diff --git a/ANNOUNCE b/ANNOUNCE index 45b1a0ea..6abf551c 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,4 +1,4 @@ - Announcing ncurses 6.4 + Announcing ncurses 6.5 Overview @@ -49,10 +49,10 @@ Overview Release Notes - These notes are for ncurses 6.4, released December 31, 2022. + These notes are for ncurses 6.5, released April 27, 2024. This release is designed to be source-compatible with ncurses 5.0 - through 6.3; providing extensions to the application binary interface + through 6.4; providing extensions to the application binary interface (ABI). Although the source can still be configured to support the ncurses 5 ABI, the reason for the release is to reflect improvements to the ncurses 6 ABI and the supporting utility programs. @@ -63,176 +63,189 @@ Release Notes The most important bug-fixes/improvements dealt with robustness issues. The release notes also mention some other bug-fixes, but are focused on new features and improvements to existing features since - ncurses 6.3 release. + ncurses 6.4 release. Library improvements New features - There are no new features in this release. + These are new features: + * The low-level terminfo and termcap interfaces are used both by the + higher-level curses library, as well as by many applications. + The functions which convert parameterized terminal capability + strings for output to the terminal (tiparm and tparm) analyze the + capability string to determine which parameters are strings (i.e., + addresses), versus numbers (not addresses). + The library's analysis of a capability string may differ from the + calling application's design if environment variables are used to + point to an invalid terminal database. This is a longstanding + problem with all implementations of terminfo, dating from the + early 1980s. + Two new functions address this problem: by providing a function + which allows the calling application to tell ncurses how many + string-parameters to expect: + + tiscan_s helps applications check formatting capabilities + that would be passed to tiparm_s. + + tiparm_s provides applications a way to tell ncurses what the + expected parameters are for a capability. + * The ncurses library supports a compile-time feature (enabled with + the configure --enable-check-size option) which simplifies + initialization with terminals which do not negotiate window + (screen) size. This is done in setupterm, by providing for using + ANSI cursor-position report (in user6/user7 terminfo capabilities) + to obtain the screen size if neither environment variables or + ioctl is used. + The ncurses test-program with options "-E -T" demonstrates this + feature. + * add functions to query tty-flags in SCREEN + + This release drops compatibility with obsolete versions of tack, e.g., + pre-1.08 Other improvements These are improvements to existing features: - * modify delscreen to more effectively delete all windows on the - given screen. - * modify wnoutrefresh to call pnoutrefresh if its parameter is a - pad, rather than treating it as an error, and modify new_panel to - permit its window-parameter to be a pad - * modify curses_trace() to show the trace-mask as symbols, e.g., - TRACE_ORDINARY, DEBUG_LEVEL(3). - * improve checks for valid mouse events when an intermediate mouse - state is not part of the mousemask specified by the caller - * allow extended-color number in opts parameter of wattr_on. - * improve _tracecchar_t2 formatting of base+combining character. - * trim out some unwanted linker options from ncurses*config and .pc - files seen in Fedora 36+. - * improve shell-scripts with shellcheck - * improve use of "trap" in shell scripts, using a script. - * modify make-tar.sh scripts to make timestamps more predictable. + * In addition to the new, safer function tiparm_s, ncurses adds + checks to make the older tiparm, tparm and tgoto functions safer: + + the terminfo functions tiparm and tparm ensure that the + capability string comes from the terminal description which + ncurses loads, rather than from random data which the + application happens to have. + + the tgoto function disallows capabilities which its analysis + shows will attempt to use string parameters. + + ncurses uses internal functions which correspond to tiparm, + and tgoto which ensure that the capability strings which are + passed to these functions come from the loaded terminal + description. + * improve check in lib_tparm.c, ensuring that a char* fits into a + TPARM_ARG + * modify _nc_syserr_abort to use _nc_env_access, rather than only + checking root uid + * improve thread lock in lib_trace.c + * modify flushinp to use file descriptors in SCREEN, rather than + from TERMINAL, and check if they are for a terminal, like SVr4 + * modify mcprint to use file descriptor in SCREEN, for consistency + * modify internal function _nc_read_file_entry to show relevant + filename in warnings + * improve checks in internal function convert_string for corrupt + terminfo entry + * review/improve handling of out-of-memory conditions + * limit delays to 30 seconds, i.e., padding delays in terminfo, as + well as napms and delay_output functions + * fix reallocation loop for vsnprintf in _nc_sprintf_string by + copying the va_list variable + * modify delscreen to limit the windows which it creates to just + those associated with the screen + * modify endwin to return an error if it is called again without an + intervening screen update + * modify wenclose to handle pads + * eliminate use of PATH_MAX in lib_trace.c + * provide for any CCHARW_MAX greater than 1 These are corrections to existing features: - * modify misc/gen-pkgconfig.in to allow for the case where the - library directory does not yet exist, since this is processed - before doing an install - * set trailing null on string passed from winsnstr to wins_nwstr. - * modify waddch_literal to allow for double-width base character - when merging a combining character + * correct loop termination condition in waddnstr and waddnwstr + * improve parsing in internal function _nc_msec_cost, allowing a + single decimal point + * amend parameter check for entire string versus specific length in + winsnstr and wins_nwstr to match Solaris; make similar correction + to wins_nwstr + * correct internal function wadd_wch_literal when adding a + non-spacing character to a double-width character + * correct definition of Charable macro for non-wide ncurses library + . Program improvements - Several improvements were made to the utility programs: + Several improvements were made to the utility programs. Some were done + to make the infocmp option "-u" option help refactor the terminal + database. infocmp - + rewrite canonical_name function of infocmp to ensure buffer - size - + improve readability of long parameterized expressions with - the infocmp "-f" option by allowing split before a "%p" - marker. - + modify verbose-option of infocmp, tic, toe to enable - debug-tracing if that is configured. - - tabs - limit tab-stop values to max-columns + + add limit checks for processing extended capabilities with + the "-u" option + + correct initial alignment of extended capabilities, so that + the "-u" option can be used for more than two terminal types + + modify "-u" option to not report cancels for strings which + were already cancelled in a use'd chunk. + + correct an assignment "-u" for detecting if a boolean is + unset in a base entry and set in a use'd chunk, i.e., if it + was cancelled. tic - add consistency check in tic for u6/u7/u8/u9 and NQ - capabilities. - tput - corrected use of original tty-modes in init/reset subcommands + + correct limit-check when dumping tc/use clause via "-I" + + check return value of _nc_save_str, in special case where + extended capabilities are processed but the terminal + description was not initialized + + modify check for multiply defined aliases to report problems + within the current runtime rather than for conflicts with + pre-existing terminal descriptions. + + disallow using $TERMINFO or $HOME/.terminfo when "-o" option + is used + + tput and tset + + + add "-v" option to tput, to show warnings + + modify reset command to avoid altering clocal if the terminal + uses a modem + + modify reset feature to avoid 1-second sleep if running in a + pseudo-terminal Examples Along with the library and utilities, improvements were made to the - ncurses-examples. Most of this activity aimed at improving the - test-packages: - * add minimal -h (usage) and -V (version) getopt logic to all - ncurses-examples programs. - * fix an error in "@" command in test/ncurses.c F-menu - * add curses_trace to ifdef's for START_TRACE in test/test.priv.h - * improve pthread-configuration for test/worm.c - * add setlocale call to several test-programs. - * workaround in test/picsmap.c for use of floating point for rgb - values by ImageMagick 6.9.11, which appears to use the wrong upper - limit. - * use static libraries for AdaCurses test-package for Mageia, since - no gprbuild package is available. - * install Ada95 sample programs in libexecdir, adding a wrapper - script to invoke those. - * install ncurses-examples programs in libexecdir, adding a wrapper - script to invoke those. - - There are other new demo/test programs and reusable examples: - - test/combine - demonstrate combining characters - - test/test_delwin - demonstrate deleting a window - - test/test_mouse - observe mouse events in the raw terminal or parsed ncurses - modes - - test/test_unget_wch - demonstrate the unget_wch and unget functions + ncurses-examples: + * modify test_tparm to account for extended capabilities + * corrected mouse mask in test/testcurs.c + * modify test/clip_printw.c to optionally test non-wrapped updates + * modify test/test_mouse.c to use curses api for raw/noraw + * modify test/clip_printw.c to optionally test non-wrapped updates + + There is one new demo/test programs: + + test/test_endwin.c + This program shows the return-status from endwin with different + combinations of endwin (repeated), initscr, newterm. Terminal database There are several new terminal descriptions: - * mosh - * mosh-256color - * teken-16color - * teken-sc - * teken-vt - * xgterm + * ansi+apparrows + * contour + * linux+kbs for terminals which imitate xterm's behavior with Linux + * rio, rio-direct + * mostlike + * ms-vt100-16color, winconsole + * vt100+noapp, vt100+noapp+pc, xterm+app+pc, xterm+decedit from + xterm #389 + * putty+cursor to reflect amending of modified cursor-keys in 2021 + * wezterm There are many changes to existing terminal descriptions. Some were - updates to several descriptions: - * make description-fields distinct - * fix errata in description fields - * add/use several building-blocks: - + aixterm+sl - + ansi+cpr - + apollo+vt132 - + decid+cpr - + ncr260vp+sl - + wyse+sl - + x10term+sl - + xterm+acs - + xterm+alt47 - - while others affected specific descriptions. These were retested, to - take into account changes by their developers: - * kitty - * teken - - while these are specific fixes based on reviewing documentation, user - reports, or warnings from tic: - - att610+cvis0 - amended note as per documentation for att610, att620, att730 - - kon, kon2, jfbterm - revise to undo "linux2.6" change to smacs/rmacs/enacs - - st-0.6 - add dim, ecma+strikeout - - foot+base - add xterm+sl-alt - - dec+sl - correct dsl in dec+sl - - mintty and tmux - correct setal in mintty/tmux entries, add to vte-2018 - - nsterm - modify nsterm to use xterm+alt1049 - - putty - modify putty to use xterm+alt1049 - - vte-2018 - add blink and setal - - A few entries use extensions (user-defined terminal capabilities): - * use ansi+enq and decid+cpr in cases where the terminal probably - supported the u6-u9 extension - * remove u6-u9 from teken-2018 - * use NQ to flag entries where the terminal does not support query - and response - * add/use bracketed+paste to help identify terminals supporting this - xterm feature - * modify samples for xterm mouse 1002/1003 modes to use 1006 mode, - and also provide for focus in/out responses - * xterm patch #371 supports DEC-compatible status-line. add dec+sl - to xterm-new, per xterm #371, add xterm-p371, add xterm-p370, for - use in older terminals, and set "xterm-new" to "xterm-p370" (to - ease adoption). + updates to several descriptions, using the infocmp "-u" option in a + script to determine which building-block entries could be used to + replace multiple capability settings (and trim redundant information). + + Other changes include: + * document XF, kxIN and kxOUT + * add note on sun regarding wscons/cmdtool/shelltool + * remove DECCOLM+DECSCLM from foot + * add xterm+focus to foot+base + * add ecma+strikeout to putty + * use CSI 3J in vte-2017 + * use oldxterm+sm+1006 in vte-2014 + * modify xgterm to work around line-drawing bug + * add xterm focus mode 1004 to xterm+focus as fe/fd capabilities, + like vim. + * add xterm+focus to alacritty+common + * add XR/xr, to work with vim, and use RV/rv to denote DA2 and its + response + * add XF flag to xterm+focus so that termcap applications can be + aware of terminals which may support focus in/out + * use xterm+focus in xterm-p370 and tmux + * remove xterm+sm+1006 from tmux + * NetBSD-related fixes for x68k and wsvt25 Documentation @@ -247,123 +260,157 @@ Release Notes features and show how they evolved, there are corrections, clarifications, etc.: * Corrections: - + remove a stray '/' from description of %g in terminfo(5). - + correct/improve font-formatting in curs_getch.3x, as well as - other manual pages. + + add assignment in CF_MAN_PAGES to fill in value for + TERMINFO_DIRS in ncurses, terminfo and tic manpages. + + clarify interaction of -R option versus -C, -I and -r in + infocmp manpage. + + correct manpage description of panel_hidden. + + improve manpage description for addch versus unctrl format + used for non-printable characters. + + improve manpages discussing file descriptors in low-level + functions. + + improve description of search rules for terminal descriptions + in terminfo manpage. + + modify dist.mk to avoid passing developer's comments in + manpages into the generated html documentation. + + modify test-package "ncurses6-doc" to use manpage-aliases, + which in turn required a change to the configure script to + factor in the extra-suffix option when deriving alias names. * New/improved history and portability sections: - + add portability notes for delscreen and delwin in manual. - + improve curs_slk.3x discussion of extensions and portability + + add information about "ttycap", termcap's forerunner, to + tset.1 + + document limitations of tparm, and error-returns in + curs_terminfo.3x + + document limitations of tgoto, and error-returns in + curs_termcap.3x * Other improvements: - + improve curs_bkgd.3x, explaining that bkgdset can affect - results for bkgd - + add note on portable memory-leak checking in curs_memleaks.3x - + expanded description in resizeterm.3x - + add section on releasing memory to curs_termcap.3x and - curs_terminfo.3x manpages. - + add clarification of the scope of dynamic variables in - terminfo(5). - + improve formatting of ncurses-intro.html and hackguide.html - + improve curs_clear.3x links to other pages - + update ncurses-howto, making documentation fixes along with - corrections to example programs. - + use newer version 1.36 of gnathtml for generating Ada html - files. - + update external links in Ada95.html + + This release has many changes to improve the formatting and + style of the manpages. + + Manpages now use consistent section-naming, page headers and + footers (including the modification date for each page). + + Table layout has been revised. There are no new manual pages (all of the manual page updates are to existing pages). Interesting bug-fixes - While there were many bugs fixed during development of ncurses 6.4, - only a few (the reason for this release) were both important and - interesting. Most of the bug-fixes were for local issues which did not - affect compatibility across releases. Since those are detailed in the - NEWS file no elaboration is needed here. - - The interesting bugs were those dealing with memory leaks and buffer - overflows. Although the utilities are designed for text files (which - they do properly), some choose to test them with non-text files. - * Text files contain no embedded nulls. Also, they end with a - newline. Feeding tic non-text files exposed a few cases where the - program did not check for those issues. As a result, further - processing of the input found limit-checks whose assumptions were - invalid. - * Fixing the limit-checks (first) found a problem with tic managing - the list of strings in a terminal description. In merging two - terminal descriptions (i.e., the "use=" feature), tic was not - allocating a complete copy. A quick repair for that introduced a - memory leak. - * The checks for non-text files are improved (i.e., embedded nulls - in the input file will cause tic to reject it rather than - attempting to process it). - * The string allocations in tic are likewise improved. + The changes to tparm, tgoto which improve the design of the low-level + interfaces are interesting, but are not bug-fixes per se. Configuration changes Major changes - There are no major changes. No new options were added. Several - improvements were made to configure checks. + These are the major changes (aside from introducing tiparm_s): + * use wide-character (ncursesw) by default + * use opaque typedefs by default + + However, most of the work on configure scripts was done to reduce + warnings within the configure script: + * intrusive warnings from GNU grep regarding fgrep and egrep + * fatal errors in compile-checks, arising from recent "Modern C" + efforts by some developers which caused longstanding configure + checks to fail. + After repairing the configure script, none of that activity + affected ncurses because stricter warnings are used routinely in + development. + + Other improvements made to configure checks include + * use string-hacks in alloc_entry.c, alloc_type.c and hardscroll.c, + overlooked due to compiler changes in recent OpenBSD releases + * revise progs.priv.h to provide for NC_ISATTY reuse + * configure check for MB_LEN_MAX provides warning as needed + * trim a space after some "-R" options, fixing builds for + applications built using clang and ncurses on Solaris + * work around misconfiguration of MacPorts gcc13, which exposes + invalid definition of MB_LEN_MAX in gcc's fallback copy of + limits.h + * modified experimental Windows driver works with xterm mouse + protocol Configuration options - There are a few new/modified configure options: + There are a few new configure options: + + --disable-setuid-environ + Compile with environment restriction, so certain environment + variables are not available when running via a setuid/setgid + application. These are (for example $TERMINFO) those that allow + the search path for the terminfo or termcap entry to be + customized. + + A setuid/setgid application inherits its environment variables + from the current user, in contrast to sudo which may limit the + environment variables that ncurses uses. + + --enable-check-size + Compile-in feature to detect screensize for terminals which do + not advertise their screensize, e.g., serial terminals. + + --with-abi-altered=NUM + Override the displayed (rather than compiled-in) ABI. Only + packagers who have created configurations where the ABI differs + from ncurses should be interested in this option. + + --with-strip-program=XXX + When stripping executables during install, use the specified + program rather than "strip" overriding program chosen by the + install program for stripping executables. - --with-abi-version - add ABI 7 defaults to configure script. + These configure options are modified: - --with-caps - add warning in configure script if file specified for - "--with-caps" does not exist. + --with-pkg-config-libdir[=DIR] + The optional DIR parameter can now be "auto" to automatically + use pkg-config's library directory. - --with-manpage-format - bzip2 and xz compression are now supported + The default is $(libdir). - --with-xterm-kbs - add check/warning in configure script if option - "--with-xterm-kbs" is missing or inconsistent + --with-xterm-kbs[=XXX] + The default is "auto" which tells the configure script to + choose BS or DEL according to platform defaults. Portability Many of the portability changes are implemented via the configure script: - * amend configure option's auto-search to account for systems where - none of the directories known to pkg-config exist - * corrected regex needed for older pkg-config used in Solaris 10 - * improve handling of --with-pkg-config-libdir option, allowing for - the case where either $PKG_CONFIG_LIBDIR or the option value has a - colon-separated list of directories - * if the --with-pkg-config-libdir option is not given, use - ${libdir}/pkgconfig as a default - * improve search-path check for pkg-config, e.g., for Debian testing - which installs pkg-config with architecture-prefixes. - * build-fix for cross-compiling to MingW, conditionally add -lssp - * improve configure check for getttynam - * fixes to build with dietlibc: - + add configure check for fpathconf - + add configure check for math sine/cosine, needed in - test/tclock, and eliminate pow() from test/hanoi - + use wcsnlen as an alternative to wmemchr if it is not found - * modify configure macro CF_BUILD_CC to check if the build-compiler - works, rather than that it is different from the cross-compiler, - e.g., to accommodate a compiler which can be used for either - purpose with different flags - * modify configure/scripts to work around interference by GNU grep - 3.8 + * add/use configure check for clock_gettime, to supersede + gettimeofday. + * modify configure script check for pkg-config library directory to + take into account an older version 0.15.0 which used + PKG_CONFIG_PATH but not PKG_CONFIG_LIBDIR + * allow for MinGW32-/64-bit configurations to use _DEFAULT_SOURCE + * modify CF_XOPEN_SOURCE macro's amend default case to avoid + undefining _XOPEN_SOURCE if _POSIX_C_SOURCE is defined + * updated configure script macro CF_XOPEN_SOURCE, for uClibc-ng + * modify version-check for gcc/g++, now works for msys2 + * build-fixes related to configure-options and/or platform: + + fix for --enable-fvisibility + + fix for unusual values of --with-rel-version + + fix for unusual values of --with-abi-version + + fix for --disable-tcap-names + + fix for termcap in nc_access.h + * other configure-script improvements: + + recent msys2 headers work with _DEFAULT_SOURCE; amend check + + use $ac_includes_default in most cases where stdlib.h should + work + + use #error consistently vs "make an error" + + add configure macro for gettimeofday vs inline check Here are some of the other portability fixes: - * change man_db.renames to template, to handle ncurses*-config - script with the --extra-suffix configure option. - * update CF_XOPEN_SOURCE macro, adding variants "gnueabi" and - "gnueabihf" to get _DEFAULT_SOURCE special case, as well as adding - GNU libc suffixes for "abi64", "abin32", "x32" to distinguish it - from other libc flavors. - * work around musl's nonstandard use of feature test macros by - adding a definition for NCURSES_WIDECHAR to the generated ".pc" - and *-config files. - * use "command -v" rather than "type" in Ada95/gen/Makefile.in to - fix a portability issue. + * modify configure scripts/makefiles to omit KEY_RESIZE if the + corresponding SIGWINCH feature is disabled + * increase MB_CUR_MAX to 16, matching glibc's MB_LEN_MAX + * add BSD erase2 to characters handled by tset/reset + * use getauxval when available, to improve setuid/setgid checks + * set dwShareMode in calls to CreateConsoleScreenBuffer + * use CreateFile with "CONIN$", "CONOUT$" rather than GetStdHandle + to obtain a handle on the actual console, avoiding redirection in + the MinGW/Win32 configurations + * modify MinGW driver to return KEY_BACKSPACE when an unmodified + VK_BACK virtual key is entered + * modify MinGW configuration to provide for running in MSYS/MSYS2 + shells, assuming ConPTY support _________________________________________________________________ Features of ncurses @@ -371,20 +418,21 @@ Features of ncurses The ncurses package is fully upward-compatible with SVr4 (System V Release 4) curses: * All of the SVr4 calls have been implemented (and are documented). - * ncurses supports all of the for SVr4 curses features including - keyboard mapping, color, forms-drawing with ACS characters, and - automatic recognition of keypad and function keys. - * ncurses provides these SVr4 add-on libraries (not part of X/Open - Curses): - + the panels library, supporting a stack of windows with - backing store. - + the menus library, supporting a uniform but flexible - interface for menu programming. + * ncurses supports the features of SVr4 curses including keyboard + mapping, color, form drawing with ACS characters, and automatic + recognition of keypad and function keys. + * ncurses provides work-alike replacements of SVr4 supplemental + libraries based on curses, but which were not specified by X/Open + Curses: + + the panel library, supporting a stack of windows with backing + store + + the menu library, supporting a uniform but flexible interface + for menu programming + the form library, supporting data collection through - on-screen forms. + on-screen forms * ncurses's terminal database is fully compatible with that used by SVr4 curses. - + ncurses supports user-defined capabilities which it can see, + + ncurses supports user-defined capabilities that it can see, but which are hidden from SVr4 curses applications using the same terminal database. + It can be optionally configured to match the format used in @@ -397,11 +445,12 @@ Features of ncurses the HP-UX and AIX ports. The ncurses package also has many useful extensions over SVr4: - * The API is 8-bit clean and base-level conformant with the X/OPEN - curses specification, XSI curses (that is, it implements all BASE - level features, and most EXTENDED features). It includes many - function calls not supported under SVr4 curses (but portability of - all calls is documented so you can use the SVr4 subset only). + * The API is 8-bit clean and base-level conformant with the X/Open + Curses specification, XSI curses (that is, it implements all BASE + level features, and almost all EXTENDED features). It includes + many function calls not supported under SVr4 curses (but + portability of all calls is documented so you can use the SVr4 + subset only). * Unlike SVr3 curses, ncurses can write to the rightmost-bottommost corner of the screen if your terminal has an insert-character capability. @@ -461,10 +510,19 @@ Features of ncurses user's $HOME/.terminfo directory. * The table-of-entries utility toe makes it easy for users to see exactly what terminal types are available on the system. - * The library meets the XSI requirement that every macro entry point - has a corresponding function which may be linked (and will be - prototype-checked) if the macro definition is disabled with - #undef. + * X/Open Curses permits most functions it specifies to be made + available as macros as well. ncurses does this + + to improve performance, e.g., for operations composed of + simpler functions such as cursor movement following by adding + text to the screen, + + to simplify the implementation by reusing functions which use + common parameters, e.g., the standard screen stdscr, and + + to provide functions that return values via their parameters + Except for the last case, ncurses provides a non-macro + implementation of the function. If the macro definition is + disabled with #undef, or by defining NCURSES_NOMACROS the function + may be linked (and its calls will be checked against the + prototype). * Extensive documentation is provided (see the Additional Reading section of the ncurses FAQ for online documentation). @@ -517,7 +575,8 @@ Applications using ncurses nvi New vi uses ncurses. - https://sites.google.com/a/bostic.com/keithbostic/vi + https://sites.google.com/a/bostic.com/keithbostic/the-berkeley- + vi-editor-home-page ranger A console file manager with VI key bindings in Python. @@ -539,7 +598,7 @@ Applications using ncurses minicom terminal emulator for serial modem connections - https://alioth.debian.org/projects/minicom/ + https://salsa.debian.org/minicom-team/minicom mosh a replacement for ssh. @@ -620,12 +679,12 @@ Development activities Patches to the current release are made available at - https://invisible-island.net/archives/ncurses/6.3/ and - https://invisible-mirror.net/archives/ncurses/6.3/ . + https://invisible-island.net/archives/ncurses/6.4/ and + https://invisible-mirror.net/archives/ncurses/6.4/ . There is an archive of the mailing list here: - http://lists.gnu.org/archive/html/bug-ncurses (also https) + https://lists.gnu.org/archive/html/bug-ncurses . Related resources @@ -645,11 +704,12 @@ Other resources terminal description file once maintained by Eric Raymond . Unlike the older version, the termcap and terminfo data are provided in the same file, which also provides several user-definable extensions beyond the - X/Open specification. + X/Open Curses specification. You can find lots of information on terminal-related topics not - covered in the terminfo file at Richard Shuford's archive . The - collection of computer manuals at bitsavers.org has also been useful. + covered in the terminfo file in Richard Shuford's archive (original). + The collection of computer manuals at bitsavers.org has also been + useful. * Overview * Release Notes diff --git a/AUTHORS b/AUTHORS index 09dfc9a9..9a5ac067 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,5 +1,5 @@ ------------------------------------------------------------------------------- --- Copyright 2020,2021 Thomas E. Dickey -- +-- Copyright 2020-2021,2024 Thomas E. Dickey -- -- Copyright 2006,2017 Free Software Foundation, Inc. -- -- -- -- Permission is hereby granted, free of charge, to any person obtaining a -- @@ -26,7 +26,7 @@ -- sale, use or other dealings in this Software without prior written -- -- authorization. -- ------------------------------------------------------------------------------- --- $Id: AUTHORS,v 1.5 2021/06/17 21:20:30 tom Exp $ +-- $Id: AUTHORS,v 1.7 2024/06/15 20:43:32 tom Exp $ ------------------------------------------------------------------------------- These are the principal authors/contributors of ncurses since 1.9.9e, in decreasing order of their contribution: @@ -37,4 +37,5 @@ ESR Eric S Raymond AVL Alexander V Lukyanov PB Philippe Blain SV Sven Verdoolaege -NB Nicolas Boulenguez +NB Nicolas Boulenguez +GBR Branden Robinson diff --git a/Ada95/Makefile.in b/Ada95/Makefile.in index 22b922e9..c937df98 100644 --- a/Ada95/Makefile.in +++ b/Ada95/Makefile.in @@ -1,6 +1,6 @@ -# $Id: Makefile.in,v 1.30 2022/12/17 23:33:33 tom Exp $ +# $Id: Makefile.in,v 1.31 2024/08/11 00:24:28 tom Exp $ ############################################################################## -# Copyright 2020-2021,2022 Thomas E. Dickey # +# Copyright 2020-2022,2024 Thomas E. Dickey # # Copyright 1998-2010,2015 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # @@ -31,7 +31,7 @@ # Author: Juergen Pfeifer, 1996 # # Version Control -# $Revision: 1.30 $ +# $Revision: 1.31 $ # SHELL = @SHELL@ VPATH = @srcdir@ @@ -47,12 +47,12 @@ libdir = @libdir@ libexecdir = @libexecdir@ includedir = @includedir@ -BINDIR = $(DESTDIR)$(bindir) -DATADIR = $(DESTDIR)$(datadir) -LIBDIR = $(DESTDIR)$(libdir) -LIBEXECDIR = $(DESTDIR)$(libexecdir) +BINDIR = $(DESTDIR)$(bindir@MERGE_PREFIX@) +DATADIR = $(DESTDIR)$(datadir@MERGE_PREFIX@) +LIBDIR = $(DESTDIR)$(libdir@MERGE_PREFIX@) +LIBEXECDIR = $(DESTDIR)$(libexecdir@MERGE_PREFIX@) -SUBDIRS = @ADA_SUBDIRS@ +SUBDIRS = @ADA_SUBDIRS@ INSTALL = @INSTALL@ @INSTALL_OPT_O@ INSTALL_SCRIPT = @INSTALL@ diff --git a/Ada95/aclocal.m4 b/Ada95/aclocal.m4 index 76367b00..390c3944 100644 --- a/Ada95/aclocal.m4 +++ b/Ada95/aclocal.m4 @@ -1,5 +1,5 @@ dnl*************************************************************************** -dnl Copyright 2018-2022,2023 Thomas E. Dickey * +dnl Copyright 2018-2024,2025 Thomas E. Dickey * dnl Copyright 2010-2017,2018 Free Software Foundation, Inc. * dnl * dnl Permission is hereby granted, free of charge, to any person obtaining a * @@ -29,7 +29,7 @@ dnl*************************************************************************** dnl dnl Author: Thomas E. Dickey dnl -dnl $Id: aclocal.m4,v 1.201 2023/02/25 13:45:56 tom Exp $ +dnl $Id: aclocal.m4,v 1.227 2025/02/23 01:57:36 tom Exp $ dnl Macros used in NCURSES Ada95 auto-configuration script. dnl dnl These macros are maintained separately from NCURSES. The copyright on @@ -477,7 +477,7 @@ fi AC_SUBST(ARFLAGS) ]) dnl --------------------------------------------------------------------------- -dnl CF_BUILD_CC version: 11 updated: 2022/12/04 15:40:08 +dnl CF_BUILD_CC version: 14 updated: 2024/12/14 11:58:01 dnl ----------- dnl If we're cross-compiling, allow the user to override the tools and their dnl options. The configure script is oriented toward identifying the host @@ -555,7 +555,7 @@ if test "$cross_compiling" = yes ; then AC_TRY_RUN([#include int main(int argc, char *argv[]) { - ${cf_cv_main_return:-return}(argc < 0 || argv == 0 || argv[0] == 0); + ${cf_cv_main_return:-return}(argc < 0 || argv == (void*)0 || argv[0] == (void*)0); } ], cf_ok_build_cc=yes, @@ -901,7 +901,7 @@ if test "x$ifelse([$2],,CLANG_COMPILER,[$2])" = "xyes" ; then fi ]) dnl --------------------------------------------------------------------------- -dnl CF_CONST_X_STRING version: 7 updated: 2021/06/07 17:39:17 +dnl CF_CONST_X_STRING version: 9 updated: 2024/12/04 03:49:57 dnl ----------------- dnl The X11R4-X11R6 Xt specification uses an ambiguous String type for most dnl character-strings. @@ -928,7 +928,7 @@ CF_SAVE_XTRA_FLAGS([CF_CONST_X_STRING]) AC_TRY_COMPILE( [ -#include +$ac_includes_default #include ], [String foo = malloc(1); free((void*)foo)],[ @@ -936,9 +936,10 @@ AC_TRY_COMPILE( AC_CACHE_CHECK(for X11/Xt const-feature,cf_cv_const_x_string,[ AC_TRY_COMPILE( [ +#undef _CONST_X_STRING #define _CONST_X_STRING /* X11R7.8 (perhaps) */ #undef XTSTRINGDEFINES /* X11R5 and later */ -#include +$ac_includes_default #include ],[String foo = malloc(1); *foo = 0],[ cf_cv_const_x_string=no @@ -961,64 +962,50 @@ esac ]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_CONST_X_STRING version: 7 updated: 2021/06/07 17:39:17 -dnl ----------------- -dnl The X11R4-X11R6 Xt specification uses an ambiguous String type for most -dnl character-strings. -dnl -dnl It is ambiguous because the specification accommodated the pre-ANSI -dnl compilers bundled by more than one vendor in lieu of providing a standard C -dnl compiler other than by costly add-ons. Because of this, the specification -dnl did not take into account the use of const for telling the compiler that -dnl string literals would be in readonly memory. -dnl -dnl As a workaround, one could (starting with X11R5) define XTSTRINGDEFINES, to -dnl let the compiler decide how to represent Xt's strings which were #define'd. -dnl That does not solve the problem of using the block of Xt's strings which -dnl are compiled into the library (and is less efficient than one might want). -dnl -dnl Xt specification 7 introduces the _CONST_X_STRING symbol which is used both -dnl when compiling the library and compiling using the library, to tell the -dnl compiler that String is const. -AC_DEFUN([CF_CONST_X_STRING], -[ -AC_REQUIRE([AC_PATH_XTRA]) - -CF_SAVE_XTRA_FLAGS([CF_CONST_X_STRING]) - -AC_TRY_COMPILE( +dnl CF_CURSES_CONFIG version: 2 updated: 2006/10/29 11:06:27 +dnl ---------------- +dnl Tie together the configure-script macros for curses. It may be ncurses, +dnl but unless asked, we do not make a special search for ncurses. However, +dnl still check for the ncurses version number, for use in other macros. +AC_DEFUN([CF_CURSES_CONFIG], [ -#include -#include -], -[String foo = malloc(1); free((void*)foo)],[ - -AC_CACHE_CHECK(for X11/Xt const-feature,cf_cv_const_x_string,[ - AC_TRY_COMPILE( - [ -#define _CONST_X_STRING /* X11R7.8 (perhaps) */ -#undef XTSTRINGDEFINES /* X11R5 and later */ -#include -#include - ],[String foo = malloc(1); *foo = 0],[ - cf_cv_const_x_string=no - ],[ - cf_cv_const_x_string=yes - ]) -]) - -CF_RESTORE_XTRA_FLAGS([CF_CONST_X_STRING]) +CF_CURSES_CPPFLAGS +CF_NCURSES_VERSION +CF_CURSES_LIBS +])dnl +dnl --------------------------------------------------------------------------- +dnl CF_CURSES_CPPFLAGS version: 14 updated: 2021/01/02 09:31:20 +dnl ------------------ +dnl Look for the curses headers. +AC_DEFUN([CF_CURSES_CPPFLAGS],[ -case "$cf_cv_const_x_string" in -(no) - CF_APPEND_TEXT(CPPFLAGS,-DXTSTRINGDEFINES) +AC_CACHE_CHECK(for extra include directories,cf_cv_curses_incdir,[ +cf_cv_curses_incdir=no +case "$host_os" in +(hpux10.*) + if test "x$cf_cv_screen" = "xcurses_colr" + then + test -d /usr/include/curses_colr && \ + cf_cv_curses_incdir="-I/usr/include/curses_colr" + fi ;; -(*) - CF_APPEND_TEXT(CPPFLAGS,-D_CONST_X_STRING) +(sunos3*|sunos4*) + if test "x$cf_cv_screen" = "xcurses_5lib" + then + test -d /usr/5lib && \ + test -d /usr/5include && \ + cf_cv_curses_incdir="-I/usr/5include" + fi ;; esac - ]) +if test "$cf_cv_curses_incdir" != no +then + CF_APPEND_TEXT(CPPFLAGS,$cf_cv_curses_incdir) +fi + +CF_CURSES_HEADER +CF_TERM_HEADER ])dnl dnl --------------------------------------------------------------------------- dnl CF_CURSES_HEADER version: 6 updated: 2022/12/02 20:06:52 @@ -1046,6 +1033,136 @@ fi # cheat, to get the right #define's for HAVE_NCURSES_H, etc. AC_CHECK_HEADERS($cf_cv_ncurses_header) +])dnl +dnl --------------------------------------------------------------------------- +dnl CF_CURSES_LIBS version: 45 updated: 2022/12/02 20:06:52 +dnl -------------- +dnl Look for the curses libraries. Older curses implementations may require +dnl termcap/termlib to be linked as well. Call CF_CURSES_CPPFLAGS first. +AC_DEFUN([CF_CURSES_LIBS],[ + +AC_REQUIRE([CF_CURSES_CPPFLAGS])dnl +AC_MSG_CHECKING(if we have identified curses libraries) +AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>], + [initscr(); endwin()], + cf_result=yes, + cf_result=no) +AC_MSG_RESULT($cf_result) + +if test "$cf_result" = no ; then +case "$host_os" in +(freebsd*) + AC_CHECK_LIB(mytinfo,tgoto,[CF_ADD_LIBS(-lmytinfo)]) + ;; +(hpux10.*) + # Looking at HPUX 10.20, the Hcurses library is the oldest (1997), cur_colr + # next (1998), and xcurses "newer" (2000). There is no header file for + # Hcurses; the subdirectory curses_colr has the headers (curses.h and + # term.h) for cur_colr + if test "x$cf_cv_screen" = "xcurses_colr" + then + AC_CHECK_LIB(cur_colr,initscr,[ + CF_ADD_LIBS(-lcur_colr) + ac_cv_func_initscr=yes + ],[ + AC_CHECK_LIB(Hcurses,initscr,[ + # HP's header uses __HP_CURSES, but user claims _HP_CURSES. + CF_ADD_LIBS(-lHcurses) + CF_APPEND_TEXT(CPPFLAGS,-D__HP_CURSES -D_HP_CURSES) + ac_cv_func_initscr=yes + ])]) + fi + ;; +(linux*) + case `arch 2>/dev/null` in + (x86_64) + if test -d /lib64 + then + CF_ADD_LIBDIR(/lib64) + else + CF_ADD_LIBDIR(/lib) + fi + ;; + (*) + CF_ADD_LIBDIR(/lib) + ;; + esac + ;; +(sunos3*|sunos4*) + if test "x$cf_cv_screen" = "xcurses_5lib" + then + if test -d /usr/5lib ; then + CF_ADD_LIBDIR(/usr/5lib) + CF_ADD_LIBS(-lcurses -ltermcap) + fi + fi + ac_cv_func_initscr=yes + ;; +esac + +if test ".$ac_cv_func_initscr" != .yes ; then + cf_save_LIBS="$LIBS" + + if test ".${cf_cv_ncurses_version:-no}" != .no + then + cf_check_list="ncurses curses cursesX" + else + cf_check_list="cursesX curses ncurses" + fi + + # Check for library containing tgoto. Do this before curses library + # because it may be needed to link the test-case for initscr. + if test "x$cf_term_lib" = x + then + AC_CHECK_FUNC(tgoto,[cf_term_lib=predefined],[ + for cf_term_lib in $cf_check_list otermcap termcap tinfo termlib unknown + do + AC_CHECK_LIB($cf_term_lib,tgoto,[ + : "${cf_nculib_root:=$cf_term_lib}" + break + ]) + done + ]) + fi + + # Check for library containing initscr + test "$cf_term_lib" != predefined && test "$cf_term_lib" != unknown && LIBS="-l$cf_term_lib $cf_save_LIBS" + if test "x$cf_curs_lib" = x + then + for cf_curs_lib in $cf_check_list xcurses jcurses pdcurses unknown + do + LIBS="-l$cf_curs_lib $cf_save_LIBS" + if test "$cf_term_lib" = unknown || test "$cf_term_lib" = "$cf_curs_lib" ; then + AC_MSG_CHECKING(if we can link with $cf_curs_lib library) + AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>], + [initscr()], + [cf_result=yes], + [cf_result=no]) + AC_MSG_RESULT($cf_result) + test "$cf_result" = yes && break + elif test "$cf_curs_lib" = "$cf_term_lib" ; then + cf_result=no + elif test "$cf_term_lib" != predefined ; then + AC_MSG_CHECKING(if we need both $cf_curs_lib and $cf_term_lib libraries) + AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>], + [initscr(); endwin();], + [cf_result=no], + [ + LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS" + AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>], + [initscr()], + [cf_result=yes], + [cf_result=error]) + ]) + AC_MSG_RESULT($cf_result) + test "$cf_result" != error && break + fi + done + fi + test "$cf_curs_lib" = unknown && AC_MSG_ERROR(no curses library found) +fi +fi + ])dnl dnl --------------------------------------------------------------------------- dnl CF_DIRNAME version: 5 updated: 2020/12/31 20:19:42 @@ -1393,19 +1510,36 @@ fi AC_SUBST(EXTRA_CFLAGS) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_FUNC_GETTIME version: 2 updated: 2023/02/25 08:45:56 +dnl CF_FUNC_GETTIME version: 3 updated: 2024/05/11 13:40:02 dnl --------------- dnl Check for gettimeofday or clock_gettime. In 2023, the former is still more dnl widely supported, but "deprecated" (2008), so we will use the latter if it dnl is available, to reduce compiler warnings. AC_DEFUN([CF_FUNC_GETTIME],[ -AC_CACHE_CHECK(for clock_gettime,cf_cv_func_clock_gettime,[ - AC_TRY_LINK([#include ], +cf_save_libs="$LIBS" +AC_CHECK_FUNC(clock_gettime, + cf_cv_test_clock_gettime=yes, + AC_CHECK_LIB(rt, clock_gettime, + [LIBS="-lrt $LIBS" + cf_cv_test_clock_gettime=yes], + cf_cv_test_clock_gettime=no)) + +if test "$cf_cv_test_clock_gettime" = yes ; then +AC_CACHE_CHECK(if clock_gettime links,cf_cv_func_clock_gettime,[ + AC_TRY_LINK([ +$ac_includes_default +#include + ], [struct timespec ts; - int rc = clock_gettime(CLOCK_REALTIME, &ts); (void) rc; (void)ts], + int rc = clock_gettime(CLOCK_REALTIME, &ts) + + clock_gettime(CLOCK_MONOTONIC, &ts); + (void) rc; (void)ts], [cf_cv_func_clock_gettime=yes], [cf_cv_func_clock_gettime=no]) ]) +else + cf_cv_func_clock_gettime=no +fi if test "$cf_cv_func_clock_gettime" = yes then @@ -1533,7 +1667,7 @@ rm -rf ./conftest* fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_GCC_VERSION version: 8 updated: 2019/09/07 13:38:36 +dnl CF_GCC_VERSION version: 9 updated: 2023/03/05 14:30:13 dnl -------------- dnl Find version of gcc, and (because icc/clang pretend to be gcc without being dnl compatible), attempt to determine if icc/clang is actually used. @@ -1542,7 +1676,7 @@ AC_REQUIRE([AC_PROG_CC]) GCC_VERSION=none if test "$GCC" = yes ; then AC_MSG_CHECKING(version of $CC) - GCC_VERSION="`${CC} --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(GCC[[^)]]*) //' -e 's/^.*(Debian[[^)]]*) //' -e 's/^[[^0-9.]]*//' -e 's/[[^0-9.]].*//'`" + GCC_VERSION="`${CC} --version 2>/dev/null | sed -e '2,$d' -e 's/^[[^(]]*([[^)]][[^)]]*) //' -e 's/^[[^0-9.]]*//' -e 's/[[^0-9.]].*//'`" test -z "$GCC_VERSION" && GCC_VERSION=unknown AC_MSG_RESULT($GCC_VERSION) fi @@ -1550,7 +1684,7 @@ CF_INTEL_COMPILER(GCC,INTEL_COMPILER,CFLAGS) CF_CLANG_COMPILER(GCC,CLANG_COMPILER,CFLAGS) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_GCC_WARNINGS version: 41 updated: 2021/01/01 16:53:59 +dnl CF_GCC_WARNINGS version: 43 updated: 2024/12/21 08:44:12 dnl --------------- dnl Check if the compiler supports useful warning options. There's a few that dnl we don't use, simply because they're too noisy: @@ -1664,6 +1798,26 @@ rm -rf ./conftest* AC_SUBST(EXTRA_CFLAGS) ])dnl dnl --------------------------------------------------------------------------- +dnl CF_GLOB_FULLPATH version: 2 updated: 2024/08/03 12:34:02 +dnl ---------------- +dnl Use this in case-statements to check for pathname syntax, i.e., absolute +dnl pathnames. The "x" is assumed since we provide an alternate form for DOS. +AC_DEFUN([CF_GLOB_FULLPATH],[ +AC_REQUIRE([CF_WITH_SYSTYPE])dnl +case "$cf_cv_system_name" in +(cygwin*|msys*|mingw32*|mingw64|os2*) + GLOB_FULLPATH_POSIX='/*' + GLOB_FULLPATH_OTHER='[[a-zA-Z]]:[[\\/]]*' + ;; +(*) + GLOB_FULLPATH_POSIX='/*' + GLOB_FULLPATH_OTHER=$GLOB_FULLPATH_POSIX + ;; +esac +AC_SUBST(GLOB_FULLPATH_POSIX) +AC_SUBST(GLOB_FULLPATH_OTHER) +])dnl +dnl --------------------------------------------------------------------------- dnl CF_GNATPREP_OPT_T version: 1 updated: 2014/08/02 18:37:25 dnl ----------------- AC_DEFUN([CF_GNATPREP_OPT_T],[ @@ -2126,7 +2280,7 @@ CPPFLAGS="-I. $CPPFLAGS" AC_SUBST(CPPFLAGS) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_INSTALL_OPTS version: 2 updated: 2018/08/18 12:19:21 +dnl CF_INSTALL_OPTS version: 3 updated: 2023/06/03 15:17:30 dnl --------------- dnl prompt for/fill-in useful install-program options AC_DEFUN([CF_INSTALL_OPTS], @@ -2134,6 +2288,7 @@ AC_DEFUN([CF_INSTALL_OPTS], CF_INSTALL_OPT_S CF_INSTALL_OPT_P CF_INSTALL_OPT_O +CF_INSTALL_OPT_STRIP_PROG ])dnl dnl --------------------------------------------------------------------------- dnl CF_INSTALL_OPT_O version: 3 updated: 2020/12/31 20:19:42 @@ -2220,6 +2375,106 @@ fi AC_SUBST(INSTALL_OPT_S) ])dnl dnl --------------------------------------------------------------------------- +dnl CF_INSTALL_OPT_STRIP_PROG version: 1 updated: 2023/06/03 15:17:30 +dnl ------------------------- +dnl Provide an option for overriding the strip program used in install "-s" +dnl +dnl coreutils install provides a --strip-program option +dnl FreeBSD uses STRIPBIN environment variable, while NetBSD and OpenBSD use +dnl STRIP environment variable. Other versions of install do not support this. +AC_DEFUN([CF_INSTALL_OPT_STRIP_PROG], +[ +AC_REQUIRE([CF_INSTALL_OPT_S]) +if test -n "$INSTALL_OPT_S" +then + AC_MSG_CHECKING(if you want to specify strip-program) + AC_ARG_WITH(strip-program, + [ --with-strip-program=XX specify program to use when stripping in install], + [with_strip_program=$withval], + [with_strip_program=no]) + AC_MSG_RESULT($with_strip_program) + if test "$with_strip_program" != no + then + AC_MSG_CHECKING(if strip-program is supported with this installer) + cf_install_program=`echo "$INSTALL" | sed -e 's%[[ ]]*[[ ]]-.%%'` + check_install_strip=no + if test -f "$cf_install_program" + then + check_install_version=`"$cf_install_program" --version 2>/dev/null | head -n 1 | grep coreutils` + if test -n "$check_install_version" + then + check_install_strip="option" + else + for check_strip_variable in STRIPBIN STRIP + do + if strings "$cf_install_program" | grep "^$check_strip_variable[$]" >/dev/null + then + check_install_strip="environ" + break + fi + done + fi + fi + AC_MSG_RESULT($check_install_strip) + case "$check_install_strip" in + (no) + AC_MSG_WARN($cf_install_program does not support strip program option) + with_strip_program=no + ;; + (environ) + cat >install.tmp <<-CF_EOF + #! $SHELL + STRIPBIN="$with_strip_program" \\ + STRIP="$with_strip_program" \\ + $INSTALL "[$]@" + CF_EOF + INSTALL="`pwd`/install.tmp" + chmod +x "$INSTALL" + CF_VERBOSE(created $INSTALL) + ;; + (option) + INSTALL_OPT_S="$INSTALL_OPT_S --strip-program=\"$with_strip_program\"" + ;; + esac + fi +fi +AC_SUBST(INSTALL_OPT_S) +])dnl +dnl --------------------------------------------------------------------------- +dnl CF_INSTALL_PREFIX version: 1 updated: 2024/08/10 20:16:32 +dnl ----------------- +dnl Special option for use by system-builders: the install-prefix is used to +dnl adjust the location into which the actual install is done, so that an +dnl archive can be built without modifying the host system's configuration. +AC_DEFUN([CF_INSTALL_PREFIX],[ +AC_MSG_CHECKING(for an installation directory prefix) +AC_ARG_WITH(install-prefix, + [ --with-install-prefix=DESTDIR use DESTDIR as installation directory prefix], + [case "x$withval" in + (xyes|xno) + ;; + (*) DESTDIR="$withval" + ;; + esac]) +AC_MSG_RESULT([${DESTDIR:-(none)}]) +AC_SUBST(DESTDIR) + +AC_MSG_CHECKING(if installation directory prefix should be merged) +CF_ARG_ENABLE(install-prefix, + [ --enable-install-prefix merge DESTDIR with installation prefix], + cf_install_prefix=yes, + cf_install_prefix=no) +AC_MSG_RESULT($cf_install_prefix) + +if test "$cf_install_prefix" = yes ; then + MERGE_PREFIX=':$(prefix)%=%' +else + MERGE_PREFIX='' +fi + +AC_SUBST(MERGE_PREFIX) +])dnl +dnl --------------------------------------------------------------------------- dnl CF_INTEL_COMPILER version: 9 updated: 2023/02/18 17:41:25 dnl ----------------- dnl Check if the given compiler is really the Intel compiler for Linux. It @@ -2258,7 +2513,7 @@ cf_save_CFLAGS="$cf_save_CFLAGS -we147" fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_LARGEFILE version: 12 updated: 2020/03/19 20:23:48 +dnl CF_LARGEFILE version: 13 updated: 2023/12/03 19:09:59 dnl ------------ dnl Add checks for large file support. AC_DEFUN([CF_LARGEFILE],[ @@ -2292,11 +2547,15 @@ ifdef([AC_FUNC_FSEEKO],[ #pragma GCC diagnostic error "-Wincompatible-pointer-types" #include #include + +#ifndef __REDIRECT +/* if transitional largefile support is setup, this is true */ +extern struct dirent64 * readdir(DIR *); +#endif ],[ - /* if transitional largefile support is setup, this is true */ - extern struct dirent64 * readdir(DIR *); - struct dirent64 *x = readdir((DIR *)0); - struct dirent *y = readdir((DIR *)0); + DIR *dp = opendir("."); + struct dirent64 *x = readdir(dp); + struct dirent *y = readdir(dp); int z = x - y; (void)z; ], @@ -2527,7 +2786,7 @@ AC_DEFUN([CF_LIB_TYPE], test -n "$LIB_SUFFIX" && $2="${LIB_SUFFIX}[$]{$2}" ])dnl dnl --------------------------------------------------------------------------- -dnl CF_LINK_DATAONLY version: 13 updated: 2020/02/08 15:59:30 +dnl CF_LINK_DATAONLY version: 15 updated: 2023/12/03 10:03:10 dnl ---------------- dnl Some systems have a non-ANSI linker that doesn't pull in modules that have dnl only data (i.e., no functions), for example NeXT. On those systems we'll @@ -2549,17 +2808,21 @@ EOF rm -f conftest.$ac_ext data.o cat >conftest.$ac_ext <&AC_FD_CC ])dnl dnl --------------------------------------------------------------------------- -dnl CF_NCURSES_ADDON version: 6 updated: 2021/01/04 19:33:05 +dnl CF_NCURSES_ADDON version: 7 updated: 2024/06/01 17:37:13 dnl ---------------- dnl Configure an ncurses add-on, built outside the ncurses tree. AC_DEFUN([CF_NCURSES_ADDON],[ @@ -2852,18 +3115,29 @@ AC_REQUIRE([CF_NCURSES_CONFIG]) AC_PROVIDE([CF_SUBST_NCURSES_VERSION]) -AC_MSG_CHECKING(if you want wide-character code) -AC_ARG_ENABLE(widec, - [ --enable-widec compile with wide-char/UTF-8 code], - [with_widec=$enableval], - [with_widec=no]) -AC_MSG_RESULT($with_widec) -if test "$with_widec" = yes ; then +AC_MSG_CHECKING(for specified curses library type) +AC_ARG_WITH(screen, + [ --with-screen=XXX use specified curses-libraries], + [cf_cv_screen=$withval], + [cf_cv_screen=ncurses]) + +case $cf_cv_screen in +(curses|curses_*) + CF_CURSES_CONFIG + ;; +(ncursesw*) CF_UTF8_LIB - CF_NCURSES_CONFIG(ncursesw) -else - CF_NCURSES_CONFIG(ncurses) -fi + CF_NCURSES_CONFIG($cf_cv_screen) + ;; +(ncurses*) + CF_NCURSES_CONFIG($cf_cv_screen) + ;; +(*) + AC_MSG_ERROR(unexpected screen-value: $cf_cv_screen) + ;; +esac + +AC_SUBST(cf_cv_screen) if test "$NCURSES_CONFIG_PKG" != none ; then cf_version=`$PKG_CONFIG --modversion $NCURSES_CONFIG_PKG 2>/dev/null` @@ -2927,11 +3201,14 @@ dnl We need these values in the generated makefiles AC_SUBST(cf_cv_rel_version) AC_SUBST(cf_cv_abi_version) -dnl FIXME - not needed for Ada95 -AC_SUBST(cf_cv_builtin_bool) -AC_SUBST(cf_cv_header_stdbool_h) -AC_SUBST(cf_cv_type_of_bool)dnl - +AC_CACHE_CHECK(if KEY_RESIZE is supported,cf_cv_curses_resizes,[ + AC_TRY_COMPILE([#include <${cf_cv_ncurses_header:-curses.h}>], + [int key = KEY_RESIZE; (void)key], + cf_cv_curses_resizes=yes, + cf_cv_curses_resizes=no)]) +cf_cv_enable_sigwinch=0 +test "$cf_cv_curses_resizes" = yes && cf_cv_enable_sigwinch=1 +AC_SUBST(cf_cv_enable_sigwinch) ]) dnl --------------------------------------------------------------------------- dnl CF_NCURSES_CC_CHECK version: 6 updated: 2023/02/18 17:47:58 @@ -2967,7 +3244,7 @@ printf("old\\n"); ,[$1=no]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_NCURSES_CONFIG version: 28 updated: 2021/08/28 15:20:37 +dnl CF_NCURSES_CONFIG version: 29 updated: 2025/01/10 19:55:54 dnl ----------------- dnl Tie together the configure-script macros for ncurses, preferring these in dnl order: @@ -3028,6 +3305,7 @@ if test "x${PKG_CONFIG:=none}" != xnone; then ;; esac + CF_REQUIRE_PKG($cf_ncuconfig_root) CF_APPEND_CFLAGS($cf_pkg_cflags) CF_ADD_LIBS($cf_pkg_libs) @@ -3282,7 +3560,7 @@ CF_UPPER(cf_nculib_ROOT,HAVE_LIB$cf_nculib_root) AC_DEFINE_UNQUOTED($cf_nculib_ROOT) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_NCURSES_VERSION version: 17 updated: 2023/01/05 18:54:02 +dnl CF_NCURSES_VERSION version: 18 updated: 2024/01/07 06:34:16 dnl ------------------ dnl Check for the version of ncurses, to aid in reporting bugs, etc. dnl Call CF_CURSES_CPPFLAGS first, or CF_NCURSES_CPPFLAGS. We don't use @@ -3312,7 +3590,7 @@ int main(void) # ifdef __NCURSES_H fprintf(fp, "old\\n"); # else - make an error + #error expected ncurses header to define __NCURSES_H # endif #endif ${cf_cv_main_return:-return}(0); @@ -3382,35 +3660,35 @@ ifelse([$1],,,[$1=$PATH_SEPARATOR]) AC_MSG_RESULT($PATH_SEPARATOR) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_PATH_SYNTAX version: 18 updated: 2020/12/31 18:40:20 +dnl CF_PATH_SYNTAX version: 19 updated: 2024/08/03 13:08:58 dnl -------------- dnl Check the argument to see that it looks like a pathname. Rewrite it if it dnl begins with one of the prefix/exec_prefix variables, and then again if the dnl result begins with 'NONE'. This is necessary to work around autoconf's dnl delayed evaluation of those symbols. AC_DEFUN([CF_PATH_SYNTAX],[ +AC_REQUIRE([CF_GLOB_FULLPATH])dnl + if test "x$prefix" != xNONE; then cf_path_syntax="$prefix" else cf_path_syntax="$ac_default_prefix" fi -case ".[$]$1" in -(.\[$]\(*\)*|.\'*\'*) - ;; -(..|./*|.\\*) +case "x[$]$1" in +(x\[$]\(*\)*|x\'*\'*) ;; -(.[[a-zA-Z]]:[[\\/]]*) # OS/2 EMX +(x.|x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER) ;; -(.\[$]\{*prefix\}*|.\[$]\{*dir\}*) +(x\[$]\{*prefix\}*|x\[$]\{*dir\}*) eval $1="[$]$1" - case ".[$]$1" in - (.NONE/*) + case "x[$]$1" in + (xNONE/*) $1=`echo "[$]$1" | sed -e s%NONE%$cf_path_syntax%` ;; esac ;; -(.no|.NONE/*) +(xno|xNONE/*) $1=`echo "[$]$1" | sed -e s%NONE%$cf_path_syntax%` ;; (*) @@ -3419,7 +3697,7 @@ case ".[$]$1" in esac ])dnl dnl --------------------------------------------------------------------------- -dnl CF_PKG_CONFIG version: 12 updated: 2021/10/10 20:18:09 +dnl CF_PKG_CONFIG version: 13 updated: 2023/10/28 11:59:01 dnl ------------- dnl Check for the package-config program, unless disabled by command-line. dnl @@ -3428,7 +3706,7 @@ AC_DEFUN([CF_PKG_CONFIG], [ AC_MSG_CHECKING(if you want to use pkg-config) AC_ARG_WITH(pkg-config, - [ --with-pkg-config{=path} enable/disable use of pkg-config], + [[ --with-pkg-config[=CMD] enable/disable use of pkg-config and its name CMD]], [cf_pkg_config=$withval], [cf_pkg_config=yes]) AC_MSG_RESULT($cf_pkg_config) @@ -3782,15 +4060,16 @@ AC_SUBST(cf_ada_config_Ada) AC_SUBST(cf_ada_config_C) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_PROG_INSTALL version: 10 updated: 2021/01/04 19:33:05 +dnl CF_PROG_INSTALL version: 11 updated: 2024/08/03 13:08:58 dnl --------------- dnl Force $INSTALL to be an absolute-path. Otherwise, edit_man.sh and the dnl misc/tabset install won't work properly. Usually this happens only when dnl using the fallback mkinstalldirs script AC_DEFUN([CF_PROG_INSTALL], [AC_PROG_INSTALL -case $INSTALL in -(/*) +AC_REQUIRE([CF_GLOB_FULLPATH])dnl +case x$INSTALL in +(x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER) ;; (*) CF_DIRNAME(cf_dir,$INSTALL) @@ -3870,6 +4149,30 @@ define([CF_REMOVE_LIB], $1=`echo "$2" | sed -e 's/-l$3[[ ]]//g' -e 's/-l$3[$]//'` ])dnl dnl --------------------------------------------------------------------------- +dnl CF_REQUIRE_PKG version: 1 updated: 2025/01/10 19:55:54 +dnl -------------- +dnl Update $REQUIRE_PKG, which lists the known required packages for this +dnl program. +dnl +dnl $1 = package(s) to require, e.g., in the generated ".pc" file +define([CF_REQUIRE_PKG], +[ +for cf_required in $1 +do + # check for duplicates + for cf_require_pkg in $REQUIRE_PKG + do + if test "$cf_required" = "$cf_require_pkg" + then + cf_required= + break + fi + done + test -n "$cf_required" && REQUIRE_PKG="$REQUIRE_PKG $cf_required" +done +AC_SUBST(REQUIRE_PKG) +])dnl +dnl --------------------------------------------------------------------------- dnl CF_RESTORE_XTRA_FLAGS version: 1 updated: 2020/01/11 16:47:45 dnl --------------------- dnl Restore flags saved in CF_SAVE_XTRA_FLAGS @@ -3906,7 +4209,7 @@ do done ])dnl dnl --------------------------------------------------------------------------- -dnl CF_SHARED_OPTS version: 107 updated: 2021/09/04 06:47:34 +dnl CF_SHARED_OPTS version: 112 updated: 2024/12/14 16:09:34 dnl -------------- dnl -------------- dnl Attempt to determine the appropriate CC/LD options for creating a shared @@ -3952,9 +4255,9 @@ AC_DEFUN([CF_SHARED_OPTS], cf_ld_rpath_opt= test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT" - AC_MSG_CHECKING(if release/abi version should be used for shared libs) + AC_MSG_CHECKING(whether to use release or ABI version in shared library file names) AC_ARG_WITH(shlib-version, - [ --with-shlib-version=X Specify rel or abi version for shared libs], + [[ --with-shlib-version[={rel|abi}] use release or ABI version in shared library file names]], [test -z "$withval" && withval=auto case "$withval" in (yes) @@ -3996,7 +4299,7 @@ AC_DEFUN([CF_SHARED_OPTS], for CC_SHARED_OPTS in -fPIC -fpic '' do CFLAGS="$cf_save_CFLAGS $CC_SHARED_OPTS" - AC_TRY_COMPILE([#include ],[int x = 1],[break],[]) + AC_TRY_COMPILE([#include ],[int x = 1; (void)x],[break],[]) done AC_MSG_RESULT($CC_SHARED_OPTS) CFLAGS="$cf_save_CFLAGS" @@ -4366,11 +4669,11 @@ CF_EOF # tested with SunOS 5.5.1 (solaris 2.5.1) and gcc 2.7.2 # tested with SunOS 5.10 (solaris 10) and gcc 3.4.3 if test "$DFT_LWR_MODEL" = "shared" ; then - LOCAL_LDFLAGS="-R \$(LOCAL_LIBDIR):\${libdir}" + LOCAL_LDFLAGS="-R\$(LOCAL_LIBDIR):\${libdir}" LOCAL_LDFLAGS2="$LOCAL_LDFLAGS" fi if test "$cf_cv_enable_rpath" = yes ; then - EXTRA_LDFLAGS="-R \${libdir} $EXTRA_LDFLAGS" + EXTRA_LDFLAGS="-R\${libdir} $EXTRA_LDFLAGS" fi CF_SHARED_SONAME if test "$GCC" != yes; then @@ -4382,9 +4685,9 @@ CF_EOF done CFLAGS="$cf_save_CFLAGS" CC_SHARED_OPTS=$cf_shared_opts - MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -dy -G -h '$cf_cv_shared_soname' -o $[@]' + MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -dy -G -Wl,-h,'$cf_cv_shared_soname' -o $[@]' else - MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -shared -dy -G -h '$cf_cv_shared_soname' -o $[@]' + MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -shared -dy -G -Wl,-h,'$cf_cv_shared_soname' -o $[@]' fi ;; (sysv5uw7*|unix_sv*) @@ -4422,7 +4725,7 @@ cat > conftest.$ac_ext </dev/null` + case "x$cf_file_gnatgcc" in + (*script*) + cf_cv_path_gnatgcc=`sh -x "$cf_cv_path_gnatgcc" --version 2>&1 | grep -w exec | sed -e 's/^[[ ]]*+[[ ]]*//' -e 's/exec[[ ]]//' -e 's/ .*//'` + ;; + (*) + cf_cv_path_gnatgcc=no + ;; + esac + AC_MSG_RESULT($cf_cv_path_gnatgcc) + test "$cf_cv_path_gnatgcc" = no && cf_cv_path_gnatgcc=gnatgcc + cf_prog_cc="$cf_cv_path_gnatgcc $cf_prog_cc" + fi + fi +fi +case "$cf_prog_cc" in +(*/*) + CC="$cf_prog_cc" + AC_SUBST(CC) + ;; +(*) + CF_PROG_CC($cf_prog_cc) + ;; +esac +])dnl +dnl --------------------------------------------------------------------------- +dnl CF_WITH_ADA_COMPILER version: 3 updated: 2023/10/28 11:59:01 dnl -------------------- dnl Command-line option to specify the Ada95 compiler. AC_DEFUN([CF_WITH_ADA_COMPILER],[ -AC_MSG_CHECKING(for ada-compiler) +AC_MSG_CHECKING(for Ada95 compiler) AC_ARG_WITH(ada-compiler, - [ --with-ada-compiler=CMD specify Ada95 compiler command (default gnatmake)], + [[ --with-ada-compiler[=CMD] use CMD as Ada95 compiler (default: gnatmake)]], [cf_ada_compiler=$withval], [cf_ada_compiler=gnatmake]) AC_SUBST(cf_ada_compiler) AC_MSG_RESULT($cf_ada_compiler) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_WITH_ADA_INCLUDE version: 2 updated: 2010/06/26 17:35:58 +dnl CF_WITH_ADA_INCLUDE version: 3 updated: 2023/10/28 11:59:01 dnl ------------------- dnl Command-line option to specify where Ada includes will install. AC_DEFUN([CF_WITH_ADA_INCLUDE],[ -AC_MSG_CHECKING(for ada-include) +AC_MSG_CHECKING(for Ada95 include directory) CF_WITH_PATH(ada-include, - [ --with-ada-include=DIR Ada includes are in DIR], + [ --with-ada-include=DIR find Ada95 includes in DIR], ADA_INCLUDE, PREFIX/share/ada/adainclude, [$]prefix/share/ada/adainclude) @@ -4697,16 +5050,16 @@ AC_SUBST(ADA_INCLUDE) AC_MSG_RESULT($ADA_INCLUDE) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_WITH_ADA_LIBNAME version: 1 updated: 2019/09/07 18:59:41 +dnl CF_WITH_ADA_LIBNAME version: 3 updated: 2023/11/22 20:48:30 dnl ------------------- dnl CF_WITH_ADA_LIBNAME dnl ------------------- dnl Command-line option to specify how to name the resulting Ada library. dnl $1 = default value AC_DEFUN([CF_WITH_ADA_LIBNAME],[ -AC_MSG_CHECKING(for ada-libname) +AC_MSG_CHECKING(for Ada95 curses library name) AC_ARG_WITH(ada-libname, - [ --with-ada-libname=XXX override default Ada library-name], + [[ --with-ada-libname[=XXX] use XXX as Ada95 library name]], ADA_LIBNAME=[$]withval, ADA_LIBNAME=$1) case "x$ADA_LIBNAME" in @@ -4718,13 +5071,13 @@ AC_SUBST(ADA_LIBNAME) AC_MSG_RESULT($ADA_LIBNAME) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_WITH_ADA_OBJECTS version: 2 updated: 2010/06/26 17:35:58 +dnl CF_WITH_ADA_OBJECTS version: 3 updated: 2023/10/28 11:59:01 dnl ------------------- dnl Command-line option to specify where Ada objects will install. AC_DEFUN([CF_WITH_ADA_OBJECTS],[ -AC_MSG_CHECKING(for ada-objects) +AC_MSG_CHECKING(for Ada95 object directory) CF_WITH_PATH(ada-objects, - [ --with-ada-objects=DIR Ada objects are in DIR], + [ --with-ada-objects=DIR find Ada95 objects in DIR], ADA_OBJECTS, PREFIX/lib/ada/adalib, [$]prefix/lib/ada/adalib) @@ -4732,28 +5085,34 @@ AC_SUBST(ADA_OBJECTS) AC_MSG_RESULT($ADA_OBJECTS) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_WITH_ADA_SHAREDLIB version: 5 updated: 2018/07/21 19:10:35 +dnl CF_WITH_ADA_SHAREDLIB version: 6 updated: 2023/10/28 11:59:01 dnl --------------------- -dnl Command-line option to specify if an Ada95 shared-library should be built, +dnl Command-line option to specify if an Ada95 shared library should be built, dnl and optionally what its soname should be. AC_DEFUN([CF_WITH_ADA_SHAREDLIB],[ AC_REQUIRE([CF_GNAT_PROJECTS]) -AC_MSG_CHECKING(if an Ada95 shared-library should be built) +AC_MSG_CHECKING(whether to build an Ada95 shared library) AC_ARG_WITH(ada-sharedlib, - [ --with-ada-sharedlib=soname build shared-library (requires GNAT projects)], + [ --with-ada-sharedlib build Ada95 shared library; requires GNAT project support], [with_ada_sharedlib=$withval], [with_ada_sharedlib=no]) -AC_MSG_RESULT($with_ada_sharedlib) +cf_ada_sharedlib_warn=no if test "x$with_ada_sharedlib" != xno then if test "x$cf_gnat_projects" != xyes then - AC_MSG_WARN(disabling shared-library since GNAT projects are not supported) with_ada_sharedlib=no + cf_ada_sharedlib_warn=yes fi fi +AC_MSG_RESULT($with_ada_sharedlib) +if test "x$cf_ada_sharedlib_warn" != xno +then + AC_MSG_WARN(disabling Ada95 shared library since GNAT projects are not supported) +fi + ADA_SHAREDLIB='lib$(LIB_NAME).so.1' MAKE_ADA_SHAREDLIB="#" @@ -4841,7 +5200,7 @@ eval $3="$withval" AC_SUBST($3)dnl ])dnl dnl --------------------------------------------------------------------------- -dnl CF_WITH_PKG_CONFIG_LIBDIR version: 21 updated: 2023/01/22 13:37:42 +dnl CF_WITH_PKG_CONFIG_LIBDIR version: 25 updated: 2024/08/03 13:34:29 dnl ------------------------- dnl Allow the choice of the pkg-config library directory to be overridden. dnl @@ -4855,6 +5214,7 @@ dnl pkgconf (used with some systems such as FreeBSD in place of pkg-config) dnl optionally ignores $PKG_CONFIG_LIBDIR. Very old versions of pkg-config, dnl e.g., Solaris 10 also do not recognize $PKG_CONFIG_LIBDIR. AC_DEFUN([CF_WITH_PKG_CONFIG_LIBDIR],[ +AC_REQUIRE([CF_GLOB_FULLPATH])dnl case "$PKG_CONFIG" in (no|none|yes) @@ -4876,7 +5236,7 @@ fi # if the option is used, let that override. otherwise default to "libdir" AC_ARG_WITH(pkg-config-libdir, - [ --with-pkg-config-libdir=XXX use given directory for installing pc-files], + [[ --with-pkg-config-libdir[=XXX] use given directory for installing pc-files]], [cf_search_path=$withval], [test "x$PKG_CONFIG" != xnone && test -z "$cf_search_path" && cf_search_path=libdir]) @@ -4888,10 +5248,10 @@ case "x$cf_search_path" in ;; (x) ;; -(x/*\ *) +(x$GLOB_FULLPATH_POSIX\ *|x$GLOB_FULLPATH_OTHER\ *) PKG_CONFIG_LIBDIR= ;; -(x/*) +(x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER) PKG_CONFIG_LIBDIR="$cf_search_path" AC_MSG_RESULT($PKG_CONFIG_LIBDIR) cf_search_path= @@ -4910,7 +5270,15 @@ case "x$cf_search_path" in pkg-config \ pkgconf do - cf_search_path=`"$PKG_CONFIG" --variable=pc_path "$cf_pkg_program" 2>/dev/null | tr : ' '` + cf_raw_search_path=`"$PKG_CONFIG" --variable=pc_path "$cf_pkg_program" 2>/dev/null` + case "$cf_raw_search_path" in + (*\\*) + cf_search_path=`echo "$cf_raw_search_path" | tr ';' ' ' | tr '\' '/'` + ;; + (*/*) + cf_search_path=`echo "$cf_raw_search_path" | tr : ' '` + ;; + esac test -n "$cf_search_path" && break done @@ -5045,7 +5413,7 @@ AC_ARG_WITH(system-type, ]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_XOPEN_SOURCE version: 64 updated: 2023/02/18 17:41:25 +dnl CF_XOPEN_SOURCE version: 68 updated: 2024/11/09 18:07:29 dnl --------------- dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions, dnl or adapt to the vendor's definitions to get equivalent functionality, @@ -5054,6 +5422,18 @@ dnl dnl Parameters: dnl $1 is the nominal value for _XOPEN_SOURCE dnl $2 is the nominal value for _POSIX_C_SOURCE +dnl +dnl The default case prefers _XOPEN_SOURCE over _POSIX_C_SOURCE if the +dnl implementation predefines it, because X/Open and most implementations agree +dnl that the latter is a legacy or "aligned" value. +dnl +dnl Because _XOPEN_SOURCE is preferred, if defining _POSIX_C_SOURCE turns +dnl that off, then refrain from setting _POSIX_C_SOURCE explicitly. +dnl +dnl References: +dnl https://pubs.opengroup.org/onlinepubs/007904975/functions/xsh_chap02_02.html +dnl https://docs.oracle.com/cd/E19253-01/816-5175/standards-5/index.html +dnl https://www.gnu.org/software/libc/manual/html_node/Feature-Test-Macros.html AC_DEFUN([CF_XOPEN_SOURCE],[ AC_REQUIRE([AC_CANONICAL_HOST]) AC_REQUIRE([CF_POSIX_VISIBLE]) @@ -5093,9 +5473,12 @@ case "$host_os" in cf_xopen_source="-D_SGI_SOURCE" cf_XOPEN_SOURCE= ;; -(linux*gnu|linux*gnuabi64|linux*gnuabin32|linux*gnueabi|linux*gnueabihf|linux*gnux32|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys) +(linux*gnu|linux*gnuabi64|linux*gnuabin32|linux*gnueabi|linux*gnueabihf|linux*gnux32|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys|mingw*|linux*uclibc) CF_GNU_SOURCE($cf_XOPEN_SOURCE) ;; +linux*musl) + cf_xopen_source="-D_BSD_SOURCE" + ;; (minix*) cf_xopen_source="-D_NETBSD_SOURCE" # POSIX.1-2001 features are ifdef'd with this... ;; @@ -5145,8 +5528,8 @@ case "$host_os" in cf_save_xopen_cppflags="$CPPFLAGS" CF_POSIX_C_SOURCE($cf_POSIX_C_SOURCE) # Some of these niche implementations use copy/paste, double-check... - if test "$cf_cv_xopen_source" != no ; then - CF_VERBOSE(checking if _POSIX_C_SOURCE inteferes) + if test "$cf_cv_xopen_source" = no ; then + CF_VERBOSE(checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE) AC_TRY_COMPILE(CF__XOPEN_SOURCE_HEAD,CF__XOPEN_SOURCE_BODY,,[ AC_MSG_WARN(_POSIX_C_SOURCE definition is not usable) CPPFLAGS="$cf_save_xopen_cppflags"]) diff --git a/Ada95/configure b/Ada95/configure index 64aefa5e..b7e8e5f6 100755 --- a/Ada95/configure +++ b/Ada95/configure @@ -1,7 +1,7 @@ #! /bin/sh -# From configure.in Revision: 1.91 . +# From configure.in Revision: 1.94 . # Guess values for system-dependent variables and create Makefiles. -# Generated by Autoconf 2.52.20230114. +# Generated by Autoconf 2.52.20240618. # # Copyright 2003-2022,2023 Thomas E. Dickey # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 @@ -481,6 +481,10 @@ do | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) x_libraries=$ac_optarg ;; + -*dir | -dvi* | -doc* | -html* | -local* | -pdf* | -ps* ) + echo "$as_me: WARNING: unsupported option: $ac_option" >&2 + ;; + -*) { echo "$as_me: error: unrecognized option: $ac_option Try \`$0 --help' for more information." >&2 { (exit 1); exit 1; }; } @@ -703,12 +707,15 @@ Optional Features: General Options: --with-system-type=XXX test: override derived host system-type + --without-ada suppress check for Ada compiler --disable-stripping do not strip (debug info) installed executables - --with-pkg-config{=path} enable/disable use of pkg-config - --with-pkg-config-libdir=XXX use given directory for installing pc-files + --with-strip-program=XX specify program to use when stripping in install + --with-pkg-config[=CMD] enable/disable use of pkg-config and its name CMD + --with-pkg-config-libdir[=XXX] use given directory for installing pc-files --without-tests suppress build with test-programs --enable-mixed-case tic should assume mixed-case filenames - --with-install-prefix prefixes actual install-location ($DESTDIR) + --with-install-prefix=DESTDIR use DESTDIR as installation directory prefix + --enable-install-prefix merge DESTDIR with installation prefix Build-Tools Needed to Compile Temporary Applications for Cross-compiling: --with-build-cc=XXX the build C compiler ($BUILD_CC) --with-build-cpp=XXX the build C preprocessor ($BUILD_CPP) @@ -719,9 +726,9 @@ Build-Tools Needed to Compile Temporary Applications for Cross-compiling: Options to Specify the Libraries Built/Used: --with-shared generate shared C-objects (needed for --with-ada-sharedlib) --with-curses-dir=DIR directory in which (n)curses is installed - --enable-widec compile with wide-char/UTF-8 code + --with-screen=XXX use specified curses-libraries --with-lib-prefix override library-prefix - --with-shlib-version=X Specify rel or abi version for shared libs + --with-shlib-version[={rel|abi}] use release or ABI version in shared library file names --enable-rpath-link link sample programs with rpath option Fine-Tuning Your Configuration: --enable-broken_linker compile with broken-linker support code @@ -747,11 +754,11 @@ Testing/development Options: --with-trace test: add trace() function to all models of ncurses --disable-gnat-projects test: disable GNAT projects even if usable Ada95 Binding Options: - --with-ada-compiler=CMD specify Ada95 compiler command (default gnatmake) - --with-ada-include=DIR Ada includes are in DIR (default: PREFIX/share/ada/adainclude) - --with-ada-objects=DIR Ada objects are in DIR (default: PREFIX/lib/ada/adalib) - --with-ada-sharedlib=soname build shared-library (requires GNAT projects) - --with-ada-libname=XXX override default Ada library-name + --with-ada-compiler[=CMD] use CMD as Ada95 compiler (default: gnatmake) + --with-ada-include=DIR find Ada95 includes in DIR (default: PREFIX/share/ada/adainclude) + --with-ada-objects=DIR find Ada95 objects in DIR (default: PREFIX/lib/ada/adalib) + --with-ada-sharedlib build Ada95 shared library; requires GNAT project support + --with-ada-libname[=XXX] use XXX as Ada95 library name Some influential environment variables: CC C compiler command @@ -822,7 +829,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was -generated by GNU Autoconf 2.52.20230114. Invocation command line was +generated by GNU Autoconf 2.52.20240618. Invocation command line was $ $0 $@ @@ -946,7 +953,7 @@ if test -z "$CONFIG_SITE"; then fi for ac_site_file in $CONFIG_SITE; do if test -r "$ac_site_file"; then - { echo "$as_me:949: loading site script $ac_site_file" >&5 + { echo "$as_me:956: loading site script $ac_site_file" >&5 echo "$as_me: loading site script $ac_site_file" >&6;} cat "$ac_site_file" >&5 . "$ac_site_file" @@ -957,7 +964,7 @@ if test -r "$cache_file"; then # Some versions of bash will fail to source /dev/null (special # files actually), so we avoid doing that. if test -f "$cache_file"; then - { echo "$as_me:960: loading cache $cache_file" >&5 + { echo "$as_me:967: loading cache $cache_file" >&5 echo "$as_me: loading cache $cache_file" >&6;} case $cache_file in [\\/]* | ?:[\\/]* ) . $cache_file;; @@ -965,7 +972,7 @@ echo "$as_me: loading cache $cache_file" >&6;} esac fi else - { echo "$as_me:968: creating cache $cache_file" >&5 + { echo "$as_me:975: creating cache $cache_file" >&5 echo "$as_me: creating cache $cache_file" >&6;} >$cache_file fi @@ -981,21 +988,21 @@ for ac_var in `(set) 2>&1 | eval ac_new_val="\$ac_env_${ac_var}_value" case "$ac_old_set,$ac_new_set" in set,) - { echo "$as_me:984: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 + { echo "$as_me:991: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} ac_cache_corrupted=: ;; ,set) - { echo "$as_me:988: error: \`$ac_var' was not set in the previous run" >&5 + { echo "$as_me:995: error: \`$ac_var' was not set in the previous run" >&5 echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_cache_corrupted=: ;; ,);; *) if test "x$ac_old_val" != "x$ac_new_val"; then - { echo "$as_me:994: error: \`$ac_var' has changed since the previous run:" >&5 + { echo "$as_me:1001: error: \`$ac_var' has changed since the previous run:" >&5 echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} - { echo "$as_me:996: former value: $ac_old_val" >&5 + { echo "$as_me:1003: former value: $ac_old_val" >&5 echo "$as_me: former value: $ac_old_val" >&2;} - { echo "$as_me:998: current value: $ac_new_val" >&5 + { echo "$as_me:1005: current value: $ac_new_val" >&5 echo "$as_me: current value: $ac_new_val" >&2;} ac_cache_corrupted=: fi;; @@ -1014,9 +1021,9 @@ echo "$as_me: current value: $ac_new_val" >&2;} fi done if "$ac_cache_corrupted"; then - { echo "$as_me:1017: error: changes in the environment can compromise the build" >&5 + { echo "$as_me:1024: error: changes in the environment can compromise the build" >&5 echo "$as_me: error: changes in the environment can compromise the build" >&2;} - { { echo "$as_me:1019: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 + { { echo "$as_me:1026: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} { (exit 1); exit 1; }; } fi @@ -1045,10 +1052,10 @@ esac echo "#! $SHELL" >conftest.sh echo "exit 0" >>conftest.sh chmod +x conftest.sh -if { (echo "$as_me:1048: PATH=\".;.\"; conftest.sh") >&5 +if { (echo "$as_me:1055: PATH=\".;.\"; conftest.sh") >&5 (PATH=".;."; conftest.sh) 2>&5 ac_status=$? - echo "$as_me:1051: \$? = $ac_status" >&5 + echo "$as_me:1058: \$? = $ac_status" >&5 (exit "$ac_status"); }; then ac_path_separator=';' else @@ -1080,7 +1087,7 @@ for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do fi done if test -z "$ac_aux_dir"; then - { { echo "$as_me:1083: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 + { { echo "$as_me:1090: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;} { (exit 1); exit 1; }; } fi @@ -1090,11 +1097,11 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. # Make sure we can run config.sub. $ac_config_sub sun4 >/dev/null 2>&1 || - { { echo "$as_me:1093: error: cannot run $ac_config_sub" >&5 + { { echo "$as_me:1100: error: cannot run $ac_config_sub" >&5 echo "$as_me: error: cannot run $ac_config_sub" >&2;} { (exit 1); exit 1; }; } -echo "$as_me:1097: checking build system type" >&5 +echo "$as_me:1104: checking build system type" >&5 echo $ECHO_N "checking build system type... $ECHO_C" >&6 if test "${ac_cv_build+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1103,23 +1110,23 @@ else test -z "$ac_cv_build_alias" && ac_cv_build_alias=`$ac_config_guess` test -z "$ac_cv_build_alias" && - { { echo "$as_me:1106: error: cannot guess build type; you must specify one" >&5 + { { echo "$as_me:1113: error: cannot guess build type; you must specify one" >&5 echo "$as_me: error: cannot guess build type; you must specify one" >&2;} { (exit 1); exit 1; }; } ac_cv_build=`$ac_config_sub "$ac_cv_build_alias"` || - { { echo "$as_me:1110: error: $ac_config_sub $ac_cv_build_alias failed." >&5 + { { echo "$as_me:1117: error: $ac_config_sub $ac_cv_build_alias failed." >&5 echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:1115: result: $ac_cv_build" >&5 +echo "$as_me:1122: result: $ac_cv_build" >&5 echo "${ECHO_T}$ac_cv_build" >&6 build=$ac_cv_build build_cpu=`echo "$ac_cv_build" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` build_vendor=`echo "$ac_cv_build" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` build_os=`echo "$ac_cv_build" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -echo "$as_me:1122: checking host system type" >&5 +echo "$as_me:1129: checking host system type" >&5 echo $ECHO_N "checking host system type... $ECHO_C" >&6 if test "${ac_cv_host+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1128,12 +1135,12 @@ else test -z "$ac_cv_host_alias" && ac_cv_host_alias=$ac_cv_build_alias ac_cv_host=`$ac_config_sub "$ac_cv_host_alias"` || - { { echo "$as_me:1131: error: $ac_config_sub $ac_cv_host_alias failed" >&5 + { { echo "$as_me:1138: error: $ac_config_sub $ac_cv_host_alias failed" >&5 echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:1136: result: $ac_cv_host" >&5 +echo "$as_me:1143: result: $ac_cv_host" >&5 echo "${ECHO_T}$ac_cv_host" >&6 host=$ac_cv_host host_cpu=`echo "$ac_cv_host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` @@ -1141,7 +1148,7 @@ host_vendor=`echo "$ac_cv_host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` host_os=`echo "$ac_cv_host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` if test -f "$srcdir/config.guess" || test -f "$ac_aux_dir/config.guess" ; then - echo "$as_me:1144: checking target system type" >&5 + echo "$as_me:1151: checking target system type" >&5 echo $ECHO_N "checking target system type... $ECHO_C" >&6 if test "${ac_cv_target+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1150,12 +1157,12 @@ else test "x$ac_cv_target_alias" = "x" && ac_cv_target_alias=$ac_cv_host_alias ac_cv_target=`$ac_config_sub "$ac_cv_target_alias"` || - { { echo "$as_me:1153: error: $ac_config_sub $ac_cv_target_alias failed" >&5 + { { echo "$as_me:1160: error: $ac_config_sub $ac_cv_target_alias failed" >&5 echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:1158: result: $ac_cv_target" >&5 +echo "$as_me:1165: result: $ac_cv_target" >&5 echo "${ECHO_T}$ac_cv_target" >&6 target=$ac_cv_target target_cpu=`echo "$ac_cv_target" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` @@ -1187,13 +1194,13 @@ else fi test -z "$system_name" && system_name="$cf_cv_system_name" -test -n "$cf_cv_system_name" && echo "$as_me:1190: result: Configuring for $cf_cv_system_name" >&5 +test -n "$cf_cv_system_name" && echo "$as_me:1197: result: Configuring for $cf_cv_system_name" >&5 echo "${ECHO_T}Configuring for $cf_cv_system_name" >&6 if test ".$system_name" != ".$cf_cv_system_name" ; then - echo "$as_me:1194: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5 + echo "$as_me:1201: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5 echo "${ECHO_T}Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&6 - { { echo "$as_me:1196: error: \"Please remove config.cache and try again.\"" >&5 + { { echo "$as_me:1203: error: \"Please remove config.cache and try again.\"" >&5 echo "$as_me: error: \"Please remove config.cache and try again.\"" >&2;} { (exit 1); exit 1; }; } fi @@ -1201,7 +1208,7 @@ fi # Check whether --with-system-type or --without-system-type was given. if test "${with_system_type+set}" = set; then withval="$with_system_type" - { echo "$as_me:1204: WARNING: overriding system type to $withval" >&5 + { echo "$as_me:1211: WARNING: overriding system type to $withval" >&5 echo "$as_me: WARNING: overriding system type to $withval" >&2;} cf_cv_system_name=$withval host_os=$withval @@ -1216,7 +1223,7 @@ for ac_prog in ggrep grep do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:1219: checking for $ac_word" >&5 +echo "$as_me:1226: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_GREP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1231,7 +1238,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_GREP="$ac_prog" -echo "$as_me:1234: found $ac_dir/$ac_word" >&5 +echo "$as_me:1241: found $ac_dir/$ac_word" >&5 break done @@ -1239,10 +1246,10 @@ fi fi GREP=$ac_cv_prog_GREP if test -n "$GREP"; then - echo "$as_me:1242: result: $GREP" >&5 + echo "$as_me:1249: result: $GREP" >&5 echo "${ECHO_T}$GREP" >&6 else - echo "$as_me:1245: result: no" >&5 + echo "$as_me:1252: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1250,7 +1257,7 @@ fi done test -n "$GREP" || GREP=": " -echo "$as_me:1253: checking for fgrep" >&5 +echo "$as_me:1260: checking for fgrep" >&5 echo $ECHO_N "checking for fgrep... $ECHO_C" >&6 if test "${ac_cv_path_FGREP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1262,7 +1269,7 @@ else do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:1265: checking for $ac_word" >&5 +echo "$as_me:1272: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_FGREP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1279,7 +1286,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_FGREP="$ac_dir/$ac_word" - echo "$as_me:1282: found $ac_dir/$ac_word" >&5 + echo "$as_me:1289: found $ac_dir/$ac_word" >&5 break fi done @@ -1290,10 +1297,10 @@ fi FGREP=$ac_cv_path_FGREP if test -n "$FGREP"; then - echo "$as_me:1293: result: $FGREP" >&5 + echo "$as_me:1300: result: $FGREP" >&5 echo "${ECHO_T}$FGREP" >&6 else - echo "$as_me:1296: result: no" >&5 + echo "$as_me:1303: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1301,16 +1308,16 @@ fi done test -n "$FGREP" || FGREP=": " - test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:1304: error: cannot find workable fgrep" >&5 + test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:1311: error: cannot find workable fgrep" >&5 echo "$as_me: error: cannot find workable fgrep" >&2;} { (exit 1); exit 1; }; } fi fi -echo "$as_me:1309: result: $ac_cv_path_FGREP" >&5 +echo "$as_me:1316: result: $ac_cv_path_FGREP" >&5 echo "${ECHO_T}$ac_cv_path_FGREP" >&6 FGREP="$ac_cv_path_FGREP" -echo "$as_me:1313: checking for prefix" >&5 +echo "$as_me:1320: checking for prefix" >&5 echo $ECHO_N "checking for prefix... $ECHO_C" >&6 if test "x$prefix" = "xNONE" ; then case "$cf_cv_system_name" in @@ -1322,11 +1329,11 @@ if test "x$prefix" = "xNONE" ; then ;; esac fi -echo "$as_me:1325: result: $prefix" >&5 +echo "$as_me:1332: result: $prefix" >&5 echo "${ECHO_T}$prefix" >&6 if test "x$prefix" = "xNONE" ; then -echo "$as_me:1329: checking for default include-directory" >&5 +echo "$as_me:1336: checking for default include-directory" >&5 echo $ECHO_N "checking for default include-directory... $ECHO_C" >&6 test -n "$verbose" && echo 1>&6 for cf_symbol in \ @@ -1349,12 +1356,322 @@ do fi test -n "$verbose" && echo " tested $cf_dir" 1>&6 done -echo "$as_me:1352: result: $includedir" >&5 +echo "$as_me:1359: result: $includedir" >&5 echo "${ECHO_T}$includedir" >&6 fi ### Checks for programs. +# Check whether --with-ada or --without-ada was given. +if test "${with_ada+set}" = set; then + withval="$with_ada" + cf_with_ada=$withval +else + cf_with_ada=yes +fi; + +cf_prog_cc="gcc cc" +if test "x$cf_with_ada" = xyes +then + +for cf_prog_gnat in gnat gnatmake gprconfig gprbuild +do + +cf_upper_prog_gnat=`echo "${cf_prog_gnat}" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` + + unset ac_cv_path_cf_TEMP_gnat + unset cf_TEMP_gnat + # Extract the first word of "$cf_prog_gnat", so it can be a program name with args. +set dummy $cf_prog_gnat; ac_word=$2 +echo "$as_me:1386: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_cf_TEMP_gnat+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $cf_TEMP_gnat in + [\\/]* | ?:[\\/]*) + ac_cv_path_cf_TEMP_gnat="$cf_TEMP_gnat" # Let the user override the test with a path. + ;; + *) + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_cf_TEMP_gnat="$ac_dir/$ac_word" + echo "$as_me:1403: found $ac_dir/$ac_word" >&5 + break +fi +done + + test -z "$ac_cv_path_cf_TEMP_gnat" && ac_cv_path_cf_TEMP_gnat="no" + ;; +esac +fi +cf_TEMP_gnat=$ac_cv_path_cf_TEMP_gnat + +if test -n "$cf_TEMP_gnat"; then + echo "$as_me:1415: result: $cf_TEMP_gnat" >&5 +echo "${ECHO_T}$cf_TEMP_gnat" >&6 +else + echo "$as_me:1418: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + eval "cf_cv_PATH_$cf_upper_prog_gnat=$ac_cv_path_cf_TEMP_gnat" + + if test "x$cf_TEMP_gnat" != xno; then + unset cf_cv_gnat_version + unset cf_TEMP_gnat + +echo "$as_me:1428: checking for $cf_prog_gnat version" >&5 +echo $ECHO_N "checking for $cf_prog_gnat version... $ECHO_C" >&6 +if test "${cf_cv_gnat_version+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + +cf_cv_gnat_version=`$cf_prog_gnat --version 2>&1 | \ + grep '[0-9].[0-9][0-9]*' |\ + sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'` + +fi +echo "$as_me:1439: result: $cf_cv_gnat_version" >&5 +echo "${ECHO_T}$cf_cv_gnat_version" >&6 +test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no +eval cf_TEMP_gnat=$cf_cv_gnat_version; unset cf_cv_gnat_version + + fi + eval "cf_cv_VERSION_$cf_upper_prog_gnat=$cf_TEMP_gnat" + + unset cf_TEMP_gnat + unset cf_cv_gnat_version + unset ac_cv_path_cf_TEMP_gnat +done + +if test "x$cf_cv_VERSION_GNATMAKE" = "xno"; then + cf_ada_make= + cf_cv_prog_gnat_correct=no +else + cf_ada_make=gnatmake + if test "x$cf_cv_VERSION_GPRCONFIG" = "xno"; then + # gprconfig is newer than gnatmake; we can continue... + cf_ada_config="##" + else + rm -rf ./conftest* ./*~conftest* + if mkdir conftest.src + then + cf_ada_config="" + cd conftest.src + for cf_gprconfig in Ada C + do + echo "$as_me:1468: checking for gprconfig name for $cf_gprconfig" >&5 +echo $ECHO_N "checking for gprconfig name for $cf_gprconfig... $ECHO_C" >&6 + if test "$cf_gprconfig" = C + then + for cf_gprconfig_param in \ + "$cf_gprconfig,,,,GNATGCC" \ + "$cf_gprconfig,,,,GCC" \ + "$cf_gprconfig" + do + cf_gprconfig_value=`echo s| gprconfig --config=$cf_gprconfig_param 2>&5 | ${AWK:-awk} '/^\*/{print $3;}' | head -n 1` + test -n "$cf_gprconfig_value" && break + done + else + cf_gprconfig_param=$cf_gprconfig + cf_gprconfig_value=`echo s| gprconfig --config=$cf_gprconfig_param 2>&5 | ${AWK:-awk} '/^\*/{print $3;}' | head -n 1` + fi + if test -n "$cf_gprconfig_value" + then + eval "cf_ada_config_$cf_gprconfig=$cf_gprconfig_value" + echo "$as_me:1487: result: $cf_gprconfig_value" >&5 +echo "${ECHO_T}$cf_gprconfig_value" >&6 + else + echo "$as_me:1490: result: missing" >&5 +echo "${ECHO_T}missing" >&6 + cf_ada_config="#" + break + fi + done + cd .. + rm -rf ./conftest* ./*~conftest* + fi + fi + if test "x$cf_ada_config" != "x#" + then + +echo "$as_me:1503: checking for gnat version" >&5 +echo $ECHO_N "checking for gnat version... $ECHO_C" >&6 +if test "${cf_cv_gnat_version+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + +cf_cv_gnat_version=`${cf_ada_make:-gnatmake} --version 2>&1 | \ + grep '[0-9].[0-9][0-9]*' |\ + sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'` + +fi +echo "$as_me:1514: result: $cf_cv_gnat_version" >&5 +echo "${ECHO_T}$cf_cv_gnat_version" >&6 +test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no + +case "$cf_cv_gnat_version" in +(3.1[1-9]*|3.[2-9]*|[4-9].*|[1-9][0-9].[0-9]*|20[0-9][0-9]) + cf_cv_prog_gnat_correct=yes + ;; +(*) + { echo "$as_me:1523: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5 +echo "$as_me: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;} + cf_cv_prog_gnat_correct=no + ;; +esac + + # Extract the first word of "m4", so it can be a program name with args. +set dummy m4; ac_word=$2 +echo "$as_me:1531: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_M4_exists+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$M4_exists"; then + ac_cv_prog_M4_exists="$M4_exists" # Let the user override the test. +else + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue +ac_cv_prog_M4_exists="yes" +echo "$as_me:1546: found $ac_dir/$ac_word" >&5 +break +done + + test -z "$ac_cv_prog_M4_exists" && ac_cv_prog_M4_exists="no" +fi +fi +M4_exists=$ac_cv_prog_M4_exists +if test -n "$M4_exists"; then + echo "$as_me:1555: result: $M4_exists" >&5 +echo "${ECHO_T}$M4_exists" >&6 +else + echo "$as_me:1558: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + if test "$ac_cv_prog_M4_exists" = no; then + cf_cv_prog_gnat_correct=no + { echo "$as_me:1564: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5 +echo "$as_me: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&2;} + fi + if test "$cf_cv_prog_gnat_correct" = yes; then + echo "$as_me:1568: checking if GNAT works" >&5 +echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6 + +rm -rf ./conftest* ./*~conftest* +cat >>conftest.ads <>conftest.adb <&5 2>&1 ) ; then + if ( ./conftest 1>&5 2>&1 ) ; then + cf_cv_prog_gnat_correct=yes + else + cf_cv_prog_gnat_correct=no + fi +else + cf_cv_prog_gnat_correct=no +fi +rm -rf ./conftest* ./*~conftest* + + echo "$as_me:1596: result: $cf_cv_prog_gnat_correct" >&5 +echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6 + fi + else + cf_cv_prog_gnat_correct=no + fi +fi + + if test "x$cf_cv_prog_gnat_correct" = xyes; then + # gcc's developers chose to deprecate gnatgcc before making gprconfig + # work. They replaced gnatgcc in gcc 13 with a script which spits out + # a warning offering advice which could never work. + # + # Here is a workaround. + # Extract the first word of "gnatgcc", so it can be a program name with args. +set dummy gnatgcc; ac_word=$2 +echo "$as_me:1612: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_cf_cv_path_gnatgcc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $cf_cv_path_gnatgcc in + [\\/]* | ?:[\\/]*) + ac_cv_path_cf_cv_path_gnatgcc="$cf_cv_path_gnatgcc" # Let the user override the test with a path. + ;; + *) + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_cf_cv_path_gnatgcc="$ac_dir/$ac_word" + echo "$as_me:1629: found $ac_dir/$ac_word" >&5 + break +fi +done + + test -z "$ac_cv_path_cf_cv_path_gnatgcc" && ac_cv_path_cf_cv_path_gnatgcc="no" + ;; +esac +fi +cf_cv_path_gnatgcc=$ac_cv_path_cf_cv_path_gnatgcc + +if test -n "$cf_cv_path_gnatgcc"; then + echo "$as_me:1641: result: $cf_cv_path_gnatgcc" >&5 +echo "${ECHO_T}$cf_cv_path_gnatgcc" >&6 +else + echo "$as_me:1644: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + if test "$cf_cv_path_gnatgcc" != no + then + echo "$as_me:1650: checking for improvement" >&5 +echo $ECHO_N "checking for improvement... $ECHO_C" >&6 + cf_file_gnatgcc=`file -L "$cf_cv_path_gnatgcc" 2>/dev/null` + case "x$cf_file_gnatgcc" in + (*script*) + cf_cv_path_gnatgcc=`sh -x "$cf_cv_path_gnatgcc" --version 2>&1 | grep -w exec | sed -e 's/^[ ]*+[ ]*//' -e 's/exec[ ]//' -e 's/ .*//'` + ;; + (*) + cf_cv_path_gnatgcc=no + ;; + esac + echo "$as_me:1661: result: $cf_cv_path_gnatgcc" >&5 +echo "${ECHO_T}$cf_cv_path_gnatgcc" >&6 + test "$cf_cv_path_gnatgcc" = no && cf_cv_path_gnatgcc=gnatgcc + cf_prog_cc="$cf_cv_path_gnatgcc $cf_prog_cc" + fi + fi +fi +case "$cf_prog_cc" in +(*/*) + CC="$cf_prog_cc" + + ;; +(*) + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS "conftest.$ac_ext" >&5' @@ -1362,11 +1679,11 @@ ac_link='$CC -o "conftest$ac_exeext" $CFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac_ex ac_compiler_gnu=$ac_cv_c_compiler_gnu ac_main_return="return" if test -n "$ac_tool_prefix"; then - for ac_prog in gnatgcc gcc cc + for ac_prog in $cf_prog_cc do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:1369: checking for $ac_word" >&5 +echo "$as_me:1686: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1381,7 +1698,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_CC="$ac_tool_prefix$ac_prog" -echo "$as_me:1384: found $ac_dir/$ac_word" >&5 +echo "$as_me:1701: found $ac_dir/$ac_word" >&5 break done @@ -1389,10 +1706,10 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1392: result: $CC" >&5 + echo "$as_me:1709: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1395: result: no" >&5 + echo "$as_me:1712: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1401,11 +1718,11 @@ fi fi if test -z "$CC"; then ac_ct_CC=$CC - for ac_prog in gnatgcc gcc cc + for ac_prog in $cf_prog_cc do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:1408: checking for $ac_word" >&5 +echo "$as_me:1725: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1420,7 +1737,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_CC="$ac_prog" -echo "$as_me:1423: found $ac_dir/$ac_word" >&5 +echo "$as_me:1740: found $ac_dir/$ac_word" >&5 break done @@ -1428,10 +1745,10 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1431: result: $ac_ct_CC" >&5 + echo "$as_me:1748: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1434: result: no" >&5 + echo "$as_me:1751: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1441,32 +1758,32 @@ done CC=$ac_ct_CC fi -test -z "$CC" && { { echo "$as_me:1444: error: no acceptable cc found in \$PATH" >&5 +test -z "$CC" && { { echo "$as_me:1761: error: no acceptable cc found in \$PATH" >&5 echo "$as_me: error: no acceptable cc found in \$PATH" >&2;} { (exit 1); exit 1; }; } # Provide some information about the compiler. -echo "$as_me:1449:" \ +echo "$as_me:1766:" \ "checking for C compiler version" >&5 ac_compiler=`set X $ac_compile; echo "$2"` -{ (eval echo "$as_me:1452: \"$ac_compiler --version &5\"") >&5 +{ (eval echo "$as_me:1769: \"$ac_compiler --version &5\"") >&5 (eval $ac_compiler --version &5) 2>&5 ac_status=$? - echo "$as_me:1455: \$? = $ac_status" >&5 + echo "$as_me:1772: \$? = $ac_status" >&5 (exit "$ac_status"); } -{ (eval echo "$as_me:1457: \"$ac_compiler -v &5\"") >&5 +{ (eval echo "$as_me:1774: \"$ac_compiler -v &5\"") >&5 (eval $ac_compiler -v &5) 2>&5 ac_status=$? - echo "$as_me:1460: \$? = $ac_status" >&5 + echo "$as_me:1777: \$? = $ac_status" >&5 (exit "$ac_status"); } -{ (eval echo "$as_me:1462: \"$ac_compiler -V &5\"") >&5 +{ (eval echo "$as_me:1779: \"$ac_compiler -V &5\"") >&5 (eval $ac_compiler -V &5) 2>&5 ac_status=$? - echo "$as_me:1465: \$? = $ac_status" >&5 + echo "$as_me:1782: \$? = $ac_status" >&5 (exit "$ac_status"); } cat >"conftest.$ac_ext" <<_ACEOF -#line 1469 "configure" +#line 1786 "configure" #include "confdefs.h" int @@ -1482,13 +1799,13 @@ ac_clean_files="$ac_clean_files a.out a.exe" # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. -echo "$as_me:1485: checking for C compiler default output" >&5 +echo "$as_me:1802: checking for C compiler default output" >&5 echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6 ac_link_default=`echo "$ac_link" | sed 's/ -o *"conftest[^"]*"//'` -if { (eval echo "$as_me:1488: \"$ac_link_default\"") >&5 +if { (eval echo "$as_me:1805: \"$ac_link_default\"") >&5 (eval $ac_link_default) 2>&5 ac_status=$? - echo "$as_me:1491: \$? = $ac_status" >&5 + echo "$as_me:1808: \$? = $ac_status" >&5 (exit "$ac_status"); }; then # Find the output, starting from the most likely. This scheme is # not robust to junk in `.', hence go to wildcards (a.*) only as a last @@ -1511,34 +1828,34 @@ done else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 -{ { echo "$as_me:1514: error: C compiler cannot create executables" >&5 +{ { echo "$as_me:1831: error: C compiler cannot create executables" >&5 echo "$as_me: error: C compiler cannot create executables" >&2;} { (exit 77); exit 77; }; } fi ac_exeext=$ac_cv_exeext -echo "$as_me:1520: result: $ac_file" >&5 +echo "$as_me:1837: result: $ac_file" >&5 echo "${ECHO_T}$ac_file" >&6 # Check the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -echo "$as_me:1525: checking whether the C compiler works" >&5 +echo "$as_me:1842: checking whether the C compiler works" >&5 echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0 # If not cross compiling, check that we can run a simple program. if test "$cross_compiling" != yes; then if { ac_try='./$ac_file' - { (eval echo "$as_me:1531: \"$ac_try\"") >&5 + { (eval echo "$as_me:1848: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1534: \$? = $ac_status" >&5 + echo "$as_me:1851: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cross_compiling=no else if test "$cross_compiling" = maybe; then cross_compiling=yes else - { { echo "$as_me:1541: error: cannot run C compiled programs. + { { echo "$as_me:1858: error: cannot run C compiled programs. If you meant to cross compile, use \`--host'." >&5 echo "$as_me: error: cannot run C compiled programs. If you meant to cross compile, use \`--host'." >&2;} @@ -1546,24 +1863,24 @@ If you meant to cross compile, use \`--host'." >&2;} fi fi fi -echo "$as_me:1549: result: yes" >&5 +echo "$as_me:1866: result: yes" >&5 echo "${ECHO_T}yes" >&6 rm -f a.out a.exe "conftest$ac_cv_exeext" ac_clean_files=$ac_clean_files_save # Check the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -echo "$as_me:1556: checking whether we are cross compiling" >&5 +echo "$as_me:1873: checking whether we are cross compiling" >&5 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 -echo "$as_me:1558: result: $cross_compiling" >&5 +echo "$as_me:1875: result: $cross_compiling" >&5 echo "${ECHO_T}$cross_compiling" >&6 -echo "$as_me:1561: checking for executable suffix" >&5 +echo "$as_me:1878: checking for executable suffix" >&5 echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6 -if { (eval echo "$as_me:1563: \"$ac_link\"") >&5 +if { (eval echo "$as_me:1880: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:1566: \$? = $ac_status" >&5 + echo "$as_me:1883: \$? = $ac_status" >&5 (exit "$ac_status"); }; then # If both `conftest.exe' and `conftest' are `present' (well, observable) # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will @@ -1579,25 +1896,25 @@ for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do esac done else - { { echo "$as_me:1582: error: cannot compute EXEEXT: cannot compile and link" >&5 + { { echo "$as_me:1899: error: cannot compute EXEEXT: cannot compile and link" >&5 echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;} { (exit 1); exit 1; }; } fi rm -f "conftest$ac_cv_exeext" -echo "$as_me:1588: result: $ac_cv_exeext" >&5 +echo "$as_me:1905: result: $ac_cv_exeext" >&5 echo "${ECHO_T}$ac_cv_exeext" >&6 rm -f "conftest.$ac_ext" EXEEXT=$ac_cv_exeext ac_exeext=$EXEEXT -echo "$as_me:1594: checking for object suffix" >&5 +echo "$as_me:1911: checking for object suffix" >&5 echo $ECHO_N "checking for object suffix... $ECHO_C" >&6 if test "${ac_cv_objext+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 1600 "configure" +#line 1917 "configure" #include "confdefs.h" int @@ -1609,10 +1926,10 @@ main (void) } _ACEOF rm -f conftest.o conftest.obj -if { (eval echo "$as_me:1612: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1929: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1615: \$? = $ac_status" >&5 + echo "$as_me:1932: \$? = $ac_status" >&5 (exit "$ac_status"); }; then for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do case $ac_file in @@ -1624,24 +1941,24 @@ done else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 -{ { echo "$as_me:1627: error: cannot compute OBJEXT: cannot compile" >&5 +{ { echo "$as_me:1944: error: cannot compute OBJEXT: cannot compile" >&5 echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;} { (exit 1); exit 1; }; } fi rm -f "conftest.$ac_cv_objext" "conftest.$ac_ext" fi -echo "$as_me:1634: result: $ac_cv_objext" >&5 +echo "$as_me:1951: result: $ac_cv_objext" >&5 echo "${ECHO_T}$ac_cv_objext" >&6 OBJEXT=$ac_cv_objext ac_objext=$OBJEXT -echo "$as_me:1638: checking whether we are using the GNU C compiler" >&5 +echo "$as_me:1955: checking whether we are using the GNU C compiler" >&5 echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 if test "${ac_cv_c_compiler_gnu+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 1644 "configure" +#line 1961 "configure" #include "confdefs.h" int @@ -1656,16 +1973,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:1659: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1976: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1662: \$? = $ac_status" >&5 + echo "$as_me:1979: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:1665: \"$ac_try\"") >&5 + { (eval echo "$as_me:1982: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1668: \$? = $ac_status" >&5 + echo "$as_me:1985: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_compiler_gnu=yes else @@ -1677,19 +1994,19 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -echo "$as_me:1680: result: $ac_cv_c_compiler_gnu" >&5 +echo "$as_me:1997: result: $ac_cv_c_compiler_gnu" >&5 echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 GCC=`test $ac_compiler_gnu = yes && echo yes` ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS CFLAGS="-g" -echo "$as_me:1686: checking whether $CC accepts -g" >&5 +echo "$as_me:2003: checking whether $CC accepts -g" >&5 echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 if test "${ac_cv_prog_cc_g+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 1692 "configure" +#line 2009 "configure" #include "confdefs.h" int @@ -1701,16 +2018,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:1704: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2021: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1707: \$? = $ac_status" >&5 + echo "$as_me:2024: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:1710: \"$ac_try\"") >&5 + { (eval echo "$as_me:2027: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1713: \$? = $ac_status" >&5 + echo "$as_me:2030: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_prog_cc_g=yes else @@ -1720,7 +2037,7 @@ ac_cv_prog_cc_g=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:1723: result: $ac_cv_prog_cc_g" >&5 +echo "$as_me:2040: result: $ac_cv_prog_cc_g" >&5 echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS @@ -1747,16 +2064,16 @@ cat >"conftest.$ac_ext" <<_ACEOF #endif _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:1750: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2067: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1753: \$? = $ac_status" >&5 + echo "$as_me:2070: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:1756: \"$ac_try\"") >&5 + { (eval echo "$as_me:2073: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1759: \$? = $ac_status" >&5 + echo "$as_me:2076: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then for ac_declaration in \ ''\ @@ -1768,7 +2085,7 @@ if { (eval echo "$as_me:1750: \"$ac_compile\"") >&5 'void exit (int);' do cat >"conftest.$ac_ext" <<_ACEOF -#line 1771 "configure" +#line 2088 "configure" #include "confdefs.h" #include $ac_declaration @@ -1781,16 +2098,16 @@ exit (42); } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:1784: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2101: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1787: \$? = $ac_status" >&5 + echo "$as_me:2104: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:1790: \"$ac_try\"") >&5 + { (eval echo "$as_me:2107: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1793: \$? = $ac_status" >&5 + echo "$as_me:2110: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -1800,7 +2117,7 @@ continue fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" cat >"conftest.$ac_ext" <<_ACEOF -#line 1803 "configure" +#line 2120 "configure" #include "confdefs.h" $ac_declaration int @@ -1812,16 +2129,16 @@ exit (42); } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:1815: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2132: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1818: \$? = $ac_status" >&5 + echo "$as_me:2135: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:1821: \"$ac_try\"") >&5 + { (eval echo "$as_me:2138: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1824: \$? = $ac_status" >&5 + echo "$as_me:2141: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then break else @@ -1851,11 +2168,11 @@ ac_main_return="return" GCC_VERSION=none if test "$GCC" = yes ; then - echo "$as_me:1854: checking version of $CC" >&5 + echo "$as_me:2171: checking version of $CC" >&5 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6 - GCC_VERSION="`${CC} --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(GCC[^)]*) //' -e 's/^.*(Debian[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`" + GCC_VERSION="`${CC} --version 2>/dev/null | sed -e '2,$d' -e 's/^[^(]*([^)][^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`" test -z "$GCC_VERSION" && GCC_VERSION=unknown - echo "$as_me:1858: result: $GCC_VERSION" >&5 + echo "$as_me:2175: result: $GCC_VERSION" >&5 echo "${ECHO_T}$GCC_VERSION" >&6 fi @@ -1864,12 +2181,12 @@ INTEL_COMPILER=no if test "$GCC" = yes ; then case "$host_os" in (linux*|gnu*) - echo "$as_me:1867: checking if this is really Intel C compiler" >&5 + echo "$as_me:2184: checking if this is really Intel C compiler" >&5 echo $ECHO_N "checking if this is really Intel C compiler... $ECHO_C" >&6 cf_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -no-gcc" cat >"conftest.$ac_ext" <<_ACEOF -#line 1872 "configure" +#line 2189 "configure" #include "confdefs.h" int @@ -1886,16 +2203,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:1889: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2206: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1892: \$? = $ac_status" >&5 + echo "$as_me:2209: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:1895: \"$ac_try\"") >&5 + { (eval echo "$as_me:2212: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1898: \$? = $ac_status" >&5 + echo "$as_me:2215: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then INTEL_COMPILER=yes cf_save_CFLAGS="$cf_save_CFLAGS -we147" @@ -1906,7 +2223,7 @@ cat "conftest.$ac_ext" >&5 fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" CFLAGS="$cf_save_CFLAGS" - echo "$as_me:1909: result: $INTEL_COMPILER" >&5 + echo "$as_me:2226: result: $INTEL_COMPILER" >&5 echo "${ECHO_T}$INTEL_COMPILER" >&6 ;; esac @@ -1915,11 +2232,11 @@ fi CLANG_COMPILER=no if test "$GCC" = yes ; then - echo "$as_me:1918: checking if this is really Clang C compiler" >&5 + echo "$as_me:2235: checking if this is really Clang C compiler" >&5 echo $ECHO_N "checking if this is really Clang C compiler... $ECHO_C" >&6 cf_save_CFLAGS="$CFLAGS" cat >"conftest.$ac_ext" <<_ACEOF -#line 1922 "configure" +#line 2239 "configure" #include "confdefs.h" int @@ -1936,16 +2253,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:1939: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2256: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1942: \$? = $ac_status" >&5 + echo "$as_me:2259: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:1945: \"$ac_try\"") >&5 + { (eval echo "$as_me:2262: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1948: \$? = $ac_status" >&5 + echo "$as_me:2265: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then CLANG_COMPILER=yes @@ -1955,7 +2272,7 @@ cat "conftest.$ac_ext" >&5 fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" CFLAGS="$cf_save_CFLAGS" - echo "$as_me:1958: result: $CLANG_COMPILER" >&5 + echo "$as_me:2275: result: $CLANG_COMPILER" >&5 echo "${ECHO_T}$CLANG_COMPILER" >&6 fi @@ -1964,30 +2281,30 @@ CLANG_VERSION=none if test "x$CLANG_COMPILER" = "xyes" ; then case "$CC" in (c[1-9][0-9]|*/c[1-9][0-9]) - { echo "$as_me:1967: WARNING: replacing broken compiler alias $CC" >&5 + { echo "$as_me:2284: WARNING: replacing broken compiler alias $CC" >&5 echo "$as_me: WARNING: replacing broken compiler alias $CC" >&2;} CFLAGS="$CFLAGS -std=`echo "$CC" | sed -e 's%.*/%%'`" CC=clang ;; esac - echo "$as_me:1974: checking version of $CC" >&5 + echo "$as_me:2291: checking version of $CC" >&5 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6 CLANG_VERSION="`$CC --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(CLANG[^)]*) //' -e 's/^.*(Debian[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`" test -z "$CLANG_VERSION" && CLANG_VERSION=unknown - echo "$as_me:1978: result: $CLANG_VERSION" >&5 + echo "$as_me:2295: result: $CLANG_VERSION" >&5 echo "${ECHO_T}$CLANG_VERSION" >&6 for cf_clang_opt in \ -Qunused-arguments \ -Wno-error=implicit-function-declaration do - echo "$as_me:1985: checking if option $cf_clang_opt works" >&5 + echo "$as_me:2302: checking if option $cf_clang_opt works" >&5 echo $ECHO_N "checking if option $cf_clang_opt works... $ECHO_C" >&6 cf_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $cf_clang_opt" cat >"conftest.$ac_ext" <<_ACEOF -#line 1990 "configure" +#line 2307 "configure" #include "confdefs.h" #include @@ -2001,16 +2318,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:2004: \"$ac_link\"") >&5 +if { (eval echo "$as_me:2321: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:2007: \$? = $ac_status" >&5 + echo "$as_me:2324: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:2010: \"$ac_try\"") >&5 + { (eval echo "$as_me:2327: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2013: \$? = $ac_status" >&5 + echo "$as_me:2330: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_clang_optok=yes @@ -2021,13 +2338,13 @@ cat "conftest.$ac_ext" >&5 cf_clang_optok=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - echo "$as_me:2024: result: $cf_clang_optok" >&5 + echo "$as_me:2341: result: $cf_clang_optok" >&5 echo "${ECHO_T}$cf_clang_optok" >&6 CFLAGS="$cf_save_CFLAGS" if test "$cf_clang_optok" = yes; then test -n "$verbose" && echo " adding option $cf_clang_opt" 1>&6 -echo "${as_me:-configure}:2030: testing adding option $cf_clang_opt ..." 1>&5 +echo "${as_me:-configure}:2347: testing adding option $cf_clang_opt ..." 1>&5 test -n "$CFLAGS" && CFLAGS="$CFLAGS " CFLAGS="${CFLAGS}$cf_clang_opt" @@ -2036,7 +2353,7 @@ echo "${as_me:-configure}:2030: testing adding option $cf_clang_opt ..." 1>&5 done fi -echo "$as_me:2039: checking for $CC option to accept ANSI C" >&5 +echo "$as_me:2356: checking for $CC option to accept ANSI C" >&5 echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 if test "${ac_cv_prog_cc_stdc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2044,7 +2361,7 @@ else ac_cv_prog_cc_stdc=no ac_save_CC=$CC cat >"conftest.$ac_ext" <<_ACEOF -#line 2047 "configure" +#line 2364 "configure" #include "confdefs.h" #include #include @@ -2091,16 +2408,16 @@ for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIO do CC="$ac_save_CC $ac_arg" rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:2094: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2411: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2097: \$? = $ac_status" >&5 + echo "$as_me:2414: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:2100: \"$ac_try\"") >&5 + { (eval echo "$as_me:2417: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2103: \$? = $ac_status" >&5 + echo "$as_me:2420: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_prog_cc_stdc=$ac_arg break @@ -2117,10 +2434,10 @@ fi case "x$ac_cv_prog_cc_stdc" in x|xno) - echo "$as_me:2120: result: none needed" >&5 + echo "$as_me:2437: result: none needed" >&5 echo "${ECHO_T}none needed" >&6 ;; *) - echo "$as_me:2123: result: $ac_cv_prog_cc_stdc" >&5 + echo "$as_me:2440: result: $ac_cv_prog_cc_stdc" >&5 echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 CC="$CC $ac_cv_prog_cc_stdc" ;; esac @@ -2128,13 +2445,13 @@ esac # This should have been defined by AC_PROG_CC : "${CC:=cc}" -echo "$as_me:2131: checking \$CFLAGS variable" >&5 +echo "$as_me:2448: checking \$CFLAGS variable" >&5 echo $ECHO_N "checking \$CFLAGS variable... $ECHO_C" >&6 case "x$CFLAGS" in (*-[IUD]*) - echo "$as_me:2135: result: broken" >&5 + echo "$as_me:2452: result: broken" >&5 echo "${ECHO_T}broken" >&6 - { echo "$as_me:2137: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5 + { echo "$as_me:2454: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5 echo "$as_me: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&2;} cf_flags="$CFLAGS" CFLAGS= @@ -2242,18 +2559,18 @@ fi done ;; (*) - echo "$as_me:2245: result: ok" >&5 + echo "$as_me:2562: result: ok" >&5 echo "${ECHO_T}ok" >&6 ;; esac -echo "$as_me:2250: checking \$CC variable" >&5 +echo "$as_me:2567: checking \$CC variable" >&5 echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6 case "$CC" in (*[\ \ ]-*) - echo "$as_me:2254: result: broken" >&5 + echo "$as_me:2571: result: broken" >&5 echo "${ECHO_T}broken" >&6 - { echo "$as_me:2256: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5 + { echo "$as_me:2573: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5 echo "$as_me: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&2;} # humor him... cf_prog=`echo "$CC" | sed -e 's/ / /g' -e 's/[ ]* / /g' -e 's/[ ]*[ ]-[^ ].*//'` @@ -2370,24 +2687,27 @@ fi done test -n "$verbose" && echo " resulting CC: '$CC'" 1>&6 -echo "${as_me:-configure}:2373: testing resulting CC: '$CC' ..." 1>&5 +echo "${as_me:-configure}:2690: testing resulting CC: '$CC' ..." 1>&5 test -n "$verbose" && echo " resulting CFLAGS: '$CFLAGS'" 1>&6 -echo "${as_me:-configure}:2377: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5 +echo "${as_me:-configure}:2694: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5 test -n "$verbose" && echo " resulting CPPFLAGS: '$CPPFLAGS'" 1>&6 -echo "${as_me:-configure}:2381: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5 +echo "${as_me:-configure}:2698: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5 ;; (*) - echo "$as_me:2385: result: ok" >&5 + echo "$as_me:2702: result: ok" >&5 echo "${ECHO_T}ok" >&6 ;; esac -echo "$as_me:2390: checking for egrep" >&5 + ;; +esac + +echo "$as_me:2710: checking for egrep" >&5 echo $ECHO_N "checking for egrep... $ECHO_C" >&6 if test "${ac_cv_path_EGREP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2399,7 +2719,7 @@ else do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:2402: checking for $ac_word" >&5 +echo "$as_me:2722: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_EGREP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2416,7 +2736,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_EGREP="$ac_dir/$ac_word" - echo "$as_me:2419: found $ac_dir/$ac_word" >&5 + echo "$as_me:2739: found $ac_dir/$ac_word" >&5 break fi done @@ -2427,10 +2747,10 @@ fi EGREP=$ac_cv_path_EGREP if test -n "$EGREP"; then - echo "$as_me:2430: result: $EGREP" >&5 + echo "$as_me:2750: result: $EGREP" >&5 echo "${ECHO_T}$EGREP" >&6 else - echo "$as_me:2433: result: no" >&5 + echo "$as_me:2753: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2438,12 +2758,12 @@ fi done test -n "$EGREP" || EGREP=": " - test "x$ac_cv_path_EGREP" = "x:" && { { echo "$as_me:2441: error: cannot find workable egrep" >&5 + test "x$ac_cv_path_EGREP" = "x:" && { { echo "$as_me:2761: error: cannot find workable egrep" >&5 echo "$as_me: error: cannot find workable egrep" >&2;} { (exit 1); exit 1; }; } fi fi -echo "$as_me:2446: result: $ac_cv_path_EGREP" >&5 +echo "$as_me:2766: result: $ac_cv_path_EGREP" >&5 echo "${ECHO_T}$ac_cv_path_EGREP" >&6 EGREP="$ac_cv_path_EGREP" @@ -2453,7 +2773,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS "conftest.$ac_ext" >&5' ac_link='$CC -o "conftest$ac_exeext" $CFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac_ext" $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu ac_main_return="return" -echo "$as_me:2456: checking how to run the C preprocessor" >&5 +echo "$as_me:2776: checking how to run the C preprocessor" >&5 echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then @@ -2474,18 +2794,18 @@ do # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >"conftest.$ac_ext" <<_ACEOF -#line 2477 "configure" +#line 2797 "configure" #include "confdefs.h" #include Syntax error _ACEOF -if { (eval echo "$as_me:2482: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:2802: \"$ac_cpp "conftest.$ac_ext"\"") >&5 (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:2488: \$? = $ac_status" >&5 + echo "$as_me:2808: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -2508,17 +2828,17 @@ rm -f conftest.err "conftest.$ac_ext" # OK, works on sane cases. Now check whether non-existent headers # can be detected and how. cat >"conftest.$ac_ext" <<_ACEOF -#line 2511 "configure" +#line 2831 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:2515: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:2835: \"$ac_cpp "conftest.$ac_ext"\"") >&5 (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:2521: \$? = $ac_status" >&5 + echo "$as_me:2841: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -2555,7 +2875,7 @@ fi else ac_cv_prog_CPP=$CPP fi -echo "$as_me:2558: result: $CPP" >&5 +echo "$as_me:2878: result: $CPP" >&5 echo "${ECHO_T}$CPP" >&6 ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes @@ -2565,18 +2885,18 @@ do # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >"conftest.$ac_ext" <<_ACEOF -#line 2568 "configure" +#line 2888 "configure" #include "confdefs.h" #include Syntax error _ACEOF -if { (eval echo "$as_me:2573: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:2893: \"$ac_cpp "conftest.$ac_ext"\"") >&5 (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:2579: \$? = $ac_status" >&5 + echo "$as_me:2899: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -2599,17 +2919,17 @@ rm -f conftest.err "conftest.$ac_ext" # OK, works on sane cases. Now check whether non-existent headers # can be detected and how. cat >"conftest.$ac_ext" <<_ACEOF -#line 2602 "configure" +#line 2922 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:2606: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:2926: \"$ac_cpp "conftest.$ac_ext"\"") >&5 (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:2612: \$? = $ac_status" >&5 + echo "$as_me:2932: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -2637,7 +2957,7 @@ rm -f conftest.err "conftest.$ac_ext" if $ac_preproc_ok; then : else - { { echo "$as_me:2640: error: C preprocessor \"$CPP\" fails sanity check" >&5 + { { echo "$as_me:2960: error: C preprocessor \"$CPP\" fails sanity check" >&5 echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;} { (exit 1); exit 1; }; } fi @@ -2650,14 +2970,14 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu ac_main_return="return" if test $ac_cv_c_compiler_gnu = yes; then - echo "$as_me:2653: checking whether $CC needs -traditional" >&5 + echo "$as_me:2973: checking whether $CC needs -traditional" >&5 echo $ECHO_N "checking whether $CC needs -traditional... $ECHO_C" >&6 if test "${ac_cv_prog_gcc_traditional+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_pattern="Autoconf.*'x'" cat >"conftest.$ac_ext" <<_ACEOF -#line 2660 "configure" +#line 2980 "configure" #include "confdefs.h" #include int Autoconf = TIOCGETP; @@ -2672,7 +2992,7 @@ rm -rf conftest* if test $ac_cv_prog_gcc_traditional = no; then cat >"conftest.$ac_ext" <<_ACEOF -#line 2675 "configure" +#line 2995 "configure" #include "confdefs.h" #include int Autoconf = TCGETA; @@ -2685,14 +3005,14 @@ rm -rf conftest* fi fi -echo "$as_me:2688: result: $ac_cv_prog_gcc_traditional" >&5 +echo "$as_me:3008: result: $ac_cv_prog_gcc_traditional" >&5 echo "${ECHO_T}$ac_cv_prog_gcc_traditional" >&6 if test $ac_cv_prog_gcc_traditional = yes; then CC="$CC -traditional" fi fi -echo "$as_me:2695: checking whether $CC understands -c and -o together" >&5 +echo "$as_me:3015: checking whether $CC understands -c and -o together" >&5 echo $ECHO_N "checking whether $CC understands -c and -o together... $ECHO_C" >&6 if test "${cf_cv_prog_CC_c_o+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2707,15 +3027,15 @@ CF_EOF # We do the test twice because some compilers refuse to overwrite an # existing .o file with -o, though they will create one. ac_try='$CC $CFLAGS $CPPFLAGS -c conftest.$ac_ext -o conftest2.$ac_objext >&5' -if { (eval echo "$as_me:2710: \"$ac_try\"") >&5 +if { (eval echo "$as_me:3030: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2713: \$? = $ac_status" >&5 + echo "$as_me:3033: \$? = $ac_status" >&5 (exit "$ac_status"); } && - test -f conftest2.$ac_objext && { (eval echo "$as_me:2715: \"$ac_try\"") >&5 + test -f conftest2.$ac_objext && { (eval echo "$as_me:3035: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2718: \$? = $ac_status" >&5 + echo "$as_me:3038: \$? = $ac_status" >&5 (exit "$ac_status"); }; then eval cf_cv_prog_CC_c_o=yes @@ -2726,10 +3046,10 @@ rm -rf ./conftest* fi if test "$cf_cv_prog_CC_c_o" = yes; then - echo "$as_me:2729: result: yes" >&5 + echo "$as_me:3049: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:2732: result: no" >&5 + echo "$as_me:3052: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2750,7 +3070,7 @@ for ac_prog in mawk gawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:2753: checking for $ac_word" >&5 +echo "$as_me:3073: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_AWK+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2765,7 +3085,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_AWK="$ac_prog" -echo "$as_me:2768: found $ac_dir/$ac_word" >&5 +echo "$as_me:3088: found $ac_dir/$ac_word" >&5 break done @@ -2773,21 +3093,21 @@ fi fi AWK=$ac_cv_prog_AWK if test -n "$AWK"; then - echo "$as_me:2776: result: $AWK" >&5 + echo "$as_me:3096: result: $AWK" >&5 echo "${ECHO_T}$AWK" >&6 else - echo "$as_me:2779: result: no" >&5 + echo "$as_me:3099: result: no" >&5 echo "${ECHO_T}no" >&6 fi test -n "$AWK" && break done -test -z "$AWK" && { { echo "$as_me:2786: error: No awk program found" >&5 +test -z "$AWK" && { { echo "$as_me:3106: error: No awk program found" >&5 echo "$as_me: error: No awk program found" >&2;} { (exit 1); exit 1; }; } -echo "$as_me:2790: checking for egrep" >&5 +echo "$as_me:3110: checking for egrep" >&5 echo $ECHO_N "checking for egrep... $ECHO_C" >&6 if test "${ac_cv_prog_egrep+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2797,11 +3117,11 @@ else else ac_cv_prog_egrep='egrep' fi fi -echo "$as_me:2800: result: $ac_cv_prog_egrep" >&5 +echo "$as_me:3120: result: $ac_cv_prog_egrep" >&5 echo "${ECHO_T}$ac_cv_prog_egrep" >&6 EGREP=$ac_cv_prog_egrep - test -z "$EGREP" && { { echo "$as_me:2804: error: No egrep program found" >&5 + test -z "$EGREP" && { { echo "$as_me:3124: error: No egrep program found" >&5 echo "$as_me: error: No egrep program found" >&2;} { (exit 1); exit 1; }; } @@ -2817,7 +3137,7 @@ echo "$as_me: error: No egrep program found" >&2;} # AFS /usr/afsws/bin/install, which mishandles nonexistent args # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. -echo "$as_me:2820: checking for a BSD compatible install" >&5 +echo "$as_me:3140: checking for a BSD compatible install" >&5 echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6 if test -z "$INSTALL"; then if test "${ac_cv_path_install+set}" = set; then @@ -2866,7 +3186,7 @@ fi INSTALL=$ac_install_sh fi fi -echo "$as_me:2869: result: $INSTALL" >&5 +echo "$as_me:3189: result: $INSTALL" >&5 echo "${ECHO_T}$INSTALL" >&6 # Use test -z because SunOS4 sh mishandles braces in ${var-val}. @@ -2877,18 +3197,18 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -echo "$as_me:2880: checking whether ln -s works" >&5 +echo "$as_me:3200: checking whether ln -s works" >&5 echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6 LN_S=$as_ln_s if test "$LN_S" = "ln -s"; then - echo "$as_me:2884: result: yes" >&5 + echo "$as_me:3204: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:2887: result: no, using $LN_S" >&5 + echo "$as_me:3207: result: no, using $LN_S" >&5 echo "${ECHO_T}no, using $LN_S" >&6 fi -echo "$as_me:2891: checking if $LN_S -f options work" >&5 +echo "$as_me:3211: checking if $LN_S -f options work" >&5 echo $ECHO_N "checking if $LN_S -f options work... $ECHO_C" >&6 rm -f conf$$.src conf$$dst @@ -2900,13 +3220,24 @@ else cf_prog_ln_sf=no fi rm -f conf$$.dst conf$$src -echo "$as_me:2903: result: $cf_prog_ln_sf" >&5 +echo "$as_me:3223: result: $cf_prog_ln_sf" >&5 echo "${ECHO_T}$cf_prog_ln_sf" >&6 test "$cf_prog_ln_sf" = yes && LN_S="$LN_S -f" -# Find a good install program. We prefer a C program (faster), -# so one script is as good as another. But avoid the broken or +case "$cf_cv_system_name" in +(cygwin*|msys*|mingw32*|mingw64|os2*) + GLOB_FULLPATH_POSIX='/*' + GLOB_FULLPATH_OTHER='[a-zA-Z]:[\\/]*' + ;; +(*) + GLOB_FULLPATH_POSIX='/*' + GLOB_FULLPATH_OTHER=$GLOB_FULLPATH_POSIX + ;; +esac + +# Find a good install program. We prefer a C program (faster), +# so one script is as good as another. But avoid the broken or # incompatible versions: # SysV /etc/install, /usr/sbin/install # SunOS /usr/etc/install @@ -2917,7 +3248,7 @@ test "$cf_prog_ln_sf" = yes && LN_S="$LN_S -f" # AFS /usr/afsws/bin/install, which mishandles nonexistent args # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. -echo "$as_me:2920: checking for a BSD compatible install" >&5 +echo "$as_me:3251: checking for a BSD compatible install" >&5 echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6 if test -z "$INSTALL"; then if test "${ac_cv_path_install+set}" = set; then @@ -2966,7 +3297,7 @@ fi INSTALL=$ac_install_sh fi fi -echo "$as_me:2969: result: $INSTALL" >&5 +echo "$as_me:3300: result: $INSTALL" >&5 echo "${ECHO_T}$INSTALL" >&6 # Use test -z because SunOS4 sh mishandles braces in ${var-val}. @@ -2977,8 +3308,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -case $INSTALL in -(/*) +case x$INSTALL in +(x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER) ;; (*) cf_dir=`echo "$INSTALL" | sed -e 's%/[^/]*$%%'` @@ -2987,7 +3318,7 @@ case $INSTALL in ;; esac -echo "$as_me:2990: checking if you want to install stripped executables" >&5 +echo "$as_me:3321: checking if you want to install stripped executables" >&5 echo $ECHO_N "checking if you want to install stripped executables... $ECHO_C" >&6 # Check whether --enable-stripping or --disable-stripping was given. @@ -3004,7 +3335,7 @@ else enable_stripping=yes fi; -echo "$as_me:3007: result: $enable_stripping" >&5 +echo "$as_me:3338: result: $enable_stripping" >&5 echo "${ECHO_T}$enable_stripping" >&6 if test "$enable_stripping" = yes @@ -3015,7 +3346,7 @@ else fi : "${INSTALL:=install}" -echo "$as_me:3018: checking if install accepts -p option" >&5 +echo "$as_me:3349: checking if install accepts -p option" >&5 echo $ECHO_N "checking if install accepts -p option... $ECHO_C" >&6 if test "${cf_cv_install_p+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3046,10 +3377,10 @@ else rm -rf ./conftest* fi -echo "$as_me:3049: result: $cf_cv_install_p" >&5 +echo "$as_me:3380: result: $cf_cv_install_p" >&5 echo "${ECHO_T}$cf_cv_install_p" >&6 -echo "$as_me:3052: checking if install needs to be told about ownership" >&5 +echo "$as_me:3383: checking if install needs to be told about ownership" >&5 echo $ECHO_N "checking if install needs to be told about ownership... $ECHO_C" >&6 case `$ac_config_guess` in (*minix) @@ -3060,7 +3391,7 @@ case `$ac_config_guess` in ;; esac -echo "$as_me:3063: result: $with_install_o" >&5 +echo "$as_me:3394: result: $with_install_o" >&5 echo "${ECHO_T}$with_install_o" >&6 if test "x$with_install_o" = xyes then @@ -3069,7 +3400,73 @@ else INSTALL_OPT_O= fi -echo "$as_me:3072: checking for long file names" >&5 +if test -n "$INSTALL_OPT_S" +then + echo "$as_me:3405: checking if you want to specify strip-program" >&5 +echo $ECHO_N "checking if you want to specify strip-program... $ECHO_C" >&6 + +# Check whether --with-strip-program or --without-strip-program was given. +if test "${with_strip_program+set}" = set; then + withval="$with_strip_program" + with_strip_program=$withval +else + with_strip_program=no +fi; + echo "$as_me:3415: result: $with_strip_program" >&5 +echo "${ECHO_T}$with_strip_program" >&6 + if test "$with_strip_program" != no + then + echo "$as_me:3419: checking if strip-program is supported with this installer" >&5 +echo $ECHO_N "checking if strip-program is supported with this installer... $ECHO_C" >&6 + cf_install_program=`echo "$INSTALL" | sed -e 's%[ ]*[ ]-.%%'` + check_install_strip=no + if test -f "$cf_install_program" + then + check_install_version=`"$cf_install_program" --version 2>/dev/null | head -n 1 | grep coreutils` + if test -n "$check_install_version" + then + check_install_strip="option" + else + for check_strip_variable in STRIPBIN STRIP + do + if strings "$cf_install_program" | grep "^$check_strip_variable$" >/dev/null + then + check_install_strip="environ" + break + fi + done + fi + fi + echo "$as_me:3440: result: $check_install_strip" >&5 +echo "${ECHO_T}$check_install_strip" >&6 + case "$check_install_strip" in + (no) + { echo "$as_me:3444: WARNING: $cf_install_program does not support strip program option" >&5 +echo "$as_me: WARNING: $cf_install_program does not support strip program option" >&2;} + with_strip_program=no + ;; + (environ) + cat >install.tmp <<-CF_EOF + #! $SHELL + STRIPBIN="$with_strip_program" \\ + STRIP="$with_strip_program" \\ + $INSTALL "$@" + CF_EOF + INSTALL="`pwd`/install.tmp" + chmod +x "$INSTALL" + test -n "$verbose" && echo " created $INSTALL" 1>&6 + +echo "${as_me:-configure}:3459: testing created $INSTALL ..." 1>&5 + + ;; + (option) + INSTALL_OPT_S="$INSTALL_OPT_S --strip-program=\"$with_strip_program\"" + ;; + esac + fi +fi + +echo "$as_me:3469: checking for long file names" >&5 echo $ECHO_N "checking for long file names... $ECHO_C" >&6 if test "${ac_cv_sys_long_file_names+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3108,7 +3505,7 @@ for ac_dir in . $ac_tmpdirs `eval echo "$prefix/lib" "$exec_prefix/lib"` ; do rm -rf "$ac_xdir" 2>/dev/null done fi -echo "$as_me:3111: result: $ac_cv_sys_long_file_names" >&5 +echo "$as_me:3508: result: $ac_cv_sys_long_file_names" >&5 echo "${ECHO_T}$ac_cv_sys_long_file_names" >&6 if test "$ac_cv_sys_long_file_names" = yes; then @@ -3120,7 +3517,7 @@ fi # if we find pkg-config, check if we should install the ".pc" files. -echo "$as_me:3123: checking if you want to use pkg-config" >&5 +echo "$as_me:3520: checking if you want to use pkg-config" >&5 echo $ECHO_N "checking if you want to use pkg-config... $ECHO_C" >&6 # Check whether --with-pkg-config or --without-pkg-config was given. @@ -3130,7 +3527,7 @@ if test "${with_pkg_config+set}" = set; then else cf_pkg_config=yes fi; -echo "$as_me:3133: result: $cf_pkg_config" >&5 +echo "$as_me:3530: result: $cf_pkg_config" >&5 echo "${ECHO_T}$cf_pkg_config" >&6 case "$cf_pkg_config" in @@ -3142,7 +3539,7 @@ case "$cf_pkg_config" in if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 -echo "$as_me:3145: checking for $ac_word" >&5 +echo "$as_me:3542: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_PKG_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3159,7 +3556,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word" - echo "$as_me:3162: found $ac_dir/$ac_word" >&5 + echo "$as_me:3559: found $ac_dir/$ac_word" >&5 break fi done @@ -3170,10 +3567,10 @@ fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then - echo "$as_me:3173: result: $PKG_CONFIG" >&5 + echo "$as_me:3570: result: $PKG_CONFIG" >&5 echo "${ECHO_T}$PKG_CONFIG" >&6 else - echo "$as_me:3176: result: no" >&5 + echo "$as_me:3573: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3182,7 +3579,7 @@ if test -z "$ac_cv_path_PKG_CONFIG"; then ac_pt_PKG_CONFIG=$PKG_CONFIG # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -echo "$as_me:3185: checking for $ac_word" >&5 +echo "$as_me:3582: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3199,7 +3596,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_ac_pt_PKG_CONFIG="$ac_dir/$ac_word" - echo "$as_me:3202: found $ac_dir/$ac_word" >&5 + echo "$as_me:3599: found $ac_dir/$ac_word" >&5 break fi done @@ -3211,10 +3608,10 @@ fi ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG if test -n "$ac_pt_PKG_CONFIG"; then - echo "$as_me:3214: result: $ac_pt_PKG_CONFIG" >&5 + echo "$as_me:3611: result: $ac_pt_PKG_CONFIG" >&5 echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6 else - echo "$as_me:3217: result: no" >&5 + echo "$as_me:3614: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3238,43 +3635,41 @@ else cf_path_syntax="$ac_default_prefix" fi -case ".$PKG_CONFIG" in -(.\$\(*\)*|.\'*\'*) - ;; -(..|./*|.\\*) +case "x$PKG_CONFIG" in +(x\$\(*\)*|x\'*\'*) ;; -(.[a-zA-Z]:[\\/]*) # OS/2 EMX +(x.|x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER) ;; -(.\$\{*prefix\}*|.\$\{*dir\}*) +(x\$\{*prefix\}*|x\$\{*dir\}*) eval PKG_CONFIG="$PKG_CONFIG" - case ".$PKG_CONFIG" in - (.NONE/*) + case "x$PKG_CONFIG" in + (xNONE/*) PKG_CONFIG=`echo "$PKG_CONFIG" | sed -e s%NONE%$cf_path_syntax%` ;; esac ;; -(.no|.NONE/*) +(xno|xNONE/*) PKG_CONFIG=`echo "$PKG_CONFIG" | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { { echo "$as_me:3260: error: expected a pathname, not \"$PKG_CONFIG\"" >&5 + { { echo "$as_me:3655: error: expected a pathname, not \"$PKG_CONFIG\"" >&5 echo "$as_me: error: expected a pathname, not \"$PKG_CONFIG\"" >&2;} { (exit 1); exit 1; }; } ;; esac elif test "x$cf_pkg_config" != xno ; then - { echo "$as_me:3267: WARNING: pkg-config is not installed" >&5 + { echo "$as_me:3662: WARNING: pkg-config is not installed" >&5 echo "$as_me: WARNING: pkg-config is not installed" >&2;} fi case "$PKG_CONFIG" in (no|none|yes) - echo "$as_me:3273: checking for pkg-config library directory" >&5 + echo "$as_me:3668: checking for pkg-config library directory" >&5 echo $ECHO_N "checking for pkg-config library directory... $ECHO_C" >&6 ;; (*) - echo "$as_me:3277: checking for $PKG_CONFIG library directory" >&5 + echo "$as_me:3672: checking for $PKG_CONFIG library directory" >&5 echo $ECHO_N "checking for $PKG_CONFIG library directory... $ECHO_C" >&6 ;; esac @@ -3301,27 +3696,27 @@ fi; case "x$cf_search_path" in (xlibdir) PKG_CONFIG_LIBDIR='${libdir}/pkgconfig' - echo "$as_me:3304: result: $PKG_CONFIG_LIBDIR" >&5 + echo "$as_me:3699: result: $PKG_CONFIG_LIBDIR" >&5 echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6 cf_search_path= ;; (x) ;; -(x/*\ *) +(x$GLOB_FULLPATH_POSIX\ *|x$GLOB_FULLPATH_OTHER\ *) PKG_CONFIG_LIBDIR= ;; -(x/*) +(x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER) PKG_CONFIG_LIBDIR="$cf_search_path" - echo "$as_me:3315: result: $PKG_CONFIG_LIBDIR" >&5 + echo "$as_me:3710: result: $PKG_CONFIG_LIBDIR" >&5 echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6 cf_search_path= ;; (xyes|xauto) - echo "$as_me:3320: result: auto" >&5 + echo "$as_me:3715: result: auto" >&5 echo "${ECHO_T}auto" >&6 cf_search_path= # Look for the library directory using the same prefix as the executable - echo "$as_me:3324: checking for search-list" >&5 + echo "$as_me:3719: checking for search-list" >&5 echo $ECHO_N "checking for search-list... $ECHO_C" >&6 if test "x$PKG_CONFIG" != xnone then @@ -3332,7 +3727,15 @@ echo $ECHO_N "checking for search-list... $ECHO_C" >&6 pkg-config \ pkgconf do - cf_search_path=`"$PKG_CONFIG" --variable=pc_path "$cf_pkg_program" 2>/dev/null | tr : ' '` + cf_raw_search_path=`"$PKG_CONFIG" --variable=pc_path "$cf_pkg_program" 2>/dev/null` + case "$cf_raw_search_path" in + (*\\*) + cf_search_path=`echo "$cf_raw_search_path" | tr ';' ' ' | tr '\' '/'` + ;; + (*/*) + cf_search_path=`echo "$cf_raw_search_path" | tr : ' '` + ;; + esac test -n "$cf_search_path" && break done @@ -3348,11 +3751,11 @@ echo $ECHO_N "checking for search-list... $ECHO_C" >&6 "` fi - echo "$as_me:3351: result: $cf_search_path" >&5 + echo "$as_me:3754: result: $cf_search_path" >&5 echo "${ECHO_T}$cf_search_path" >&6 ;; (*) - { { echo "$as_me:3355: error: Unexpected option value: $cf_search_path" >&5 + { { echo "$as_me:3758: error: Unexpected option value: $cf_search_path" >&5 echo "$as_me: error: Unexpected option value: $cf_search_path" >&2;} { (exit 1); exit 1; }; } ;; @@ -3360,7 +3763,7 @@ esac if test -n "$cf_search_path" then - echo "$as_me:3363: checking for first directory" >&5 + echo "$as_me:3766: checking for first directory" >&5 echo $ECHO_N "checking for first directory... $ECHO_C" >&6 cf_pkg_config_path=none for cf_config in $cf_search_path @@ -3371,7 +3774,7 @@ echo $ECHO_N "checking for first directory... $ECHO_C" >&6 break fi done - echo "$as_me:3374: result: $cf_pkg_config_path" >&5 + echo "$as_me:3777: result: $cf_pkg_config_path" >&5 echo "${ECHO_T}$cf_pkg_config_path" >&6 if test "x$cf_pkg_config_path" != xnone ; then @@ -3381,7 +3784,7 @@ echo "${ECHO_T}$cf_pkg_config_path" >&6 if test -z "$PKG_CONFIG_LIBDIR" && test -n "$cf_search_path" then - echo "$as_me:3384: checking for workaround" >&5 + echo "$as_me:3787: checking for workaround" >&5 echo $ECHO_N "checking for workaround... $ECHO_C" >&6 if test "$prefix" = "NONE" ; then cf_prefix="$ac_default_prefix" @@ -3404,12 +3807,12 @@ echo $ECHO_N "checking for workaround... $ECHO_C" >&6 esac done test -z "$PKG_CONFIG_LIBDIR" && PKG_CONFIG_LIBDIR=$cf_backup - echo "$as_me:3407: result: $PKG_CONFIG_LIBDIR" >&5 + echo "$as_me:3810: result: $PKG_CONFIG_LIBDIR" >&5 echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6 fi fi -echo "$as_me:3412: checking if you want to build test-programs" >&5 +echo "$as_me:3815: checking if you want to build test-programs" >&5 echo $ECHO_N "checking if you want to build test-programs... $ECHO_C" >&6 # Check whether --with-tests or --without-tests was given. @@ -3419,10 +3822,10 @@ if test "${with_tests+set}" = set; then else cf_with_tests=yes fi; -echo "$as_me:3422: result: $cf_with_tests" >&5 +echo "$as_me:3825: result: $cf_with_tests" >&5 echo "${ECHO_T}$cf_with_tests" >&6 -echo "$as_me:3425: checking if we should assume mixed-case filenames" >&5 +echo "$as_me:3828: checking if we should assume mixed-case filenames" >&5 echo $ECHO_N "checking if we should assume mixed-case filenames... $ECHO_C" >&6 # Check whether --enable-mixed-case or --disable-mixed-case was given. @@ -3432,11 +3835,11 @@ if test "${enable_mixed_case+set}" = set; then else enable_mixedcase=auto fi; -echo "$as_me:3435: result: $enable_mixedcase" >&5 +echo "$as_me:3838: result: $enable_mixedcase" >&5 echo "${ECHO_T}$enable_mixedcase" >&6 if test "$enable_mixedcase" = "auto" ; then -echo "$as_me:3439: checking if filesystem supports mixed-case filenames" >&5 +echo "$as_me:3842: checking if filesystem supports mixed-case filenames" >&5 echo $ECHO_N "checking if filesystem supports mixed-case filenames... $ECHO_C" >&6 if test "${cf_cv_mixedcase+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3463,7 +3866,7 @@ else fi fi -echo "$as_me:3466: result: $cf_cv_mixedcase" >&5 +echo "$as_me:3869: result: $cf_cv_mixedcase" >&5 echo "${ECHO_T}$cf_cv_mixedcase" >&6 test "$cf_cv_mixedcase" = yes && cat >>confdefs.h <<\EOF @@ -3481,7 +3884,7 @@ EOF fi # do this after mixed-case option (tags/TAGS is not as important as tic). -echo "$as_me:3484: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "$as_me:3887: checking whether ${MAKE-make} sets \${MAKE}" >&5 echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'` if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then @@ -3501,16 +3904,16 @@ fi rm -f conftest.make fi if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then - echo "$as_me:3504: result: yes" >&5 + echo "$as_me:3907: result: yes" >&5 echo "${ECHO_T}yes" >&6 SET_MAKE= else - echo "$as_me:3508: result: no" >&5 + echo "$as_me:3911: result: no" >&5 echo "${ECHO_T}no" >&6 SET_MAKE="MAKE=${MAKE-make}" fi -echo "$as_me:3513: checking for \".PHONY\" make-support" >&5 +echo "$as_me:3916: checking for \".PHONY\" make-support" >&5 echo $ECHO_N "checking for \".PHONY\" make-support... $ECHO_C" >&6 if test "${cf_cv_make_PHONY+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3565,7 +3968,7 @@ CF_EOF rm -rf conftest* fi -echo "$as_me:3568: result: $cf_cv_make_PHONY" >&5 +echo "$as_me:3971: result: $cf_cv_make_PHONY" >&5 echo "${ECHO_T}$cf_cv_make_PHONY" >&6 MAKE_NO_PHONY="#" MAKE_PHONY="#" @@ -3576,7 +3979,7 @@ for ac_prog in exctags ctags do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:3579: checking for $ac_word" >&5 +echo "$as_me:3982: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CTAGS+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3591,7 +3994,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_CTAGS="$ac_prog" -echo "$as_me:3594: found $ac_dir/$ac_word" >&5 +echo "$as_me:3997: found $ac_dir/$ac_word" >&5 break done @@ -3599,10 +4002,10 @@ fi fi CTAGS=$ac_cv_prog_CTAGS if test -n "$CTAGS"; then - echo "$as_me:3602: result: $CTAGS" >&5 + echo "$as_me:4005: result: $CTAGS" >&5 echo "${ECHO_T}$CTAGS" >&6 else - echo "$as_me:3605: result: no" >&5 + echo "$as_me:4008: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3613,7 +4016,7 @@ for ac_prog in exetags etags do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:3616: checking for $ac_word" >&5 +echo "$as_me:4019: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ETAGS+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3628,7 +4031,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ETAGS="$ac_prog" -echo "$as_me:3631: found $ac_dir/$ac_word" >&5 +echo "$as_me:4034: found $ac_dir/$ac_word" >&5 break done @@ -3636,10 +4039,10 @@ fi fi ETAGS=$ac_cv_prog_ETAGS if test -n "$ETAGS"; then - echo "$as_me:3639: result: $ETAGS" >&5 + echo "$as_me:4042: result: $ETAGS" >&5 echo "${ECHO_T}$ETAGS" >&6 else - echo "$as_me:3642: result: no" >&5 + echo "$as_me:4045: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3648,7 +4051,7 @@ done # Extract the first word of "${CTAGS:-ctags}", so it can be a program name with args. set dummy ${CTAGS:-ctags}; ac_word=$2 -echo "$as_me:3651: checking for $ac_word" >&5 +echo "$as_me:4054: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_MAKE_LOWER_TAGS+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3663,7 +4066,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_MAKE_LOWER_TAGS="yes" -echo "$as_me:3666: found $ac_dir/$ac_word" >&5 +echo "$as_me:4069: found $ac_dir/$ac_word" >&5 break done @@ -3672,17 +4075,17 @@ fi fi MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS if test -n "$MAKE_LOWER_TAGS"; then - echo "$as_me:3675: result: $MAKE_LOWER_TAGS" >&5 + echo "$as_me:4078: result: $MAKE_LOWER_TAGS" >&5 echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6 else - echo "$as_me:3678: result: no" >&5 + echo "$as_me:4081: result: no" >&5 echo "${ECHO_T}no" >&6 fi if test "$cf_cv_mixedcase" = yes ; then # Extract the first word of "${ETAGS:-etags}", so it can be a program name with args. set dummy ${ETAGS:-etags}; ac_word=$2 -echo "$as_me:3685: checking for $ac_word" >&5 +echo "$as_me:4088: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_MAKE_UPPER_TAGS+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3697,7 +4100,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_MAKE_UPPER_TAGS="yes" -echo "$as_me:3700: found $ac_dir/$ac_word" >&5 +echo "$as_me:4103: found $ac_dir/$ac_word" >&5 break done @@ -3706,10 +4109,10 @@ fi fi MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS if test -n "$MAKE_UPPER_TAGS"; then - echo "$as_me:3709: result: $MAKE_UPPER_TAGS" >&5 + echo "$as_me:4112: result: $MAKE_UPPER_TAGS" >&5 echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6 else - echo "$as_me:3712: result: no" >&5 + echo "$as_me:4115: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3729,7 +4132,7 @@ else MAKE_LOWER_TAGS="#" fi -echo "$as_me:3732: checking for makeflags variable" >&5 +echo "$as_me:4135: checking for makeflags variable" >&5 echo $ECHO_N "checking for makeflags variable... $ECHO_C" >&6 if test "${cf_cv_makeflags+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3759,7 +4162,7 @@ CF_EOF ;; (*) -echo "${as_me:-configure}:3762: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5 +echo "${as_me:-configure}:4165: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5 ;; esac @@ -3767,13 +4170,13 @@ echo "${as_me:-configure}:3762: testing given option \"$cf_option\",no match \"$ rm -f cf_makeflags.tmp fi -echo "$as_me:3770: result: $cf_cv_makeflags" >&5 +echo "$as_me:4173: result: $cf_cv_makeflags" >&5 echo "${ECHO_T}$cf_cv_makeflags" >&6 if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 -echo "$as_me:3776: checking for $ac_word" >&5 +echo "$as_me:4179: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_RANLIB+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3788,7 +4191,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" -echo "$as_me:3791: found $ac_dir/$ac_word" >&5 +echo "$as_me:4194: found $ac_dir/$ac_word" >&5 break done @@ -3796,10 +4199,10 @@ fi fi RANLIB=$ac_cv_prog_RANLIB if test -n "$RANLIB"; then - echo "$as_me:3799: result: $RANLIB" >&5 + echo "$as_me:4202: result: $RANLIB" >&5 echo "${ECHO_T}$RANLIB" >&6 else - echo "$as_me:3802: result: no" >&5 + echo "$as_me:4205: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3808,7 +4211,7 @@ if test -z "$ac_cv_prog_RANLIB"; then ac_ct_RANLIB=$RANLIB # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 -echo "$as_me:3811: checking for $ac_word" >&5 +echo "$as_me:4214: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3823,7 +4226,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_RANLIB="ranlib" -echo "$as_me:3826: found $ac_dir/$ac_word" >&5 +echo "$as_me:4229: found $ac_dir/$ac_word" >&5 break done @@ -3832,10 +4235,10 @@ fi fi ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB if test -n "$ac_ct_RANLIB"; then - echo "$as_me:3835: result: $ac_ct_RANLIB" >&5 + echo "$as_me:4238: result: $ac_ct_RANLIB" >&5 echo "${ECHO_T}$ac_ct_RANLIB" >&6 else - echo "$as_me:3838: result: no" >&5 + echo "$as_me:4241: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3847,7 +4250,7 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ld", so it can be a program name with args. set dummy ${ac_tool_prefix}ld; ac_word=$2 -echo "$as_me:3850: checking for $ac_word" >&5 +echo "$as_me:4253: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_LD+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3862,7 +4265,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_LD="${ac_tool_prefix}ld" -echo "$as_me:3865: found $ac_dir/$ac_word" >&5 +echo "$as_me:4268: found $ac_dir/$ac_word" >&5 break done @@ -3870,10 +4273,10 @@ fi fi LD=$ac_cv_prog_LD if test -n "$LD"; then - echo "$as_me:3873: result: $LD" >&5 + echo "$as_me:4276: result: $LD" >&5 echo "${ECHO_T}$LD" >&6 else - echo "$as_me:3876: result: no" >&5 + echo "$as_me:4279: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3882,7 +4285,7 @@ if test -z "$ac_cv_prog_LD"; then ac_ct_LD=$LD # Extract the first word of "ld", so it can be a program name with args. set dummy ld; ac_word=$2 -echo "$as_me:3885: checking for $ac_word" >&5 +echo "$as_me:4288: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_LD+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3897,7 +4300,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_LD="ld" -echo "$as_me:3900: found $ac_dir/$ac_word" >&5 +echo "$as_me:4303: found $ac_dir/$ac_word" >&5 break done @@ -3906,10 +4309,10 @@ fi fi ac_ct_LD=$ac_cv_prog_ac_ct_LD if test -n "$ac_ct_LD"; then - echo "$as_me:3909: result: $ac_ct_LD" >&5 + echo "$as_me:4312: result: $ac_ct_LD" >&5 echo "${ECHO_T}$ac_ct_LD" >&6 else - echo "$as_me:3912: result: no" >&5 + echo "$as_me:4315: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3921,7 +4324,7 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 -echo "$as_me:3924: checking for $ac_word" >&5 +echo "$as_me:4327: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_AR+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3936,7 +4339,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_AR="${ac_tool_prefix}ar" -echo "$as_me:3939: found $ac_dir/$ac_word" >&5 +echo "$as_me:4342: found $ac_dir/$ac_word" >&5 break done @@ -3944,10 +4347,10 @@ fi fi AR=$ac_cv_prog_AR if test -n "$AR"; then - echo "$as_me:3947: result: $AR" >&5 + echo "$as_me:4350: result: $AR" >&5 echo "${ECHO_T}$AR" >&6 else - echo "$as_me:3950: result: no" >&5 + echo "$as_me:4353: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3956,7 +4359,7 @@ if test -z "$ac_cv_prog_AR"; then ac_ct_AR=$AR # Extract the first word of "ar", so it can be a program name with args. set dummy ar; ac_word=$2 -echo "$as_me:3959: checking for $ac_word" >&5 +echo "$as_me:4362: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3971,7 +4374,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_AR="ar" -echo "$as_me:3974: found $ac_dir/$ac_word" >&5 +echo "$as_me:4377: found $ac_dir/$ac_word" >&5 break done @@ -3980,10 +4383,10 @@ fi fi ac_ct_AR=$ac_cv_prog_ac_ct_AR if test -n "$ac_ct_AR"; then - echo "$as_me:3983: result: $ac_ct_AR" >&5 + echo "$as_me:4386: result: $ac_ct_AR" >&5 echo "${ECHO_T}$ac_ct_AR" >&6 else - echo "$as_me:3986: result: no" >&5 + echo "$as_me:4389: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3995,7 +4398,7 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 -echo "$as_me:3998: checking for $ac_word" >&5 +echo "$as_me:4401: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_AR+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4010,7 +4413,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_AR="${ac_tool_prefix}ar" -echo "$as_me:4013: found $ac_dir/$ac_word" >&5 +echo "$as_me:4416: found $ac_dir/$ac_word" >&5 break done @@ -4018,10 +4421,10 @@ fi fi AR=$ac_cv_prog_AR if test -n "$AR"; then - echo "$as_me:4021: result: $AR" >&5 + echo "$as_me:4424: result: $AR" >&5 echo "${ECHO_T}$AR" >&6 else - echo "$as_me:4024: result: no" >&5 + echo "$as_me:4427: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4030,7 +4433,7 @@ if test -z "$ac_cv_prog_AR"; then ac_ct_AR=$AR # Extract the first word of "ar", so it can be a program name with args. set dummy ar; ac_word=$2 -echo "$as_me:4033: checking for $ac_word" >&5 +echo "$as_me:4436: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4045,7 +4448,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_AR="ar" -echo "$as_me:4048: found $ac_dir/$ac_word" >&5 +echo "$as_me:4451: found $ac_dir/$ac_word" >&5 break done @@ -4054,10 +4457,10 @@ fi fi ac_ct_AR=$ac_cv_prog_ac_ct_AR if test -n "$ac_ct_AR"; then - echo "$as_me:4057: result: $ac_ct_AR" >&5 + echo "$as_me:4460: result: $ac_ct_AR" >&5 echo "${ECHO_T}$ac_ct_AR" >&6 else - echo "$as_me:4060: result: no" >&5 + echo "$as_me:4463: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4066,7 +4469,7 @@ else AR="$ac_cv_prog_AR" fi -echo "$as_me:4069: checking for options to update archives" >&5 +echo "$as_me:4472: checking for options to update archives" >&5 echo $ECHO_N "checking for options to update archives... $ECHO_C" >&6 if test "${cf_cv_ar_flags+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4103,13 +4506,13 @@ else rm -f conftest.a cat >"conftest.$ac_ext" <&5 + if { (eval echo "$as_me:4512: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4112: \$? = $ac_status" >&5 + echo "$as_me:4515: \$? = $ac_status" >&5 (exit "$ac_status"); } ; then echo "$AR $ARFLAGS $cf_ar_flags conftest.a conftest.$ac_cv_objext" >&5 $AR $ARFLAGS "$cf_ar_flags" conftest.a "conftest.$ac_cv_objext" 2>&5 1>/dev/null @@ -4120,7 +4523,7 @@ EOF else test -n "$verbose" && echo " cannot compile test-program" 1>&6 -echo "${as_me:-configure}:4123: testing cannot compile test-program ..." 1>&5 +echo "${as_me:-configure}:4526: testing cannot compile test-program ..." 1>&5 break fi @@ -4130,7 +4533,7 @@ echo "${as_me:-configure}:4123: testing cannot compile test-program ..." 1>&5 esac fi -echo "$as_me:4133: result: $cf_cv_ar_flags" >&5 +echo "$as_me:4536: result: $cf_cv_ar_flags" >&5 echo "${ECHO_T}$cf_cv_ar_flags" >&6 if test -n "$ARFLAGS" ; then @@ -4141,31 +4544,57 @@ else ARFLAGS=$cf_cv_ar_flags fi - echo "$as_me:4144: checking for PATH separator" >&5 + echo "$as_me:4547: checking for PATH separator" >&5 echo $ECHO_N "checking for PATH separator... $ECHO_C" >&6 case "$cf_cv_system_name" in (os2*) PATH_SEPARATOR=';' ;; (*) ${PATH_SEPARATOR:=':'} ;; esac - echo "$as_me:4151: result: $PATH_SEPARATOR" >&5 + echo "$as_me:4554: result: $PATH_SEPARATOR" >&5 echo "${ECHO_T}$PATH_SEPARATOR" >&6 -echo "$as_me:4154: checking if you have specified an install-prefix" >&5 -echo $ECHO_N "checking if you have specified an install-prefix... $ECHO_C" >&6 +echo "$as_me:4557: checking for an installation directory prefix" >&5 +echo $ECHO_N "checking for an installation directory prefix... $ECHO_C" >&6 # Check whether --with-install-prefix or --without-install-prefix was given. if test "${with_install_prefix+set}" = set; then withval="$with_install_prefix" - case "$withval" in - (yes|no) + case "x$withval" in + (xyes|xno) ;; (*) DESTDIR="$withval" ;; esac fi; -echo "$as_me:4167: result: $DESTDIR" >&5 -echo "${ECHO_T}$DESTDIR" >&6 +echo "$as_me:4570: result: ${DESTDIR:-(none)}" >&5 +echo "${ECHO_T}${DESTDIR:-(none)}" >&6 + +echo "$as_me:4573: checking if installation directory prefix should be merged" >&5 +echo $ECHO_N "checking if installation directory prefix should be merged... $ECHO_C" >&6 + +# Check whether --enable-install-prefix or --disable-install-prefix was given. +if test "${enable_install_prefix+set}" = set; then + enableval="$enable_install_prefix" + test "$enableval" != yes && enableval=no + if test "$enableval" != "no" ; then + cf_install_prefix=yes + else + cf_install_prefix=no + fi +else + enableval=no + cf_install_prefix=no + +fi; +echo "$as_me:4590: result: $cf_install_prefix" >&5 +echo "${ECHO_T}$cf_install_prefix" >&6 + +if test "$cf_install_prefix" = yes ; then + MERGE_PREFIX=':$(prefix)%=%' +else + MERGE_PREFIX='' +fi ############################################################################### @@ -4192,7 +4621,7 @@ else do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:4195: checking for $ac_word" >&5 +echo "$as_me:4624: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_BUILD_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4207,7 +4636,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_BUILD_CC="$ac_prog" -echo "$as_me:4210: found $ac_dir/$ac_word" >&5 +echo "$as_me:4639: found $ac_dir/$ac_word" >&5 break done @@ -4215,10 +4644,10 @@ fi fi BUILD_CC=$ac_cv_prog_BUILD_CC if test -n "$BUILD_CC"; then - echo "$as_me:4218: result: $BUILD_CC" >&5 + echo "$as_me:4647: result: $BUILD_CC" >&5 echo "${ECHO_T}$BUILD_CC" >&6 else - echo "$as_me:4221: result: no" >&5 + echo "$as_me:4650: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4227,12 +4656,12 @@ done test -n "$BUILD_CC" || BUILD_CC="none" fi; - echo "$as_me:4230: checking for native build C compiler" >&5 + echo "$as_me:4659: checking for native build C compiler" >&5 echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6 - echo "$as_me:4232: result: $BUILD_CC" >&5 + echo "$as_me:4661: result: $BUILD_CC" >&5 echo "${ECHO_T}$BUILD_CC" >&6 - echo "$as_me:4235: checking for native build C preprocessor" >&5 + echo "$as_me:4664: checking for native build C preprocessor" >&5 echo $ECHO_N "checking for native build C preprocessor... $ECHO_C" >&6 # Check whether --with-build-cpp or --without-build-cpp was given. @@ -4242,10 +4671,10 @@ if test "${with_build_cpp+set}" = set; then else BUILD_CPP='${BUILD_CC} -E' fi; - echo "$as_me:4245: result: $BUILD_CPP" >&5 + echo "$as_me:4674: result: $BUILD_CPP" >&5 echo "${ECHO_T}$BUILD_CPP" >&6 - echo "$as_me:4248: checking for native build C flags" >&5 + echo "$as_me:4677: checking for native build C flags" >&5 echo $ECHO_N "checking for native build C flags... $ECHO_C" >&6 # Check whether --with-build-cflags or --without-build-cflags was given. @@ -4253,10 +4682,10 @@ if test "${with_build_cflags+set}" = set; then withval="$with_build_cflags" BUILD_CFLAGS="$withval" fi; - echo "$as_me:4256: result: $BUILD_CFLAGS" >&5 + echo "$as_me:4685: result: $BUILD_CFLAGS" >&5 echo "${ECHO_T}$BUILD_CFLAGS" >&6 - echo "$as_me:4259: checking for native build C preprocessor-flags" >&5 + echo "$as_me:4688: checking for native build C preprocessor-flags" >&5 echo $ECHO_N "checking for native build C preprocessor-flags... $ECHO_C" >&6 # Check whether --with-build-cppflags or --without-build-cppflags was given. @@ -4264,10 +4693,10 @@ if test "${with_build_cppflags+set}" = set; then withval="$with_build_cppflags" BUILD_CPPFLAGS="$withval" fi; - echo "$as_me:4267: result: $BUILD_CPPFLAGS" >&5 + echo "$as_me:4696: result: $BUILD_CPPFLAGS" >&5 echo "${ECHO_T}$BUILD_CPPFLAGS" >&6 - echo "$as_me:4270: checking for native build linker-flags" >&5 + echo "$as_me:4699: checking for native build linker-flags" >&5 echo $ECHO_N "checking for native build linker-flags... $ECHO_C" >&6 # Check whether --with-build-ldflags or --without-build-ldflags was given. @@ -4275,10 +4704,10 @@ if test "${with_build_ldflags+set}" = set; then withval="$with_build_ldflags" BUILD_LDFLAGS="$withval" fi; - echo "$as_me:4278: result: $BUILD_LDFLAGS" >&5 + echo "$as_me:4707: result: $BUILD_LDFLAGS" >&5 echo "${ECHO_T}$BUILD_LDFLAGS" >&6 - echo "$as_me:4281: checking for native build linker-libraries" >&5 + echo "$as_me:4710: checking for native build linker-libraries" >&5 echo $ECHO_N "checking for native build linker-libraries... $ECHO_C" >&6 # Check whether --with-build-libs or --without-build-libs was given. @@ -4286,7 +4715,7 @@ if test "${with_build_libs+set}" = set; then withval="$with_build_libs" BUILD_LIBS="$withval" fi; - echo "$as_me:4289: result: $BUILD_LIBS" >&5 + echo "$as_me:4718: result: $BUILD_LIBS" >&5 echo "${ECHO_T}$BUILD_LIBS" >&6 # this assumes we're on Unix. @@ -4295,7 +4724,7 @@ echo "${ECHO_T}$BUILD_LIBS" >&6 : ${BUILD_CC:='${CC}'} - echo "$as_me:4298: checking if the build-compiler \"$BUILD_CC\" works" >&5 + echo "$as_me:4727: checking if the build-compiler \"$BUILD_CC\" works" >&5 echo $ECHO_N "checking if the build-compiler \"$BUILD_CC\" works... $ECHO_C" >&6 cf_save_crossed=$cross_compiling @@ -4309,25 +4738,25 @@ echo $ECHO_N "checking if the build-compiler \"$BUILD_CC\" works... $ECHO_C" >&6 cf_ok_build_cc=unknown else cat >"conftest.$ac_ext" <<_ACEOF -#line 4312 "configure" +#line 4741 "configure" #include "confdefs.h" #include int main(int argc, char *argv[]) { - ${cf_cv_main_return:-return}(argc < 0 || argv == 0 || argv[0] == 0); + ${cf_cv_main_return:-return}(argc < 0 || argv == (void*)0 || argv[0] == (void*)0); } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:4322: \"$ac_link\"") >&5 +if { (eval echo "$as_me:4751: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4325: \$? = $ac_status" >&5 + echo "$as_me:4754: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:4327: \"$ac_try\"") >&5 + { (eval echo "$as_me:4756: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4330: \$? = $ac_status" >&5 + echo "$as_me:4759: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_ok_build_cc=yes else @@ -4342,12 +4771,12 @@ fi cross_compiling=$cf_save_crossed ac_link=$cf_save_ac_link - echo "$as_me:4345: result: $cf_ok_build_cc" >&5 + echo "$as_me:4774: result: $cf_ok_build_cc" >&5 echo "${ECHO_T}$cf_ok_build_cc" >&6 if test "$cf_ok_build_cc" != yes then - { { echo "$as_me:4350: error: Cross-build requires two compilers. + { { echo "$as_me:4779: error: Cross-build requires two compilers. Use --with-build-cc to specify the native compiler." >&5 echo "$as_me: error: Cross-build requires two compilers. Use --with-build-cc to specify the native compiler." >&2;} @@ -4372,7 +4801,7 @@ fi ### shared, for example. cf_list_models="" -echo "$as_me:4375: checking if you want to build shared C-objects" >&5 +echo "$as_me:4804: checking if you want to build shared C-objects" >&5 echo $ECHO_N "checking if you want to build shared C-objects... $ECHO_C" >&6 # Check whether --with-shared or --without-shared was given. @@ -4382,27 +4811,27 @@ if test "${with_shared+set}" = set; then else with_shared=no fi; -echo "$as_me:4385: result: $with_shared" >&5 +echo "$as_me:4814: result: $with_shared" >&5 echo "${ECHO_T}$with_shared" >&6 test "$with_shared" = "yes" && cf_list_models="$cf_list_models shared" -echo "$as_me:4389: checking for specified models" >&5 +echo "$as_me:4818: checking for specified models" >&5 echo $ECHO_N "checking for specified models... $ECHO_C" >&6 test -z "$cf_list_models" && cf_list_models=normal -echo "$as_me:4392: result: $cf_list_models" >&5 +echo "$as_me:4821: result: $cf_list_models" >&5 echo "${ECHO_T}$cf_list_models" >&6 ### Use the first model as the default, and save its suffix for use in building ### up test-applications. -echo "$as_me:4397: checking for default model" >&5 +echo "$as_me:4826: checking for default model" >&5 echo $ECHO_N "checking for default model... $ECHO_C" >&6 DFT_LWR_MODEL=`echo "$cf_list_models" | $AWK '{print $1}'` -echo "$as_me:4400: result: $DFT_LWR_MODEL" >&5 +echo "$as_me:4829: result: $DFT_LWR_MODEL" >&5 echo "${ECHO_T}$DFT_LWR_MODEL" >&6 DFT_UPR_MODEL=`echo "$DFT_LWR_MODEL" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` -echo "$as_me:4405: checking for specific curses-directory" >&5 +echo "$as_me:4834: checking for specific curses-directory" >&5 echo $ECHO_N "checking for specific curses-directory... $ECHO_C" >&6 # Check whether --with-curses-dir or --without-curses-dir was given. @@ -4412,7 +4841,7 @@ if test "${with_curses_dir+set}" = set; then else cf_cv_curses_dir=no fi; -echo "$as_me:4415: result: $cf_cv_curses_dir" >&5 +echo "$as_me:4844: result: $cf_cv_curses_dir" >&5 echo "${ECHO_T}$cf_cv_curses_dir" >&6 if test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" @@ -4424,26 +4853,24 @@ else cf_path_syntax="$ac_default_prefix" fi -case ".$withval" in -(.\$\(*\)*|.\'*\'*) +case "x$withval" in +(x\$\(*\)*|x\'*\'*) ;; -(..|./*|.\\*) +(x.|x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER) ;; -(.[a-zA-Z]:[\\/]*) # OS/2 EMX - ;; -(.\$\{*prefix\}*|.\$\{*dir\}*) +(x\$\{*prefix\}*|x\$\{*dir\}*) eval withval="$withval" - case ".$withval" in - (.NONE/*) + case "x$withval" in + (xNONE/*) withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%` ;; esac ;; -(.no|.NONE/*) +(xno|xNONE/*) withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { { echo "$as_me:4446: error: expected a pathname, not \"$withval\"" >&5 + { { echo "$as_me:4873: error: expected a pathname, not \"$withval\"" >&5 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -4479,7 +4906,7 @@ if test -n "$cf_cv_curses_dir/include" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 4482 "configure" +#line 4909 "configure" #include "confdefs.h" #include int @@ -4491,16 +4918,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:4494: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4921: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4497: \$? = $ac_status" >&5 + echo "$as_me:4924: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:4500: \"$ac_try\"") >&5 + { (eval echo "$as_me:4927: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4503: \$? = $ac_status" >&5 + echo "$as_me:4930: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -4517,7 +4944,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:4520: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:4947: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -4553,7 +4980,7 @@ if test -n "$cf_cv_curses_dir/lib" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:4556: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:4983: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -4568,13 +4995,13 @@ cf_ncuconfig_root=ncurses cf_have_ncuconfig=no if test "x${PKG_CONFIG:=none}" != xnone; then - echo "$as_me:4571: checking pkg-config for $cf_ncuconfig_root" >&5 + echo "$as_me:4998: checking pkg-config for $cf_ncuconfig_root" >&5 echo $ECHO_N "checking pkg-config for $cf_ncuconfig_root... $ECHO_C" >&6 if "$PKG_CONFIG" --exists $cf_ncuconfig_root ; then - echo "$as_me:4574: result: yes" >&5 + echo "$as_me:5001: result: yes" >&5 echo "${ECHO_T}yes" >&6 - echo "$as_me:4577: checking if the $cf_ncuconfig_root package files work" >&5 + echo "$as_me:5004: checking if the $cf_ncuconfig_root package files work" >&5 echo $ECHO_N "checking if the $cf_ncuconfig_root package files work... $ECHO_C" >&6 cf_have_ncuconfig=unknown @@ -4707,7 +5134,7 @@ done LIBS="$cf_add_libs" cat >"conftest.$ac_ext" <<_ACEOF -#line 4710 "configure" +#line 5137 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -4719,37 +5146,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:4722: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5149: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4725: \$? = $ac_status" >&5 + echo "$as_me:5152: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:4728: \"$ac_try\"") >&5 + { (eval echo "$as_me:5155: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4731: \$? = $ac_status" >&5 + echo "$as_me:5158: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then if test "$cross_compiling" = yes; then cf_test_ncuconfig=maybe else cat >"conftest.$ac_ext" <<_ACEOF -#line 4737 "configure" +#line 5164 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int main(void) { const char *xx = curses_version(); return (xx == 0); } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:4744: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5171: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4747: \$? = $ac_status" >&5 + echo "$as_me:5174: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:4749: \"$ac_try\"") >&5 + { (eval echo "$as_me:5176: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4752: \$? = $ac_status" >&5 + echo "$as_me:5179: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_test_ncuconfig=yes else @@ -4780,6 +5207,20 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" ;; esac +for cf_required in $cf_ncuconfig_root +do + # check for duplicates + for cf_require_pkg in $REQUIRE_PKG + do + if test "$cf_required" = "$cf_require_pkg" + then + cf_required= + break + fi + done + test -n "$cf_required" && REQUIRE_PKG="$REQUIRE_PKG $cf_required" +done + for cf_add_cflags in $cf_pkg_cflags do case "x$cf_add_cflags" in @@ -4923,7 +5364,7 @@ done LIBS="$cf_add_libs" cat >"conftest.$ac_ext" <<_ACEOF -#line 4926 "configure" +#line 5367 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -4935,37 +5376,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:4938: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5379: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4941: \$? = $ac_status" >&5 + echo "$as_me:5382: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:4944: \"$ac_try\"") >&5 + { (eval echo "$as_me:5385: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4947: \$? = $ac_status" >&5 + echo "$as_me:5388: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then if test "$cross_compiling" = yes; then cf_have_ncuconfig=maybe else cat >"conftest.$ac_ext" <<_ACEOF -#line 4953 "configure" +#line 5394 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int main(void) { const char *xx = curses_version(); return (xx == 0); } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:4960: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5401: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4963: \$? = $ac_status" >&5 + echo "$as_me:5404: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:4965: \"$ac_try\"") >&5 + { (eval echo "$as_me:5406: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4968: \$? = $ac_status" >&5 + echo "$as_me:5409: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_have_ncuconfig=yes else @@ -4982,7 +5423,7 @@ cat "conftest.$ac_ext" >&5 cf_have_ncuconfig=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - echo "$as_me:4985: result: $cf_have_ncuconfig" >&5 + echo "$as_me:5426: result: $cf_have_ncuconfig" >&5 echo "${ECHO_T}$cf_have_ncuconfig" >&6 test "$cf_have_ncuconfig" = maybe && cf_have_ncuconfig=yes if test "$cf_have_ncuconfig" != "yes" @@ -4998,7 +5439,7 @@ EOF NCURSES_CONFIG_PKG=$cf_ncuconfig_root -echo "$as_me:5001: checking for terminfo header" >&5 +echo "$as_me:5442: checking for terminfo header" >&5 echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6 if test "${cf_cv_term_header+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5016,7 +5457,7 @@ esac for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do cat >"conftest.$ac_ext" <<_ACEOF -#line 5019 "configure" +#line 5460 "configure" #include "confdefs.h" #include #include <${cf_cv_ncurses_header:-curses.h}> @@ -5031,16 +5472,16 @@ int x = auto_left_margin; (void)x } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:5034: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5475: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5037: \$? = $ac_status" >&5 + echo "$as_me:5478: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:5040: \"$ac_try\"") >&5 + { (eval echo "$as_me:5481: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5043: \$? = $ac_status" >&5 + echo "$as_me:5484: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_term_header="$cf_test" @@ -5056,7 +5497,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:5059: result: $cf_cv_term_header" >&5 +echo "$as_me:5500: result: $cf_cv_term_header" >&5 echo "${ECHO_T}$cf_cv_term_header" >&6 # Set definitions to allow ifdef'ing to accommodate subdirectories @@ -5091,7 +5532,7 @@ esac fi else - echo "$as_me:5094: result: no" >&5 + echo "$as_me:5535: result: no" >&5 echo "${ECHO_T}no" >&6 NCURSES_CONFIG_PKG=none fi @@ -5107,7 +5548,7 @@ if test -n "$ac_tool_prefix"; then do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:5110: checking for $ac_word" >&5 +echo "$as_me:5551: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_NCURSES_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5122,7 +5563,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog" -echo "$as_me:5125: found $ac_dir/$ac_word" >&5 +echo "$as_me:5566: found $ac_dir/$ac_word" >&5 break done @@ -5130,10 +5571,10 @@ fi fi NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG if test -n "$NCURSES_CONFIG"; then - echo "$as_me:5133: result: $NCURSES_CONFIG" >&5 + echo "$as_me:5574: result: $NCURSES_CONFIG" >&5 echo "${ECHO_T}$NCURSES_CONFIG" >&6 else - echo "$as_me:5136: result: no" >&5 + echo "$as_me:5577: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -5146,7 +5587,7 @@ if test -z "$NCURSES_CONFIG"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:5149: checking for $ac_word" >&5 +echo "$as_me:5590: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_NCURSES_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5161,7 +5602,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog" -echo "$as_me:5164: found $ac_dir/$ac_word" >&5 +echo "$as_me:5605: found $ac_dir/$ac_word" >&5 break done @@ -5169,10 +5610,10 @@ fi fi ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG if test -n "$ac_ct_NCURSES_CONFIG"; then - echo "$as_me:5172: result: $ac_ct_NCURSES_CONFIG" >&5 + echo "$as_me:5613: result: $ac_ct_NCURSES_CONFIG" >&5 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6 else - echo "$as_me:5175: result: no" >&5 + echo "$as_me:5616: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -5329,7 +5770,7 @@ LIBS="$cf_add_libs" # even with config script, some packages use no-override for curses.h -echo "$as_me:5332: checking if we have identified curses headers" >&5 +echo "$as_me:5773: checking if we have identified curses headers" >&5 echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6 if test "${cf_cv_ncurses_header+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5341,7 +5782,7 @@ for cf_header in \ curses.h ncurses/curses.h do cat >"conftest.$ac_ext" <<_ACEOF -#line 5344 "configure" +#line 5785 "configure" #include "confdefs.h" #include <${cf_header}> int @@ -5353,16 +5794,16 @@ initscr(); endwin() } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:5356: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5797: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5359: \$? = $ac_status" >&5 + echo "$as_me:5800: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:5362: \"$ac_try\"") >&5 + { (eval echo "$as_me:5803: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5365: \$? = $ac_status" >&5 + echo "$as_me:5806: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_header=$cf_header; break else @@ -5373,11 +5814,11 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:5376: result: $cf_cv_ncurses_header" >&5 +echo "$as_me:5817: result: $cf_cv_ncurses_header" >&5 echo "${ECHO_T}$cf_cv_ncurses_header" >&6 if test "$cf_cv_ncurses_header" = none ; then - { { echo "$as_me:5380: error: No curses header-files found" >&5 + { { echo "$as_me:5821: error: No curses header-files found" >&5 echo "$as_me: error: No curses header-files found" >&2;} { (exit 1); exit 1; }; } fi @@ -5387,23 +5828,23 @@ fi for ac_header in $cf_cv_ncurses_header do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:5390: checking for $ac_header" >&5 +echo "$as_me:5831: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 5396 "configure" +#line 5837 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:5400: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:5841: \"$ac_cpp "conftest.$ac_ext"\"") >&5 (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:5406: \$? = $ac_status" >&5 + echo "$as_me:5847: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -5422,7 +5863,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:5425: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:5866: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then cat >>confdefs.h <"conftest.$ac_ext" <<_ACEOF -#line 5481 "configure" +#line 5922 "configure" #include "confdefs.h" #include int @@ -5490,16 +5931,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:5493: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5934: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5496: \$? = $ac_status" >&5 + echo "$as_me:5937: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:5499: \"$ac_try\"") >&5 + { (eval echo "$as_me:5940: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5502: \$? = $ac_status" >&5 + echo "$as_me:5943: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -5516,7 +5957,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:5519: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:5960: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -5535,7 +5976,7 @@ fi } -echo "$as_me:5538: checking for $cf_ncuhdr_root header in include-path" >&5 +echo "$as_me:5979: checking for $cf_ncuhdr_root header in include-path" >&5 echo $ECHO_N "checking for $cf_ncuhdr_root header in include-path... $ECHO_C" >&6 if test "${cf_cv_ncurses_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5547,7 +5988,7 @@ else do cat >"conftest.$ac_ext" <<_ACEOF -#line 5550 "configure" +#line 5991 "configure" #include "confdefs.h" #include <$cf_header> @@ -5571,16 +6012,16 @@ printf("old\\n"); } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:5574: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6015: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5577: \$? = $ac_status" >&5 + echo "$as_me:6018: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:5580: \"$ac_try\"") >&5 + { (eval echo "$as_me:6021: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5583: \$? = $ac_status" >&5 + echo "$as_me:6024: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_h=$cf_header @@ -5595,14 +6036,14 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:5598: result: $cf_cv_ncurses_h" >&5 +echo "$as_me:6039: result: $cf_cv_ncurses_h" >&5 echo "${ECHO_T}$cf_cv_ncurses_h" >&6 if test "$cf_cv_ncurses_h" != no ; then cf_cv_ncurses_header=$cf_cv_ncurses_h else -echo "$as_me:5605: checking for $cf_ncuhdr_root include-path" >&5 +echo "$as_me:6046: checking for $cf_ncuhdr_root include-path" >&5 echo $ECHO_N "checking for $cf_ncuhdr_root include-path... $ECHO_C" >&6 if test "${cf_cv_ncurses_h2+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5723,7 +6164,7 @@ if test -n "$cf_incdir" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 5726 "configure" +#line 6167 "configure" #include "confdefs.h" #include int @@ -5735,16 +6176,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:5738: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6179: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5741: \$? = $ac_status" >&5 + echo "$as_me:6182: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:5744: \"$ac_try\"") >&5 + { (eval echo "$as_me:6185: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5747: \$? = $ac_status" >&5 + echo "$as_me:6188: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -5761,7 +6202,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:5764: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:6205: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -5784,7 +6225,7 @@ fi do cat >"conftest.$ac_ext" <<_ACEOF -#line 5787 "configure" +#line 6228 "configure" #include "confdefs.h" #include <$cf_header> @@ -5808,16 +6249,16 @@ printf("old\\n"); } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:5811: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6252: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5814: \$? = $ac_status" >&5 + echo "$as_me:6255: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:5817: \"$ac_try\"") >&5 + { (eval echo "$as_me:6258: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5820: \$? = $ac_status" >&5 + echo "$as_me:6261: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_h2=$cf_header @@ -5838,12 +6279,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" CPPFLAGS="$cf_save2_CPPFLAGS" test "$cf_cv_ncurses_h2" != no && break done - test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:5841: error: not found" >&5 + test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:6282: error: not found" >&5 echo "$as_me: error: not found" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:5846: result: $cf_cv_ncurses_h2" >&5 +echo "$as_me:6287: result: $cf_cv_ncurses_h2" >&5 echo "${ECHO_T}$cf_cv_ncurses_h2" >&6 cf_1st_incdir=`echo "$cf_cv_ncurses_h2" | sed -e 's%/[^/]*$%%'` @@ -5879,7 +6320,7 @@ if test -n "$cf_1st_incdir" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 5882 "configure" +#line 6323 "configure" #include "confdefs.h" #include int @@ -5891,16 +6332,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:5894: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6335: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5897: \$? = $ac_status" >&5 + echo "$as_me:6338: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:5900: \"$ac_try\"") >&5 + { (eval echo "$as_me:6341: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5903: \$? = $ac_status" >&5 + echo "$as_me:6344: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -5917,7 +6358,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:5920: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:6361: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -5965,7 +6406,7 @@ EOF ;; esac -echo "$as_me:5968: checking for terminfo header" >&5 +echo "$as_me:6409: checking for terminfo header" >&5 echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6 if test "${cf_cv_term_header+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5983,7 +6424,7 @@ esac for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do cat >"conftest.$ac_ext" <<_ACEOF -#line 5986 "configure" +#line 6427 "configure" #include "confdefs.h" #include #include <${cf_cv_ncurses_header:-curses.h}> @@ -5998,16 +6439,16 @@ int x = auto_left_margin; (void)x } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:6001: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6442: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6004: \$? = $ac_status" >&5 + echo "$as_me:6445: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:6007: \"$ac_try\"") >&5 + { (eval echo "$as_me:6448: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6010: \$? = $ac_status" >&5 + echo "$as_me:6451: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_term_header="$cf_test" @@ -6023,7 +6464,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:6026: result: $cf_cv_term_header" >&5 +echo "$as_me:6467: result: $cf_cv_term_header" >&5 echo "${ECHO_T}$cf_cv_term_header" >&6 # Set definitions to allow ifdef'ing to accommodate subdirectories @@ -6061,7 +6502,7 @@ cat >>confdefs.h <<\EOF #define NCURSES 1 EOF -echo "$as_me:6064: checking for ncurses version" >&5 +echo "$as_me:6505: checking for ncurses version" >&5 echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6 if test "${cf_cv_ncurses_version+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6087,10 +6528,10 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo "$as_me:6090: \"$cf_try\"") >&5 + { (eval echo "$as_me:6531: \"$cf_try\"") >&5 (eval $cf_try) 2>&5 ac_status=$? - echo "$as_me:6093: \$? = $ac_status" >&5 + echo "$as_me:6534: \$? = $ac_status" >&5 (exit "$ac_status"); } if test -f conftest.out ; then cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out` @@ -6100,7 +6541,7 @@ EOF else cat >"conftest.$ac_ext" <<_ACEOF -#line 6103 "configure" +#line 6544 "configure" #include "confdefs.h" $ac_includes_default @@ -6120,22 +6561,22 @@ int main(void) # ifdef __NCURSES_H fprintf(fp, "old\\n"); # else - make an error + #error expected ncurses header to define __NCURSES_H # endif #endif ${cf_cv_main_return:-return}(0); } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:6130: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6571: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6133: \$? = $ac_status" >&5 + echo "$as_me:6574: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:6135: \"$ac_try\"") >&5 + { (eval echo "$as_me:6576: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6138: \$? = $ac_status" >&5 + echo "$as_me:6579: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_version=`cat $cf_tempfile` @@ -6149,7 +6590,7 @@ fi rm -f "$cf_tempfile" fi -echo "$as_me:6152: result: $cf_cv_ncurses_version" >&5 +echo "$as_me:6593: result: $cf_cv_ncurses_version" >&5 echo "${ECHO_T}$cf_cv_ncurses_version" >&6 test "$cf_cv_ncurses_version" = no || cat >>confdefs.h <<\EOF @@ -6162,7 +6603,7 @@ cf_nculib_root=ncurses # to link gpm. cf_ncurses_LIBS="" cf_ncurses_SAVE="$LIBS" -echo "$as_me:6165: checking for Gpm_Open in -lgpm" >&5 +echo "$as_me:6606: checking for Gpm_Open in -lgpm" >&5 echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6 if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6170,7 +6611,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 6173 "configure" +#line 6614 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -6179,7 +6620,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char Gpm_Open (); +char Gpm_Open (void); int main (void) { @@ -6189,16 +6630,16 @@ Gpm_Open (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:6192: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6633: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6195: \$? = $ac_status" >&5 + echo "$as_me:6636: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:6198: \"$ac_try\"") >&5 + { (eval echo "$as_me:6639: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6201: \$? = $ac_status" >&5 + echo "$as_me:6642: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_gpm_Gpm_Open=yes else @@ -6209,10 +6650,10 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:6212: result: $ac_cv_lib_gpm_Gpm_Open" >&5 +echo "$as_me:6653: result: $ac_cv_lib_gpm_Gpm_Open" >&5 echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6 if test "$ac_cv_lib_gpm_Gpm_Open" = yes; then - echo "$as_me:6215: checking for initscr in -lgpm" >&5 + echo "$as_me:6656: checking for initscr in -lgpm" >&5 echo $ECHO_N "checking for initscr in -lgpm... $ECHO_C" >&6 if test "${ac_cv_lib_gpm_initscr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6220,7 +6661,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 6223 "configure" +#line 6664 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -6229,7 +6670,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char initscr (); +char initscr (void); int main (void) { @@ -6239,16 +6680,16 @@ initscr (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:6242: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6683: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6245: \$? = $ac_status" >&5 + echo "$as_me:6686: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:6248: \"$ac_try\"") >&5 + { (eval echo "$as_me:6689: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6251: \$? = $ac_status" >&5 + echo "$as_me:6692: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_gpm_initscr=yes else @@ -6259,7 +6700,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:6262: result: $ac_cv_lib_gpm_initscr" >&5 +echo "$as_me:6703: result: $ac_cv_lib_gpm_initscr" >&5 echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6 if test "$ac_cv_lib_gpm_initscr" = yes; then LIBS="$cf_ncurses_SAVE" @@ -6274,7 +6715,7 @@ case "$host_os" in # This is only necessary if you are linking against an obsolete # version of ncurses (but it should do no harm, since it is static). if test "$cf_nculib_root" = ncurses ; then - echo "$as_me:6277: checking for tgoto in -lmytinfo" >&5 + echo "$as_me:6718: checking for tgoto in -lmytinfo" >&5 echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6 if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6282,7 +6723,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lmytinfo $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 6285 "configure" +#line 6726 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -6291,7 +6732,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char tgoto (); +char tgoto (void); int main (void) { @@ -6301,16 +6742,16 @@ tgoto (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:6304: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6745: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6307: \$? = $ac_status" >&5 + echo "$as_me:6748: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:6310: \"$ac_try\"") >&5 + { (eval echo "$as_me:6751: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6313: \$? = $ac_status" >&5 + echo "$as_me:6754: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_mytinfo_tgoto=yes else @@ -6321,7 +6762,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:6324: result: $ac_cv_lib_mytinfo_tgoto" >&5 +echo "$as_me:6765: result: $ac_cv_lib_mytinfo_tgoto" >&5 echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6 if test "$ac_cv_lib_mytinfo_tgoto" = yes; then cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS" @@ -6370,13 +6811,13 @@ else eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no' cf_libdir="" - echo "$as_me:6373: checking for initscr" >&5 + echo "$as_me:6814: checking for initscr" >&5 echo $ECHO_N "checking for initscr... $ECHO_C" >&6 if test "${ac_cv_func_initscr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 6379 "configure" +#line 6820 "configure" #include "confdefs.h" #define initscr autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -6407,16 +6848,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:6410: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6851: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6413: \$? = $ac_status" >&5 + echo "$as_me:6854: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:6416: \"$ac_try\"") >&5 + { (eval echo "$as_me:6857: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6419: \$? = $ac_status" >&5 + echo "$as_me:6860: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_initscr=yes else @@ -6426,18 +6867,18 @@ ac_cv_func_initscr=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:6429: result: $ac_cv_func_initscr" >&5 +echo "$as_me:6870: result: $ac_cv_func_initscr" >&5 echo "${ECHO_T}$ac_cv_func_initscr" >&6 if test "$ac_cv_func_initscr" = yes; then eval 'cf_cv_have_lib_'"$cf_nculib_root"'=yes' else cf_save_LIBS="$LIBS" - echo "$as_me:6436: checking for initscr in -l$cf_nculib_root" >&5 + echo "$as_me:6877: checking for initscr in -l$cf_nculib_root" >&5 echo $ECHO_N "checking for initscr in -l$cf_nculib_root... $ECHO_C" >&6 LIBS="-l$cf_nculib_root $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 6440 "configure" +#line 6881 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -6449,25 +6890,25 @@ initscr() } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:6452: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6893: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6455: \$? = $ac_status" >&5 + echo "$as_me:6896: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:6458: \"$ac_try\"") >&5 + { (eval echo "$as_me:6899: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6461: \$? = $ac_status" >&5 + echo "$as_me:6902: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - echo "$as_me:6463: result: yes" >&5 + echo "$as_me:6904: result: yes" >&5 echo "${ECHO_T}yes" >&6 eval 'cf_cv_have_lib_'"$cf_nculib_root"'=yes' else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 -echo "$as_me:6470: result: no" >&5 +echo "$as_me:6911: result: no" >&5 echo "${ECHO_T}no" >&6 cf_search= @@ -6535,11 +6976,11 @@ cf_search="$cf_library_path_list $cf_search" for cf_libdir in $cf_search do - echo "$as_me:6538: checking for -l$cf_nculib_root in $cf_libdir" >&5 + echo "$as_me:6979: checking for -l$cf_nculib_root in $cf_libdir" >&5 echo $ECHO_N "checking for -l$cf_nculib_root in $cf_libdir... $ECHO_C" >&6 LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 6542 "configure" +#line 6983 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -6551,25 +6992,25 @@ initscr() } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:6554: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6995: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6557: \$? = $ac_status" >&5 + echo "$as_me:6998: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:6560: \"$ac_try\"") >&5 + { (eval echo "$as_me:7001: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6563: \$? = $ac_status" >&5 + echo "$as_me:7004: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - echo "$as_me:6565: result: yes" >&5 + echo "$as_me:7006: result: yes" >&5 echo "${ECHO_T}yes" >&6 eval 'cf_cv_have_lib_'"$cf_nculib_root"'=yes' break else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 -echo "$as_me:6572: result: no" >&5 +echo "$as_me:7013: result: no" >&5 echo "${ECHO_T}no" >&6 LIBS="$cf_save_LIBS" fi @@ -6584,7 +7025,7 @@ fi eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\" if test "$cf_found_library" = no ; then - { { echo "$as_me:6587: error: Cannot link $cf_nculib_root library" >&5 + { { echo "$as_me:7028: error: Cannot link $cf_nculib_root library" >&5 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;} { (exit 1); exit 1; }; } fi @@ -6592,7 +7033,7 @@ fi fi if test -n "$cf_ncurses_LIBS" ; then - echo "$as_me:6595: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 + echo "$as_me:7036: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS... $ECHO_C" >&6 cf_ncurses_SAVE="$LIBS" for p in $cf_ncurses_LIBS ; do @@ -6602,7 +7043,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS.. fi done cat >"conftest.$ac_ext" <<_ACEOF -#line 6605 "configure" +#line 7046 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -6614,23 +7055,23 @@ initscr(); mousemask(0,0); tigetstr((char *)0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:6617: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7058: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6620: \$? = $ac_status" >&5 + echo "$as_me:7061: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:6623: \"$ac_try\"") >&5 + { (eval echo "$as_me:7064: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6626: \$? = $ac_status" >&5 + echo "$as_me:7067: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - echo "$as_me:6628: result: yes" >&5 + echo "$as_me:7069: result: yes" >&5 echo "${ECHO_T}yes" >&6 else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 -echo "$as_me:6633: result: no" >&5 +echo "$as_me:7074: result: no" >&5 echo "${ECHO_T}no" >&6 LIBS="$cf_ncurses_SAVE" fi @@ -6648,40 +7089,131 @@ else NCURSES_CONFIG=none fi -echo "$as_me:6651: checking if you want wide-character code" >&5 -echo $ECHO_N "checking if you want wide-character code... $ECHO_C" >&6 +echo "$as_me:7092: checking for specified curses library type" >&5 +echo $ECHO_N "checking for specified curses library type... $ECHO_C" >&6 -# Check whether --enable-widec or --disable-widec was given. -if test "${enable_widec+set}" = set; then - enableval="$enable_widec" - with_widec=$enableval +# Check whether --with-screen or --without-screen was given. +if test "${with_screen+set}" = set; then + withval="$with_screen" + cf_cv_screen=$withval else - with_widec=no + cf_cv_screen=ncurses fi; -echo "$as_me:6661: result: $with_widec" >&5 -echo "${ECHO_T}$with_widec" >&6 -if test "$with_widec" = yes ; then -for ac_header in wchar.h +case $cf_cv_screen in +(curses|curses_*) + +echo "$as_me:7106: checking for extra include directories" >&5 +echo $ECHO_N "checking for extra include directories... $ECHO_C" >&6 +if test "${cf_cv_curses_incdir+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + +cf_cv_curses_incdir=no +case "$host_os" in +(hpux10.*) + if test "x$cf_cv_screen" = "xcurses_colr" + then + test -d /usr/include/curses_colr && \ + cf_cv_curses_incdir="-I/usr/include/curses_colr" + fi + ;; +(sunos3*|sunos4*) + if test "x$cf_cv_screen" = "xcurses_5lib" + then + test -d /usr/5lib && \ + test -d /usr/5include && \ + cf_cv_curses_incdir="-I/usr/5include" + fi + ;; +esac + +fi +echo "$as_me:7132: result: $cf_cv_curses_incdir" >&5 +echo "${ECHO_T}$cf_cv_curses_incdir" >&6 +if test "$cf_cv_curses_incdir" != no +then + + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}$cf_cv_curses_incdir" + +fi + +echo "$as_me:7142: checking if we have identified curses headers" >&5 +echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6 +if test "${cf_cv_ncurses_header+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + +cf_cv_ncurses_header=none +for cf_header in \ + ncurses.h \ + curses.h ncurses/ncurses.h ncurses/curses.h +do +cat >"conftest.$ac_ext" <<_ACEOF +#line 7154 "configure" +#include "confdefs.h" +#include <${cf_header}> +int +main (void) +{ +initscr(); endwin() + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:7166: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:7169: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:7172: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:7175: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_ncurses_header=$cf_header; break +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +fi +rm -f "conftest.$ac_objext" "conftest.$ac_ext" +done + +fi +echo "$as_me:7186: result: $cf_cv_ncurses_header" >&5 +echo "${ECHO_T}$cf_cv_ncurses_header" >&6 + +if test "$cf_cv_ncurses_header" = none ; then + { { echo "$as_me:7190: error: No curses header-files found" >&5 +echo "$as_me: error: No curses header-files found" >&2;} + { (exit 1); exit 1; }; } +fi + +# cheat, to get the right #define's for HAVE_NCURSES_H, etc. + +for ac_header in $cf_cv_ncurses_header do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:6668: checking for $ac_header" >&5 +echo "$as_me:7200: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 6674 "configure" +#line 7206 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:6678: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:7210: \"$ac_cpp "conftest.$ac_ext"\"") >&5 (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:6684: \$? = $ac_status" >&5 + echo "$as_me:7216: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -6700,7 +7232,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:6703: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:7235: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then cat >>confdefs.h <&5 -echo $ECHO_N "checking for multibyte character support... $ECHO_C" >&6 -if test "${cf_cv_utf8_lib+set}" = set; then +echo "$as_me:7245: checking for terminfo header" >&5 +echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6 +if test "${cf_cv_term_header+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cf_save_LIBS="$LIBS" - cat >"conftest.$ac_ext" <<_ACEOF -#line 6721 "configure" -#include "confdefs.h" - -$ac_includes_default -#ifdef HAVE_WCHAR_H -#include -#endif - -int -main (void) -{ -putwc(0,0); - ; - return 0; -} -_ACEOF -rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:6738: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:6741: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:6744: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:6747: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - cf_cv_utf8_lib=yes -else - echo "$as_me: failed program was:" >&5 -cat "conftest.$ac_ext" >&5 - -# If the linkage is not already in the $CPPFLAGS/$LDFLAGS configuration, these -# will be set on completion of the AC_TRY_LINK below. -cf_cv_header_path_utf8= -cf_cv_library_path_utf8= - -echo "${as_me:-configure}:6759: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5 - -cf_save_LIBS="$LIBS" +case "${cf_cv_ncurses_header}" in +(*/ncurses.h|*/ncursesw.h) + cf_term_header=`echo "$cf_cv_ncurses_header" | sed -e 's%ncurses[^.]*\.h$%term.h%'` + ;; +(*) + cf_term_header=term.h + ;; +esac +for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" +do cat >"conftest.$ac_ext" <<_ACEOF -#line 6764 "configure" +#line 7263 "configure" #include "confdefs.h" +#include +#include <${cf_cv_ncurses_header:-curses.h}> +#include <$cf_test> -#include int main (void) { -putwc(0,0); +int x = auto_left_margin; (void)x ; return 0; } _ACEOF -rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:6777: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:7278: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6780: \$? = $ac_status" >&5 + echo "$as_me:7281: \$? = $ac_status" >&5 (exit "$ac_status"); } && - { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:6783: \"$ac_try\"") >&5 + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:7284: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6786: \$? = $ac_status" >&5 + echo "$as_me:7287: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - cf_cv_find_linkage_utf8=yes - cf_cv_header_path_utf8=/usr/include - cf_cv_library_path_utf8=/usr/lib - + cf_cv_term_header="$cf_test" else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 -LIBS="-lutf8 $cf_save_LIBS" - -cat >"conftest.$ac_ext" <<_ACEOF -#line 6800 "configure" -#include "confdefs.h" + cf_cv_term_header=unknown -#include -int -main (void) -{ -putwc(0,0); - ; - return 0; -} -_ACEOF -rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:6813: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:6816: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:6819: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:6822: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then +fi +rm -f "conftest.$ac_objext" "conftest.$ac_ext" + test "$cf_cv_term_header" != unknown && break +done - cf_cv_find_linkage_utf8=yes - cf_cv_header_path_utf8=/usr/include - cf_cv_library_path_utf8=/usr/lib - cf_cv_library_file_utf8="-lutf8" +fi +echo "$as_me:7303: result: $cf_cv_term_header" >&5 +echo "${ECHO_T}$cf_cv_term_header" >&6 -else - echo "$as_me: failed program was:" >&5 -cat "conftest.$ac_ext" >&5 +# Set definitions to allow ifdef'ing to accommodate subdirectories - cf_cv_find_linkage_utf8=no - LIBS="$cf_save_LIBS" +case "$cf_cv_term_header" in +(*term.h) - test -n "$verbose" && echo " find linkage for utf8 library" 1>&6 +cat >>confdefs.h <<\EOF +#define HAVE_TERM_H 1 +EOF -echo "${as_me:-configure}:6839: testing find linkage for utf8 library ..." 1>&5 + ;; +esac -echo "${as_me:-configure}:6841: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5 +case "$cf_cv_term_header" in +(ncurses/term.h) - cf_save_CPPFLAGS="$CPPFLAGS" - cf_test_CPPFLAGS="$CPPFLAGS" +cat >>confdefs.h <<\EOF +#define HAVE_NCURSES_TERM_H 1 +EOF -cf_search= + ;; +(ncursesw/term.h) -# collect the current set of include-directories from compiler flags -cf_header_path_list="" -if test -n "${CFLAGS}${CPPFLAGS}" ; then - for cf_header_path in $CPPFLAGS $CFLAGS - do - case "$cf_header_path" in - (-I*) - cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'` +cat >>confdefs.h <<\EOF +#define HAVE_NCURSESW_TERM_H 1 +EOF + + ;; +esac + +echo "$as_me:7335: checking for ncurses version" >&5 +echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6 +if test "${cf_cv_ncurses_version+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + cf_cv_ncurses_version=no + cf_tempfile=out$$ + rm -f "$cf_tempfile" + if test "$cross_compiling" = yes; then + + # This will not work if the preprocessor splits the line after the + # Autoconf token. The 'unproto' program does that. + cat > "conftest.$ac_ext" < +#undef Autoconf +#ifdef NCURSES_VERSION +Autoconf NCURSES_VERSION +#else +#ifdef __NCURSES_H +Autoconf "old" +#endif +; +#endif +EOF + cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" + { (eval echo "$as_me:7361: \"$cf_try\"") >&5 + (eval $cf_try) 2>&5 + ac_status=$? + echo "$as_me:7364: \$? = $ac_status" >&5 + (exit "$ac_status"); } + if test -f conftest.out ; then + cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out` + test -n "$cf_out" && cf_cv_ncurses_version="$cf_out" + rm -f conftest.out + fi + +else + cat >"conftest.$ac_ext" <<_ACEOF +#line 7374 "configure" +#include "confdefs.h" + +$ac_includes_default + +#include <${cf_cv_ncurses_header:-curses.h}> + +int main(void) +{ + FILE *fp = fopen("$cf_tempfile", "w"); +#ifdef NCURSES_VERSION +# ifdef NCURSES_VERSION_PATCH + fprintf(fp, "%s.%d\\n", NCURSES_VERSION, NCURSES_VERSION_PATCH); +# else + fprintf(fp, "%s\\n", NCURSES_VERSION); +# endif +#else +# ifdef __NCURSES_H + fprintf(fp, "old\\n"); +# else + #error expected ncurses header to define __NCURSES_H +# endif +#endif + ${cf_cv_main_return:-return}(0); +} +_ACEOF +rm -f "conftest$ac_exeext" +if { (eval echo "$as_me:7401: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:7404: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' + { (eval echo "$as_me:7406: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:7409: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cf_cv_ncurses_version=`cat $cf_tempfile` +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +fi +rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext" +fi + rm -f "$cf_tempfile" + +fi +echo "$as_me:7423: result: $cf_cv_ncurses_version" >&5 +echo "${ECHO_T}$cf_cv_ncurses_version" >&6 +test "$cf_cv_ncurses_version" = no || +cat >>confdefs.h <<\EOF +#define NCURSES 1 +EOF + +echo "$as_me:7430: checking if we have identified curses libraries" >&5 +echo $ECHO_N "checking if we have identified curses libraries... $ECHO_C" >&6 +cat >"conftest.$ac_ext" <<_ACEOF +#line 7433 "configure" +#include "confdefs.h" +#include <${cf_cv_ncurses_header:-curses.h}> +int +main (void) +{ +initscr(); endwin() + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:7445: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:7448: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:7451: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:7454: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_result=yes +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +cf_result=no +fi +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" +echo "$as_me:7463: result: $cf_result" >&5 +echo "${ECHO_T}$cf_result" >&6 + +if test "$cf_result" = no ; then +case "$host_os" in +(freebsd*) + echo "$as_me:7469: checking for tgoto in -lmytinfo" >&5 +echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6 +if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lmytinfo $LIBS" +cat >"conftest.$ac_ext" <<_ACEOF +#line 7477 "configure" +#include "confdefs.h" + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char tgoto (void); +int +main (void) +{ +tgoto (); + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:7496: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:7499: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:7502: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:7505: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_mytinfo_tgoto=yes +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +ac_cv_lib_mytinfo_tgoto=no +fi +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:7516: result: $ac_cv_lib_mytinfo_tgoto" >&5 +echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6 +if test "$ac_cv_lib_mytinfo_tgoto" = yes; then + +cf_add_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in -lmytinfo; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; do + for cf_add_2lib in $cf_add_libs; do + if test "x$cf_add_1lib" = "x$cf_add_2lib"; then + cf_add_1lib= + break + fi + done + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" +done +LIBS="$cf_add_libs" + +fi + + ;; +(hpux10.*) + # Looking at HPUX 10.20, the Hcurses library is the oldest (1997), cur_colr + # next (1998), and xcurses "newer" (2000). There is no header file for + # Hcurses; the subdirectory curses_colr has the headers (curses.h and + # term.h) for cur_colr + if test "x$cf_cv_screen" = "xcurses_colr" + then + echo "$as_me:7546: checking for initscr in -lcur_colr" >&5 +echo $ECHO_N "checking for initscr in -lcur_colr... $ECHO_C" >&6 +if test "${ac_cv_lib_cur_colr_initscr+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lcur_colr $LIBS" +cat >"conftest.$ac_ext" <<_ACEOF +#line 7554 "configure" +#include "confdefs.h" + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char initscr (void); +int +main (void) +{ +initscr (); + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:7573: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:7576: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:7579: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:7582: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_cur_colr_initscr=yes +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +ac_cv_lib_cur_colr_initscr=no +fi +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:7593: result: $ac_cv_lib_cur_colr_initscr" >&5 +echo "${ECHO_T}$ac_cv_lib_cur_colr_initscr" >&6 +if test "$ac_cv_lib_cur_colr_initscr" = yes; then + +cf_add_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in -lcur_colr; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; do + for cf_add_2lib in $cf_add_libs; do + if test "x$cf_add_1lib" = "x$cf_add_2lib"; then + cf_add_1lib= + break + fi + done + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" +done +LIBS="$cf_add_libs" + + ac_cv_func_initscr=yes + +else + + echo "$as_me:7617: checking for initscr in -lHcurses" >&5 +echo $ECHO_N "checking for initscr in -lHcurses... $ECHO_C" >&6 +if test "${ac_cv_lib_Hcurses_initscr+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lHcurses $LIBS" +cat >"conftest.$ac_ext" <<_ACEOF +#line 7625 "configure" +#include "confdefs.h" + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char initscr (void); +int +main (void) +{ +initscr (); + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:7644: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:7647: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:7650: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:7653: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_Hcurses_initscr=yes +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +ac_cv_lib_Hcurses_initscr=no +fi +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:7664: result: $ac_cv_lib_Hcurses_initscr" >&5 +echo "${ECHO_T}$ac_cv_lib_Hcurses_initscr" >&6 +if test "$ac_cv_lib_Hcurses_initscr" = yes; then + + # HP's header uses __HP_CURSES, but user claims _HP_CURSES. + +cf_add_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in -lHcurses; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; do + for cf_add_2lib in $cf_add_libs; do + if test "x$cf_add_1lib" = "x$cf_add_2lib"; then + cf_add_1lib= + break + fi + done + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" +done +LIBS="$cf_add_libs" + + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}-D__HP_CURSES -D_HP_CURSES" + + ac_cv_func_initscr=yes + +fi + +fi + + fi + ;; +(linux*) + case `arch 2>/dev/null` in + (x86_64) + if test -d /lib64 + then + +if test -n "/lib64" ; then + for cf_add_libdir in /lib64 + do + if test "$cf_add_libdir" = /usr/lib ; then + : + elif test -d "$cf_add_libdir" + then + cf_have_libdir=no + if test -n "$LDFLAGS$LIBS" ; then + # a loop is needed to ensure we can add subdirs of existing dirs + for cf_test_libdir in $LDFLAGS $LIBS ; do + if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then + cf_have_libdir=yes; break + fi + done + fi + if test "$cf_have_libdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 + +echo "${as_me:-configure}:7722: testing adding $cf_add_libdir to library-path ..." 1>&5 + + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi + fi + done +fi + + else + +if test -n "/lib" ; then + for cf_add_libdir in /lib + do + if test "$cf_add_libdir" = /usr/lib ; then + : + elif test -d "$cf_add_libdir" + then + cf_have_libdir=no + if test -n "$LDFLAGS$LIBS" ; then + # a loop is needed to ensure we can add subdirs of existing dirs + for cf_test_libdir in $LDFLAGS $LIBS ; do + if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then + cf_have_libdir=yes; break + fi + done + fi + if test "$cf_have_libdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 + +echo "${as_me:-configure}:7751: testing adding $cf_add_libdir to library-path ..." 1>&5 + + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi + fi + done +fi + + fi + ;; + (*) + +if test -n "/lib" ; then + for cf_add_libdir in /lib + do + if test "$cf_add_libdir" = /usr/lib ; then + : + elif test -d "$cf_add_libdir" + then + cf_have_libdir=no + if test -n "$LDFLAGS$LIBS" ; then + # a loop is needed to ensure we can add subdirs of existing dirs + for cf_test_libdir in $LDFLAGS $LIBS ; do + if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then + cf_have_libdir=yes; break + fi + done + fi + if test "$cf_have_libdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 + +echo "${as_me:-configure}:7782: testing adding $cf_add_libdir to library-path ..." 1>&5 + + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi + fi + done +fi + + ;; + esac + ;; +(sunos3*|sunos4*) + if test "x$cf_cv_screen" = "xcurses_5lib" + then + if test -d /usr/5lib ; then + +if test -n "/usr/5lib" ; then + for cf_add_libdir in /usr/5lib + do + if test "$cf_add_libdir" = /usr/lib ; then + : + elif test -d "$cf_add_libdir" + then + cf_have_libdir=no + if test -n "$LDFLAGS$LIBS" ; then + # a loop is needed to ensure we can add subdirs of existing dirs + for cf_test_libdir in $LDFLAGS $LIBS ; do + if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then + cf_have_libdir=yes; break + fi + done + fi + if test "$cf_have_libdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 + +echo "${as_me:-configure}:7817: testing adding $cf_add_libdir to library-path ..." 1>&5 + + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi + fi + done +fi + +cf_add_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in -lcurses -ltermcap; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; do + for cf_add_2lib in $cf_add_libs; do + if test "x$cf_add_1lib" = "x$cf_add_2lib"; then + cf_add_1lib= + break + fi + done + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" +done +LIBS="$cf_add_libs" + + fi + fi + ac_cv_func_initscr=yes + ;; +esac + +if test ".$ac_cv_func_initscr" != .yes ; then + cf_save_LIBS="$LIBS" + + if test ".${cf_cv_ncurses_version:-no}" != .no + then + cf_check_list="ncurses curses cursesX" + else + cf_check_list="cursesX curses ncurses" + fi + + # Check for library containing tgoto. Do this before curses library + # because it may be needed to link the test-case for initscr. + if test "x$cf_term_lib" = x + then + echo "$as_me:7861: checking for tgoto" >&5 +echo $ECHO_N "checking for tgoto... $ECHO_C" >&6 +if test "${ac_cv_func_tgoto+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >"conftest.$ac_ext" <<_ACEOF +#line 7867 "configure" +#include "confdefs.h" +#define tgoto autoconf_temporary +#include /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef tgoto + +#ifdef __cplusplus +extern "C" +#endif + +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char tgoto (void); + +int +main (void) +{ + +/* The GNU C library defines stubs for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_tgoto) || defined (__stub___tgoto) +#error found stub for tgoto +#endif + + return tgoto (); + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:7898: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:7901: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:7904: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:7907: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_tgoto=yes +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +ac_cv_func_tgoto=no +fi +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" +fi +echo "$as_me:7917: result: $ac_cv_func_tgoto" >&5 +echo "${ECHO_T}$ac_cv_func_tgoto" >&6 +if test "$ac_cv_func_tgoto" = yes; then + cf_term_lib=predefined +else + + for cf_term_lib in $cf_check_list otermcap termcap tinfo termlib unknown + do + as_ac_Lib=`echo "ac_cv_lib_$cf_term_lib''_tgoto" | $as_tr_sh` +echo "$as_me:7926: checking for tgoto in -l$cf_term_lib" >&5 +echo $ECHO_N "checking for tgoto in -l$cf_term_lib... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Lib+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-l$cf_term_lib $LIBS" +cat >"conftest.$ac_ext" <<_ACEOF +#line 7934 "configure" +#include "confdefs.h" + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char tgoto (void); +int +main (void) +{ +tgoto (); + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:7953: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:7956: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:7959: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:7962: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + eval "$as_ac_Lib=yes" +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +eval "$as_ac_Lib=no" +fi +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:7973: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5 +echo "${ECHO_T}`eval echo '${'"$as_ac_Lib"'}'`" >&6 +if test "`eval echo '${'"$as_ac_Lib"'}'`" = yes; then + + : "${cf_nculib_root:=$cf_term_lib}" + break + +fi + + done + +fi + + fi + + # Check for library containing initscr + test "$cf_term_lib" != predefined && test "$cf_term_lib" != unknown && LIBS="-l$cf_term_lib $cf_save_LIBS" + if test "x$cf_curs_lib" = x + then + for cf_curs_lib in $cf_check_list xcurses jcurses pdcurses unknown + do + LIBS="-l$cf_curs_lib $cf_save_LIBS" + if test "$cf_term_lib" = unknown || test "$cf_term_lib" = "$cf_curs_lib" ; then + echo "$as_me:7996: checking if we can link with $cf_curs_lib library" >&5 +echo $ECHO_N "checking if we can link with $cf_curs_lib library... $ECHO_C" >&6 + cat >"conftest.$ac_ext" <<_ACEOF +#line 7999 "configure" +#include "confdefs.h" +#include <${cf_cv_ncurses_header:-curses.h}> +int +main (void) +{ +initscr() + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:8011: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:8014: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:8017: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:8020: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_result=yes +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +cf_result=no +fi +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + echo "$as_me:8029: result: $cf_result" >&5 +echo "${ECHO_T}$cf_result" >&6 + test "$cf_result" = yes && break + elif test "$cf_curs_lib" = "$cf_term_lib" ; then + cf_result=no + elif test "$cf_term_lib" != predefined ; then + echo "$as_me:8035: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5 +echo $ECHO_N "checking if we need both $cf_curs_lib and $cf_term_lib libraries... $ECHO_C" >&6 + cat >"conftest.$ac_ext" <<_ACEOF +#line 8038 "configure" +#include "confdefs.h" +#include <${cf_cv_ncurses_header:-curses.h}> +int +main (void) +{ +initscr(); endwin(); + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:8050: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:8053: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:8056: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:8059: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_result=no +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 + + LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +#line 8068 "configure" +#include "confdefs.h" +#include <${cf_cv_ncurses_header:-curses.h}> +int +main (void) +{ +initscr() + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:8080: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:8083: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:8086: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:8089: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_result=yes +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +cf_result=error +fi +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + +fi +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + echo "$as_me:8101: result: $cf_result" >&5 +echo "${ECHO_T}$cf_result" >&6 + test "$cf_result" != error && break + fi + done + fi + test "$cf_curs_lib" = unknown && { { echo "$as_me:8107: error: no curses library found" >&5 +echo "$as_me: error: no curses library found" >&2;} + { (exit 1); exit 1; }; } +fi +fi + + ;; +(ncursesw*) + +for ac_header in wchar.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +echo "$as_me:8119: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >"conftest.$ac_ext" <<_ACEOF +#line 8125 "configure" +#include "confdefs.h" +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:8129: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:8135: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + eval "$as_ac_Header=yes" +else + echo "$as_me: failed program was:" >&5 + cat "conftest.$ac_ext" >&5 + eval "$as_ac_Header=no" +fi +rm -f conftest.err "conftest.$ac_ext" +fi +echo "$as_me:8154: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 +if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then + cat >>confdefs.h <&5 +echo $ECHO_N "checking for multibyte character support... $ECHO_C" >&6 +if test "${cf_cv_utf8_lib+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + cf_save_LIBS="$LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +#line 8172 "configure" +#include "confdefs.h" + +$ac_includes_default +#ifdef HAVE_WCHAR_H +#include +#endif + +int +main (void) +{ +putwc(0,0); + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:8189: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:8192: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:8195: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:8198: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_utf8_lib=yes +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 + +# If the linkage is not already in the $CPPFLAGS/$LDFLAGS configuration, these +# will be set on completion of the AC_TRY_LINK below. +cf_cv_header_path_utf8= +cf_cv_library_path_utf8= + +echo "${as_me:-configure}:8210: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5 + +cf_save_LIBS="$LIBS" + +cat >"conftest.$ac_ext" <<_ACEOF +#line 8215 "configure" +#include "confdefs.h" + +#include +int +main (void) +{ +putwc(0,0); + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:8228: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:8231: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:8234: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:8237: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cf_cv_find_linkage_utf8=yes + cf_cv_header_path_utf8=/usr/include + cf_cv_library_path_utf8=/usr/lib + +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 + +LIBS="-lutf8 $cf_save_LIBS" + +cat >"conftest.$ac_ext" <<_ACEOF +#line 8251 "configure" +#include "confdefs.h" + +#include +int +main (void) +{ +putwc(0,0); + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:8264: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:8267: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:8270: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:8273: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cf_cv_find_linkage_utf8=yes + cf_cv_header_path_utf8=/usr/include + cf_cv_library_path_utf8=/usr/lib + cf_cv_library_file_utf8="-lutf8" + +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 + + cf_cv_find_linkage_utf8=no + LIBS="$cf_save_LIBS" + + test -n "$verbose" && echo " find linkage for utf8 library" 1>&6 + +echo "${as_me:-configure}:8290: testing find linkage for utf8 library ..." 1>&5 + +echo "${as_me:-configure}:8292: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5 + + cf_save_CPPFLAGS="$CPPFLAGS" + cf_test_CPPFLAGS="$CPPFLAGS" + +cf_search= + +# collect the current set of include-directories from compiler flags +cf_header_path_list="" +if test -n "${CFLAGS}${CPPFLAGS}" ; then + for cf_header_path in $CPPFLAGS $CFLAGS + do + case "$cf_header_path" in + (-I*) + cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'` test "x$cf_header_path" != "xNONE" && \ test -d "$cf_header_path" && \ @@ -6929,7 +8380,7 @@ cf_search="$cf_search $cf_header_path_list" if test -d "$cf_cv_header_path_utf8" ; then test -n "$verbose" && echo " ... testing $cf_cv_header_path_utf8" 1>&6 -echo "${as_me:-configure}:6932: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5 +echo "${as_me:-configure}:8383: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5 CPPFLAGS="$cf_save_CPPFLAGS" @@ -6937,7 +8388,7 @@ echo "${as_me:-configure}:6932: testing ... testing $cf_cv_header_path_utf8 ..." CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8" cat >"conftest.$ac_ext" <<_ACEOF -#line 6940 "configure" +#line 8391 "configure" #include "confdefs.h" #include @@ -6950,21 +8401,21 @@ putwc(0,0); } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:6953: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8404: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6956: \$? = $ac_status" >&5 + echo "$as_me:8407: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:6959: \"$ac_try\"") >&5 + { (eval echo "$as_me:8410: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6962: \$? = $ac_status" >&5 + echo "$as_me:8413: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then test -n "$verbose" && echo " ... found utf8 headers in $cf_cv_header_path_utf8" 1>&6 -echo "${as_me:-configure}:6967: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5 +echo "${as_me:-configure}:8418: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5 cf_cv_find_linkage_utf8=maybe cf_test_CPPFLAGS="$CPPFLAGS" @@ -6982,7 +8433,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_cv_find_linkage_utf8" = maybe ; then -echo "${as_me:-configure}:6985: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5 +echo "${as_me:-configure}:8436: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5 cf_save_LIBS="$LIBS" cf_save_LDFLAGS="$LDFLAGS" @@ -7057,13 +8508,13 @@ cf_search="$cf_library_path_list $cf_search" if test -d "$cf_cv_library_path_utf8" ; then test -n "$verbose" && echo " ... testing $cf_cv_library_path_utf8" 1>&6 -echo "${as_me:-configure}:7060: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5 +echo "${as_me:-configure}:8511: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5 CPPFLAGS="$cf_test_CPPFLAGS" LIBS="-lutf8 $cf_save_LIBS" LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_utf8" cat >"conftest.$ac_ext" <<_ACEOF -#line 7066 "configure" +#line 8517 "configure" #include "confdefs.h" #include @@ -7076,21 +8527,21 @@ putwc(0,0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:7079: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8530: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7082: \$? = $ac_status" >&5 + echo "$as_me:8533: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:7085: \"$ac_try\"") >&5 + { (eval echo "$as_me:8536: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7088: \$? = $ac_status" >&5 + echo "$as_me:8539: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then test -n "$verbose" && echo " ... found utf8 library in $cf_cv_library_path_utf8" 1>&6 -echo "${as_me:-configure}:7093: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5 +echo "${as_me:-configure}:8544: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5 cf_cv_find_linkage_utf8=yes cf_cv_library_file_utf8="-lutf8" @@ -7132,7 +8583,7 @@ fi fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:7135: result: $cf_cv_utf8_lib" >&5 +echo "$as_me:8586: result: $cf_cv_utf8_lib" >&5 echo "${ECHO_T}$cf_cv_utf8_lib" >&6 # HAVE_LIBUTF8_H is used by ncurses if curses.h is shared between @@ -7170,7 +8621,7 @@ if test -n "$cf_cv_header_path_utf8" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 7173 "configure" +#line 8624 "configure" #include "confdefs.h" #include int @@ -7182,16 +8633,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:7185: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8636: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7188: \$? = $ac_status" >&5 + echo "$as_me:8639: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:7191: \"$ac_try\"") >&5 + { (eval echo "$as_me:8642: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7194: \$? = $ac_status" >&5 + echo "$as_me:8645: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -7208,7 +8659,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:7211: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:8662: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -7244,7 +8695,7 @@ if test -n "$cf_cv_library_path_utf8" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:7247: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:8698: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -7270,17 +8721,17 @@ LIBS="$cf_add_libs" fi -cf_ncuconfig_root=ncursesw +cf_ncuconfig_root=$cf_cv_screen cf_have_ncuconfig=no if test "x${PKG_CONFIG:=none}" != xnone; then - echo "$as_me:7277: checking pkg-config for $cf_ncuconfig_root" >&5 + echo "$as_me:8728: checking pkg-config for $cf_ncuconfig_root" >&5 echo $ECHO_N "checking pkg-config for $cf_ncuconfig_root... $ECHO_C" >&6 if "$PKG_CONFIG" --exists $cf_ncuconfig_root ; then - echo "$as_me:7280: result: yes" >&5 + echo "$as_me:8731: result: yes" >&5 echo "${ECHO_T}yes" >&6 - echo "$as_me:7283: checking if the $cf_ncuconfig_root package files work" >&5 + echo "$as_me:8734: checking if the $cf_ncuconfig_root package files work" >&5 echo $ECHO_N "checking if the $cf_ncuconfig_root package files work... $ECHO_C" >&6 cf_have_ncuconfig=unknown @@ -7413,7 +8864,7 @@ done LIBS="$cf_add_libs" cat >"conftest.$ac_ext" <<_ACEOF -#line 7416 "configure" +#line 8867 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -7425,37 +8876,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:7428: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8879: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7431: \$? = $ac_status" >&5 + echo "$as_me:8882: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:7434: \"$ac_try\"") >&5 + { (eval echo "$as_me:8885: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7437: \$? = $ac_status" >&5 + echo "$as_me:8888: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then if test "$cross_compiling" = yes; then cf_test_ncuconfig=maybe else cat >"conftest.$ac_ext" <<_ACEOF -#line 7443 "configure" +#line 8894 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int main(void) { const char *xx = curses_version(); return (xx == 0); } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:7450: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8901: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7453: \$? = $ac_status" >&5 + echo "$as_me:8904: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:7455: \"$ac_try\"") >&5 + { (eval echo "$as_me:8906: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7458: \$? = $ac_status" >&5 + echo "$as_me:8909: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_test_ncuconfig=yes else @@ -7486,6 +8937,20 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" ;; esac +for cf_required in $cf_ncuconfig_root +do + # check for duplicates + for cf_require_pkg in $REQUIRE_PKG + do + if test "$cf_required" = "$cf_require_pkg" + then + cf_required= + break + fi + done + test -n "$cf_required" && REQUIRE_PKG="$REQUIRE_PKG $cf_required" +done + for cf_add_cflags in $cf_pkg_cflags do case "x$cf_add_cflags" in @@ -7629,7 +9094,7 @@ done LIBS="$cf_add_libs" cat >"conftest.$ac_ext" <<_ACEOF -#line 7632 "configure" +#line 9097 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -7641,37 +9106,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:7644: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9109: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7647: \$? = $ac_status" >&5 + echo "$as_me:9112: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:7650: \"$ac_try\"") >&5 + { (eval echo "$as_me:9115: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7653: \$? = $ac_status" >&5 + echo "$as_me:9118: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then if test "$cross_compiling" = yes; then cf_have_ncuconfig=maybe else cat >"conftest.$ac_ext" <<_ACEOF -#line 7659 "configure" +#line 9124 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int main(void) { const char *xx = curses_version(); return (xx == 0); } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:7666: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9131: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7669: \$? = $ac_status" >&5 + echo "$as_me:9134: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:7671: \"$ac_try\"") >&5 + { (eval echo "$as_me:9136: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7674: \$? = $ac_status" >&5 + echo "$as_me:9139: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_have_ncuconfig=yes else @@ -7688,7 +9153,7 @@ cat "conftest.$ac_ext" >&5 cf_have_ncuconfig=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - echo "$as_me:7691: result: $cf_have_ncuconfig" >&5 + echo "$as_me:9156: result: $cf_have_ncuconfig" >&5 echo "${ECHO_T}$cf_have_ncuconfig" >&6 test "$cf_have_ncuconfig" = maybe && cf_have_ncuconfig=yes if test "$cf_have_ncuconfig" != "yes" @@ -7704,7 +9169,7 @@ EOF NCURSES_CONFIG_PKG=$cf_ncuconfig_root -echo "$as_me:7707: checking for terminfo header" >&5 +echo "$as_me:9172: checking for terminfo header" >&5 echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6 if test "${cf_cv_term_header+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7722,7 +9187,7 @@ esac for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do cat >"conftest.$ac_ext" <<_ACEOF -#line 7725 "configure" +#line 9190 "configure" #include "confdefs.h" #include #include <${cf_cv_ncurses_header:-curses.h}> @@ -7737,16 +9202,16 @@ int x = auto_left_margin; (void)x } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:7740: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9205: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7743: \$? = $ac_status" >&5 + echo "$as_me:9208: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:7746: \"$ac_try\"") >&5 + { (eval echo "$as_me:9211: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7749: \$? = $ac_status" >&5 + echo "$as_me:9214: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_term_header="$cf_test" @@ -7762,7 +9227,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:7765: result: $cf_cv_term_header" >&5 +echo "$as_me:9230: result: $cf_cv_term_header" >&5 echo "${ECHO_T}$cf_cv_term_header" >&6 # Set definitions to allow ifdef'ing to accommodate subdirectories @@ -7797,7 +9262,7 @@ esac fi else - echo "$as_me:7800: result: no" >&5 + echo "$as_me:9265: result: no" >&5 echo "${ECHO_T}no" >&6 NCURSES_CONFIG_PKG=none fi @@ -7813,7 +9278,7 @@ if test -n "$ac_tool_prefix"; then do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:7816: checking for $ac_word" >&5 +echo "$as_me:9281: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_NCURSES_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7828,7 +9293,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog" -echo "$as_me:7831: found $ac_dir/$ac_word" >&5 +echo "$as_me:9296: found $ac_dir/$ac_word" >&5 break done @@ -7836,10 +9301,10 @@ fi fi NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG if test -n "$NCURSES_CONFIG"; then - echo "$as_me:7839: result: $NCURSES_CONFIG" >&5 + echo "$as_me:9304: result: $NCURSES_CONFIG" >&5 echo "${ECHO_T}$NCURSES_CONFIG" >&6 else - echo "$as_me:7842: result: no" >&5 + echo "$as_me:9307: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -7852,7 +9317,7 @@ if test -z "$NCURSES_CONFIG"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:7855: checking for $ac_word" >&5 +echo "$as_me:9320: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_NCURSES_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7867,7 +9332,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog" -echo "$as_me:7870: found $ac_dir/$ac_word" >&5 +echo "$as_me:9335: found $ac_dir/$ac_word" >&5 break done @@ -7875,10 +9340,10 @@ fi fi ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG if test -n "$ac_ct_NCURSES_CONFIG"; then - echo "$as_me:7878: result: $ac_ct_NCURSES_CONFIG" >&5 + echo "$as_me:9343: result: $ac_ct_NCURSES_CONFIG" >&5 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6 else - echo "$as_me:7881: result: no" >&5 + echo "$as_me:9346: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -8035,7 +9500,7 @@ LIBS="$cf_add_libs" # even with config script, some packages use no-override for curses.h -echo "$as_me:8038: checking if we have identified curses headers" >&5 +echo "$as_me:9503: checking if we have identified curses headers" >&5 echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6 if test "${cf_cv_ncurses_header+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -8043,11 +9508,11 @@ else cf_cv_ncurses_header=none for cf_header in \ - ncurses.h ncursesw/ncurses.h \ - curses.h ncursesw/curses.h + ncurses.h $cf_cv_screen/ncurses.h \ + curses.h $cf_cv_screen/curses.h do cat >"conftest.$ac_ext" <<_ACEOF -#line 8050 "configure" +#line 9515 "configure" #include "confdefs.h" #include <${cf_header}> int @@ -8059,16 +9524,16 @@ initscr(); endwin() } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:8062: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9527: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8065: \$? = $ac_status" >&5 + echo "$as_me:9530: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:8068: \"$ac_try\"") >&5 + { (eval echo "$as_me:9533: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8071: \$? = $ac_status" >&5 + echo "$as_me:9536: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_header=$cf_header; break else @@ -8079,11 +9544,11 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:8082: result: $cf_cv_ncurses_header" >&5 +echo "$as_me:9547: result: $cf_cv_ncurses_header" >&5 echo "${ECHO_T}$cf_cv_ncurses_header" >&6 if test "$cf_cv_ncurses_header" = none ; then - { { echo "$as_me:8086: error: No curses header-files found" >&5 + { { echo "$as_me:9551: error: No curses header-files found" >&5 echo "$as_me: error: No curses header-files found" >&2;} { (exit 1); exit 1; }; } fi @@ -8093,23 +9558,23 @@ fi for ac_header in $cf_cv_ncurses_header do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:8096: checking for $ac_header" >&5 +echo "$as_me:9561: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 8102 "configure" +#line 9567 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:8106: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:9571: \"$ac_cpp "conftest.$ac_ext"\"") >&5 (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:8112: \$? = $ac_status" >&5 + echo "$as_me:9577: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -8128,7 +9593,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:8131: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:9596: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then cat >>confdefs.h <"conftest.$ac_ext" <<_ACEOF -#line 8187 "configure" +#line 9652 "configure" #include "confdefs.h" #include int @@ -8196,16 +9661,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:8199: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9664: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8202: \$? = $ac_status" >&5 + echo "$as_me:9667: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:8205: \"$ac_try\"") >&5 + { (eval echo "$as_me:9670: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8208: \$? = $ac_status" >&5 + echo "$as_me:9673: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -8222,7 +9687,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:8225: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:9690: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -8241,7 +9706,7 @@ fi } -echo "$as_me:8244: checking for $cf_ncuhdr_root header in include-path" >&5 +echo "$as_me:9709: checking for $cf_ncuhdr_root header in include-path" >&5 echo $ECHO_N "checking for $cf_ncuhdr_root header in include-path... $ECHO_C" >&6 if test "${cf_cv_ncurses_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -8253,13 +9718,9 @@ else do cat >"conftest.$ac_ext" <<_ACEOF -#line 8256 "configure" +#line 9721 "configure" #include "confdefs.h" -#define _XOPEN_SOURCE_EXTENDED -#undef HAVE_LIBUTF8_H /* in case we used CF_UTF8_LIB */ -#define HAVE_LIBUTF8_H /* to force ncurses' header file to use cchar_t */ - #include <$cf_header> int main (void) @@ -8267,10 +9728,6 @@ main (void) #ifdef NCURSES_VERSION -#ifndef WACS_BSSB - #error WACS_BSSB is not defined -#endif - printf("%s\\n", NCURSES_VERSION); #else #ifdef __NCURSES_H @@ -8285,16 +9742,16 @@ printf("old\\n"); } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:8288: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9745: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8291: \$? = $ac_status" >&5 + echo "$as_me:9748: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:8294: \"$ac_try\"") >&5 + { (eval echo "$as_me:9751: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8297: \$? = $ac_status" >&5 + echo "$as_me:9754: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_h=$cf_header @@ -8309,14 +9766,14 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:8312: result: $cf_cv_ncurses_h" >&5 +echo "$as_me:9769: result: $cf_cv_ncurses_h" >&5 echo "${ECHO_T}$cf_cv_ncurses_h" >&6 if test "$cf_cv_ncurses_h" != no ; then cf_cv_ncurses_header=$cf_cv_ncurses_h else -echo "$as_me:8319: checking for $cf_ncuhdr_root include-path" >&5 +echo "$as_me:9776: checking for $cf_ncuhdr_root include-path" >&5 echo $ECHO_N "checking for $cf_ncuhdr_root include-path... $ECHO_C" >&6 if test "${cf_cv_ncurses_h2+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -8437,7 +9894,7 @@ if test -n "$cf_incdir" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 8440 "configure" +#line 9897 "configure" #include "confdefs.h" #include int @@ -8449,16 +9906,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:8452: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9909: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8455: \$? = $ac_status" >&5 + echo "$as_me:9912: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:8458: \"$ac_try\"") >&5 + { (eval echo "$as_me:9915: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8461: \$? = $ac_status" >&5 + echo "$as_me:9918: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -8475,7 +9932,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:8478: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:9935: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -8498,7 +9955,7 @@ fi do cat >"conftest.$ac_ext" <<_ACEOF -#line 8501 "configure" +#line 9958 "configure" #include "confdefs.h" #include <$cf_header> @@ -8522,16 +9979,16 @@ printf("old\\n"); } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:8525: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9982: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8528: \$? = $ac_status" >&5 + echo "$as_me:9985: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:8531: \"$ac_try\"") >&5 + { (eval echo "$as_me:9988: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8534: \$? = $ac_status" >&5 + echo "$as_me:9991: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_h2=$cf_header @@ -8552,12 +10009,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" CPPFLAGS="$cf_save2_CPPFLAGS" test "$cf_cv_ncurses_h2" != no && break done - test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:8555: error: not found" >&5 + test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:10012: error: not found" >&5 echo "$as_me: error: not found" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:8560: result: $cf_cv_ncurses_h2" >&5 +echo "$as_me:10017: result: $cf_cv_ncurses_h2" >&5 echo "${ECHO_T}$cf_cv_ncurses_h2" >&6 cf_1st_incdir=`echo "$cf_cv_ncurses_h2" | sed -e 's%/[^/]*$%%'` @@ -8593,7 +10050,7 @@ if test -n "$cf_1st_incdir" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 8596 "configure" +#line 10053 "configure" #include "confdefs.h" #include int @@ -8605,16 +10062,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:8608: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10065: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8611: \$? = $ac_status" >&5 + echo "$as_me:10068: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:8614: \"$ac_try\"") >&5 + { (eval echo "$as_me:10071: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8617: \$? = $ac_status" >&5 + echo "$as_me:10074: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -8631,7 +10088,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:8634: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:10091: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -8679,7 +10136,7 @@ EOF ;; esac -echo "$as_me:8682: checking for terminfo header" >&5 +echo "$as_me:10139: checking for terminfo header" >&5 echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6 if test "${cf_cv_term_header+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -8697,7 +10154,7 @@ esac for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do cat >"conftest.$ac_ext" <<_ACEOF -#line 8700 "configure" +#line 10157 "configure" #include "confdefs.h" #include #include <${cf_cv_ncurses_header:-curses.h}> @@ -8712,16 +10169,16 @@ int x = auto_left_margin; (void)x } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:8715: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10172: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8718: \$? = $ac_status" >&5 + echo "$as_me:10175: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:8721: \"$ac_try\"") >&5 + { (eval echo "$as_me:10178: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8724: \$? = $ac_status" >&5 + echo "$as_me:10181: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_term_header="$cf_test" @@ -8737,7 +10194,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:8740: result: $cf_cv_term_header" >&5 +echo "$as_me:10197: result: $cf_cv_term_header" >&5 echo "${ECHO_T}$cf_cv_term_header" >&6 # Set definitions to allow ifdef'ing to accommodate subdirectories @@ -8775,7 +10232,7 @@ cat >>confdefs.h <<\EOF #define NCURSES 1 EOF -echo "$as_me:8778: checking for ncurses version" >&5 +echo "$as_me:10235: checking for ncurses version" >&5 echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6 if test "${cf_cv_ncurses_version+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -8801,10 +10258,10 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo "$as_me:8804: \"$cf_try\"") >&5 + { (eval echo "$as_me:10261: \"$cf_try\"") >&5 (eval $cf_try) 2>&5 ac_status=$? - echo "$as_me:8807: \$? = $ac_status" >&5 + echo "$as_me:10264: \$? = $ac_status" >&5 (exit "$ac_status"); } if test -f conftest.out ; then cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out` @@ -8814,7 +10271,7 @@ EOF else cat >"conftest.$ac_ext" <<_ACEOF -#line 8817 "configure" +#line 10274 "configure" #include "confdefs.h" $ac_includes_default @@ -8834,22 +10291,22 @@ int main(void) # ifdef __NCURSES_H fprintf(fp, "old\\n"); # else - make an error + #error expected ncurses header to define __NCURSES_H # endif #endif ${cf_cv_main_return:-return}(0); } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:8844: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10301: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8847: \$? = $ac_status" >&5 + echo "$as_me:10304: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:8849: \"$ac_try\"") >&5 + { (eval echo "$as_me:10306: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8852: \$? = $ac_status" >&5 + echo "$as_me:10309: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_version=`cat $cf_tempfile` @@ -8863,20 +10320,20 @@ fi rm -f "$cf_tempfile" fi -echo "$as_me:8866: result: $cf_cv_ncurses_version" >&5 +echo "$as_me:10323: result: $cf_cv_ncurses_version" >&5 echo "${ECHO_T}$cf_cv_ncurses_version" >&6 test "$cf_cv_ncurses_version" = no || cat >>confdefs.h <<\EOF #define NCURSES 1 EOF -cf_nculib_root=ncursesw +cf_nculib_root=$cf_cv_screen # This works, except for the special case where we find gpm, but # ncurses is in a nonstandard location via $LIBS, and we really want # to link gpm. cf_ncurses_LIBS="" cf_ncurses_SAVE="$LIBS" -echo "$as_me:8879: checking for Gpm_Open in -lgpm" >&5 +echo "$as_me:10336: checking for Gpm_Open in -lgpm" >&5 echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6 if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -8884,7 +10341,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 8887 "configure" +#line 10344 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -8893,7 +10350,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char Gpm_Open (); +char Gpm_Open (void); int main (void) { @@ -8903,16 +10360,16 @@ Gpm_Open (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:8906: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10363: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8909: \$? = $ac_status" >&5 + echo "$as_me:10366: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:8912: \"$ac_try\"") >&5 + { (eval echo "$as_me:10369: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8915: \$? = $ac_status" >&5 + echo "$as_me:10372: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_gpm_Gpm_Open=yes else @@ -8923,10 +10380,10 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:8926: result: $ac_cv_lib_gpm_Gpm_Open" >&5 +echo "$as_me:10383: result: $ac_cv_lib_gpm_Gpm_Open" >&5 echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6 if test "$ac_cv_lib_gpm_Gpm_Open" = yes; then - echo "$as_me:8929: checking for initscr in -lgpm" >&5 + echo "$as_me:10386: checking for initscr in -lgpm" >&5 echo $ECHO_N "checking for initscr in -lgpm... $ECHO_C" >&6 if test "${ac_cv_lib_gpm_initscr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -8934,7 +10391,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 8937 "configure" +#line 10394 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -8943,7 +10400,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char initscr (); +char initscr (void); int main (void) { @@ -8953,16 +10410,16 @@ initscr (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:8956: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10413: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8959: \$? = $ac_status" >&5 + echo "$as_me:10416: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:8962: \"$ac_try\"") >&5 + { (eval echo "$as_me:10419: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8965: \$? = $ac_status" >&5 + echo "$as_me:10422: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_gpm_initscr=yes else @@ -8973,7 +10430,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:8976: result: $ac_cv_lib_gpm_initscr" >&5 +echo "$as_me:10433: result: $ac_cv_lib_gpm_initscr" >&5 echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6 if test "$ac_cv_lib_gpm_initscr" = yes; then LIBS="$cf_ncurses_SAVE" @@ -8988,7 +10445,7 @@ case "$host_os" in # This is only necessary if you are linking against an obsolete # version of ncurses (but it should do no harm, since it is static). if test "$cf_nculib_root" = ncurses ; then - echo "$as_me:8991: checking for tgoto in -lmytinfo" >&5 + echo "$as_me:10448: checking for tgoto in -lmytinfo" >&5 echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6 if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -8996,7 +10453,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lmytinfo $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 8999 "configure" +#line 10456 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -9005,7 +10462,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char tgoto (); +char tgoto (void); int main (void) { @@ -9015,16 +10472,16 @@ tgoto (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:9018: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10475: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9021: \$? = $ac_status" >&5 + echo "$as_me:10478: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:9024: \"$ac_try\"") >&5 + { (eval echo "$as_me:10481: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9027: \$? = $ac_status" >&5 + echo "$as_me:10484: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_mytinfo_tgoto=yes else @@ -9035,7 +10492,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:9038: result: $ac_cv_lib_mytinfo_tgoto" >&5 +echo "$as_me:10495: result: $ac_cv_lib_mytinfo_tgoto" >&5 echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6 if test "$ac_cv_lib_mytinfo_tgoto" = yes; then cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS" @@ -9084,13 +10541,13 @@ else eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no' cf_libdir="" - echo "$as_me:9087: checking for initscr" >&5 + echo "$as_me:10544: checking for initscr" >&5 echo $ECHO_N "checking for initscr... $ECHO_C" >&6 if test "${ac_cv_func_initscr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 9093 "configure" +#line 10550 "configure" #include "confdefs.h" #define initscr autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -9121,16 +10578,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:9124: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10581: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9127: \$? = $ac_status" >&5 + echo "$as_me:10584: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:9130: \"$ac_try\"") >&5 + { (eval echo "$as_me:10587: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9133: \$? = $ac_status" >&5 + echo "$as_me:10590: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_initscr=yes else @@ -9140,18 +10597,18 @@ ac_cv_func_initscr=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:9143: result: $ac_cv_func_initscr" >&5 +echo "$as_me:10600: result: $ac_cv_func_initscr" >&5 echo "${ECHO_T}$ac_cv_func_initscr" >&6 if test "$ac_cv_func_initscr" = yes; then eval 'cf_cv_have_lib_'"$cf_nculib_root"'=yes' else cf_save_LIBS="$LIBS" - echo "$as_me:9150: checking for initscr in -l$cf_nculib_root" >&5 + echo "$as_me:10607: checking for initscr in -l$cf_nculib_root" >&5 echo $ECHO_N "checking for initscr in -l$cf_nculib_root... $ECHO_C" >&6 LIBS="-l$cf_nculib_root $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 9154 "configure" +#line 10611 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -9163,25 +10620,25 @@ initscr() } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:9166: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10623: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9169: \$? = $ac_status" >&5 + echo "$as_me:10626: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:9172: \"$ac_try\"") >&5 + { (eval echo "$as_me:10629: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9175: \$? = $ac_status" >&5 + echo "$as_me:10632: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - echo "$as_me:9177: result: yes" >&5 + echo "$as_me:10634: result: yes" >&5 echo "${ECHO_T}yes" >&6 eval 'cf_cv_have_lib_'"$cf_nculib_root"'=yes' else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 -echo "$as_me:9184: result: no" >&5 +echo "$as_me:10641: result: no" >&5 echo "${ECHO_T}no" >&6 cf_search= @@ -9249,11 +10706,11 @@ cf_search="$cf_library_path_list $cf_search" for cf_libdir in $cf_search do - echo "$as_me:9252: checking for -l$cf_nculib_root in $cf_libdir" >&5 + echo "$as_me:10709: checking for -l$cf_nculib_root in $cf_libdir" >&5 echo $ECHO_N "checking for -l$cf_nculib_root in $cf_libdir... $ECHO_C" >&6 LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 9256 "configure" +#line 10713 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -9265,25 +10722,25 @@ initscr() } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:9268: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10725: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9271: \$? = $ac_status" >&5 + echo "$as_me:10728: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:9274: \"$ac_try\"") >&5 + { (eval echo "$as_me:10731: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9277: \$? = $ac_status" >&5 + echo "$as_me:10734: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - echo "$as_me:9279: result: yes" >&5 + echo "$as_me:10736: result: yes" >&5 echo "${ECHO_T}yes" >&6 eval 'cf_cv_have_lib_'"$cf_nculib_root"'=yes' break else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 -echo "$as_me:9286: result: no" >&5 +echo "$as_me:10743: result: no" >&5 echo "${ECHO_T}no" >&6 LIBS="$cf_save_LIBS" fi @@ -9298,7 +10755,7 @@ fi eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\" if test "$cf_found_library" = no ; then - { { echo "$as_me:9301: error: Cannot link $cf_nculib_root library" >&5 + { { echo "$as_me:10758: error: Cannot link $cf_nculib_root library" >&5 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;} { (exit 1); exit 1; }; } fi @@ -9306,7 +10763,7 @@ fi fi if test -n "$cf_ncurses_LIBS" ; then - echo "$as_me:9309: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 + echo "$as_me:10766: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS... $ECHO_C" >&6 cf_ncurses_SAVE="$LIBS" for p in $cf_ncurses_LIBS ; do @@ -9316,7 +10773,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS.. fi done cat >"conftest.$ac_ext" <<_ACEOF -#line 9319 "configure" +#line 10776 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -9328,23 +10785,23 @@ initscr(); mousemask(0,0); tigetstr((char *)0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:9331: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10788: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9334: \$? = $ac_status" >&5 + echo "$as_me:10791: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:9337: \"$ac_try\"") >&5 + { (eval echo "$as_me:10794: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9340: \$? = $ac_status" >&5 + echo "$as_me:10797: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - echo "$as_me:9342: result: yes" >&5 + echo "$as_me:10799: result: yes" >&5 echo "${ECHO_T}yes" >&6 else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 -echo "$as_me:9347: result: no" >&5 +echo "$as_me:10804: result: no" >&5 echo "${ECHO_T}no" >&6 LIBS="$cf_ncurses_SAVE" fi @@ -9362,19 +10819,20 @@ else NCURSES_CONFIG=none fi -else + ;; +(ncurses*) -cf_ncuconfig_root=ncurses +cf_ncuconfig_root=$cf_cv_screen cf_have_ncuconfig=no if test "x${PKG_CONFIG:=none}" != xnone; then - echo "$as_me:9371: checking pkg-config for $cf_ncuconfig_root" >&5 + echo "$as_me:10829: checking pkg-config for $cf_ncuconfig_root" >&5 echo $ECHO_N "checking pkg-config for $cf_ncuconfig_root... $ECHO_C" >&6 if "$PKG_CONFIG" --exists $cf_ncuconfig_root ; then - echo "$as_me:9374: result: yes" >&5 + echo "$as_me:10832: result: yes" >&5 echo "${ECHO_T}yes" >&6 - echo "$as_me:9377: checking if the $cf_ncuconfig_root package files work" >&5 + echo "$as_me:10835: checking if the $cf_ncuconfig_root package files work" >&5 echo $ECHO_N "checking if the $cf_ncuconfig_root package files work... $ECHO_C" >&6 cf_have_ncuconfig=unknown @@ -9507,7 +10965,7 @@ done LIBS="$cf_add_libs" cat >"conftest.$ac_ext" <<_ACEOF -#line 9510 "configure" +#line 10968 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -9519,37 +10977,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:9522: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10980: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9525: \$? = $ac_status" >&5 + echo "$as_me:10983: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:9528: \"$ac_try\"") >&5 + { (eval echo "$as_me:10986: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9531: \$? = $ac_status" >&5 + echo "$as_me:10989: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then if test "$cross_compiling" = yes; then cf_test_ncuconfig=maybe else cat >"conftest.$ac_ext" <<_ACEOF -#line 9537 "configure" +#line 10995 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int main(void) { const char *xx = curses_version(); return (xx == 0); } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:9544: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11002: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9547: \$? = $ac_status" >&5 + echo "$as_me:11005: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:9549: \"$ac_try\"") >&5 + { (eval echo "$as_me:11007: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9552: \$? = $ac_status" >&5 + echo "$as_me:11010: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_test_ncuconfig=yes else @@ -9580,6 +11038,20 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" ;; esac +for cf_required in $cf_ncuconfig_root +do + # check for duplicates + for cf_require_pkg in $REQUIRE_PKG + do + if test "$cf_required" = "$cf_require_pkg" + then + cf_required= + break + fi + done + test -n "$cf_required" && REQUIRE_PKG="$REQUIRE_PKG $cf_required" +done + for cf_add_cflags in $cf_pkg_cflags do case "x$cf_add_cflags" in @@ -9723,7 +11195,7 @@ done LIBS="$cf_add_libs" cat >"conftest.$ac_ext" <<_ACEOF -#line 9726 "configure" +#line 11198 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -9735,37 +11207,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:9738: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11210: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9741: \$? = $ac_status" >&5 + echo "$as_me:11213: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:9744: \"$ac_try\"") >&5 + { (eval echo "$as_me:11216: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9747: \$? = $ac_status" >&5 + echo "$as_me:11219: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then if test "$cross_compiling" = yes; then cf_have_ncuconfig=maybe else cat >"conftest.$ac_ext" <<_ACEOF -#line 9753 "configure" +#line 11225 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int main(void) { const char *xx = curses_version(); return (xx == 0); } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:9760: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11232: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9763: \$? = $ac_status" >&5 + echo "$as_me:11235: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:9765: \"$ac_try\"") >&5 + { (eval echo "$as_me:11237: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9768: \$? = $ac_status" >&5 + echo "$as_me:11240: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_have_ncuconfig=yes else @@ -9782,7 +11254,7 @@ cat "conftest.$ac_ext" >&5 cf_have_ncuconfig=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - echo "$as_me:9785: result: $cf_have_ncuconfig" >&5 + echo "$as_me:11257: result: $cf_have_ncuconfig" >&5 echo "${ECHO_T}$cf_have_ncuconfig" >&6 test "$cf_have_ncuconfig" = maybe && cf_have_ncuconfig=yes if test "$cf_have_ncuconfig" != "yes" @@ -9798,7 +11270,7 @@ EOF NCURSES_CONFIG_PKG=$cf_ncuconfig_root -echo "$as_me:9801: checking for terminfo header" >&5 +echo "$as_me:11273: checking for terminfo header" >&5 echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6 if test "${cf_cv_term_header+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9816,7 +11288,7 @@ esac for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do cat >"conftest.$ac_ext" <<_ACEOF -#line 9819 "configure" +#line 11291 "configure" #include "confdefs.h" #include #include <${cf_cv_ncurses_header:-curses.h}> @@ -9831,16 +11303,16 @@ int x = auto_left_margin; (void)x } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:9834: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11306: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9837: \$? = $ac_status" >&5 + echo "$as_me:11309: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:9840: \"$ac_try\"") >&5 + { (eval echo "$as_me:11312: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9843: \$? = $ac_status" >&5 + echo "$as_me:11315: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_term_header="$cf_test" @@ -9856,7 +11328,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:9859: result: $cf_cv_term_header" >&5 +echo "$as_me:11331: result: $cf_cv_term_header" >&5 echo "${ECHO_T}$cf_cv_term_header" >&6 # Set definitions to allow ifdef'ing to accommodate subdirectories @@ -9891,7 +11363,7 @@ esac fi else - echo "$as_me:9894: result: no" >&5 + echo "$as_me:11366: result: no" >&5 echo "${ECHO_T}no" >&6 NCURSES_CONFIG_PKG=none fi @@ -9907,7 +11379,7 @@ if test -n "$ac_tool_prefix"; then do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:9910: checking for $ac_word" >&5 +echo "$as_me:11382: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_NCURSES_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9922,7 +11394,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog" -echo "$as_me:9925: found $ac_dir/$ac_word" >&5 +echo "$as_me:11397: found $ac_dir/$ac_word" >&5 break done @@ -9930,10 +11402,10 @@ fi fi NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG if test -n "$NCURSES_CONFIG"; then - echo "$as_me:9933: result: $NCURSES_CONFIG" >&5 + echo "$as_me:11405: result: $NCURSES_CONFIG" >&5 echo "${ECHO_T}$NCURSES_CONFIG" >&6 else - echo "$as_me:9936: result: no" >&5 + echo "$as_me:11408: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -9946,7 +11418,7 @@ if test -z "$NCURSES_CONFIG"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:9949: checking for $ac_word" >&5 +echo "$as_me:11421: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_NCURSES_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9961,7 +11433,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog" -echo "$as_me:9964: found $ac_dir/$ac_word" >&5 +echo "$as_me:11436: found $ac_dir/$ac_word" >&5 break done @@ -9969,10 +11441,10 @@ fi fi ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG if test -n "$ac_ct_NCURSES_CONFIG"; then - echo "$as_me:9972: result: $ac_ct_NCURSES_CONFIG" >&5 + echo "$as_me:11444: result: $ac_ct_NCURSES_CONFIG" >&5 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6 else - echo "$as_me:9975: result: no" >&5 + echo "$as_me:11447: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -10129,7 +11601,7 @@ LIBS="$cf_add_libs" # even with config script, some packages use no-override for curses.h -echo "$as_me:10132: checking if we have identified curses headers" >&5 +echo "$as_me:11604: checking if we have identified curses headers" >&5 echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6 if test "${cf_cv_ncurses_header+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -10137,11 +11609,11 @@ else cf_cv_ncurses_header=none for cf_header in \ - ncurses.h ncurses/ncurses.h \ - curses.h ncurses/curses.h + ncurses.h $cf_cv_screen/ncurses.h \ + curses.h $cf_cv_screen/curses.h do cat >"conftest.$ac_ext" <<_ACEOF -#line 10144 "configure" +#line 11616 "configure" #include "confdefs.h" #include <${cf_header}> int @@ -10153,16 +11625,16 @@ initscr(); endwin() } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:10156: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11628: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10159: \$? = $ac_status" >&5 + echo "$as_me:11631: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:10162: \"$ac_try\"") >&5 + { (eval echo "$as_me:11634: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10165: \$? = $ac_status" >&5 + echo "$as_me:11637: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_header=$cf_header; break else @@ -10173,11 +11645,11 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:10176: result: $cf_cv_ncurses_header" >&5 +echo "$as_me:11648: result: $cf_cv_ncurses_header" >&5 echo "${ECHO_T}$cf_cv_ncurses_header" >&6 if test "$cf_cv_ncurses_header" = none ; then - { { echo "$as_me:10180: error: No curses header-files found" >&5 + { { echo "$as_me:11652: error: No curses header-files found" >&5 echo "$as_me: error: No curses header-files found" >&2;} { (exit 1); exit 1; }; } fi @@ -10187,23 +11659,23 @@ fi for ac_header in $cf_cv_ncurses_header do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:10190: checking for $ac_header" >&5 +echo "$as_me:11662: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 10196 "configure" +#line 11668 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:10200: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:11672: \"$ac_cpp "conftest.$ac_ext"\"") >&5 (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:10206: \$? = $ac_status" >&5 + echo "$as_me:11678: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -10222,7 +11694,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:10225: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:11697: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then cat >>confdefs.h <"conftest.$ac_ext" <<_ACEOF -#line 10281 "configure" +#line 11753 "configure" #include "confdefs.h" #include int @@ -10290,16 +11762,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:10293: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11765: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10296: \$? = $ac_status" >&5 + echo "$as_me:11768: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:10299: \"$ac_try\"") >&5 + { (eval echo "$as_me:11771: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10302: \$? = $ac_status" >&5 + echo "$as_me:11774: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -10316,7 +11788,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:10319: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:11791: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -10335,7 +11807,7 @@ fi } -echo "$as_me:10338: checking for $cf_ncuhdr_root header in include-path" >&5 +echo "$as_me:11810: checking for $cf_ncuhdr_root header in include-path" >&5 echo $ECHO_N "checking for $cf_ncuhdr_root header in include-path... $ECHO_C" >&6 if test "${cf_cv_ncurses_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -10347,7 +11819,7 @@ else do cat >"conftest.$ac_ext" <<_ACEOF -#line 10350 "configure" +#line 11822 "configure" #include "confdefs.h" #include <$cf_header> @@ -10371,16 +11843,16 @@ printf("old\\n"); } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:10374: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11846: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10377: \$? = $ac_status" >&5 + echo "$as_me:11849: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:10380: \"$ac_try\"") >&5 + { (eval echo "$as_me:11852: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10383: \$? = $ac_status" >&5 + echo "$as_me:11855: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_h=$cf_header @@ -10395,14 +11867,14 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:10398: result: $cf_cv_ncurses_h" >&5 +echo "$as_me:11870: result: $cf_cv_ncurses_h" >&5 echo "${ECHO_T}$cf_cv_ncurses_h" >&6 if test "$cf_cv_ncurses_h" != no ; then cf_cv_ncurses_header=$cf_cv_ncurses_h else -echo "$as_me:10405: checking for $cf_ncuhdr_root include-path" >&5 +echo "$as_me:11877: checking for $cf_ncuhdr_root include-path" >&5 echo $ECHO_N "checking for $cf_ncuhdr_root include-path... $ECHO_C" >&6 if test "${cf_cv_ncurses_h2+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -10523,7 +11995,7 @@ if test -n "$cf_incdir" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 10526 "configure" +#line 11998 "configure" #include "confdefs.h" #include int @@ -10535,16 +12007,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:10538: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12010: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10541: \$? = $ac_status" >&5 + echo "$as_me:12013: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:10544: \"$ac_try\"") >&5 + { (eval echo "$as_me:12016: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10547: \$? = $ac_status" >&5 + echo "$as_me:12019: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -10561,7 +12033,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:10564: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:12036: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -10584,7 +12056,7 @@ fi do cat >"conftest.$ac_ext" <<_ACEOF -#line 10587 "configure" +#line 12059 "configure" #include "confdefs.h" #include <$cf_header> @@ -10608,16 +12080,16 @@ printf("old\\n"); } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:10611: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12083: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10614: \$? = $ac_status" >&5 + echo "$as_me:12086: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:10617: \"$ac_try\"") >&5 + { (eval echo "$as_me:12089: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10620: \$? = $ac_status" >&5 + echo "$as_me:12092: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_h2=$cf_header @@ -10638,12 +12110,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" CPPFLAGS="$cf_save2_CPPFLAGS" test "$cf_cv_ncurses_h2" != no && break done - test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:10641: error: not found" >&5 + test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:12113: error: not found" >&5 echo "$as_me: error: not found" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:10646: result: $cf_cv_ncurses_h2" >&5 +echo "$as_me:12118: result: $cf_cv_ncurses_h2" >&5 echo "${ECHO_T}$cf_cv_ncurses_h2" >&6 cf_1st_incdir=`echo "$cf_cv_ncurses_h2" | sed -e 's%/[^/]*$%%'` @@ -10679,7 +12151,7 @@ if test -n "$cf_1st_incdir" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 10682 "configure" +#line 12154 "configure" #include "confdefs.h" #include int @@ -10691,16 +12163,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:10694: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12166: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10697: \$? = $ac_status" >&5 + echo "$as_me:12169: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:10700: \"$ac_try\"") >&5 + { (eval echo "$as_me:12172: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10703: \$? = $ac_status" >&5 + echo "$as_me:12175: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -10717,7 +12189,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:10720: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:12192: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -10765,7 +12237,7 @@ EOF ;; esac -echo "$as_me:10768: checking for terminfo header" >&5 +echo "$as_me:12240: checking for terminfo header" >&5 echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6 if test "${cf_cv_term_header+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -10783,7 +12255,7 @@ esac for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do cat >"conftest.$ac_ext" <<_ACEOF -#line 10786 "configure" +#line 12258 "configure" #include "confdefs.h" #include #include <${cf_cv_ncurses_header:-curses.h}> @@ -10798,16 +12270,16 @@ int x = auto_left_margin; (void)x } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:10801: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12273: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10804: \$? = $ac_status" >&5 + echo "$as_me:12276: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:10807: \"$ac_try\"") >&5 + { (eval echo "$as_me:12279: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10810: \$? = $ac_status" >&5 + echo "$as_me:12282: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_term_header="$cf_test" @@ -10823,7 +12295,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:10826: result: $cf_cv_term_header" >&5 +echo "$as_me:12298: result: $cf_cv_term_header" >&5 echo "${ECHO_T}$cf_cv_term_header" >&6 # Set definitions to allow ifdef'ing to accommodate subdirectories @@ -10861,7 +12333,7 @@ cat >>confdefs.h <<\EOF #define NCURSES 1 EOF -echo "$as_me:10864: checking for ncurses version" >&5 +echo "$as_me:12336: checking for ncurses version" >&5 echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6 if test "${cf_cv_ncurses_version+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -10887,10 +12359,10 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo "$as_me:10890: \"$cf_try\"") >&5 + { (eval echo "$as_me:12362: \"$cf_try\"") >&5 (eval $cf_try) 2>&5 ac_status=$? - echo "$as_me:10893: \$? = $ac_status" >&5 + echo "$as_me:12365: \$? = $ac_status" >&5 (exit "$ac_status"); } if test -f conftest.out ; then cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out` @@ -10900,7 +12372,7 @@ EOF else cat >"conftest.$ac_ext" <<_ACEOF -#line 10903 "configure" +#line 12375 "configure" #include "confdefs.h" $ac_includes_default @@ -10920,22 +12392,22 @@ int main(void) # ifdef __NCURSES_H fprintf(fp, "old\\n"); # else - make an error + #error expected ncurses header to define __NCURSES_H # endif #endif ${cf_cv_main_return:-return}(0); } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:10930: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12402: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10933: \$? = $ac_status" >&5 + echo "$as_me:12405: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:10935: \"$ac_try\"") >&5 + { (eval echo "$as_me:12407: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10938: \$? = $ac_status" >&5 + echo "$as_me:12410: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_version=`cat $cf_tempfile` @@ -10949,20 +12421,20 @@ fi rm -f "$cf_tempfile" fi -echo "$as_me:10952: result: $cf_cv_ncurses_version" >&5 +echo "$as_me:12424: result: $cf_cv_ncurses_version" >&5 echo "${ECHO_T}$cf_cv_ncurses_version" >&6 test "$cf_cv_ncurses_version" = no || cat >>confdefs.h <<\EOF #define NCURSES 1 EOF -cf_nculib_root=ncurses +cf_nculib_root=$cf_cv_screen # This works, except for the special case where we find gpm, but # ncurses is in a nonstandard location via $LIBS, and we really want # to link gpm. cf_ncurses_LIBS="" cf_ncurses_SAVE="$LIBS" -echo "$as_me:10965: checking for Gpm_Open in -lgpm" >&5 +echo "$as_me:12437: checking for Gpm_Open in -lgpm" >&5 echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6 if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -10970,7 +12442,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 10973 "configure" +#line 12445 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -10979,7 +12451,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char Gpm_Open (); +char Gpm_Open (void); int main (void) { @@ -10989,16 +12461,16 @@ Gpm_Open (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:10992: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12464: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10995: \$? = $ac_status" >&5 + echo "$as_me:12467: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:10998: \"$ac_try\"") >&5 + { (eval echo "$as_me:12470: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11001: \$? = $ac_status" >&5 + echo "$as_me:12473: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_gpm_Gpm_Open=yes else @@ -11009,10 +12481,10 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:11012: result: $ac_cv_lib_gpm_Gpm_Open" >&5 +echo "$as_me:12484: result: $ac_cv_lib_gpm_Gpm_Open" >&5 echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6 if test "$ac_cv_lib_gpm_Gpm_Open" = yes; then - echo "$as_me:11015: checking for initscr in -lgpm" >&5 + echo "$as_me:12487: checking for initscr in -lgpm" >&5 echo $ECHO_N "checking for initscr in -lgpm... $ECHO_C" >&6 if test "${ac_cv_lib_gpm_initscr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -11020,7 +12492,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 11023 "configure" +#line 12495 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -11029,7 +12501,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char initscr (); +char initscr (void); int main (void) { @@ -11039,16 +12511,16 @@ initscr (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:11042: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12514: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11045: \$? = $ac_status" >&5 + echo "$as_me:12517: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:11048: \"$ac_try\"") >&5 + { (eval echo "$as_me:12520: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11051: \$? = $ac_status" >&5 + echo "$as_me:12523: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_gpm_initscr=yes else @@ -11059,7 +12531,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:11062: result: $ac_cv_lib_gpm_initscr" >&5 +echo "$as_me:12534: result: $ac_cv_lib_gpm_initscr" >&5 echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6 if test "$ac_cv_lib_gpm_initscr" = yes; then LIBS="$cf_ncurses_SAVE" @@ -11074,7 +12546,7 @@ case "$host_os" in # This is only necessary if you are linking against an obsolete # version of ncurses (but it should do no harm, since it is static). if test "$cf_nculib_root" = ncurses ; then - echo "$as_me:11077: checking for tgoto in -lmytinfo" >&5 + echo "$as_me:12549: checking for tgoto in -lmytinfo" >&5 echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6 if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -11082,7 +12554,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lmytinfo $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 11085 "configure" +#line 12557 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -11091,7 +12563,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char tgoto (); +char tgoto (void); int main (void) { @@ -11101,16 +12573,16 @@ tgoto (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:11104: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12576: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11107: \$? = $ac_status" >&5 + echo "$as_me:12579: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:11110: \"$ac_try\"") >&5 + { (eval echo "$as_me:12582: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11113: \$? = $ac_status" >&5 + echo "$as_me:12585: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_mytinfo_tgoto=yes else @@ -11121,7 +12593,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:11124: result: $ac_cv_lib_mytinfo_tgoto" >&5 +echo "$as_me:12596: result: $ac_cv_lib_mytinfo_tgoto" >&5 echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6 if test "$ac_cv_lib_mytinfo_tgoto" = yes; then cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS" @@ -11170,13 +12642,13 @@ else eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no' cf_libdir="" - echo "$as_me:11173: checking for initscr" >&5 + echo "$as_me:12645: checking for initscr" >&5 echo $ECHO_N "checking for initscr... $ECHO_C" >&6 if test "${ac_cv_func_initscr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 11179 "configure" +#line 12651 "configure" #include "confdefs.h" #define initscr autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -11207,16 +12679,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:11210: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12682: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11213: \$? = $ac_status" >&5 + echo "$as_me:12685: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:11216: \"$ac_try\"") >&5 + { (eval echo "$as_me:12688: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11219: \$? = $ac_status" >&5 + echo "$as_me:12691: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_initscr=yes else @@ -11226,18 +12698,18 @@ ac_cv_func_initscr=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:11229: result: $ac_cv_func_initscr" >&5 +echo "$as_me:12701: result: $ac_cv_func_initscr" >&5 echo "${ECHO_T}$ac_cv_func_initscr" >&6 if test "$ac_cv_func_initscr" = yes; then eval 'cf_cv_have_lib_'"$cf_nculib_root"'=yes' else cf_save_LIBS="$LIBS" - echo "$as_me:11236: checking for initscr in -l$cf_nculib_root" >&5 + echo "$as_me:12708: checking for initscr in -l$cf_nculib_root" >&5 echo $ECHO_N "checking for initscr in -l$cf_nculib_root... $ECHO_C" >&6 LIBS="-l$cf_nculib_root $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 11240 "configure" +#line 12712 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -11249,25 +12721,25 @@ initscr() } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:11252: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12724: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11255: \$? = $ac_status" >&5 + echo "$as_me:12727: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:11258: \"$ac_try\"") >&5 + { (eval echo "$as_me:12730: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11261: \$? = $ac_status" >&5 + echo "$as_me:12733: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - echo "$as_me:11263: result: yes" >&5 + echo "$as_me:12735: result: yes" >&5 echo "${ECHO_T}yes" >&6 eval 'cf_cv_have_lib_'"$cf_nculib_root"'=yes' else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 -echo "$as_me:11270: result: no" >&5 +echo "$as_me:12742: result: no" >&5 echo "${ECHO_T}no" >&6 cf_search= @@ -11335,11 +12807,11 @@ cf_search="$cf_library_path_list $cf_search" for cf_libdir in $cf_search do - echo "$as_me:11338: checking for -l$cf_nculib_root in $cf_libdir" >&5 + echo "$as_me:12810: checking for -l$cf_nculib_root in $cf_libdir" >&5 echo $ECHO_N "checking for -l$cf_nculib_root in $cf_libdir... $ECHO_C" >&6 LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 11342 "configure" +#line 12814 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -11351,25 +12823,25 @@ initscr() } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:11354: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12826: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11357: \$? = $ac_status" >&5 + echo "$as_me:12829: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:11360: \"$ac_try\"") >&5 + { (eval echo "$as_me:12832: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11363: \$? = $ac_status" >&5 + echo "$as_me:12835: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - echo "$as_me:11365: result: yes" >&5 + echo "$as_me:12837: result: yes" >&5 echo "${ECHO_T}yes" >&6 eval 'cf_cv_have_lib_'"$cf_nculib_root"'=yes' break else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 -echo "$as_me:11372: result: no" >&5 +echo "$as_me:12844: result: no" >&5 echo "${ECHO_T}no" >&6 LIBS="$cf_save_LIBS" fi @@ -11384,7 +12856,7 @@ fi eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\" if test "$cf_found_library" = no ; then - { { echo "$as_me:11387: error: Cannot link $cf_nculib_root library" >&5 + { { echo "$as_me:12859: error: Cannot link $cf_nculib_root library" >&5 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;} { (exit 1); exit 1; }; } fi @@ -11392,7 +12864,7 @@ fi fi if test -n "$cf_ncurses_LIBS" ; then - echo "$as_me:11395: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 + echo "$as_me:12867: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS... $ECHO_C" >&6 cf_ncurses_SAVE="$LIBS" for p in $cf_ncurses_LIBS ; do @@ -11402,7 +12874,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS.. fi done cat >"conftest.$ac_ext" <<_ACEOF -#line 11405 "configure" +#line 12877 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -11414,23 +12886,23 @@ initscr(); mousemask(0,0); tigetstr((char *)0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:11417: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12889: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11420: \$? = $ac_status" >&5 + echo "$as_me:12892: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:11423: \"$ac_try\"") >&5 + { (eval echo "$as_me:12895: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11426: \$? = $ac_status" >&5 + echo "$as_me:12898: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - echo "$as_me:11428: result: yes" >&5 + echo "$as_me:12900: result: yes" >&5 echo "${ECHO_T}yes" >&6 else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 -echo "$as_me:11433: result: no" >&5 +echo "$as_me:12905: result: no" >&5 echo "${ECHO_T}no" >&6 LIBS="$cf_ncurses_SAVE" fi @@ -11448,7 +12920,13 @@ else NCURSES_CONFIG=none fi -fi + ;; +(*) + { { echo "$as_me:12925: error: unexpected screen-value: $cf_cv_screen" >&5 +echo "$as_me: error: unexpected screen-value: $cf_cv_screen" >&2;} + { (exit 1); exit 1; }; } + ;; +esac if test "$NCURSES_CONFIG_PKG" != none ; then cf_version=`$PKG_CONFIG --modversion $NCURSES_CONFIG_PKG 2>/dev/null` @@ -11483,10 +12961,10 @@ else AUTOCONF_$cf_name NCURSES_VERSION_$cf_name CF_EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | fgrep AUTOCONF_$cf_name >conftest.out" - { (eval echo "$as_me:11486: \"$cf_try\"") >&5 + { (eval echo "$as_me:12964: \"$cf_try\"") >&5 (eval $cf_try) 2>&5 ac_status=$? - echo "$as_me:11489: \$? = $ac_status" >&5 + echo "$as_me:12967: \$? = $ac_status" >&5 (exit "$ac_status"); } if test -f conftest.out ; then cf_result=`sed -e "s/^.*AUTOCONF_${cf_name}[ ][ ]*//" conftest.out` @@ -11504,10 +12982,53 @@ cf_cv_rel_version=${NCURSES_MAJOR}.${NCURSES_MINOR} cf_cv_timestamp=`date` -echo "$as_me:11507: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5 +echo "$as_me:12985: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5 echo "${ECHO_T}Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&6 -echo "$as_me:11510: checking if you want to have a library-prefix" >&5 +echo "$as_me:12988: checking if KEY_RESIZE is supported" >&5 +echo $ECHO_N "checking if KEY_RESIZE is supported... $ECHO_C" >&6 +if test "${cf_cv_curses_resizes+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + cat >"conftest.$ac_ext" <<_ACEOF +#line 12995 "configure" +#include "confdefs.h" +#include <${cf_cv_ncurses_header:-curses.h}> +int +main (void) +{ +int key = KEY_RESIZE; (void)key + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:13007: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:13010: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:13013: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:13016: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_curses_resizes=yes +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +cf_cv_curses_resizes=no +fi +rm -f "conftest.$ac_objext" "conftest.$ac_ext" +fi +echo "$as_me:13026: result: $cf_cv_curses_resizes" >&5 +echo "${ECHO_T}$cf_cv_curses_resizes" >&6 +cf_cv_enable_sigwinch=0 +test "$cf_cv_curses_resizes" = yes && cf_cv_enable_sigwinch=1 + +echo "$as_me:13031: checking if you want to have a library-prefix" >&5 echo $ECHO_N "checking if you want to have a library-prefix... $ECHO_C" >&6 # Check whether --with-lib-prefix or --without-lib-prefix was given. @@ -11517,7 +13038,7 @@ if test "${with_lib_prefix+set}" = set; then else with_lib_prefix=auto fi; -echo "$as_me:11520: result: $with_lib_prefix" >&5 +echo "$as_me:13041: result: $with_lib_prefix" >&5 echo "${ECHO_T}$with_lib_prefix" >&6 if test "$with_lib_prefix" = auto @@ -11555,7 +13076,7 @@ if test X"$CC_G_OPT" = X"" ; then test -n "$GCC" && test "${ac_cv_prog_cc_g}" != yes && CC_G_OPT='' fi -echo "$as_me:11558: checking for default loader flags" >&5 +echo "$as_me:13079: checking for default loader flags" >&5 echo $ECHO_N "checking for default loader flags... $ECHO_C" >&6 case $DFT_LWR_MODEL in (normal) LD_MODEL='' ;; @@ -11563,13 +13084,13 @@ case $DFT_LWR_MODEL in (profile) LD_MODEL='-pg';; (shared) LD_MODEL='' ;; esac -echo "$as_me:11566: result: $LD_MODEL" >&5 +echo "$as_me:13087: result: $LD_MODEL" >&5 echo "${ECHO_T}$LD_MODEL" >&6 LD_RPATH_OPT= if test "x$cf_cv_enable_rpath" != xno then - echo "$as_me:11572: checking for an rpath option" >&5 + echo "$as_me:13093: checking for an rpath option" >&5 echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6 case "$cf_cv_system_name" in (irix*) @@ -11600,12 +13121,12 @@ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6 (*) ;; esac - echo "$as_me:11603: result: $LD_RPATH_OPT" >&5 + echo "$as_me:13124: result: $LD_RPATH_OPT" >&5 echo "${ECHO_T}$LD_RPATH_OPT" >&6 case "x$LD_RPATH_OPT" in (x-R*) - echo "$as_me:11608: checking if we need a space after rpath option" >&5 + echo "$as_me:13129: checking if we need a space after rpath option" >&5 echo $ECHO_N "checking if we need a space after rpath option... $ECHO_C" >&6 cf_save_LIBS="$LIBS" @@ -11626,7 +13147,7 @@ done LIBS="$cf_add_libs" cat >"conftest.$ac_ext" <<_ACEOF -#line 11629 "configure" +#line 13150 "configure" #include "confdefs.h" int @@ -11638,16 +13159,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:11641: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13162: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11644: \$? = $ac_status" >&5 + echo "$as_me:13165: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:11647: \"$ac_try\"") >&5 + { (eval echo "$as_me:13168: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11650: \$? = $ac_status" >&5 + echo "$as_me:13171: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_rpath_space=no else @@ -11657,7 +13178,7 @@ cf_rpath_space=yes fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS="$cf_save_LIBS" - echo "$as_me:11660: result: $cf_rpath_space" >&5 + echo "$as_me:13181: result: $cf_rpath_space" >&5 echo "${ECHO_T}$cf_rpath_space" >&6 test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT " ;; @@ -11679,8 +13200,8 @@ fi cf_ld_rpath_opt= test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT" - echo "$as_me:11682: checking if release/abi version should be used for shared libs" >&5 -echo $ECHO_N "checking if release/abi version should be used for shared libs... $ECHO_C" >&6 + echo "$as_me:13203: checking whether to use release or ABI version in shared library file names" >&5 +echo $ECHO_N "checking whether to use release or ABI version in shared library file names... $ECHO_C" >&6 # Check whether --with-shlib-version or --without-shlib-version was given. if test "${with_shlib_version+set}" = set; then @@ -11694,9 +13215,9 @@ if test "${with_shlib_version+set}" = set; then cf_cv_shlib_version=$withval ;; (*) - echo "$as_me:11697: result: $withval" >&5 + echo "$as_me:13218: result: $withval" >&5 echo "${ECHO_T}$withval" >&6 - { { echo "$as_me:11699: error: option value must be one of: rel, abi, or auto" >&5 + { { echo "$as_me:13220: error: option value must be one of: rel, abi, or auto" >&5 echo "$as_me: error: option value must be one of: rel, abi, or auto" >&2;} { (exit 1); exit 1; }; } ;; @@ -11705,7 +13226,7 @@ echo "$as_me: error: option value must be one of: rel, abi, or auto" >&2;} else cf_cv_shlib_version=auto fi; - echo "$as_me:11708: result: $cf_cv_shlib_version" >&5 + echo "$as_me:13229: result: $cf_cv_shlib_version" >&5 echo "${ECHO_T}$cf_cv_shlib_version" >&6 cf_cv_rm_so_locs=no @@ -11728,35 +13249,35 @@ echo "${ECHO_T}$cf_cv_shlib_version" >&6 if test "$cf_try_fPIC" = yes then - echo "$as_me:11731: checking which $CC option to use" >&5 + echo "$as_me:13252: checking which $CC option to use" >&5 echo $ECHO_N "checking which $CC option to use... $ECHO_C" >&6 cf_save_CFLAGS="$CFLAGS" for CC_SHARED_OPTS in -fPIC -fpic '' do CFLAGS="$cf_save_CFLAGS $CC_SHARED_OPTS" cat >"conftest.$ac_ext" <<_ACEOF -#line 11738 "configure" +#line 13259 "configure" #include "confdefs.h" #include int main (void) { -int x = 1 +int x = 1; (void)x ; return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:11750: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:13271: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11753: \$? = $ac_status" >&5 + echo "$as_me:13274: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:11756: \"$ac_try\"") >&5 + { (eval echo "$as_me:13277: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11759: \$? = $ac_status" >&5 + echo "$as_me:13280: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then break else @@ -11765,7 +13286,7 @@ cat "conftest.$ac_ext" >&5 fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" done - echo "$as_me:11768: result: $CC_SHARED_OPTS" >&5 + echo "$as_me:13289: result: $CC_SHARED_OPTS" >&5 echo "${ECHO_T}$CC_SHARED_OPTS" >&6 CFLAGS="$cf_save_CFLAGS" fi @@ -11836,7 +13357,7 @@ CF_EOF MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -dynamiclib -install_name ${libdir}/`basename $@` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $@' test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=abi cf_cv_shlib_version_infix=yes - echo "$as_me:11839: checking if ld -search_paths_first works" >&5 + echo "$as_me:13360: checking if ld -search_paths_first works" >&5 echo $ECHO_N "checking if ld -search_paths_first works... $ECHO_C" >&6 if test "${cf_cv_ldflags_search_paths_first+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -11845,7 +13366,7 @@ else cf_save_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS -Wl,-search_paths_first" cat >"conftest.$ac_ext" <<_ACEOF -#line 11848 "configure" +#line 13369 "configure" #include "confdefs.h" int @@ -11857,16 +13378,16 @@ int i; } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:11860: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13381: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11863: \$? = $ac_status" >&5 + echo "$as_me:13384: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:11866: \"$ac_try\"") >&5 + { (eval echo "$as_me:13387: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11869: \$? = $ac_status" >&5 + echo "$as_me:13390: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ldflags_search_paths_first=yes else @@ -11877,7 +13398,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LDFLAGS=$cf_save_LDFLAGS fi -echo "$as_me:11880: result: $cf_cv_ldflags_search_paths_first" >&5 +echo "$as_me:13401: result: $cf_cv_ldflags_search_paths_first" >&5 echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6 if test "$cf_cv_ldflags_search_paths_first" = yes; then LDFLAGS="$LDFLAGS -Wl,-search_paths_first" @@ -12207,11 +13728,11 @@ CF_EOF # tested with SunOS 5.5.1 (solaris 2.5.1) and gcc 2.7.2 # tested with SunOS 5.10 (solaris 10) and gcc 3.4.3 if test "$DFT_LWR_MODEL" = "shared" ; then - LOCAL_LDFLAGS="-R \$(LOCAL_LIBDIR):\${libdir}" + LOCAL_LDFLAGS="-R\$(LOCAL_LIBDIR):\${libdir}" LOCAL_LDFLAGS2="$LOCAL_LDFLAGS" fi if test "$cf_cv_enable_rpath" = yes ; then - EXTRA_LDFLAGS="-R \${libdir} $EXTRA_LDFLAGS" + EXTRA_LDFLAGS="-R\${libdir} $EXTRA_LDFLAGS" fi test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel @@ -12227,7 +13748,7 @@ CF_EOF do CFLAGS="$cf_shared_opts $cf_save_CFLAGS" cat >"conftest.$ac_ext" <<_ACEOF -#line 12230 "configure" +#line 13751 "configure" #include "confdefs.h" #include int @@ -12239,16 +13760,16 @@ printf("Hello\\n"); } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:12242: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:13763: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12245: \$? = $ac_status" >&5 + echo "$as_me:13766: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:12248: \"$ac_try\"") >&5 + { (eval echo "$as_me:13769: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12251: \$? = $ac_status" >&5 + echo "$as_me:13772: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then break else @@ -12259,9 +13780,9 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done CFLAGS="$cf_save_CFLAGS" CC_SHARED_OPTS=$cf_shared_opts - MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -dy -G -h '$cf_cv_shared_soname' -o $@' + MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -dy -G -Wl,-h,'$cf_cv_shared_soname' -o $@' else - MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -shared -dy -G -h '$cf_cv_shared_soname' -o $@' + MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -shared -dy -G -Wl,-h,'$cf_cv_shared_soname' -o $@' fi ;; (sysv5uw7*|unix_sv*) @@ -12285,7 +13806,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes ;; (*) - { echo "$as_me:12288: WARNING: ignored --with-shlib-version" >&5 + { echo "$as_me:13809: WARNING: ignored --with-shlib-version" >&5 echo "$as_me: WARNING: ignored --with-shlib-version" >&2;} ;; esac @@ -12295,30 +13816,30 @@ echo "$as_me: WARNING: ignored --with-shlib-version" >&2;} if test -n "$cf_try_cflags" then cat > conftest.$ac_ext < int main(int argc, char *argv[]) { printf("hello\\n"); - return (argv[argc-1] == 0) ; + return (argv[argc-1] == NULL) ; } EOF cf_save_CFLAGS="$CFLAGS" for cf_opt in $cf_try_cflags do CFLAGS="$cf_save_CFLAGS -$cf_opt" - echo "$as_me:12310: checking if CFLAGS option -$cf_opt works" >&5 + echo "$as_me:13831: checking if CFLAGS option -$cf_opt works" >&5 echo $ECHO_N "checking if CFLAGS option -$cf_opt works... $ECHO_C" >&6 - if { (eval echo "$as_me:12312: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:13833: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12315: \$? = $ac_status" >&5 + echo "$as_me:13836: \$? = $ac_status" >&5 (exit "$ac_status"); }; then - echo "$as_me:12317: result: yes" >&5 + echo "$as_me:13838: result: yes" >&5 echo "${ECHO_T}yes" >&6 cf_save_CFLAGS="$CFLAGS" else - echo "$as_me:12321: result: no" >&5 + echo "$as_me:13842: result: no" >&5 echo "${ECHO_T}no" >&6 fi done @@ -12333,17 +13854,17 @@ echo "${ECHO_T}no" >&6 test -n "$verbose" && echo " CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6 -echo "${as_me:-configure}:12336: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5 +echo "${as_me:-configure}:13857: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5 test -n "$verbose" && echo " MK_SHARED_LIB: $MK_SHARED_LIB" 1>&6 -echo "${as_me:-configure}:12340: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5 +echo "${as_me:-configure}:13861: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5 # The test/sample programs in the original tree link using rpath option. # Make it optional for packagers. if test -n "$LOCAL_LDFLAGS" then - echo "$as_me:12346: checking if you want to link sample programs with rpath option" >&5 + echo "$as_me:13867: checking if you want to link sample programs with rpath option" >&5 echo $ECHO_N "checking if you want to link sample programs with rpath option... $ECHO_C" >&6 # Check whether --enable-rpath-link or --disable-rpath-link was given. @@ -12353,7 +13874,7 @@ if test "${enable_rpath_link+set}" = set; then else with_rpath_link=yes fi; - echo "$as_me:12356: result: $with_rpath_link" >&5 + echo "$as_me:13877: result: $with_rpath_link" >&5 echo "${ECHO_T}$with_rpath_link" >&6 if test "$with_rpath_link" = no then @@ -12366,7 +13887,7 @@ fi ### use option --enable-broken-linker to force on use of broken-linker support -echo "$as_me:12369: checking if you want broken-linker support code" >&5 +echo "$as_me:13890: checking if you want broken-linker support code" >&5 echo $ECHO_N "checking if you want broken-linker support code... $ECHO_C" >&6 # Check whether --enable-broken_linker or --disable-broken_linker was given. @@ -12376,7 +13897,7 @@ if test "${enable_broken_linker+set}" = set; then else with_broken_linker=no fi; -echo "$as_me:12379: result: $with_broken_linker" >&5 +echo "$as_me:13900: result: $with_broken_linker" >&5 echo "${ECHO_T}$with_broken_linker" >&6 : "${BROKEN_LINKER:=0}" @@ -12391,14 +13912,14 @@ fi # Check to define _XOPEN_SOURCE "automatically" -echo "$as_me:12394: checking if the POSIX test-macros are already defined" >&5 +echo "$as_me:13915: checking if the POSIX test-macros are already defined" >&5 echo $ECHO_N "checking if the POSIX test-macros are already defined... $ECHO_C" >&6 if test "${cf_cv_posix_visible+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 12401 "configure" +#line 13922 "configure" #include "confdefs.h" #include int @@ -12417,16 +13938,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:12420: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:13941: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12423: \$? = $ac_status" >&5 + echo "$as_me:13944: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:12426: \"$ac_try\"") >&5 + { (eval echo "$as_me:13947: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12429: \$? = $ac_status" >&5 + echo "$as_me:13950: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_posix_visible=no else @@ -12437,7 +13958,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:12440: result: $cf_cv_posix_visible" >&5 +echo "$as_me:13961: result: $cf_cv_posix_visible" >&5 echo "${ECHO_T}$cf_cv_posix_visible" >&6 if test "$cf_cv_posix_visible" = no; then @@ -12475,18 +13996,18 @@ case "$host_os" in cf_xopen_source="-D_SGI_SOURCE" cf_XOPEN_SOURCE= ;; -(linux*gnu|linux*gnuabi64|linux*gnuabin32|linux*gnueabi|linux*gnueabihf|linux*gnux32|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys) +(linux*gnu|linux*gnuabi64|linux*gnuabin32|linux*gnueabi|linux*gnueabihf|linux*gnux32|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys|mingw*|linux*uclibc) cf_gnu_xopen_source=$cf_XOPEN_SOURCE -echo "$as_me:12482: checking if this is the GNU C library" >&5 +echo "$as_me:14003: checking if this is the GNU C library" >&5 echo $ECHO_N "checking if this is the GNU C library... $ECHO_C" >&6 if test "${cf_cv_gnu_library+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 12489 "configure" +#line 14010 "configure" #include "confdefs.h" #include int @@ -12505,16 +14026,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:12508: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14029: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12511: \$? = $ac_status" >&5 + echo "$as_me:14032: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:12514: \"$ac_try\"") >&5 + { (eval echo "$as_me:14035: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12517: \$? = $ac_status" >&5 + echo "$as_me:14038: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_gnu_library=yes else @@ -12525,7 +14046,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:12528: result: $cf_cv_gnu_library" >&5 +echo "$as_me:14049: result: $cf_cv_gnu_library" >&5 echo "${ECHO_T}$cf_cv_gnu_library" >&6 if test x$cf_cv_gnu_library = xyes; then @@ -12533,7 +14054,7 @@ if test x$cf_cv_gnu_library = xyes; then # With glibc 2.19 (13 years after this check was begun), _DEFAULT_SOURCE # was changed to help a little. newlib incorporated the change about 4 # years later. - echo "$as_me:12536: checking if _DEFAULT_SOURCE can be used as a basis" >&5 + echo "$as_me:14057: checking if _DEFAULT_SOURCE can be used as a basis" >&5 echo $ECHO_N "checking if _DEFAULT_SOURCE can be used as a basis... $ECHO_C" >&6 if test "${cf_cv_gnu_library_219+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -12545,7 +14066,7 @@ else CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE" cat >"conftest.$ac_ext" <<_ACEOF -#line 12548 "configure" +#line 14069 "configure" #include "confdefs.h" #include int @@ -12564,16 +14085,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:12567: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14088: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12570: \$? = $ac_status" >&5 + echo "$as_me:14091: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:12573: \"$ac_try\"") >&5 + { (eval echo "$as_me:14094: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12576: \$? = $ac_status" >&5 + echo "$as_me:14097: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_gnu_library_219=yes else @@ -12585,12 +14106,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" CPPFLAGS="$cf_save" fi -echo "$as_me:12588: result: $cf_cv_gnu_library_219" >&5 +echo "$as_me:14109: result: $cf_cv_gnu_library_219" >&5 echo "${ECHO_T}$cf_cv_gnu_library_219" >&6 if test "x$cf_cv_gnu_library_219" = xyes; then cf_save="$CPPFLAGS" - echo "$as_me:12593: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5 + echo "$as_me:14114: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5 echo $ECHO_N "checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE... $ECHO_C" >&6 if test "${cf_cv_gnu_dftsrc_219+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -12695,7 +14216,7 @@ if test -n "$cf_new_extra_cppflags" ; then fi cat >"conftest.$ac_ext" <<_ACEOF -#line 12698 "configure" +#line 14219 "configure" #include "confdefs.h" #include @@ -12715,16 +14236,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:12718: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14239: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12721: \$? = $ac_status" >&5 + echo "$as_me:14242: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:12724: \"$ac_try\"") >&5 + { (eval echo "$as_me:14245: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12727: \$? = $ac_status" >&5 + echo "$as_me:14248: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_gnu_dftsrc_219=yes else @@ -12735,7 +14256,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:12738: result: $cf_cv_gnu_dftsrc_219" >&5 +echo "$as_me:14259: result: $cf_cv_gnu_dftsrc_219" >&5 echo "${ECHO_T}$cf_cv_gnu_dftsrc_219" >&6 test "x$cf_cv_gnu_dftsrc_219" = "xyes" || CPPFLAGS="$cf_save" else @@ -12744,14 +14265,14 @@ echo "${ECHO_T}$cf_cv_gnu_dftsrc_219" >&6 if test "x$cf_cv_gnu_dftsrc_219" != xyes; then - echo "$as_me:12747: checking if we must define _GNU_SOURCE" >&5 + echo "$as_me:14268: checking if we must define _GNU_SOURCE" >&5 echo $ECHO_N "checking if we must define _GNU_SOURCE... $ECHO_C" >&6 if test "${cf_cv_gnu_source+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 12754 "configure" +#line 14275 "configure" #include "confdefs.h" #include int @@ -12766,16 +14287,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:12769: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14290: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12772: \$? = $ac_status" >&5 + echo "$as_me:14293: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:12775: \"$ac_try\"") >&5 + { (eval echo "$as_me:14296: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12778: \$? = $ac_status" >&5 + echo "$as_me:14299: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_gnu_source=no else @@ -12882,7 +14403,7 @@ if test -n "$cf_new_extra_cppflags" ; then fi cat >"conftest.$ac_ext" <<_ACEOF -#line 12885 "configure" +#line 14406 "configure" #include "confdefs.h" #include int @@ -12897,16 +14418,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:12900: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14421: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12903: \$? = $ac_status" >&5 + echo "$as_me:14424: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:12906: \"$ac_try\"") >&5 + { (eval echo "$as_me:14427: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12909: \$? = $ac_status" >&5 + echo "$as_me:14430: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_gnu_source=no else @@ -12921,12 +14442,12 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:12924: result: $cf_cv_gnu_source" >&5 +echo "$as_me:14445: result: $cf_cv_gnu_source" >&5 echo "${ECHO_T}$cf_cv_gnu_source" >&6 if test "$cf_cv_gnu_source" = yes then - echo "$as_me:12929: checking if we should also define _DEFAULT_SOURCE" >&5 + echo "$as_me:14450: checking if we should also define _DEFAULT_SOURCE" >&5 echo $ECHO_N "checking if we should also define _DEFAULT_SOURCE... $ECHO_C" >&6 if test "${cf_cv_default_source+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -12936,7 +14457,7 @@ else CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE" cat >"conftest.$ac_ext" <<_ACEOF -#line 12939 "configure" +#line 14460 "configure" #include "confdefs.h" #include int @@ -12951,16 +14472,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:12954: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14475: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12957: \$? = $ac_status" >&5 + echo "$as_me:14478: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:12960: \"$ac_try\"") >&5 + { (eval echo "$as_me:14481: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12963: \$? = $ac_status" >&5 + echo "$as_me:14484: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_default_source=no else @@ -12971,7 +14492,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:12974: result: $cf_cv_default_source" >&5 +echo "$as_me:14495: result: $cf_cv_default_source" >&5 echo "${ECHO_T}$cf_cv_default_source" >&6 if test "$cf_cv_default_source" = yes then @@ -12985,6 +14506,9 @@ echo "${ECHO_T}$cf_cv_default_source" >&6 fi + ;; +linux*musl) + cf_xopen_source="-D_BSD_SOURCE" ;; (minix*) cf_xopen_source="-D_NETBSD_SOURCE" # POSIX.1-2001 features are ifdef'd with this... @@ -13008,16 +14532,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \ sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'` -echo "$as_me:13011: checking if we should define _POSIX_C_SOURCE" >&5 +echo "$as_me:14535: checking if we should define _POSIX_C_SOURCE" >&5 echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6 if test "${cf_cv_posix_c_source+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -echo "${as_me:-configure}:13017: testing if the symbol is already defined go no further ..." 1>&5 +echo "${as_me:-configure}:14541: testing if the symbol is already defined go no further ..." 1>&5 cat >"conftest.$ac_ext" <<_ACEOF -#line 13020 "configure" +#line 14544 "configure" #include "confdefs.h" #include int @@ -13032,16 +14556,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:13035: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14559: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13038: \$? = $ac_status" >&5 + echo "$as_me:14562: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:13041: \"$ac_try\"") >&5 + { (eval echo "$as_me:14565: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13044: \$? = $ac_status" >&5 + echo "$as_me:14568: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_posix_c_source=no else @@ -13062,7 +14586,7 @@ cf_want_posix_source=no esac if test "$cf_want_posix_source" = yes ; then cat >"conftest.$ac_ext" <<_ACEOF -#line 13065 "configure" +#line 14589 "configure" #include "confdefs.h" #include int @@ -13077,16 +14601,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:13080: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14604: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13083: \$? = $ac_status" >&5 + echo "$as_me:14607: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:13086: \"$ac_try\"") >&5 + { (eval echo "$as_me:14610: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13089: \$? = $ac_status" >&5 + echo "$as_me:14613: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -13097,7 +14621,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "${as_me:-configure}:13100: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 +echo "${as_me:-configure}:14624: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 CFLAGS="$cf_trim_CFLAGS" CPPFLAGS="$cf_trim_CPPFLAGS" @@ -13105,10 +14629,10 @@ echo "${as_me:-configure}:13100: testing ifdef from value $cf_POSIX_C_SOURCE ... test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source" -echo "${as_me:-configure}:13108: testing if the second compile does not leave our definition intact error ..." 1>&5 +echo "${as_me:-configure}:14632: testing if the second compile does not leave our definition intact error ..." 1>&5 cat >"conftest.$ac_ext" <<_ACEOF -#line 13111 "configure" +#line 14635 "configure" #include "confdefs.h" #include int @@ -13123,16 +14647,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:13126: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14650: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13129: \$? = $ac_status" >&5 + echo "$as_me:14653: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:13132: \"$ac_try\"") >&5 + { (eval echo "$as_me:14656: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13135: \$? = $ac_status" >&5 + echo "$as_me:14659: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -13148,7 +14672,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:13151: result: $cf_cv_posix_c_source" >&5 +echo "$as_me:14675: result: $cf_cv_posix_c_source" >&5 echo "${ECHO_T}$cf_cv_posix_c_source" >&6 if test "$cf_cv_posix_c_source" != no ; then @@ -13265,7 +14789,7 @@ fi # cf_cv_posix_visible # OpenBSD 6.x has broken locale support, both compile-time and runtime. # see https://www.mail-archive.com/bugs@openbsd.org/msg13200.html # Abusing the conformance level is a workaround. - { echo "$as_me:13268: WARNING: this system does not provide usable locale support" >&5 + { echo "$as_me:14792: WARNING: this system does not provide usable locale support" >&5 echo "$as_me: WARNING: this system does not provide usable locale support" >&2;} cf_xopen_source="-D_BSD_SOURCE" cf_XOPEN_SOURCE=700 @@ -13297,14 +14821,14 @@ echo "$as_me: WARNING: this system does not provide usable locale support" >&2;} ;; (*) -echo "$as_me:13300: checking if we should define _XOPEN_SOURCE" >&5 +echo "$as_me:14824: checking if we should define _XOPEN_SOURCE" >&5 echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6 if test "${cf_cv_xopen_source+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 13307 "configure" +#line 14831 "configure" #include "confdefs.h" $ac_includes_default @@ -13322,16 +14846,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:13325: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14849: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13328: \$? = $ac_status" >&5 + echo "$as_me:14852: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:13331: \"$ac_try\"") >&5 + { (eval echo "$as_me:14855: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13334: \$? = $ac_status" >&5 + echo "$as_me:14858: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_xopen_source=no else @@ -13343,7 +14867,7 @@ cf_save="$CPPFLAGS" CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" cat >"conftest.$ac_ext" <<_ACEOF -#line 13346 "configure" +#line 14870 "configure" #include "confdefs.h" $ac_includes_default @@ -13361,16 +14885,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:13364: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14888: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13367: \$? = $ac_status" >&5 + echo "$as_me:14891: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:13370: \"$ac_try\"") >&5 + { (eval echo "$as_me:14894: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13373: \$? = $ac_status" >&5 + echo "$as_me:14897: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_xopen_source=no else @@ -13385,7 +14909,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:13388: result: $cf_cv_xopen_source" >&5 +echo "$as_me:14912: result: $cf_cv_xopen_source" >&5 echo "${ECHO_T}$cf_cv_xopen_source" >&6 if test "$cf_cv_xopen_source" != no ; then @@ -13545,16 +15069,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \ sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'` -echo "$as_me:13548: checking if we should define _POSIX_C_SOURCE" >&5 +echo "$as_me:15072: checking if we should define _POSIX_C_SOURCE" >&5 echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6 if test "${cf_cv_posix_c_source+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -echo "${as_me:-configure}:13554: testing if the symbol is already defined go no further ..." 1>&5 +echo "${as_me:-configure}:15078: testing if the symbol is already defined go no further ..." 1>&5 cat >"conftest.$ac_ext" <<_ACEOF -#line 13557 "configure" +#line 15081 "configure" #include "confdefs.h" #include int @@ -13569,16 +15093,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:13572: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15096: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13575: \$? = $ac_status" >&5 + echo "$as_me:15099: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:13578: \"$ac_try\"") >&5 + { (eval echo "$as_me:15102: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13581: \$? = $ac_status" >&5 + echo "$as_me:15105: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_posix_c_source=no else @@ -13599,7 +15123,7 @@ cf_want_posix_source=no esac if test "$cf_want_posix_source" = yes ; then cat >"conftest.$ac_ext" <<_ACEOF -#line 13602 "configure" +#line 15126 "configure" #include "confdefs.h" #include int @@ -13614,16 +15138,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:13617: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15141: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13620: \$? = $ac_status" >&5 + echo "$as_me:15144: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:13623: \"$ac_try\"") >&5 + { (eval echo "$as_me:15147: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13626: \$? = $ac_status" >&5 + echo "$as_me:15150: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -13634,7 +15158,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "${as_me:-configure}:13637: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 +echo "${as_me:-configure}:15161: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 CFLAGS="$cf_trim_CFLAGS" CPPFLAGS="$cf_trim_CPPFLAGS" @@ -13642,10 +15166,10 @@ echo "${as_me:-configure}:13637: testing ifdef from value $cf_POSIX_C_SOURCE ... test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source" -echo "${as_me:-configure}:13645: testing if the second compile does not leave our definition intact error ..." 1>&5 +echo "${as_me:-configure}:15169: testing if the second compile does not leave our definition intact error ..." 1>&5 cat >"conftest.$ac_ext" <<_ACEOF -#line 13648 "configure" +#line 15172 "configure" #include "confdefs.h" #include int @@ -13660,16 +15184,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:13663: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15187: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13666: \$? = $ac_status" >&5 + echo "$as_me:15190: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:13669: \"$ac_try\"") >&5 + { (eval echo "$as_me:15193: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13672: \$? = $ac_status" >&5 + echo "$as_me:15196: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -13685,7 +15209,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:13688: result: $cf_cv_posix_c_source" >&5 +echo "$as_me:15212: result: $cf_cv_posix_c_source" >&5 echo "${ECHO_T}$cf_cv_posix_c_source" >&6 if test "$cf_cv_posix_c_source" != no ; then @@ -13795,13 +15319,13 @@ fi fi # cf_cv_posix_visible # Some of these niche implementations use copy/paste, double-check... - if test "$cf_cv_xopen_source" != no ; then - test -n "$verbose" && echo " checking if _POSIX_C_SOURCE inteferes" 1>&6 + if test "$cf_cv_xopen_source" = no ; then + test -n "$verbose" && echo " checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE" 1>&6 -echo "${as_me:-configure}:13801: testing checking if _POSIX_C_SOURCE inteferes ..." 1>&5 +echo "${as_me:-configure}:15325: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5 cat >"conftest.$ac_ext" <<_ACEOF -#line 13804 "configure" +#line 15328 "configure" #include "confdefs.h" $ac_includes_default @@ -13819,23 +15343,23 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:13822: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15346: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13825: \$? = $ac_status" >&5 + echo "$as_me:15349: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:13828: \"$ac_try\"") >&5 + { (eval echo "$as_me:15352: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13831: \$? = $ac_status" >&5 + echo "$as_me:15355: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 - { echo "$as_me:13838: WARNING: _POSIX_C_SOURCE definition is not usable" >&5 + { echo "$as_me:15362: WARNING: _POSIX_C_SOURCE definition is not usable" >&5 echo "$as_me: WARNING: _POSIX_C_SOURCE definition is not usable" >&2;} CPPFLAGS="$cf_save_xopen_cppflags" fi @@ -13858,7 +15382,7 @@ do test "$CFLAGS" != "$cf_old_cflag" || break test -n "$verbose" && echo " removing old option $cf_add_cflags from CFLAGS" 1>&6 -echo "${as_me:-configure}:13861: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5 +echo "${as_me:-configure}:15385: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5 CFLAGS="$cf_old_cflag" done @@ -13870,7 +15394,7 @@ do test "$CPPFLAGS" != "$cf_old_cflag" || break test -n "$verbose" && echo " removing old option $cf_add_cflags from CPPFLAGS" 1>&6 -echo "${as_me:-configure}:13873: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5 +echo "${as_me:-configure}:15397: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5 CPPFLAGS="$cf_old_cflag" done @@ -13958,7 +15482,7 @@ done if test -n "$cf_new_cflags" ; then test -n "$verbose" && echo " add to \$CFLAGS $cf_new_cflags" 1>&6 -echo "${as_me:-configure}:13961: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 +echo "${as_me:-configure}:15485: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 test -n "$CFLAGS" && CFLAGS="$CFLAGS " CFLAGS="${CFLAGS}$cf_new_cflags" @@ -13968,7 +15492,7 @@ fi if test -n "$cf_new_cppflags" ; then test -n "$verbose" && echo " add to \$CPPFLAGS $cf_new_cppflags" 1>&6 -echo "${as_me:-configure}:13971: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 +echo "${as_me:-configure}:15495: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" @@ -13978,7 +15502,7 @@ fi if test -n "$cf_new_extra_cppflags" ; then test -n "$verbose" && echo " add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6 -echo "${as_me:-configure}:13981: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 +echo "${as_me:-configure}:15505: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" @@ -13990,10 +15514,10 @@ done fi if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then - echo "$as_me:13993: checking if _XOPEN_SOURCE really is set" >&5 + echo "$as_me:15517: checking if _XOPEN_SOURCE really is set" >&5 echo $ECHO_N "checking if _XOPEN_SOURCE really is set... $ECHO_C" >&6 cat >"conftest.$ac_ext" <<_ACEOF -#line 13996 "configure" +#line 15520 "configure" #include "confdefs.h" #include int @@ -14008,16 +15532,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:14011: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15535: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14014: \$? = $ac_status" >&5 + echo "$as_me:15538: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:14017: \"$ac_try\"") >&5 + { (eval echo "$as_me:15541: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14020: \$? = $ac_status" >&5 + echo "$as_me:15544: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_XOPEN_SOURCE_set=yes else @@ -14026,12 +15550,12 @@ cat "conftest.$ac_ext" >&5 cf_XOPEN_SOURCE_set=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" - echo "$as_me:14029: result: $cf_XOPEN_SOURCE_set" >&5 + echo "$as_me:15553: result: $cf_XOPEN_SOURCE_set" >&5 echo "${ECHO_T}$cf_XOPEN_SOURCE_set" >&6 if test "$cf_XOPEN_SOURCE_set" = yes then cat >"conftest.$ac_ext" <<_ACEOF -#line 14034 "configure" +#line 15558 "configure" #include "confdefs.h" #include int @@ -14046,16 +15570,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:14049: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15573: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14052: \$? = $ac_status" >&5 + echo "$as_me:15576: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:14055: \"$ac_try\"") >&5 + { (eval echo "$as_me:15579: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14058: \$? = $ac_status" >&5 + echo "$as_me:15582: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_XOPEN_SOURCE_set_ok=yes else @@ -14066,19 +15590,19 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_XOPEN_SOURCE_set_ok" = no then - { echo "$as_me:14069: WARNING: _XOPEN_SOURCE is lower than requested" >&5 + { echo "$as_me:15593: WARNING: _XOPEN_SOURCE is lower than requested" >&5 echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;} fi else -echo "$as_me:14074: checking if we should define _XOPEN_SOURCE" >&5 +echo "$as_me:15598: checking if we should define _XOPEN_SOURCE" >&5 echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6 if test "${cf_cv_xopen_source+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 14081 "configure" +#line 15605 "configure" #include "confdefs.h" $ac_includes_default @@ -14096,16 +15620,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:14099: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15623: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14102: \$? = $ac_status" >&5 + echo "$as_me:15626: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:14105: \"$ac_try\"") >&5 + { (eval echo "$as_me:15629: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14108: \$? = $ac_status" >&5 + echo "$as_me:15632: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_xopen_source=no else @@ -14117,7 +15641,7 @@ cf_save="$CPPFLAGS" CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" cat >"conftest.$ac_ext" <<_ACEOF -#line 14120 "configure" +#line 15644 "configure" #include "confdefs.h" $ac_includes_default @@ -14135,16 +15659,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:14138: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15662: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14141: \$? = $ac_status" >&5 + echo "$as_me:15665: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:14144: \"$ac_try\"") >&5 + { (eval echo "$as_me:15668: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14147: \$? = $ac_status" >&5 + echo "$as_me:15671: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_xopen_source=no else @@ -14159,7 +15683,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:14162: result: $cf_cv_xopen_source" >&5 +echo "$as_me:15686: result: $cf_cv_xopen_source" >&5 echo "${ECHO_T}$cf_cv_xopen_source" >&6 if test "$cf_cv_xopen_source" != no ; then @@ -14306,13 +15830,13 @@ fi fi fi # cf_cv_posix_visible -echo "$as_me:14309: checking for ANSI C header files" >&5 +echo "$as_me:15833: checking for ANSI C header files" >&5 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 if test "${ac_cv_header_stdc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 14315 "configure" +#line 15839 "configure" #include "confdefs.h" #include #include @@ -14320,13 +15844,13 @@ else #include _ACEOF -if { (eval echo "$as_me:14323: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:15847: \"$ac_cpp "conftest.$ac_ext"\"") >&5 (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:14329: \$? = $ac_status" >&5 + echo "$as_me:15853: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -14348,7 +15872,7 @@ rm -f conftest.err "conftest.$ac_ext" if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat >"conftest.$ac_ext" <<_ACEOF -#line 14351 "configure" +#line 15875 "configure" #include "confdefs.h" #include @@ -14366,7 +15890,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat >"conftest.$ac_ext" <<_ACEOF -#line 14369 "configure" +#line 15893 "configure" #include "confdefs.h" #include @@ -14387,7 +15911,7 @@ if test $ac_cv_header_stdc = yes; then : else cat >"conftest.$ac_ext" <<_ACEOF -#line 14390 "configure" +#line 15914 "configure" #include "confdefs.h" #include #if ((' ' & 0x0FF) == 0x020) @@ -14413,15 +15937,15 @@ main (void) } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:14416: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15940: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14419: \$? = $ac_status" >&5 + echo "$as_me:15943: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:14421: \"$ac_try\"") >&5 + { (eval echo "$as_me:15945: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14424: \$? = $ac_status" >&5 + echo "$as_me:15948: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -14434,7 +15958,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes fi fi fi -echo "$as_me:14437: result: $ac_cv_header_stdc" >&5 +echo "$as_me:15961: result: $ac_cv_header_stdc" >&5 echo "${ECHO_T}$ac_cv_header_stdc" >&6 if test $ac_cv_header_stdc = yes; then @@ -14450,28 +15974,28 @@ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ inttypes.h stdint.h unistd.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:14453: checking for $ac_header" >&5 +echo "$as_me:15977: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 14459 "configure" +#line 15983 "configure" #include "confdefs.h" $ac_includes_default #include <$ac_header> _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:14465: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15989: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14468: \$? = $ac_status" >&5 + echo "$as_me:15992: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:14471: \"$ac_try\"") >&5 + { (eval echo "$as_me:15995: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14474: \$? = $ac_status" >&5 + echo "$as_me:15998: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then eval "$as_ac_Header=yes" else @@ -14481,7 +16005,7 @@ eval "$as_ac_Header=no" fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:14484: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:16008: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then cat >>confdefs.h <&5 +echo "$as_me:16018: checking whether exit is declared" >&5 echo $ECHO_N "checking whether exit is declared... $ECHO_C" >&6 if test "${ac_cv_have_decl_exit+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 14500 "configure" +#line 16024 "configure" #include "confdefs.h" $ac_includes_default int main (void) { #ifndef exit - char *p = (char *) exit; (void) p; + (void) exit; #endif ; @@ -14512,16 +16036,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:14515: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16039: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14518: \$? = $ac_status" >&5 + echo "$as_me:16042: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:14521: \"$ac_try\"") >&5 + { (eval echo "$as_me:16045: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14524: \$? = $ac_status" >&5 + echo "$as_me:16048: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_have_decl_exit=yes else @@ -14531,7 +16055,7 @@ ac_cv_have_decl_exit=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:14534: result: $ac_cv_have_decl_exit" >&5 +echo "$as_me:16058: result: $ac_cv_have_decl_exit" >&5 echo "${ECHO_T}$ac_cv_have_decl_exit" >&6 # Check whether --enable-largefile or --disable-largefile was given. @@ -14541,7 +16065,7 @@ if test "${enable_largefile+set}" = set; then fi; if test "$enable_largefile" != no; then - echo "$as_me:14544: checking for special C compiler options needed for large files" >&5 + echo "$as_me:16068: checking for special C compiler options needed for large files" >&5 echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6 if test "${ac_cv_sys_largefile_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -14553,7 +16077,7 @@ else # IRIX 6.2 and later do not support large files by default, # so use the C compiler's -n32 option if that helps. cat >"conftest.$ac_ext" <<_ACEOF -#line 14556 "configure" +#line 16080 "configure" #include "confdefs.h" #include /* Check that off_t can represent 2**63 - 1 correctly. @@ -14573,16 +16097,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:14576: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16100: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14579: \$? = $ac_status" >&5 + echo "$as_me:16103: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:14582: \"$ac_try\"") >&5 + { (eval echo "$as_me:16106: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14585: \$? = $ac_status" >&5 + echo "$as_me:16109: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then break else @@ -14592,16 +16116,16 @@ fi rm -f "conftest.$ac_objext" CC="$CC -n32" rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:14595: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16119: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14598: \$? = $ac_status" >&5 + echo "$as_me:16122: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:14601: \"$ac_try\"") >&5 + { (eval echo "$as_me:16125: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14604: \$? = $ac_status" >&5 + echo "$as_me:16128: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_sys_largefile_CC=' -n32'; break else @@ -14615,13 +16139,13 @@ rm -f "conftest.$ac_objext" rm -f "conftest.$ac_ext" fi fi -echo "$as_me:14618: result: $ac_cv_sys_largefile_CC" >&5 +echo "$as_me:16142: result: $ac_cv_sys_largefile_CC" >&5 echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6 if test "$ac_cv_sys_largefile_CC" != no; then CC=$CC$ac_cv_sys_largefile_CC fi - echo "$as_me:14624: checking for _FILE_OFFSET_BITS value needed for large files" >&5 + echo "$as_me:16148: checking for _FILE_OFFSET_BITS value needed for large files" >&5 echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6 if test "${ac_cv_sys_file_offset_bits+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -14629,7 +16153,7 @@ else while :; do ac_cv_sys_file_offset_bits=no cat >"conftest.$ac_ext" <<_ACEOF -#line 14632 "configure" +#line 16156 "configure" #include "confdefs.h" #include /* Check that off_t can represent 2**63 - 1 correctly. @@ -14649,16 +16173,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:14652: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16176: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14655: \$? = $ac_status" >&5 + echo "$as_me:16179: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:14658: \"$ac_try\"") >&5 + { (eval echo "$as_me:16182: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14661: \$? = $ac_status" >&5 + echo "$as_me:16185: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then break else @@ -14667,7 +16191,7 @@ cat "conftest.$ac_ext" >&5 fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" cat >"conftest.$ac_ext" <<_ACEOF -#line 14670 "configure" +#line 16194 "configure" #include "confdefs.h" #define _FILE_OFFSET_BITS 64 #include @@ -14688,16 +16212,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:14691: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16215: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14694: \$? = $ac_status" >&5 + echo "$as_me:16218: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:14697: \"$ac_try\"") >&5 + { (eval echo "$as_me:16221: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14700: \$? = $ac_status" >&5 + echo "$as_me:16224: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_sys_file_offset_bits=64; break else @@ -14708,7 +16232,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" break done fi -echo "$as_me:14711: result: $ac_cv_sys_file_offset_bits" >&5 +echo "$as_me:16235: result: $ac_cv_sys_file_offset_bits" >&5 echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6 if test "$ac_cv_sys_file_offset_bits" != no; then @@ -14718,7 +16242,7 @@ EOF fi rm -rf conftest* - echo "$as_me:14721: checking for _LARGE_FILES value needed for large files" >&5 + echo "$as_me:16245: checking for _LARGE_FILES value needed for large files" >&5 echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6 if test "${ac_cv_sys_large_files+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -14726,7 +16250,7 @@ else while :; do ac_cv_sys_large_files=no cat >"conftest.$ac_ext" <<_ACEOF -#line 14729 "configure" +#line 16253 "configure" #include "confdefs.h" #include /* Check that off_t can represent 2**63 - 1 correctly. @@ -14746,16 +16270,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:14749: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16273: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14752: \$? = $ac_status" >&5 + echo "$as_me:16276: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:14755: \"$ac_try\"") >&5 + { (eval echo "$as_me:16279: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14758: \$? = $ac_status" >&5 + echo "$as_me:16282: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then break else @@ -14764,7 +16288,7 @@ cat "conftest.$ac_ext" >&5 fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" cat >"conftest.$ac_ext" <<_ACEOF -#line 14767 "configure" +#line 16291 "configure" #include "confdefs.h" #define _LARGE_FILES 1 #include @@ -14785,16 +16309,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:14788: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16312: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14791: \$? = $ac_status" >&5 + echo "$as_me:16315: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:14794: \"$ac_try\"") >&5 + { (eval echo "$as_me:16318: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14797: \$? = $ac_status" >&5 + echo "$as_me:16321: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_sys_large_files=1; break else @@ -14805,7 +16329,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" break done fi -echo "$as_me:14808: result: $ac_cv_sys_large_files" >&5 +echo "$as_me:16332: result: $ac_cv_sys_large_files" >&5 echo "${ECHO_T}$ac_cv_sys_large_files" >&6 if test "$ac_cv_sys_large_files" != no; then @@ -14818,7 +16342,7 @@ rm -rf conftest* fi if test "$enable_largefile" != no ; then - echo "$as_me:14821: checking for _LARGEFILE_SOURCE value needed for large files" >&5 + echo "$as_me:16345: checking for _LARGEFILE_SOURCE value needed for large files" >&5 echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6 if test "${ac_cv_sys_largefile_source+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -14826,28 +16350,31 @@ else while :; do ac_cv_sys_largefile_source=no cat >"conftest.$ac_ext" <<_ACEOF -#line 14829 "configure" +#line 16353 "configure" #include "confdefs.h" #include + #include int main (void) { -return !fseeko; + + int (*my_fseeko)(FILE *, off_t, int) = fseeko; + return my_fseeko(stdin, 0, 0); ; return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:14841: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16368: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14844: \$? = $ac_status" >&5 + echo "$as_me:16371: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:14847: \"$ac_try\"") >&5 + { (eval echo "$as_me:16374: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14850: \$? = $ac_status" >&5 + echo "$as_me:16377: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then break else @@ -14856,29 +16383,32 @@ cat "conftest.$ac_ext" >&5 fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" cat >"conftest.$ac_ext" <<_ACEOF -#line 14859 "configure" +#line 16386 "configure" #include "confdefs.h" #define _LARGEFILE_SOURCE 1 #include + #include int main (void) { -return !fseeko; + + int (*my_fseeko)(FILE *, off_t, int) = fseeko; + return my_fseeko(stdin, 0, 0); ; return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:14872: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16402: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14875: \$? = $ac_status" >&5 + echo "$as_me:16405: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:14878: \"$ac_try\"") >&5 + { (eval echo "$as_me:16408: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14881: \$? = $ac_status" >&5 + echo "$as_me:16411: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_sys_largefile_source=1; break else @@ -14889,7 +16419,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" break done fi -echo "$as_me:14892: result: $ac_cv_sys_largefile_source" >&5 +echo "$as_me:16422: result: $ac_cv_sys_largefile_source" >&5 echo "${ECHO_T}$ac_cv_sys_largefile_source" >&6 if test "$ac_cv_sys_largefile_source" != no; then @@ -14903,34 +16433,36 @@ rm -rf conftest* # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug # in glibc 2.1.3, but that breaks too many other things. # If you want fseeko and ftello with glibc, upgrade to a fixed glibc. -echo "$as_me:14906: checking for fseeko" >&5 +echo "$as_me:16436: checking for fseeko" >&5 echo $ECHO_N "checking for fseeko... $ECHO_C" >&6 if test "${ac_cv_func_fseeko+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 14912 "configure" +#line 16442 "configure" #include "confdefs.h" #include + #include int main (void) { -return fseeko && fseeko (stdin, 0, 0); +int (*my_fseeko)(FILE *, off_t, int) = fseeko; + return my_fseeko && my_fseeko (stdin, 0, 0); ; return 0; } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:14924: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16456: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14927: \$? = $ac_status" >&5 + echo "$as_me:16459: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:14930: \"$ac_try\"") >&5 + { (eval echo "$as_me:16462: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14933: \$? = $ac_status" >&5 + echo "$as_me:16465: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_fseeko=yes else @@ -14940,7 +16472,7 @@ ac_cv_func_fseeko=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:14943: result: $ac_cv_func_fseeko" >&5 +echo "$as_me:16475: result: $ac_cv_func_fseeko" >&5 echo "${ECHO_T}$ac_cv_func_fseeko" >&6 if test $ac_cv_func_fseeko = yes; then @@ -14979,28 +16511,32 @@ fi fi - echo "$as_me:14982: checking whether to use struct dirent64" >&5 + echo "$as_me:16514: checking whether to use struct dirent64" >&5 echo $ECHO_N "checking whether to use struct dirent64... $ECHO_C" >&6 if test "${cf_cv_struct_dirent64+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 14989 "configure" +#line 16521 "configure" #include "confdefs.h" #pragma GCC diagnostic error "-Wincompatible-pointer-types" #include #include +#ifndef __REDIRECT +/* if transitional largefile support is setup, this is true */ +extern struct dirent64 * readdir(DIR *); +#endif + int main (void) { - /* if transitional largefile support is setup, this is true */ - extern struct dirent64 * readdir(DIR *); - struct dirent64 *x = readdir((DIR *)0); - struct dirent *y = readdir((DIR *)0); + DIR *dp = opendir("."); + struct dirent64 *x = readdir(dp); + struct dirent *y = readdir(dp); int z = x - y; (void)z; @@ -15009,16 +16545,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:15012: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16548: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15015: \$? = $ac_status" >&5 + echo "$as_me:16551: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:15018: \"$ac_try\"") >&5 + { (eval echo "$as_me:16554: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15021: \$? = $ac_status" >&5 + echo "$as_me:16557: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_struct_dirent64=yes else @@ -15029,7 +16565,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:15032: result: $cf_cv_struct_dirent64" >&5 +echo "$as_me:16568: result: $cf_cv_struct_dirent64" >&5 echo "${ECHO_T}$cf_cv_struct_dirent64" >&6 test "$cf_cv_struct_dirent64" = yes && cat >>confdefs.h <<\EOF @@ -15039,7 +16575,7 @@ EOF fi ### Enable compiling-in rcs id's -echo "$as_me:15042: checking if RCS identifiers should be compiled-in" >&5 +echo "$as_me:16578: checking if RCS identifiers should be compiled-in" >&5 echo $ECHO_N "checking if RCS identifiers should be compiled-in... $ECHO_C" >&6 # Check whether --with-rcs-ids or --without-rcs-ids was given. @@ -15049,7 +16585,7 @@ if test "${with_rcs_ids+set}" = set; then else with_rcs_ids=no fi; -echo "$as_me:15052: result: $with_rcs_ids" >&5 +echo "$as_me:16588: result: $with_rcs_ids" >&5 echo "${ECHO_T}$with_rcs_ids" >&6 test "$with_rcs_ids" = yes && cat >>confdefs.h <<\EOF @@ -15059,7 +16595,7 @@ EOF ############################################################################### ### Note that some functions (such as const) are normally disabled anyway. -echo "$as_me:15062: checking if you want to build with function extensions" >&5 +echo "$as_me:16598: checking if you want to build with function extensions" >&5 echo $ECHO_N "checking if you want to build with function extensions... $ECHO_C" >&6 # Check whether --enable-ext-funcs or --disable-ext-funcs was given. @@ -15069,7 +16605,7 @@ if test "${enable_ext_funcs+set}" = set; then else with_ext_funcs=yes fi; -echo "$as_me:15072: result: $with_ext_funcs" >&5 +echo "$as_me:16608: result: $with_ext_funcs" >&5 echo "${ECHO_T}$with_ext_funcs" >&6 if test "$with_ext_funcs" = yes ; then NCURSES_EXT_FUNCS=1 @@ -15087,7 +16623,7 @@ else fi ### use option --enable-const to turn on use of const beyond that in XSI. -echo "$as_me:15090: checking for extended use of const keyword" >&5 +echo "$as_me:16626: checking for extended use of const keyword" >&5 echo $ECHO_N "checking for extended use of const keyword... $ECHO_C" >&6 # Check whether --enable-const or --disable-const was given. @@ -15097,7 +16633,7 @@ if test "${enable_const+set}" = set; then else with_ext_const=no fi; -echo "$as_me:15100: result: $with_ext_const" >&5 +echo "$as_me:16636: result: $with_ext_const" >&5 echo "${ECHO_T}$with_ext_const" >&6 NCURSES_CONST='/*nothing*/' if test "$with_ext_const" = yes ; then @@ -15107,7 +16643,7 @@ fi ############################################################################### # These options are relatively safe to experiment with. -echo "$as_me:15110: checking if you want all development code" >&5 +echo "$as_me:16646: checking if you want all development code" >&5 echo $ECHO_N "checking if you want all development code... $ECHO_C" >&6 # Check whether --with-develop or --without-develop was given. @@ -15117,7 +16653,7 @@ if test "${with_develop+set}" = set; then else with_develop=no fi; -echo "$as_me:15120: result: $with_develop" >&5 +echo "$as_me:16656: result: $with_develop" >&5 echo "${ECHO_T}$with_develop" >&6 ############################################################################### @@ -15126,7 +16662,7 @@ echo "${ECHO_T}$with_develop" >&6 # This is still experimental (20080329), but should ultimately be moved to # the script-block --with-normal, etc. -echo "$as_me:15129: checking if you want to link with the pthread library" >&5 +echo "$as_me:16665: checking if you want to link with the pthread library" >&5 echo $ECHO_N "checking if you want to link with the pthread library... $ECHO_C" >&6 # Check whether --with-pthread or --without-pthread was given. @@ -15136,27 +16672,27 @@ if test "${with_pthread+set}" = set; then else with_pthread=no fi; -echo "$as_me:15139: result: $with_pthread" >&5 +echo "$as_me:16675: result: $with_pthread" >&5 echo "${ECHO_T}$with_pthread" >&6 if test "$with_pthread" != no ; then - echo "$as_me:15143: checking for pthread.h" >&5 + echo "$as_me:16679: checking for pthread.h" >&5 echo $ECHO_N "checking for pthread.h... $ECHO_C" >&6 if test "${ac_cv_header_pthread_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 15149 "configure" +#line 16685 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:15153: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:16689: \"$ac_cpp "conftest.$ac_ext"\"") >&5 (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:15159: \$? = $ac_status" >&5 + echo "$as_me:16695: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -15175,7 +16711,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:15178: result: $ac_cv_header_pthread_h" >&5 +echo "$as_me:16714: result: $ac_cv_header_pthread_h" >&5 echo "${ECHO_T}$ac_cv_header_pthread_h" >&6 if test "$ac_cv_header_pthread_h" = yes; then @@ -15185,7 +16721,7 @@ EOF for cf_lib_pthread in pthread c_r do - echo "$as_me:15188: checking if we can link with the $cf_lib_pthread library" >&5 + echo "$as_me:16724: checking if we can link with the $cf_lib_pthread library" >&5 echo $ECHO_N "checking if we can link with the $cf_lib_pthread library... $ECHO_C" >&6 cf_save_LIBS="$LIBS" @@ -15206,7 +16742,7 @@ done LIBS="$cf_add_libs" cat >"conftest.$ac_ext" <<_ACEOF -#line 15209 "configure" +#line 16745 "configure" #include "confdefs.h" #include @@ -15223,16 +16759,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:15226: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16762: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15229: \$? = $ac_status" >&5 + echo "$as_me:16765: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:15232: \"$ac_try\"") >&5 + { (eval echo "$as_me:16768: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15235: \$? = $ac_status" >&5 + echo "$as_me:16771: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then with_pthread=yes else @@ -15242,7 +16778,7 @@ with_pthread=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS="$cf_save_LIBS" - echo "$as_me:15245: result: $with_pthread" >&5 + echo "$as_me:16781: result: $with_pthread" >&5 echo "${ECHO_T}$with_pthread" >&6 test "$with_pthread" = yes && break done @@ -15270,7 +16806,7 @@ cat >>confdefs.h <<\EOF EOF else - { { echo "$as_me:15273: error: Cannot link with pthread library" >&5 + { { echo "$as_me:16809: error: Cannot link with pthread library" >&5 echo "$as_me: error: Cannot link with pthread library" >&2;} { (exit 1); exit 1; }; } fi @@ -15279,7 +16815,7 @@ fi fi -echo "$as_me:15282: checking if you want to use weak-symbols for pthreads" >&5 +echo "$as_me:16818: checking if you want to use weak-symbols for pthreads" >&5 echo $ECHO_N "checking if you want to use weak-symbols for pthreads... $ECHO_C" >&6 # Check whether --enable-weak-symbols or --disable-weak-symbols was given. @@ -15289,18 +16825,18 @@ if test "${enable_weak_symbols+set}" = set; then else use_weak_symbols=no fi; -echo "$as_me:15292: result: $use_weak_symbols" >&5 +echo "$as_me:16828: result: $use_weak_symbols" >&5 echo "${ECHO_T}$use_weak_symbols" >&6 if test "$use_weak_symbols" = yes ; then -echo "$as_me:15296: checking if $CC supports weak symbols" >&5 +echo "$as_me:16832: checking if $CC supports weak symbols" >&5 echo $ECHO_N "checking if $CC supports weak symbols... $ECHO_C" >&6 if test "${cf_cv_weak_symbols+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 15303 "configure" +#line 16839 "configure" #include "confdefs.h" #include @@ -15326,16 +16862,16 @@ weak_symbol(fopen); } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:15329: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16865: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15332: \$? = $ac_status" >&5 + echo "$as_me:16868: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:15335: \"$ac_try\"") >&5 + { (eval echo "$as_me:16871: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15338: \$? = $ac_status" >&5 + echo "$as_me:16874: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_weak_symbols=yes else @@ -15346,7 +16882,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:15349: result: $cf_cv_weak_symbols" >&5 +echo "$as_me:16885: result: $cf_cv_weak_symbols" >&5 echo "${ECHO_T}$cf_cv_weak_symbols" >&6 else @@ -15375,13 +16911,13 @@ EOF fi # OpenSUSE is installing ncurses6, using reentrant option. -echo "$as_me:15378: checking for _nc_TABSIZE" >&5 +echo "$as_me:16914: checking for _nc_TABSIZE" >&5 echo $ECHO_N "checking for _nc_TABSIZE... $ECHO_C" >&6 if test "${ac_cv_func__nc_TABSIZE+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 15384 "configure" +#line 16920 "configure" #include "confdefs.h" #define _nc_TABSIZE autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -15412,16 +16948,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:15415: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16951: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15418: \$? = $ac_status" >&5 + echo "$as_me:16954: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:15421: \"$ac_try\"") >&5 + { (eval echo "$as_me:16957: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15424: \$? = $ac_status" >&5 + echo "$as_me:16960: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func__nc_TABSIZE=yes else @@ -15431,7 +16967,7 @@ ac_cv_func__nc_TABSIZE=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:15434: result: $ac_cv_func__nc_TABSIZE" >&5 +echo "$as_me:16970: result: $ac_cv_func__nc_TABSIZE" >&5 echo "${ECHO_T}$ac_cv_func__nc_TABSIZE" >&6 if test "$ac_cv_func__nc_TABSIZE" = yes; then assume_reentrant=yes @@ -15443,7 +16979,7 @@ fi # opaque outside of that, so there is no --enable-opaque option. We can use # this option without --with-pthreads, but this will be always set for # pthreads. -echo "$as_me:15446: checking if you want experimental reentrant code" >&5 +echo "$as_me:16982: checking if you want experimental reentrant code" >&5 echo $ECHO_N "checking if you want experimental reentrant code... $ECHO_C" >&6 # Check whether --enable-reentrant or --disable-reentrant was given. @@ -15453,7 +16989,7 @@ if test "${enable_reentrant+set}" = set; then else with_reentrant=$assume_reentrant fi; -echo "$as_me:15456: result: $with_reentrant" >&5 +echo "$as_me:16992: result: $with_reentrant" >&5 echo "${ECHO_T}$with_reentrant" >&6 if test "$with_reentrant" = yes ; then cf_cv_enable_reentrant=1 @@ -15476,7 +17012,7 @@ fi ### Allow using a different wrap-prefix if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then - echo "$as_me:15479: checking for prefix used to wrap public variables" >&5 + echo "$as_me:17015: checking for prefix used to wrap public variables" >&5 echo $ECHO_N "checking for prefix used to wrap public variables... $ECHO_C" >&6 # Check whether --with-wrap-prefix or --without-wrap-prefix was given. @@ -15486,7 +17022,7 @@ if test "${with_wrap_prefix+set}" = set; then else NCURSES_WRAP_PREFIX=_nc_ fi; - echo "$as_me:15489: result: $NCURSES_WRAP_PREFIX" >&5 + echo "$as_me:17025: result: $NCURSES_WRAP_PREFIX" >&5 echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6 else NCURSES_WRAP_PREFIX=_nc_ @@ -15500,7 +17036,7 @@ EOF ### use option --disable-echo to suppress full display compiling commands -echo "$as_me:15503: checking if you want to see long compiling messages" >&5 +echo "$as_me:17039: checking if you want to see long compiling messages" >&5 echo $ECHO_N "checking if you want to see long compiling messages... $ECHO_C" >&6 # Check whether --enable-echo or --disable-echo was given. @@ -15534,10 +17070,10 @@ else ECHO_CC='' fi; -echo "$as_me:15537: result: $enableval" >&5 +echo "$as_me:17073: result: $enableval" >&5 echo "${ECHO_T}$enableval" >&6 -echo "$as_me:15540: checking if you want to use C11 _Noreturn feature" >&5 +echo "$as_me:17076: checking if you want to use C11 _Noreturn feature" >&5 echo $ECHO_N "checking if you want to use C11 _Noreturn feature... $ECHO_C" >&6 # Check whether --enable-stdnoreturn or --disable-stdnoreturn was given. @@ -15554,17 +17090,17 @@ else enable_stdnoreturn=no fi; -echo "$as_me:15557: result: $enable_stdnoreturn" >&5 +echo "$as_me:17093: result: $enable_stdnoreturn" >&5 echo "${ECHO_T}$enable_stdnoreturn" >&6 if test $enable_stdnoreturn = yes; then -echo "$as_me:15561: checking for C11 _Noreturn feature" >&5 +echo "$as_me:17097: checking for C11 _Noreturn feature" >&5 echo $ECHO_N "checking for C11 _Noreturn feature... $ECHO_C" >&6 if test "${cf_cv_c11_noreturn+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 15567 "configure" +#line 17103 "configure" #include "confdefs.h" $ac_includes_default @@ -15580,16 +17116,16 @@ if (feof(stdin)) giveup() } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:15583: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:17119: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15586: \$? = $ac_status" >&5 + echo "$as_me:17122: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:15589: \"$ac_try\"") >&5 + { (eval echo "$as_me:17125: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15592: \$? = $ac_status" >&5 + echo "$as_me:17128: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_c11_noreturn=yes else @@ -15600,7 +17136,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:15603: result: $cf_cv_c11_noreturn" >&5 +echo "$as_me:17139: result: $cf_cv_c11_noreturn" >&5 echo "${ECHO_T}$cf_cv_c11_noreturn" >&6 else cf_cv_c11_noreturn=no, @@ -15656,16 +17192,16 @@ then then test -n "$verbose" && echo " repairing CFLAGS: $CFLAGS" 1>&6 -echo "${as_me:-configure}:15659: testing repairing CFLAGS: $CFLAGS ..." 1>&5 +echo "${as_me:-configure}:17195: testing repairing CFLAGS: $CFLAGS ..." 1>&5 CFLAGS="$cf_temp_flags" test -n "$verbose" && echo " ... fixed $CFLAGS" 1>&6 -echo "${as_me:-configure}:15664: testing ... fixed $CFLAGS ..." 1>&5 +echo "${as_me:-configure}:17200: testing ... fixed $CFLAGS ..." 1>&5 test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 -echo "${as_me:-configure}:15668: testing ... extra $EXTRA_CFLAGS ..." 1>&5 +echo "${as_me:-configure}:17204: testing ... extra $EXTRA_CFLAGS ..." 1>&5 fi ;; @@ -15704,16 +17240,16 @@ then then test -n "$verbose" && echo " repairing CPPFLAGS: $CPPFLAGS" 1>&6 -echo "${as_me:-configure}:15707: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5 +echo "${as_me:-configure}:17243: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5 CPPFLAGS="$cf_temp_flags" test -n "$verbose" && echo " ... fixed $CPPFLAGS" 1>&6 -echo "${as_me:-configure}:15712: testing ... fixed $CPPFLAGS ..." 1>&5 +echo "${as_me:-configure}:17248: testing ... fixed $CPPFLAGS ..." 1>&5 test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 -echo "${as_me:-configure}:15716: testing ... extra $EXTRA_CFLAGS ..." 1>&5 +echo "${as_me:-configure}:17252: testing ... extra $EXTRA_CFLAGS ..." 1>&5 fi ;; @@ -15752,23 +17288,23 @@ then then test -n "$verbose" && echo " repairing LDFLAGS: $LDFLAGS" 1>&6 -echo "${as_me:-configure}:15755: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:17291: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5 LDFLAGS="$cf_temp_flags" test -n "$verbose" && echo " ... fixed $LDFLAGS" 1>&6 -echo "${as_me:-configure}:15760: testing ... fixed $LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:17296: testing ... fixed $LDFLAGS ..." 1>&5 test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 -echo "${as_me:-configure}:15764: testing ... extra $EXTRA_CFLAGS ..." 1>&5 +echo "${as_me:-configure}:17300: testing ... extra $EXTRA_CFLAGS ..." 1>&5 fi ;; esac fi -echo "$as_me:15771: checking if you want to turn on gcc warnings" >&5 +echo "$as_me:17307: checking if you want to turn on gcc warnings" >&5 echo $ECHO_N "checking if you want to turn on gcc warnings... $ECHO_C" >&6 # Check whether --enable-warnings or --disable-warnings was given. @@ -15785,7 +17321,7 @@ else enable_warnings=no fi; -echo "$as_me:15788: result: $enable_warnings" >&5 +echo "$as_me:17324: result: $enable_warnings" >&5 echo "${ECHO_T}$enable_warnings" >&6 if test "$enable_warnings" = "yes" then @@ -15809,10 +17345,10 @@ do done cat >"conftest.$ac_ext" <<_ACEOF -#line 15812 "configure" +#line 17348 "configure" #include "confdefs.h" -#include +$ac_includes_default #include int @@ -15824,31 +17360,32 @@ String foo = malloc(1); free((void*)foo) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:15827: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:17363: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15830: \$? = $ac_status" >&5 + echo "$as_me:17366: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:15833: \"$ac_try\"") >&5 + { (eval echo "$as_me:17369: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15836: \$? = $ac_status" >&5 + echo "$as_me:17372: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then -echo "$as_me:15839: checking for X11/Xt const-feature" >&5 +echo "$as_me:17375: checking for X11/Xt const-feature" >&5 echo $ECHO_N "checking for X11/Xt const-feature... $ECHO_C" >&6 if test "${cf_cv_const_x_string+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 15846 "configure" +#line 17382 "configure" #include "confdefs.h" +#undef _CONST_X_STRING #define _CONST_X_STRING /* X11R7.8 (perhaps) */ #undef XTSTRINGDEFINES /* X11R5 and later */ -#include +$ac_includes_default #include int @@ -15860,16 +17397,16 @@ String foo = malloc(1); *foo = 0 } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:15863: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:17400: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15866: \$? = $ac_status" >&5 + echo "$as_me:17403: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:15869: \"$ac_try\"") >&5 + { (eval echo "$as_me:17406: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15872: \$? = $ac_status" >&5 + echo "$as_me:17409: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_const_x_string=no @@ -15884,7 +17421,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:15887: result: $cf_cv_const_x_string" >&5 +echo "$as_me:17424: result: $cf_cv_const_x_string" >&5 echo "${ECHO_T}$cf_cv_const_x_string" >&6 LIBS="$cf_save_LIBS_CF_CONST_X_STRING" @@ -15913,7 +17450,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi cat > "conftest.$ac_ext" <&5 + { echo "$as_me:17469: checking for $CC warning options..." >&5 echo "$as_me: checking for $CC warning options..." >&6;} cf_save_CFLAGS="$CFLAGS" EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall" @@ -15945,12 +17482,12 @@ echo "$as_me: checking for $CC warning options..." >&6;} wd981 do CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" - if { (eval echo "$as_me:15948: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:17485: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15951: \$? = $ac_status" >&5 + echo "$as_me:17488: \$? = $ac_status" >&5 (exit "$ac_status"); }; then - test -n "$verbose" && echo "$as_me:15953: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:17490: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt" fi @@ -15958,7 +17495,7 @@ echo "${ECHO_T}... -$cf_opt" >&6 CFLAGS="$cf_save_CFLAGS" elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown" then - { echo "$as_me:15961: checking for $CC warning options..." >&5 + { echo "$as_me:17498: checking for $CC warning options..." >&5 echo "$as_me: checking for $CC warning options..." >&6;} cf_save_CFLAGS="$CFLAGS" cf_warn_CONST="" @@ -15981,12 +17518,12 @@ echo "$as_me: checking for $CC warning options..." >&6;} Wundef Wno-inline $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas Wswitch-enum do CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" - if { (eval echo "$as_me:15984: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:17521: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15987: \$? = $ac_status" >&5 + echo "$as_me:17524: \$? = $ac_status" >&5 (exit "$ac_status"); }; then - test -n "$verbose" && echo "$as_me:15989: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:17526: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 case "$cf_opt" in (Winline) @@ -15994,7 +17531,7 @@ echo "${ECHO_T}... -$cf_opt" >&6 ([34].*) test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6 -echo "${as_me:-configure}:15997: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 +echo "${as_me:-configure}:17534: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 continue;; esac @@ -16004,7 +17541,7 @@ echo "${as_me:-configure}:15997: testing feature is broken in gcc $GCC_VERSION . ([12].*) test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6 -echo "${as_me:-configure}:16007: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 +echo "${as_me:-configure}:17544: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 continue;; esac @@ -16037,10 +17574,10 @@ cat > conftest.i <&5 + { echo "$as_me:17577: checking for $CC __attribute__ directives..." >&5 echo "$as_me: checking for $CC __attribute__ directives..." >&6;} cat > "conftest.$ac_ext" < #include "confdefs.h" #include "conftest.h" @@ -16090,12 +17627,12 @@ EOF ;; esac - if { (eval echo "$as_me:16093: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:17630: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16096: \$? = $ac_status" >&5 + echo "$as_me:17633: \$? = $ac_status" >&5 (exit "$ac_status"); }; then - test -n "$verbose" && echo "$as_me:16098: result: ... $cf_attribute" >&5 + test -n "$verbose" && echo "$as_me:17635: result: ... $cf_attribute" >&5 echo "${ECHO_T}... $cf_attribute" >&6 cat conftest.h >>confdefs.h case "$cf_attribute" in @@ -16163,7 +17700,7 @@ if test "x$enable_warnings" = "xyes"; then fi ### use option --enable-assertions to turn on generation of assertion code -echo "$as_me:16166: checking if you want to enable runtime assertions" >&5 +echo "$as_me:17703: checking if you want to enable runtime assertions" >&5 echo $ECHO_N "checking if you want to enable runtime assertions... $ECHO_C" >&6 # Check whether --enable-assertions or --disable-assertions was given. @@ -16173,7 +17710,7 @@ if test "${enable_assertions+set}" = set; then else with_assertions=no fi; -echo "$as_me:16176: result: $with_assertions" >&5 +echo "$as_me:17713: result: $with_assertions" >&5 echo "${ECHO_T}$with_assertions" >&6 if test -n "$GCC" then @@ -16226,7 +17763,7 @@ case "$CFLAGS $CPPFLAGS" in ;; esac -echo "$as_me:16229: checking whether to add trace feature to all models" >&5 +echo "$as_me:17766: checking whether to add trace feature to all models" >&5 echo $ECHO_N "checking whether to add trace feature to all models... $ECHO_C" >&6 # Check whether --with-trace or --without-trace was given. @@ -16236,115 +17773,21 @@ if test "${with_trace+set}" = set; then else cf_with_trace=$cf_all_traces fi; -echo "$as_me:16239: result: $cf_with_trace" >&5 +echo "$as_me:17776: result: $cf_with_trace" >&5 echo "${ECHO_T}$cf_with_trace" >&6 if test "$cf_with_trace" = yes ; then ADA_TRACE=TRUE -cf_fix_cppflags=no -cf_new_cflags= -cf_new_cppflags= -cf_new_extra_cppflags= - -for cf_add_cflags in -DTRACE -do -case "$cf_fix_cppflags" in -(no) - case "$cf_add_cflags" in - (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) - case "$cf_add_cflags" in - (-D*) - cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'` - - test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ - && test -z "${cf_tst_cflags}" \ - && cf_fix_cppflags=yes - - if test "$cf_fix_cppflags" = yes ; then - - test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " - cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" - - continue - elif test "${cf_tst_cflags}" = "\"'" ; then - - test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " - cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" - - continue - fi - ;; - esac - case "$CPPFLAGS" in - (*$cf_add_cflags) - ;; - (*) - case "$cf_add_cflags" in - (-D*) - cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` - -CPPFLAGS=`echo "$CPPFLAGS" | \ - sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ - -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` - - ;; - esac - - test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags " - cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags" - - ;; - esac - ;; - (*) - - test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags " - cf_new_cflags="${cf_new_cflags}$cf_add_cflags" - - ;; - esac - ;; -(yes) - - test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " - cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" - - cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^[^"]*"'\''//'` - - test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ - && test -z "${cf_tst_cflags}" \ - && cf_fix_cppflags=no - ;; -esac -done - -if test -n "$cf_new_cflags" ; then - - test -n "$CFLAGS" && CFLAGS="$CFLAGS " - CFLAGS="${CFLAGS}$cf_new_cflags" - -fi - -if test -n "$cf_new_cppflags" ; then - - test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " - CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" - -fi - -if test -n "$cf_new_extra_cppflags" ; then - - test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " - EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" - -fi +cat >>confdefs.h <<\EOF +#define TRACE 1 +EOF else ADA_TRACE=FALSE fi -echo "$as_me:16347: checking if we want to use GNAT projects" >&5 +echo "$as_me:17790: checking if we want to use GNAT projects" >&5 echo $ECHO_N "checking if we want to use GNAT projects... $ECHO_C" >&6 # Check whether --enable-gnat-projects or --disable-gnat-projects was given. @@ -16361,21 +17804,21 @@ else enable_gnat_projects=yes fi; -echo "$as_me:16364: result: $enable_gnat_projects" >&5 +echo "$as_me:17807: result: $enable_gnat_projects" >&5 echo "${ECHO_T}$enable_gnat_projects" >&6 ### Checks for libraries. case $cf_cv_system_name in (*mingw32*) -echo "$as_me:16371: checking if ssp library is needed" >&5 +echo "$as_me:17814: checking if ssp library is needed" >&5 echo $ECHO_N "checking if ssp library is needed... $ECHO_C" >&6 if test "${cf_cv_need_libssp+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 16378 "configure" +#line 17821 "configure" #include "confdefs.h" #include @@ -16392,16 +17835,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:16395: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17838: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16398: \$? = $ac_status" >&5 + echo "$as_me:17841: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:16401: \"$ac_try\"") >&5 + { (eval echo "$as_me:17844: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16404: \$? = $ac_status" >&5 + echo "$as_me:17847: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_need_libssp=no else @@ -16411,7 +17854,7 @@ cat "conftest.$ac_ext" >&5 cf_save_LIBS="$LIBS" LIBS="$LIBS -lssp" cat >"conftest.$ac_ext" <<_ACEOF -#line 16414 "configure" +#line 17857 "configure" #include "confdefs.h" #include @@ -16428,16 +17871,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:16431: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17874: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16434: \$? = $ac_status" >&5 + echo "$as_me:17877: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:16437: \"$ac_try\"") >&5 + { (eval echo "$as_me:17880: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16440: \$? = $ac_status" >&5 + echo "$as_me:17883: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_need_libssp=yes else @@ -16451,7 +17894,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:16454: result: $cf_cv_need_libssp" >&5 +echo "$as_me:17897: result: $cf_cv_need_libssp" >&5 echo "${ECHO_T}$cf_cv_need_libssp" >&6 if test "x$cf_cv_need_libssp" = xyes @@ -16475,39 +17918,165 @@ LIBS="$cf_add_libs" fi - ;; -(*) + ;; +(*) + +cf_save_libs="$LIBS" +echo "$as_me:17925: checking for clock_gettime" >&5 +echo $ECHO_N "checking for clock_gettime... $ECHO_C" >&6 +if test "${ac_cv_func_clock_gettime+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >"conftest.$ac_ext" <<_ACEOF +#line 17931 "configure" +#include "confdefs.h" +#define clock_gettime autoconf_temporary +#include /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef clock_gettime + +#ifdef __cplusplus +extern "C" +#endif + +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char clock_gettime (void); + +int +main (void) +{ + +/* The GNU C library defines stubs for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_clock_gettime) || defined (__stub___clock_gettime) +#error found stub for clock_gettime +#endif + + return clock_gettime (); + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:17962: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:17965: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:17968: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:17971: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_clock_gettime=yes +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +ac_cv_func_clock_gettime=no +fi +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" +fi +echo "$as_me:17981: result: $ac_cv_func_clock_gettime" >&5 +echo "${ECHO_T}$ac_cv_func_clock_gettime" >&6 +if test "$ac_cv_func_clock_gettime" = yes; then + cf_cv_test_clock_gettime=yes +else + echo "$as_me:17986: checking for clock_gettime in -lrt" >&5 +echo $ECHO_N "checking for clock_gettime in -lrt... $ECHO_C" >&6 +if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lrt $LIBS" +cat >"conftest.$ac_ext" <<_ACEOF +#line 17994 "configure" +#include "confdefs.h" + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char clock_gettime (void); +int +main (void) +{ +clock_gettime (); + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:18013: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:18016: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:18019: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:18022: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_rt_clock_gettime=yes +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +ac_cv_lib_rt_clock_gettime=no +fi +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:18033: result: $ac_cv_lib_rt_clock_gettime" >&5 +echo "${ECHO_T}$ac_cv_lib_rt_clock_gettime" >&6 +if test "$ac_cv_lib_rt_clock_gettime" = yes; then + LIBS="-lrt $LIBS" + cf_cv_test_clock_gettime=yes +else + cf_cv_test_clock_gettime=no +fi + +fi -echo "$as_me:16481: checking for clock_gettime" >&5 -echo $ECHO_N "checking for clock_gettime... $ECHO_C" >&6 +if test "$cf_cv_test_clock_gettime" = yes ; then +echo "$as_me:18045: checking if clock_gettime links" >&5 +echo $ECHO_N "checking if clock_gettime links... $ECHO_C" >&6 if test "${cf_cv_func_clock_gettime+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 16488 "configure" +#line 18052 "configure" #include "confdefs.h" + +$ac_includes_default #include + int main (void) { struct timespec ts; - int rc = clock_gettime(CLOCK_REALTIME, &ts); (void) rc; (void)ts + int rc = clock_gettime(CLOCK_REALTIME, &ts) + + clock_gettime(CLOCK_MONOTONIC, &ts); + (void) rc; (void)ts ; return 0; } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:16501: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18070: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16504: \$? = $ac_status" >&5 + echo "$as_me:18073: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:16507: \"$ac_try\"") >&5 + { (eval echo "$as_me:18076: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16510: \$? = $ac_status" >&5 + echo "$as_me:18079: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_func_clock_gettime=yes else @@ -16518,8 +18087,11 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:16521: result: $cf_cv_func_clock_gettime" >&5 +echo "$as_me:18090: result: $cf_cv_func_clock_gettime" >&5 echo "${ECHO_T}$cf_cv_func_clock_gettime" >&6 +else + cf_cv_func_clock_gettime=no +fi if test "$cf_cv_func_clock_gettime" = yes then @@ -16529,13 +18101,13 @@ cat >>confdefs.h <<\EOF EOF else -echo "$as_me:16532: checking for gettimeofday" >&5 +echo "$as_me:18104: checking for gettimeofday" >&5 echo $ECHO_N "checking for gettimeofday... $ECHO_C" >&6 if test "${ac_cv_func_gettimeofday+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 16538 "configure" +#line 18110 "configure" #include "confdefs.h" #define gettimeofday autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -16566,16 +18138,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:16569: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18141: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16572: \$? = $ac_status" >&5 + echo "$as_me:18144: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:16575: \"$ac_try\"") >&5 + { (eval echo "$as_me:18147: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16578: \$? = $ac_status" >&5 + echo "$as_me:18150: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_gettimeofday=yes else @@ -16585,7 +18157,7 @@ ac_cv_func_gettimeofday=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:16588: result: $ac_cv_func_gettimeofday" >&5 +echo "$as_me:18160: result: $ac_cv_func_gettimeofday" >&5 echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6 if test "$ac_cv_func_gettimeofday" = yes; then @@ -16595,7 +18167,7 @@ EOF else -echo "$as_me:16598: checking for gettimeofday in -lbsd" >&5 +echo "$as_me:18170: checking for gettimeofday in -lbsd" >&5 echo $ECHO_N "checking for gettimeofday in -lbsd... $ECHO_C" >&6 if test "${ac_cv_lib_bsd_gettimeofday+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -16603,7 +18175,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lbsd $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 16606 "configure" +#line 18178 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -16612,7 +18184,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char gettimeofday (); +char gettimeofday (void); int main (void) { @@ -16622,16 +18194,16 @@ gettimeofday (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:16625: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18197: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16628: \$? = $ac_status" >&5 + echo "$as_me:18200: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:16631: \"$ac_try\"") >&5 + { (eval echo "$as_me:18203: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16634: \$? = $ac_status" >&5 + echo "$as_me:18206: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_bsd_gettimeofday=yes else @@ -16642,7 +18214,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:16645: result: $ac_cv_lib_bsd_gettimeofday" >&5 +echo "$as_me:18217: result: $ac_cv_lib_bsd_gettimeofday" >&5 echo "${ECHO_T}$ac_cv_lib_bsd_gettimeofday" >&6 if test "$ac_cv_lib_bsd_gettimeofday" = yes; then @@ -16675,13 +18247,13 @@ fi esac ### Checks for header files. -echo "$as_me:16678: checking for signed char" >&5 +echo "$as_me:18250: checking for signed char" >&5 echo $ECHO_N "checking for signed char... $ECHO_C" >&6 if test "${ac_cv_type_signed_char+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 16684 "configure" +#line 18256 "configure" #include "confdefs.h" $ac_includes_default int @@ -16696,16 +18268,16 @@ if (sizeof (signed char)) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:16699: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:18271: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16702: \$? = $ac_status" >&5 + echo "$as_me:18274: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:16705: \"$ac_try\"") >&5 + { (eval echo "$as_me:18277: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16708: \$? = $ac_status" >&5 + echo "$as_me:18280: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_type_signed_char=yes else @@ -16715,10 +18287,10 @@ ac_cv_type_signed_char=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:16718: result: $ac_cv_type_signed_char" >&5 +echo "$as_me:18290: result: $ac_cv_type_signed_char" >&5 echo "${ECHO_T}$ac_cv_type_signed_char" >&6 -echo "$as_me:16721: checking size of signed char" >&5 +echo "$as_me:18293: checking size of signed char" >&5 echo $ECHO_N "checking size of signed char... $ECHO_C" >&6 if test "${ac_cv_sizeof_signed_char+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -16727,7 +18299,7 @@ else if test "$cross_compiling" = yes; then # Depending upon the size, compute the lo and hi bounds. cat >"conftest.$ac_ext" <<_ACEOF -#line 16730 "configure" +#line 18302 "configure" #include "confdefs.h" $ac_includes_default int @@ -16739,21 +18311,21 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= 0)] } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:16742: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:18314: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16745: \$? = $ac_status" >&5 + echo "$as_me:18317: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:16748: \"$ac_try\"") >&5 + { (eval echo "$as_me:18320: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16751: \$? = $ac_status" >&5 + echo "$as_me:18323: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_lo=0 ac_mid=0 while :; do cat >"conftest.$ac_ext" <<_ACEOF -#line 16756 "configure" +#line 18328 "configure" #include "confdefs.h" $ac_includes_default int @@ -16765,16 +18337,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)] } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:16768: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:18340: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16771: \$? = $ac_status" >&5 + echo "$as_me:18343: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:16774: \"$ac_try\"") >&5 + { (eval echo "$as_me:18346: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16777: \$? = $ac_status" >&5 + echo "$as_me:18349: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_hi=$ac_mid; break else @@ -16790,7 +18362,7 @@ cat "conftest.$ac_ext" >&5 ac_hi=-1 ac_mid=-1 while :; do cat >"conftest.$ac_ext" <<_ACEOF -#line 16793 "configure" +#line 18365 "configure" #include "confdefs.h" $ac_includes_default int @@ -16802,16 +18374,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= $ac_mid)] } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:16805: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:18377: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16808: \$? = $ac_status" >&5 + echo "$as_me:18380: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:16811: \"$ac_try\"") >&5 + { (eval echo "$as_me:18383: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16814: \$? = $ac_status" >&5 + echo "$as_me:18386: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_lo=$ac_mid; break else @@ -16827,7 +18399,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" while test "x$ac_lo" != "x$ac_hi"; do ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"` cat >"conftest.$ac_ext" <<_ACEOF -#line 16830 "configure" +#line 18402 "configure" #include "confdefs.h" $ac_includes_default int @@ -16839,16 +18411,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)] } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:16842: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:18414: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16845: \$? = $ac_status" >&5 + echo "$as_me:18417: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:16848: \"$ac_try\"") >&5 + { (eval echo "$as_me:18420: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16851: \$? = $ac_status" >&5 + echo "$as_me:18423: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_hi=$ac_mid else @@ -16861,12 +18433,12 @@ done ac_cv_sizeof_signed_char=$ac_lo else if test "$cross_compiling" = yes; then - { { echo "$as_me:16864: error: cannot run test program while cross compiling" >&5 + { { echo "$as_me:18436: error: cannot run test program while cross compiling" >&5 echo "$as_me: error: cannot run test program while cross compiling" >&2;} { (exit 1); exit 1; }; } else cat >"conftest.$ac_ext" <<_ACEOF -#line 16869 "configure" +#line 18441 "configure" #include "confdefs.h" $ac_includes_default int @@ -16882,15 +18454,15 @@ fclose (f); } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:16885: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18457: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16888: \$? = $ac_status" >&5 + echo "$as_me:18460: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:16890: \"$ac_try\"") >&5 + { (eval echo "$as_me:18462: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16893: \$? = $ac_status" >&5 + echo "$as_me:18465: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_sizeof_signed_char=`cat conftest.val` else @@ -16906,7 +18478,7 @@ else ac_cv_sizeof_signed_char=0 fi fi -echo "$as_me:16909: result: $ac_cv_sizeof_signed_char" >&5 +echo "$as_me:18481: result: $ac_cv_sizeof_signed_char" >&5 echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6 cat >>confdefs.h <&5 +echo "$as_me:18490: checking for $ac_hdr that defines DIR" >&5 echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 16924 "configure" +#line 18496 "configure" #include "confdefs.h" #include #include <$ac_hdr> @@ -16936,16 +18508,16 @@ return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:16939: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:18511: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16942: \$? = $ac_status" >&5 + echo "$as_me:18514: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:16945: \"$ac_try\"") >&5 + { (eval echo "$as_me:18517: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16948: \$? = $ac_status" >&5 + echo "$as_me:18520: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then eval "$as_ac_Header=yes" else @@ -16955,7 +18527,7 @@ eval "$as_ac_Header=no" fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:16958: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:18530: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then cat >>confdefs.h <&5 + echo "$as_me:18543: checking for opendir in -ldir" >&5 echo $ECHO_N "checking for opendir in -ldir... $ECHO_C" >&6 if test "${ac_cv_lib_dir_opendir+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -16976,7 +18548,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldir $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 16979 "configure" +#line 18551 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -16985,7 +18557,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char opendir (); +char opendir (void); int main (void) { @@ -16995,16 +18567,16 @@ opendir (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:16998: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18570: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17001: \$? = $ac_status" >&5 + echo "$as_me:18573: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:17004: \"$ac_try\"") >&5 + { (eval echo "$as_me:18576: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17007: \$? = $ac_status" >&5 + echo "$as_me:18579: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_dir_opendir=yes else @@ -17015,14 +18587,14 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:17018: result: $ac_cv_lib_dir_opendir" >&5 +echo "$as_me:18590: result: $ac_cv_lib_dir_opendir" >&5 echo "${ECHO_T}$ac_cv_lib_dir_opendir" >&6 if test "$ac_cv_lib_dir_opendir" = yes; then LIBS="$LIBS -ldir" fi else - echo "$as_me:17025: checking for opendir in -lx" >&5 + echo "$as_me:18597: checking for opendir in -lx" >&5 echo $ECHO_N "checking for opendir in -lx... $ECHO_C" >&6 if test "${ac_cv_lib_x_opendir+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -17030,7 +18602,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lx $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 17033 "configure" +#line 18605 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -17039,7 +18611,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char opendir (); +char opendir (void); int main (void) { @@ -17049,16 +18621,16 @@ opendir (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:17052: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18624: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17055: \$? = $ac_status" >&5 + echo "$as_me:18627: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:17058: \"$ac_try\"") >&5 + { (eval echo "$as_me:18630: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17061: \$? = $ac_status" >&5 + echo "$as_me:18633: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_x_opendir=yes else @@ -17069,7 +18641,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:17072: result: $ac_cv_lib_x_opendir" >&5 +echo "$as_me:18644: result: $ac_cv_lib_x_opendir" >&5 echo "${ECHO_T}$ac_cv_lib_x_opendir" >&6 if test "$ac_cv_lib_x_opendir" = yes; then LIBS="$LIBS -lx" @@ -17077,13 +18649,13 @@ fi fi -echo "$as_me:17080: checking whether time.h and sys/time.h may both be included" >&5 +echo "$as_me:18652: checking whether time.h and sys/time.h may both be included" >&5 echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6 if test "${ac_cv_header_time+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 17086 "configure" +#line 18658 "configure" #include "confdefs.h" #include #include @@ -17099,16 +18671,16 @@ return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:17102: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:18674: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17105: \$? = $ac_status" >&5 + echo "$as_me:18677: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:17108: \"$ac_try\"") >&5 + { (eval echo "$as_me:18680: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17111: \$? = $ac_status" >&5 + echo "$as_me:18683: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_header_time=yes else @@ -17118,7 +18690,7 @@ ac_cv_header_time=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:17121: result: $ac_cv_header_time" >&5 +echo "$as_me:18693: result: $ac_cv_header_time" >&5 echo "${ECHO_T}$ac_cv_header_time" >&6 if test $ac_cv_header_time = yes; then @@ -17136,13 +18708,13 @@ ac_link='$CC -o "conftest$ac_exeext" $CFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac_ex ac_compiler_gnu=$ac_cv_c_compiler_gnu ac_main_return="return" -echo "$as_me:17139: checking for an ANSI C-conforming const" >&5 +echo "$as_me:18711: checking for an ANSI C-conforming const" >&5 echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6 if test "${ac_cv_c_const+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 17145 "configure" +#line 18717 "configure" #include "confdefs.h" int @@ -17152,13 +18724,13 @@ main (void) #ifndef __cplusplus /* Ultrix mips cc rejects this. */ typedef int charset[2]; - const charset x; + const charset x; (void)x; /* SunOS 4.1.1 cc rejects this. */ char const *const *ccp; char **p; /* NEC SVR4.0.2 mips cc rejects this. */ struct point {int x, y;}; - static struct point const zero = {0,0}; + static struct point const zero = {0,0}; (void)zero; /* AIX XL C 1.02.0.0 rejects this. It does not let you subtract one const X* pointer from another in an arm of an if-expression whose if-part is not a constant @@ -17174,16 +18746,19 @@ main (void) char const *s = 0 ? (char *) 0 : (char const *) 0; *t++ = 0; + (void)s; } { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */ int x[] = {25, 17}; const int *foo = &x[0]; ++foo; + (void)foo; } { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */ typedef const int *iptr; iptr p = 0; ++p; + (void)p; } { /* AIX XL C 1.02.0.0 rejects this saying "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ @@ -17192,6 +18767,7 @@ main (void) } { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ const int foo = 10; + (void)foo; } #endif @@ -17200,16 +18776,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:17203: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:18779: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17206: \$? = $ac_status" >&5 + echo "$as_me:18782: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:17209: \"$ac_try\"") >&5 + { (eval echo "$as_me:18785: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17212: \$? = $ac_status" >&5 + echo "$as_me:18788: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_c_const=yes else @@ -17219,7 +18795,7 @@ ac_cv_c_const=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:17222: result: $ac_cv_c_const" >&5 +echo "$as_me:18798: result: $ac_cv_c_const" >&5 echo "${ECHO_T}$ac_cv_c_const" >&6 if test $ac_cv_c_const = no; then @@ -17231,7 +18807,7 @@ fi ### Checks for external-data -echo "$as_me:17234: checking if data-only library module links" >&5 +echo "$as_me:18810: checking if data-only library module links" >&5 echo $ECHO_N "checking if data-only library module links... $ECHO_C" >&6 if test "${cf_cv_link_dataonly+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -17239,36 +18815,40 @@ else rm -f conftest.a cat >conftest.$ac_ext <&5 + if { (eval echo "$as_me:18821: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17248: \$? = $ac_status" >&5 + echo "$as_me:18824: \$? = $ac_status" >&5 (exit "$ac_status"); } ; then mv conftest.o data.o && \ ( $AR $ARFLAGS conftest.a data.o ) 2>&5 1>/dev/null fi rm -f conftest.$ac_ext data.o cat >conftest.$ac_ext <&5 + if { (eval echo "$as_me:18848: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17271: \$? = $ac_status" >&5 + echo "$as_me:18851: \$? = $ac_status" >&5 (exit "$ac_status"); }; then mv conftest.o func.o && \ ( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null @@ -17281,26 +18861,26 @@ EOF cf_cv_link_dataonly=unknown else cat >"conftest.$ac_ext" <<_ACEOF -#line 17284 "configure" +#line 18864 "configure" #include "confdefs.h" + extern int testfunc(void); int main(void) { - extern int testfunc(); ${cf_cv_main_return:-return} (!testfunc()); } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:17295: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18875: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17298: \$? = $ac_status" >&5 + echo "$as_me:18878: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:17300: \"$ac_try\"") >&5 + { (eval echo "$as_me:18880: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17303: \$? = $ac_status" >&5 + echo "$as_me:18883: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_link_dataonly=yes else @@ -17315,7 +18895,7 @@ fi fi -echo "$as_me:17318: result: $cf_cv_link_dataonly" >&5 +echo "$as_me:18898: result: $cf_cv_link_dataonly" >&5 echo "${ECHO_T}$cf_cv_link_dataonly" >&6 if test "$cf_cv_link_dataonly" = no ; then @@ -17334,23 +18914,23 @@ unistd.h \ do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:17337: checking for $ac_header" >&5 +echo "$as_me:18917: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 17343 "configure" +#line 18923 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:17347: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:18927: \"$ac_cpp "conftest.$ac_ext"\"") >&5 (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:17353: \$? = $ac_status" >&5 + echo "$as_me:18933: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -17369,7 +18949,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:17372: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:18952: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then cat >>confdefs.h <&5 +echo "$as_me:18962: checking for working mkstemp" >&5 echo $ECHO_N "checking for working mkstemp... $ECHO_C" >&6 if test "${cf_cv_func_mkstemp+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -17390,14 +18970,14 @@ if test "$cross_compiling" = yes; then cf_cv_func_mkstemp=maybe else cat >"conftest.$ac_ext" <<_ACEOF -#line 17393 "configure" +#line 18973 "configure" #include "confdefs.h" $ac_includes_default int main(void) { - char *tmpl = "conftestXXXXXX"; + static char tmpl[] = "conftestXXXXXX"; char name[2][80]; int n; int result = 0; @@ -17425,15 +19005,15 @@ int main(void) _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:17428: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19008: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17431: \$? = $ac_status" >&5 + echo "$as_me:19011: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:17433: \"$ac_try\"") >&5 + { (eval echo "$as_me:19013: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17436: \$? = $ac_status" >&5 + echo "$as_me:19016: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_func_mkstemp=yes @@ -17448,16 +19028,16 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes fi fi -echo "$as_me:17451: result: $cf_cv_func_mkstemp" >&5 +echo "$as_me:19031: result: $cf_cv_func_mkstemp" >&5 echo "${ECHO_T}$cf_cv_func_mkstemp" >&6 if test "x$cf_cv_func_mkstemp" = xmaybe ; then - echo "$as_me:17454: checking for mkstemp" >&5 + echo "$as_me:19034: checking for mkstemp" >&5 echo $ECHO_N "checking for mkstemp... $ECHO_C" >&6 if test "${ac_cv_func_mkstemp+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 17460 "configure" +#line 19040 "configure" #include "confdefs.h" #define mkstemp autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -17488,16 +19068,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:17491: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19071: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17494: \$? = $ac_status" >&5 + echo "$as_me:19074: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:17497: \"$ac_try\"") >&5 + { (eval echo "$as_me:19077: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17500: \$? = $ac_status" >&5 + echo "$as_me:19080: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_mkstemp=yes else @@ -17507,7 +19087,7 @@ ac_cv_func_mkstemp=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:17510: result: $ac_cv_func_mkstemp" >&5 +echo "$as_me:19090: result: $ac_cv_func_mkstemp" >&5 echo "${ECHO_T}$ac_cv_func_mkstemp" >&6 fi @@ -17526,237 +19106,9 @@ fi cf_with_ada=yes if test "$cf_with_ada" != "no" ; then - -for cf_prog_gnat in gnat gnatmake gprconfig gprbuild -do - -cf_upper_prog_gnat=`echo "${cf_prog_gnat}" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` - - unset ac_cv_path_cf_TEMP_gnat - unset cf_TEMP_gnat - # Extract the first word of "$cf_prog_gnat", so it can be a program name with args. -set dummy $cf_prog_gnat; ac_word=$2 -echo "$as_me:17539: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_cf_TEMP_gnat+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $cf_TEMP_gnat in - [\\/]* | ?:[\\/]*) - ac_cv_path_cf_TEMP_gnat="$cf_TEMP_gnat" # Let the user override the test with a path. - ;; - *) - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - if $as_executable_p "$ac_dir/$ac_word"; then - ac_cv_path_cf_TEMP_gnat="$ac_dir/$ac_word" - echo "$as_me:17556: found $ac_dir/$ac_word" >&5 - break -fi -done - - test -z "$ac_cv_path_cf_TEMP_gnat" && ac_cv_path_cf_TEMP_gnat="no" - ;; -esac -fi -cf_TEMP_gnat=$ac_cv_path_cf_TEMP_gnat - -if test -n "$cf_TEMP_gnat"; then - echo "$as_me:17568: result: $cf_TEMP_gnat" >&5 -echo "${ECHO_T}$cf_TEMP_gnat" >&6 -else - echo "$as_me:17571: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - eval "cf_cv_PATH_$cf_upper_prog_gnat=$ac_cv_path_cf_TEMP_gnat" - - if test "x$cf_TEMP_gnat" != xno; then - unset cf_cv_gnat_version - unset cf_TEMP_gnat - -echo "$as_me:17581: checking for $cf_prog_gnat version" >&5 -echo $ECHO_N "checking for $cf_prog_gnat version... $ECHO_C" >&6 -if test "${cf_cv_gnat_version+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - -cf_cv_gnat_version=`$cf_prog_gnat --version 2>&1 | \ - grep '[0-9].[0-9][0-9]*' |\ - sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'` - -fi -echo "$as_me:17592: result: $cf_cv_gnat_version" >&5 -echo "${ECHO_T}$cf_cv_gnat_version" >&6 -test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no -eval cf_TEMP_gnat=$cf_cv_gnat_version; unset cf_cv_gnat_version - - fi - eval "cf_cv_VERSION_$cf_upper_prog_gnat=$cf_TEMP_gnat" - - unset cf_TEMP_gnat - unset cf_cv_gnat_version - unset ac_cv_path_cf_TEMP_gnat -done - -if test "x$cf_cv_VERSION_GNATMAKE" = "xno"; then - cf_ada_make= - cf_cv_prog_gnat_correct=no -else - cf_ada_make=gnatmake - if test "x$cf_cv_VERSION_GPRCONFIG" = "xno"; then - # gprconfig is newer than gnatmake; we can continue... - cf_ada_config="##" - else - rm -rf ./conftest* ./*~conftest* - if mkdir conftest.src - then - cf_ada_config="" - cd conftest.src - for cf_gprconfig in Ada C - do - echo "$as_me:17621: checking for gprconfig name for $cf_gprconfig" >&5 -echo $ECHO_N "checking for gprconfig name for $cf_gprconfig... $ECHO_C" >&6 - if test "$cf_gprconfig" = C - then - for cf_gprconfig_param in \ - "$cf_gprconfig,,,,GNATGCC" \ - "$cf_gprconfig,,,,GCC" \ - "$cf_gprconfig" - do - cf_gprconfig_value=`echo s| gprconfig --config=$cf_gprconfig_param 2>&5 | ${AWK:-awk} '/^\*/{print $3;}' | head -n 1` - test -n "$cf_gprconfig_value" && break - done - else - cf_gprconfig_param=$cf_gprconfig - cf_gprconfig_value=`echo s| gprconfig --config=$cf_gprconfig_param 2>&5 | ${AWK:-awk} '/^\*/{print $3;}' | head -n 1` - fi - if test -n "$cf_gprconfig_value" - then - eval "cf_ada_config_$cf_gprconfig=$cf_gprconfig_value" - echo "$as_me:17640: result: $cf_gprconfig_value" >&5 -echo "${ECHO_T}$cf_gprconfig_value" >&6 - else - echo "$as_me:17643: result: missing" >&5 -echo "${ECHO_T}missing" >&6 - cf_ada_config="#" - break - fi - done - cd .. - rm -rf ./conftest* ./*~conftest* - fi - fi - if test "x$cf_ada_config" != "x#" - then - -echo "$as_me:17656: checking for gnat version" >&5 -echo $ECHO_N "checking for gnat version... $ECHO_C" >&6 -if test "${cf_cv_gnat_version+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - -cf_cv_gnat_version=`${cf_ada_make:-gnatmake} --version 2>&1 | \ - grep '[0-9].[0-9][0-9]*' |\ - sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'` - -fi -echo "$as_me:17667: result: $cf_cv_gnat_version" >&5 -echo "${ECHO_T}$cf_cv_gnat_version" >&6 -test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no - -case "$cf_cv_gnat_version" in -(3.1[1-9]*|3.[2-9]*|[4-9].*|[1-9][0-9].[0-9]*|20[0-9][0-9]) - cf_cv_prog_gnat_correct=yes - ;; -(*) - { echo "$as_me:17676: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5 -echo "$as_me: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;} - cf_cv_prog_gnat_correct=no - ;; -esac - - # Extract the first word of "m4", so it can be a program name with args. -set dummy m4; ac_word=$2 -echo "$as_me:17684: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_M4_exists+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$M4_exists"; then - ac_cv_prog_M4_exists="$M4_exists" # Let the user override the test. -else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_M4_exists="yes" -echo "$as_me:17699: found $ac_dir/$ac_word" >&5 -break -done - - test -z "$ac_cv_prog_M4_exists" && ac_cv_prog_M4_exists="no" -fi -fi -M4_exists=$ac_cv_prog_M4_exists -if test -n "$M4_exists"; then - echo "$as_me:17708: result: $M4_exists" >&5 -echo "${ECHO_T}$M4_exists" >&6 -else - echo "$as_me:17711: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - if test "$ac_cv_prog_M4_exists" = no; then - cf_cv_prog_gnat_correct=no - { echo "$as_me:17717: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5 -echo "$as_me: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&2;} - fi - if test "$cf_cv_prog_gnat_correct" = yes; then - echo "$as_me:17721: checking if GNAT works" >&5 -echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6 - -rm -rf ./conftest* ./*~conftest* -cat >>conftest.ads <>conftest.adb <&5 2>&1 ) ; then - if ( ./conftest 1>&5 2>&1 ) ; then - cf_cv_prog_gnat_correct=yes - else - cf_cv_prog_gnat_correct=no - fi -else - cf_cv_prog_gnat_correct=no -fi -rm -rf ./conftest* ./*~conftest* - - echo "$as_me:17749: result: $cf_cv_prog_gnat_correct" >&5 -echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6 - fi - else - cf_cv_prog_gnat_correct=no - fi -fi - if test "$cf_cv_prog_gnat_correct" = yes; then - echo "$as_me:17759: checking optimization options for ADAFLAGS" >&5 + echo "$as_me:19111: checking optimization options for ADAFLAGS" >&5 echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6 case "$CFLAGS" in (*-g*) @@ -17773,10 +19125,10 @@ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6 ;; esac - echo "$as_me:17776: result: $ADAFLAGS" >&5 + echo "$as_me:19128: result: $ADAFLAGS" >&5 echo "${ECHO_T}$ADAFLAGS" >&6 -echo "$as_me:17779: checking if GNATPREP supports -T option" >&5 +echo "$as_me:19131: checking if GNATPREP supports -T option" >&5 echo $ECHO_N "checking if GNATPREP supports -T option... $ECHO_C" >&6 if test "${cf_cv_gnatprep_opt_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -17786,11 +19138,11 @@ cf_cv_gnatprep_opt_t=no gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes fi -echo "$as_me:17789: result: $cf_cv_gnatprep_opt_t" >&5 +echo "$as_me:19141: result: $cf_cv_gnatprep_opt_t" >&5 echo "${ECHO_T}$cf_cv_gnatprep_opt_t" >&6 test "$cf_cv_gnatprep_opt_t" = yes && GNATPREP_OPTS="-T $GNATPREP_OPTS" -echo "$as_me:17793: checking if GNAT supports generics" >&5 +echo "$as_me:19145: checking if GNAT supports generics" >&5 echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6 case "$cf_cv_gnat_version" in (3.1[1-9]*|3.[2-9]*|[4-9].*|[1-9][0-9].[0-9]*|20[0-9][0-9]) @@ -17800,7 +19152,7 @@ case "$cf_cv_gnat_version" in cf_gnat_generics=no ;; esac -echo "$as_me:17803: result: $cf_gnat_generics" >&5 +echo "$as_me:19155: result: $cf_gnat_generics" >&5 echo "${ECHO_T}$cf_gnat_generics" >&6 if test "$cf_gnat_generics" = yes @@ -17812,7 +19164,7 @@ else cf_generic_objects= fi -echo "$as_me:17815: checking if GNAT supports SIGINT" >&5 +echo "$as_me:19167: checking if GNAT supports SIGINT" >&5 echo $ECHO_N "checking if GNAT supports SIGINT... $ECHO_C" >&6 if test "${cf_cv_gnat_sigint+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -17860,7 +19212,7 @@ fi rm -rf ./conftest* ./*~conftest* fi -echo "$as_me:17863: result: $cf_cv_gnat_sigint" >&5 +echo "$as_me:19215: result: $cf_cv_gnat_sigint" >&5 echo "${ECHO_T}$cf_cv_gnat_sigint" >&6 if test "$cf_cv_gnat_sigint" = yes ; then @@ -17873,7 +19225,7 @@ cf_gnat_libraries=no cf_gnat_projects=no if test "$enable_gnat_projects" != no ; then -echo "$as_me:17876: checking if GNAT supports project files" >&5 +echo "$as_me:19228: checking if GNAT supports project files" >&5 echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6 case "$cf_cv_gnat_version" in (3.[0-9]*) @@ -17936,15 +19288,15 @@ CF_EOF esac ;; esac -echo "$as_me:17939: result: $cf_gnat_projects" >&5 +echo "$as_me:19291: result: $cf_gnat_projects" >&5 echo "${ECHO_T}$cf_gnat_projects" >&6 fi # enable_gnat_projects if test "$cf_gnat_projects" = yes then - echo "$as_me:17945: checking if GNAT supports libraries" >&5 + echo "$as_me:19297: checking if GNAT supports libraries" >&5 echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6 - echo "$as_me:17947: result: $cf_gnat_libraries" >&5 + echo "$as_me:19299: result: $cf_gnat_libraries" >&5 echo "${ECHO_T}$cf_gnat_libraries" >&6 fi @@ -17964,7 +19316,7 @@ then then USE_GNAT_MAKE_GPR="" else - { echo "$as_me:17967: WARNING: use old makefile rules since tools are missing" >&5 + { echo "$as_me:19319: WARNING: use old makefile rules since tools are missing" >&5 echo "$as_me: WARNING: use old makefile rules since tools are missing" >&2;} fi fi @@ -17976,8 +19328,8 @@ else USE_GNAT_LIBRARIES="#" fi -echo "$as_me:17979: checking for ada-compiler" >&5 -echo $ECHO_N "checking for ada-compiler... $ECHO_C" >&6 +echo "$as_me:19331: checking for Ada95 compiler" >&5 +echo $ECHO_N "checking for Ada95 compiler... $ECHO_C" >&6 # Check whether --with-ada-compiler or --without-ada-compiler was given. if test "${with_ada_compiler+set}" = set; then @@ -17987,13 +19339,13 @@ else cf_ada_compiler=gnatmake fi; -echo "$as_me:17990: result: $cf_ada_compiler" >&5 +echo "$as_me:19342: result: $cf_ada_compiler" >&5 echo "${ECHO_T}$cf_ada_compiler" >&6 cf_ada_package=terminal_interface -echo "$as_me:17995: checking for ada-include" >&5 -echo $ECHO_N "checking for ada-include... $ECHO_C" >&6 +echo "$as_me:19347: checking for Ada95 include directory" >&5 +echo $ECHO_N "checking for Ada95 include directory... $ECHO_C" >&6 # Check whether --with-ada-include or --without-ada-include was given. if test "${with_ada_include+set}" = set; then @@ -18009,26 +19361,24 @@ else cf_path_syntax="$ac_default_prefix" fi -case ".$withval" in -(.\$\(*\)*|.\'*\'*) - ;; -(..|./*|.\\*) +case "x$withval" in +(x\$\(*\)*|x\'*\'*) ;; -(.[a-zA-Z]:[\\/]*) # OS/2 EMX +(x.|x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER) ;; -(.\$\{*prefix\}*|.\$\{*dir\}*) +(x\$\{*prefix\}*|x\$\{*dir\}*) eval withval="$withval" - case ".$withval" in - (.NONE/*) + case "x$withval" in + (xNONE/*) withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%` ;; esac ;; -(.no|.NONE/*) +(xno|xNONE/*) withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { { echo "$as_me:18031: error: expected a pathname, not \"$withval\"" >&5 + { { echo "$as_me:19381: error: expected a pathname, not \"$withval\"" >&5 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -18037,11 +19387,11 @@ esac fi eval ADA_INCLUDE="$withval" -echo "$as_me:18040: result: $ADA_INCLUDE" >&5 +echo "$as_me:19390: result: $ADA_INCLUDE" >&5 echo "${ECHO_T}$ADA_INCLUDE" >&6 -echo "$as_me:18043: checking for ada-objects" >&5 -echo $ECHO_N "checking for ada-objects... $ECHO_C" >&6 +echo "$as_me:19393: checking for Ada95 object directory" >&5 +echo $ECHO_N "checking for Ada95 object directory... $ECHO_C" >&6 # Check whether --with-ada-objects or --without-ada-objects was given. if test "${with_ada_objects+set}" = set; then @@ -18057,26 +19407,24 @@ else cf_path_syntax="$ac_default_prefix" fi -case ".$withval" in -(.\$\(*\)*|.\'*\'*) +case "x$withval" in +(x\$\(*\)*|x\'*\'*) ;; -(..|./*|.\\*) +(x.|x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER) ;; -(.[a-zA-Z]:[\\/]*) # OS/2 EMX - ;; -(.\$\{*prefix\}*|.\$\{*dir\}*) +(x\$\{*prefix\}*|x\$\{*dir\}*) eval withval="$withval" - case ".$withval" in - (.NONE/*) + case "x$withval" in + (xNONE/*) withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%` ;; esac ;; -(.no|.NONE/*) +(xno|xNONE/*) withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { { echo "$as_me:18079: error: expected a pathname, not \"$withval\"" >&5 + { { echo "$as_me:19427: error: expected a pathname, not \"$withval\"" >&5 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -18085,11 +19433,11 @@ esac fi eval ADA_OBJECTS="$withval" -echo "$as_me:18088: result: $ADA_OBJECTS" >&5 +echo "$as_me:19436: result: $ADA_OBJECTS" >&5 echo "${ECHO_T}$ADA_OBJECTS" >&6 -echo "$as_me:18091: checking if an Ada95 shared-library should be built" >&5 -echo $ECHO_N "checking if an Ada95 shared-library should be built... $ECHO_C" >&6 +echo "$as_me:19439: checking whether to build an Ada95 shared library" >&5 +echo $ECHO_N "checking whether to build an Ada95 shared library... $ECHO_C" >&6 # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given. if test "${with_ada_sharedlib+set}" = set; then @@ -18098,19 +19446,25 @@ if test "${with_ada_sharedlib+set}" = set; then else with_ada_sharedlib=no fi; -echo "$as_me:18101: result: $with_ada_sharedlib" >&5 -echo "${ECHO_T}$with_ada_sharedlib" >&6 +cf_ada_sharedlib_warn=no if test "x$with_ada_sharedlib" != xno then if test "x$cf_gnat_projects" != xyes then - { echo "$as_me:18108: WARNING: disabling shared-library since GNAT projects are not supported" >&5 -echo "$as_me: WARNING: disabling shared-library since GNAT projects are not supported" >&2;} with_ada_sharedlib=no + cf_ada_sharedlib_warn=yes fi fi +echo "$as_me:19460: result: $with_ada_sharedlib" >&5 +echo "${ECHO_T}$with_ada_sharedlib" >&6 +if test "x$cf_ada_sharedlib_warn" != xno +then + { echo "$as_me:19464: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5 +echo "$as_me: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&2;} +fi + ADA_SHAREDLIB='lib$(LIB_NAME).so.1' MAKE_ADA_SHAREDLIB="#" @@ -18125,8 +19479,8 @@ fi # allow the Ada binding to be renamed -echo "$as_me:18128: checking for ada-libname" >&5 -echo $ECHO_N "checking for ada-libname... $ECHO_C" >&6 +echo "$as_me:19482: checking for Ada95 curses library name" >&5 +echo $ECHO_N "checking for Ada95 curses library name... $ECHO_C" >&6 # Check whether --with-ada-libname or --without-ada-libname was given. if test "${with_ada_libname+set}" = set; then @@ -18141,16 +19495,16 @@ case "x$ADA_LIBNAME" in ;; esac -echo "$as_me:18144: result: $ADA_LIBNAME" >&5 +echo "$as_me:19498: result: $ADA_LIBNAME" >&5 echo "${ECHO_T}$ADA_LIBNAME" >&6 else - { { echo "$as_me:18148: error: No usable Ada compiler found" >&5 + { { echo "$as_me:19502: error: No usable Ada compiler found" >&5 echo "$as_me: error: No usable Ada compiler found" >&2;} { (exit 1); exit 1; }; } fi else - { { echo "$as_me:18153: error: The Ada compiler is needed for this package" >&5 + { { echo "$as_me:19507: error: The Ada compiler is needed for this package" >&5 echo "$as_me: error: The Ada compiler is needed for this package" >&2;} { (exit 1); exit 1; }; } fi @@ -18190,7 +19544,7 @@ elif test "$includedir" != "/usr/include"; then fi ### Build up pieces for makefile rules -echo "$as_me:18193: checking default library suffix" >&5 +echo "$as_me:19547: checking default library suffix" >&5 echo $ECHO_N "checking default library suffix... $ECHO_C" >&6 case $DFT_LWR_MODEL in @@ -18201,10 +19555,10 @@ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6 (shared) DFT_ARG_SUFFIX='' ;; esac test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}" -echo "$as_me:18204: result: $DFT_ARG_SUFFIX" >&5 +echo "$as_me:19558: result: $DFT_ARG_SUFFIX" >&5 echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6 -echo "$as_me:18207: checking default library-dependency suffix" >&5 +echo "$as_me:19561: checking default library-dependency suffix" >&5 echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6 case X$DFT_LWR_MODEL in @@ -18287,10 +19641,10 @@ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6 DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}" DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}" fi -echo "$as_me:18290: result: $DFT_DEP_SUFFIX" >&5 +echo "$as_me:19644: result: $DFT_DEP_SUFFIX" >&5 echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6 -echo "$as_me:18293: checking default object directory" >&5 +echo "$as_me:19647: checking default object directory" >&5 echo $ECHO_N "checking default object directory... $ECHO_C" >&6 case $DFT_LWR_MODEL in @@ -18306,7 +19660,7 @@ echo $ECHO_N "checking default object directory... $ECHO_C" >&6 DFT_OBJ_SUBDIR='obj_s' ;; esac esac -echo "$as_me:18309: result: $DFT_OBJ_SUBDIR" >&5 +echo "$as_me:19663: result: $DFT_OBJ_SUBDIR" >&5 echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6 ### Set up low-level terminfo dependencies for makefiles. @@ -18379,7 +19733,7 @@ cat >confcache <<\_ACEOF # config.status only pays attention to the cache file if you give it # the --recheck option to rerun configure. # -# `ac_cv_env_foo' variables (set or unset) will be overriden when +# `ac_cv_env_foo' variables (set or unset) will be overridden when # loading this file, other *unset* `ac_cv_foo' will be assigned the # following values. @@ -18448,7 +19802,7 @@ DEFS=-DHAVE_CONFIG_H : "${CONFIG_STATUS=./config.status}" ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ echo "$as_me:18451: creating $CONFIG_STATUS" >&5 +{ echo "$as_me:19805: creating $CONFIG_STATUS" >&5 echo "$as_me: creating $CONFIG_STATUS" >&6;} cat >"$CONFIG_STATUS" <<_ACEOF #! $SHELL @@ -18584,7 +19938,7 @@ EOF cat >>"$CONFIG_STATUS" <>"$CONFIG_STATUS" <<\EOF echo "$ac_cs_version"; exit 0 ;; --he | --h) # Conflict between --help and --header - { { echo "$as_me:18632: error: ambiguous option: $1 + { { echo "$as_me:19986: error: ambiguous option: $1 Try \`$0 --help' for more information." >&5 echo "$as_me: error: ambiguous option: $1 Try \`$0 --help' for more information." >&2;} @@ -18648,7 +20002,7 @@ Try \`$0 --help' for more information." >&2;} ac_need_defaults=false;; # This is an error. - -*) { { echo "$as_me:18651: error: unrecognized option: $1 + -*) { { echo "$as_me:20005: error: unrecognized option: $1 Try \`$0 --help' for more information." >&5 echo "$as_me: error: unrecognized option: $1 Try \`$0 --help' for more information." >&2;} @@ -18667,7 +20021,7 @@ cat >&5 << _ACEOF ## Running config.status. ## ## ----------------------- ## -This file was extended by $as_me 2.52.20230114, executed with +This file was extended by $as_me 2.52.20240618, executed with CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS CONFIG_LINKS = $CONFIG_LINKS @@ -18723,7 +20077,7 @@ do "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; "include/ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/ncurses_cfg.h:include/ncurses_cfg.hin" ;; - *) { { echo "$as_me:18726: error: invalid argument: $ac_config_target" >&5 + *) { { echo "$as_me:20080: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac @@ -18823,6 +20177,13 @@ s,@target_vendor@,$target_vendor,;t t s,@target_os@,$target_os,;t t s,@GREP@,$GREP,;t t s,@FGREP@,$FGREP,;t t +s,@cf_TEMP_gnat@,$cf_TEMP_gnat,;t t +s,@M4_exists@,$M4_exists,;t t +s,@cf_ada_make@,$cf_ada_make,;t t +s,@cf_ada_config@,$cf_ada_config,;t t +s,@cf_ada_config_Ada@,$cf_ada_config_Ada,;t t +s,@cf_ada_config_C@,$cf_ada_config_C,;t t +s,@cf_cv_path_gnatgcc@,$cf_cv_path_gnatgcc,;t t s,@CC@,$CC,;t t s,@CFLAGS@,$CFLAGS,;t t s,@LDFLAGS@,$LDFLAGS,;t t @@ -18838,6 +20199,8 @@ s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t s,@INSTALL_DATA@,$INSTALL_DATA,;t t s,@LN_S@,$LN_S,;t t +s,@GLOB_FULLPATH_POSIX@,$GLOB_FULLPATH_POSIX,;t t +s,@GLOB_FULLPATH_OTHER@,$GLOB_FULLPATH_OTHER,;t t s,@INSTALL_OPT_S@,$INSTALL_OPT_S,;t t s,@INSTALL_OPT_O@,$INSTALL_OPT_O,;t t s,@PKG_CONFIG@,$PKG_CONFIG,;t t @@ -18859,6 +20222,7 @@ s,@AR@,$AR,;t t s,@ac_ct_AR@,$ac_ct_AR,;t t s,@ARFLAGS@,$ARFLAGS,;t t s,@DESTDIR@,$DESTDIR,;t t +s,@MERGE_PREFIX@,$MERGE_PREFIX,;t t s,@BUILD_CC@,$BUILD_CC,;t t s,@BUILD_CPP@,$BUILD_CPP,;t t s,@BUILD_CFLAGS@,$BUILD_CFLAGS,;t t @@ -18869,8 +20233,10 @@ s,@BUILD_EXEEXT@,$BUILD_EXEEXT,;t t s,@BUILD_OBJEXT@,$BUILD_OBJEXT,;t t s,@DFT_LWR_MODEL@,$DFT_LWR_MODEL,;t t s,@DFT_UPR_MODEL@,$DFT_UPR_MODEL,;t t +s,@REQUIRE_PKG@,$REQUIRE_PKG,;t t s,@NCURSES_CONFIG@,$NCURSES_CONFIG,;t t s,@ac_ct_NCURSES_CONFIG@,$ac_ct_NCURSES_CONFIG,;t t +s,@cf_cv_screen@,$cf_cv_screen,;t t s,@NCURSES_MAJOR@,$NCURSES_MAJOR,;t t s,@NCURSES_MINOR@,$NCURSES_MINOR,;t t s,@NCURSES_PATCH@,$NCURSES_PATCH,;t t @@ -18879,6 +20245,7 @@ s,@cf_cv_abi_version@,$cf_cv_abi_version,;t t s,@cf_cv_builtin_bool@,$cf_cv_builtin_bool,;t t s,@cf_cv_header_stdbool_h@,$cf_cv_header_stdbool_h,;t t s,@cf_cv_type_of_bool@,$cf_cv_type_of_bool,;t t +s,@cf_cv_enable_sigwinch@,$cf_cv_enable_sigwinch,;t t s,@LIB_PREFIX@,$LIB_PREFIX,;t t s,@LIB_SUFFIX@,$LIB_SUFFIX,;t t s,@CC_G_OPT@,$CC_G_OPT,;t t @@ -18913,12 +20280,6 @@ s,@HAVE_STDNORETURN_H@,$HAVE_STDNORETURN_H,;t t s,@STDC_NORETURN@,$STDC_NORETURN,;t t s,@ADAFLAGS@,$ADAFLAGS,;t t s,@ADA_TRACE@,$ADA_TRACE,;t t -s,@cf_TEMP_gnat@,$cf_TEMP_gnat,;t t -s,@M4_exists@,$M4_exists,;t t -s,@cf_ada_make@,$cf_ada_make,;t t -s,@cf_ada_config@,$cf_ada_config,;t t -s,@cf_ada_config_Ada@,$cf_ada_config_Ada,;t t -s,@cf_ada_config_C@,$cf_ada_config_C,;t t s,@GNATPREP_OPTS@,$GNATPREP_OPTS,;t t s,@cf_compile_generics@,$cf_compile_generics,;t t s,@cf_generic_objects@,$cf_generic_objects,;t t @@ -18979,14 +20340,14 @@ EOF # is no need to browse any of the substitutions). # These are the two extra sed commands mentioned above. (echo ':t - /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat "$tmp"/subs.frag) >"$tmp"/subs-$ac_sed_frag.sed + /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && sed -e 's/\\\\*$//g' -e 's/$/\\/' -e 's/;t t\\/;t t/' -e 't' -e '3,'$ac_max_sed_lines's/$/\\/' "$tmp"/subs.frag) >"$tmp"/subs-$ac_sed_frag.sed # It is possible to make a multiline substitution using escaped newlines. # Ensure that we do not split the substitution between script fragments. ac_BEG=$ac_end ac_END=`expr "$ac_end" + "$ac_max_sed_lines"` sed "1,${ac_BEG}d; ${ac_END}p; q" "$tmp"/subs.sed >"$tmp"/subs.next if test -s "$tmp"/subs.next; then - grep '^s,@[^@,][^@,]*@,.*\\$' "$tmp"/subs.next >"$tmp"/subs.edit + grep '^s,@[^@,][^@,]*@,.*$' "$tmp"/subs.next | grep -v '^s,@.*;t t$' >"$tmp"/subs.edit if test ! -s "$tmp"/subs.edit; then grep "^s,@[^@,][^@,]*@,.*,;t t$" "$tmp"/subs.next >"$tmp"/subs.edit if test ! -s "$tmp"/subs.edit; then @@ -19084,7 +20445,7 @@ done; } esac if test x"$ac_file" != x-; then - { echo "$as_me:19087: creating $ac_file" >&5 + { echo "$as_me:20448: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} rm -f "$ac_file" fi @@ -19102,7 +20463,7 @@ echo "$as_me: creating $ac_file" >&6;} -) echo "$tmp"/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:19105: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:20466: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo "$f";; @@ -19115,7 +20476,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo "$srcdir/$f" else # /dev/null tree - { { echo "$as_me:19118: error: cannot find input file: $f" >&5 + { { echo "$as_me:20479: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -19131,7 +20492,7 @@ cat >>"$CONFIG_STATUS" <<\EOF if test -n "$ac_seen"; then ac_used=`grep '@datarootdir@' "$ac_item"` if test -z "$ac_used"; then - { echo "$as_me:19134: WARNING: datarootdir was used implicitly but not set: + { echo "$as_me:20495: WARNING: datarootdir was used implicitly but not set: $ac_seen" >&5 echo "$as_me: WARNING: datarootdir was used implicitly but not set: $ac_seen" >&2;} @@ -19140,7 +20501,7 @@ $ac_seen" >&2;} fi ac_seen=`grep '${datarootdir}' "$ac_item"` if test -n "$ac_seen"; then - { echo "$as_me:19143: WARNING: datarootdir was used explicitly but not set: + { echo "$as_me:20504: WARNING: datarootdir was used explicitly but not set: $ac_seen" >&5 echo "$as_me: WARNING: datarootdir was used explicitly but not set: $ac_seen" >&2;} @@ -19168,11 +20529,11 @@ s,@INSTALL@,$ac_INSTALL,;t t " $ac_file_inputs | (eval "$ac_sed_cmds") >"$tmp"/out rm -f "$tmp"/stdin EOF -: "${FGREP:=grep -F}" -: "${EGREP:=grep -E}" +test -n "${FGREP}" || FGREP="grep -F" +test -n "${EGREP}" || EGREP="grep -E" cat >>"$CONFIG_STATUS" <>"$CONFIG_STATUS" <<\EOF if test x"$ac_file" != x-; then @@ -19185,7 +20546,7 @@ cat >>"$CONFIG_STATUS" <<\EOF ac_init=`$EGREP '[ ]*'$ac_name'[ ]*=' "$ac_file"` if test -z "$ac_init"; then ac_seen=`echo "$ac_seen" |sed -e 's,^,'"$ac_file"':,'` - { echo "$as_me:19188: WARNING: Variable $ac_name is used but was not set: + { echo "$as_me:20549: WARNING: Variable $ac_name is used but was not set: $ac_seen" >&5 echo "$as_me: WARNING: Variable $ac_name is used but was not set: $ac_seen" >&2;} @@ -19196,7 +20557,7 @@ $ac_seen" >&2;} $EGREP -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>"$tmp"/out if test -s "$tmp"/out; then ac_seen=`sed -e 's,^,'"$ac_file"':,' < "$tmp"/out` - { echo "$as_me:19199: WARNING: Some variables may not be substituted: + { echo "$as_me:20560: WARNING: Some variables may not be substituted: $ac_seen" >&5 echo "$as_me: WARNING: Some variables may not be substituted: $ac_seen" >&2;} @@ -19245,7 +20606,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue * ) ac_file_in=$ac_file.in ;; esac - test x"$ac_file" != x- && { echo "$as_me:19248: creating $ac_file" >&5 + test x"$ac_file" != x- && { echo "$as_me:20609: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} # First look for the input files in the build tree, otherwise in the @@ -19256,7 +20617,7 @@ echo "$as_me: creating $ac_file" >&6;} -) echo "$tmp"/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:19259: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:20620: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -19269,7 +20630,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo "$srcdir/$f" else # /dev/null tree - { { echo "$as_me:19272: error: cannot find input file: $f" >&5 + { { echo "$as_me:20633: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -19327,7 +20688,7 @@ cat >>"$CONFIG_STATUS" <<\EOF rm -f "$tmp"/in if test x"$ac_file" != x-; then if cmp -s "$ac_file" "$tmp/config.h" 2>/dev/null; then - { echo "$as_me:19330: $ac_file is unchanged" >&5 + { echo "$as_me:20691: $ac_file is unchanged" >&5 echo "$as_me: $ac_file is unchanged" >&6;} else ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ diff --git a/Ada95/configure.in b/Ada95/configure.in index 3384df24..bd58beb7 100644 --- a/Ada95/configure.in +++ b/Ada95/configure.in @@ -1,5 +1,5 @@ dnl*************************************************************************** -dnl Copyright 2018-2022,2023 Thomas E. Dickey * +dnl Copyright 2018-2023,2024 Thomas E. Dickey * dnl Copyright 2010-2016,2018 Free Software Foundation, Inc. * dnl * dnl Permission is hereby granted, free of charge, to any person obtaining a * @@ -29,7 +29,7 @@ dnl*************************************************************************** dnl dnl Author: Thomas E. Dickey dnl -dnl $Id: configure.in,v 1.91 2023/02/18 23:21:29 tom Exp $ +dnl $Id: configure.in,v 1.94 2024/08/11 00:22:07 tom Exp $ dnl Process this file with autoconf to produce a configure script. dnl dnl For additional information, see @@ -38,7 +38,7 @@ dnl https://invisible-island.net/autoconf/my-autoconf.html dnl dnl --------------------------------------------------------------------------- AC_PREREQ(2.52.20210509) -AC_REVISION($Revision: 1.91 $) +AC_REVISION($Revision: 1.94 $) AC_INIT(gen/gen.c) AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin) @@ -59,7 +59,7 @@ cf_user_CFLAGS="$CFLAGS" CF_CFG_DEFAULTS ### Checks for programs. -CF_PROG_CC(gnatgcc gcc cc) +CF_WITH_ADA AC_PROG_CPP AC_PROG_GCC_TRADITIONAL CF_PROG_CC_C_O(CC,[$CFLAGS $CPPFLAGS]) @@ -115,20 +115,7 @@ AC_CHECK_TOOL(AR, ar, ar) CF_AR_FLAGS CF_PATHSEP -dnl Special option for use by system-builders: the install-prefix is used to -dnl adjust the location into which the actual install is done, so that an -dnl archive can be built without modifying the host system's configuration. -AC_MSG_CHECKING(if you have specified an install-prefix) -AC_ARG_WITH(install-prefix, - [ --with-install-prefix prefixes actual install-location ($DESTDIR)], - [case "$withval" in - (yes|no) - ;; - (*) DESTDIR="$withval" - ;; - esac]) -AC_MSG_RESULT($DESTDIR) -AC_SUBST(DESTDIR) +CF_INSTALL_PREFIX ############################################################################### CF_HELP_MESSAGE(Build-Tools Needed to Compile Temporary Applications for Cross-compiling:) @@ -410,7 +397,7 @@ AC_MSG_RESULT($cf_with_trace) if test "$cf_with_trace" = yes ; then ADA_TRACE=TRUE - CF_ADD_CFLAGS(-DTRACE) + AC_DEFINE(TRACE,1,[Define to 1 if we have support trace functions]) else ADA_TRACE=FALSE fi @@ -455,7 +442,6 @@ cf_with_ada=yes dnl Check for availability of GNU Ada Translator (GNAT). dnl At the moment we support no other Ada95 compiler. if test "$cf_with_ada" != "no" ; then - CF_PROG_GNAT if test "$cf_cv_prog_gnat_correct" = yes; then CF_FIXUP_ADAFLAGS diff --git a/Ada95/doc/Makefile.in b/Ada95/doc/Makefile.in index 0aed33fe..f94a341f 100644 --- a/Ada95/doc/Makefile.in +++ b/Ada95/doc/Makefile.in @@ -1,6 +1,6 @@ -# $Id: Makefile.in,v 1.9 2021/07/03 15:45:33 tom Exp $ +# $Id: Makefile.in,v 1.10 2024/08/10 18:18:19 tom Exp $ ############################################################################## -# Copyright 2019-2020,2021 Thomas E. Dickey # +# Copyright 2019-2021,2024 Thomas E. Dickey # # Copyright 2011-2015,2018 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # @@ -49,8 +49,8 @@ INSTALL_DATA = @INSTALL_DATA@ DFT_ARG_SUFFIX = @DFT_ARG_SUFFIX@ THIS = @ADA_LIBNAME@ -DOCDIR = $(DESTDIR)$(datadir)/doc/$(THIS) -MANDIR = $(DESTDIR)$(mandir)/man1 +DOCDIR = $(DESTDIR)$(datadir@MERGE_PREFIX@)/doc/$(THIS) +MANDIR = $(DESTDIR)$(mandir@MERGE_PREFIX@)/man1 ################################################################################ diff --git a/Ada95/gen/Makefile.in b/Ada95/gen/Makefile.in index 05331374..135a493e 100644 --- a/Ada95/gen/Makefile.in +++ b/Ada95/gen/Makefile.in @@ -1,5 +1,5 @@ ############################################################################## -# Copyright 2019-2021,2022 Thomas E. Dickey # +# Copyright 2019-2022,2024 Thomas E. Dickey # # Copyright 1998-2015,2018 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # @@ -30,7 +30,7 @@ # Author: Juergen Pfeifer, 1996 # and: Thomas E. Dickey, 1997 # -# $Id: Makefile.in,v 1.101 2022/12/03 19:45:12 Nicolas.Boulenguez Exp $ +# $Id: Makefile.in,v 1.105 2024/08/10 17:55:15 tom Exp $ # .SUFFIXES: @@ -48,6 +48,8 @@ exec_prefix = @exec_prefix@ bindir = @bindir@ includedir = @includedir@ +BINDIR = $(DESTDIR)$(bindir@MERGE_PREFIX@) + INSTALL = @INSTALL@ @INSTALL_OPT_O@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_DATA = @INSTALL_DATA@ @@ -111,36 +113,37 @@ ABASE = $(ALIB)-curses ADA_SRCDIR = ../src -GEN_TARGETS = $(ADA_SRCDIR)/$(ABASE).ads \ - $(ADA_SRCDIR)/$(ABASE).adb \ - $(ADA_SRCDIR)/$(ABASE)-aux.ads \ - $(ADA_SRCDIR)/$(ABASE)-trace.ads \ - $(ADA_SRCDIR)/$(ABASE)-menus.ads \ - $(ADA_SRCDIR)/$(ABASE)-forms.ads \ - $(ADA_SRCDIR)/$(ABASE)-mouse.ads \ - $(ADA_SRCDIR)/$(ABASE)-panels.ads \ - $(ADA_SRCDIR)/$(ABASE)-menus-menu_user_data.ads \ - $(ADA_SRCDIR)/$(ABASE)-menus-item_user_data.ads \ - $(ADA_SRCDIR)/$(ABASE)-forms-form_user_data.ads \ - $(ADA_SRCDIR)/$(ABASE)-forms-field_types.ads \ - $(ADA_SRCDIR)/$(ABASE)-forms-field_user_data.ads \ - $(ADA_SRCDIR)/$(ABASE)-panels-user_data.ads \ - $(ADA_SRCDIR)/$(ABASE)_constants.ads +GEN_TARGETS = options.m4 \ + $(ADA_SRCDIR)/$(ABASE).ads \ + $(ADA_SRCDIR)/$(ABASE).adb \ + $(ADA_SRCDIR)/$(ABASE)-aux.ads \ + $(ADA_SRCDIR)/$(ABASE)-trace.ads \ + $(ADA_SRCDIR)/$(ABASE)-menus.ads \ + $(ADA_SRCDIR)/$(ABASE)-forms.ads \ + $(ADA_SRCDIR)/$(ABASE)-mouse.ads \ + $(ADA_SRCDIR)/$(ABASE)-panels.ads \ + $(ADA_SRCDIR)/$(ABASE)-menus-menu_user_data.ads \ + $(ADA_SRCDIR)/$(ABASE)-menus-item_user_data.ads \ + $(ADA_SRCDIR)/$(ABASE)-forms-form_user_data.ads \ + $(ADA_SRCDIR)/$(ABASE)-forms-field_types.ads \ + $(ADA_SRCDIR)/$(ABASE)-forms-field_user_data.ads \ + $(ADA_SRCDIR)/$(ABASE)-panels-user_data.ads \ + $(ADA_SRCDIR)/$(ABASE)_constants.ads GEN_SRC = $(srcdir)/$(ABASE).ads.m4 \ $(srcdir)/$(ABASE).adb.m4 \ - $(srcdir)/$(ABASE)-aux.ads.m4 \ - $(srcdir)/$(ABASE)-trace.ads.m4 \ - $(srcdir)/$(ABASE)-menus.ads.m4 \ - $(srcdir)/$(ABASE)-forms.ads.m4 \ - $(srcdir)/$(ABASE)-mouse.ads.m4 \ - $(srcdir)/$(ABASE)-panels.ads.m4 \ - $(srcdir)/$(ABASE)-menus-menu_user_data.ads.m4 \ - $(srcdir)/$(ABASE)-menus-item_user_data.ads.m4 \ - $(srcdir)/$(ABASE)-forms-form_user_data.ads.m4 \ - $(srcdir)/$(ABASE)-forms-field_types.ads.m4 \ - $(srcdir)/$(ABASE)-forms-field_user_data.ads.m4 \ - $(srcdir)/$(ABASE)-panels-user_data.ads.m4 + $(srcdir)/$(ABASE)-aux.ads.m4 \ + $(srcdir)/$(ABASE)-trace.ads.m4 \ + $(srcdir)/$(ABASE)-menus.ads.m4 \ + $(srcdir)/$(ABASE)-forms.ads.m4 \ + $(srcdir)/$(ABASE)-mouse.ads.m4 \ + $(srcdir)/$(ABASE)-panels.ads.m4 \ + $(srcdir)/$(ABASE)-menus-menu_user_data.ads.m4 \ + $(srcdir)/$(ABASE)-menus-item_user_data.ads.m4 \ + $(srcdir)/$(ABASE)-forms-form_user_data.ads.m4 \ + $(srcdir)/$(ABASE)-forms-field_types.ads.m4 \ + $(srcdir)/$(ABASE)-forms-field_user_data.ads.m4 \ + $(srcdir)/$(ABASE)-panels-user_data.ads.m4 ################################################################################ @@ -162,16 +165,19 @@ libs : $(GEN_TARGETS) sources: -$(DESTDIR)$(bindir) : +$(BINDIR) : mkdir -p $@ install \ -install.libs :: $(DESTDIR)$(bindir) $(ADACURSES_CONFIG) - $(INSTALL_SCRIPT) $(ADACURSES_CONFIG) $(DESTDIR)$(bindir)/$(ADACURSES_CONFIG) +install.libs :: \ + $(GEN_TARGETS) \ + $(BINDIR) \ + $(ADACURSES_CONFIG) + $(INSTALL_SCRIPT) $(ADACURSES_CONFIG) $(BINDIR)/$(ADACURSES_CONFIG) uninstall \ uninstall.libs :: - -rm -f $(DESTDIR)$(bindir)/$(ADACURSES_CONFIG) + -rm -f $(BINDIR)/$(ADACURSES_CONFIG) $(PROG_GENERATE): gen.o @ECHO_LD@ $(LINK) $(CFLAGS_NORMAL) gen.o $(ACTUAL_LDFLAGS) -o $@ @@ -183,7 +189,8 @@ $(ADA_SRCDIR)/$(ABASE)_constants.ads: $(PROG_GENERATE) $(WRAPPER) "$(GENERATE) $@" ################################################################################ $(ADA_SRCDIR)/$(ABASE).ads: $(srcdir)/$(ABASE).ads.m4 \ - $(srcdir)/normal.m4 + $(srcdir)/normal.m4 \ + options.m4 $(M4) $(M4FLAGS) -DM4MACRO=$(srcdir)/normal.m4 \ $(srcdir)/$(ABASE).ads.m4 |\ $(DEL_ADAMODE) >$@ @@ -284,6 +291,7 @@ mostlyclean :: -rm -f a.out core $(PROG_GENERATE) *.o clean :: mostlyclean + -rm -f options.m4 -rm -f $(GEN_TARGETS) instab.tmp *.ad[bs] *.html *.ali *.tmp distclean :: clean @@ -294,6 +302,15 @@ realclean :: distclean HTML_DIR = @ADAHTML_DIR@ +options.m4 : + $(SHELL) -c "if [ @cf_cv_enable_sigwinch@ = 0 ]; \ + then \ + dashes=' --'; \ + else \ + dashes='';\ + fi; \ + echo \"define(OPT_KEY_RESIZE,\\\`\$$dashes')dnl\" > $@" + instab.tmp : table.m4 $(GEN_SRC) @rm -f $@ @for f in $(GEN_SRC) ; do \ diff --git a/Ada95/gen/gen.c b/Ada95/gen/gen.c index d92fa68e..fae38f97 100644 --- a/Ada95/gen/gen.c +++ b/Ada95/gen/gen.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020,2021 Thomas E. Dickey * + * Copyright 2020-2024,2025 Thomas E. Dickey * * Copyright 1998-2014,2016 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -35,7 +35,7 @@ /* Version Control - $Id: gen.c,v 1.78 2021/12/11 21:03:21 tom Exp $ + $Id: gen.c,v 1.80 2025/01/24 20:39:23 tom Exp $ --------------------------------------------------------------------------*/ /* This program prints on its standard output the source for the @@ -189,7 +189,7 @@ find_pos(const UCHAR * const data, int main(int argc, const char *argv[]) { - FILE *fp = 0; + FILE *fp = NULL; const int x = 0x12345678; little_endian = (*((const char *)&x) == 0x78); @@ -424,7 +424,9 @@ main(int argc, const char *argv[]) PRINT_NAMED_CONSTANT(KEY_SUSPEND); PRINT_NAMED_CONSTANT(KEY_UNDO); PRINT_NAMED_CONSTANT(KEY_MOUSE); +#ifdef KEY_RESIZE PRINT_NAMED_CONSTANT(KEY_RESIZE); +#endif print_comment(fp, "alternate character codes (ACS) from addch(3NCURSES)"); #define PRINT_ACS(name) print_size_of (fp, #name, (size_t)(&name - &acs_map[0])) diff --git a/Ada95/gen/terminal_interface-curses.adb.m4 b/Ada95/gen/terminal_interface-curses.adb.m4 index 3f34d203..c966f9b9 100644 --- a/Ada95/gen/terminal_interface-curses.adb.m4 +++ b/Ada95/gen/terminal_interface-curses.adb.m4 @@ -9,7 +9,7 @@ include(M4MACRO)---------------------------------------------------------------- -- B O D Y -- -- -- ------------------------------------------------------------------------------ --- Copyright 2018,2020 Thomas E. Dickey -- +-- Copyright 2018-2020,2024 Thomas E. Dickey -- -- Copyright 2007-2011,2014 Free Software Foundation, Inc. -- -- -- -- Permission is hereby granted, free of charge, to any person obtaining a -- @@ -38,8 +38,8 @@ include(M4MACRO)---------------------------------------------------------------- ------------------------------------------------------------------------------ -- Author: Juergen Pfeifer, 1996 -- Version Control: --- $Revision: 1.16 $ --- $Date: 2020/02/02 23:34:34 $ +-- $Revision: 1.17 $ +-- $Date: 2024/03/30 13:24:07 $ -- Binding Version 01.00 ------------------------------------------------------------------------------ with System; @@ -564,7 +564,7 @@ package body Terminal_Interface.Curses is L : constant Special_Key_Code := Special_Key_Code (Natural (Key_F0) + Natural (Function_Key_Number'Last)); begin - if (Key >= Key_F0) and then (Key <= L) then + if Key >= Key_F0 and then Key <= L then return True; else return False; diff --git a/Ada95/gen/terminal_interface-curses.ads.m4 b/Ada95/gen/terminal_interface-curses.ads.m4 index a5e91036..d6b18e58 100644 --- a/Ada95/gen/terminal_interface-curses.ads.m4 +++ b/Ada95/gen/terminal_interface-curses.ads.m4 @@ -1,6 +1,6 @@ -- -*- ada -*- define(`HTMLNAME',`terminal_interface-curses__ads.htm')dnl -include(M4MACRO)------------------------------------------------------------------------------ +include(M4MACRO)include(options.m4)------------------------------------------------------------------------------ -- -- -- GNAT ncurses Binding -- -- -- @@ -9,7 +9,7 @@ include(M4MACRO)---------------------------------------------------------------- -- S P E C -- -- -- ------------------------------------------------------------------------------ --- Copyright 2020 Thomas E. Dickey -- +-- Copyright 2020,2024 Thomas E. Dickey -- -- Copyright 1998-2011,2014 Free Software Foundation, Inc. -- -- -- -- Permission is hereby granted, free of charge, to any person obtaining a -- @@ -38,8 +38,8 @@ include(M4MACRO)---------------------------------------------------------------- ------------------------------------------------------------------------------ -- Author: Juergen Pfeifer, 1996 -- Version Control: --- $Revision: 1.48 $ --- $Date: 2020/02/02 23:34:34 $ +-- $Revision: 1.49 $ +-- $Date: 2024/01/19 16:51:30 $ -- Binding Version 01.00 ------------------------------------------------------------------------------ with System.Storage_Elements; @@ -377,8 +377,8 @@ package Terminal_Interface.Curses is := Curses_Constants.KEY_UNDO; Key_Mouse : constant Special_Key_Code := Curses_Constants.KEY_MOUSE; - Key_Resize : constant Special_Key_Code - := Curses_Constants.KEY_RESIZE; +OPT_KEY_RESIZE Key_Resize : constant Special_Key_Code +OPT_KEY_RESIZE := Curses_Constants.KEY_RESIZE; Key_Max : constant Special_Key_Code := Special_Key_Code'Last; diff --git a/Ada95/include/ncurses_cfg.hin b/Ada95/include/ncurses_cfg.hin index f8bcb662..c19ac8a5 100644 --- a/Ada95/include/ncurses_cfg.hin +++ b/Ada95/include/ncurses_cfg.hin @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020 Thomas E. Dickey * + * Copyright 2020,2024 Thomas E. Dickey * * Copyright 2005-2017,2018 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 * ****************************************************************************/ /* - * $Id: ncurses_cfg.hin,v 1.11 2020/02/02 23:34:34 tom Exp $ + * $Id: ncurses_cfg.hin,v 1.13 2024/06/08 14:04:14 tom Exp $ * * This is a template-file used to generate the "ncurses_cfg.h" file. * @@ -41,7 +41,7 @@ * * See: * https://invisible-island.net/autoconf/ - * ftp://ftp.invisible-island.net/autoconf/ + * https://invisible-island.net/archives/autoconf/ */ #ifndef NC_CONFIG_H #define NC_CONFIG_H diff --git a/Ada95/package/AdaCurses-doc.spec b/Ada95/package/AdaCurses-doc.spec index c5b68dd4..cfc8527c 100644 --- a/Ada95/package/AdaCurses-doc.spec +++ b/Ada95/package/AdaCurses-doc.spec @@ -3,13 +3,13 @@ Summary: AdaCurses - Ada95 binding documentation for ncurses %define AppVersion MAJOR.MINOR %define AppRelease YYYYMMDD %define AppPackage %{AppProgram}-doc -# $Id: AdaCurses-doc.spec,v 1.7 2019/11/23 21:15:53 tom Exp $ +# $Id: AdaCurses-doc.spec,v 1.8 2024/06/08 13:54:31 tom Exp $ Name: %{AppPackage} Version: %{AppVersion} Release: %{AppRelease} License: MIT Group: Applications/Development -URL: ftp://ftp.invisible-island.net/%{AppProgram} +URL: https://invisible-island.net/%{AppProgram} Source0: %{AppProgram}-%{AppRelease}.tgz Packager: Thomas Dickey diff --git a/Ada95/package/AdaCurses.spec b/Ada95/package/AdaCurses.spec index 540e8e54..aa557ab1 100644 --- a/Ada95/package/AdaCurses.spec +++ b/Ada95/package/AdaCurses.spec @@ -2,13 +2,13 @@ Summary: Ada95 binding for ncurses %define AppProgram AdaCurses %define AppVersion MAJOR.MINOR %define AppRelease YYYYMMDD -# $Id: AdaCurses.spec,v 1.31 2022/12/18 00:08:17 tom Exp $ +# $Id: AdaCurses.spec,v 1.34 2024/06/08 13:53:14 tom Exp $ Name: %{AppProgram} Version: %{AppVersion} Release: %{AppRelease} License: MIT Group: Applications/Development -URL: ftp://ftp.invisible-island.net/%{AppProgram} +URL: https://invisible-island.net/%{AppProgram} Source0: %{AppProgram}-%{AppRelease}.tgz Packager: Thomas Dickey @@ -69,6 +69,7 @@ INSTALL_PROGRAM='${INSTALL}' \ --disable-rpath-link \ --disable-echo \ --verbose \ + --with-screen=ncursesw6dev \ --enable-warnings make diff --git a/Ada95/package/debian/copyright b/Ada95/package/debian/copyright index 3c8e5256..d4bbc997 100644 --- a/Ada95/package/debian/copyright +++ b/Ada95/package/debian/copyright @@ -4,12 +4,12 @@ Current ncurses maintainer: Thomas Dickey ------------------------------------------------------------------------------- Files: * -Copyright: 2017-2022,2023 by Thomas E. Dickey +Copyright: 2017-2024,2025 by Thomas E. Dickey Copyright: 1998-2016,2017 Free Software Foundation, Inc. License: X11 Files: aclocal.m4 package -Copyright: 2010-2020,2021 by Thomas E. Dickey +Copyright: 2010-2024,2025 by Thomas E. Dickey License: X11 Permission is hereby granted, free of charge, to any person obtaining a diff --git a/Ada95/package/debian/rules b/Ada95/package/debian/rules index 0adde8de..8f8e841c 100755 --- a/Ada95/package/debian/rules +++ b/Ada95/package/debian/rules @@ -41,6 +41,7 @@ configure-stamp: --disable-rpath-link \ --with-shared \ --with-ada-sharedlib \ + --with-screen=ncursesw6td \ --without-pkg-config touch configure-stamp diff --git a/Ada95/package/debian/watch b/Ada95/package/debian/watch index 1b870ba1..5a8f1d2a 100644 --- a/Ada95/package/debian/watch +++ b/Ada95/package/debian/watch @@ -1,4 +1,4 @@ version=3 -opts=passive ftp://ftp.invisible-island.net/AdaCurses/AdaCurses-([\d.]+)\.tgz \ +opts=passive https://invisible-island.net/archives/AdaCurses/AdaCurses-([\d.]+)\.tgz \ debian uupdate diff --git a/Ada95/samples/Makefile.in b/Ada95/samples/Makefile.in index 3731085a..ec7e52e5 100644 --- a/Ada95/samples/Makefile.in +++ b/Ada95/samples/Makefile.in @@ -1,5 +1,5 @@ ############################################################################## -# Copyright 2018-2020,2021 Thomas E. Dickey # +# Copyright 2018-2021,2024 Thomas E. Dickey # # Copyright 1998-2015,2018 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # @@ -29,7 +29,7 @@ # # Author: Juergen Pfeifer, 1996 # -# $Id: Makefile.in,v 1.64 2021/07/03 15:45:33 tom Exp $ +# $Id: Makefile.in,v 1.66 2024/08/10 17:56:19 tom Exp $ # .SUFFIXES: @@ -78,9 +78,9 @@ LDFLAGS = @LDFLAGS@ @LD_MODEL@ @LIBS@ RANLIB = @RANLIB@ ################################################################################ -BINDIR = $(DESTDIR)$(bindir) -DATADIR = $(DESTDIR)$(datadir) -LIBDIR = $(DESTDIR)$(libdir) +BINDIR = $(DESTDIR)$(bindir@MERGE_PREFIX@) +DATADIR = $(DESTDIR)$(datadir@MERGE_PREFIX@) +LIBDIR = $(DESTDIR)$(libdir@MERGE_PREFIX@) MY_DATADIR = $(DATADIR)/@ADA_LIBNAME@ THIS_DATADIR = $(datadir)/@ADA_LIBNAME@ @@ -133,7 +133,7 @@ sources : libs \ install \ -install.libs :: +install.libs :: $(PROGS) @echo made $@ uninstall \ diff --git a/Ada95/samples/ncurses2-overlap_test.adb b/Ada95/samples/ncurses2-overlap_test.adb index c0fd6209..6f3341ba 100644 --- a/Ada95/samples/ncurses2-overlap_test.adb +++ b/Ada95/samples/ncurses2-overlap_test.adb @@ -7,7 +7,7 @@ -- B O D Y -- -- -- ------------------------------------------------------------------------------ --- Copyright 2020,2021 Thomas E. Dickey -- +-- Copyright 2020-2021,2024 Thomas E. Dickey -- -- Copyright 2000-2014,2015 Free Software Foundation, Inc. -- -- -- -- Permission is hereby granted, free of charge, to any person obtaining a -- @@ -36,8 +36,8 @@ ------------------------------------------------------------------------------ -- Author: Eugene V. Melaragno 2000 -- Version Control --- $Revision: 1.9 $ --- $Date: 2021/09/04 10:52:55 $ +-- $Revision: 1.10 $ +-- $Date: 2024/03/30 13:21:15 $ -- Binding Version 01.00 ------------------------------------------------------------------------------ with ncurses2.util; use ncurses2.util; @@ -73,8 +73,8 @@ procedure ncurses2.overlap_test is Get_Size (win, y1, x1); for y in 0 .. y1 - 1 loop for x in 0 .. x1 - 1 loop - if ((x > (x1 - 1) / 3) and (x <= (2 * (x1 - 1)) / 3)) or - (((y > (y1 - 1) / 3) and (y <= (2 * (y1 - 1)) / 3))) + if (x > (x1 - 1) / 3 and x <= (2 * (x1 - 1)) / 3) or + (y > (y1 - 1) / 3 and y <= (2 * (y1 - 1)) / 3) then Move_Cursor (win, y, x); Add (win, Ch => ch); diff --git a/Ada95/samples/ncurses2-trace_set.adb b/Ada95/samples/ncurses2-trace_set.adb index d2739809..3b1983da 100644 --- a/Ada95/samples/ncurses2-trace_set.adb +++ b/Ada95/samples/ncurses2-trace_set.adb @@ -7,7 +7,7 @@ -- B O D Y -- -- -- ------------------------------------------------------------------------------ --- Copyright 2020 Thomas E. Dickey -- +-- Copyright 2020,2023 Thomas E. Dickey -- -- Copyright 2000-2011,2014 Free Software Foundation, Inc. -- -- -- -- Permission is hereby granted, free of charge, to any person obtaining a -- @@ -36,8 +36,8 @@ ------------------------------------------------------------------------------ -- Author: Eugene V. Melaragno 2000 -- Version Control --- $Revision: 1.7 $ --- $Date: 2020/02/02 23:34:34 $ +-- $Revision: 1.8 $ +-- $Date: 2023/06/17 17:21:47 $ -- Binding Version 01.00 ------------------------------------------------------------------------------ with ncurses2.util; use ncurses2.util; @@ -121,7 +121,7 @@ procedure ncurses2.trace_set is Trace_Attribute_Set'(Character_Calls => True, others => False)), (new String'("Termcap_TermInfo"), Trace_Attribute_Set'(Termcap_TermInfo => True, others => False)), - (new String'("Maximium"), + (new String'("Maximum"), Trace_Maximum) ); @@ -353,7 +353,7 @@ procedure ncurses2.trace_set is if subset (tlevel, Trace_Maximum) then - Append (buf, "Maximium"); + Append (buf, "Maximum"); Append (buf, ", "); end if; end if; diff --git a/Ada95/samples/sample-explanation.adb_p b/Ada95/samples/sample-explanation.adb_p index f99ceb6f..79348e97 100644 --- a/Ada95/samples/sample-explanation.adb_p +++ b/Ada95/samples/sample-explanation.adb_p @@ -7,7 +7,7 @@ -- B O D Y -- -- -- ------------------------------------------------------------------------------ --- Copyright 2019,2020 Thomas E. Dickey -- +-- Copyright 2019-2020,2025 Thomas E. Dickey -- -- -- -- Permission is hereby granted, free of charge, to any person obtaining a -- -- copy of this software and associated documentation files (the -- @@ -35,8 +35,8 @@ ------------------------------------------------------------------------------ -- Author: Juergen Pfeifer, 1996 -- Version Control --- $Revision: 1.5 $ --- $Date: 2020/02/02 23:34:34 $ +-- $Revision: 1.6 $ +-- $Date: 2025/01/24 20:39:23 $ -- Binding Version 01.00 ------------------------------------------------------------------------------ -- Poor mans help system. This scans a sequential file for key lines and @@ -136,7 +136,7 @@ package body Sample.Explanation is H : Help_Line_Access := Top_Line; begin if Top_Line /= null then - for L in 0 .. (Height - 1) loop + for L in 0 .. Height - 1 loop Add (W, L, 0, H.all.Line.all); exit when H.all.Next = null; H := H.all.Next; diff --git a/Ada95/samples/sample-menu_demo-aux.adb b/Ada95/samples/sample-menu_demo-aux.adb index f430c88c..f64e41da 100644 --- a/Ada95/samples/sample-menu_demo-aux.adb +++ b/Ada95/samples/sample-menu_demo-aux.adb @@ -7,7 +7,7 @@ -- B O D Y -- -- -- ------------------------------------------------------------------------------ --- Copyright 2020 Thomas E. Dickey -- +-- Copyright 2020,2023 Thomas E. Dickey -- -- Copyright 1998-2006,2009 Free Software Foundation, Inc. -- -- -- -- Permission is hereby granted, free of charge, to any person obtaining a -- @@ -36,8 +36,8 @@ ------------------------------------------------------------------------------ -- Author: Juergen Pfeifer, 1996 -- Version Control --- $Revision: 1.15 $ --- $Date: 2020/02/02 23:34:34 $ +-- $Revision: 1.16 $ +-- $Date: 2023/06/17 17:21:59 $ -- Binding Version 01.00 ------------------------------------------------------------------------------ with Ada.Characters.Latin_1; use Ada.Characters.Latin_1; @@ -79,7 +79,7 @@ package body Sample.Menu_Demo.Aux is -- Calculate horizontal coordinate at the screen center X := (Columns - C) / 2; - Y := 1; -- always startin line 1 + Y := 1; -- always starting on line 1 end Geometry; diff --git a/Ada95/src/Makefile.in b/Ada95/src/Makefile.in index eb4489b0..c35dbc08 100644 --- a/Ada95/src/Makefile.in +++ b/Ada95/src/Makefile.in @@ -1,5 +1,5 @@ ############################################################################## -# Copyright 2018-2020,2021 Thomas E. Dickey # +# Copyright 2018-2021,2024 Thomas E. Dickey # # Copyright 1999-2016,2018 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # @@ -29,7 +29,7 @@ # # Author: Juergen Pfeifer, 1996 # -# $Id: Makefile.in,v 1.96 2021/07/03 15:45:33 tom Exp $ +# $Id: Makefile.in,v 1.97 2024/08/10 18:18:44 tom Exp $ # .SUFFIXES: @@ -51,7 +51,7 @@ exec_prefix = @exec_prefix@ includedir = @includedir@ libdir = @libdir@ -LIBDIR = $(DESTDIR)$(libdir) +LIBDIR = $(DESTDIR)$(libdir@MERGE_PREFIX@) ADA_INCLUDE = $(DESTDIR)@ADA_INCLUDE@ ADA_OBJECTS = $(DESTDIR)@ADA_OBJECTS@ diff --git a/Ada95/src/modules b/Ada95/src/modules index 29a0d8b0..cb1fb84b 100644 --- a/Ada95/src/modules +++ b/Ada95/src/modules @@ -1,6 +1,6 @@ -# $Id: modules,v 1.4 2020/02/02 23:34:34 tom Exp $ +# $Id: modules,v 1.5 2024/06/15 20:51:03 tom Exp $ ############################################################################## -# Copyright 2020 Thomas E. Dickey # +# Copyright 2020,2024 Thomas E. Dickey # # Copyright 2010 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # @@ -69,3 +69,5 @@ $(ABASE)-text_io-decimal_io $(srcdir) $(srcdir) body $(ABASE)-text_io-enumeration_io $(srcdir) $(srcdir) body $(ABASE)-text_io-modular_io $(srcdir) $(srcdir) body $(ABASE)-text_io-complex_io $(srcdir) $(srcdir) body + +# vile:makemode diff --git a/Ada95/src/terminal_interface-curses-forms.adb b/Ada95/src/terminal_interface-curses-forms.adb index f50420e6..2e6fd16c 100644 --- a/Ada95/src/terminal_interface-curses-forms.adb +++ b/Ada95/src/terminal_interface-curses-forms.adb @@ -7,7 +7,7 @@ -- B O D Y -- -- -- ------------------------------------------------------------------------------ --- Copyright 2020 Thomas E. Dickey -- +-- Copyright 2020,2025 Thomas E. Dickey -- -- Copyright 1999-2011,2014 Free Software Foundation, Inc. -- -- -- -- Permission is hereby granted, free of charge, to any person obtaining a -- @@ -36,8 +36,8 @@ ------------------------------------------------------------------------------ -- Author: Juergen Pfeifer, 1996 -- Version Control: --- $Revision: 1.33 $ --- $Date: 2020/02/02 23:34:34 $ +-- $Revision: 1.34 $ +-- $Date: 2025/01/24 20:39:23 $ -- Binding Version 01.00 ------------------------------------------------------------------------------ with Ada.Unchecked_Deallocation; @@ -1006,7 +1006,7 @@ package body Terminal_Interface.Curses.Forms is (Field_Array, Field_Array_Access); begin if FA /= null and then Free_Fields then - for I in FA'First .. (FA'Last - 1) loop + for I in FA'First .. FA'Last - 1 loop if FA.all (I) /= Null_Field then Delete (FA.all (I)); end if; diff --git a/Ada95/src/terminal_interface-curses-menus.adb b/Ada95/src/terminal_interface-curses-menus.adb index 76f3e36e..9febcf9d 100644 --- a/Ada95/src/terminal_interface-curses-menus.adb +++ b/Ada95/src/terminal_interface-curses-menus.adb @@ -7,7 +7,7 @@ -- B O D Y -- -- -- ------------------------------------------------------------------------------ --- Copyright 2018,2020 Thomas E. Dickey -- +-- Copyright 2018-2020,2025 Thomas E. Dickey -- -- Copyright 1999-2011,2014 Free Software Foundation, Inc. -- -- -- -- Permission is hereby granted, free of charge, to any person obtaining a -- @@ -36,8 +36,8 @@ ------------------------------------------------------------------------------ -- Author: Juergen Pfeifer, 1996 -- Version Control: --- $Revision: 1.34 $ --- $Date: 2020/02/02 23:34:34 $ +-- $Revision: 1.35 $ +-- $Date: 2025/01/24 20:39:23 $ -- Binding Version 01.00 ------------------------------------------------------------------------------ with Ada.Unchecked_Deallocation; @@ -878,7 +878,7 @@ package body Terminal_Interface.Curses.Menus is (Item_Array, Item_Array_Access); begin if IA /= null and then Free_Items then - for I in IA'First .. (IA'Last - 1) loop + for I in IA'First .. IA'Last - 1 loop if IA.all (I) /= Null_Item then Delete (IA.all (I)); end if; diff --git a/Ada95/src/terminal_interface-curses-panels-user_data.adb b/Ada95/src/terminal_interface-curses-panels-user_data.adb index 504b07d4..4a951a4d 100644 --- a/Ada95/src/terminal_interface-curses-panels-user_data.adb +++ b/Ada95/src/terminal_interface-curses-panels-user_data.adb @@ -7,7 +7,7 @@ -- B O D Y -- -- -- ------------------------------------------------------------------------------ --- Copyright 2020 Thomas E. Dickey -- +-- Copyright 2020,2025 Thomas E. Dickey -- -- Copyright 1999-2003,2009 Free Software Foundation, Inc. -- -- -- -- Permission is hereby granted, free of charge, to any person obtaining a -- @@ -36,7 +36,7 @@ ------------------------------------------------------------------------------ -- Author: Juergen Pfeifer, 1996 -- Version Control: --- $Revision: 1.13 $ +-- $Revision: 1.14 $ -- Binding Version 01.00 ------------------------------------------------------------------------------ with Interfaces.C; diff --git a/COPYING b/COPYING index 2abcc60d..6182a3bc 100644 --- a/COPYING +++ b/COPYING @@ -1,4 +1,4 @@ -Copyright 2018-2022,2023 Thomas E. Dickey +Copyright 2018-2024,2025 Thomas E. Dickey Copyright 1998-2017,2018 Free Software Foundation, Inc. Permission is hereby granted, free of charge, to any person obtaining a @@ -26,4 +26,4 @@ sale, use or other dealings in this Software without prior written authorization. -- vile:txtmode fc=72 --- $Id: COPYING,v 1.12 2023/01/07 17:55:53 tom Exp $ +-- $Id: COPYING,v 1.14 2025/01/04 10:53:46 tom Exp $ diff --git a/INSTALL b/INSTALL index 5b04c34a..afbe12a2 100644 --- a/INSTALL +++ b/INSTALL @@ -1,5 +1,5 @@ ------------------------------------------------------------------------------- --- Copyright 2018-2022,2023 Thomas E. Dickey -- +-- Copyright 2018-2023,2024 Thomas E. Dickey -- -- Copyright 1998-2017,2018 Free Software Foundation, Inc. -- -- -- -- Permission is hereby granted, free of charge, to any person obtaining a -- @@ -26,7 +26,7 @@ -- sale, use or other dealings in this Software without prior written -- -- authorization. -- ------------------------------------------------------------------------------- --- $Id: INSTALL,v 1.240 2023/01/08 00:29:04 tom Exp $ +-- $Id: INSTALL,v 1.258 2024/12/28 21:37:40 Branden.Robinson Exp $ --------------------------------------------------------------------- How to install Ncurses/Terminfo on your system --------------------------------------------------------------------- @@ -35,10 +35,10 @@ * READ ALL OF THIS FILE BEFORE YOU TRY TO INSTALL NCURSES. * ************************************************************ -You should be reading the file INSTALL in a directory called ncurses-d.d, where -d.d is the current version number. There should be several subdirectories, -including `c++', `form', `man', `menu', 'misc', `ncurses', `panel', `progs', -and `test'. See the README file for a roadmap to the package. +You should be reading the file INSTALL in a directory called ncurses-d.d, +where d.d is the current version number. There should be several +subdirectories, including 'c++', 'form', 'man', 'menu', 'misc', 'ncurses', +'panel', 'progs', and 'test'. See 'README' for a roadmap to the package. If you are a distribution integrator or packager, please read and act on the section titled FOR SYSTEM INTEGRATORS below. @@ -47,9 +47,10 @@ If you are converting from BSD curses and do not have root access, be sure to read the BSD CONVERSION NOTES section below. If you are trying to build applications using gpm with ncurses, -read the USING NCURSES WITH GPM section below. +read the USING GPM section below. -If you are cross-compiling, see the note below on BUILDING WITH A CROSS-COMPILER. +If you are cross-compiling, see the note below on +BUILDING WITH A CROSS-COMPILER. If you want to build the Ada95 binding, go to the Ada95 directory and follow the instructions there. The Ada95 binding is not covered below. @@ -72,14 +73,14 @@ Ncurses has been also built in the OS/2 EMX environment. INSTALLATION PROCEDURE: ---------------------- -1. First, decide whether you want ncurses to replace your existing library (in - which case you'll need super-user privileges) or be installed in parallel - with it. +1. First, decide whether you want ncurses to replace your existing library + (in which case you'll need super-user privileges) or be installed in + parallel with it. The --prefix option to configure changes the root directory for installing ncurses. The default is normally in subdirectories of /usr/local, except for systems where ncurses is normally installed as a system library (see - "IF YOU ARE A SYSTEM INTEGRATOR"). Use --prefix=/usr to replace your + "FOR SYSTEM INTEGRATORS"). Use --prefix=/usr to replace your default curses distribution. The package gets installed beneath the --prefix directory as follows: @@ -106,16 +107,16 @@ INSTALLATION PROCEDURE: See also the discussion of --with-install-prefix. -2. Type `./configure' in the top-level directory of the distribution to +2. Type './configure' in the top-level directory of the distribution to configure ncurses for your operating system and create the Makefiles. Besides --prefix, various configuration options are available to customize - the installation; use `./configure --help' to list the available options. + the installation; use './configure --help' to list the available options. If your operating system is not supported, read the PORTABILITY section in the file ncurses/README for information on how to create a configuration file for your system. - The `configure' script generates makefile rules for one or more object + The 'configure' script generates makefile rules for one or more object models and their associated libraries: libncurses.a (normal) @@ -145,7 +146,7 @@ INSTALLATION PROCEDURE: the library names (e.g., libncursest.a, libncursestw.a). If you do not specify any models, the normal and debug libraries will be - configured. Typing `configure' with no arguments is equivalent to: + configured. Typing 'configure' with no arguments is equivalent to: ./configure --with-normal --with-debug --enable-overwrite @@ -176,10 +177,10 @@ INSTALLATION PROCEDURE: You can make curses and terminfo fall back to an existing file of termcap definitions by configuring with --enable-termcap. If you do this, the library will search /etc/termcap before the terminfo database, and will - also interpret the contents of the TERM environment variable. See the + also interpret the contents of the $TERM environment variable. See the section BSD CONVERSION NOTES below. -3. Type `make'. Ignore any warnings, no error messages should be produced. +3. Type 'make'. Ignore any warnings; no error messages should be produced. This should compile the ncurses library, the terminfo compiler tic(1), captoinfo(1), infocmp(1), toe(1), clear(1) tset(1), reset(1), and tput(1) programs (see the manual pages for explanation of what they do), some test @@ -195,8 +196,9 @@ INSTALLATION PROCEDURE: database before running the test programs. Not all vendors' terminfo databases are SVr4-compatible, but most seem to be. - It is possible to configure ncurses to use other terminfo database formats. - A few are provided as examples in the include-directory (see --with-caps). + It is possible to configure ncurses to use other terminfo database + formats. A few are provided as examples in the include-directory (see + --with-caps). If you run the test programs WITHOUT installing terminfo, ncurses may read the termcap file and cache that in $HOME/.terminfo, which will @@ -207,21 +209,21 @@ INSTALLATION PROCEDURE: You can use it to verify that the screen highlights work correctly, that cursor addressing and window scrolling works OK, etc. -5. Once you've tested, you can type `make install' to install libraries, - the programs, the terminfo database and the manual pages. Alternately, you - can type `make install' in each directory you want to install. In the +5. Once you've tested, you can type 'make install' to install libraries, + the programs, the terminfo database and the manual pages. Alternately, + you can type 'make install' in each directory you want to install. In the top-level directory, you can do a partial install using these commands: 'make install.progs' installs tic, infocmp, etc... 'make install.includes' installs the headers. 'make install.libs' installs the libraries (and the headers). - 'make install.data' installs the terminfo data. (Note: `tic' must + 'make install.data' installs the terminfo data. (Note: 'tic' must be installed before the terminfo data can be compiled). 'make install.man' installs the manual pages. ############################################################################ - # CAVEAT EMPTOR: `install.data' run as root will NUKE any existing # + # CAVEAT EMPTOR: 'install.data' run as root will NUKE any existing # # terminfo database. If you have any custom or unusual entries SAVE them # # before you install ncurses. # ############################################################################ @@ -242,8 +244,8 @@ INSTALLATION PROCEDURE: compile using its curses.h you'll end up with a large number of undefined symbols at link time. - IF YOU DO NOT HAVE ROOT: Change directory to the `progs' subdirectory - and run the `capconvert' script. This script will deduce various things + IF YOU DO NOT HAVE ROOT: Change directory to the 'progs' subdirectory + and run the 'capconvert' script. This script will deduce various things about your environment and use them to build you a private terminfo tree, so you can use ncurses applications. @@ -273,13 +275,13 @@ CONFIGURE OPTIONS: ./configure --help - The --help and several options are common to all configure scripts that are - generated with autoconf. Those are all listed before the line + The --help and several options are common to all configure scripts that + are generated with autoconf. Those are all listed before the line --enable and --with options recognized: - The other options are specific to this package. We list them in alphabetic - order. + The other options are specific to this package. We list them in + alphabetic order. --disable-assumed-color With ncurses 5.1, we introduced a new function, assume_default_colors() @@ -444,7 +446,7 @@ CONFIGURE OPTIONS: --with-menu-libname=XXX --with-panel-libname=XXX - Rather than renaming them abitrarily, a prefix or suffix is + Rather than renaming them arbitrarily, a prefix or suffix is recommended. An "n" prefix provides consistency with ncurses versus curses, i.e., @@ -477,13 +479,17 @@ CONFIGURE OPTIONS: --disable-root-access Compile with environment restriction, so most file-access is limited - when running via a setuid/setgid application. + when running as root, or via a setuid/setgid application. --disable-root-environ Compile with environment restriction, so certain environment variables - are not available when running as root, or via a setuid/setgid - application. These are (for example $TERMINFO) those that allow the - search path for the terminfo or termcap entry to be customized. + are not available when running as root. These are (for example + $TERMINFO) those that allow the search path for the terminfo or termcap + entry to be customized. + + Disabling the root environment variables also disables the setuid + environment variables by default. Use the --disable-setuid-environ + option to modify this behavior. --disable-rpath-hack Normally the configure script helps link libraries found in unusual @@ -498,6 +504,16 @@ CONFIGURE OPTIONS: --disable-stripping Do not strip installed executables. + --disable-setuid-environ + Compile with environment restriction, so certain environment variables + are not available when running via a setuid/setgid application. These + are (for example $TERMINFO) those that allow the search path for the + terminfo or termcap entry to be customized. + + A setuid/setgid application inherits its environment variables from + the current user, in contrast to sudo which may limit the environment + variables that ncurses uses. + --disable-tic-depends When building shared libraries, normally the tic library is linked to depend upon the ncurses library (or equivalently, on the tinfo-library @@ -534,8 +550,12 @@ CONFIGURE OPTIONS: problem. --enable-bsdpad - Recognize BSD-style prefix padding. Some ancient BSD programs (such as - nethack) call tputs("50") to implement delays. + Recognize BSD-style prefix padding. Some programs written using + the BSD curses API use tputs("50") to implement delays. + + --enable-check-size + Compile-in feature to detect screensize for terminals which do not + advertise their screensize, e.g., serial terminals. --enable-colorfgbg Compile with experimental $COLORFGBG code. That environment variable @@ -630,6 +650,12 @@ CONFIGURE OPTIONS: may not be accurate, or that your stty settings have disabled the use of tabs. + --enable-install-prefix + Extend the --with-install-prefix feature to replace the prefix value + with $DESTDIR rather than simply prepending $DESTDIR to install + pathnames. This works with any "make" which supports AT&T style + variable substitution. + --enable-interop Compile-in experimental interop bindings. These provide generic types for the form-library. @@ -650,9 +676,17 @@ CONFIGURE OPTIONS: --enable-opaque-form --enable-opaque-menu --enable-opaque-panel - Define symbol in curses.h which controls whether some library - structures are treated as "opaque". The --enable-opaque-curses option - is overridden by the --enable-reentrant option. + Define symbol in curses.h controlling whether some library structures + are opaque, meaning that their members are accessible only via the + documented API. The --enable-opaque-curses option may be overridden + by the --enable-reentrant option. + + Enabling opaque-curses enables opaque for the form, menu, and panel + libraries. Use their corresponding options to disable the feature + individually. + + NOTE: beginning with ncurses 6.5 this option is enabled by default; + older versions disable it by default. --enable-pc-files If pkg-config is found (see --with-pkg-config), generate ".pc" files @@ -675,7 +709,7 @@ CONFIGURE OPTIONS: Use rpath option when generating shared libraries, and (with some restrictions) when linking the corresponding programs. This originally (in 1997) applied mainly to systems using the GNU linker (read the - manpage). + man page). More recently it is useful for systems that require special treatment shared libraries in "unusual" locations. The "system" libraries reside @@ -798,11 +832,14 @@ CONFIGURE OPTIONS: symbolic link to equate libncurses.so with libncursesw.so NOTE: the Ada95 binding may be built against either version of the the - ncurses library, but you must decide which: the binding installs the - same set of files for either version. Currently (2002/6/22) it does + ncurses library, but you must decide which: the binding installs the + same set of files for either version. Currently (2023/10/21) it does not use the extended features from the wide-character code, so it is probably better to not install the binding for that configuration. + NOTE: beginning with ncurses 6.5 this option is enabled by default; + older versions disable it by default. + --enable-xmc-glitch Compile-in support experimental xmc (magic cookie) code. @@ -908,8 +945,9 @@ CONFIGURE OPTIONS: script supplies "unsigned"). --with-config-suffix=XXX - Specify a suffix for the ncursesw6-config file, etc., used to work - around conflicts with packages. + Specify an suffix for "ncurses*" in the ncurses*-config filename to + work around conflicts with packages. The suffix is placed before the + dash. --with-cxx-libname=NAME Override the basename of the ncurses++ library (default: "ncurses++") @@ -1014,7 +1052,7 @@ CONFIGURE OPTIONS: See also the --enable-getcap option. --with-infocmp-path[=XXX] - Use this option to override the automatic detection of tic in your + Use this option to override the automatic detection of infocmp in your $PATH when building fallbacks (see "--with-fallbacks"). --with-install-prefix=XXX @@ -1065,34 +1103,35 @@ CONFIGURE OPTIONS: ./configure --enable-static --with-manpage-aliases - Tell the configure script you wish to create entries in the - man-directory for aliases to manpages which list them, e.g., the - functions in the panel manpage. This is the default. You can disable - it if your man program does this. You can also disable - --with-manpage-symlinks to install files containing a ".so" command - rather than symbolic links. + Create files in subdirectories of the installation "man" directory that + alias the man pages documenting them. For example, the "beep" man page + also documents the function "flash". This is the default. You can + disable this procedure if your system's makewhatis(8) or mandb(8) + program indexes the directory to which the pages are installed. If you + disable man page symlinks by specifying "--without-manpage-symlinks", + the alias pages are created as stubs containing ".so" *roff requests. --with-manpage-format=XXX Tell the configure script how you would like to install man-pages. The - option value must be one of these: gzip, compress, BSDI, normal, - formatted. If you do not give this option, the configure script + option value must be one of these: "gzip", "compress", "BSDI", "normal", + "formatted". If you do not specify this option, the configure script attempts to determine which is the case. --with-manpage-renames=XXX - Tell the configure script that you wish to rename the manpages while - installing. Currently the only distribution which does this is Debian. + Tell the configure script that you wish to rename the man pages when + installing them. Debian and distributions descended from it do this. The option value specifies the name of a file that lists the renamed - files, e.g., $srcdir/man/man_db.renames + files, e.g., "$srcdir/man/man_db.renames". --with-manpage-symlinks Tell the configure script that you wish to make symbolic links in the man-directory for aliases to the man-pages. This is the default, but - can be disabled for systems that provide this automatically. Doing - this on systems that do not support symbolic links will result in - copying the man-page for each alias. + can be disabled for systems that provide this service automatically. + Doing this on systems that do not support symbolic links creates a copy + of the target man page for each alias. --with-manpage-tbl - Tell the configure script that you wish to preprocess the manpages + Tell the configure script that you wish to preprocess the man pages by running them through tbl to generate tables understandable by nroff. @@ -1130,9 +1169,10 @@ CONFIGURE OPTIONS: Override the basename of the panel library (default: "panel") --with-pc-suffix=SUFFIX - If ".pc" files are installed, optionally add a suffix to the files - and corresponding package names to separate unusual configurations. - If no option value is given (or if it is "none"), no suffix is added. + If ".pc" files are installed (see --enable-pc-files), optionally add a + suffix to the files and corresponding package names to separate + unusual configurations. If no option value is given (or if it is + "none"), no suffix is added. --with-pcre2 Add PCRE2 (Perl-compatible regular expressions v2) to the build if it @@ -1143,12 +1183,20 @@ CONFIGURE OPTIONS: not supplied by the development environment, while ncurses' form library uses a regular expression feature for one of the field types. - --with-pkg-config=[DIR] - Check for pkg-config, optionally specifying its path. + --with-pkg-config[=CMD] + Check for pkg-config, optionally specifying its pathname. - --with-pkg-config-libdir=[DIR] + --with-pkg-config-libdir[=DIR] If pkg-config was found, override the automatic check for its library - path. The configure script allows only a single directory, because + path. The optional DIR value can be + + "auto", automatically use pkg-config's library directory, or + + "libdir", use a ${libdir}/pkgconfig (based on the configuration), or + + a directory path, i.e., beginning with "/". + + The configure script allows only a single directory, because that is used as the directory in which to install ".pc" files. The automatic check for the library path prefers the first directory @@ -1158,12 +1206,6 @@ CONFIGURE OPTIONS: default), or if pkg-config lists nothing suitable, the first one which is listed by pkg-config is used. - Automatic selection is overridden by providing an option-value - beginning with "/". - - If this option is omitted, the default directory for installing - ".pc" files is ${libdir}/pkgconfig - --with-profile Generate profile-libraries These are named by adding "_p" to the root, e.g., libncurses_p.a @@ -1222,6 +1264,10 @@ CONFIGURE OPTIONS: This is normally chosen automatically based on the type of system which you are building on. We use it for testing the configure script. + --with-strip-program=XXX + When stripping executables during install, use the specified program + rather than "strip". + --with-sysmouse use FreeBSD sysmouse interface provide mouse support on the console. @@ -1236,7 +1282,7 @@ CONFIGURE OPTIONS: Specify a search-list of terminfo directories which will be compiled into the ncurses library (default: DATADIR/terminfo) - This is a colon-separated list, like the TERMINFO_DIRS environment + This is a colon-separated list, like the $TERMINFO_DIRS environment variable. --with-termlib[=XXX] @@ -1312,11 +1358,9 @@ CONFIGURE OPTIONS: several builds, some symbols will be listed in the the ".map" files that do not happen to be present in one configuration or another. - The sample ".map" (and ".sym") files are generated using a set of - scripts which build several configurations for each release version, - checking to see which of the "_nc_" symbols can be made local. In - addition to the ncurses libraries and programs, the symbols used - by the "tack" program before version 1.08 are made global. + The sample ".map" (and ".sym") files were generated using a set of + scripts which built several configurations for each release version, + checking to see which of the "_nc_" symbols can be made local. These sample ".map" files will not cover all possible combinations. In some cases, e.g., when using the --with-weak-symbols option, you @@ -1342,7 +1386,8 @@ CONFIGURE OPTIONS: --with-xterm-kbs=XXX Configure xterm's terminfo entries to use either BS (^H, i.e., ASCII backspace) or DEL (^?, or 127). XXX can be BS (or bs, 8) or DEL - (or del, 127). + (or del, 127). If XXX is "auto", the configure script chooses BS or + DEL according to platform defaults. During installation, the makefile and scripts modifies the "xterm+kbs" terminfo entry to use this setting. @@ -1353,10 +1398,10 @@ CONFIGURE OPTIONS: --without-curses-h Don't install the ncurses header with the name "curses.h". Rather, - install as "ncurses.h" and modify the installed headers and manpages + install as "ncurses.h" and modify the installed headers and man pages accordingly. - Likewise, do not install an alias "curses" for the ncurses manpage. + Likewise, do not install an alias "curses" for the ncurses man page. --without-cxx XSI curses declares "bool" as part of the interface. C++ also declares @@ -1379,18 +1424,13 @@ CONFIGURE OPTIONS: Do not use dlsym() to load GPM dynamically. --without-manpages - Tell the configure script to suppress the install of ncurses' manpages. + Tell the configure script to suppress the install of ncurses' man pages. --without-progs Tell the configure script to suppress the build of ncurses' application programs (e.g., tic). The test applications will still be built if you type "make", though not if you simply do "make install". - --without-tack - Suppress build/install with tack program, if it happens to be - in the same build-tree (tack was moved out of the ncurses source-tree - in 20070203). - --without-tests Tell the configure script to suppress the build of ncurses' test programs. @@ -1416,6 +1456,35 @@ COMPATIBILITY WITH OLDER RELEASES: you may encounter when building a system with different versions of ncurses: + 6.5 (Apt 27, 2024) + Interface changes: + + + the WINDOW structure and some related internal data types declared + in have been made opaque by default; + + the FORM, MENU, and PANEL structures and related internal data types + from their corresponding header files have been made opqaue by + default; and + + support for wide characters is now enabled by default. + + Added extensions: + + + is_cbreak, is_echo, is_nl, and is_raw, as well as "_sp" variants + + + tiparm_s and tiscan_s + + Added internal functions (other than "_sp" variants): + + + _nc_env_access + + Removed internal functions: + + + none + + Modified internal functions: + + + These now pass a const parameter: _nc_delink_entry, _nc_str_copy, + and _nc_trans_string + 6.4 (Dec 31, 2022) Interface changes: @@ -2231,10 +2300,10 @@ FOR SYSTEM INTEGRATORS: Naming the Console Terminal In various systems there has been a practice of designating the system - console driver type as `console'. Please do not do this! It + console driver type as 'console'. Please do not do this! It complicates peoples' lives, because it can mean that several different terminfo entries from different operating systems all logically want to - be called `console'. + be called 'console'. Please pick a name unique to your console driver and set that up in the /etc/inittab table or local equivalent. Send the entry to the @@ -2472,4 +2541,4 @@ BUG REPORTS: The Hacker's Guide in the doc directory includes some guidelines on how to report bugs in ways that will get them fixed most quickly. --- vile:txtmode +-- vile:txtmode fc=78 diff --git a/MANIFEST b/MANIFEST index 1156b49e..9e506b48 100644 --- a/MANIFEST +++ b/MANIFEST @@ -343,7 +343,7 @@ ./doc/html/announce.html ./doc/html/hackguide.html ./doc/html/index.html -./doc/html/man/adacurses6-config.1.html +./doc/html/man/adacursesw6-config.1.html ./doc/html/man/captoinfo.1m.html ./doc/html/man/clear.1.html ./doc/html/man/curs_add_wch.3x.html @@ -464,7 +464,7 @@ ./doc/html/man/mitem_value.3x.html ./doc/html/man/mitem_visible.3x.html ./doc/html/man/ncurses.3x.html -./doc/html/man/ncurses6-config.1.html +./doc/html/man/ncursesw6-config.1.html ./doc/html/man/new_pair.3x.html ./doc/html/man/panel.3x.html ./doc/html/man/resizeterm.3x.html @@ -1012,7 +1012,7 @@ ./package/debian-mingw/compat ./package/debian-mingw/control ./package/debian-mingw/copyright -./package/debian-mingw/mingw32-ncurses6.lintian-overrides +./package/debian-mingw/mingw32-ncurses6td.lintian-overrides ./package/debian-mingw/rules ./package/debian-mingw/source/format ./package/debian-mingw/watch @@ -1020,7 +1020,7 @@ ./package/debian-mingw64/compat ./package/debian-mingw64/control ./package/debian-mingw64/copyright -./package/debian-mingw64/mingw64-ncurses6.lintian-overrides +./package/debian-mingw64/mingw64-ncurses6td.lintian-overrides ./package/debian-mingw64/rules ./package/debian-mingw64/source/format ./package/debian-mingw64/watch @@ -1028,10 +1028,10 @@ ./package/debian/compat ./package/debian/control ./package/debian/copyright -./package/debian/ncurses6.lintian-overrides -./package/debian/ncurses6.triggers -./package/debian/ncursest6.lintian-overrides -./package/debian/ncursest6.triggers +./package/debian/ncurses6td.lintian-overrides +./package/debian/ncurses6td.triggers +./package/debian/ncursest6td.lintian-overrides +./package/debian/ncursest6td.triggers ./package/debian/rules ./package/debian/source/format ./package/debian/watch @@ -1218,6 +1218,7 @@ ./test/test_addwstr.c ./test/test_arrays.c ./test/test_delwin.c +./test/test_endwin.c ./test/test_get_wstr.c ./test/test_getstr.c ./test/test_instr.c diff --git a/NEWS b/NEWS index bc5be49f..0b8280cd 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,5 @@ ------------------------------------------------------------------------------- --- Copyright 2018-2022,2023 Thomas E. Dickey -- +-- Copyright 2018-2024,2025 Thomas E. Dickey -- -- Copyright 1998-2017,2018 Free Software Foundation, Inc. -- -- -- -- Permission is hereby granted, free of charge, to any person obtaining a -- @@ -26,7 +26,7 @@ -- sale, use or other dealings in this Software without prior written -- -- authorization. -- ------------------------------------------------------------------------------- --- $Id: NEWS,v 1.3919 2023/03/12 00:14:16 tom Exp $ +-- $Id: NEWS,v 1.4257 2025/03/01 21:57:13 tom Exp $ ------------------------------------------------------------------------------- This is a log of changes that ncurses has gone through since Zeyd started @@ -46,6 +46,722 @@ See the AUTHORS file for the corresponding full names. Changes through 1.9.9e did not credit all contributions; it is not possible to add this information. +20250301 + + add color to vt525 (Branden Robinson) + + add vt520-w and vt525-w (Branden Robinson) + + improve formatting/style of manpages (patches by Branden Robinson). + + improve configurability of alloca() as used in Windows ports. + + fix some typos in manpages. + + modify configure script checks for stdbool.h to fix build with older + gcc version. + +20250222 + + modify treatment of "n" parameter for waddnstr, waddnwstr, and + wins_nwstr to return OK when "n" is zero, for consistency with other + implementations (report by Benjamin Barenblat, cf: 20231118). + + formatting improvements for terminfo.5 (Debian #1096164). + +20250216 + + add limit-checks in alloc_entry.c and alloc_ttype.c to avoid indexing + errors when using infocmp to compare all capabilities when processing + a malformed terminfo binary which has a valid header (testcase by + "Ekkosun"). + +20250215 + + add gzip option for suppressing filename/timestamp information to an + overlooked case (cf: 20240330). + + correct spelling errors found with codespell. + + fix some typos in manpages (report by Sven Joachim) + + amend change to lib_set_term.c to work with thread configuration + (report by Rajeev Pillai, cf: 20250208). + +20250208 + + change etip.h.in to include either/both of and , + needed for another old BSD. + + update st (report by Alexander Kashpir) -TD + + add note for ghostty 1.1.0 -TD + + fix a few issues found with coverity. + +20250201 + + add to the possible headers declaring the C++ std::bad_alloc + (report by Carl Hansen). + + modify check for stdbool.h to be more conservative in case the + headers are used with a compiler other than that which was used to + configure (Redhat #2342514). + + improve MKlib_gen.sh handling of "bool" type, for building link_test + + improve formatting/style of manpages (patches by Branden Robinson). + +20250125 + + improve error-handling in c++ binding (report by Mingjie Shen). + + strict compiler-warning fixes for upcoming gcc15 + +20250118 + + improve pattern used for configure --with-xterm-kbs option (report by + Mingyu Wang) + + update configure macros, from work on cdk and dialog. + + change a parameter name in curs_sp_funcs.3x, for consistency (patch + by "WHR"). + > patches by Branden Robinson: + + improve formatting/style of manpages + + change winwstr() to a generated function, using the macro definition, + moving its handling of negative length parameter into winnwstr(). + + correct actual-function name in a few trace calls. + +20250111 + + add check for infinite loop in tic's use-resolution. + + increase limit on use-clauses from 32 to 40, warn but allow entries + which exceed the old limit. + + add some null-pointer checks after mallocs in test-programs. + +20250104 + + modify tput to warn about capabilities which expect parameters where + none are given; also repair the feature where multiple capabilities + can be handled on a single line. + + cleanup use-clauses -TD + + add linux+lockeys, xterm+r5+lockeys, xterm+r5+fkeys -TD + + add vt220+ufkeys, vt220+sfkeys + + revert man/manlinks.sed change, which loses aliases (cf: 20241228). + + modify MKlib_gen.c to allow for Solaris's definition of NULL as 0L + +20241228 + + correct conditional-compile for a case when the C compiler does not + have a bool type. + + add ghostty -TD + > patches by Branden Robinson: + + add comments to generated term.h to hint the configure options used + + use same subdir-convention for term.h, in configure script + + improve formatting/style of manpages + +20241221 + + modify ncurses/tinfo/MKfallback.sh to work with MacOS sed, which + lacks BSD-style \< and \> + + trim padding from sgr expression used in trim_sgr0, to avoid copying + the padding into the resulting sgr0 (report by Rajeev Pillai). + + strict compiler-warning fixes for upcoming gcc15 + +20241214 + + avoid redefining bool in curses.h if the platform already supports + that type (cf: 20241123). + + move include from etip.h.in to cursesw.h, to work around + breakage in Apple's port of ncurses. + + strict compiler-warning fixes for upcoming gcc15 + +20241207 + + strict compiler-warning fixes for upcoming gcc15 + +20241130 + + improve configure check for lint program. + + adjust options in test-programs to allow for consistent use of -c/-l + for command/logging. + + modify win_driver.c for MinGW to handle shift-tab and control-tab as + back-tab (report by Axel Reinhold) + +20241123 + + remove dependency on stdbool.h from configure script check for type + of bool when C++ binding is omitted (report by Sam James). + + compiler-warning fixes + +20241109 + + work around musl header ifdef's (report by Urs Jansen, cf: Gentoo + #920266). + + improve error-reporting in write_entry.c (report by Changqing Li). + + remove unused #include from DJGPP configuration (report by Stas + Sergeev). + + workaround/fix issues from clang-analyze + +20241102 + + remove djgpp-specific initialization to binary mode (report/patch by + Stas Sergeev). + + add extended-keys for djgpp 2.05 -TD + +20241026 + + update ms-terminal -TD + + add ms-terminal-direct -TD + + correct dimensions in test/popup_msg.c, fixing an overrun (patch by + Stas Sergeev, cf: 20211219). + +20241019 + + fixes for compiler warnings/cppcheck. + + build-fixes for DJGPP configuration (patches by Stas Sergeev) + +20241006 + + fixes for compiler warnings/cppcheck. + + use xterm+alt+title in wezterm -TD + +20240928 + + improve error-message from infocmp when a terminal entry cannot be + opened (patch by Branden Robinson). + + improve filtering of -L options in misc/gen-pkgconfig.in and in + misc/ncurses-config.in + + add check in wresize() for out-of-range dimensions (report by Peter + Bierma). + +20240922 + + add a few null-pointer checks in ncurses + + improve test-driver in ncurses/link_test.c + + restore background character in manpages as described in X/Open + Curses section 3.3.6, and add option "-c" to test programs to + illustrate a non-blank character in the window background property. + + improve formatting/style of manpages (patches by Branden Robinson). + + modify ncurses*-config to add -I option in --cflag where needed for + --disable-overwrite to match ".pc" files. + + disallow directories and block/character devices in safe-open. + + amend scr_restore() and scr_init() to remove the target window only + after validating the source window which will replace the target + (report by Zixi Liu). + +20240914 + + modify _nc_flush() to also flush stderr to help the flash capability + to work in bash (patch by Harm te Hennepe, cf: 20201128) + + omit -g and -fXXX flags from CFLAGS in misc/ncurses-config.in + + improve formatting/style of manpages (patches by Branden Robinson). + + improve examples in NCURSES-Programming-HOWTO.html + + update comments in terminfo.src -TD + +20240831 + + build-fix for a case in msys2 where gettimeofday() was available but + the fallback was partly configured. + > patch by Rafael Kitover: + + separate the _NC_WINDOWS platform macro into _NC_WINDOWS_NATIVE, + for MinGW and other native Win32 support, and _NC_WINDOWS, to make + some Win32 features available under the Cygwin runtime, in this case + the term-driver. + + make some minor adjustments to allow + ./configure --enable-term-driver + to also work on Cygwin platforms such as Cygwin and MSYS2. + +20240824 + + modify infocmp and tabs to use actual name in usage and header. + + modify test/demo_keyok.c to accept ^Q for quit, for consistency. + +20240817 + + review/update foot for 1.18.1 -TD + + add a note about DomTerm 3.2.0 -TD + + add new glob-expressions variables to list in config.status script + (patch by Werner Fink). + + add --enable-install-prefix to modify behavior of $DESTDIR to merge + or replace the value set by --prefix (adapted from suggestion by + Eli Zaretskii). + +20240810 + + modify misc/Makefile.in and misc/run_tic.in so that $DESTDIR is set + and used only in the makefile. + + modify CF_WITH_PKG_CONFIG_LIBDIR to allow for pkg-config using + DOS/Windows pathname syntax (report by Eli Zaretskii). + + improve glob-expressions in configure script + + remove unused Get_Menu_Screen() macro from menu.priv.h + + update config.guess, config.sub + +20240727 + + improve formatting/style of manpages (patches by Branden Robinson). + + fixes for compiler warnings/cppcheck. + + modify wattron/wattroff calls in form/m_post.c to call wattr_on and + wattr_off to omit cast used in the former for X/Open compatibility + (patch by Bill Gray). + + modify wezterm, omitting its broken left/right margin feature (report + by Thayne McCombs) -TD + +20240720 + + improve formatting/style of manpages (patches by Branden Robinson). + + modify configure script and misc/Makefile to accept glob expressions + that include Windows/DOS drive-letters (report by Eli Zaretskii). + + fix misspelled ifdef and correct return-value of _nc_mingw_tcflush in + win_driver.c (report/patch by Eli Zaretskii). + +20240713 + + modify misc/ncurses-config.in, improved match with pkg-config output. + +20240706 + + update configure script to use macro changes from dialog. + + modify CF_NCURSES_PTHREADS to avoid equating package and library + names. + +20240629 + + build-fix for ncurses-examples with newer PDCurses, which no longer + has stubs for unimplemented features. + + add help-popup for test_instr.c, test_inwstr.c + + modify checks in delwin to avoid checking if the window is a pad + until first checking if it is still on the active window-list + (cf: 20211115). + + improve -t option of test/gdc.c, allowing hours only, or hours and + minutes only. + +20240622 + + improve test/gdc.c (patch by Branden Robinson). + + improve formatting/style of manpages (patches by Branden Robinson). + + adjust naming of mingw *-config scripts to match the pkg-config names + + widen pattern in pc/*-config scripts to disallow more linker options + + add --cflags-only-I and --cflags-only-other options to + misc/ncurses-config.in + + revert change to CF_BUILD_CC macro (report by Vassili Courzakis, + cf: 20240518). + +20240615 + + improve formatting/style of manpages (patches by Branden Robinson). + + review/update modules files. + + improve install-rules in Ada95 makefiles (report by Branden Robinson). + + improve formatting/style of manpages in test-directory. + +20240608 + + change winwstr to return wide character count instead of OK (patch + by Branden Robinson). + + improve formatting/style of manpages (patches by Branden Robinson). + + rename testing dpkg's for ncurses6 to resolve a naming conflict with + Debian's ncurses packages. + +20240601 + + improve formatting/style of manpages (patches by Branden Robinson). + + change Ada95/configure to use --with-screen option rather than + --enable-widec, to provide more choices of underlying curses library + +20240525 + + build-fix for configure option --disable-ext-funcs + + improve formatting/style of manpages (patches by Branden Robinson). + + review/update iTerm2 for 3.5.0 -TD + +20240519 + + update Ada95/configure to match change for -DTRACE + + revert change to include/ncurses_defs, which caused build failure if + tracing was not enabled (report by Branden Robinson). + +20240518 + + improve formatting/style of manpages (patches by Branden Robinson). + + move makefile's -DTRACE into include/ncurses_cfg.h, to simplify use + of CFLAGS/CPPFLAGS. + + improve check for clock_gettime(), from xterm. + + modify configure script to work around broken gnatgcc script found in + gcc-13 builds. + +20240511 + + improve formatting/style of manpages (patches by Branden Robinson). + + limit value from ESCDELAY environment variable to 30 seconds, like + other delay limits. + + limit values from LINES and COLUMNS environment variables to 512 + (report by Miroslav Lichvar). + +20240504 + + update ncurses/wcwidth.c, for MinGW ports, from xterm. + + trim obsolete comment about tack from INSTALL. + +20240427 6.5 release for upload to ftp.gnu.org + + update announcement + + fixes/corrections for manpages (patches by Branden Robinson). + + fix redefinition of CASTxPTR, for legacy Unix. + +20240420 + + improve formatting/style of manpages (patches by Branden Robinson). + + compiler warning/portability fixes. + +20240414 + + build/bug-fix for check-size feature (reports by Sam James, Gabriele + Balducci). + +20240413 + + improve formatting/style of manpages (patches by Branden Robinson). + + provide for padding in check-size feature, using new_prescr() to + pass interim SCREEN pointer. + + complete change for opaque options (Gentoo #928973, cf: 20231021). + + update package /debian/rules and related lintian overrides + + revise progs.priv.h to provide for NC_ISATTY reuse + +20240330 + + remove masking of ISIG in cbreak() (report by Benno Schulenberg). + + modify test/test_mouse.c to use curses api for raw/noraw. + > improved configure macros from other program development: + + build-fix for clang on Solaris + + suppress filename/timestamp in gzip'd manpages (suggested for + byacc by Andrin Geiger) + +20240323 + + modify tput/tset reset feature to avoid 1-second sleep if running in + a pseudo-terminal. + + modify check-size feature to avoid using it in a pseudoterminal + (cf: 20231016) + + improve formatting/style of manpages (patches by Branden Robinson). + + trim a space after some "-R" options, fixing builds for applications + built using clang and ncurses on Solaris. + +20240309 + + modify xgterm to work around line-drawing bug -TD + + use CSI 3J in vte-2017 (report by Sven Joachim) + +20240302 + + add configure check for MB_LEN_MAX, to provide warning as needed. + + improve formatting/style of manpages (patches by Branden Robinson). + + fix regression in tput which disallowed hex/octal parameters (report + by Werner Fink, cf: 20230408) + + update config.guess, config.sub + +20240224 + + improve man/curs_mouse.3x style (Branden Robinson, Sven Joachim). + + provide for CCHARW_MAX greater than 1 + + eliminate use of PATH_MAX in lib_trace.c + + work around misconfiguration of MacPorts gcc13, which exposes invalid + definition of MB_LEN_MAX in gcc's fallback copy of limits.h (MacPorts + #69374). + +20240217 + + add vt100+noapp, vt100+noapp+pc, xterm+app+pc, xterm+decedit from + xterm #389 -TD + + fix inconsistent description of wmouse_trafo() (Debian #1059778). + + modify wenclose() to handle pads (Debian #1059783). + + improve manpage discussion of mouseinterval() (Debian #1058560). + +20240210 + + compiler-warning fixes, while investigating an optimizer bug in + "gcc (MacPorts gcc13 13.2.0_4+stdlib_flag) 13.2.0" + which results in only the first byte of a multibyte character being + printed to the screen. + +20240203 + + minor changes to tracing and locale-checks. + +20240127 + + amend change to z39-a (report by Sven Joachim). + + use xterm+nopcfkeys, vt52-basic, dec+pp, dec+sl, vt52+arrows, + hp+pfk+cr, klone+acs, klone+color, klone+sgr, ncr160wy50+pp + to trim -TD + + NetBSD-related fixes for x68k and wsvt25 (patch by Thomas Klausner) + +20240120 + + improve formatting/style of manpages (patches by Branden Robinson). + + amend discussion of aliases in tput.1 + + use ansi+sgrbold, ansi+sgrdim, ansi+sgrso, ansi+sgrul, ansi+tabs + ecma+color, ecma+sgr, vt100+4bsd, vt100+pfkeys, vt220+pcedit + xterm+256color, xterm+acs, xterm+nopcfkeys, xterm+pcf2 to trim -TD + + modify configure scripts/makefiles to omit KEY_RESIZE if the + corresponding SIGWINCH feature is disabled. + +20240113 + + improve formatting/style of manpages (patches by Branden Robinson). + + modify dist.mk to avoid passing developer's comments in manpages into + the generated html documentation. + + use ansi+local, ansi+local1, ansi+pp, ansi+rca, ansi+rca2, ansi+sgr + to trim -TD + + restore padding for wy520* and vt320-k311 (report by Sven Joachim). + +20240106 + + use ansi+arrows, ansi+apparrows, ansi+csr, ansi+erase, ansi+idc, + ansi+idc1, ansi+idl, ansi+idl1, ansi+inittabs to trim -TD + + minor manpage formatting changes for consistency. + + modify doc-html test package's install-directory, per lintian. + + add attr_get.3x to man_db.renames.in (patch by Sven Joachim). + +20231230 + + improve formatting/style of manpages (patches by Branden Robinson). + + add ms-vt100-16color, winconsole -TD + + add rio, rio-direct -TD + + add mostlike -TD + + add wezterm, contour -TD + +20231223 + + improve formatting/style of manpages (patches by Branden Robinson). + +20231217 + + improve formatting/style of manpages (patches by Branden Robinson). + + correct an assignment in infocmp "-u" for detecting if a boolean + is unset in a base entry and set in a use'd chunk, i.e., if it was + cancelled. + + modify infocmp "-u" option to not report cancels for strings which + were already cancelled in a use'd chunk. + + join two lines in infotocap.3x to eliminate a spurious "description" + link in installed manpages (report by Sven Joachim). + + fix typo in NEWS (report by Sven Joachim). + +20231209 + + modify infocmp "-u" option to not report cancels in use'd chunks + which are not mentioned in the top-level terminal description. + + remove xterm+sm+1006 from tmux (Debian #1057688). + + used "infocmp -u" to help trim redundant capabilities -TD + + updated man/edit_man.sh to allow for "\%" markers embedded after + bold font escapes in manpage cross-references (Debian #1057651). + + reduce compiler-warnings in configure checks + +20231202 + + correct initial alignment of extended capabilities in infocmp, so + that the "-u" option can be used for more than two terminal types. + + improve formatting/style of manpages, changing environment variables + to italics (patches by Branden Robinson). + +20231125 + + add information about "ttycap", termcap's forerunner, to tset.1 + (patch by Branden Robinson). + + improve formatting/style of manpages, including section reordering + (patches by Branden Robinson). + + modify usage messages in configure script, bracketing optional values + (report by Branden Robinson). + +20231121 + + amend fix for Debian #1055882, correcting nul terminator check in + waddnstr (Debian #1056340). + +20231118 + + improve description of length-parameter and error-returns in several + manpages: curs_addchstr.3x, curs_addstr.3x, curs_addwstr.3x, + curs_in_wch.3x, curs_in_wchstr.3x, curs_inchstr.3x, curs_ins_wstr.3x, + curs_insstr.3x, curs_instr.3x, curs_inwstr.3x + + amend parameter check for entire string versus specific length in + winsnstr() and wins_nwstr() to match Solaris. + + make similar correction to wins_nwstr(). + + correct loop termination condition in waddnstr() and waddnwstr() + (Debian #1055882, cf: 20201205). + +20231111 + + used "infocmp -u" to help trim redundant capabilities -TD + + add limit checks in infocmp needed when processing extended + capabilities with the "-u" option. + + fix inconsistent sort-order in see-also sections of manpages. + + fix a few compiler warnings for Solaris 10. + + modify endwin() to return an error if it is called again without an + intervening screen update (report by Rajeev Pillai, NetBSD #57592). + +20231104 + + modify reset command to avoid altering clocal if the terminal uses a + modem (prompted by discussion with Werner Fink, Michal Suchanek, + OpenSUSE #1201384, Debian #60377). + + build-fixes for --with-caps variations. + + correct a couple of section-references in INSTALL. + +20231028 + + move xterm focus mode 1004 from xterm+sm+1006 into xterm+focus as + fe/fd capabilities, like vim (vim-pr #13440). + + modify --with-pkg-config-libdir option to make "libdir" the default, + as documented, rather than "auto" (report by Branden Robinson). + + improve messages from configure script (patches by Branden Robinson). + +20231021 + + use oldxterm+sm+1006 in vte-2014 (report by Benno Schulenberg) -TD + + add ansi+apparrows -TD + + change defaults for configure opaque and widec options (prompted by + discussion with Branden Robinson). + + minor cleanup of compiler- and manpage-warnings. + +20231016 + + make the recent change to setupterm optional "--enable-check-size" + (Debian #1054022). + +20231014 + + improve formatting/style of manpages (patches by Branden Robinson). + + updated configure script macro CF_XOPEN_SOURCE, for uClibc-ng + + update config.guess, config.sub + +20231007 + + improve loop-limit for get_position(). + + improve manual description of immedok (Debian #1053603). + + fix a few formatting issues with manpages (Debian #1053123). + + improve formatting/style of manpages (patches by Branden Robinson). + +20231001 + + modify setupterm to provide for using ANSI cursor-position report (in + user6/user7 terminfo capabilities) to obtain screensize if neither + environment variables or ioctl is used. The ncurses test-program + with options "-E -T" demonstrates this feature. + + improve error messages in tic (patch by Branden Robinson). + + improve formatting/style of manpages (patches by Branden Robinson). + + modify test/clip_printw.c to optionally test non-wrapped updates. + + fix reallocation loop for vsnprintf() in _nc_sprintf_string() by + copying the va_list variable (patch by Ian Abbott). + +20230923 + + improve formatting of manpages (patches by Branden Robinson). + + amend change to delscreen() to limit the windows which it creates to + just those associated with the screen (report by Frederic Boiteux, + cf: 20220813). + +20230918 + + new tarball/errata (report by Sven Joachim). + +20230917 + + improve formatting of manpages (integrated patches by Branden + Robinson). + + correct limit for name-length in write_entry.c (report/testcase by + Luna Saphie Mittelbach). + + limit delays to 30 seconds, i.e., padding delays in terminfo, as well + as napms() and delay_output() functions. + + improve a few pointer-checks. + + improve parsing in _nc_msec_cost, allowing a single decimal point. + +20230909 + + improve formatting of manpages (patches by Branden Robinson), for + captoinfo.1m and terminfo.5 + > patches by Nicholas Marriott: + + use string-hacks in alloc_entry.c, alloc_type.c and hardscroll.c, + overlooked due to compiler changes in recent OpenBSD releases. + + add "-6" option to ncu2openbsd script. + +20230902 + + improve description of search rules for terminal descriptions in + terminfo manpage (report by Sven Joachim). + +20230826 + + fixes for compiler-warnings. + + update config.guess, config.sub + +20230819 + + various manpage-formatting fixes. + + correct formatting of table header in curs_inopts.3x (Branden + Robinson). + + correct manpage description of panel_hidden (report by Benjamin + Mordaunt). + +20230812 + + add/use putty+cursor to reflect amending of modified cursor-keys in + 2021 -TD + + add ecma+strikeout to putty -TD + + add functions to query tty-flags in SCREEN (request by Bill Gray). + +20230805 + + fix a few manpages needing tbl marker, seen by lintian warning. + + fixes for compiler-warnings. + + minor grammatical fix for manpages (Branden Robinson). + +20230729 + + improve manpages for wgetnstr() and wget_nwstr(). + + modify MinGW configuration to provide for running in MSYS/MSYS2 + shells, assuming ConPTY support (patch by Pavel Fedin). + + add assignment in CF_MAN_PAGES to fill in value for TERMINFO_DIRS in + ncurses, terminfo and tic manpages (patch by Sven Joachim). + +20230722 + + add "auto" default for --with-xterm-kbs configure option. + +20230715 + + correct wadd_wch_literal() when adding a non-spacing character to a + double-width character. + + improve manual page for curs_util. + + improve manual page for wadd_wch(). + +20230708 + + add linux+kbs for terminals which imitate xterm's behavior with + Linux -TD + + modify MinGW driver to return KEY_BACKSPACE when an unmodified + VK_BACK virtual key is entered (prompted by patch by Pavel Fedin, + Savannah #64292). + + disallow using $TERMINFO or $HOME/.terminfo when tic "-o" option is + used (report by Sven Joachim, Debian #1040048). + +20230701 + + fix mandoc warnings about unnecessary markup. + + improve parameter check in tparm_setup() + +20230625 + + adjust man/make_sed.sh to work with dates as the third field of TH. + + fixes for out-of-memory condition (report by "eaglegai"). + +20230624 + + fixes for out-of-memory condition (report by "eaglegai"). + +20230617 + + markup manpages with revision information (prompted by discussion + with Bjarni Ingi Gislason). + +20230615 + + modify _nc_read_file_entry() to show relevant filename in warnings. + + improve checks in convert_string() for corrupt terminfo entry (report + and test-case by Gregory James Duck). + +20230610 + + improve manpages discussing file descriptors in low-level functions. + + modify flushinp to use file descriptors in SCREEN, rather than from + TERMINAL, and check if they are for a terminal, like SVr4. + + modify mcprint to use file descriptor in SCREEN, for consistency. + + add xterm+focus to foot+base (patch by Daniel Ekloef). + + correct definition of Charable() for non-wide ncurses library (report + and test-case by Zbigniew Baniewski). + +20230603 + + add configure option --with-strip-program, to override program + chosen by the install program for stripping executables (prompted + by discussion with Aapo Rantalainen). + + fix typo in INSTALL (report/patch by Aapo Rantalainen). + + improve error-checks for isEILSEQ() + + increase MB_CUR_MAX to 16, matching glibc's MB_LEN_MAX. + + corrected mouse mask in test/testcurs.c + + improve thread lock in lib_trace.c + +20230527 + + fixes for compiler warnings/cppcheck. + +20230520 + + fixes for compiler warnings in MinGW environments. + +20230514 + + modify test-package "ncurses6-doc" to use manpage-aliases, which in + turn required a change to the configure script to factor in the + extra-suffix option when deriving alias names. + + add mode 1004 to xterm+sm+1006 from xterm #380 -TD + +20230506 + > build-fixes related to configure-options and/or platform: + + fix for --enable-fvisibility + + fix for unusual values of --with-rel-version + + fix for unusual values of --with-abi-version + + fix for --disable-tcap-names + + fix for termcap in nc_access.h (report by Werner Fink). + +20230429 + + revise recent change to _nc_write_entry to isolate it to a Cygwin bug + (cf: 20230311) + + amend fix for wgetnstr, wgetn_wstr to use cbreak mode unless raw + mode was set (cf: 20210522). + + fix a few warnings from cppcheck, etc. + + correct copy/paste error in nc_access.h (report by Werner Fink). + +20230424 + + check return value of _nc_save_str(), in special case for tic where + extended capabilities are processed but the terminal description was + not initialized (report by Ziqiao Kong). + + regenerate llib-* files. + +20230423 + + add tiscan_s() to help applications check formatting capabilities + that would be passed to tiparm_s, etc. + + add tiparm_s() to provide applications a way to tell ncurses what + the expected parameters are for a capability (tmux #3531). + + improve check in lib_tparm.c, ensuring that a char* fits into a + TPARM_ARG. + + add --disable-setuid-environ configure option (request by Sven + Joachim). + + drop compatibility with obsolete versions of tack, e.g., pre-1.08 + (Debian #1034549, cf: 20170722). + +20230418 + + improve checks for limits on privileged execution: + + modify _nc_syserr_abort() to use _nc_env_access(), rather than + only checking root uid. + + use getauxval() when available, to improve setuid/setgid checks. + + modify test packages to disable root access/environ options. + + modify tgoto() to accept no-parameter capabilities, for joe editor + (OpenSUSE #1210485, Gentoo #904263). + +20230415 + + configure script fixes: + + fix copy/paste error in configure option --disable-root-access + (report/patch by Sven Joachim). + + modify CF_XOPEN_SOURCE macro's amend default case to avoid + undefining _XOPEN_SOURCE if _POSIX_C_SOURCE is defined. + + modify test_tparm to account for extended capabilities. + + add checks in tparm() and tiparm() for misuse of numeric parameters, + overlooked in 20230408. + + fix errata in clear.1 and curs_terminfo.3x + +20230408 + + document limitations of tparm, and error-returns in curs_terminfo.3x + + document limitations of tgoto, and error-returns in curs_termcap.3x + + add xterm+focus to alacritty+common (patch by Christian Duerr). + + add "-v" option to tput, to show warnings. + > improve checks for malformed terminfo data (report/analysis by + Jonathan Bar Or, Michael Pearse, Emanuele Cozzi). + + make the parameter type/count checks in _nc_tiparm() more stringent + + update tgoto() to account for _nc_tiparm() changes + + add checks in tparm() and tiparm() for misuse of string parameters + + add special cases in tput to handle extensions Cs/Ms parameters + + ignore compiled-terminfo where the array sizes exceed the standard + +20230401 + + modify experimental Windows driver to work with xterm mouse protocol. + + remove DECCOLM+DECSCLM from foot (patch by Daniel Ekloef). + 20230311 + improve manpage description for addch versus unctrl format used for non-printable characters. @@ -3843,7 +4559,7 @@ it is not possible to add this information. 20140621 + change shared-library suffix for AIX 5 and 6 to ".so", avoiding conflict with the static library (report by Ben Lentz). - + document RPATH_LIST in INSTALLATION file, as part of workarounds for + + document RPATH_LIST in INSTALL file, as part of workarounds for upgrading an ncurses library using the "--with-shared" option. + modify test/ncurses.c c/C tests to cycle through subsets of the total number of colors, to better illustrate 8/16/88/256-colors by @@ -5344,7 +6060,7 @@ it is not possible to add this information. function pointer passed to tputs(). + modify init_pair() to accept -1's for color value after assume_default_colors() has been called (Debian #337095). - + modify test/background.c, adding commmand-line options to demonstrate + + modify test/background.c, adding command-line options to demonstrate assume_default_colors() and use_default_colors(). 20110416 @@ -10211,7 +10927,7 @@ it is not possible to add this information. wide-character structures (report by ). + ensure that _XOPEN_SOURCE_EXTENDED is defined in curses.priv.h if compiling for wide-character configuration. - + make addwnstr() handle non-spacing characters (patch by Sven + + make addnwstr() handle non-spacing characters (patch by Sven Verdoolaege). 20010630 @@ -11079,7 +11795,7 @@ it is not possible to add this information. + add mgterm terminfo entry from NetBSD, minor adjustments to sun-ss5, aixterm entries -TD + modify tack/ansi.c to make it more tolerant of bad ANSI replies. An - example of an illegal ANSI resonse can be found using Microsoft's + example of an illegal ANSI response can be found using Microsoft's Telnet client. A correct display can be found using a VT-4xx terminal or XFree86 xterm with: XTerm*VT100*decTerminalID: 450 @@ -11973,7 +12689,7 @@ it is not possible to add this information. + correct a typo in term.7 (Todd C Miller). + add configure --with-shlib-version option to allow installing shared libraries named according to release or ABI versions. This - parameterizes some existing logic in the configure script, and is + parametrizes some existing logic in the configure script, and is intended for compatibility upgrades on Digital Unix, which used versioned libraries in ncurses 4.2, but no longer does (cf: 980425). + resync configure script against autoconf 2.13 + patches diff --git a/README b/README index 84998f23..5587f5b7 100644 --- a/README +++ b/README @@ -1,5 +1,5 @@ ------------------------------------------------------------------------------- --- Copyright 2020,2021 Thomas E. Dickey -- +-- Copyright 2020-2021,2023 Thomas E. Dickey -- -- Copyright 1998-2012,2018 Free Software Foundation, Inc. -- -- -- -- Permission is hereby granted, free of charge, to any person obtaining a -- @@ -26,7 +26,7 @@ -- sale, use or other dealings in this Software without prior written -- -- authorization. -- ------------------------------------------------------------------------------- --- $Id: README,v 1.29 2021/06/17 21:20:30 tom Exp $ +-- $Id: README,v 1.31 2023/10/28 14:49:04 tom Exp $ ------------------------------------------------------------------------------- README file for the ncurses package @@ -35,18 +35,19 @@ See the file INSTALL for instructions on how to build and install ncurses. See the file NEWS for a release history and bug-fix notes. See the file TO-DO for things that still need doing, including known bugs. -Browse the file misc/ncurses-intro.html for narrative descriptions of how +Browse the file doc/html/ncurses-intro.html for narrative descriptions of how to use ncurses and the panel, menu, and form libraries. Browse the file doc/html/hackguide.html for a tour of the package internals. +Find plain text versions of both of these documents in doc/. + ROADMAP AND PACKAGE OVERVIEW: You should be reading this file in a directory called: ncurses-d.d, where d.d is the current version number (see the dist.mk file in this directory for that). There should be a number of subdirectories, including `c++', `form', -`man', `menu', `misc', `ncurses', `panel', `progs', `test', 'tack' and `Ada95'. -(The 'tack' program may be distributed separately). +`man', `menu', `misc', `ncurses', `panel', `progs', `test', and `Ada95'. A full build/install of this package typically installs several libraries, a handful of utilities, and a database hierarchy. Here is an inventory of the @@ -81,7 +82,7 @@ version. If you configure using the --enable-reentrant option, a "t" is appended to the library names (e.g., libncursest.a) and the resulting libraries have a -different binary interface which makes the ncurses interface more "opaque". +different binary interface, making the ncurses interface more opaque. The ncurses libraries implement the curses API. The panel, menu and forms libraries implement clones of the SVr4 panel, menu and forms APIs. The source @@ -89,9 +90,9 @@ code for these lives in the `ncurses', `panel', `menu', and `form' directories respectively. In the `c++' directory, you'll find code that defines an interface to the -curses, forms, menus and panels library packaged as C++ classes, and a demo program in C++ -to test it. These class definition modules are not installed by the 'make -install.libs' rule as libncurses++. +curses, forms, menus and panels library packaged as C++ classes, and a demo +program in C++ to test it. These class definition modules are not installed +by the 'make install.libs' rule as libncurses++. In the `Ada95' directory, you'll find code and documentation for an Ada95 binding of the curses API, to be used with the GNAT compiler. @@ -102,8 +103,8 @@ for documentation of the binding. To do its job, the ncurses code needs your terminal type to be set in the environment variable TERM (normally set by your OS; under UNIX, getty(1) -typically does this, but you can override it in your .profile); and, it needs a -database of terminal descriptions in which to look up your terminal type's +typically does this, but you can override it in your .profile); and, it needs +a database of terminal descriptions in which to look up your terminal type's capabilities. In older (V7/BSD) versions of curses, the database was a flat text file, @@ -117,10 +118,10 @@ second form. In the `misc' directory, there is a text file terminfo.src, in editable terminfo format, which can be used to generate the terminfo binaries (that's what make install.data does). If the package was built with the ---enable-termcap option enabled, and the ncurses library cannot find a terminfo -description for your terminal, it will fall back to the termcap file supplied -with your system (which the ncurses package installation leaves strictly -alone). +--enable-termcap option enabled, and the ncurses library cannot find a +terminfo description for your terminal, it will fall back to the termcap file +supplied with your system (which the ncurses package installation leaves +strictly alone). The utilities are as follows: @@ -176,8 +177,8 @@ Eric S. Raymond: xterm mouse support, and the ncurses test program. Juergen Pfeifer - The menu and form libraries, C++ bindings for ncurses, menus, forms and - panels, as well as the Ada95 binding. Ongoing support for panel. + The menu and form libraries, C++ bindings for ncurses, menus, forms + and panels, as well as the Ada95 binding. Ongoing support for panel. CONTRIBUTORS: @@ -216,3 +217,5 @@ BUGS: See the INSTALL file for bug and developer-list addresses. The Hacker's Guide in the doc directory includes some guidelines on how to report bugs in ways that will get them fixed most quickly. + +-- vile:txtmode fc=78 diff --git a/VERSION b/VERSION index 2565b033..32d413ba 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -5:0:10 6.4 20230311 +5:0:10 6.5 20250301 diff --git a/aclocal.m4 b/aclocal.m4 index 9a53f26b..9c185a3a 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,5 +1,5 @@ dnl*************************************************************************** -dnl Copyright 2018-2022,2023 Thomas E. Dickey * +dnl Copyright 2018-2024,2025 Thomas E. Dickey * dnl Copyright 1998-2017,2018 Free Software Foundation, Inc. * dnl * dnl Permission is hereby granted, free of charge, to any person obtaining a * @@ -29,7 +29,7 @@ dnl*************************************************************************** dnl dnl Author: Thomas E. Dickey 1995-on dnl -dnl $Id: aclocal.m4,v 1.1037 2023/03/05 19:30:13 tom Exp $ +dnl $Id: aclocal.m4,v 1.1104 2025/02/23 01:49:45 tom Exp $ dnl Macros used in NCURSES auto-configuration script. dnl dnl These macros are maintained separately from NCURSES. The copyright on @@ -67,7 +67,7 @@ $ac_includes_default fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_ABI_DEFAULTS version: 4 updated: 2023/01/07 16:32:06 +dnl CF_ABI_DEFAULTS version: 5 updated: 2023/10/21 08:54:23 dnl --------------- dnl Provide configure-script defaults for different ncurses ABIs. AC_DEFUN([CF_ABI_DEFAULTS],[ @@ -88,9 +88,10 @@ cf_dft_opaque_curses=no cf_dft_ordinate_type=short cf_dft_signed_char=no cf_dft_tparm_arg=long +cf_dft_widec=no cf_dft_with_lp64=no -# ABI 6 defaults: +# ABI 6 default differences from ABI 5: case x$cf_cv_abi_default in (x[[6789]]) cf_dft_chtype=uint32_t @@ -102,17 +103,18 @@ case x$cf_cv_abi_default in cf_dft_filter_syms=yes cf_dft_interop=yes cf_dft_mmask_t=uint32_t + cf_dft_opaque_curses=yes cf_dft_tparm_arg=intptr_t + cf_dft_widec=yes cf_dft_with_lp64=yes ;; esac -# ABI 7 defaults: +# ABI 7 default differences from ABI 6: case x$cf_cv_abi_default in (x[[789]]) cf_dft_ccharw_max=6 cf_dft_mmask_t=uint64_t - cf_dft_opaque_curses=yes cf_dft_ordinate_type=int cf_dft_signed_char=yes # also: remove the wgetch-events feature in ABI 7 @@ -596,54 +598,25 @@ AC_DEFUN([CF_AWK_BIG_PRINTF], esac ])dnl dnl --------------------------------------------------------------------------- -dnl CF_BOOL_DECL version: 8 updated: 2004/01/30 15:51:18 +dnl CF_BOOL_DECL version: 11 updated: 2025/02/22 20:49:45 dnl ------------ -dnl Test if 'bool' is a builtin type in the configured C++ compiler. Some +dnl Test if 'bool' is a builtin type in the configured C/C++ compiler. Some dnl older compilers (e.g., gcc 2.5.8) don't support 'bool' directly; gcc dnl 2.6.3 does, in anticipation of the ANSI C++ standard. dnl -dnl Treat the configuration-variable specially here, since we're directly -dnl substituting its value (i.e., 1/0). -dnl dnl $1 is the shell variable to store the result in, if not $cv_cv_builtin_bool AC_DEFUN([CF_BOOL_DECL], [ -AC_MSG_CHECKING(if we should include stdbool.h) - -AC_CACHE_VAL(cf_cv_header_stdbool_h,[ - AC_TRY_COMPILE([],[bool foo = false], - [cf_cv_header_stdbool_h=0], - [AC_TRY_COMPILE([ -#ifndef __BEOS__ -#include -#endif -],[bool foo = false], - [cf_cv_header_stdbool_h=1], - [cf_cv_header_stdbool_h=0])])]) - -if test "$cf_cv_header_stdbool_h" = 1 -then AC_MSG_RESULT(yes) -else AC_MSG_RESULT(no) -fi - -AC_MSG_CHECKING([for builtin bool type]) - -AC_CACHE_VAL(ifelse($1,,cf_cv_builtin_bool,[$1]),[ +AC_REQUIRE([CF_C99_STDBOOL_H]) +AC_CACHE_CHECK(for builtin bool type, ifelse($1,,cf_cv_builtin_bool,[$1]),[ AC_TRY_COMPILE([ -#include -#include -],[bool x = false], - [ifelse($1,,cf_cv_builtin_bool,[$1])=1], - [ifelse($1,,cf_cv_builtin_bool,[$1])=0]) - ]) - -if test "$ifelse($1,,cf_cv_builtin_bool,[$1])" = 1 -then AC_MSG_RESULT(yes) -else AC_MSG_RESULT(no) -fi +$ac_includes_default +],[bool x = false; (void)x], + [ifelse($1,,cf_cv_builtin_bool,[$1])=yes], + [ifelse($1,,cf_cv_builtin_bool,[$1])=no])]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_BOOL_SIZE version: 20 updated: 2023/02/18 17:41:25 +dnl CF_BOOL_SIZE version: 22 updated: 2025/02/22 20:49:45 dnl ------------ dnl Test for the size of 'bool' in the configured C++ compiler (e.g., a type). dnl Don't bother looking for bool.h, since it has been deprecated. @@ -652,6 +625,7 @@ dnl If the current compiler is C rather than C++, we get the bool definition dnl from . AC_DEFUN([CF_BOOL_SIZE], [ +AC_REQUIRE([CF_C99_STDBOOL_H]) AC_CHECK_SIZEOF(bool,,[ $ac_includes_default @@ -667,7 +641,7 @@ $ac_includes_default #else -#if $cf_cv_header_stdbool_h +#if $USE_STDBOOL_H #include #endif @@ -691,7 +665,7 @@ $ac_includes_default #else -#if $cf_cv_header_stdbool_h +#if $USE_STDBOOL_H #include #endif @@ -700,7 +674,7 @@ $ac_includes_default int main(void) { FILE *fp = fopen("cf_test.out", "w"); - if (fp != 0) { + if (fp != NULL) { bool x = true; if ((bool)(-x) >= 0) fputs("unsigned ", fp); @@ -739,7 +713,7 @@ if test "$cf_cv_type_of_bool" = unknown ; then fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_BUILD_CC version: 11 updated: 2022/12/04 15:40:08 +dnl CF_BUILD_CC version: 14 updated: 2024/12/14 11:58:01 dnl ----------- dnl If we're cross-compiling, allow the user to override the tools and their dnl options. The configure script is oriented toward identifying the host @@ -817,7 +791,7 @@ if test "$cross_compiling" = yes ; then AC_TRY_RUN([#include int main(int argc, char *argv[]) { - ${cf_cv_main_return:-return}(argc < 0 || argv == 0 || argv[0] == 0); + ${cf_cv_main_return:-return}(argc < 0 || argv == (void*)0 || argv[0] == (void*)0); } ], cf_ok_build_cc=yes, @@ -894,6 +868,27 @@ AC_SUBST(HAVE_STDNORETURN_H) AC_SUBST(STDC_NORETURN) ])dnl dnl --------------------------------------------------------------------------- +dnl CF_C99_STDBOOL_H version: 1 updated: 2025/02/22 20:49:45 +dnl ---------------- +dnl Check if we can compile using and get a valid "bool" type. +AC_DEFUN([CF_C99_STDBOOL_H], +[ +AC_CACHE_CHECK(if we can include stdbool.h,cf_cv_header_stdbool_h,[ + AC_TRY_COMPILE([ +$ac_includes_default +#include +],[bool foo = false; (void)foo], + [cf_cv_header_stdbool_h=yes], + [AC_TRY_COMPILE([],[bool foo = false; (void)foo], + [cf_cv_header_stdbool_h=no])])]) + +if test "$cf_cv_header_stdbool_h" = yes +then USE_STDBOOL_H=1 +else USE_STDBOOL_H=0 +fi +AC_SUBST(USE_STDBOOL_H) +])dnl +dnl --------------------------------------------------------------------------- dnl CF_CC_ENV_FLAGS version: 11 updated: 2023/02/20 11:15:46 dnl --------------- dnl Check for user's environment-breakage by stuffing CFLAGS/CPPFLAGS content @@ -1194,7 +1189,7 @@ __attribute__ ((visibility("default"))) int somefunc() {return 42;} ]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_CHECK_GETENV version: 3 updated: 2023/01/05 17:47:56 +dnl CF_CHECK_GETENV version: 5 updated: 2024/12/14 16:09:34 dnl --------------- dnl Check if repeated getenv calls return the same pointer, e.g., it does not dnl discard the previous pointer when returning a new one. @@ -1246,7 +1241,7 @@ int main(void) for (j = 0; environ[j]; ++j) { mynames[j] = str_alloc(environ[j]); equals = strchr(mynames[j], '='); - if (equals != 0) { + if (equals != NULL) { *equals++ = '\\0'; myvalues[j] = str_alloc(equals); } else { @@ -1271,7 +1266,7 @@ int main(void) } } } while (found); - sprintf(value, "%lu:%p", (unsigned long) k, &mynames[j]); + sprintf(value, "%lu:%p", (unsigned long) k, (void*)&mynames[j]); set_value(name, value); mynames[j] = str_alloc(name); myvalues[j] = str_alloc(value); @@ -1409,7 +1404,7 @@ then fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_CHECK_LIBTOOL_VERSION version: 2 updated: 2021/05/01 16:24:34 +dnl CF_CHECK_LIBTOOL_VERSION version: 3 updated: 2024/06/12 04:19:01 dnl ------------------------ dnl Show the version of libtool dnl @@ -1425,6 +1420,7 @@ then AC_MSG_CHECKING(version of $LIBTOOL) CF_LIBTOOL_VERSION AC_MSG_RESULT($cf_cv_libtool_version) + ifdef([LT_PACKAGE_VERSION],,[ if test -n "$cf_cv_libtool_version" then cf_check_libtool_version=`$LIBTOOL --version 2>&1 | sed -e '/^$/d' -e 's,[[()]],...,g' -e 's,[[ ]],-,g' -e '2,$d'` @@ -1438,12 +1434,26 @@ then else AC_MSG_ERROR(No version found for $LIBTOOL) fi + ]) else AC_MSG_ERROR(GNU libtool has not been found) fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_CHECK_WCHAR_H version: 4 updated: 2023/02/18 17:41:25 +dnl CF_CHECK_TYPE2 version: 2 updated: 2024/12/14 16:33:06 +dnl -------------- +dnl CF_CHECK_TYPE version: 5 updated: 2024/12/14 16:09:34 +dnl ------------- +dnl Check if the given type can be declared via the given header. +dnl $1 = the type to check +dnl $2 = the header (i.e., not one of the default includes) +AC_DEFUN([CF_CHECK_TYPE2],[ + AC_CHECK_TYPES($1,,,[ +$ac_includes_default +ifelse($2,,,[#include <$2>])]) +])dnl +dnl --------------------------------------------------------------------------- +dnl CF_CHECK_WCHAR_H version: 5 updated: 2023/12/03 09:21:34 dnl ---------------- dnl Check if wchar.h can be used, i.e., without defining _XOPEN_SOURCE_EXTENDED AC_DEFUN([CF_CHECK_WCHAR_H],[ @@ -1463,7 +1473,7 @@ $ac_includes_default #endif ],[ wint_t foo = 0; - int bar = iswpunct(foo)], + int bar = iswpunct(foo); (void) bar], [cf_cv_wchar_h_okay=yes], [cf_cv_wchar_h_okay=no])]) @@ -1473,7 +1483,7 @@ then fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_CHECK_WCWIDTH_GRAPHICS version: 3 updated: 2023/01/05 18:01:30 +dnl CF_CHECK_WCWIDTH_GRAPHICS version: 5 updated: 2024/12/14 16:09:34 dnl ------------------------- dnl Most "modern" terminal emulators are based to some degree on VT100, and dnl should support line-drawing. Even with Unicode. There is a problem. @@ -1582,7 +1592,7 @@ int main(void) { FILE *fp; - int value; + unsigned value; char buffer[MY_LEN + 1]; char notes[MY_LEN + 1]; int totals = 0; @@ -1592,15 +1602,15 @@ main(void) setlocale(LC_ALL, "en_US.UTF-8") || setlocale(LC_ALL, "en_US.utf8") || setlocale(LC_ALL, "en_US.utf-8")) { - if ((fp = fopen("conftest.in", "r")) != 0) { - while (fgets(buffer, MY_LEN, fp) != 0) { + if ((fp = fopen("conftest.in", "r")) != NULL) { + while (fgets(buffer, MY_LEN, fp) != NULL) { if (*buffer == '-') { fprintf(stderr, "\\t%s", buffer); } else if (sscanf(buffer, "%x %s", &value, notes) == 2) { ++totals; - if (wcwidth(value) == 1) + if (wcwidth((int)value) == 1) ++passed; - fprintf(stderr, "%d\\t%s", wcwidth(value), buffer); + fprintf(stderr, "%d\\t%s", wcwidth((int)value), buffer); } else { fprintf(stderr, "?\\t%s", buffer); } @@ -1685,7 +1695,7 @@ if test "x$ifelse([$2],,CLANG_COMPILER,[$2])" = "xyes" ; then fi ]) dnl --------------------------------------------------------------------------- -dnl CF_CONST_X_STRING version: 7 updated: 2021/06/07 17:39:17 +dnl CF_CONST_X_STRING version: 9 updated: 2024/12/04 03:49:57 dnl ----------------- dnl The X11R4-X11R6 Xt specification uses an ambiguous String type for most dnl character-strings. @@ -1712,7 +1722,7 @@ CF_SAVE_XTRA_FLAGS([CF_CONST_X_STRING]) AC_TRY_COMPILE( [ -#include +$ac_includes_default #include ], [String foo = malloc(1); free((void*)foo)],[ @@ -1720,9 +1730,10 @@ AC_TRY_COMPILE( AC_CACHE_CHECK(for X11/Xt const-feature,cf_cv_const_x_string,[ AC_TRY_COMPILE( [ +#undef _CONST_X_STRING #define _CONST_X_STRING /* X11R7.8 (perhaps) */ #undef XTSTRINGDEFINES /* X11R5 and later */ -#include +$ac_includes_default #include ],[String foo = malloc(1); *foo = 0],[ cf_cv_const_x_string=no @@ -1745,7 +1756,7 @@ esac ]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_CPP_OVERRIDE version: 1 updated: 2022/08/20 16:07:10 +dnl CF_CPP_OVERRIDE version: 2 updated: 2024/11/09 18:07:29 dnl --------------- dnl Check if the C++ compiler accepts the override keyword. This is a C++-11 dnl feature. @@ -1760,7 +1771,7 @@ AC_CACHE_CHECK(if $CXX accepts override keyword,cf_cv_cpp_override,[ class base { public: - virtual int foo(float x) = 0; + virtual int foo(float x) = 0; }; @@ -2271,7 +2282,7 @@ AC_DEFUN([CF_ERRNO], CF_CHECK_ERRNO(errno) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_ETIP_DEFINES version: 6 updated: 2021/01/02 17:09:14 +dnl CF_ETIP_DEFINES version: 7 updated: 2023/10/28 11:59:01 dnl --------------- dnl Test for conflicting definitions of exception in gcc 2.8.0, etc., between dnl math.h and builtin.h, only for ncurses @@ -2303,7 +2314,7 @@ AC_TRY_COMPILE([ ],[]) done done -AC_MSG_RESULT($cf_result) +AC_MSG_RESULT([${cf_result:-(none)}]) CXXFLAGS="$cf_save_CXXFLAGS" ]) dnl --------------------------------------------------------------------------- @@ -2531,7 +2542,7 @@ fi AC_SUBST(EXTRA_CFLAGS) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_FOPEN_BIN_R version: 3 updated: 2023/01/05 18:05:46 +dnl CF_FOPEN_BIN_R version: 4 updated: 2024/12/14 16:09:34 dnl -------------- dnl Check if fopen works when the "b" (binary) flag is added to the mode dnl parameter. POSIX ignores the "b", which c89 specified. Some very old @@ -2545,14 +2556,14 @@ int main(void) { FILE *fp = fopen("conftest.tmp", "wb"); int rc = 0; - if (fp != 0) { + if (fp != NULL) { int p, q; for (p = 0; p < 256; ++p) { fputc(p, fp); } fclose(fp); fp = fopen("conftest.tmp", "rb"); - if (fp != 0) { + if (fp != NULL) { for (p = 0; p < 256; ++p) { q = fgetc(fp); if (q != p) { @@ -2585,7 +2596,7 @@ unset ac_ct_$1 unset $1 ])dnl dnl --------------------------------------------------------------------------- -dnl CF_FUNC_DLSYM version: 4 updated: 2015/09/12 14:46:44 +dnl CF_FUNC_DLSYM version: 5 updated: 2024/12/14 16:09:34 dnl ------------- dnl Test for dlsym() and related functions, as well as libdl. dnl @@ -2605,9 +2616,12 @@ if test "$cf_have_dlsym" = yes ; then test "$cf_have_libdl" = yes && { CF_ADD_LIB(dl) } AC_MSG_CHECKING(whether able to link to dl*() functions) - AC_TRY_LINK([#include ],[ + AC_TRY_LINK([ + #include + #include + ],[ void *obj; - if ((obj = dlopen("filename", 0)) != 0) { + if ((obj = dlopen("filename", 0)) != NULL) { if (dlsym(obj, "symbolname") == 0) { dlclose(obj); } @@ -2620,19 +2634,36 @@ else fi ]) dnl --------------------------------------------------------------------------- -dnl CF_FUNC_GETTIME version: 2 updated: 2023/02/25 08:45:56 +dnl CF_FUNC_GETTIME version: 3 updated: 2024/05/11 13:40:02 dnl --------------- dnl Check for gettimeofday or clock_gettime. In 2023, the former is still more dnl widely supported, but "deprecated" (2008), so we will use the latter if it dnl is available, to reduce compiler warnings. AC_DEFUN([CF_FUNC_GETTIME],[ -AC_CACHE_CHECK(for clock_gettime,cf_cv_func_clock_gettime,[ - AC_TRY_LINK([#include ], +cf_save_libs="$LIBS" +AC_CHECK_FUNC(clock_gettime, + cf_cv_test_clock_gettime=yes, + AC_CHECK_LIB(rt, clock_gettime, + [LIBS="-lrt $LIBS" + cf_cv_test_clock_gettime=yes], + cf_cv_test_clock_gettime=no)) + +if test "$cf_cv_test_clock_gettime" = yes ; then +AC_CACHE_CHECK(if clock_gettime links,cf_cv_func_clock_gettime,[ + AC_TRY_LINK([ +$ac_includes_default +#include + ], [struct timespec ts; - int rc = clock_gettime(CLOCK_REALTIME, &ts); (void) rc; (void)ts], + int rc = clock_gettime(CLOCK_REALTIME, &ts) + + clock_gettime(CLOCK_MONOTONIC, &ts); + (void) rc; (void)ts], [cf_cv_func_clock_gettime=yes], [cf_cv_func_clock_gettime=no]) ]) +else + cf_cv_func_clock_gettime=no +fi if test "$cf_cv_func_clock_gettime" = yes then @@ -2647,7 +2678,7 @@ AC_CHECK_LIB(bsd, gettimeofday, fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_FUNC_GETTTYNAM version: 2 updated: 2023/01/05 18:06:28 +dnl CF_FUNC_GETTTYNAM version: 3 updated: 2024/12/14 16:09:34 dnl ----------------- dnl Check if the 4.3BSD function getttyname exists, as well as if dnl defines the _PATH_TTYS symbol. If the corresponding file exists, but the @@ -2684,7 +2715,7 @@ $ac_includes_default int main(void) { FILE *fp = fopen(_PATH_TTYS, "r"); - ${cf_cv_main_return:-return} (fp == 0); + ${cf_cv_main_return:-return} (fp == NULL); }], [cf_cv_have_PATH_TTYS=yes], [cf_cv_have_PATH_TTYS=no], @@ -2772,7 +2803,7 @@ int main(void) { test "$cf_cv_func_nanosleep" = "yes" && AC_DEFINE(HAVE_NANOSLEEP,1,[Define to 1 if we have nanosleep()]) ]) dnl --------------------------------------------------------------------------- -dnl CF_FUNC_OPENPTY version: 6 updated: 2021/01/01 13:31:04 +dnl CF_FUNC_OPENPTY version: 7 updated: 2023/12/03 09:21:34 dnl --------------- dnl Check for openpty() function, along with header. It may need the dnl "util" library as well. @@ -2789,6 +2820,7 @@ AC_CACHE_CHECK(for openpty header,cf_cv_func_openpty,[ ],[ int x = openpty((int *)0, (int *)0, (char *)0, (struct termios *)0, (struct winsize *)0); + (void)x; ],[ cf_cv_func_openpty=$cf_header break @@ -2891,19 +2923,29 @@ tcgetattr(1, &foo);], test "$cf_cv_have_tcgetattr" = yes && AC_DEFINE(HAVE_TCGETATTR,1,[Define to 1 if we have tcgetattr]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_FUNC_VSSCANF version: 7 updated: 2021/01/01 13:31:04 +dnl CF_FUNC_VSSCANF version: 8 updated: 2023/12/03 19:09:59 dnl --------------- dnl Check for vsscanf() function, which is in c9x but generally not in earlier -dnl versions of C. It is in the GNU C library, and can often be simulated by -dnl other functions. +dnl versions of C. It can often be simulated by other functions on older +dnl systems (where FILE is not opaque). AC_DEFUN([CF_FUNC_VSSCANF], [ AC_CACHE_CHECK(for vsscanf function or workaround,cf_cv_func_vsscanf,[ AC_TRY_LINK([ #include -#include ],[ +#include + +static void +myfunc(const char *str, const char *fmt, ...) +{ va_list ap; - vsscanf("from", "%d", ap)],[cf_cv_func_vsscanf=vsscanf],[ + va_start(ap, fmt); + vsscanf(str, fmt, ap); + va_end(ap); +} +],[ + myfunc("55", "%d"); +],[cf_cv_func_vsscanf=vsscanf],[ AC_TRY_LINK([ #include #include ],[ @@ -3066,7 +3108,7 @@ CF_INTEL_COMPILER(GCC,INTEL_COMPILER,CFLAGS) CF_CLANG_COMPILER(GCC,CLANG_COMPILER,CFLAGS) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_GCC_WARNINGS version: 41 updated: 2021/01/01 16:53:59 +dnl CF_GCC_WARNINGS version: 43 updated: 2024/12/21 08:44:12 dnl --------------- dnl Check if the compiler supports useful warning options. There's a few that dnl we don't use, simply because they're too noisy: @@ -3180,13 +3222,14 @@ rm -rf ./conftest* AC_SUBST(EXTRA_CFLAGS) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_GETOPT_HEADER version: 8 updated: 2021/06/19 19:16:16 +dnl CF_GETOPT_HEADER version: 9 updated: 2024/08/10 10:30:39 dnl ---------------- dnl Check for getopt's variables which are commonly defined in stdlib.h, dnl unistd.h or (nonstandard) in getopt.h AC_DEFUN([CF_GETOPT_HEADER], -[ -AC_HAVE_HEADERS(unistd.h getopt.h) +[AC_REQUIRE([AC_HEADER_STDC]) + +AC_CHECK_HEADERS(getopt.h) AC_CACHE_CHECK(for header declaring getopt variables,cf_cv_getopt_header,[ cf_cv_getopt_header=none for cf_header in stdio.h stdlib.h unistd.h getopt.h @@ -3206,6 +3249,26 @@ if test "$cf_cv_getopt_header" = getopt.h ; then fi ])dnl dnl --------------------------------------------------------------------------- +dnl CF_GLOB_FULLPATH version: 2 updated: 2024/08/03 12:34:02 +dnl ---------------- +dnl Use this in case-statements to check for pathname syntax, i.e., absolute +dnl pathnames. The "x" is assumed since we provide an alternate form for DOS. +AC_DEFUN([CF_GLOB_FULLPATH],[ +AC_REQUIRE([CF_WITH_SYSTYPE])dnl +case "$cf_cv_system_name" in +(cygwin*|msys*|mingw32*|mingw64|os2*) + GLOB_FULLPATH_POSIX='/*' + GLOB_FULLPATH_OTHER='[[a-zA-Z]]:[[\\/]]*' + ;; +(*) + GLOB_FULLPATH_POSIX='/*' + GLOB_FULLPATH_OTHER=$GLOB_FULLPATH_POSIX + ;; +esac +AC_SUBST(GLOB_FULLPATH_POSIX) +AC_SUBST(GLOB_FULLPATH_OTHER) +])dnl +dnl --------------------------------------------------------------------------- dnl CF_GNATPREP_OPT_T version: 1 updated: 2014/08/02 18:37:25 dnl ----------------- AC_DEFUN([CF_GNATPREP_OPT_T],[ @@ -3659,7 +3722,7 @@ if test "$GXX" = yes; then fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_GXX_WARNINGS version: 11 updated: 2021/01/08 16:50:55 +dnl CF_GXX_WARNINGS version: 13 updated: 2024/12/21 08:44:12 dnl --------------- dnl Check if the compiler supports useful warning options. dnl @@ -3822,7 +3885,7 @@ fi ]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_HASHED_DB_LIBS version: 10 updated: 2021/01/02 17:09:14 +dnl CF_HASHED_DB_LIBS version: 11 updated: 2024/12/14 16:09:34 dnl ----------------- dnl Given that we have the header and version for hashed database, find the dnl library information. @@ -3844,7 +3907,7 @@ $ac_includes_default char *path = "/tmp/foo"; #ifdef DB_VERSION_MAJOR #if DB_VERSION_MAJOR >= 4 - DB *result = 0; + DB *result = NULL; db_create(&result, NULL, 0); result->open(result, NULL, @@ -3854,7 +3917,7 @@ $ac_includes_default DB_CREATE, 0644); #elif DB_VERSION_MAJOR >= 3 - DB *result = 0; + DB *result = NULL; db_create(&result, NULL, 0); result->open(result, path, @@ -3863,7 +3926,7 @@ $ac_includes_default DB_CREATE, 0644); #elif DB_VERSION_MAJOR >= 2 - DB *result = 0; + DB *result = NULL; db_open(path, DB_HASH, DB_CREATE, @@ -3879,7 +3942,7 @@ $ac_includes_default DB_HASH, 0); #endif - ${cf_cv_main_return:-return}(result != 0) + ${cf_cv_main_return:-return}(result != NULL) ],[ if test -n "$cf_db_libs" ; then cf_cv_hashed_db_libs=$cf_db_libs @@ -4003,7 +4066,7 @@ CPPFLAGS="-I. $CPPFLAGS" AC_SUBST(CPPFLAGS) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_INSTALL_OPTS version: 2 updated: 2018/08/18 12:19:21 +dnl CF_INSTALL_OPTS version: 3 updated: 2023/06/03 15:17:30 dnl --------------- dnl prompt for/fill-in useful install-program options AC_DEFUN([CF_INSTALL_OPTS], @@ -4011,6 +4074,7 @@ AC_DEFUN([CF_INSTALL_OPTS], CF_INSTALL_OPT_S CF_INSTALL_OPT_P CF_INSTALL_OPT_O +CF_INSTALL_OPT_STRIP_PROG ])dnl dnl --------------------------------------------------------------------------- dnl CF_INSTALL_OPT_O version: 3 updated: 2020/12/31 20:19:42 @@ -4097,6 +4161,106 @@ fi AC_SUBST(INSTALL_OPT_S) ])dnl dnl --------------------------------------------------------------------------- +dnl CF_INSTALL_OPT_STRIP_PROG version: 1 updated: 2023/06/03 15:17:30 +dnl ------------------------- +dnl Provide an option for overriding the strip program used in install "-s" +dnl +dnl coreutils install provides a --strip-program option +dnl FreeBSD uses STRIPBIN environment variable, while NetBSD and OpenBSD use +dnl STRIP environment variable. Other versions of install do not support this. +AC_DEFUN([CF_INSTALL_OPT_STRIP_PROG], +[ +AC_REQUIRE([CF_INSTALL_OPT_S]) +if test -n "$INSTALL_OPT_S" +then + AC_MSG_CHECKING(if you want to specify strip-program) + AC_ARG_WITH(strip-program, + [ --with-strip-program=XX specify program to use when stripping in install], + [with_strip_program=$withval], + [with_strip_program=no]) + AC_MSG_RESULT($with_strip_program) + if test "$with_strip_program" != no + then + AC_MSG_CHECKING(if strip-program is supported with this installer) + cf_install_program=`echo "$INSTALL" | sed -e 's%[[ ]]*[[ ]]-.%%'` + check_install_strip=no + if test -f "$cf_install_program" + then + check_install_version=`"$cf_install_program" --version 2>/dev/null | head -n 1 | grep coreutils` + if test -n "$check_install_version" + then + check_install_strip="option" + else + for check_strip_variable in STRIPBIN STRIP + do + if strings "$cf_install_program" | grep "^$check_strip_variable[$]" >/dev/null + then + check_install_strip="environ" + break + fi + done + fi + fi + AC_MSG_RESULT($check_install_strip) + case "$check_install_strip" in + (no) + AC_MSG_WARN($cf_install_program does not support strip program option) + with_strip_program=no + ;; + (environ) + cat >install.tmp <<-CF_EOF + #! $SHELL + STRIPBIN="$with_strip_program" \\ + STRIP="$with_strip_program" \\ + $INSTALL "[$]@" + CF_EOF + INSTALL="`pwd`/install.tmp" + chmod +x "$INSTALL" + CF_VERBOSE(created $INSTALL) + ;; + (option) + INSTALL_OPT_S="$INSTALL_OPT_S --strip-program=\"$with_strip_program\"" + ;; + esac + fi +fi +AC_SUBST(INSTALL_OPT_S) +])dnl +dnl --------------------------------------------------------------------------- +dnl CF_INSTALL_PREFIX version: 1 updated: 2024/08/10 20:16:32 +dnl ----------------- +dnl Special option for use by system-builders: the install-prefix is used to +dnl adjust the location into which the actual install is done, so that an +dnl archive can be built without modifying the host system's configuration. +AC_DEFUN([CF_INSTALL_PREFIX],[ +AC_MSG_CHECKING(for an installation directory prefix) +AC_ARG_WITH(install-prefix, + [ --with-install-prefix=DESTDIR use DESTDIR as installation directory prefix], + [case "x$withval" in + (xyes|xno) + ;; + (*) DESTDIR="$withval" + ;; + esac]) +AC_MSG_RESULT([${DESTDIR:-(none)}]) +AC_SUBST(DESTDIR) + +AC_MSG_CHECKING(if installation directory prefix should be merged) +CF_ARG_ENABLE(install-prefix, + [ --enable-install-prefix merge DESTDIR with installation prefix], + cf_install_prefix=yes, + cf_install_prefix=no) +AC_MSG_RESULT($cf_install_prefix) + +if test "$cf_install_prefix" = yes ; then + MERGE_PREFIX=':$(prefix)%=%' +else + MERGE_PREFIX='' +fi + +AC_SUBST(MERGE_PREFIX) +])dnl +dnl --------------------------------------------------------------------------- dnl CF_INTEL_COMPILER version: 9 updated: 2023/02/18 17:41:25 dnl ----------------- dnl Check if the given compiler is really the Intel compiler for Linux. It @@ -4135,14 +4299,14 @@ cf_save_CFLAGS="$cf_save_CFLAGS -we147" fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_ISASCII version: 4 updated: 2012/10/06 17:56:13 +dnl CF_ISASCII version: 5 updated: 2023/12/03 09:21:34 dnl ---------- dnl Check if we have either a function or macro for 'isascii()'. AC_DEFUN([CF_ISASCII], [ AC_MSG_CHECKING(for isascii) AC_CACHE_VAL(cf_cv_have_isascii,[ - AC_TRY_LINK([#include ],[int x = isascii(' ')], + AC_TRY_LINK([#include ],[int x = isascii(' '); (void)x], [cf_cv_have_isascii=yes], [cf_cv_have_isascii=no]) ])dnl @@ -4150,7 +4314,7 @@ AC_MSG_RESULT($cf_cv_have_isascii) test "$cf_cv_have_isascii" = yes && AC_DEFINE(HAVE_ISASCII,1,[Define to 1 if we have isascii()]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_LARGEFILE version: 12 updated: 2020/03/19 20:23:48 +dnl CF_LARGEFILE version: 13 updated: 2023/12/03 19:09:59 dnl ------------ dnl Add checks for large file support. AC_DEFUN([CF_LARGEFILE],[ @@ -4184,11 +4348,15 @@ ifdef([AC_FUNC_FSEEKO],[ #pragma GCC diagnostic error "-Wincompatible-pointer-types" #include #include + +#ifndef __REDIRECT +/* if transitional largefile support is setup, this is true */ +extern struct dirent64 * readdir(DIR *); +#endif ],[ - /* if transitional largefile support is setup, this is true */ - extern struct dirent64 * readdir(DIR *); - struct dirent64 *x = readdir((DIR *)0); - struct dirent *y = readdir((DIR *)0); + DIR *dp = opendir("."); + struct dirent64 *x = readdir(dp); + struct dirent *y = readdir(dp); int z = x - y; (void)z; ], @@ -4482,9 +4650,12 @@ CF_SUBDIR_PATH($1,$2,lib) $1="$cf_library_path_list [$]$1" ])dnl dnl --------------------------------------------------------------------------- -dnl CF_LIBTOOL_VERSION version: 1 updated: 2013/04/06 18:03:09 +dnl CF_LIBTOOL_VERSION version: 2 updated: 2024/06/12 04:19:01 dnl ------------------ AC_DEFUN([CF_LIBTOOL_VERSION],[ +ifdef([LT_PACKAGE_VERSION],[ + cf_cv_libtool_version=LT_PACKAGE_VERSION +],[ if test -n "$LIBTOOL" && test "$LIBTOOL" != none then cf_cv_libtool_version=`$LIBTOOL --version 2>&1 | sed -e '/^$/d' |sed -e '2,$d' -e 's/([[^)]]*)//g' -e 's/^[[^1-9]]*//' -e 's/[[^0-9.]].*//'` @@ -4493,6 +4664,7 @@ else fi test -z "$cf_cv_libtool_version" && unset cf_cv_libtool_version ])dnl +])dnl dnl --------------------------------------------------------------------------- dnl CF_LIB_PREFIX version: 14 updated: 2021/01/01 13:31:04 dnl ------------- @@ -4518,7 +4690,7 @@ ifelse($1,,,[$1=$LIB_PREFIX]) AC_SUBST(LIB_PREFIX) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_LIB_RULES version: 98 updated: 2023/01/07 16:32:06 +dnl CF_LIB_RULES version: 101 updated: 2024/08/03 13:08:58 dnl ------------ dnl Append definitions and rules for the given models to the subdirectory dnl Makefiles, and the recursion rule for the top-level Makefile. If the @@ -4536,6 +4708,7 @@ dnl Note: Libs_To_Make is mixed case, since it is not a pure autoconf variable. AC_DEFUN([CF_LIB_RULES], [AC_REQUIRE([AC_PROG_FGREP])dnl AC_REQUIRE([CF_MAKE_PHONY])dnl +AC_REQUIRE([CF_GLOB_FULLPATH])dnl cf_prefix=$LIB_PREFIX AC_REQUIRE([CF_SUBST_NCURSES_VERSION]) @@ -5025,22 +5198,10 @@ cat >> Makefile <> Makefile <>headers.sh <>headers.sh <conftest.$ac_ext <>$cf_edit_man <\$TMP.out + sed -e "/\\#[ ]*include/s,\$TMP.out mv \$TMP.out \$TMP CF_EOF fi if test "$with_curses_h" != yes ; then cat >>$cf_edit_man <\$TMP.out + sed -e "/\\#[ ]*include/s,curses.h,ncurses.h," \ + < \$TMP >\$TMP.out mv \$TMP.out \$TMP CF_EOF fi @@ -6054,7 +6231,7 @@ CF_EOF if test -n "$cf_manpage_compress" ; then cat >>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man < defines a usable MB_LEN_MAX. That may be because it is +dnl not defined, or it may be a bogus value. +AC_DEFUN([CF_MB_LEN_MAX],[ +AC_CACHE_CHECK(if MB_LEN_MAX is usable,cf_cv_mb_len_max,[ +AC_TRY_COMPILE([ +$ac_includes_default +#include ], +[ +#if defined(MB_LEN_MAX) && MB_LEN_MAX >= 6 + ${cf_cv_main_return:-return}(0); +#else +#error MB_LEN_MAX is not usable +#endif +], [cf_cv_mb_len_max=yes], + [cf_cv_mb_len_max=no])]) +if test "$cf_cv_mb_len_max" = yes +then + AC_DEFINE(HAVE_CONSISTENT_MB_LEN_MAX,1,[Define to 1 if MB_LEN_MAX is usable]) +else + AC_MSG_WARN(MB_LEN_MAX is missing/inconsistent in system headers) +fi +])dnl +dnl --------------------------------------------------------------------------- dnl CF_MIXEDCASE_FILENAMES version: 9 updated: 2021/01/01 16:53:59 dnl ---------------------- dnl Check if the file-system supports mixed-case filenames. If we're able to @@ -6262,7 +6474,7 @@ fi test "$cf_cv_mixedcase" = yes && AC_DEFINE(MIXEDCASE_FILENAMES,1,[Define to 1 if filesystem supports mixed-case filenames.]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_MKSTEMP version: 12 updated: 2023/01/05 17:53:11 +dnl CF_MKSTEMP version: 13 updated: 2023/12/01 17:22:50 dnl ---------- dnl Check for a working mkstemp. This creates two files, checks that they are dnl successfully created and distinct (AmigaOS apparently fails on the last). @@ -6277,7 +6489,7 @@ $ac_includes_default int main(void) { - char *tmpl = "conftestXXXXXX"; + static char tmpl[] = "conftestXXXXXX"; char name[2][80]; int n; int result = 0; @@ -6398,15 +6610,15 @@ case ".$with_cflags" in esac ])dnl dnl --------------------------------------------------------------------------- -dnl CF_NUMBER_SYNTAX version: 2 updated: 2015/04/17 21:13:04 +dnl CF_NUMBER_SYNTAX version: 3 updated: 2023/05/06 16:14:29 dnl ---------------- -dnl Check if the given variable is a number. If not, report an error. +dnl Check if the given variable is a positive integer. Report an error if not. dnl $1 is the variable dnl $2 is the message AC_DEFUN([CF_NUMBER_SYNTAX],[ if test -n "$1" ; then - case $1 in - ([[0-9]]*) + case `echo "$1" | sed -e 's/^[[0-9]]*$/0/g'` in + (0) ;; (*) AC_MSG_ERROR($2 is not a number: $1) @@ -6513,35 +6725,35 @@ if test -n "$cf_path_prog" ; then fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_PATH_SYNTAX version: 18 updated: 2020/12/31 18:40:20 +dnl CF_PATH_SYNTAX version: 19 updated: 2024/08/03 13:08:58 dnl -------------- dnl Check the argument to see that it looks like a pathname. Rewrite it if it dnl begins with one of the prefix/exec_prefix variables, and then again if the dnl result begins with 'NONE'. This is necessary to work around autoconf's dnl delayed evaluation of those symbols. AC_DEFUN([CF_PATH_SYNTAX],[ +AC_REQUIRE([CF_GLOB_FULLPATH])dnl + if test "x$prefix" != xNONE; then cf_path_syntax="$prefix" else cf_path_syntax="$ac_default_prefix" fi -case ".[$]$1" in -(.\[$]\(*\)*|.\'*\'*) - ;; -(..|./*|.\\*) +case "x[$]$1" in +(x\[$]\(*\)*|x\'*\'*) ;; -(.[[a-zA-Z]]:[[\\/]]*) # OS/2 EMX +(x.|x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER) ;; -(.\[$]\{*prefix\}*|.\[$]\{*dir\}*) +(x\[$]\{*prefix\}*|x\[$]\{*dir\}*) eval $1="[$]$1" - case ".[$]$1" in - (.NONE/*) + case "x[$]$1" in + (xNONE/*) $1=`echo "[$]$1" | sed -e s%NONE%$cf_path_syntax%` ;; esac ;; -(.no|.NONE/*) +(xno|xNONE/*) $1=`echo "[$]$1" | sed -e s%NONE%$cf_path_syntax%` ;; (*) @@ -6550,7 +6762,7 @@ case ".[$]$1" in esac ])dnl dnl --------------------------------------------------------------------------- -dnl CF_PKG_CONFIG version: 12 updated: 2021/10/10 20:18:09 +dnl CF_PKG_CONFIG version: 13 updated: 2023/10/28 11:59:01 dnl ------------- dnl Check for the package-config program, unless disabled by command-line. dnl @@ -6559,7 +6771,7 @@ AC_DEFUN([CF_PKG_CONFIG], [ AC_MSG_CHECKING(if you want to use pkg-config) AC_ARG_WITH(pkg-config, - [ --with-pkg-config{=path} enable/disable use of pkg-config], + [[ --with-pkg-config[=CMD] enable/disable use of pkg-config and its name CMD]], [cf_pkg_config=$withval], [cf_pkg_config=yes]) AC_MSG_RESULT($cf_pkg_config) @@ -6930,15 +7142,16 @@ AC_SUBST(cf_ada_config_Ada) AC_SUBST(cf_ada_config_C) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_PROG_INSTALL version: 10 updated: 2021/01/04 19:33:05 +dnl CF_PROG_INSTALL version: 11 updated: 2024/08/03 13:08:58 dnl --------------- dnl Force $INSTALL to be an absolute-path. Otherwise, edit_man.sh and the dnl misc/tabset install won't work properly. Usually this happens only when dnl using the fallback mkinstalldirs script AC_DEFUN([CF_PROG_INSTALL], [AC_PROG_INSTALL -case $INSTALL in -(/*) +AC_REQUIRE([CF_GLOB_FULLPATH])dnl +case x$INSTALL in +(x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER) ;; (*) CF_DIRNAME(cf_dir,$INSTALL) @@ -6968,14 +7181,17 @@ fi AC_SUBST(LDCONFIG) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_PROG_LINT version: 5 updated: 2022/08/20 15:44:13 +dnl CF_PROG_LINT version: 7 updated: 2024/11/30 14:37:45 dnl ------------ AC_DEFUN([CF_PROG_LINT], [ AC_CHECK_PROGS(LINT, lint cppcheck splint) case "x$LINT" in +(xlint|x*/lint) # NetBSD 10 + test -z "$LINT_OPTS" && LINT_OPTS="-chapbrxzgFS -v -Ac11" + ;; (xcppcheck|x*/cppcheck) - test -z "$LINT_OPTS" && LINT_OPTS="--enable=all" + test -z "$LINT_OPTS" && LINT_OPTS="--enable=all -D__CPPCHECK__" ;; esac AC_SUBST(LINT_OPTS) @@ -7004,7 +7220,7 @@ AC_MSG_RESULT($cf_prog_ln_sf) test "$cf_prog_ln_sf" = yes && LN_S="$LN_S -f" ])dnl dnl --------------------------------------------------------------------------- -dnl CF_REGEX version: 18 updated: 2021/01/01 16:53:59 +dnl CF_REGEX version: 19 updated: 2024/12/14 16:09:34 dnl -------- dnl Attempt to determine if we've got one of the flavors of regular-expression dnl code that we can support. @@ -7075,8 +7291,9 @@ case "$cf_regex_func" in for cf_regex_hdr in regex.h do AC_TRY_LINK([#include +#include #include <$cf_regex_hdr>],[ - regex_t *p = 0; + regex_t *p = NULL; int x = regcomp(p, "", 0); int y = regexec(p, "", 0, 0, 0); (void)x; @@ -7148,6 +7365,30 @@ define([CF_REMOVE_LIB], $1=`echo "$2" | sed -e 's/-l$3[[ ]]//g' -e 's/-l$3[$]//'` ])dnl dnl --------------------------------------------------------------------------- +dnl CF_REQUIRE_PKG version: 1 updated: 2025/01/10 19:55:54 +dnl -------------- +dnl Update $REQUIRE_PKG, which lists the known required packages for this +dnl program. +dnl +dnl $1 = package(s) to require, e.g., in the generated ".pc" file +define([CF_REQUIRE_PKG], +[ +for cf_required in $1 +do + # check for duplicates + for cf_require_pkg in $REQUIRE_PKG + do + if test "$cf_required" = "$cf_require_pkg" + then + cf_required= + break + fi + done + test -n "$cf_required" && REQUIRE_PKG="$REQUIRE_PKG $cf_required" +done +AC_SUBST(REQUIRE_PKG) +])dnl +dnl --------------------------------------------------------------------------- dnl CF_RESTORE_XTRA_FLAGS version: 1 updated: 2020/01/11 16:47:45 dnl --------------------- dnl Restore flags saved in CF_SAVE_XTRA_FLAGS @@ -7302,7 +7543,7 @@ do done ])dnl dnl --------------------------------------------------------------------------- -dnl CF_SHARED_OPTS version: 107 updated: 2021/09/04 06:47:34 +dnl CF_SHARED_OPTS version: 112 updated: 2024/12/14 16:09:34 dnl -------------- dnl -------------- dnl Attempt to determine the appropriate CC/LD options for creating a shared @@ -7348,9 +7589,9 @@ AC_DEFUN([CF_SHARED_OPTS], cf_ld_rpath_opt= test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT" - AC_MSG_CHECKING(if release/abi version should be used for shared libs) + AC_MSG_CHECKING(whether to use release or ABI version in shared library file names) AC_ARG_WITH(shlib-version, - [ --with-shlib-version=X Specify rel or abi version for shared libs], + [[ --with-shlib-version[={rel|abi}] use release or ABI version in shared library file names]], [test -z "$withval" && withval=auto case "$withval" in (yes) @@ -7392,7 +7633,7 @@ AC_DEFUN([CF_SHARED_OPTS], for CC_SHARED_OPTS in -fPIC -fpic '' do CFLAGS="$cf_save_CFLAGS $CC_SHARED_OPTS" - AC_TRY_COMPILE([#include ],[int x = 1],[break],[]) + AC_TRY_COMPILE([#include ],[int x = 1; (void)x],[break],[]) done AC_MSG_RESULT($CC_SHARED_OPTS) CFLAGS="$cf_save_CFLAGS" @@ -7762,11 +8003,11 @@ CF_EOF # tested with SunOS 5.5.1 (solaris 2.5.1) and gcc 2.7.2 # tested with SunOS 5.10 (solaris 10) and gcc 3.4.3 if test "$DFT_LWR_MODEL" = "shared" ; then - LOCAL_LDFLAGS="-R \$(LOCAL_LIBDIR):\${libdir}" + LOCAL_LDFLAGS="-R\$(LOCAL_LIBDIR):\${libdir}" LOCAL_LDFLAGS2="$LOCAL_LDFLAGS" fi if test "$cf_cv_enable_rpath" = yes ; then - EXTRA_LDFLAGS="-R \${libdir} $EXTRA_LDFLAGS" + EXTRA_LDFLAGS="-R\${libdir} $EXTRA_LDFLAGS" fi CF_SHARED_SONAME if test "$GCC" != yes; then @@ -7778,9 +8019,9 @@ CF_EOF done CFLAGS="$cf_save_CFLAGS" CC_SHARED_OPTS=$cf_shared_opts - MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -dy -G -h '$cf_cv_shared_soname' -o $[@]' + MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -dy -G -Wl,-h,'$cf_cv_shared_soname' -o $[@]' else - MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -shared -dy -G -h '$cf_cv_shared_soname' -o $[@]' + MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -shared -dy -G -Wl,-h,'$cf_cv_shared_soname' -o $[@]' fi ;; (sysv5uw7*|unix_sv*) @@ -7818,7 +8059,7 @@ cat > conftest.$ac_ext < #include ], - [struct sigaction act], + [struct sigaction act; (void)act], [sigact_bad=no], [ AC_TRY_COMPILE([ #define _POSIX_SOURCE #include #include ], - [struct sigaction act], + [struct sigaction act; (void)act], [sigact_bad=yes AC_DEFINE(_POSIX_SOURCE,1,[Define to 1 if we must define _POSIX_SOURCE])], [sigact_bad=unknown])]) @@ -8268,7 +8499,7 @@ AC_MSG_RESULT($sigact_bad) fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_STRUCT_TERMIOS version: 11 updated: 2020/03/19 20:46:13 +dnl CF_STRUCT_TERMIOS version: 13 updated: 2023/12/03 19:38:54 dnl ----------------- dnl Some machines require _POSIX_SOURCE to completely define struct termios. AC_DEFUN([CF_STRUCT_TERMIOS],[ @@ -8291,12 +8522,12 @@ if test "$ac_cv_header_termios_h" = yes ; then if test "$termios_bad" = maybe ; then AC_MSG_CHECKING(whether termios.h needs _POSIX_SOURCE) AC_TRY_COMPILE([#include ], - [struct termios foo; int x = foo.c_iflag = 1; (void)x], + [struct termios foo; int x = (int)(foo.c_iflag = 1); (void)x], termios_bad=no, [ AC_TRY_COMPILE([ #define _POSIX_SOURCE #include ], - [struct termios foo; int x = foo.c_iflag = 2; (void)x], + [struct termios foo; int x = (int)(foo.c_iflag = 2); (void)x], termios_bad=unknown, termios_bad=yes AC_DEFINE(_POSIX_SOURCE,1,[Define to 1 if we must define _POSIX_SOURCE])) ]) @@ -8408,7 +8639,7 @@ top_builddir=ifelse($1,,`pwd`,$1) AC_SUBST(top_builddir) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_TRY_PKG_CONFIG version: 6 updated: 2020/12/31 10:54:15 +dnl CF_TRY_PKG_CONFIG version: 7 updated: 2025/01/10 19:55:54 dnl ----------------- dnl This is a simple wrapper to use for pkg-config, for libraries which may be dnl available in that form. @@ -8425,6 +8656,7 @@ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "$1"; then cf_pkgconfig_libs="`$PKG_CONFIG --libs "$1" 2>/dev/null`" CF_VERBOSE(package $1 CFLAGS: $cf_pkgconfig_incs) CF_VERBOSE(package $1 LIBS: $cf_pkgconfig_libs) + CF_REQUIRE_PKG($1) CF_ADD_CFLAGS($cf_pkgconfig_incs) CF_ADD_LIBS($cf_pkgconfig_libs) ifelse([$2],,:,[$2]) @@ -8460,7 +8692,7 @@ if test "$cf_cv_xopen_source" != no ; then fi ]) dnl --------------------------------------------------------------------------- -dnl CF_TYPEOF_CHTYPE version: 11 updated: 2023/01/05 17:57:59 +dnl CF_TYPEOF_CHTYPE version: 12 updated: 2024/12/14 16:09:34 dnl ---------------- dnl Determine the type we should use for chtype (and attr_t, which is treated dnl as the same thing). We want around 32 bits, so on most machines want a @@ -8476,7 +8708,7 @@ $ac_includes_default int main(void) { FILE *fp = fopen("cf_test.out", "w"); - if (fp != 0) { + if (fp != NULL) { char *result = "long"; if (sizeof(unsigned long) > sizeof(unsigned int)) { int n; @@ -8512,7 +8744,7 @@ AC_SUBST(cf_cv_typeof_chtype) AC_DEFINE_UNQUOTED(TYPEOF_CHTYPE,$cf_cv_typeof_chtype,[Define to actual type if needed for chtype]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_TYPE_SIGACTION version: 4 updated: 2012/10/06 17:56:13 +dnl CF_TYPE_SIGACTION version: 5 updated: 2023/12/03 09:21:34 dnl ----------------- dnl AC_DEFUN([CF_TYPE_SIGACTION], @@ -8521,14 +8753,14 @@ AC_MSG_CHECKING([for type sigaction_t]) AC_CACHE_VAL(cf_cv_type_sigaction,[ AC_TRY_COMPILE([ #include ], - [sigaction_t x], + [sigaction_t x; (void)x], [cf_cv_type_sigaction=yes], [cf_cv_type_sigaction=no])]) AC_MSG_RESULT($cf_cv_type_sigaction) test "$cf_cv_type_sigaction" = yes && AC_DEFINE(HAVE_TYPE_SIGACTION,1,[Define to 1 if we have the sigaction_t type]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_UNSIGNED_LITERALS version: 2 updated: 1998/02/07 22:10:16 +dnl CF_UNSIGNED_LITERALS version: 3 updated: 2023/12/03 10:02:17 dnl -------------------- dnl Test if the compiler supports 'U' and 'L' suffixes. Only old compilers dnl won't, but they're still there. @@ -8536,7 +8768,7 @@ AC_DEFUN([CF_UNSIGNED_LITERALS], [ AC_MSG_CHECKING([if unsigned literals are legal]) AC_CACHE_VAL(cf_cv_unsigned_literals,[ - AC_TRY_COMPILE([],[long x = 1L + 1UL + 1U + 1], + AC_TRY_COMPILE([],[long x = 1L + 1UL + 1U + 1; (void)x], [cf_cv_unsigned_literals=yes], [cf_cv_unsigned_literals=no]) ]) @@ -8552,12 +8784,12 @@ AC_DEFUN([CF_UPPER], $1=`echo "$2" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` ])dnl dnl --------------------------------------------------------------------------- -dnl CF_UTF8_LIB version: 10 updated: 2023/01/11 04:05:23 +dnl CF_UTF8_LIB version: 11 updated: 2024/08/10 10:23:45 dnl ----------- dnl Check for multibyte support, and if not found, utf8 compatibility library AC_DEFUN([CF_UTF8_LIB], [ -AC_HAVE_HEADERS(wchar.h) +AC_CHECK_HEADERS(wchar.h) AC_CACHE_CHECK(for multibyte character support,cf_cv_utf8_lib,[ cf_save_LIBS="$LIBS" AC_TRY_LINK([ @@ -8676,7 +8908,7 @@ AC_DEFUN([CF_VERBOSE], CF_MSG_LOG([$1]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_VERSION_INFO version: 8 updated: 2021/01/01 13:31:04 +dnl CF_VERSION_INFO version: 10 updated: 2025/01/10 19:55:54 dnl --------------- dnl Define several useful symbols derived from the VERSION file. A separate dnl file is preferred to embedding the version numbers in various scripts. @@ -8754,17 +8986,19 @@ AC_SUBST(VERSION_PATCH) dnl if a package name is given, define its corresponding version info. We dnl need the package name to ensure that the defined symbols are unique. ifelse($1,,,[ - cf_PACKAGE=$1 + PROGRAM=$1 PACKAGE=ifelse($2,,$1,$2) AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE",[Define to the package-name]) + AC_SUBST(PROGRAM) AC_SUBST(PACKAGE) - CF_UPPER(cf_PACKAGE,$cf_PACKAGE) - AC_DEFINE_UNQUOTED(${cf_PACKAGE}_VERSION,"${VERSION_MAJOR}.${VERSION_MINOR}") - AC_DEFINE_UNQUOTED(${cf_PACKAGE}_PATCHDATE,${VERSION_PATCH}) + AH_TEMPLATE([AS_TR_CPP($1[_VERSION])],[version of package]) + AC_DEFINE_UNQUOTED(AS_TR_CPP($1[_VERSION]),"${VERSION_MAJOR}.${VERSION_MINOR}") + AH_TEMPLATE([AS_TR_CPP($1[_PATCHDATE])],[patchdate of package]) + AC_DEFINE_UNQUOTED(AS_TR_CPP($1[_PATCHDATE]),${VERSION_PATCH}) ]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_WCHAR_TYPE version: 4 updated: 2012/10/06 16:39:58 +dnl CF_WCHAR_TYPE version: 5 updated: 2023/12/03 09:21:34 dnl ------------- dnl Check if type wide-character type $1 is declared, and if so, which header dnl file is needed. The second parameter is used to set a shell variable when @@ -8781,7 +9015,7 @@ AC_TRY_COMPILE([ #ifdef HAVE_LIBUTF8_H #include #endif], - [$1 state], + [$1 state; (void)state], [cf_cv_$1=no], [AC_TRY_COMPILE([ #include @@ -8791,7 +9025,7 @@ AC_TRY_COMPILE([ #ifdef HAVE_LIBUTF8_H #include #endif], - [$1 value], + [$1 value; (void) value], [cf_cv_$1=yes], [cf_cv_$1=unknown])])]) @@ -8890,26 +9124,76 @@ $1_ABI=$cf_cv_abi_version cf_cv_abi_default=$cf_cv_abi_version ])dnl dnl --------------------------------------------------------------------------- -dnl CF_WITH_ADA_COMPILER version: 2 updated: 2010/06/26 17:35:58 +dnl CF_WITH_ADA version: 2 updated: 2024/11/09 18:07:29 +dnl ----------- +dnl Check for the Ada compiler (unless requested to not do this), which causes +dnl a further check for a C compiler which can work with the Ada compiler. +AC_DEFUN([CF_WITH_ADA],[ +AC_ARG_WITH(ada, + [ --without-ada suppress check for Ada compiler], + [cf_with_ada=$withval], + [cf_with_ada=yes]) + +cf_prog_cc="gcc cc" +if test "x$cf_with_ada" = xyes +then + CF_PROG_GNAT + if test "x$cf_cv_prog_gnat_correct" = xyes; then + # gcc's developers chose to deprecate gnatgcc before making gprconfig + # work. They replaced gnatgcc in gcc 13 with a script which spits out + # a warning offering advice which could never work. + # + # Here is a workaround. + AC_PATH_PROG(cf_cv_path_gnatgcc,gnatgcc,no) + if test "$cf_cv_path_gnatgcc" != no + then + AC_MSG_CHECKING(for improvement) + cf_file_gnatgcc=`file -L "$cf_cv_path_gnatgcc" 2>/dev/null` + case "x$cf_file_gnatgcc" in + (*script*) + cf_cv_path_gnatgcc=`sh -x "$cf_cv_path_gnatgcc" --version 2>&1 | grep -w exec | sed -e 's/^[[ ]]*+[[ ]]*//' -e 's/exec[[ ]]//' -e 's/ .*//'` + ;; + (*) + cf_cv_path_gnatgcc=no + ;; + esac + AC_MSG_RESULT($cf_cv_path_gnatgcc) + test "$cf_cv_path_gnatgcc" = no && cf_cv_path_gnatgcc=gnatgcc + cf_prog_cc="$cf_cv_path_gnatgcc $cf_prog_cc" + fi + fi +fi +case "$cf_prog_cc" in +(*/*) + CC="$cf_prog_cc" + AC_SUBST(CC) + ;; +(*) + CF_PROG_CC($cf_prog_cc) + ;; +esac +])dnl +dnl --------------------------------------------------------------------------- +dnl CF_WITH_ADA_COMPILER version: 3 updated: 2023/10/28 11:59:01 dnl -------------------- dnl Command-line option to specify the Ada95 compiler. AC_DEFUN([CF_WITH_ADA_COMPILER],[ -AC_MSG_CHECKING(for ada-compiler) +AC_MSG_CHECKING(for Ada95 compiler) AC_ARG_WITH(ada-compiler, - [ --with-ada-compiler=CMD specify Ada95 compiler command (default gnatmake)], + [[ --with-ada-compiler[=CMD] use CMD as Ada95 compiler (default: gnatmake)]], [cf_ada_compiler=$withval], [cf_ada_compiler=gnatmake]) AC_SUBST(cf_ada_compiler) AC_MSG_RESULT($cf_ada_compiler) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_WITH_ADA_INCLUDE version: 2 updated: 2010/06/26 17:35:58 +dnl CF_WITH_ADA_INCLUDE version: 3 updated: 2023/10/28 11:59:01 dnl ------------------- dnl Command-line option to specify where Ada includes will install. AC_DEFUN([CF_WITH_ADA_INCLUDE],[ -AC_MSG_CHECKING(for ada-include) +AC_MSG_CHECKING(for Ada95 include directory) CF_WITH_PATH(ada-include, - [ --with-ada-include=DIR Ada includes are in DIR], + [ --with-ada-include=DIR find Ada95 includes in DIR], ADA_INCLUDE, PREFIX/share/ada/adainclude, [$]prefix/share/ada/adainclude) @@ -8917,16 +9201,16 @@ AC_SUBST(ADA_INCLUDE) AC_MSG_RESULT($ADA_INCLUDE) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_WITH_ADA_LIBNAME version: 1 updated: 2019/09/07 18:59:41 +dnl CF_WITH_ADA_LIBNAME version: 3 updated: 2023/11/22 20:48:30 dnl ------------------- dnl CF_WITH_ADA_LIBNAME dnl ------------------- dnl Command-line option to specify how to name the resulting Ada library. dnl $1 = default value AC_DEFUN([CF_WITH_ADA_LIBNAME],[ -AC_MSG_CHECKING(for ada-libname) +AC_MSG_CHECKING(for Ada95 curses library name) AC_ARG_WITH(ada-libname, - [ --with-ada-libname=XXX override default Ada library-name], + [[ --with-ada-libname[=XXX] use XXX as Ada95 library name]], ADA_LIBNAME=[$]withval, ADA_LIBNAME=$1) case "x$ADA_LIBNAME" in @@ -8938,13 +9222,13 @@ AC_SUBST(ADA_LIBNAME) AC_MSG_RESULT($ADA_LIBNAME) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_WITH_ADA_OBJECTS version: 2 updated: 2010/06/26 17:35:58 +dnl CF_WITH_ADA_OBJECTS version: 3 updated: 2023/10/28 11:59:01 dnl ------------------- dnl Command-line option to specify where Ada objects will install. AC_DEFUN([CF_WITH_ADA_OBJECTS],[ -AC_MSG_CHECKING(for ada-objects) +AC_MSG_CHECKING(for Ada95 object directory) CF_WITH_PATH(ada-objects, - [ --with-ada-objects=DIR Ada objects are in DIR], + [ --with-ada-objects=DIR find Ada95 objects in DIR], ADA_OBJECTS, PREFIX/lib/ada/adalib, [$]prefix/lib/ada/adalib) @@ -8952,28 +9236,34 @@ AC_SUBST(ADA_OBJECTS) AC_MSG_RESULT($ADA_OBJECTS) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_WITH_ADA_SHAREDLIB version: 5 updated: 2018/07/21 19:10:35 +dnl CF_WITH_ADA_SHAREDLIB version: 6 updated: 2023/10/28 11:59:01 dnl --------------------- -dnl Command-line option to specify if an Ada95 shared-library should be built, +dnl Command-line option to specify if an Ada95 shared library should be built, dnl and optionally what its soname should be. AC_DEFUN([CF_WITH_ADA_SHAREDLIB],[ AC_REQUIRE([CF_GNAT_PROJECTS]) -AC_MSG_CHECKING(if an Ada95 shared-library should be built) +AC_MSG_CHECKING(whether to build an Ada95 shared library) AC_ARG_WITH(ada-sharedlib, - [ --with-ada-sharedlib=soname build shared-library (requires GNAT projects)], + [ --with-ada-sharedlib build Ada95 shared library; requires GNAT project support], [with_ada_sharedlib=$withval], [with_ada_sharedlib=no]) -AC_MSG_RESULT($with_ada_sharedlib) +cf_ada_sharedlib_warn=no if test "x$with_ada_sharedlib" != xno then if test "x$cf_gnat_projects" != xyes then - AC_MSG_WARN(disabling shared-library since GNAT projects are not supported) with_ada_sharedlib=no + cf_ada_sharedlib_warn=yes fi fi +AC_MSG_RESULT($with_ada_sharedlib) +if test "x$cf_ada_sharedlib_warn" != xno +then + AC_MSG_WARN(disabling Ada95 shared library since GNAT projects are not supported) +fi + ADA_SHAREDLIB='lib$(LIB_NAME).so.1' MAKE_ADA_SHAREDLIB="#" @@ -9020,7 +9310,7 @@ if test "$with_dmalloc" = yes ; then fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_WITH_EXPORT_SYMS version: 3 updated: 2014/12/20 19:16:08 +dnl CF_WITH_EXPORT_SYMS version: 5 updated: 2023/11/22 20:48:30 dnl ------------------- dnl Use this with libtool to specify the list of symbols that may be exported. dnl The input file contains one symbol per line; comments work with "#". @@ -9030,7 +9320,7 @@ AC_DEFUN([CF_WITH_EXPORT_SYMS], [ AC_MSG_CHECKING(if exported-symbols file should be used) AC_ARG_WITH(export-syms, - [ --with-export-syms=XXX limit exported symbols using libtool], + [[ --with-export-syms[=SYM-FILE] limit symbols exported by libtool to those listed in SYM-FILE]], [with_export_syms=$withval], [with_export_syms=no]) if test "x$with_export_syms" = xyes @@ -9222,7 +9512,7 @@ AC_SUBST(LIB_UNINSTALL) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_WITH_LIBTOOL_OPTS version: 4 updated: 2015/04/17 21:13:04 +dnl CF_WITH_LIBTOOL_OPTS version: 6 updated: 2023/11/22 20:48:30 dnl -------------------- dnl Allow user to pass additional libtool options into the library creation dnl and link steps. The main use for this is to do something like @@ -9232,7 +9522,7 @@ dnl ./configure --enable-static AC_DEFUN([CF_WITH_LIBTOOL_OPTS],[ AC_MSG_CHECKING(for additional libtool options) AC_ARG_WITH(libtool-opts, - [ --with-libtool-opts=XXX specify additional libtool options], + [[ --with-libtool-opts[=XXX] give libtool additional options XXX]], [with_libtool_opts=$withval], [with_libtool_opts=no]) AC_MSG_RESULT($with_libtool_opts) @@ -9248,7 +9538,7 @@ esac AC_SUBST(LIBTOOL_OPTS) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_WITH_LIB_BASENAME version: 1 updated: 2020/03/07 20:05:14 +dnl CF_WITH_LIB_BASENAME version: 2 updated: 2023/11/22 20:48:30 dnl -------------------- dnl Allow for overriding the basename of a library, i.e., the part to which dnl prefixes/suffixes are attached. @@ -9260,7 +9550,7 @@ AC_DEFUN([CF_WITH_LIB_BASENAME], [ AC_MSG_CHECKING(for desired basename for $2 library) AC_ARG_WITH($2-libname, - [ --with-$2-libname=XXX override ifelse($3,,$2,$3) basename of library], + [[ --with-$2-libname[=XXX] override ifelse($3,,$2,$3) basename of library]], [with_lib_basename=$withval], [with_lib_basename=ifelse($3,,$2,$3)]) $1="$with_lib_basename" @@ -9448,7 +9738,7 @@ if test "x$with_pcre2" != xno ; then fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_WITH_PKG_CONFIG_LIBDIR version: 21 updated: 2023/01/22 13:37:42 +dnl CF_WITH_PKG_CONFIG_LIBDIR version: 25 updated: 2024/08/03 13:34:29 dnl ------------------------- dnl Allow the choice of the pkg-config library directory to be overridden. dnl @@ -9462,6 +9752,7 @@ dnl pkgconf (used with some systems such as FreeBSD in place of pkg-config) dnl optionally ignores $PKG_CONFIG_LIBDIR. Very old versions of pkg-config, dnl e.g., Solaris 10 also do not recognize $PKG_CONFIG_LIBDIR. AC_DEFUN([CF_WITH_PKG_CONFIG_LIBDIR],[ +AC_REQUIRE([CF_GLOB_FULLPATH])dnl case "$PKG_CONFIG" in (no|none|yes) @@ -9483,7 +9774,7 @@ fi # if the option is used, let that override. otherwise default to "libdir" AC_ARG_WITH(pkg-config-libdir, - [ --with-pkg-config-libdir=XXX use given directory for installing pc-files], + [[ --with-pkg-config-libdir[=XXX] use given directory for installing pc-files]], [cf_search_path=$withval], [test "x$PKG_CONFIG" != xnone && test -z "$cf_search_path" && cf_search_path=libdir]) @@ -9495,10 +9786,10 @@ case "x$cf_search_path" in ;; (x) ;; -(x/*\ *) +(x$GLOB_FULLPATH_POSIX\ *|x$GLOB_FULLPATH_OTHER\ *) PKG_CONFIG_LIBDIR= ;; -(x/*) +(x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER) PKG_CONFIG_LIBDIR="$cf_search_path" AC_MSG_RESULT($PKG_CONFIG_LIBDIR) cf_search_path= @@ -9517,7 +9808,15 @@ case "x$cf_search_path" in pkg-config \ pkgconf do - cf_search_path=`"$PKG_CONFIG" --variable=pc_path "$cf_pkg_program" 2>/dev/null | tr : ' '` + cf_raw_search_path=`"$PKG_CONFIG" --variable=pc_path "$cf_pkg_program" 2>/dev/null` + case "$cf_raw_search_path" in + (*\\*) + cf_search_path=`echo "$cf_raw_search_path" | tr ';' ' ' | tr '\' '/'` + ;; + (*/*) + cf_search_path=`echo "$cf_raw_search_path" | tr : ' '` + ;; + esac test -n "$cf_search_path" && break done @@ -9632,7 +9931,7 @@ if test "$with_pthread" != no ; then fi ]) dnl --------------------------------------------------------------------------- -dnl CF_WITH_REL_VERSION version: 1 updated: 2003/09/20 18:12:49 +dnl CF_WITH_REL_VERSION version: 2 updated: 2023/05/06 18:18:18 dnl ------------------- dnl Allow library's release-version to be overridden. Generally this happens when a dnl packager has incremented the release-version past that used in the original package, @@ -9652,6 +9951,7 @@ ifelse($1,,[ ],[ $1_MAJOR=`echo "$cf_cv_rel_version" | sed -e 's/\..*//'` $1_MINOR=`echo "$cf_cv_rel_version" | sed -e 's/^[[^.]]*//' -e 's/^\.//' -e 's/\..*//'` + test -n "$1_MINOR" || $1_MINOR=0 CF_NUMBER_SYNTAX([$]$1_MAJOR,Release major-version) CF_NUMBER_SYNTAX([$]$1_MINOR,Release minor-version) ]) @@ -9707,6 +10007,27 @@ AC_ARG_WITH(system-type, ]) ])dnl dnl --------------------------------------------------------------------------- +dnl CF_WITH_TYPE version: 2 updated: 2023/11/25 16:11:47 +dnl ------------ +dnl Accept a TYPE for substitution: +dnl $1 = name of type +dnl $2 = help/usage message +dnl $3 = symbol to set +dnl $4 = default value +AC_DEFUN([CF_WITH_TYPE],[ +AC_MSG_CHECKING(for type of $1) +AC_ARG_WITH([$1], [$2], + [$3="$withval"], + [$3=$4]) +AC_MSG_RESULT([$]$3) +case x[$]$3 in +(x|xyes|xno) + AC_MSG_ERROR(expected a type name for $1) + ;; +esac +AC_SUBST($3) +])dnl +dnl --------------------------------------------------------------------------- dnl CF_WITH_VALGRIND version: 1 updated: 2006/12/14 18:00:21 dnl ---------------- AC_DEFUN([CF_WITH_VALGRIND],[ @@ -9715,7 +10036,7 @@ CF_NO_LEAKS_OPTION(valgrind, [USE_VALGRIND]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_WITH_VERSIONED_SYMS version: 10 updated: 2021/01/04 18:48:01 +dnl CF_WITH_VERSIONED_SYMS version: 16 updated: 2025/01/19 15:27:13 dnl ---------------------- dnl Use this when building shared library with ELF, to markup symbols with the dnl version identifier from the given input file. Generally that identifier is @@ -9725,10 +10046,14 @@ dnl $1 = basename of the ".map" file (default $PACKAGE) AC_DEFUN([CF_WITH_VERSIONED_SYMS], [AC_REQUIRE([AC_PROG_FGREP])dnl AC_REQUIRE([AC_PROG_EGREP])dnl +AC_REQUIRE([CF_GLOB_FULLPATH])dnl +if test "$with_libtool" = "yes" ; then + : +elif test "$with_shared" = "yes" ; then AC_MSG_CHECKING(if versioned-symbols file should be used) AC_ARG_WITH(versioned-syms, - [ --with-versioned-syms=X markup versioned symbols using ld], + [[ --with-versioned-syms[=MAP-FILE] version ELF shared library symbols per MAP-FILE]], [with_versioned_syms=$withval], [with_versioned_syms=no]) case "x$with_versioned_syms" in @@ -9738,7 +10063,7 @@ case "x$with_versioned_syms" in ;; (xno) ;; -(x/*) +(x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER) test -f "$with_versioned_syms" || AC_MSG_ERROR(expected a filename: $with_versioned_syms) ;; (*) @@ -9760,11 +10085,13 @@ then VERSIONED_SYMS="-Wl,--version-script,\${RESULTING_SYMS}" MK_SHARED_LIB=`echo "$MK_SHARED_LIB" | sed -e "s%-Wl,%\\[$]{VERSIONED_SYMS} -Wl,%"` CF_VERBOSE(MK_SHARED_LIB: $MK_SHARED_LIB) + LIB_CREATE="[$]MK_SHARED_LIB" ;; (*-dy\ *) VERSIONED_SYMS="-Wl,-M,\${RESULTING_SYMS}" MK_SHARED_LIB=`echo "$MK_SHARED_LIB" | sed -e "s%-dy%\\[$]{VERSIONED_SYMS} -dy%"` CF_VERBOSE(MK_SHARED_LIB: $MK_SHARED_LIB) + LIB_CREATE="[$]MK_SHARED_LIB" ;; (*) AC_MSG_WARN(this system does not support versioned-symbols) @@ -9815,15 +10142,15 @@ local: EOF cat >conftest.$ac_ext <conftest.mk <

These notes are for ncurses - @VERSION@, released December 31, 2022.

+ @VERSION@, released April 27, 2024.

This release is designed to be source-compatible with - ncurses 5.0 through 6.3; providing + ncurses 5.0 through 6.4; providing extensions to the application binary interface (ABI). Although the source can still be configured to support the ncurses 5 ABI, the reason for the release is @@ -172,13 +172,68 @@ bug-fixes/improvements dealt with robustness issues. The release notes also mention some other bug-fixes, but are focused on new features and improvements to existing features since - ncurses 6.3 release.

+ ncurses 6.4 release.

Library improvements

New features

-

There are no new features in this release.

+

These are new features:

+ +
    +
  • +

    The low-level terminfo and termcap interfaces are used + both by the higher-level curses library, as well as by many + applications.

    + +

    The functions which convert parameterized terminal + capability strings for output to the terminal + (tiparm and tparm) analyze the + capability string to determine which parameters are strings + (i.e., addresses), versus numbers (not addresses).

    + +

    The library's analysis of a capability string may differ + from the calling application's design if environment + variables are used to point to an invalid terminal database. + This is a longstanding problem with all + implementations of terminfo, dating from the early 1980s.

    + +

    Two new functions address this problem: by providing a + function which allows the calling application to tell ncurses + how many string-parameters to expect:

    + +
      +
    • tiscan_s helps applications check + formatting capabilities that would be passed to + tiparm_s.
      • + +
    • tiparm_s provides applications a way to + tell ncurses what the expected parameters are for a + capability.
      • +
    +
    • + +
  • +

    The ncurses library supports a compile-time feature + (enabled with the configure --enable-check-size + option) which simplifies initialization with terminals which + do not negotiate window (screen) size. This is done in + setupterm, by providing for using ANSI + cursor-position report (in user6/user7 terminfo capabilities) + to obtain the screen size if neither environment variables or + ioctl is used.

    + +

    The ncurses test-program with options + “-E -T” demonstrates this + feature.

    +
    • + +
  • add functions to query tty-flags in + SCREEN
    • +
+ +

This release drops compatibility with obsolete versions of + tack, e.g., pre-1.08

Other improvements

@@ -187,55 +242,108 @@
  • -

    modify delscreen to more effectively delete all - windows on the given screen.

    +

    In addition to the new, safer function + tiparm_s, ncurses adds checks to make the older + tiparm, tparm and + tgoto functions safer:

    + +
      +
    • +

      the terminfo functions tiparm and + tparm ensure that the capability string + comes from the terminal description which ncurses loads, + rather than from random data which the application + happens to have.

      +
      • + +
    • +

      the tgoto function disallows capabilities + which its analysis shows will attempt to use string + parameters.

      +
      • + +
    • +

      ncurses uses internal functions which correspond to + tiparm, and tgoto which ensure + that the capability strings which are passed to these + functions come from the loaded terminal description.

      +
      • +
    +
    • + +
  • +

    improve check in lib_tparm.c, ensuring that a + char* fits into a TPARM_ARG

    +
    • + +
  • +

    modify _nc_syserr_abort to use + _nc_env_access, rather than only checking root + uid

    +
    • + +
  • +

    improve thread lock in lib_trace.c

    +
    • + +
  • +

    modify flushinp to use file descriptors in + SCREEN, rather than from TERMINAL, + and check if they are for a terminal, like SVr4

    +
    • + +
  • +

    modify mcprint to use file descriptor in + SCREEN, for consistency

    +
    • + +
  • +

    modify internal function _nc_read_file_entry + to show relevant filename in warnings

  • -

    modify wnoutrefresh to call pnoutrefresh - if its parameter is a pad, rather than treating it as an - error, and modify new_panel to permit its window-parameter to - be a pad

    +

    improve checks in internal function + convert_string for corrupt terminfo entry

  • -

    modify curses_trace() to show the trace-mask as symbols, - e.g., TRACE_ORDINARY, DEBUG_LEVEL(3).

    +

    review/improve handling of out-of-memory conditions

  • -

    improve checks for valid mouse events when an intermediate - mouse state is not part of the mousemask specified by the - caller

    +

    limit delays to 30 seconds, i.e., padding delays in + terminfo, as well as napms and + delay_output functions

  • -

    allow extended-color number in opts parameter of - wattr_on.

    +

    fix reallocation loop for vsnprintf in + _nc_sprintf_string by copying the va_list + variable

  • -

    improve _tracecchar_t2 formatting of - base+combining character.

    +

    modify delscreen to delete only windows associated + with the screen

  • -

    trim out some unwanted linker options from ncurses*config - and .pc files seen in Fedora 36+.

    +

    modify endwin to return an error if it is + called again without an intervening screen update

  • -

    improve shell-scripts with shellcheck

    +

    modify wenclose to handle pads

  • -

    improve use of "trap" in shell scripts, using a - script.

    +

    eliminate use of PATH_MAX in + lib_trace.c

  • -

    modify make-tar.sh scripts to make timestamps - more predictable.

    +

    provide for any CCHARW_MAX greater than 1

@@ -243,19 +351,32 @@
  • -

    modify misc/gen-pkgconfig.in to allow for the - case where the library directory does not yet exist, since - this is processed before doing an install

    +

    correct loop termination condition in + waddnstr and waddnwstr

    +
    • + +
  • +

    improve parsing in internal function + _nc_msec_cost, allowing a single decimal + point

  • -

    set trailing null on string passed from winsnstr - to wins_nwstr.

    +

    amend parameter check for entire string versus specific + length in winsnstr and wins_nwstr + to match Solaris; make similar correction to + wins_nwstr

  • -

    modify waddch_literal to allow for double-width - base character when merging a combining character

    +

    correct internal function wadd_wch_literal + when adding a non-spacing character to a double-width + character

    +
    • + +
  • +

    correct definition of Charable macro for + non-wide ncurses library .

@@ -263,7 +384,9 @@ improvements

Several improvements were made to the - utility programs:

+ utility programs. Some were done to make the infocmp + option “-u” option help refactor the + terminal database.

    -
  • rewrite canonical_name function of - infocmp to ensure buffer size
    • +
  • +

    add limit checks for processing extended capabilities + with the “-u” option

    +
    • -
  • improve readability of long parameterized expressions - with the infocmp “-f” option by - allowing split before a “%p” - marker.
    • +
  • +

    correct initial alignment of extended capabilities, so + that the “-u” option can be used + for more than two terminal types

    +
    • -
  • modify verbose-option of infocmp, - tic, toe to enable debug-tracing if that - is configured.
    • +
  • +

    modify “-u” option to not + report cancels for strings which were already cancelled + in a use'd chunk.

    +
    • + +
  • +

    correct an assignment “-u” + for detecting if a boolean is unset in a base entry and + set in a use'd chunk, i.e., if it was cancelled.

    +
tabs + "@HOMEPAGE@/man/tic.1m.html">tic
-
limit tab-stop values to max-columns
+
+
    +
  • +

    correct limit-check when dumping tc/use clause via + “-I”

    +
    • -
    tic -
    +
  • +

    check return value of _nc_save_str, in + special case where extended capabilities are processed + but the terminal description was not initialized

    +
    • -
    add consistency check in tic for u6/u7/u8/u9 and NQ - capabilities.
    +
  • +

    modify check for multiply defined aliases to report + problems within the current runtime rather than for + conflicts with pre-existing terminal descriptions.

    +
    • + +
  • +

    disallow using $TERMINFO or + $HOME/.terminfo when + “-o” option is used

    +
    • +
+
tput -
+ "@HOMEPAGE@/man/tput.1.html">tput and tset + +
+
    +
  • +

    add “-v” option to tput, to + show warnings

    +
    • -
    corrected use of original tty-modes in init/reset - subcommands
    +
  • +

    modify reset command to avoid altering clocal + if the terminal uses a modem

    +
    • + +
  • +

    modify reset feature to avoid 1-second sleep + if running in a pseudo-terminal

    +
    • +
+

Examples

Along with the library and utilities, improvements were made to the ncurses-examples. Most of - this activity aimed at improving the test-packages:

+ "@HOMEPAGE@/ncurses-examples.html">ncurses-examples:

  • -

    add minimal -h (usage) and -V (version) - getopt logic to all ncurses-examples programs.

    -
    • - -
  • -

    fix an error in "@" command in test/ncurses.c - F-menu

    -
    • - -
  • -

    add curses_trace to ifdef's for START_TRACE in - test/test.priv.h

    -
    • - -
  • -

    improve pthread-configuration for test/worm.c

    -
    • - -
  • -

    add setlocale call to several test-programs.

    +

    modify test_tparm to account for extended + capabilities

  • -

    workaround in test/picsmap.c for use of floating - point for rgb values by ImageMagick 6.9.11, which appears to - use the wrong upper limit.

    +

    corrected mouse mask in test/testcurs.c

  • -

    use static libraries for AdaCurses test-package for - Mageia, since no gprbuild package is available.

    +

    modify test/clip_printw.c to optionally test + non-wrapped updates

  • -

    install Ada95 sample programs in libexecdir, adding a - wrapper script to invoke those.

    +

    modify test/test_mouse.c to use curses api + for raw/noraw

  • -

    install ncurses-examples programs in libexecdir, adding a - wrapper script to invoke those.

    +

    modify test/clip_printw.c to optionally test + non-wrapped updates

-

There are other new demo/test programs and reusable - examples:

+

There is one new demo/test programs:

-
test/combine +
test/test_endwin.c
-
demonstrate combining characters
- -
test/test_delwin -
- -
demonstrate deleting a window
- -
test/test_mouse -
- -
observe mouse events in the raw terminal or parsed ncurses - modes
- -
test/test_unget_wch -
- -
demonstrate the unget_wch and unget functions
+
+

This program shows the return-status from + endwin with different combinations of + endwin (repeated), initscr, + newterm.

+

Terminal database

@@ -391,190 +527,159 @@

There are several new terminal descriptions:

-

There are many changes to existing terminal descriptions. Some - were updates to several descriptions:

- - -

while others affected specific descriptions. These were - retested, to take into account changes by their developers:

+

There are many changes to existing terminal descriptions. Some + were updates to several descriptions, using the + infocmp “-u” option in a + script to determine which building-block entries could + be used to replace multiple capability settings (and trim + redundant information).

+ +

Other changes include:

  • -

    kitty -

    +

    document + XF, kxIN and kxOUT

  • -

    teken -

    +

    add note on sun + regarding wscons/cmdtool/shelltool

    • -
-

while these are specific fixes based on reviewing - documentation, user reports, or warnings from tic:

- -
-
att610+cvis0 -
- -
amended note as per documentation for att610, att620, - att730
- -
kon, - kon2, jfbterm
- -
revise to undo "linux2.6" change to smacs/rmacs/enacs
- -
st-0.6 -
- -
add dim, ecma+strikeout
- -
foot+base -
- -
add xterm+sl-alt
- -
dec+sl -
- -
correct dsl in dec+sl
- -
mintty and - tmux
- -
correct setal in mintty/tmux entries, add to vte-2018
- -
nsterm -
+
  • +

    remove DECCOLM+DECSCLM from foot

    +
    • -
    modify nsterm to use xterm+alt1049
    +
  • +

    add xterm+focus to foot+base

    +
    • -
    putty -
    +
  • +

    add ecma+strikeout to putty

    +
    • -
    modify putty to use xterm+alt1049
    +
  • +

    use CSI 3J in vte-2017

    +
    • -
    vte-2018 -
    +
  • +

    use oldxterm+sm+1006 in vte-2014

    +
    • -
    add blink and setal
    -
    +
  • +

    modify xgterm + to work around line-drawing bug

    +
    • -

    A few entries use extensions (user-defined terminal - capabilities):

    +
  • +

    add xterm focus mode 1004 to xterm+focus + as fe/fd capabilities, like vim.

    +
    • -
    • -

      use ansi+enq and decid+cpr in cases - where the terminal probably supported the u6-u9 extension

      +

      add xterm+focus to alacritty+common

    • -

      remove u6-u9 from teken-2018

      +

      add XR/xr, to work with vim, and use RV/rv to denote DA2 + and its response

    • -

      use NQ to flag entries where the terminal does - not support query and response

      +

      add XF flag to xterm+focus + so that termcap applications can be aware of terminals which + may support focus in/out

    • -

      add/use bracketed+paste - to help identify terminals supporting this xterm feature

      +

      use xterm+focus in xterm-p370 + and tmux

    • -

      modify samples for xterm mouse 1002/1003 modes to use 1006 - mode, and also provide for focus in/out responses

      +

      remove xterm+sm+1006 from tmux

    • -

      xterm patch #371 supports DEC-compatible status-line. add - dec+sl to xterm-new, per xterm #371, add xterm-p371, - add xterm-p370, - for use in older terminals, and set “xterm-new” - to “xterm-p370” (to ease adoption).

      +

      NetBSD-related fixes for x68k and + wsvt25

    @@ -610,103 +715,88 @@
    • -

      remove a stray '/' from description of %g in - - terminfo(5).

      +

      add assignment in CF_MAN_PAGES to fill in + value for TERMINFO_DIRS in ncurses, terminfo + and tic manpages.

    • -

      correct/improve font-formatting in curs_getch.3x, as - well as other manual pages.

      +

      clarify interaction of -R option versus + -C, -I and -r in + infocmp manpage.

      • -
    - - -
  • -

    New/improved history and portability sections:

    -
    • -

      add portability notes for delscreen - and delwin - in manual.

      +

      correct manpage description of panel_hidden.

    • -

      improve curs_slk.3x - discussion of extensions and portability

      +

      improve manpage description for addch versus unctrl + format used for non-printable characters.

      • -
    -
    • -
  • -

    Other improvements:

    - -
    • -

      improve curs_bkgd.3x, - explaining that bkgdset can affect results for - bkgd

      +

      improve manpages discussing file descriptors in + low-level functions.

    • -

      add note on portable memory-leak checking in curs_memleaks.3x

      +

      improve description of search rules for terminal + descriptions in terminfo manpage.

    • -

      expanded description in resizeterm.3x

      +

      modify dist.mk to avoid passing developer's comments + in manpages into the generated html documentation.

    • -

      add section on releasing memory to - curs_termcap.3x and - curs_terminfo.3x manpages.

      +

      modify test-package "ncurses6-doc" to use + manpage-aliases, which in turn required a change to the + configure script to factor in the extra-suffix option + when deriving alias names.

      • +
    +
    • +
  • +

    New/improved history and portability sections:

    + +
    • -

      add clarification of the scope of dynamic variables in - terminfo(5).

      +

      add information about "ttycap", termcap's forerunner, + to tset.1

    • -

      improve formatting of ncurses-intro.html - and hackguide.html

      +

      document limitations of tparm, and error-returns in + curs_terminfo.3x

    • -

      improve curs_clear.3x - links to other pages

      +

      document limitations of tgoto, and error-returns in + curs_termcap.3x

      • +
    +
    • + +
  • +

    Other improvements:

    +
    • -

      update ncurses-howto, - making documentation fixes along with corrections to - example programs.

      +

      This release has many changes to improve the + formatting and style of the manpages.

    • -

      use newer version 1.36 of gnathtml for generating Ada - html files.

      +

      Manpages now use consistent section-naming, page + headers and footers (including the modification date for + each page).

    • -

      update external links in Ada95.html

      +

      Table layout has been revised.

    • @@ -718,93 +808,162 @@

    Interesting bug-fixes

    -

    While there were many bugs fixed during development of ncurses - 6.4, only a few (the reason for this release) were both important - and interesting. Most of the bug-fixes were for local issues - which did not affect compatibility across releases. Since those - are detailed in the NEWS file no elaboration is - needed here.

    +

    The changes to tparm, tgoto which improve + the design of the low-level interfaces are interesting, + but are not bug-fixes per se.

    + +

    Configuration changes

    + +

    Major + changes

    -

    The interesting bugs were those dealing with memory leaks and - buffer overflows. Although the utilities are designed for - text files (which they do properly), some choose to test - them with non-text files.

    +

    These are the major changes (aside from introducing tiparm_s):

    • -

      Text files contain no embedded nulls. Also, they end with - a newline. Feeding tic non-text files - exposed a few cases where the program did not check for those - issues. As a result, further processing of the input found - limit-checks whose assumptions were invalid.

      +

      use wide-character (ncursesw) by default

    • -

      Fixing the limit-checks (first) found a problem with - tic managing the list of strings in a - terminal description. In merging two terminal descriptions - (i.e., the “use=” feature), tic - was not allocating a complete copy. A quick repair for that - introduced a memory leak.

      +

      use opaque typedefs by default

      • +
    +

    However, most of the work on configure scripts was done to + reduce warnings within the configure script:

    + +
    • -

      The checks for non-text files are improved (i.e., embedded - nulls in the input file will cause tic to - reject it rather than attempting to process it).

      +

      intrusive warnings from GNU grep regarding fgrep and + egrep

    • -

      The string allocations in tic are - likewise improved.

      +

      fatal errors in compile-checks, arising from recent + “Modern C” efforts by some developers which + caused longstanding configure checks to fail.

      + +

      After repairing the configure script, none of that + activity affected ncurses because stricter warnings are used + routinely in development.

    -

    Configuration changes

    +

    Other improvements made to configure checks include

    -

    Major - changes

    +
      +
    • +

      use string-hacks + in alloc_entry.c, alloc_type.c and hardscroll.c, overlooked + due to compiler changes in recent OpenBSD releases

      +
      • + +
    • +

      revise progs.priv.h to provide for NC_ISATTY reuse

      +
      • + +
    • +

      configure check for MB_LEN_MAX provides warning as + needed

      +
      • + +
    • +

      trim a space after some "-R" options, fixing builds for + applications built using clang and ncurses on Solaris

      +
      • -

      There are no major changes. No new options were added. Several - improvements were made to configure checks.

      +
    • +

      work around misconfiguration of MacPorts gcc13, which + exposes invalid definition of MB_LEN_MAX in gcc's + fallback copy of limits.h

      +
      • + +
    • +

      modified experimental Windows driver works with xterm + mouse protocol

      +
      • +

    Configuration options

    -

    There are a few new/modified configure options:

    +

    There are a few new configure options:

    -
    --with-abi-version +
    --disable-setuid-environ
    -

    add ABI 7 defaults to configure script.

    +

    Compile with environment restriction, so certain + environment variables are not available when running via a + setuid/setgid application. These are (for example + $TERMINFO) those that allow the search path for the + terminfo or termcap entry to be customized.

    + +

    A setuid/setgid application inherits its environment + variables from the current user, in contrast to sudo which + may limit the environment variables that ncurses uses.

    -
    --with-caps +
    --enable-check-size
    -

    add warning in configure script if file specified for - “--with-caps” does not exist.

    +

    Compile-in feature to detect screensize for terminals + which do not advertise their screensize, e.g., serial + terminals.

    -
    --with-manpage-format +
    --with-abi-altered=NUM
    -

    bzip2 and xz compression are now supported

    +

    Override the displayed (rather than compiled-in) ABI. Only + packagers who have created configurations where the ABI + differs from ncurses should be interested in this option.

    -
    --with-xterm-kbs +
    --with-strip-program=XXX
    -

    add check/warning in configure script if option - “--with-xterm-kbs” is missing or - inconsistent

    +

    When stripping executables during install, use the + specified program rather than “strip” overriding + program chosen by the install program for stripping + executables.

    +
    +
    + +

    These configure options are modified:

    + +
    +
    --with-pkg-config-libdir[=DIR] +
    + +
    +

    The optional DIR parameter can now be + “auto” to automatically use pkg-config's library + directory.

    + +

    The default is $(libdir).

    +
    + +
    --with-xterm-kbs[=XXX] +
    + +
    +

    The default is “auto” which tells the + configure script to choose BS or DEL according to platform + defaults.

    @@ -815,100 +974,117 @@
    • -

      amend configure option's auto-search to account for - systems where none of the directories known to - pkg-config exist

      +

      add/use configure check for clock_gettime, to + supersede gettimeofday.

    • -

      corrected regex needed for older pkg-config used - in Solaris 10

      +

      modify configure script check for pkg-config library + directory to take into account an older version 0.15.0 which + used PKG_CONFIG_PATH but not PKG_CONFIG_LIBDIR

    • -

      improve handling of --with-pkg-config-libdir - option, allowing for the case where either - $PKG_CONFIG_LIBDIR or the option value has a - colon-separated list of directories

      +

      allow for MinGW32-/64-bit configurations to use + _DEFAULT_SOURCE

    • -

      if the --with-pkg-config-libdir option is not - given, use ${libdir}/pkgconfig as a default

      +

      modify CF_XOPEN_SOURCE macro's amend default case to avoid + undefining _XOPEN_SOURCE if _POSIX_C_SOURCE is defined

    • -

      improve search-path check for pkg-config, e.g., - for Debian testing which installs pkg-config with - architecture-prefixes.

      +

      updated configure script macro CF_XOPEN_SOURCE, for + uClibc-ng

    • -

      build-fix for cross-compiling to MingW, conditionally add - -lssp

      +

      modify version-check for gcc/g++, now works for msys2

    • -

      improve configure check for getttynam

      +

      build-fixes related to configure-options and/or + platform:

      + +
        +
      • fix for --enable-fvisibility
        • + +
      • fix for unusual values of + --with-rel-version
        • + +
      • fix for unusual values of + --with-abi-version
        • + +
      • fix for --disable-tcap-names
        • + +
      • fix for termcap in nc_access.h
        • +
    • -

      fixes to build with dietlibc:

      +

      other configure-script improvements:

        -
      • add configure check for fpathconf
        • +
      • recent msys2 headers work with + _DEFAULT_SOURCE; amend check
        • -
      • add configure check for math sine/cosine, needed in - test/tclock, and eliminate pow() from - test/hanoi
        • +
      • use $ac_includes_default in most cases where + stdlib.h should work
        • -
      • use wcsnlen as an alternative to - wmemchr if it is not found
        • +
      • use #error consistently vs "make an + error"
        • + +
      • add configure macro for gettimeofday vs inline + check
      • +
    +

    Here are some of the other portability fixes:

    + +
    • -

      modify configure macro CF_BUILD_CC to check if - the build-compiler works, rather than that it is different - from the cross-compiler, e.g., to accommodate a compiler - which can be used for either purpose with different flags

      +

      modify configure scripts/makefiles to omit + KEY_RESIZE if the corresponding SIGWINCH + feature is disabled

    • -

      modify configure/scripts to work around interference by - GNU grep 3.8

      +

      increase MB_CUR_MAX to 16, matching glibc's + MB_LEN_MAX

      • -
    -

    Here are some of the other portability fixes:

    +
  • +

    add BSD erase2 to characters handled by + tset/reset

    +
    • -
    • -

      change man_db.renames to template, to handle - ncurses*-config script with the - --extra-suffix configure option.

      +

      use getauxval when available, to improve + setuid/setgid checks

    • -

      update CF_XOPEN_SOURCE macro, adding variants - “gnueabi" and “gnueabihf" to get - _DEFAULT_SOURCE special case, as well as adding GNU - libc suffixes for “abi64”, “abin32”, - “x32” to distinguish it from other libc - flavors.

      +

      set dwShareMode in calls to + CreateConsoleScreenBuffer

    • -

      work around musl's nonstandard use of feature - test macros by adding a definition for - NCURSES_WIDECHAR to the generated “.pc” - and *-config files.

      +

      use CreateFile with "CONIN$", + "CONOUT$" rather than GetStdHandle to + obtain a handle on the actual console, avoiding redirection + in the MinGW/Win32 configurations

    • -

      use “command -v” rather than - “type” in Ada95/gen/Makefile.in - to fix a portability issue.

      +

      modify MinGW driver to return KEY_BACKSPACE when + an unmodified VK_BACK virtual key is entered

      +
      • + +
    • +

      modify MinGW configuration to provide for running in + MSYS/MSYS2 shells, assuming ConPTY support

    @@ -927,30 +1103,31 @@
  • -

    ncurses supports all of the - for SVr4 curses features including keyboard mapping, color, - forms-drawing with ACS characters, and automatic recognition +

    ncurses supports the + features of SVr4 curses including keyboard mapping, color, + form drawing with ACS characters, and automatic recognition of keypad and function keys.

  • -

    ncurses provides these SVr4 - add-on libraries (not part of X/Open Curses):

    +

    ncurses provides work-alike + replacements of SVr4 supplemental libraries based on curses, + but which were not specified by X/Open Curses:

    • -

      the panels library, supporting a stack of windows with - backing store.

      +

      the panel library, permitting windows to stack and + overlap

    • -

      the menus library, supporting a uniform but flexible - interface for menu programming.

      +

      the menu library, supporting a uniform but flexible + interface for menu programming

    • the form library, supporting data collection through - on-screen forms.

      + on-screen forms

    • @@ -962,7 +1139,7 @@

    • ncurses supports - user-defined capabilities which it can see, but which are + user-defined capabilities that it can see, but which are hidden from SVr4 curses applications using the same terminal database.

      • @@ -994,8 +1171,8 @@

      • The API is 8-bit clean and base-level conformant with the - X/OPEN curses specification, XSI curses (that is, it - implements all BASE level features, and most + X/Open Curses specification, XSI curses (that is, it + implements all BASE level features, and almost all EXTENDED features). It includes many function calls not supported under SVr4 curses (but portability of all calls is documented so you can use the SVr4 subset only).

        @@ -1135,10 +1312,27 @@
      • -

        The library meets the XSI requirement that every macro - entry point has a corresponding function which may be linked - (and will be prototype-checked) if the macro definition is - disabled with #undef.

        +

        X/Open Curses permits most functions it specifies to be + made available as macros as well. ncurses does this

        + +
          +
        • to improve performance, e.g., for operations composed + of simpler functions such as cursor movement following by + adding text to the screen,
          • + +
        • to simplify the implementation by reusing functions + which use common parameters, e.g., the standard screen + stdscr, and
          • + +
        • to provide functions that return values via their + parameters
          • +
        + +

        Except for the last case, ncurses provides a non-macro + implementation of the function. If the macro definition is + disabled with #undef, or by defining + NCURSES_NOMACROS the function may be linked (and + its calls will be checked against the prototype).

      • @@ -1240,7 +1434,8 @@

        New vi uses ncurses.

        https://sites.google.com/a/bostic.com/keithbostic/vi
        + "https://sites.google.com/a/bostic.com/keithbostic/the-berkeley-vi-editor-home-page"> + https://sites.google.com/a/bostic.com/keithbostic/the-berkeley-vi-editor-home-page

        @@ -1288,7 +1483,7 @@

        terminal emulator for serial modem connections

        https://alioth.debian.org/projects/minicom/

        + "https://salsa.debian.org/minicom-team/minicom">https://salsa.debian.org/minicom-team/minicom

        mosh @@ -1432,19 +1627,17 @@

        https://invisible-island.net/archives/ncurses/6.3/ + "https://invisible-island.net/archives/ncurses/6.4/">https://invisible-island.net/archives/ncurses/6.4/ and
        https://invisible-mirror.net/archives/ncurses/6.3/ .

        + "https://invisible-mirror.net/archives/ncurses/6.4/">https://invisible-mirror.net/archives/ncurses/6.4/ .

        There is an archive of the mailing list here:

        http://lists.gnu.org/archive/html/bug-ncurses - (also https)

        + "https://lists.gnu.org/archive/html/bug-ncurses">https://lists.gnu.org/archive/html/bug-ncurses .

        Related @@ -1486,14 +1679,15 @@ Eric Raymond . Unlike the older version, the termcap and terminfo data are provided in the same file, which also provides - several user-definable extensions beyond the X/Open + several user-definable extensions beyond the X/Open Curses specification.

        You can find lots of information on terminal-related topics - not covered in the terminfo file at - Richard Shuford's archive . The collection of computer - manuals at Richard Shuford's + archive (original). + The collection of computer manuals at bitsavers.org has also been useful.

        diff --git a/c++/Makefile.in b/c++/Makefile.in index 99f21da4..61e25e6b 100644 --- a/c++/Makefile.in +++ b/c++/Makefile.in @@ -1,6 +1,6 @@ -# $Id: Makefile.in,v 1.133 2021/07/03 18:53:57 tom Exp $ +# $Id: Makefile.in,v 1.135 2024/08/11 15:48:44 tom Exp $ ############################################################################## -# Copyright 2018-2020,2021 Thomas E. Dickey # +# Copyright 2018-2021,2024 Thomas E. Dickey # # Copyright 1998-2015,2016 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # @@ -54,7 +54,9 @@ libdir = @libdir@ includedir = @includedir@ includesubdir = @includesubdir@ -INCLUDEDIR = $(DESTDIR)$(includedir)$(includesubdir) +INCLUDEDIR = $(DESTDIR)$(includedir@MERGE_PREFIX@)$(includesubdir) +BINDIR = $(DESTDIR)$(bindir@MERGE_PREFIX@) +LIBDIR = $(DESTDIR)$(libdir@MERGE_PREFIX@) PACKAGE = @PACKAGE@ @@ -191,7 +193,7 @@ sources : $(AUTO_SRC) tags: $(CTAGS) *.[h] *.cc -$(DESTDIR)$(libdir) : +$(LIBDIR) : mkdir -p $@ mostlyclean :: diff --git a/c++/cursesapp.cc b/c++/cursesapp.cc index 81f60983..5cfc105a 100644 --- a/c++/cursesapp.cc +++ b/c++/cursesapp.cc @@ -1,6 +1,6 @@ // * this is for making emacs happy: -*-Mode: C++;-*- /**************************************************************************** - * Copyright 2019,2020 Thomas E. Dickey * + * Copyright 2019-2020,2025 Thomas E. Dickey * * Copyright 1998-2007,2008 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -36,7 +36,7 @@ #include "internal.h" #include "cursesapp.h" -MODULE_ID("$Id: cursesapp.cc,v 1.18 2020/07/18 19:57:11 anonymous.maarten Exp $") +MODULE_ID("$Id: cursesapp.cc,v 1.19 2025/01/25 21:20:17 tom Exp $") void NCursesApplication::init(bool bColors) @@ -65,9 +65,9 @@ NCursesApplication::init(bool bColors) Root_Window->bkgd(' '|window_backgrounds()); } -NCursesApplication* NCursesApplication::theApp = 0; -NCursesWindow* NCursesApplication::titleWindow = 0; -NCursesApplication::SLK_Link* NCursesApplication::slk_stack = 0; +NCursesApplication* NCursesApplication::theApp = NULL; +NCursesWindow* NCursesApplication::titleWindow = NULL; +NCursesApplication::SLK_Link* NCursesApplication::slk_stack = NULL; NCursesWindow *&NCursesApplication::getTitleWindow() { @@ -79,7 +79,7 @@ NCursesApplication::~NCursesApplication() THROWS(NCursesException) Soft_Label_Key_Set* S; delete titleWindow; - titleWindow = 0; + titleWindow = NULL; while( (S=top()) ) { pop(); @@ -87,7 +87,7 @@ NCursesApplication::~NCursesApplication() THROWS(NCursesException) } delete Root_Window; - Root_Window = 0; + Root_Window = NULL; ::endwin(); } @@ -105,7 +105,7 @@ int NCursesApplication::rinit(NCursesWindow& w) void NCursesApplication::push(Soft_Label_Key_Set& S) { SLK_Link* L = new SLK_Link; - assert(L != 0); + assert(L != NULL); L->prev = slk_stack; L->SLKs = &S; slk_stack = L; @@ -121,7 +121,7 @@ bool NCursesApplication::pop() delete L; if (Root_Window) { Soft_Label_Key_Set* xx = top(); - if (xx != 0) + if (xx != NULL) xx->show(); } } @@ -139,7 +139,7 @@ Soft_Label_Key_Set* NCursesApplication::top() const int NCursesApplication::operator()(void) { bool bColors = b_Colors; - Soft_Label_Key_Set* S = 0; + Soft_Label_Key_Set* S = NULL; int ts = titlesize(); if (ts>0) @@ -147,7 +147,7 @@ int NCursesApplication::operator()(void) Soft_Label_Key_Set::Label_Layout fmt = useSLKs(); if (fmt!=Soft_Label_Key_Set::None) { S = new Soft_Label_Key_Set(fmt); - assert(S != 0); + assert(S != NULL); init_labels(*S); } diff --git a/c++/cursesf.cc b/c++/cursesf.cc index 5d316489..747564da 100644 --- a/c++/cursesf.cc +++ b/c++/cursesf.cc @@ -1,6 +1,6 @@ // * this is for making emacs happy: -*-Mode: C++;-*- /**************************************************************************** - * Copyright 2019-2020,2021 Thomas E. Dickey * + * Copyright 2019-2024,2025 Thomas E. Dickey * * Copyright 1998-2005,2011 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -36,7 +36,7 @@ #include "cursesf.h" #include "cursesapp.h" -MODULE_ID("$Id: cursesf.cc,v 1.26 2021/04/17 18:11:08 tom Exp $") +MODULE_ID("$Id: cursesf.cc,v 1.28 2025/01/25 21:20:17 tom Exp $") NCursesFormField::~NCursesFormField () THROWS(NCursesException) { @@ -50,33 +50,39 @@ NCursesFormField::~NCursesFormField () THROWS(NCursesException) FIELD** NCursesForm::mapFields(NCursesFormField* nfields[]) { - int fieldCount = 0,lcv; + int fieldCount = 0, lcv; FIELD** old_fields; - assert(nfields != 0); + assert(nfields != NULL); for (lcv=0; nfields[lcv]->field; ++lcv) ++fieldCount; - FIELD** fields = new FIELD*[fieldCount + 1]; + try { + FIELD** fields = new FIELD*[fieldCount + 1]; - for (lcv=0;nfields[lcv]->field;++lcv) { - fields[lcv] = nfields[lcv]->field; - } - fields[lcv] = NULL; + for (lcv=0;nfields[lcv]->field;++lcv) { + fields[lcv] = nfields[lcv]->field; + } + fields[lcv] = NULL; - my_fields = nfields; + my_fields = nfields; - if (form && (old_fields = ::form_fields(form))) { - ::set_form_fields(form, static_cast(0)); - delete[] old_fields; + if (form && (old_fields = ::form_fields(form))) { + ::set_form_fields(form, static_cast(0)); + delete[] old_fields; + } + return fields; } - return fields; + catch (std::bad_alloc const&) { + OnError (E_SYSTEM_ERROR); + } + return NULL; } void NCursesForm::setDefaultAttributes() { - NCursesApplication* S = NCursesApplication::getApplication(); + const NCursesApplication* S = NCursesApplication::getApplication(); int n = count(); if (n > 0) { @@ -108,46 +114,51 @@ NCursesForm::InitForm(NCursesFormField* nfields[], bool with_frame, bool autoDelete_Fields) { - int mrows, mcols; - - keypad(TRUE); - meta(TRUE); - - b_framed = with_frame; - b_autoDelete = autoDelete_Fields; - - form = static_cast(0); - form = ::new_form(mapFields(nfields)); - if (!form) - OnError (E_SYSTEM_ERROR); - - UserHook* hook = new UserHook; - hook->m_user = NULL; - hook->m_back = this; - hook->m_owner = form; - ::set_form_userptr(form, reinterpret_cast(hook)); - - ::set_form_init (form, _nc_xx_frm_init); - ::set_form_term (form, _nc_xx_frm_term); - ::set_field_init (form, _nc_xx_fld_init); - ::set_field_term (form, _nc_xx_fld_term); - - scale(mrows, mcols); - ::set_form_win(form, w); - - if (with_frame) { - if ((mrows > height()-2) || (mcols > width()-2)) - OnError(E_NO_ROOM); - sub = new NCursesWindow(*this,mrows,mcols,1,1,'r'); - ::set_form_sub(form, sub->w); - b_sub_owner = TRUE; + try { + int mrows, mcols; + + keypad(TRUE); + meta(TRUE); + + b_framed = with_frame; + b_autoDelete = autoDelete_Fields; + + form = static_cast(0); + form = ::new_form(mapFields(nfields)); + if (!form) + OnError (E_SYSTEM_ERROR); + + UserHook* hook = new UserHook; + hook->m_user = NULL; + hook->m_back = this; + hook->m_owner = form; + ::set_form_userptr(form, reinterpret_cast(hook)); + + ::set_form_init (form, _nc_xx_frm_init); + ::set_form_term (form, _nc_xx_frm_term); + ::set_field_init (form, _nc_xx_fld_init); + ::set_field_term (form, _nc_xx_fld_term); + + scale(mrows, mcols); + ::set_form_win(form, w); + + if (with_frame) { + if ((mrows > height()-2) || (mcols > width()-2)) + OnError(E_NO_ROOM); + sub = new NCursesWindow(*this,mrows,mcols,1,1,'r'); + ::set_form_sub(form, sub->w); + b_sub_owner = TRUE; + } + else { + sub = static_cast(NULL); + b_sub_owner = FALSE; + } + options_on(O_NL_OVERLOAD); + setDefaultAttributes(); } - else { - sub = static_cast(0); - b_sub_owner = FALSE; + catch (std::bad_alloc const&) { + OnError (E_SYSTEM_ERROR); } - options_on(O_NL_OVERLOAD); - setDefaultAttributes(); } NCursesForm::~NCursesForm() THROWS(NCursesException) @@ -156,13 +167,13 @@ NCursesForm::~NCursesForm() THROWS(NCursesException) delete hook; if (b_sub_owner) { delete sub; - ::set_form_sub(form, static_cast(0)); + ::set_form_sub(form, static_cast(NULL)); } if (form) { FIELD** fields = ::form_fields(form); int cnt = count(); - OnError(::set_form_fields(form, static_cast(0))); + OnError(::set_form_fields(form, static_cast(NULL))); if (b_autoDelete) { if (cnt>0) { @@ -381,19 +392,19 @@ bool _nc_xx_fld_fcheck(FIELD *f, const void *u) { (void) f; NCursesFormField* F = reinterpret_cast(const_cast(u)); - assert(F != 0); + assert(F != NULL); UserDefinedFieldType* udf = reinterpret_cast(F->fieldtype()); - assert(udf != 0); + assert(udf != NULL); return udf->field_check(*F); } bool _nc_xx_fld_ccheck(int c, const void *u) { NCursesFormField* F = reinterpret_cast(const_cast(u)); - assert(F != 0); + assert(F != NULL); UserDefinedFieldType* udf = reinterpret_cast(F->fieldtype()); - assert(udf != 0); + assert(udf != NULL); return udf->char_check(c); } @@ -423,10 +434,10 @@ bool _nc_xx_next_choice(FIELD *f, const void *u) { (void) f; NCursesFormField* F = reinterpret_cast(const_cast(u)); - assert(F != 0); + assert(F != NULL); UserDefinedFieldType_With_Choice* udf = reinterpret_cast(F->fieldtype()); - assert(udf != 0); + assert(udf != NULL); return udf->next(*F); } @@ -434,10 +445,10 @@ bool _nc_xx_prev_choice(FIELD *f, const void *u) { (void) f; NCursesFormField* F = reinterpret_cast(const_cast(u)); - assert(F != 0); + assert(F != NULL); UserDefinedFieldType_With_Choice* udf = reinterpret_cast(F->fieldtype()); - assert(udf != 0); + assert(udf != NULL); return udf->previous(*F); } diff --git a/c++/cursesf.h b/c++/cursesf.h index e29e7adb..7d6c2b71 100644 --- a/c++/cursesf.h +++ b/c++/cursesf.h @@ -1,7 +1,7 @@ // * This makes emacs happy -*-Mode: C++;-*- // vile:cppmode /**************************************************************************** - * Copyright 2019-2021,2022 Thomas E. Dickey * + * Copyright 2019-2024,2025 Thomas E. Dickey * * Copyright 1998-2012,2014 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -33,7 +33,7 @@ * Author: Juergen Pfeifer, 1997 * ****************************************************************************/ -// $Id: cursesf.h,v 1.39 2022/08/20 20:52:15 tom Exp $ +// $Id: cursesf.h,v 1.41 2025/01/25 21:20:17 tom Exp $ #ifndef NCURSES_CURSESF_H_incl #define NCURSES_CURSESF_H_incl 1 @@ -78,7 +78,7 @@ class NCURSES_CXX_IMPEXP NCursesFieldType public: NCursesFieldType() - : fieldtype(STATIC_CAST(FIELDTYPE*)(0)) + : fieldtype(STATIC_CAST(FIELDTYPE*)(NULL)) { } @@ -119,8 +119,8 @@ class NCURSES_CXX_IMPEXP NCursesFormField public: // Create a 'Null' field. Can be used to delimit a field list NCursesFormField() - : field(STATIC_CAST(FIELD*)(0)), - ftype(STATIC_CAST(NCursesFieldType*)(0)) + : field(STATIC_CAST(FIELD*)(NULL)), + ftype(STATIC_CAST(NCursesFieldType*)(NULL)) { } @@ -131,8 +131,8 @@ class NCURSES_CXX_IMPEXP NCursesFormField int first_col = 0, int offscreen_rows = 0, int additional_buffers = 0) - : field(0), - ftype(STATIC_CAST(NCursesFieldType*)(0)) + : field(NULL), + ftype(STATIC_CAST(NCursesFieldType*)(NULL)) { field = ::new_field(rows, ncols, first_row, first_col, offscreen_rows, additional_buffers); @@ -363,7 +363,7 @@ class NCURSES_CXX_IMPEXP NCursesForm : public NCursesPanel // Get the backward pointer to the C++ object from a FORM static inline NCursesForm* getHook(const FORM *f) { UserHook* hook = reinterpret_cast(::form_userptr(f)); - assert(hook != 0 && hook->m_owner==f); + assert(hook != NULL && hook->m_owner==f); return const_cast(hook->m_back); } @@ -379,13 +379,13 @@ class NCURSES_CXX_IMPEXP NCursesForm : public NCursesPanel // internal routines inline void set_user(void *user) { UserHook* uptr = reinterpret_cast(::form_userptr (form)); - assert (uptr != 0 && uptr->m_back==this && uptr->m_owner==form); + assert (uptr != NULL && uptr->m_back==this && uptr->m_owner==form); uptr->m_user = user; } inline void *get_user() { - UserHook* uptr = reinterpret_cast(::form_userptr (form)); - assert (uptr != 0 && uptr->m_back==this && uptr->m_owner==form); + const UserHook* uptr = reinterpret_cast(::form_userptr (form)); + assert (uptr != NULL && uptr->m_back==this && uptr->m_owner==form); return uptr->m_user; } @@ -408,12 +408,12 @@ class NCURSES_CXX_IMPEXP NCursesForm : public NCursesPanel int begin_y = 0, int begin_x = 0) : NCursesPanel(nlines, ncols, begin_y, begin_x), - form (STATIC_CAST(FORM*)(0)), - sub(0), + form (STATIC_CAST(FORM*)(NULL)), + sub(NULL), b_sub_owner(0), b_framed(0), b_autoDelete(0), - my_fields(0) + my_fields(NULL) { } @@ -423,12 +423,12 @@ class NCURSES_CXX_IMPEXP NCursesForm : public NCursesPanel bool with_frame=FALSE, // reserve space for a frame? bool autoDelete_Fields=FALSE) // do automatic cleanup? : NCursesPanel(), - form(0), - sub(0), + form(NULL), + sub(NULL), b_sub_owner(0), b_framed(0), b_autoDelete(0), - my_fields(0) + my_fields(NULL) { InitForm(Fields, with_frame, autoDelete_Fields); } @@ -442,12 +442,12 @@ class NCURSES_CXX_IMPEXP NCursesForm : public NCursesPanel bool with_frame=FALSE, // reserve space for a frame? bool autoDelete_Fields=FALSE) // do automatic cleanup? : NCursesPanel(nlines, ncols, begin_y, begin_x), - form(0), - sub(0), + form(NULL), + sub(NULL), b_sub_owner(0), b_framed(0), b_autoDelete(0), - my_fields(0) + my_fields(NULL) { InitForm(Fields, with_frame, autoDelete_Fields); } @@ -681,7 +681,7 @@ template class NCURSES_CXX_IMPEXP NCursesUserForm : public NCursesForm public: NCursesUserForm (NCursesFormField* Fields[], - const T* p_UserData = STATIC_CAST(T*)(0), + const T* p_UserData = STATIC_CAST(T*)(NULL), bool with_frame=FALSE, bool autoDelete_Fields=FALSE) : NCursesForm (Fields, with_frame, autoDelete_Fields) { @@ -694,7 +694,7 @@ template class NCURSES_CXX_IMPEXP NCursesUserForm : public NCursesForm int ncols, int begin_y = 0, int begin_x = 0, - const T* p_UserData = STATIC_CAST(T*)(0), + const T* p_UserData = STATIC_CAST(T*)(NULL), bool with_frame=FALSE, bool autoDelete_Fields=FALSE) : NCursesForm (Fields, nlines, ncols, begin_y, begin_x, diff --git a/c++/cursesm.cc b/c++/cursesm.cc index 64f36358..e7553917 100644 --- a/c++/cursesm.cc +++ b/c++/cursesm.cc @@ -1,6 +1,6 @@ // * this is for making emacs happy: -*-Mode: C++;-*- /**************************************************************************** - * Copyright 2019-2020,2021 Thomas E. Dickey * + * Copyright 2019-2024,2025 Thomas E. Dickey * * Copyright 1998-2011,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -36,7 +36,7 @@ #include "cursesm.h" #include "cursesapp.h" -MODULE_ID("$Id: cursesm.cc,v 1.27 2021/04/17 18:11:08 tom Exp $") +MODULE_ID("$Id: cursesm.cc,v 1.29 2025/01/25 21:20:17 tom Exp $") NCursesMenuItem::~NCursesMenuItem() THROWS(NCursesException) { @@ -100,23 +100,28 @@ _nc_xx_itm_term(MENU *m) ITEM** NCursesMenu::mapItems(NCursesMenuItem* nitems[]) { - int itemCount = 0,lcv; + try { + int itemCount = 0,lcv; - for (lcv=0; nitems[lcv]->item; ++lcv) - ++itemCount; + for (lcv=0; nitems[lcv]->item; ++lcv) + ++itemCount; - ITEM** itemArray = new ITEM*[itemCount + 1]; + ITEM** itemArray = new ITEM*[itemCount + 1]; - for (lcv=0;nitems[lcv]->item;++lcv) { - itemArray[lcv] = nitems[lcv]->item; - } - itemArray[lcv] = NULL; + for (lcv=0;nitems[lcv]->item;++lcv) { + itemArray[lcv] = nitems[lcv]->item; + } + itemArray[lcv] = NULL; - my_items = nitems; + my_items = nitems; - if (menu) - delete[] ::menu_items(menu); - return itemArray; + if (menu) + delete[] ::menu_items(menu); + return itemArray; + } + catch (std::bad_alloc const&) { + } + return NULL; } void @@ -124,51 +129,56 @@ NCursesMenu::InitMenu(NCursesMenuItem* nitems[], bool with_frame, bool autoDelete_Items) { - int mrows, mcols; - - keypad(TRUE); - meta(TRUE); - - b_framed = with_frame; - b_autoDelete = autoDelete_Items; - - menu = static_cast(0); - menu = ::new_menu(mapItems(nitems)); - if (!menu) - OnError (E_SYSTEM_ERROR); - - UserHook* hook = new UserHook; - hook->m_user = NULL; - hook->m_back = this; - hook->m_owner = menu; - ::set_menu_userptr(menu, static_cast(hook)); - - ::set_menu_init (menu, _nc_xx_mnu_init); - ::set_menu_term (menu, _nc_xx_mnu_term); - ::set_item_init (menu, _nc_xx_itm_init); - ::set_item_term (menu, _nc_xx_itm_term); - - scale(mrows, mcols); - ::set_menu_win(menu, w); - - if (with_frame) { - if ((mrows > height()-2) || (mcols > width()-2)) - OnError(E_NO_ROOM); - sub = new NCursesWindow(*this,mrows,mcols,1,1,'r'); - ::set_menu_sub(menu, sub->w); - b_sub_owner = TRUE; + try { + int mrows, mcols; + + keypad(TRUE); + meta(TRUE); + + b_framed = with_frame; + b_autoDelete = autoDelete_Items; + + menu = static_cast(NULL); + menu = ::new_menu(mapItems(nitems)); + if (!menu) + OnError (E_SYSTEM_ERROR); + + UserHook* hook = new UserHook; + hook->m_user = NULL; + hook->m_back = this; + hook->m_owner = menu; + ::set_menu_userptr(menu, static_cast(hook)); + + ::set_menu_init (menu, _nc_xx_mnu_init); + ::set_menu_term (menu, _nc_xx_mnu_term); + ::set_item_init (menu, _nc_xx_itm_init); + ::set_item_term (menu, _nc_xx_itm_term); + + scale(mrows, mcols); + ::set_menu_win(menu, w); + + if (with_frame) { + if ((mrows > height()-2) || (mcols > width()-2)) + OnError(E_NO_ROOM); + sub = new NCursesWindow(*this,mrows,mcols,1,1,'r'); + ::set_menu_sub(menu, sub->w); + b_sub_owner = TRUE; + } + else { + sub = static_cast(NULL); + b_sub_owner = FALSE; + } + setDefaultAttributes(); } - else { - sub = static_cast(0); - b_sub_owner = FALSE; + catch (std::bad_alloc const&) { + OnError (E_SYSTEM_ERROR); } - setDefaultAttributes(); } void NCursesMenu::setDefaultAttributes() { - NCursesApplication* S = NCursesApplication::getApplication(); + const NCursesApplication* S = NCursesApplication::getApplication(); if (S) { ::set_menu_fore(menu, S->foregrounds()); ::set_menu_back(menu, S->backgrounds()); @@ -181,14 +191,14 @@ NCursesMenu::~NCursesMenu() THROWS(NCursesException) UserHook* hook = reinterpret_cast(::menu_userptr(menu)); delete hook; if (b_sub_owner) { - ::set_menu_sub(menu, static_cast(0)); + ::set_menu_sub(menu, static_cast(NULL)); delete sub; } if (menu) { ITEM** itms = ::menu_items(menu); int cnt = count(); - OnError(::set_menu_items(menu, static_cast(0))); + OnError(::set_menu_items(menu, static_cast(NULL))); if (b_autoDelete) { if (cnt>0) { @@ -322,7 +332,7 @@ NCursesMenu::operator()(void) if (drvCmnd == CMD_ACTION) { if (options() & O_ONEVALUE) { NCursesMenuItem* itm = current_item(); - assert(itm != 0); + assert(itm != NULL); if (itm->options() & O_SELECTABLE) { b_action = itm->action(); diff --git a/c++/cursesm.h b/c++/cursesm.h index 9651195f..6e4a184c 100644 --- a/c++/cursesm.h +++ b/c++/cursesm.h @@ -1,6 +1,6 @@ // * This makes emacs happy -*-Mode: C++;-*- /**************************************************************************** - * Copyright 2019-2020,2022 Thomas E. Dickey * + * Copyright 2019-2024,2025 Thomas E. Dickey * * Copyright 1998-2012,2014 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -32,7 +32,7 @@ * Author: Juergen Pfeifer, 1997 * ****************************************************************************/ -// $Id: cursesm.h,v 1.35 2022/08/20 20:52:15 tom Exp $ +// $Id: cursesm.h,v 1.37 2025/01/25 21:20:17 tom Exp $ #ifndef NCURSES_CURSESM_H_incl #define NCURSES_CURSESM_H_incl 1 @@ -62,9 +62,9 @@ class NCURSES_CXX_IMPEXP NCursesMenuItem public: NCursesMenuItem (const char* p_name = NULL, const char* p_descript = NULL) - : item(0) + : item(NULL) { - item = p_name ? ::new_item (p_name, p_descript) : STATIC_CAST(ITEM*)(0); + item = p_name ? ::new_item (p_name, p_descript) : STATIC_CAST(ITEM*)(NULL); if (p_name && !item) OnError (E_SYSTEM_ERROR); } @@ -81,7 +81,7 @@ class NCURSES_CXX_IMPEXP NCursesMenuItem } NCursesMenuItem(const NCursesMenuItem& rhs) - : item(0) + : item(NULL) { (void) rhs; } @@ -176,7 +176,7 @@ class NCURSES_CXX_IMPEXP NCursesMenuCallbackItem : public NCursesMenuItem NCursesMenuCallbackItem(const NCursesMenuCallbackItem& rhs) : NCursesMenuItem(rhs), - p_fct(0) + p_fct(NULL) { } @@ -224,7 +224,7 @@ class NCURSES_CXX_IMPEXP NCursesMenu : public NCursesPanel // Get the backward pointer to the C++ object from a MENU static inline NCursesMenu* getHook(const MENU *m) { UserHook* hook = STATIC_CAST(UserHook*)(::menu_userptr(m)); - assert(hook != 0 && hook->m_owner==m); + assert(hook != NULL && hook->m_owner==m); return const_cast(hook->m_back); } @@ -240,13 +240,13 @@ class NCURSES_CXX_IMPEXP NCursesMenu : public NCursesPanel // internal routines inline void set_user(void *user) { UserHook* uptr = STATIC_CAST(UserHook*)(::menu_userptr (menu)); - assert (uptr != 0 && uptr->m_back==this && uptr->m_owner==menu); + assert (uptr != NULL && uptr->m_back==this && uptr->m_owner==menu); uptr->m_user = user; } inline void *get_user() { - UserHook* uptr = STATIC_CAST(UserHook*)(::menu_userptr (menu)); - assert (uptr != 0 && uptr->m_back==this && uptr->m_owner==menu); + const UserHook* uptr = STATIC_CAST(UserHook*)(::menu_userptr (menu)); + assert (uptr != NULL && uptr->m_back==this && uptr->m_owner==menu); return uptr->m_user; } @@ -270,11 +270,11 @@ class NCURSES_CXX_IMPEXP NCursesMenu : public NCursesPanel int begin_x = 0) : NCursesPanel(nlines,ncols,begin_y,begin_x), menu (STATIC_CAST(MENU*)(0)), - sub(0), + sub(NULL), b_sub_owner(0), b_framed(0), b_autoDelete(0), - my_items(0) + my_items(NULL) { } @@ -284,12 +284,12 @@ class NCURSES_CXX_IMPEXP NCursesMenu : public NCursesPanel bool with_frame=FALSE, // Reserve space for a frame? bool autoDelete_Items=FALSE) // Autocleanup of Items? : NCursesPanel(), - menu(0), - sub(0), + menu(NULL), + sub(NULL), b_sub_owner(0), b_framed(0), b_autoDelete(0), - my_items(0) + my_items(NULL) { InitMenu(Items, with_frame, autoDelete_Items); } @@ -303,12 +303,12 @@ class NCURSES_CXX_IMPEXP NCursesMenu : public NCursesPanel bool with_frame=FALSE, // Reserve space for a frame? bool autoDelete_Items=FALSE) // Autocleanup of Items? : NCursesPanel(nlines, ncols, begin_y, begin_x), - menu(0), - sub(0), + menu(NULL), + sub(NULL), b_sub_owner(0), b_framed(0), b_autoDelete(0), - my_items(0) + my_items(NULL) { InitMenu(Items, with_frame, autoDelete_Items); } @@ -601,7 +601,7 @@ template class NCURSES_CXX_IMPEXP NCursesUserItem : public NCursesMenuI public: NCursesUserItem (const char* p_name, const char* p_descript = NULL, - const T* p_UserData = STATIC_CAST(T*)(0)) + const T* p_UserData = STATIC_CAST(T*)(NULL)) : NCursesMenuItem (p_name, p_descript) { if (item) OnError (::set_item_userptr (item, const_cast(reinterpret_cast(p_UserData)))); @@ -630,7 +630,7 @@ template class NCURSES_CXX_IMPEXP NCursesUserMenu : public NCursesMenu int ncols, int begin_y = 0, int begin_x = 0, - const T* p_UserData = STATIC_CAST(T*)(0)) + const T* p_UserData = STATIC_CAST(T*)(NULL)) : NCursesMenu(nlines,ncols,begin_y,begin_x) { if (menu) set_user (const_cast(reinterpret_cast(p_UserData))); @@ -638,7 +638,7 @@ template class NCURSES_CXX_IMPEXP NCursesUserMenu : public NCursesMenu public: NCursesUserMenu (NCursesMenuItem* Items[], - const T* p_UserData = STATIC_CAST(T*)(0), + const T* p_UserData = STATIC_CAST(T*)(NULL), bool with_frame=FALSE, bool autoDelete_Items=FALSE) : NCursesMenu (Items, with_frame, autoDelete_Items) { @@ -651,7 +651,7 @@ template class NCURSES_CXX_IMPEXP NCursesUserMenu : public NCursesMenu int ncols, int begin_y = 0, int begin_x = 0, - const T* p_UserData = STATIC_CAST(T*)(0), + const T* p_UserData = STATIC_CAST(T*)(NULL), bool with_frame=FALSE) : NCursesMenu (Items, nlines, ncols, begin_y, begin_x, with_frame) { if (menu) diff --git a/c++/cursesp.cc b/c++/cursesp.cc index 58b2a8fa..65497030 100644 --- a/c++/cursesp.cc +++ b/c++/cursesp.cc @@ -1,6 +1,6 @@ // * this is for making emacs happy: -*-Mode: C++;-*- /**************************************************************************** - * Copyright 2019,2020 Thomas E. Dickey * + * Copyright 2019-2024,2025 Thomas E. Dickey * * Copyright 1998-2003,2005 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -35,9 +35,9 @@ #include "internal.h" #include "cursesp.h" -MODULE_ID("$Id: cursesp.cc,v 1.27 2020/02/02 23:34:34 tom Exp $") +MODULE_ID("$Id: cursesp.cc,v 1.29 2025/01/25 21:20:17 tom Exp $") -NCursesPanel* NCursesPanel::dummy = static_cast(0); +NCursesPanel* NCursesPanel::dummy = static_cast(NULL); void NCursesPanel::init() { @@ -55,7 +55,7 @@ void NCursesPanel::init() NCursesPanel::~NCursesPanel() THROWS(NCursesException) { UserHook* hook = UserPointer(); - assert(hook != 0 && hook->m_back==this && hook->m_owner==p); + assert(hook != NULL && hook->m_back==this && hook->m_owner==p); delete hook; ::del_panel(p); ::update_panels(); @@ -64,7 +64,7 @@ NCursesPanel::~NCursesPanel() THROWS(NCursesException) void NCursesPanel::redraw() { - PANEL *pan; + const PANEL *pan; pan = ::panel_above(NULL); while (pan) { diff --git a/c++/cursesp.h b/c++/cursesp.h index f0bd5c9c..e0bc550a 100644 --- a/c++/cursesp.h +++ b/c++/cursesp.h @@ -1,7 +1,7 @@ // * This makes emacs happy -*-Mode: C++;-*- // vile:cppmode /**************************************************************************** - * Copyright 2019-2021,2022 Thomas E. Dickey * + * Copyright 2019-2022,2025 Thomas E. Dickey * * Copyright 1998-2012,2014 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -36,7 +36,7 @@ #ifndef NCURSES_CURSESP_H_incl #define NCURSES_CURSESP_H_incl 1 -// $Id: cursesp.h,v 1.36 2022/08/20 20:52:15 tom Exp $ +// $Id: cursesp.h,v 1.37 2025/01/25 21:20:17 tom Exp $ #include @@ -73,7 +73,7 @@ class NCURSES_CXX_IMPEXP NCursesPanel void set_user(void *user) { UserHook* uptr = UserPointer(); - if (uptr != 0 && uptr->m_back==this && uptr->m_owner==p) { + if (uptr != NULL && uptr->m_back==this && uptr->m_owner==p) { uptr->m_user = user; } } @@ -82,8 +82,8 @@ class NCURSES_CXX_IMPEXP NCursesPanel void *get_user() { UserHook* uptr = UserPointer(); - void *result = 0; - if (uptr != 0 && uptr->m_back==this && uptr->m_owner==p) + void *result = NULL; + if (uptr != NULL && uptr->m_back==this && uptr->m_owner==p) result = uptr->m_user; return result; } @@ -104,14 +104,14 @@ class NCURSES_CXX_IMPEXP NCursesPanel int ncols, int begin_y = 0, int begin_x = 0) - : NCursesWindow(nlines,ncols,begin_y,begin_x), p(0) + : NCursesWindow(nlines,ncols,begin_y,begin_x), p(NULL) { init(); } // Create a panel with this size starting at the requested position. NCursesPanel() - : NCursesWindow(::stdscr), p(0) + : NCursesWindow(::stdscr), p(NULL) { init(); } @@ -244,7 +244,7 @@ template class NCursesUserPanel : public NCursesPanel // This creates an user panel of the requested size with associated // user data pointed to by p_UserData. - explicit NCursesUserPanel(const T* p_UserData = STATIC_CAST(T*)(0)) : NCursesPanel() + explicit NCursesUserPanel(const T* p_UserData = STATIC_CAST(T*)(NULL)) : NCursesPanel() { if (p) set_user(const_cast(reinterpret_cast(p_UserData))); diff --git a/c++/cursespad.cc b/c++/cursespad.cc index 6065923b..010e51a1 100644 --- a/c++/cursespad.cc +++ b/c++/cursespad.cc @@ -1,6 +1,6 @@ // * this is for making emacs happy: -*-Mode: C++;-*- /**************************************************************************** - * Copyright 2020 Thomas E. Dickey * + * Copyright 2020-2024,2025 Thomas E. Dickey * * Copyright 1999-2012,2013 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -36,17 +36,17 @@ #include -MODULE_ID("$Id: cursespad.cc,v 1.18 2020/02/02 23:34:34 tom Exp $") +MODULE_ID("$Id: cursespad.cc,v 1.20 2025/01/25 21:21:05 tom Exp $") NCursesPad::NCursesPad(int nlines, int ncols) : NCursesWindow(), - viewWin(static_cast(0)), - viewSub(static_cast(0)), + viewWin(static_cast(NULL)), + viewSub(static_cast(NULL)), h_gridsize(0), v_gridsize(0), min_row(0), min_col(0) { w = ::newpad(nlines, ncols); - if (static_cast(0) == w) { + if (static_cast(NULL) == w) { count--; err_handler("Cannot construct window"); } @@ -85,7 +85,7 @@ void NCursesPad::operator()(void) { NCursesWindow* W = Win(); - if (static_cast(0) != W) { + if (static_cast(NULL) != W) { int Width = W->width(); int Height = W->height(); @@ -170,7 +170,7 @@ void NCursesPad::operator()(void) int NCursesPad::refresh() { int res = noutrefresh(); - if (res==OK && (static_cast(0) != viewWin)) { + if (res==OK && (static_cast(NULL) != viewWin)) { res = (viewWin->refresh()); } return(res); @@ -180,7 +180,7 @@ int NCursesPad::noutrefresh() { int res = OK; NCursesWindow* W = Win(); - if (static_cast(0) != W) { + if (static_cast(NULL) != W) { int high = W->maxy(); int wide = W->maxx(); res = copywin(*W, min_row, min_col, @@ -210,9 +210,9 @@ void NCursesPad::setWindow(NCursesWindow& view, void NCursesPad::setSubWindow(NCursesWindow& sub) { - if (static_cast(0) == viewWin) + if (static_cast(NULL) == viewWin) err_handler("Pad has no viewport"); - assert(viewWin != 0); + assert(viewWin != NULL); if (!viewWin->isDescendant(sub)) THROW(new NCursesException("NCursesFramePad", E_SYSTEM_ERROR)); viewSub = ⊂ @@ -221,10 +221,10 @@ void NCursesPad::setSubWindow(NCursesWindow& sub) void NCursesFramedPad::OnOperation(int pad_req) { (void) pad_req; - NCursesWindow* W = Win(); + const NCursesWindow* W = Win(); NCursesWindow* W2 = getWindow(); - if ((static_cast(0) != W) && (static_cast(0) != W2)) { + if ((static_cast(NULL) != W) && (static_cast(NULL) != W2)) { int Width = W->width(); int Height = W->height(); int i, row, col, h_len, v_len; diff --git a/c++/cursesw.cc b/c++/cursesw.cc index 8ea265cb..835e9095 100644 --- a/c++/cursesw.cc +++ b/c++/cursesw.cc @@ -1,6 +1,6 @@ // * this is for making emacs happy: -*-Mode: C++;-*- /**************************************************************************** - * Copyright 2019,2020 Thomas E. Dickey * + * Copyright 2019-2020,2025 Thomas E. Dickey * * Copyright 1998-2012,2014 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -43,7 +43,7 @@ #include "internal.h" #include "cursesw.h" -MODULE_ID("$Id: cursesw.cc,v 1.56 2020/02/02 23:34:34 tom Exp $") +MODULE_ID("$Id: cursesw.cc,v 1.57 2025/01/25 21:21:05 tom Exp $") #define COLORS_NEED_INITIALIZATION -1 #define COLORS_NOT_INITIALIZED 0 @@ -188,27 +188,27 @@ NCursesWindow::constructing() } NCursesWindow::NCursesWindow() - : w(0), alloced(FALSE), par(0), subwins(0), sib(0) + : w(NULL), alloced(FALSE), par(NULL), subwins(NULL), sib(NULL) { constructing(); - w = static_cast(0); + w = static_cast(NULL); } NCursesWindow::NCursesWindow(int nlines, int ncols, int begin_y, int begin_x) - : w(0), alloced(TRUE), par(0), subwins(0), sib(0) + : w(NULL), alloced(TRUE), par(NULL), subwins(NULL), sib(NULL) { constructing(); w = ::newwin(nlines, ncols, begin_y, begin_x); - if (w == 0) { + if (w == NULL) { err_handler("Cannot construct window"); } set_keyboard(); } NCursesWindow::NCursesWindow(WINDOW* window) - : w(0), alloced(FALSE), par(0), subwins(0), sib(0) + : w(NULL), alloced(FALSE), par(NULL), subwins(NULL), sib(NULL) { constructing(); @@ -223,7 +223,7 @@ NCursesWindow::NCursesWindow(WINDOW* window) NCursesWindow::NCursesWindow(NCursesWindow& win, int ny, int nx, int begin_y, int begin_x, char absrel) - : w(0), alloced(TRUE), par(0), subwins(0), sib(0) + : w(NULL), alloced(TRUE), par(NULL), subwins(NULL), sib(NULL) { constructing(); if (absrel == 'a') { // absolute origin @@ -234,7 +234,7 @@ NCursesWindow::NCursesWindow(NCursesWindow& win, int ny, int nx, // Link this window into its parent's list of subwindows. // We use derwin(), since this also works for pads. w = ::derwin(win.w, ny, nx, begin_y, begin_x); - if (w == 0) { + if (w == NULL) { err_handler("Cannot construct subwindow"); } @@ -245,20 +245,20 @@ NCursesWindow::NCursesWindow(NCursesWindow& win, int ny, int nx, NCursesWindow::NCursesWindow(NCursesWindow& win, bool do_box NCURSES_PARAM_INIT(TRUE)) - : w(0), alloced(TRUE), par(0), subwins(0), sib(0) + : w(NULL), alloced(TRUE), par(NULL), subwins(NULL), sib(NULL) { constructing(); int myHeight = win.height(); int myWidth = win.width(); w = :: derwin(win.w, myHeight - 2, myWidth - 2, 1, 1); - if (w == 0) { + if (w == NULL) { err_handler("Cannot construct subwindow"); } par = &win; sib = win.subwins; win.subwins = this; - subwins = 0; + subwins = NULL; if (do_box) { win.box(); @@ -283,7 +283,7 @@ static int r_init_idx = 0; static RIPOFFINIT* prip = R_INIT; NCursesWindow::NCursesWindow(WINDOW *win, int ncols) - : w(0), alloced(FALSE), par(0), subwins(0), sib(0) + : w(NULL), alloced(FALSE), par(NULL), subwins(NULL), sib(NULL) { (void) ncols; initialize(); @@ -331,12 +331,12 @@ NCursesWindow::kill_subwindows() { NCursesWindow* p = subwins; - subwins = 0; - while (p != 0) { + subwins = NULL; + while (p != NULL) { NCursesWindow* q = p->sib; p->kill_subwindows(); if (p->alloced) { - if (p->w != 0) + if (p->w != NULL) ::delwin(p->w); } delete p; @@ -349,13 +349,13 @@ NCursesWindow::~NCursesWindow() THROWS(NCursesException) { kill_subwindows(); - if (par != 0) { + if (par != NULL) { // Remove this window from the parent's list of subwindows. NCursesWindow * next = par->subwins; - NCursesWindow * prev = 0; - while (next != 0) { + NCursesWindow * prev = NULL; + while (next != NULL) { if (next == this) { - if (prev != 0) { + if (prev != NULL) { prev->sib = next->sib; } else { par->subwins = next->sib; @@ -367,7 +367,7 @@ NCursesWindow::~NCursesWindow() THROWS(NCursesException) } } - if (alloced && w != 0) + if (alloced && w != NULL) ::delwin(w); if (alloced) { diff --git a/c++/cursesw.h b/c++/cursesw.h index eef5a631..10481a22 100644 --- a/c++/cursesw.h +++ b/c++/cursesw.h @@ -1,7 +1,7 @@ // * This makes emacs happy -*-Mode: C++;-*- // vile:cppmode /**************************************************************************** - * Copyright 2019-2021,2022 Thomas E. Dickey * + * Copyright 2019-2024,2025 Thomas E. Dickey * * Copyright 1998-2014,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -32,11 +32,9 @@ #ifndef NCURSES_CURSESW_H_incl #define NCURSES_CURSESW_H_incl 1 -// $Id: cursesw.h,v 1.59 2022/08/20 20:52:15 tom Exp $ +// $Id: cursesw.h,v 1.62 2025/01/25 21:21:05 tom Exp $ -extern "C" { -# include -} +#include #if defined(BUILDING_NCURSES_CXX) # define NCURSES_CXX_IMPEXP NCURSES_EXPORT_GENERAL_EXPORT @@ -1441,7 +1439,7 @@ class NCURSES_CXX_IMPEXP NCursesPad : public NCursesWindow NCursesWindow* Win(void) const { // Get the window into which the pad should be copied (if any) - return (viewSub?viewSub:(viewWin?viewWin:0)); + return (viewSub?viewSub:(viewWin?viewWin:NULL)); } NCursesWindow* getWindow(void) const { diff --git a/c++/cursslk.cc b/c++/cursslk.cc index 7b898cef..5ff7dd9d 100644 --- a/c++/cursslk.cc +++ b/c++/cursslk.cc @@ -1,6 +1,6 @@ // * this is for making emacs happy: -*-Mode: C++;-*- /**************************************************************************** - * Copyright 2019-2022,2023 Thomas E. Dickey * + * Copyright 2019-2023,2024 Thomas E. Dickey * * Copyright 1998-2005,2012 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -33,13 +33,12 @@ ****************************************************************************/ #include "internal.h" -#include "cursslk.h" #include "cursesapp.h" -MODULE_ID("$Id: cursslk.cc,v 1.21 2023/02/25 23:36:06 tom Exp $") +MODULE_ID("$Id: cursslk.cc,v 1.23 2024/10/05 19:36:22 tom Exp $") Soft_Label_Key_Set::Soft_Label_Key& - Soft_Label_Key_Set::Soft_Label_Key::operator=(char *text) + Soft_Label_Key_Set::Soft_Label_Key::operator=(const char *text) { delete[] label; size_t need = 1 + ::strlen(text); @@ -112,11 +111,11 @@ int Soft_Label_Key_Set::labels() const { void Soft_Label_Key_Set::activate_label(int i, bool bf) { if (!b_attrInit) { - NCursesApplication* A = NCursesApplication::getApplication(); + const NCursesApplication* A = NCursesApplication::getApplication(); if (A) attrset(A->labels()); b_attrInit = TRUE; } - Soft_Label_Key& K = (*this)[i]; + const Soft_Label_Key& K = (*this)[i]; if (ERR==::slk_set(K.num,bf?K.label:"",K.format)) Error("slk_set"); noutrefresh(); @@ -125,12 +124,12 @@ void Soft_Label_Key_Set::activate_label(int i, bool bf) { void Soft_Label_Key_Set::activate_labels(bool bf) { if (!b_attrInit) { - NCursesApplication* A = NCursesApplication::getApplication(); + const NCursesApplication* A = NCursesApplication::getApplication(); if (A) attrset(A->labels()); b_attrInit = TRUE; } for(int i=1; i <= num_labels; i++) { - Soft_Label_Key& K = (*this)[i]; + const Soft_Label_Key& K = (*this)[i]; if (ERR==::slk_set(K.num,bf?K.label:"",K.format)) Error("slk_set"); } diff --git a/c++/cursslk.h b/c++/cursslk.h index 66564fe3..7b02ed44 100644 --- a/c++/cursslk.h +++ b/c++/cursslk.h @@ -1,7 +1,7 @@ // * this is for making emacs happy: -*-Mode: C++;-*- // vile:cppmode /**************************************************************************** - * Copyright 2019-2020,2021 Thomas E. Dickey * + * Copyright 2019-2021,2024 Thomas E. Dickey * * Copyright 1998-2003,2005 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -33,7 +33,7 @@ * Author: Juergen Pfeifer, 1997 * ****************************************************************************/ -// $Id: cursslk.h,v 1.19 2021/04/17 18:11:08 tom Exp $ +// $Id: cursslk.h,v 1.20 2024/10/05 22:47:12 tom Exp $ #ifndef NCURSES_CURSSLK_H_incl #define NCURSES_CURSSLK_H_incl @@ -62,7 +62,7 @@ class NCURSES_CXX_IMPEXP Soft_Label_Key_Set { public: // Set the text of the Label - Soft_Label_Key& operator=(char *text); + Soft_Label_Key& operator=(const char *text); // Set the Justification of the Label Soft_Label_Key& operator=(Justification just) { diff --git a/c++/demo.cc b/c++/demo.cc index 195e98a0..18278451 100644 --- a/c++/demo.cc +++ b/c++/demo.cc @@ -1,6 +1,6 @@ // * This makes emacs happy -*-Mode: C++;-*- /**************************************************************************** - * Copyright 2018-2020,2021 Thomas E. Dickey * + * Copyright 2018-2023,2025 Thomas E. Dickey * * Copyright 1998-2012,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -36,7 +36,7 @@ * Demo code for NCursesMenu and NCursesForm written by * Juergen Pfeifer * - * $Id: demo.cc,v 1.50 2021/09/04 10:52:55 tom Exp $ + * $Id: demo.cc,v 1.53 2025/01/25 21:21:05 tom Exp $ */ #include "internal.h" @@ -46,6 +46,7 @@ #if (defined(_WIN32) || defined(_WIN64)) #undef KEY_EVENT +#undef sleep #define sleep(n) Sleep(n) #else extern "C" unsigned int sleep(unsigned int); @@ -168,12 +169,12 @@ class UserData // // ------------------------------------------------------------------------- // -template class MyAction : public NCursesUserItem +template class NCURSES_CXX_IMPEXP MyAction : public NCursesUserItem { public: MyAction (const char* p_name, const T* p_UserData) - : NCursesUserItem(p_name, static_cast(0), p_UserData) + : NCursesUserItem(p_name, static_cast(NULL), p_UserData) {} virtual ~MyAction() THROWS(NCursesException) {} @@ -185,9 +186,6 @@ template class MyAction : public NCursesUserItem } }; -template class MyAction; -template class NCURSES_CXX_IMPEXP NCursesUserItem; - class QuitItem : public NCursesMenuItem { public: @@ -246,10 +244,10 @@ class TestForm : public NCursesForm public: TestForm() : NCursesForm(13, 51, (lines() - 15)/2, (cols() - 53)/2), - F(0), - mft(0), - ift(0), - eft(0) + F(NULL), + mft(NULL), + ift(NULL), + eft(NULL) { F = new NCursesFormField*[10]; @@ -291,7 +289,7 @@ class TestForm : public NCursesForm } TestForm(const TestForm& rhs) - : NCursesForm(rhs), F(0), mft(0), ift(0), eft(0) + : NCursesForm(rhs), F(NULL), mft(NULL), ift(NULL), eft(NULL) { } @@ -440,7 +438,7 @@ class MyMenu : public NCursesMenu public: MyMenu () : NCursesMenu (n_items+2, 8, (lines()-10)/2, (cols()-10)/2), - P(0), I(0), u(0) + P(NULL), I(NULL), u(NULL) { u = new UserData(1); I = new NCursesMenuItem*[1+n_items]; @@ -469,7 +467,7 @@ class MyMenu : public NCursesMenu } MyMenu(const MyMenu& rhs) - : NCursesMenu(rhs), P(0), I(0), u(0) + : NCursesMenu(rhs), P(NULL), I(NULL), u(NULL) { } diff --git a/c++/edit_cfg.sh b/c++/edit_cfg.sh index 928f7fdf..0a3b710d 100755 --- a/c++/edit_cfg.sh +++ b/c++/edit_cfg.sh @@ -1,7 +1,7 @@ #!/bin/sh -# $Id: edit_cfg.sh,v 1.19 2022/07/16 18:00:59 tom Exp $ +# $Id: edit_cfg.sh,v 1.20 2025/02/02 00:38:39 tom Exp $ ############################################################################## -# Copyright 2020,2022 Thomas E. Dickey # +# Copyright 2020-2022,2025 Thomas E. Dickey # # Copyright 1998-2007,2008 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # @@ -46,7 +46,9 @@ for name in \ HAVE_BUILTIN_H \ HAVE_GPP_BUILTIN_H \ HAVE_GXX_BUILTIN_H \ + HAVE_EXCEPTION \ HAVE_IOSTREAM \ + HAVE_NEW \ HAVE_TYPEINFO \ HAVE_VALUES_H \ IOSTREAM_NAMESPACE diff --git a/c++/etip.h.in b/c++/etip.h.in index 70842ef6..193c2987 100644 --- a/c++/etip.h.in +++ b/c++/etip.h.in @@ -1,6 +1,6 @@ // * This makes emacs happy -*-Mode: C++;-*- /**************************************************************************** - * Copyright 2018-2021,2022 Thomas E. Dickey * + * Copyright 2018-2024,2025 Thomas E. Dickey * * Copyright 1998-2012,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -32,7 +32,7 @@ * Author: Juergen Pfeifer, 1997 * ****************************************************************************/ -// $Id: etip.h.in,v 1.50 2022/08/20 20:50:00 tom Exp $ +// $Id: etip.h.in,v 1.55 2025/02/08 23:39:52 tom Exp $ #ifndef NCURSES_ETIP_H_incl #define NCURSES_ETIP_H_incl 1 @@ -42,6 +42,10 @@ #define HAVE_BUILTIN_H 0 #endif +#ifndef HAVE_EXCEPTION +#define HAVE_EXCEPTION 0 +#endif + #ifndef HAVE_GXX_BUILTIN_H #define HAVE_GXX_BUILTIN_H 0 #endif @@ -54,6 +58,10 @@ #define HAVE_IOSTREAM 0 #endif +#ifndef HAVE_NEW +#define HAVE_NEW 0 +#endif + #ifndef HAVE_TYPEINFO #define HAVE_TYPEINFO 0 #endif @@ -94,6 +102,8 @@ # endif #endif +#include + #if defined(__GNUG__) # if HAVE_BUILTIN_H || HAVE_GXX_BUILTIN_H || HAVE_GPP_BUILTIN_H # if ETIP_NEEDS_MATH_H @@ -118,7 +128,16 @@ # include #endif -#include +#if HAVE_EXCEPTION +# include +#endif +#if HAVE_NEW +# include +#endif + +// This used to include , but Apple's configuration as of 2024 +// provides only a broken version of ncurses's header, which interferes +// with the configure script. extern "C" { #if HAVE_VALUES_H @@ -128,6 +147,10 @@ extern "C" { #include #include #include + +#ifndef HAVE_CONFIG_H +int endwin(void); // needed for the configure check +#endif } // Language features @@ -200,7 +223,7 @@ public: NCursesPanelException (const char *msg, int err) : NCursesException (msg, err), - p (0) + p (NULL) {}; NCursesPanelException (const NCursesPanel* panel, @@ -212,7 +235,7 @@ public: explicit NCursesPanelException (int err) : NCursesException ("panel library error", err), - p (0) + p (NULL) {}; NCursesPanelException (const NCursesPanel* panel, @@ -251,7 +274,7 @@ public: NCursesMenuException (const char *msg, int err) : NCursesException (msg, err), - m (0) + m (NULL) {}; NCursesMenuException (const NCursesMenu* menu, @@ -263,7 +286,7 @@ public: explicit NCursesMenuException (int err) : NCursesException ("menu library error", err), - m (0) + m (NULL) {}; NCursesMenuException (const NCursesMenu* menu, @@ -302,7 +325,7 @@ public: NCursesFormException (const char *msg, int err) : NCursesException (msg, err), - f (0) + f (NULL) {}; NCursesFormException (const NCursesForm* form, @@ -314,7 +337,7 @@ public: explicit NCursesFormException (int err) : NCursesException ("form library error", err), - f (0) + f (NULL) {}; NCursesFormException (const NCursesForm* form, diff --git a/c++/modules b/c++/modules index f82b487f..0cd80573 100644 --- a/c++/modules +++ b/c++/modules @@ -1,7 +1,7 @@ # Program modules -# $Id: modules,v 1.12 2020/02/02 23:34:34 tom Exp $ +# $Id: modules,v 1.13 2024/06/15 21:07:41 tom Exp $ ############################################################################## -# Copyright 2020 Thomas E. Dickey # +# Copyright 2020,2024 Thomas E. Dickey # # Copyright 1998-2006,2013 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # @@ -33,13 +33,13 @@ # @ base -cursesf c++ $(srcdir) $(internal_h) $(cursesf_h) $(cursesapp_h) -cursesm c++ $(srcdir) $(internal_h) $(cursesm_h) $(cursesapp_h) -cursesw c++ $(srcdir) $(internal_h) $(cursesw_h) -cursespad c++ $(srcdir) $(internal_h) $(cursesw_h) -cursesp c++ $(srcdir) $(internal_h) $(cursesp_h) -cursslk c++ $(srcdir) $(internal_h) $(cursesapp_h) -cursesapp c++ $(srcdir) $(internal_h) $(cursesapp_h) -cursesmain c++ $(srcdir) $(internal_h) $(cursesapp_h) $(INCDIR)/nc_alloc.h +cursesf c++ $(srcdir) $(HEADER_DEPS) $(internal_h) $(cursesf_h) $(cursesapp_h) +cursesm c++ $(srcdir) $(HEADER_DEPS) $(internal_h) $(cursesm_h) $(cursesapp_h) +cursesw c++ $(srcdir) $(HEADER_DEPS) $(internal_h) $(cursesw_h) +cursespad c++ $(srcdir) $(HEADER_DEPS) $(internal_h) $(cursesw_h) +cursesp c++ $(srcdir) $(HEADER_DEPS) $(internal_h) $(cursesp_h) +cursslk c++ $(srcdir) $(HEADER_DEPS) $(internal_h) $(cursesapp_h) +cursesapp c++ $(srcdir) $(HEADER_DEPS) $(internal_h) $(cursesapp_h) +cursesmain c++ $(srcdir) $(HEADER_DEPS) $(internal_h) $(cursesapp_h) $(INCDIR)/nc_alloc.h # vile:makemode diff --git a/config.guess b/config.guess index a419d864..48a68460 100755 --- a/config.guess +++ b/config.guess @@ -1,10 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2022 Free Software Foundation, Inc. +# Copyright 1992-2024 Free Software Foundation, Inc. # shellcheck disable=SC2006,SC2268 # see below for rationale -timestamp='2022-08-01' +timestamp='2024-07-27' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -47,7 +47,7 @@ me=`echo "$0" | sed -e 's,.*/,,'` usage="\ Usage: $0 [OPTION] -Output the configuration name of the system \`$me' is run on. +Output the configuration name of the system '$me' is run on. Options: -h, --help print this help, then exit @@ -60,13 +60,13 @@ version="\ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2022 Free Software Foundation, Inc. +Copyright 1992-2024 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." help=" -Try \`$me --help' for more information." +Try '$me --help' for more information." # Parse command line while test $# -gt 0 ; do @@ -102,8 +102,8 @@ GUESS= # temporary files to be created and, as you can see below, it is a # headache to deal with in a portable fashion. -# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still -# use `HOST_CC' if defined, but it is deprecated. +# Historically, 'CC_FOR_BUILD' used to be named 'HOST_CC'. We still +# use 'HOST_CC' if defined, but it is deprecated. # Portable tmp directory creation inspired by the Autoconf team. @@ -123,7 +123,7 @@ set_cc_for_build() { dummy=$tmp/dummy case ${CC_FOR_BUILD-},${HOST_CC-},${CC-} in ,,) echo "int x;" > "$dummy.c" - for driver in cc gcc c89 c99 ; do + for driver in cc gcc c17 c99 c89 ; do if ($driver -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then CC_FOR_BUILD=$driver break @@ -155,6 +155,9 @@ Linux|GNU|GNU/*) set_cc_for_build cat <<-EOF > "$dummy.c" + #if defined(__ANDROID__) + LIBC=android + #else #include #if defined(__UCLIBC__) LIBC=uclibc @@ -162,6 +165,8 @@ Linux|GNU|GNU/*) LIBC=dietlibc #elif defined(__GLIBC__) LIBC=gnu + #elif defined(__LLVM_LIBC__) + LIBC=llvm #else #include /* First heuristic to detect musl libc. */ @@ -169,6 +174,7 @@ Linux|GNU|GNU/*) LIBC=musl #endif #endif + #endif EOF cc_set_libc=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'` eval "$cc_set_libc" @@ -459,7 +465,7 @@ case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in UNAME_RELEASE=`uname -v` ;; esac - # Japanese Language versions have a version number like `4.1.3-JL'. + # Japanese Language versions have a version number like '4.1.3-JL'. SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/-/_/'` GUESS=sparc-sun-sunos$SUN_REL ;; @@ -628,7 +634,8 @@ EOF sed 's/^ //' << EOF > "$dummy.c" #include - main() + int + main () { if (!__power_pc()) exit(1); @@ -712,7 +719,8 @@ EOF #include #include - int main () + int + main () { #if defined(_SC_KERNEL_BITS) long bits = sysconf(_SC_KERNEL_BITS); @@ -904,7 +912,7 @@ EOF fi ;; *:FreeBSD:*:*) - UNAME_PROCESSOR=`/usr/bin/uname -p` + UNAME_PROCESSOR=`uname -p` case $UNAME_PROCESSOR in amd64) UNAME_PROCESSOR=x86_64 ;; @@ -966,11 +974,37 @@ EOF GNU_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'` GUESS=$UNAME_MACHINE-unknown-$GNU_SYS$GNU_REL-$LIBC ;; + x86_64:[Mm]anagarm:*:*|i?86:[Mm]anagarm:*:*) + GUESS="$UNAME_MACHINE-pc-managarm-mlibc" + ;; + *:[Mm]anagarm:*:*) + GUESS="$UNAME_MACHINE-unknown-managarm-mlibc" + ;; *:Minix:*:*) GUESS=$UNAME_MACHINE-unknown-minix ;; aarch64:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + set_cc_for_build + CPU=$UNAME_MACHINE + LIBCABI=$LIBC + if test "$CC_FOR_BUILD" != no_compiler_found; then + ABI=64 + sed 's/^ //' << EOF > "$dummy.c" + #ifdef __ARM_EABI__ + #ifdef __ARM_PCS_VFP + ABI=eabihf + #else + ABI=eabi + #endif + #endif +EOF + cc_set_abi=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^ABI' | sed 's, ,,g'` + eval "$cc_set_abi" + case $ABI in + eabi | eabihf) CPU=armv8l; LIBCABI=$LIBC$ABI ;; + esac + fi + GUESS=$CPU-unknown-linux-$LIBCABI ;; aarch64_be:Linux:*:*) UNAME_MACHINE=aarch64_be @@ -1036,6 +1070,15 @@ EOF k1om:Linux:*:*) GUESS=$UNAME_MACHINE-unknown-linux-$LIBC ;; + kvx:Linux:*:*) + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; + kvx:cos:*:*) + GUESS=$UNAME_MACHINE-unknown-cos + ;; + kvx:mbr:*:*) + GUESS=$UNAME_MACHINE-unknown-mbr + ;; loongarch32:Linux:*:* | loongarch64:Linux:*:*) GUESS=$UNAME_MACHINE-unknown-linux-$LIBC ;; @@ -1191,7 +1234,7 @@ EOF GUESS=$UNAME_MACHINE-pc-sysv4.2uw$UNAME_VERSION ;; i*86:OS/2:*:*) - # If we were able to find `uname', then EMX Unix compatibility + # If we were able to find 'uname', then EMX Unix compatibility # is probably installed. GUESS=$UNAME_MACHINE-pc-os2-emx ;; @@ -1332,7 +1375,7 @@ EOF GUESS=ns32k-sni-sysv fi ;; - PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort + PENTIUM:*:4.0*:*) # Unisys 'ClearPath HMP IX 4000' SVR4/MP effort # says GUESS=i586-unisys-sysv4 ;; @@ -1554,6 +1597,9 @@ EOF *:Unleashed:*:*) GUESS=$UNAME_MACHINE-unknown-unleashed$UNAME_RELEASE ;; + *:Ironclad:*:*) + GUESS=$UNAME_MACHINE-unknown-ironclad + ;; esac # Do we have a guess based on uname results? @@ -1577,6 +1623,7 @@ cat > "$dummy.c" <." version="\ GNU config.sub ($timestamp) -Copyright 1992-2022 Free Software Foundation, Inc. +Copyright 1992-2024 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." help=" -Try \`$me --help' for more information." +Try '$me --help' for more information." # Parse command line while test $# -gt 0 ; do @@ -120,7 +120,6 @@ case $# in esac # Split fields of configuration type -# shellcheck disable=SC2162 saved_IFS=$IFS IFS="-" read field1 field2 field3 field4 <&2 + echo "Invalid configuration '$1': more than four components" >&2 exit 1 ;; *-*-*-*) @@ -142,10 +141,21 @@ case $1 in # parts maybe_os=$field2-$field3 case $maybe_os in - nto-qnx* | linux-* | uclinux-uclibc* \ - | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* \ - | netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* \ - | storm-chaos* | os2-emx* | rtmk-nova*) + cloudabi*-eabi* \ + | kfreebsd*-gnu* \ + | knetbsd*-gnu* \ + | kopensolaris*-gnu* \ + | linux-* \ + | managarm-* \ + | netbsd*-eabi* \ + | netbsd*-gnu* \ + | nto-qnx* \ + | os2-emx* \ + | rtmk-nova* \ + | storm-chaos* \ + | uclinux-gnu* \ + | uclinux-uclibc* \ + | windows-* ) basic_machine=$field1 basic_os=$maybe_os ;; @@ -160,8 +170,12 @@ case $1 in esac ;; *-*) - # A lone config we happen to match not fitting any pattern case $field1-$field2 in + # Shorthands that happen to contain a single dash + convex-c[12] | convex-c3[248]) + basic_machine=$field2-convex + basic_os= + ;; decstation-3100) basic_machine=mips-dec basic_os= @@ -169,28 +183,88 @@ case $1 in *-*) # Second component is usually, but not always the OS case $field2 in - # Prevent following clause from handling this valid os + # Do not treat sunos as a manufacturer sun*os*) basic_machine=$field1 basic_os=$field2 ;; - zephyr*) - basic_machine=$field1-unknown - basic_os=$field2 - ;; # Manufacturers - dec* | mips* | sequent* | encore* | pc533* | sgi* | sony* \ - | att* | 7300* | 3300* | delta* | motorola* | sun[234]* \ - | unicom* | ibm* | next | hp | isi* | apollo | altos* \ - | convergent* | ncr* | news | 32* | 3600* | 3100* \ - | hitachi* | c[123]* | convex* | sun | crds | omron* | dg \ - | ultra | tti* | harris | dolphin | highlevel | gould \ - | cbm | ns | masscomp | apple | axis | knuth | cray \ - | microblaze* | sim | cisco \ - | oki | wec | wrs | winbond) + 3100* \ + | 32* \ + | 3300* \ + | 3600* \ + | 7300* \ + | acorn \ + | altos* \ + | apollo \ + | apple \ + | atari \ + | att* \ + | axis \ + | be \ + | bull \ + | cbm \ + | ccur \ + | cisco \ + | commodore \ + | convergent* \ + | convex* \ + | cray \ + | crds \ + | dec* \ + | delta* \ + | dg \ + | digital \ + | dolphin \ + | encore* \ + | gould \ + | harris \ + | highlevel \ + | hitachi* \ + | hp \ + | ibm* \ + | intergraph \ + | isi* \ + | knuth \ + | masscomp \ + | microblaze* \ + | mips* \ + | motorola* \ + | ncr* \ + | news \ + | next \ + | ns \ + | oki \ + | omron* \ + | pc533* \ + | rebel \ + | rom68k \ + | rombug \ + | semi \ + | sequent* \ + | siemens \ + | sgi* \ + | siemens \ + | sim \ + | sni \ + | sony* \ + | stratus \ + | sun \ + | sun[234]* \ + | tektronix \ + | tti* \ + | ultra \ + | unicom* \ + | wec \ + | winbond \ + | wrs) basic_machine=$field1-$field2 basic_os= ;; + zephyr*) + basic_machine=$field1-unknown + basic_os=$field2 + ;; *) basic_machine=$field1 basic_os=$field2 @@ -271,26 +345,6 @@ case $1 in basic_machine=arm-unknown basic_os=cegcc ;; - convex-c1) - basic_machine=c1-convex - basic_os=bsd - ;; - convex-c2) - basic_machine=c2-convex - basic_os=bsd - ;; - convex-c32) - basic_machine=c32-convex - basic_os=bsd - ;; - convex-c34) - basic_machine=c34-convex - basic_os=bsd - ;; - convex-c38) - basic_machine=c38-convex - basic_os=bsd - ;; cray) basic_machine=j90-cray basic_os=unicos @@ -713,15 +767,26 @@ case $basic_machine in vendor=dec basic_os=tops20 ;; - delta | 3300 | motorola-3300 | motorola-delta \ - | 3300-motorola | delta-motorola) + delta | 3300 | delta-motorola | 3300-motorola | motorola-delta | motorola-3300) cpu=m68k vendor=motorola ;; - dpx2*) + # This used to be dpx2*, but that gets the RS6000-based + # DPX/20 and the x86-based DPX/2-100 wrong. See + # https://oldskool.silicium.org/stations/bull_dpx20.htm + # https://www.feb-patrimoine.com/english/bull_dpx2.htm + # https://www.feb-patrimoine.com/english/unix_and_bull.htm + dpx2 | dpx2[23]00 | dpx2[23]xx) cpu=m68k vendor=bull - basic_os=sysv3 + ;; + dpx2100 | dpx21xx) + cpu=i386 + vendor=bull + ;; + dpx20) + cpu=rs6000 + vendor=bull ;; encore | umax | mmax) cpu=ns32k @@ -836,18 +901,6 @@ case $basic_machine in next | m*-next) cpu=m68k vendor=next - case $basic_os in - openstep*) - ;; - nextstep*) - ;; - ns2*) - basic_os=nextstep2 - ;; - *) - basic_os=nextstep3 - ;; - esac ;; np1) cpu=np1 @@ -936,14 +989,13 @@ case $basic_machine in ;; *-*) - # shellcheck disable=SC2162 saved_IFS=$IFS IFS="-" read cpu vendor <&2 + echo "Invalid configuration '$1': machine '$cpu-$vendor' not recognized" 1>&2 exit 1 ;; esac @@ -1306,11 +1491,12 @@ esac # Decode manufacturer-specific aliases for certain operating systems. -if test x$basic_os != x +if test x"$basic_os" != x then # First recognize some ad-hoc cases, or perhaps split kernel-os, or else just # set os. +obj= case $basic_os in gnu/linux*) kernel=linux @@ -1325,7 +1511,6 @@ case $basic_os in os=`echo "$basic_os" | sed -e 's|nto-qnx|qnx|'` ;; *-*) - # shellcheck disable=SC2162 saved_IFS=$IFS IFS="-" read kernel os <&2 + fi + ;; + *) + echo "Invalid configuration '$1': OS '$os' not recognized" 1>&2 + exit 1 + ;; +esac + +case $obj in + aout* | coff* | elf* | pe*) + ;; + '') + # empty is fine + ;; *) - echo Invalid configuration \`"$1"\': OS \`"$os"\' not recognized 1>&2 + echo "Invalid configuration '$1': Machine code format '$obj' not recognized" 1>&2 + exit 1 + ;; +esac + +# Here we handle the constraint that a (synthetic) cpu and os are +# valid only in combination with each other and nowhere else. +case $cpu-$os in + # The "javascript-unknown-ghcjs" triple is used by GHC; we + # accept it here in order to tolerate that, but reject any + # variations. + javascript-ghcjs) + ;; + javascript-* | *-ghcjs) + echo "Invalid configuration '$1': cpu '$cpu' is not valid with os '$os$obj'" 1>&2 exit 1 ;; esac # As a final step for OS-related things, validate the OS-kernel combination # (given a valid OS), if there is a kernel. -case $kernel-$os in - linux-gnu* | linux-dietlibc* | linux-android* | linux-newlib* \ - | linux-musl* | linux-relibc* | linux-uclibc* ) +case $kernel-$os-$obj in + linux-gnu*- | linux-android*- | linux-dietlibc*- | linux-llvm*- \ + | linux-mlibc*- | linux-musl*- | linux-newlib*- \ + | linux-relibc*- | linux-uclibc*- | linux-ohos*- ) + ;; + uclinux-uclibc*- | uclinux-gnu*- ) + ;; + managarm-mlibc*- | managarm-kernel*- ) ;; - uclinux-uclibc* ) + windows*-msvc*-) ;; - -dietlibc* | -newlib* | -musl* | -relibc* | -uclibc* ) + -dietlibc*- | -llvm*- | -mlibc*- | -musl*- | -newlib*- | -relibc*- \ + | -uclibc*- ) # These are just libc implementations, not actual OSes, and thus # require a kernel. - echo "Invalid configuration \`$1': libc \`$os' needs explicit kernel." 1>&2 + echo "Invalid configuration '$1': libc '$os' needs explicit kernel." 1>&2 exit 1 ;; - kfreebsd*-gnu* | kopensolaris*-gnu*) + -kernel*- ) + echo "Invalid configuration '$1': '$os' needs explicit kernel." 1>&2 + exit 1 ;; - vxworks-simlinux | vxworks-simwindows | vxworks-spe) + *-kernel*- ) + echo "Invalid configuration '$1': '$kernel' does not support '$os'." 1>&2 + exit 1 ;; - nto-qnx*) + *-msvc*- ) + echo "Invalid configuration '$1': '$os' needs 'windows'." 1>&2 + exit 1 ;; - os2-emx) + kfreebsd*-gnu*- | knetbsd*-gnu*- | netbsd*-gnu*- | kopensolaris*-gnu*-) + ;; + vxworks-simlinux- | vxworks-simwindows- | vxworks-spe-) + ;; + nto-qnx*-) ;; - *-eabi* | *-gnueabi*) + os2-emx-) ;; - -*) + rtmk-nova-) + ;; + *-eabi*- | *-gnueabi*-) + ;; + none--*) + # None (no kernel, i.e. freestanding / bare metal), + # can be paired with an machine code file format + ;; + -*-) # Blank kernel with real OS is always fine. ;; - *-*) - echo "Invalid configuration \`$1': Kernel \`$kernel' not known to work with OS \`$os'." 1>&2 + --*) + # Blank kernel and OS with real machine code file format is always fine. + ;; + *-*-*) + echo "Invalid configuration '$1': Kernel '$kernel' not known to work with OS '$os'." 1>&2 exit 1 ;; esac @@ -1809,7 +2273,7 @@ case $vendor in *-riscix*) vendor=acorn ;; - *-sunos*) + *-sunos* | *-solaris*) vendor=sun ;; *-cnk* | *-aix*) @@ -1879,7 +2343,7 @@ case $vendor in ;; esac -echo "$cpu-$vendor-${kernel:+$kernel-}$os" +echo "$cpu-$vendor${kernel:+-$kernel}${os:+-$os}${obj:+-$obj}" exit # Local variables: diff --git a/configure b/configure index 412e5af2..dad6c3ea 100755 --- a/configure +++ b/configure @@ -1,7 +1,7 @@ #! /bin/sh -# From configure.in Revision: 1.757 . +# From configure.in Revision: 1.794 . # Guess values for system-dependent variables and create Makefiles. -# Generated by Autoconf 2.52.20230114. +# Generated by Autoconf 2.52.20250126. # # Copyright 2003-2022,2023 Thomas E. Dickey # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 @@ -481,6 +481,10 @@ do | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) x_libraries=$ac_optarg ;; + -*dir | -dvi* | -doc* | -html* | -local* | -pdf* | -ps* ) + echo "$as_me: WARNING: unsupported option: $ac_option" >&2 + ;; + -*) { echo "$as_me: error: unrecognized option: $ac_option Try \`$0 --help' for more information." >&2 { (exit 1); exit 1; }; } @@ -717,22 +721,22 @@ Optional Features: --with-abi-version=XXX override derived ABI version --with-system-type=XXX test: override derived host system-type --with-abi-altered=XXX override visible ABI version, for packaging - --without-ada suppress check for Ada compiler, don't build demo + --without-ada suppress check for Ada compiler --without-cxx do not adjust ncurses bool to match C++ --without-cxx-binding do not build C++ binding and demo --disable-db-install suppress install of terminal database --without-manpages suppress install of manpages --without-progs suppress build/install with programs (e.g., tic) - --without-tack suppress build/install with tack program --without-tests suppress build/install with test-programs --without-curses-h install curses.h as ncurses.h only - --with-config-suffix=X suffixes ncursesXX-config file - --with-pkg-config{=path} enable/disable use of pkg-config - --with-pkg-config-libdir=XXX use given directory for installing pc-files + --with-config-suffix=X name ncurses*X-config file with X + --with-pkg-config[=CMD] enable/disable use of pkg-config and its name CMD + --with-pkg-config-libdir[=XXX] use given directory for installing pc-files --enable-pc-files generate and install .pc files for pkg-config - --with-pc-suffix suffixes pc-files + --with-pc-suffix[=XXX] suffix pkg-config files with XXX --enable-mixed-case tic should assume mixed-case filenames - --with-install-prefix prefixes actual install-location ($DESTDIR) + --with-install-prefix=DESTDIR use DESTDIR as installation directory prefix + --enable-install-prefix merge DESTDIR with installation prefix Build-Tools Needed to Compile Temporary Applications for Cross-compiling: --with-build-cc=XXX the build C compiler ($BUILD_CC) --with-build-cpp=XXX the build C preprocessor ($BUILD_CPP) @@ -753,10 +757,10 @@ Options to Specify the Libraries Built/Used: --with-ticlib generate separate tic library --enable-rpath use rpath option when generating shared libraries --disable-relink relink shared libraries during install - --with-shlib-version=X Specify rel or abi version for shared libs - --with-libtool-opts=XXX specify additional libtool options - --with-export-syms=XXX limit exported symbols using libtool - --with-versioned-syms=X markup versioned symbols using ld + --with-shlib-version[={rel|abi}] use release or ABI version in shared library file names + --with-libtool-opts[=XXX] give libtool additional options XXX + --with-export-syms[=SYM-FILE] limit symbols exported by libtool to those listed in SYM-FILE + --with-versioned-syms[=MAP-FILE] version ELF shared library symbols per MAP-FILE --with-gpm use Alessandro Rubini's GPM library --without-dlsym do not use dlsym() to load GPM dynamically --with-pcre2 use PCRE2 for regular-expressions @@ -765,7 +769,7 @@ Options to Specify the Libraries Built/Used: --disable-rpath-hack don't add rpath options for additional libraries --disable-pkg-ldflags disable extra LDFLAGS for package-scripts Fine-Tuning Your Configuration: - --with-extra-suffix=X append extra suffix to header/library paths + --with-extra-suffix[=X] append extra suffix X to header/library paths --disable-overwrite put headers in subdir, omit link to -lcurses --disable-database do not use terminfo, only fallbacks/termcap --with-database=XXX specify terminfo source to install @@ -774,7 +778,7 @@ Fine-Tuning Your Configuration: --with-tic-path=XXX specify path of tic for fallbacks --with-infocmp-path=XXX specify path of infocmp for fallbacks --without-xterm-new specify if xterm terminfo should be old version - --with-xterm-kbs=XXX specify if xterm backspace sends BS or DEL + --with-xterm-kbs[=XXX] specify if xterm backspace sends BS or DEL --with-terminfo-dirs=XXX specify list of terminfo directories (default: DATADIR/terminfo) --with-default-terminfo-dir=DIR default terminfo directory (default: DATADIR/terminfo) --disable-big-core assume machine has little memory @@ -786,23 +790,24 @@ Fine-Tuning Your Configuration: --disable-home-terminfo drop ~/.terminfo from terminfo search-path --disable-root-environ restrict root use of ncurses environment variables --disable-root-access restrict file-access when running setuid + --disable-setuid-environ restrict setuid use of ncurses environment variables --enable-symlinks make tic use symbolic links not hard links --enable-broken_linker compile with broken-linker support code --enable-bsdpad recognize BSD-style prefix padding - --enable-widec compile with wide-char/UTF-8 code + --disable-widec compile without wide character and UTF-8 support --disable-lp64 allow chtype to be long (ignore _LP64) --disable-largefile omit support for large files --disable-tparm-varargs compile tparm() without varargs interface --disable-tic-depends link tic library without explicit dependency on ncurses library --enable-wattr-macros enable wattr* macros - --with-x11-rgb=FILE file containing X11 rgb information (EPREFIX/lib/X11/rgb.txt) - --with-bool=TYPE override fallback type of bool variable + --with-x11-rgb=FILE obtain X11 color definitions from FILE (default: EPREFIX/lib/X11/rgb.txt) + --with-bool=TYPE fall back to TYPE for curses 'bool' typedef --with-caps=alt compile with alternate Caps file --with-chtype=TYPE override type of chtype --with-ospeed=TYPE override type of ospeed variable --with-mmask-t=TYPE override type of mmask_t --with-ccharw-max=XXX override size CCHARW_MAX - --enable-signed-char compile using signed Boolean's in term.h + --enable-signed-char use signed chars for Boolean array in term.h --with-tparm-arg=TYPE override parameter type of tparm --with-rcs-ids compile-in RCS identifiers Options to Specify How Manpages are Installed: @@ -829,13 +834,14 @@ Reentrant Code: --enable-pthreads-eintr enable EINTR in wgetch with pthreads --enable-weak-symbols enable weak-symbols for pthreads --enable-reentrant compile with reentrant code - --enable-opaque-curses make curses WINDOW, etc., "opaque" - --enable-opaque-form make form-library structures "opaque" - --enable-opaque-menu make menu-library structures "opaque" - --enable-opaque-panel make panel-library structures "opaque" + --disable-opaque-curses do not make WINDOW, etc., structures opaque + --disable-opaque-form do not make form library structures opaque + --disable-opaque-menu do not make menu library structures opaque + --disable-opaque-panel do not make panel library structures opaque --with-wrap-prefix=XXX override prefix used for public variables Development Code: --without-develop disable development options + --enable-check-size compile-in code to detect screensize of serial terminals --enable-hard-tabs compile with hard-tabs code --enable-xmc-glitch compile with support for xmc (magic-cookie) Experimental Code: @@ -851,6 +857,7 @@ Experimental Code: Testing/development Options: --disable-echo do not display "compiling" commands --disable-stripping do not strip (debug info) installed executables + --with-strip-program=XX specify program to use when stripping in install --enable-warnings test: turn on gcc compiler warnings --enable-stdnoreturn enable C11 _Noreturn feature for diagnostics --enable-string-hacks work around bogus compiler/loader warnings @@ -864,15 +871,16 @@ Testing/development Options: --with-trace test: add trace() function to all models of ncurses --disable-gnat-projects test: disable GNAT projects even if usable Ada Binding Options: - --with-ada-compiler=CMD specify Ada95 compiler command (default gnatmake) - --with-ada-include=DIR Ada includes are in DIR (default: PREFIX/share/ada/adainclude) - --with-ada-objects=DIR Ada objects are in DIR (default: PREFIX/lib/ada/adalib) - --with-ada-sharedlib=soname build shared-library (requires GNAT projects) - --with-ada-libname=XXX override default Ada library-name - --with-form-libname=XXX override form basename of library - --with-menu-libname=XXX override menu basename of library - --with-panel-libname=XXX override panel basename of library - --with-cxx-libname=XXX override ncurses++ basename of library + --with-ada-compiler[=CMD] use CMD as Ada95 compiler (default: gnatmake) + --with-ada-include=DIR find Ada95 includes in DIR (default: PREFIX/share/ada/adainclude) + --with-ada-objects=DIR find Ada95 objects in DIR (default: PREFIX/lib/ada/adalib) + --with-ada-sharedlib build Ada95 shared library; requires GNAT project support + --with-ada-libname[=XXX] use XXX as Ada95 library name +Library basenames for pkgsrc: + --with-form-libname[=XXX] override ifelse(,,form,) basename of library + --with-menu-libname[=XXX] override ifelse(,,menu,) basename of library + --with-panel-libname[=XXX] override ifelse(,,panel,) basename of library + --with-cxx-libname[=XXX] override ifelse(ncurses++,,cxx,ncurses++) basename of library Some influential environment variables: CC C compiler command @@ -946,7 +954,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was -generated by GNU Autoconf 2.52.20230114. Invocation command line was +generated by GNU Autoconf 2.52.20250126. Invocation command line was $ $0 $@ @@ -1070,7 +1078,7 @@ if test -z "$CONFIG_SITE"; then fi for ac_site_file in $CONFIG_SITE; do if test -r "$ac_site_file"; then - { echo "$as_me:1073: loading site script $ac_site_file" >&5 + { echo "$as_me:1081: loading site script $ac_site_file" >&5 echo "$as_me: loading site script $ac_site_file" >&6;} cat "$ac_site_file" >&5 . "$ac_site_file" @@ -1081,7 +1089,7 @@ if test -r "$cache_file"; then # Some versions of bash will fail to source /dev/null (special # files actually), so we avoid doing that. if test -f "$cache_file"; then - { echo "$as_me:1084: loading cache $cache_file" >&5 + { echo "$as_me:1092: loading cache $cache_file" >&5 echo "$as_me: loading cache $cache_file" >&6;} case $cache_file in [\\/]* | ?:[\\/]* ) . $cache_file;; @@ -1089,7 +1097,7 @@ echo "$as_me: loading cache $cache_file" >&6;} esac fi else - { echo "$as_me:1092: creating cache $cache_file" >&5 + { echo "$as_me:1100: creating cache $cache_file" >&5 echo "$as_me: creating cache $cache_file" >&6;} >$cache_file fi @@ -1105,21 +1113,21 @@ for ac_var in `(set) 2>&1 | eval ac_new_val="\$ac_env_${ac_var}_value" case "$ac_old_set,$ac_new_set" in set,) - { echo "$as_me:1108: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 + { echo "$as_me:1116: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} ac_cache_corrupted=: ;; ,set) - { echo "$as_me:1112: error: \`$ac_var' was not set in the previous run" >&5 + { echo "$as_me:1120: error: \`$ac_var' was not set in the previous run" >&5 echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_cache_corrupted=: ;; ,);; *) if test "x$ac_old_val" != "x$ac_new_val"; then - { echo "$as_me:1118: error: \`$ac_var' has changed since the previous run:" >&5 + { echo "$as_me:1126: error: \`$ac_var' has changed since the previous run:" >&5 echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} - { echo "$as_me:1120: former value: $ac_old_val" >&5 + { echo "$as_me:1128: former value: $ac_old_val" >&5 echo "$as_me: former value: $ac_old_val" >&2;} - { echo "$as_me:1122: current value: $ac_new_val" >&5 + { echo "$as_me:1130: current value: $ac_new_val" >&5 echo "$as_me: current value: $ac_new_val" >&2;} ac_cache_corrupted=: fi;; @@ -1138,9 +1146,9 @@ echo "$as_me: current value: $ac_new_val" >&2;} fi done if "$ac_cache_corrupted"; then - { echo "$as_me:1141: error: changes in the environment can compromise the build" >&5 + { echo "$as_me:1149: error: changes in the environment can compromise the build" >&5 echo "$as_me: error: changes in the environment can compromise the build" >&2;} - { { echo "$as_me:1143: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 + { { echo "$as_me:1151: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} { (exit 1); exit 1; }; } fi @@ -1169,10 +1177,10 @@ esac echo "#! $SHELL" >conftest.sh echo "exit 0" >>conftest.sh chmod +x conftest.sh -if { (echo "$as_me:1172: PATH=\".;.\"; conftest.sh") >&5 +if { (echo "$as_me:1180: PATH=\".;.\"; conftest.sh") >&5 (PATH=".;."; conftest.sh) 2>&5 ac_status=$? - echo "$as_me:1175: \$? = $ac_status" >&5 + echo "$as_me:1183: \$? = $ac_status" >&5 (exit "$ac_status"); }; then ac_path_separator=';' else @@ -1189,7 +1197,7 @@ for ac_prog in ggrep grep do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:1192: checking for $ac_word" >&5 +echo "$as_me:1200: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_GREP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1204,7 +1212,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_GREP="$ac_prog" -echo "$as_me:1207: found $ac_dir/$ac_word" >&5 +echo "$as_me:1215: found $ac_dir/$ac_word" >&5 break done @@ -1212,10 +1220,10 @@ fi fi GREP=$ac_cv_prog_GREP if test -n "$GREP"; then - echo "$as_me:1215: result: $GREP" >&5 + echo "$as_me:1223: result: $GREP" >&5 echo "${ECHO_T}$GREP" >&6 else - echo "$as_me:1218: result: no" >&5 + echo "$as_me:1226: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1223,7 +1231,7 @@ fi done test -n "$GREP" || GREP=": " -echo "$as_me:1226: checking for egrep" >&5 +echo "$as_me:1234: checking for egrep" >&5 echo $ECHO_N "checking for egrep... $ECHO_C" >&6 if test "${ac_cv_path_EGREP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1235,7 +1243,7 @@ else do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:1238: checking for $ac_word" >&5 +echo "$as_me:1246: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_EGREP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1252,7 +1260,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_EGREP="$ac_dir/$ac_word" - echo "$as_me:1255: found $ac_dir/$ac_word" >&5 + echo "$as_me:1263: found $ac_dir/$ac_word" >&5 break fi done @@ -1263,10 +1271,10 @@ fi EGREP=$ac_cv_path_EGREP if test -n "$EGREP"; then - echo "$as_me:1266: result: $EGREP" >&5 + echo "$as_me:1274: result: $EGREP" >&5 echo "${ECHO_T}$EGREP" >&6 else - echo "$as_me:1269: result: no" >&5 + echo "$as_me:1277: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1274,12 +1282,12 @@ fi done test -n "$EGREP" || EGREP=": " - test "x$ac_cv_path_EGREP" = "x:" && { { echo "$as_me:1277: error: cannot find workable egrep" >&5 + test "x$ac_cv_path_EGREP" = "x:" && { { echo "$as_me:1285: error: cannot find workable egrep" >&5 echo "$as_me: error: cannot find workable egrep" >&2;} { (exit 1); exit 1; }; } fi fi -echo "$as_me:1282: result: $ac_cv_path_EGREP" >&5 +echo "$as_me:1290: result: $ac_cv_path_EGREP" >&5 echo "${ECHO_T}$ac_cv_path_EGREP" >&6 EGREP="$ac_cv_path_EGREP" @@ -1290,11 +1298,11 @@ cf_cv_abi_version=${NCURSES_MAJOR} cf_cv_abi_default=${NCURSES_MAJOR} cf_cv_rel_version=${NCURSES_MAJOR}.${NCURSES_MINOR} cf_cv_timestamp=`date` -echo "$as_me:1293: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_default ($cf_cv_timestamp)" >&5 +echo "$as_me:1301: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_default ($cf_cv_timestamp)" >&5 echo "${ECHO_T}Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_default ($cf_cv_timestamp)" >&6 if test -f "$srcdir/VERSION" ; then - echo "$as_me:1297: checking for package version" >&5 + echo "$as_me:1305: checking for package version" >&5 echo $ECHO_N "checking for package version... $ECHO_C" >&6 # if there are not enough fields, cut returns the last one... @@ -1306,39 +1314,39 @@ echo $ECHO_N "checking for package version... $ECHO_C" >&6 VERSION="$cf_field1" VERSION_MAJOR=`echo "$cf_field2" | sed -e 's/\..*//'` - test -z "$VERSION_MAJOR" && { { echo "$as_me:1309: error: missing major-version" >&5 + test -z "$VERSION_MAJOR" && { { echo "$as_me:1317: error: missing major-version" >&5 echo "$as_me: error: missing major-version" >&2;} { (exit 1); exit 1; }; } VERSION_MINOR=`echo "$cf_field2" | sed -e 's/^[^.]*\.//' -e 's/-.*//'` - test -z "$VERSION_MINOR" && { { echo "$as_me:1314: error: missing minor-version" >&5 + test -z "$VERSION_MINOR" && { { echo "$as_me:1322: error: missing minor-version" >&5 echo "$as_me: error: missing minor-version" >&2;} { (exit 1); exit 1; }; } - echo "$as_me:1318: result: ${VERSION_MAJOR}.${VERSION_MINOR}" >&5 + echo "$as_me:1326: result: ${VERSION_MAJOR}.${VERSION_MINOR}" >&5 echo "${ECHO_T}${VERSION_MAJOR}.${VERSION_MINOR}" >&6 - echo "$as_me:1321: checking for package patch date" >&5 + echo "$as_me:1329: checking for package patch date" >&5 echo $ECHO_N "checking for package patch date... $ECHO_C" >&6 VERSION_PATCH=`echo "$cf_field3" | sed -e 's/^[^-]*-//'` case .$VERSION_PATCH in (.) - { { echo "$as_me:1326: error: missing patch-date $VERSION_PATCH" >&5 + { { echo "$as_me:1334: error: missing patch-date $VERSION_PATCH" >&5 echo "$as_me: error: missing patch-date $VERSION_PATCH" >&2;} { (exit 1); exit 1; }; } ;; (.[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]) ;; (*) - { { echo "$as_me:1333: error: illegal patch-date $VERSION_PATCH" >&5 + { { echo "$as_me:1341: error: illegal patch-date $VERSION_PATCH" >&5 echo "$as_me: error: illegal patch-date $VERSION_PATCH" >&2;} { (exit 1); exit 1; }; } ;; esac - echo "$as_me:1338: result: $VERSION_PATCH" >&5 + echo "$as_me:1346: result: $VERSION_PATCH" >&5 echo "${ECHO_T}$VERSION_PATCH" >&6 else - { { echo "$as_me:1341: error: did not find $srcdir/VERSION" >&5 + { { echo "$as_me:1349: error: did not find $srcdir/VERSION" >&5 echo "$as_me: error: did not find $srcdir/VERSION" >&2;} { (exit 1); exit 1; }; } fi @@ -1346,35 +1354,33 @@ fi # show the actual data that we have for versions: test -n "$verbose" && echo " ABI VERSION $VERSION" 1>&6 -echo "${as_me:-configure}:1349: testing ABI VERSION $VERSION ..." 1>&5 +echo "${as_me:-configure}:1357: testing ABI VERSION $VERSION ..." 1>&5 test -n "$verbose" && echo " VERSION_MAJOR $VERSION_MAJOR" 1>&6 -echo "${as_me:-configure}:1353: testing VERSION_MAJOR $VERSION_MAJOR ..." 1>&5 +echo "${as_me:-configure}:1361: testing VERSION_MAJOR $VERSION_MAJOR ..." 1>&5 test -n "$verbose" && echo " VERSION_MINOR $VERSION_MINOR" 1>&6 -echo "${as_me:-configure}:1357: testing VERSION_MINOR $VERSION_MINOR ..." 1>&5 +echo "${as_me:-configure}:1365: testing VERSION_MINOR $VERSION_MINOR ..." 1>&5 test -n "$verbose" && echo " VERSION_PATCH $VERSION_PATCH" 1>&6 -echo "${as_me:-configure}:1361: testing VERSION_PATCH $VERSION_PATCH ..." 1>&5 +echo "${as_me:-configure}:1369: testing VERSION_PATCH $VERSION_PATCH ..." 1>&5 - cf_PACKAGE=NCURSES + PROGRAM=NCURSES PACKAGE=ncurses cat >>confdefs.h <>confdefs.h <>confdefs.h <&5 + { echo "$as_me:1391: WARNING: overriding release version $cf_cv_rel_version to $withval" >&5 echo "$as_me: WARNING: overriding release version $cf_cv_rel_version to $withval" >&2;} cf_cv_rel_version=$withval fi; NCURSES_MAJOR=`echo "$cf_cv_rel_version" | sed -e 's/\..*//'` NCURSES_MINOR=`echo "$cf_cv_rel_version" | sed -e 's/^[^.]*//' -e 's/^\.//' -e 's/\..*//'` + test -n "NCURSES_MINOR" || NCURSES_MINOR=0 if test -n "$NCURSES_MAJOR" ; then - case $NCURSES_MAJOR in - ([0-9]*) + case `echo "$NCURSES_MAJOR" | sed -e 's/^[0-9]*$/0/g'` in + (0) ;; (*) - { { echo "$as_me:1398: error: Release major-version is not a number: $NCURSES_MAJOR" >&5 + { { echo "$as_me:1405: error: Release major-version is not a number: $NCURSES_MAJOR" >&5 echo "$as_me: error: Release major-version is not a number: $NCURSES_MAJOR" >&2;} { (exit 1); exit 1; }; } ;; esac else - { { echo "$as_me:1404: error: Release major-version value is empty" >&5 + { { echo "$as_me:1411: error: Release major-version value is empty" >&5 echo "$as_me: error: Release major-version value is empty" >&2;} { (exit 1); exit 1; }; } fi if test -n "$NCURSES_MINOR" ; then - case $NCURSES_MINOR in - ([0-9]*) + case `echo "$NCURSES_MINOR" | sed -e 's/^[0-9]*$/0/g'` in + (0) ;; (*) - { { echo "$as_me:1414: error: Release minor-version is not a number: $NCURSES_MINOR" >&5 + { { echo "$as_me:1421: error: Release minor-version is not a number: $NCURSES_MINOR" >&5 echo "$as_me: error: Release minor-version is not a number: $NCURSES_MINOR" >&2;} { (exit 1); exit 1; }; } ;; esac else - { { echo "$as_me:1420: error: Release minor-version value is empty" >&5 + { { echo "$as_me:1427: error: Release minor-version value is empty" >&5 echo "$as_me: error: Release minor-version value is empty" >&2;} { (exit 1); exit 1; }; } fi @@ -1430,7 +1437,7 @@ if test "${with_abi_version+set}" = set; then if test "x$cf_cv_abi_version" != "x$withval" then - { echo "$as_me:1433: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&5 + { echo "$as_me:1440: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&5 echo "$as_me: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&2;} case "$cf_cv_rel_version" in (5.*) @@ -1445,17 +1452,17 @@ echo "$as_me: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >& fi; if test -n "$cf_cv_abi_version" ; then - case $cf_cv_abi_version in - ([0-9]*) + case `echo "$cf_cv_abi_version" | sed -e 's/^[0-9]*$/0/g'` in + (0) ;; (*) - { { echo "$as_me:1452: error: ABI version is not a number: $cf_cv_abi_version" >&5 + { { echo "$as_me:1459: error: ABI version is not a number: $cf_cv_abi_version" >&5 echo "$as_me: error: ABI version is not a number: $cf_cv_abi_version" >&2;} { (exit 1); exit 1; }; } ;; esac else - { { echo "$as_me:1458: error: ABI version value is empty" >&5 + { { echo "$as_me:1465: error: ABI version value is empty" >&5 echo "$as_me: error: ABI version value is empty" >&2;} { (exit 1); exit 1; }; } fi @@ -1488,7 +1495,7 @@ for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do fi done if test -z "$ac_aux_dir"; then - { { echo "$as_me:1491: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 + { { echo "$as_me:1498: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;} { (exit 1); exit 1; }; } fi @@ -1498,11 +1505,11 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. # Make sure we can run config.sub. $ac_config_sub sun4 >/dev/null 2>&1 || - { { echo "$as_me:1501: error: cannot run $ac_config_sub" >&5 + { { echo "$as_me:1508: error: cannot run $ac_config_sub" >&5 echo "$as_me: error: cannot run $ac_config_sub" >&2;} { (exit 1); exit 1; }; } -echo "$as_me:1505: checking build system type" >&5 +echo "$as_me:1512: checking build system type" >&5 echo $ECHO_N "checking build system type... $ECHO_C" >&6 if test "${ac_cv_build+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1511,23 +1518,23 @@ else test -z "$ac_cv_build_alias" && ac_cv_build_alias=`$ac_config_guess` test -z "$ac_cv_build_alias" && - { { echo "$as_me:1514: error: cannot guess build type; you must specify one" >&5 + { { echo "$as_me:1521: error: cannot guess build type; you must specify one" >&5 echo "$as_me: error: cannot guess build type; you must specify one" >&2;} { (exit 1); exit 1; }; } ac_cv_build=`$ac_config_sub "$ac_cv_build_alias"` || - { { echo "$as_me:1518: error: $ac_config_sub $ac_cv_build_alias failed." >&5 + { { echo "$as_me:1525: error: $ac_config_sub $ac_cv_build_alias failed." >&5 echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:1523: result: $ac_cv_build" >&5 +echo "$as_me:1530: result: $ac_cv_build" >&5 echo "${ECHO_T}$ac_cv_build" >&6 build=$ac_cv_build build_cpu=`echo "$ac_cv_build" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` build_vendor=`echo "$ac_cv_build" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` build_os=`echo "$ac_cv_build" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -echo "$as_me:1530: checking host system type" >&5 +echo "$as_me:1537: checking host system type" >&5 echo $ECHO_N "checking host system type... $ECHO_C" >&6 if test "${ac_cv_host+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1536,12 +1543,12 @@ else test -z "$ac_cv_host_alias" && ac_cv_host_alias=$ac_cv_build_alias ac_cv_host=`$ac_config_sub "$ac_cv_host_alias"` || - { { echo "$as_me:1539: error: $ac_config_sub $ac_cv_host_alias failed" >&5 + { { echo "$as_me:1546: error: $ac_config_sub $ac_cv_host_alias failed" >&5 echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:1544: result: $ac_cv_host" >&5 +echo "$as_me:1551: result: $ac_cv_host" >&5 echo "${ECHO_T}$ac_cv_host" >&6 host=$ac_cv_host host_cpu=`echo "$ac_cv_host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` @@ -1549,7 +1556,7 @@ host_vendor=`echo "$ac_cv_host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` host_os=`echo "$ac_cv_host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` if test -f "$srcdir/config.guess" || test -f "$ac_aux_dir/config.guess" ; then - echo "$as_me:1552: checking target system type" >&5 + echo "$as_me:1559: checking target system type" >&5 echo $ECHO_N "checking target system type... $ECHO_C" >&6 if test "${ac_cv_target+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1558,12 +1565,12 @@ else test "x$ac_cv_target_alias" = "x" && ac_cv_target_alias=$ac_cv_host_alias ac_cv_target=`$ac_config_sub "$ac_cv_target_alias"` || - { { echo "$as_me:1561: error: $ac_config_sub $ac_cv_target_alias failed" >&5 + { { echo "$as_me:1568: error: $ac_config_sub $ac_cv_target_alias failed" >&5 echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:1566: result: $ac_cv_target" >&5 +echo "$as_me:1573: result: $ac_cv_target" >&5 echo "${ECHO_T}$ac_cv_target" >&6 target=$ac_cv_target target_cpu=`echo "$ac_cv_target" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` @@ -1595,13 +1602,13 @@ else fi test -z "$system_name" && system_name="$cf_cv_system_name" -test -n "$cf_cv_system_name" && echo "$as_me:1598: result: Configuring for $cf_cv_system_name" >&5 +test -n "$cf_cv_system_name" && echo "$as_me:1605: result: Configuring for $cf_cv_system_name" >&5 echo "${ECHO_T}Configuring for $cf_cv_system_name" >&6 if test ".$system_name" != ".$cf_cv_system_name" ; then - echo "$as_me:1602: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5 + echo "$as_me:1609: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5 echo "${ECHO_T}Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&6 - { { echo "$as_me:1604: error: \"Please remove config.cache and try again.\"" >&5 + { { echo "$as_me:1611: error: \"Please remove config.cache and try again.\"" >&5 echo "$as_me: error: \"Please remove config.cache and try again.\"" >&2;} { (exit 1); exit 1; }; } fi @@ -1609,7 +1616,7 @@ fi # Check whether --with-system-type or --without-system-type was given. if test "${with_system_type+set}" = set; then withval="$with_system_type" - { echo "$as_me:1612: WARNING: overriding system type to $withval" >&5 + { echo "$as_me:1619: WARNING: overriding system type to $withval" >&5 echo "$as_me: WARNING: overriding system type to $withval" >&2;} cf_cv_system_name=$withval host_os=$withval @@ -1620,7 +1627,7 @@ fi; cf_user_CFLAGS="$CFLAGS" ### Default install-location -echo "$as_me:1623: checking for fgrep" >&5 +echo "$as_me:1630: checking for fgrep" >&5 echo $ECHO_N "checking for fgrep... $ECHO_C" >&6 if test "${ac_cv_path_FGREP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1632,7 +1639,7 @@ else do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:1635: checking for $ac_word" >&5 +echo "$as_me:1642: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_FGREP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1649,7 +1656,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_FGREP="$ac_dir/$ac_word" - echo "$as_me:1652: found $ac_dir/$ac_word" >&5 + echo "$as_me:1659: found $ac_dir/$ac_word" >&5 break fi done @@ -1660,10 +1667,10 @@ fi FGREP=$ac_cv_path_FGREP if test -n "$FGREP"; then - echo "$as_me:1663: result: $FGREP" >&5 + echo "$as_me:1670: result: $FGREP" >&5 echo "${ECHO_T}$FGREP" >&6 else - echo "$as_me:1666: result: no" >&5 + echo "$as_me:1673: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1671,16 +1678,16 @@ fi done test -n "$FGREP" || FGREP=": " - test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:1674: error: cannot find workable fgrep" >&5 + test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:1681: error: cannot find workable fgrep" >&5 echo "$as_me: error: cannot find workable fgrep" >&2;} { (exit 1); exit 1; }; } fi fi -echo "$as_me:1679: result: $ac_cv_path_FGREP" >&5 +echo "$as_me:1686: result: $ac_cv_path_FGREP" >&5 echo "${ECHO_T}$ac_cv_path_FGREP" >&6 FGREP="$ac_cv_path_FGREP" -echo "$as_me:1683: checking for prefix" >&5 +echo "$as_me:1690: checking for prefix" >&5 echo $ECHO_N "checking for prefix... $ECHO_C" >&6 if test "x$prefix" = "xNONE" ; then case "$cf_cv_system_name" in @@ -1692,11 +1699,11 @@ if test "x$prefix" = "xNONE" ; then ;; esac fi -echo "$as_me:1695: result: $prefix" >&5 +echo "$as_me:1702: result: $prefix" >&5 echo "${ECHO_T}$prefix" >&6 if test "x$prefix" = "xNONE" ; then -echo "$as_me:1699: checking for default include-directory" >&5 +echo "$as_me:1706: checking for default include-directory" >&5 echo $ECHO_N "checking for default include-directory... $ECHO_C" >&6 test -n "$verbose" && echo 1>&6 for cf_symbol in \ @@ -1719,7 +1726,7 @@ do fi test -n "$verbose" && echo " tested $cf_dir" 1>&6 done -echo "$as_me:1722: result: $includedir" >&5 +echo "$as_me:1729: result: $includedir" >&5 echo "${ECHO_T}$includedir" >&6 fi @@ -1740,9 +1747,10 @@ cf_dft_opaque_curses=no cf_dft_ordinate_type=short cf_dft_signed_char=no cf_dft_tparm_arg=long +cf_dft_widec=no cf_dft_with_lp64=no -# ABI 6 defaults: +# ABI 6 default differences from ABI 5: case x$cf_cv_abi_default in (x[6789]) cf_dft_chtype=uint32_t @@ -1754,17 +1762,18 @@ case x$cf_cv_abi_default in cf_dft_filter_syms=yes cf_dft_interop=yes cf_dft_mmask_t=uint32_t + cf_dft_opaque_curses=yes cf_dft_tparm_arg=intptr_t + cf_dft_widec=yes cf_dft_with_lp64=yes ;; esac -# ABI 7 defaults: +# ABI 7 default differences from ABI 6: case x$cf_cv_abi_default in (x[789]) cf_dft_ccharw_max=6 cf_dft_mmask_t=uint64_t - cf_dft_opaque_curses=yes cf_dft_ordinate_type=int cf_dft_signed_char=yes # also: remove the wgetch-events feature in ABI 7 @@ -1778,24 +1787,24 @@ if test "${with_abi_altered+set}" = set; then withval="$with_abi_altered" if test -n "$withval" ; then - case $withval in - ([0-9]*) + case `echo "$withval" | sed -e 's/^[0-9]*$/0/g'` in + (0) ;; (*) - { { echo "$as_me:1785: error: ABI altered is not a number: $withval" >&5 + { { echo "$as_me:1794: error: ABI altered is not a number: $withval" >&5 echo "$as_me: error: ABI altered is not a number: $withval" >&2;} { (exit 1); exit 1; }; } ;; esac else - { { echo "$as_me:1791: error: ABI altered value is empty" >&5 + { { echo "$as_me:1800: error: ABI altered value is empty" >&5 echo "$as_me: error: ABI altered value is empty" >&2;} { (exit 1); exit 1; }; } fi if test "$cf_cv_abi_version" != "$withval" then - { echo "$as_me:1798: WARNING: altering visible ABI from $cf_cv_abi_version to $withval" >&5 + { echo "$as_me:1807: WARNING: altering visible ABI from $cf_cv_abi_version to $withval" >&5 echo "$as_me: WARNING: altering visible ABI from $cf_cv_abi_version to $withval" >&2;} cf_cv_abi_version=$withval fi @@ -1812,13 +1821,308 @@ else cf_with_ada=yes fi; +cf_prog_cc="gcc cc" if test "x$cf_with_ada" = xyes then - cf_prog_cc="gnatgcc gcc cc" + +for cf_prog_gnat in gnat gnatmake gprconfig gprbuild +do + +cf_upper_prog_gnat=`echo "${cf_prog_gnat}" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` + + unset ac_cv_path_cf_TEMP_gnat + unset cf_TEMP_gnat + # Extract the first word of "$cf_prog_gnat", so it can be a program name with args. +set dummy $cf_prog_gnat; ac_word=$2 +echo "$as_me:1837: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_cf_TEMP_gnat+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $cf_TEMP_gnat in + [\\/]* | ?:[\\/]*) + ac_cv_path_cf_TEMP_gnat="$cf_TEMP_gnat" # Let the user override the test with a path. + ;; + *) + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_cf_TEMP_gnat="$ac_dir/$ac_word" + echo "$as_me:1854: found $ac_dir/$ac_word" >&5 + break +fi +done + + test -z "$ac_cv_path_cf_TEMP_gnat" && ac_cv_path_cf_TEMP_gnat="no" + ;; +esac +fi +cf_TEMP_gnat=$ac_cv_path_cf_TEMP_gnat + +if test -n "$cf_TEMP_gnat"; then + echo "$as_me:1866: result: $cf_TEMP_gnat" >&5 +echo "${ECHO_T}$cf_TEMP_gnat" >&6 +else + echo "$as_me:1869: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + eval "cf_cv_PATH_$cf_upper_prog_gnat=$ac_cv_path_cf_TEMP_gnat" + + if test "x$cf_TEMP_gnat" != xno; then + unset cf_cv_gnat_version + unset cf_TEMP_gnat + +echo "$as_me:1879: checking for $cf_prog_gnat version" >&5 +echo $ECHO_N "checking for $cf_prog_gnat version... $ECHO_C" >&6 +if test "${cf_cv_gnat_version+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + +cf_cv_gnat_version=`$cf_prog_gnat --version 2>&1 | \ + grep '[0-9].[0-9][0-9]*' |\ + sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'` + +fi +echo "$as_me:1890: result: $cf_cv_gnat_version" >&5 +echo "${ECHO_T}$cf_cv_gnat_version" >&6 +test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no +eval cf_TEMP_gnat=$cf_cv_gnat_version; unset cf_cv_gnat_version + + fi + eval "cf_cv_VERSION_$cf_upper_prog_gnat=$cf_TEMP_gnat" + + unset cf_TEMP_gnat + unset cf_cv_gnat_version + unset ac_cv_path_cf_TEMP_gnat +done + +if test "x$cf_cv_VERSION_GNATMAKE" = "xno"; then + cf_ada_make= + cf_cv_prog_gnat_correct=no +else + cf_ada_make=gnatmake + if test "x$cf_cv_VERSION_GPRCONFIG" = "xno"; then + # gprconfig is newer than gnatmake; we can continue... + cf_ada_config="##" + else + rm -rf ./conftest* ./*~conftest* + if mkdir conftest.src + then + cf_ada_config="" + cd conftest.src + for cf_gprconfig in Ada C + do + echo "$as_me:1919: checking for gprconfig name for $cf_gprconfig" >&5 +echo $ECHO_N "checking for gprconfig name for $cf_gprconfig... $ECHO_C" >&6 + if test "$cf_gprconfig" = C + then + for cf_gprconfig_param in \ + "$cf_gprconfig,,,,GNATGCC" \ + "$cf_gprconfig,,,,GCC" \ + "$cf_gprconfig" + do + cf_gprconfig_value=`echo s| gprconfig --config=$cf_gprconfig_param 2>&5 | ${AWK:-awk} '/^\*/{print $3;}' | head -n 1` + test -n "$cf_gprconfig_value" && break + done + else + cf_gprconfig_param=$cf_gprconfig + cf_gprconfig_value=`echo s| gprconfig --config=$cf_gprconfig_param 2>&5 | ${AWK:-awk} '/^\*/{print $3;}' | head -n 1` + fi + if test -n "$cf_gprconfig_value" + then + eval "cf_ada_config_$cf_gprconfig=$cf_gprconfig_value" + echo "$as_me:1938: result: $cf_gprconfig_value" >&5 +echo "${ECHO_T}$cf_gprconfig_value" >&6 + else + echo "$as_me:1941: result: missing" >&5 +echo "${ECHO_T}missing" >&6 + cf_ada_config="#" + break + fi + done + cd .. + rm -rf ./conftest* ./*~conftest* + fi + fi + if test "x$cf_ada_config" != "x#" + then + +echo "$as_me:1954: checking for gnat version" >&5 +echo $ECHO_N "checking for gnat version... $ECHO_C" >&6 +if test "${cf_cv_gnat_version+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + +cf_cv_gnat_version=`${cf_ada_make:-gnatmake} --version 2>&1 | \ + grep '[0-9].[0-9][0-9]*' |\ + sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'` + +fi +echo "$as_me:1965: result: $cf_cv_gnat_version" >&5 +echo "${ECHO_T}$cf_cv_gnat_version" >&6 +test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no + +case "$cf_cv_gnat_version" in +(3.1[1-9]*|3.[2-9]*|[4-9].*|[1-9][0-9].[0-9]*|20[0-9][0-9]) + cf_cv_prog_gnat_correct=yes + ;; +(*) + { echo "$as_me:1974: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5 +echo "$as_me: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;} + cf_cv_prog_gnat_correct=no + ;; +esac + + # Extract the first word of "m4", so it can be a program name with args. +set dummy m4; ac_word=$2 +echo "$as_me:1982: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_M4_exists+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$M4_exists"; then + ac_cv_prog_M4_exists="$M4_exists" # Let the user override the test. +else + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue +ac_cv_prog_M4_exists="yes" +echo "$as_me:1997: found $ac_dir/$ac_word" >&5 +break +done + + test -z "$ac_cv_prog_M4_exists" && ac_cv_prog_M4_exists="no" +fi +fi +M4_exists=$ac_cv_prog_M4_exists +if test -n "$M4_exists"; then + echo "$as_me:2006: result: $M4_exists" >&5 +echo "${ECHO_T}$M4_exists" >&6 else - cf_prog_cc="gcc cc" + echo "$as_me:2009: result: no" >&5 +echo "${ECHO_T}no" >&6 fi + if test "$ac_cv_prog_M4_exists" = no; then + cf_cv_prog_gnat_correct=no + { echo "$as_me:2015: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5 +echo "$as_me: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&2;} + fi + if test "$cf_cv_prog_gnat_correct" = yes; then + echo "$as_me:2019: checking if GNAT works" >&5 +echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6 + +rm -rf ./conftest* ./*~conftest* +cat >>conftest.ads <>conftest.adb <&5 2>&1 ) ; then + if ( ./conftest 1>&5 2>&1 ) ; then + cf_cv_prog_gnat_correct=yes + else + cf_cv_prog_gnat_correct=no + fi +else + cf_cv_prog_gnat_correct=no +fi +rm -rf ./conftest* ./*~conftest* + + echo "$as_me:2047: result: $cf_cv_prog_gnat_correct" >&5 +echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6 + fi + else + cf_cv_prog_gnat_correct=no + fi +fi + + if test "x$cf_cv_prog_gnat_correct" = xyes; then + # gcc's developers chose to deprecate gnatgcc before making gprconfig + # work. They replaced gnatgcc in gcc 13 with a script which spits out + # a warning offering advice which could never work. + # + # Here is a workaround. + # Extract the first word of "gnatgcc", so it can be a program name with args. +set dummy gnatgcc; ac_word=$2 +echo "$as_me:2063: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_cf_cv_path_gnatgcc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $cf_cv_path_gnatgcc in + [\\/]* | ?:[\\/]*) + ac_cv_path_cf_cv_path_gnatgcc="$cf_cv_path_gnatgcc" # Let the user override the test with a path. + ;; + *) + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_cf_cv_path_gnatgcc="$ac_dir/$ac_word" + echo "$as_me:2080: found $ac_dir/$ac_word" >&5 + break +fi +done + + test -z "$ac_cv_path_cf_cv_path_gnatgcc" && ac_cv_path_cf_cv_path_gnatgcc="no" + ;; +esac +fi +cf_cv_path_gnatgcc=$ac_cv_path_cf_cv_path_gnatgcc + +if test -n "$cf_cv_path_gnatgcc"; then + echo "$as_me:2092: result: $cf_cv_path_gnatgcc" >&5 +echo "${ECHO_T}$cf_cv_path_gnatgcc" >&6 +else + echo "$as_me:2095: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + if test "$cf_cv_path_gnatgcc" != no + then + echo "$as_me:2101: checking for improvement" >&5 +echo $ECHO_N "checking for improvement... $ECHO_C" >&6 + cf_file_gnatgcc=`file -L "$cf_cv_path_gnatgcc" 2>/dev/null` + case "x$cf_file_gnatgcc" in + (*script*) + cf_cv_path_gnatgcc=`sh -x "$cf_cv_path_gnatgcc" --version 2>&1 | grep -w exec | sed -e 's/^[ ]*+[ ]*//' -e 's/exec[ ]//' -e 's/ .*//'` + ;; + (*) + cf_cv_path_gnatgcc=no + ;; + esac + echo "$as_me:2112: result: $cf_cv_path_gnatgcc" >&5 +echo "${ECHO_T}$cf_cv_path_gnatgcc" >&6 + test "$cf_cv_path_gnatgcc" = no && cf_cv_path_gnatgcc=gnatgcc + cf_prog_cc="$cf_cv_path_gnatgcc $cf_prog_cc" + fi + fi +fi +case "$cf_prog_cc" in +(*/*) + CC="$cf_prog_cc" + + ;; +(*) + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS "conftest.$ac_ext" >&5' @@ -1830,7 +2134,7 @@ if test -n "$ac_tool_prefix"; then do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:1833: checking for $ac_word" >&5 +echo "$as_me:2137: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1845,7 +2149,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_CC="$ac_tool_prefix$ac_prog" -echo "$as_me:1848: found $ac_dir/$ac_word" >&5 +echo "$as_me:2152: found $ac_dir/$ac_word" >&5 break done @@ -1853,10 +2157,10 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1856: result: $CC" >&5 + echo "$as_me:2160: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1859: result: no" >&5 + echo "$as_me:2163: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1869,7 +2173,7 @@ if test -z "$CC"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:1872: checking for $ac_word" >&5 +echo "$as_me:2176: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1884,7 +2188,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_CC="$ac_prog" -echo "$as_me:1887: found $ac_dir/$ac_word" >&5 +echo "$as_me:2191: found $ac_dir/$ac_word" >&5 break done @@ -1892,10 +2196,10 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1895: result: $ac_ct_CC" >&5 + echo "$as_me:2199: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1898: result: no" >&5 + echo "$as_me:2202: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1905,32 +2209,32 @@ done CC=$ac_ct_CC fi -test -z "$CC" && { { echo "$as_me:1908: error: no acceptable cc found in \$PATH" >&5 +test -z "$CC" && { { echo "$as_me:2212: error: no acceptable cc found in \$PATH" >&5 echo "$as_me: error: no acceptable cc found in \$PATH" >&2;} { (exit 1); exit 1; }; } # Provide some information about the compiler. -echo "$as_me:1913:" \ +echo "$as_me:2217:" \ "checking for C compiler version" >&5 ac_compiler=`set X $ac_compile; echo "$2"` -{ (eval echo "$as_me:1916: \"$ac_compiler --version &5\"") >&5 +{ (eval echo "$as_me:2220: \"$ac_compiler --version &5\"") >&5 (eval $ac_compiler --version &5) 2>&5 ac_status=$? - echo "$as_me:1919: \$? = $ac_status" >&5 + echo "$as_me:2223: \$? = $ac_status" >&5 (exit "$ac_status"); } -{ (eval echo "$as_me:1921: \"$ac_compiler -v &5\"") >&5 +{ (eval echo "$as_me:2225: \"$ac_compiler -v &5\"") >&5 (eval $ac_compiler -v &5) 2>&5 ac_status=$? - echo "$as_me:1924: \$? = $ac_status" >&5 + echo "$as_me:2228: \$? = $ac_status" >&5 (exit "$ac_status"); } -{ (eval echo "$as_me:1926: \"$ac_compiler -V &5\"") >&5 +{ (eval echo "$as_me:2230: \"$ac_compiler -V &5\"") >&5 (eval $ac_compiler -V &5) 2>&5 ac_status=$? - echo "$as_me:1929: \$? = $ac_status" >&5 + echo "$as_me:2233: \$? = $ac_status" >&5 (exit "$ac_status"); } cat >"conftest.$ac_ext" <<_ACEOF -#line 1933 "configure" +#line 2237 "configure" #include "confdefs.h" int @@ -1946,13 +2250,13 @@ ac_clean_files="$ac_clean_files a.out a.exe" # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. -echo "$as_me:1949: checking for C compiler default output" >&5 +echo "$as_me:2253: checking for C compiler default output" >&5 echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6 ac_link_default=`echo "$ac_link" | sed 's/ -o *"conftest[^"]*"//'` -if { (eval echo "$as_me:1952: \"$ac_link_default\"") >&5 +if { (eval echo "$as_me:2256: \"$ac_link_default\"") >&5 (eval $ac_link_default) 2>&5 ac_status=$? - echo "$as_me:1955: \$? = $ac_status" >&5 + echo "$as_me:2259: \$? = $ac_status" >&5 (exit "$ac_status"); }; then # Find the output, starting from the most likely. This scheme is # not robust to junk in `.', hence go to wildcards (a.*) only as a last @@ -1975,34 +2279,34 @@ done else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 -{ { echo "$as_me:1978: error: C compiler cannot create executables" >&5 +{ { echo "$as_me:2282: error: C compiler cannot create executables" >&5 echo "$as_me: error: C compiler cannot create executables" >&2;} { (exit 77); exit 77; }; } fi ac_exeext=$ac_cv_exeext -echo "$as_me:1984: result: $ac_file" >&5 +echo "$as_me:2288: result: $ac_file" >&5 echo "${ECHO_T}$ac_file" >&6 # Check the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -echo "$as_me:1989: checking whether the C compiler works" >&5 +echo "$as_me:2293: checking whether the C compiler works" >&5 echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0 # If not cross compiling, check that we can run a simple program. if test "$cross_compiling" != yes; then if { ac_try='./$ac_file' - { (eval echo "$as_me:1995: \"$ac_try\"") >&5 + { (eval echo "$as_me:2299: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1998: \$? = $ac_status" >&5 + echo "$as_me:2302: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cross_compiling=no else if test "$cross_compiling" = maybe; then cross_compiling=yes else - { { echo "$as_me:2005: error: cannot run C compiled programs. + { { echo "$as_me:2309: error: cannot run C compiled programs. If you meant to cross compile, use \`--host'." >&5 echo "$as_me: error: cannot run C compiled programs. If you meant to cross compile, use \`--host'." >&2;} @@ -2010,24 +2314,24 @@ If you meant to cross compile, use \`--host'." >&2;} fi fi fi -echo "$as_me:2013: result: yes" >&5 +echo "$as_me:2317: result: yes" >&5 echo "${ECHO_T}yes" >&6 rm -f a.out a.exe "conftest$ac_cv_exeext" ac_clean_files=$ac_clean_files_save # Check the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -echo "$as_me:2020: checking whether we are cross compiling" >&5 +echo "$as_me:2324: checking whether we are cross compiling" >&5 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 -echo "$as_me:2022: result: $cross_compiling" >&5 +echo "$as_me:2326: result: $cross_compiling" >&5 echo "${ECHO_T}$cross_compiling" >&6 -echo "$as_me:2025: checking for executable suffix" >&5 +echo "$as_me:2329: checking for executable suffix" >&5 echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6 -if { (eval echo "$as_me:2027: \"$ac_link\"") >&5 +if { (eval echo "$as_me:2331: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:2030: \$? = $ac_status" >&5 + echo "$as_me:2334: \$? = $ac_status" >&5 (exit "$ac_status"); }; then # If both `conftest.exe' and `conftest' are `present' (well, observable) # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will @@ -2043,25 +2347,25 @@ for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do esac done else - { { echo "$as_me:2046: error: cannot compute EXEEXT: cannot compile and link" >&5 + { { echo "$as_me:2350: error: cannot compute EXEEXT: cannot compile and link" >&5 echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;} { (exit 1); exit 1; }; } fi rm -f "conftest$ac_cv_exeext" -echo "$as_me:2052: result: $ac_cv_exeext" >&5 +echo "$as_me:2356: result: $ac_cv_exeext" >&5 echo "${ECHO_T}$ac_cv_exeext" >&6 rm -f "conftest.$ac_ext" EXEEXT=$ac_cv_exeext ac_exeext=$EXEEXT -echo "$as_me:2058: checking for object suffix" >&5 +echo "$as_me:2362: checking for object suffix" >&5 echo $ECHO_N "checking for object suffix... $ECHO_C" >&6 if test "${ac_cv_objext+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 2064 "configure" +#line 2368 "configure" #include "confdefs.h" int @@ -2073,10 +2377,10 @@ main (void) } _ACEOF rm -f conftest.o conftest.obj -if { (eval echo "$as_me:2076: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2380: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2079: \$? = $ac_status" >&5 + echo "$as_me:2383: \$? = $ac_status" >&5 (exit "$ac_status"); }; then for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do case $ac_file in @@ -2088,24 +2392,24 @@ done else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 -{ { echo "$as_me:2091: error: cannot compute OBJEXT: cannot compile" >&5 +{ { echo "$as_me:2395: error: cannot compute OBJEXT: cannot compile" >&5 echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;} { (exit 1); exit 1; }; } fi rm -f "conftest.$ac_cv_objext" "conftest.$ac_ext" fi -echo "$as_me:2098: result: $ac_cv_objext" >&5 +echo "$as_me:2402: result: $ac_cv_objext" >&5 echo "${ECHO_T}$ac_cv_objext" >&6 OBJEXT=$ac_cv_objext ac_objext=$OBJEXT -echo "$as_me:2102: checking whether we are using the GNU C compiler" >&5 +echo "$as_me:2406: checking whether we are using the GNU C compiler" >&5 echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 if test "${ac_cv_c_compiler_gnu+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 2108 "configure" +#line 2412 "configure" #include "confdefs.h" int @@ -2120,16 +2424,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:2123: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2427: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2126: \$? = $ac_status" >&5 + echo "$as_me:2430: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:2129: \"$ac_try\"") >&5 + { (eval echo "$as_me:2433: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2132: \$? = $ac_status" >&5 + echo "$as_me:2436: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_compiler_gnu=yes else @@ -2141,19 +2445,19 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -echo "$as_me:2144: result: $ac_cv_c_compiler_gnu" >&5 +echo "$as_me:2448: result: $ac_cv_c_compiler_gnu" >&5 echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 GCC=`test $ac_compiler_gnu = yes && echo yes` ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS CFLAGS="-g" -echo "$as_me:2150: checking whether $CC accepts -g" >&5 +echo "$as_me:2454: checking whether $CC accepts -g" >&5 echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 if test "${ac_cv_prog_cc_g+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 2156 "configure" +#line 2460 "configure" #include "confdefs.h" int @@ -2165,16 +2469,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:2168: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2472: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2171: \$? = $ac_status" >&5 + echo "$as_me:2475: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:2174: \"$ac_try\"") >&5 + { (eval echo "$as_me:2478: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2177: \$? = $ac_status" >&5 + echo "$as_me:2481: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_prog_cc_g=yes else @@ -2184,7 +2488,7 @@ ac_cv_prog_cc_g=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:2187: result: $ac_cv_prog_cc_g" >&5 +echo "$as_me:2491: result: $ac_cv_prog_cc_g" >&5 echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS @@ -2211,16 +2515,16 @@ cat >"conftest.$ac_ext" <<_ACEOF #endif _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:2214: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2518: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2217: \$? = $ac_status" >&5 + echo "$as_me:2521: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:2220: \"$ac_try\"") >&5 + { (eval echo "$as_me:2524: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2223: \$? = $ac_status" >&5 + echo "$as_me:2527: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then for ac_declaration in \ ''\ @@ -2232,7 +2536,7 @@ if { (eval echo "$as_me:2214: \"$ac_compile\"") >&5 'void exit (int);' do cat >"conftest.$ac_ext" <<_ACEOF -#line 2235 "configure" +#line 2539 "configure" #include "confdefs.h" #include $ac_declaration @@ -2245,16 +2549,16 @@ exit (42); } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:2248: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2552: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2251: \$? = $ac_status" >&5 + echo "$as_me:2555: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:2254: \"$ac_try\"") >&5 + { (eval echo "$as_me:2558: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2257: \$? = $ac_status" >&5 + echo "$as_me:2561: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -2264,7 +2568,7 @@ continue fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" cat >"conftest.$ac_ext" <<_ACEOF -#line 2267 "configure" +#line 2571 "configure" #include "confdefs.h" $ac_declaration int @@ -2276,16 +2580,16 @@ exit (42); } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:2279: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2583: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2282: \$? = $ac_status" >&5 + echo "$as_me:2586: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:2285: \"$ac_try\"") >&5 + { (eval echo "$as_me:2589: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2288: \$? = $ac_status" >&5 + echo "$as_me:2592: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then break else @@ -2315,11 +2619,11 @@ ac_main_return="return" GCC_VERSION=none if test "$GCC" = yes ; then - echo "$as_me:2318: checking version of $CC" >&5 + echo "$as_me:2622: checking version of $CC" >&5 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6 GCC_VERSION="`${CC} --version 2>/dev/null | sed -e '2,$d' -e 's/^[^(]*([^)][^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`" test -z "$GCC_VERSION" && GCC_VERSION=unknown - echo "$as_me:2322: result: $GCC_VERSION" >&5 + echo "$as_me:2626: result: $GCC_VERSION" >&5 echo "${ECHO_T}$GCC_VERSION" >&6 fi @@ -2328,12 +2632,12 @@ INTEL_COMPILER=no if test "$GCC" = yes ; then case "$host_os" in (linux*|gnu*) - echo "$as_me:2331: checking if this is really Intel C compiler" >&5 + echo "$as_me:2635: checking if this is really Intel C compiler" >&5 echo $ECHO_N "checking if this is really Intel C compiler... $ECHO_C" >&6 cf_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -no-gcc" cat >"conftest.$ac_ext" <<_ACEOF -#line 2336 "configure" +#line 2640 "configure" #include "confdefs.h" int @@ -2350,16 +2654,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:2353: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2657: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2356: \$? = $ac_status" >&5 + echo "$as_me:2660: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:2359: \"$ac_try\"") >&5 + { (eval echo "$as_me:2663: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2362: \$? = $ac_status" >&5 + echo "$as_me:2666: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then INTEL_COMPILER=yes cf_save_CFLAGS="$cf_save_CFLAGS -we147" @@ -2370,7 +2674,7 @@ cat "conftest.$ac_ext" >&5 fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" CFLAGS="$cf_save_CFLAGS" - echo "$as_me:2373: result: $INTEL_COMPILER" >&5 + echo "$as_me:2677: result: $INTEL_COMPILER" >&5 echo "${ECHO_T}$INTEL_COMPILER" >&6 ;; esac @@ -2379,11 +2683,11 @@ fi CLANG_COMPILER=no if test "$GCC" = yes ; then - echo "$as_me:2382: checking if this is really Clang C compiler" >&5 + echo "$as_me:2686: checking if this is really Clang C compiler" >&5 echo $ECHO_N "checking if this is really Clang C compiler... $ECHO_C" >&6 cf_save_CFLAGS="$CFLAGS" cat >"conftest.$ac_ext" <<_ACEOF -#line 2386 "configure" +#line 2690 "configure" #include "confdefs.h" int @@ -2400,16 +2704,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:2403: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2707: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2406: \$? = $ac_status" >&5 + echo "$as_me:2710: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:2409: \"$ac_try\"") >&5 + { (eval echo "$as_me:2713: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2412: \$? = $ac_status" >&5 + echo "$as_me:2716: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then CLANG_COMPILER=yes @@ -2419,7 +2723,7 @@ cat "conftest.$ac_ext" >&5 fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" CFLAGS="$cf_save_CFLAGS" - echo "$as_me:2422: result: $CLANG_COMPILER" >&5 + echo "$as_me:2726: result: $CLANG_COMPILER" >&5 echo "${ECHO_T}$CLANG_COMPILER" >&6 fi @@ -2428,30 +2732,30 @@ CLANG_VERSION=none if test "x$CLANG_COMPILER" = "xyes" ; then case "$CC" in (c[1-9][0-9]|*/c[1-9][0-9]) - { echo "$as_me:2431: WARNING: replacing broken compiler alias $CC" >&5 + { echo "$as_me:2735: WARNING: replacing broken compiler alias $CC" >&5 echo "$as_me: WARNING: replacing broken compiler alias $CC" >&2;} CFLAGS="$CFLAGS -std=`echo "$CC" | sed -e 's%.*/%%'`" CC=clang ;; esac - echo "$as_me:2438: checking version of $CC" >&5 + echo "$as_me:2742: checking version of $CC" >&5 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6 CLANG_VERSION="`$CC --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(CLANG[^)]*) //' -e 's/^.*(Debian[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`" test -z "$CLANG_VERSION" && CLANG_VERSION=unknown - echo "$as_me:2442: result: $CLANG_VERSION" >&5 + echo "$as_me:2746: result: $CLANG_VERSION" >&5 echo "${ECHO_T}$CLANG_VERSION" >&6 for cf_clang_opt in \ -Qunused-arguments \ -Wno-error=implicit-function-declaration do - echo "$as_me:2449: checking if option $cf_clang_opt works" >&5 + echo "$as_me:2753: checking if option $cf_clang_opt works" >&5 echo $ECHO_N "checking if option $cf_clang_opt works... $ECHO_C" >&6 cf_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $cf_clang_opt" cat >"conftest.$ac_ext" <<_ACEOF -#line 2454 "configure" +#line 2758 "configure" #include "confdefs.h" #include @@ -2465,16 +2769,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:2468: \"$ac_link\"") >&5 +if { (eval echo "$as_me:2772: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:2471: \$? = $ac_status" >&5 + echo "$as_me:2775: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:2474: \"$ac_try\"") >&5 + { (eval echo "$as_me:2778: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2477: \$? = $ac_status" >&5 + echo "$as_me:2781: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_clang_optok=yes @@ -2485,13 +2789,13 @@ cat "conftest.$ac_ext" >&5 cf_clang_optok=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - echo "$as_me:2488: result: $cf_clang_optok" >&5 + echo "$as_me:2792: result: $cf_clang_optok" >&5 echo "${ECHO_T}$cf_clang_optok" >&6 CFLAGS="$cf_save_CFLAGS" if test "$cf_clang_optok" = yes; then test -n "$verbose" && echo " adding option $cf_clang_opt" 1>&6 -echo "${as_me:-configure}:2494: testing adding option $cf_clang_opt ..." 1>&5 +echo "${as_me:-configure}:2798: testing adding option $cf_clang_opt ..." 1>&5 test -n "$CFLAGS" && CFLAGS="$CFLAGS " CFLAGS="${CFLAGS}$cf_clang_opt" @@ -2500,7 +2804,7 @@ echo "${as_me:-configure}:2494: testing adding option $cf_clang_opt ..." 1>&5 done fi -echo "$as_me:2503: checking for $CC option to accept ANSI C" >&5 +echo "$as_me:2807: checking for $CC option to accept ANSI C" >&5 echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 if test "${ac_cv_prog_cc_stdc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2508,7 +2812,7 @@ else ac_cv_prog_cc_stdc=no ac_save_CC=$CC cat >"conftest.$ac_ext" <<_ACEOF -#line 2511 "configure" +#line 2815 "configure" #include "confdefs.h" #include #include @@ -2555,16 +2859,16 @@ for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIO do CC="$ac_save_CC $ac_arg" rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:2558: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2862: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2561: \$? = $ac_status" >&5 + echo "$as_me:2865: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:2564: \"$ac_try\"") >&5 + { (eval echo "$as_me:2868: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2567: \$? = $ac_status" >&5 + echo "$as_me:2871: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_prog_cc_stdc=$ac_arg break @@ -2581,10 +2885,10 @@ fi case "x$ac_cv_prog_cc_stdc" in x|xno) - echo "$as_me:2584: result: none needed" >&5 + echo "$as_me:2888: result: none needed" >&5 echo "${ECHO_T}none needed" >&6 ;; *) - echo "$as_me:2587: result: $ac_cv_prog_cc_stdc" >&5 + echo "$as_me:2891: result: $ac_cv_prog_cc_stdc" >&5 echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 CC="$CC $ac_cv_prog_cc_stdc" ;; esac @@ -2592,13 +2896,13 @@ esac # This should have been defined by AC_PROG_CC : "${CC:=cc}" -echo "$as_me:2595: checking \$CFLAGS variable" >&5 +echo "$as_me:2899: checking \$CFLAGS variable" >&5 echo $ECHO_N "checking \$CFLAGS variable... $ECHO_C" >&6 case "x$CFLAGS" in (*-[IUD]*) - echo "$as_me:2599: result: broken" >&5 + echo "$as_me:2903: result: broken" >&5 echo "${ECHO_T}broken" >&6 - { echo "$as_me:2601: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5 + { echo "$as_me:2905: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5 echo "$as_me: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&2;} cf_flags="$CFLAGS" CFLAGS= @@ -2706,18 +3010,18 @@ fi done ;; (*) - echo "$as_me:2709: result: ok" >&5 + echo "$as_me:3013: result: ok" >&5 echo "${ECHO_T}ok" >&6 ;; esac -echo "$as_me:2714: checking \$CC variable" >&5 +echo "$as_me:3018: checking \$CC variable" >&5 echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6 case "$CC" in (*[\ \ ]-*) - echo "$as_me:2718: result: broken" >&5 + echo "$as_me:3022: result: broken" >&5 echo "${ECHO_T}broken" >&6 - { echo "$as_me:2720: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5 + { echo "$as_me:3024: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5 echo "$as_me: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&2;} # humor him... cf_prog=`echo "$CC" | sed -e 's/ / /g' -e 's/[ ]* / /g' -e 's/[ ]*[ ]-[^ ].*//'` @@ -2834,30 +3138,33 @@ fi done test -n "$verbose" && echo " resulting CC: '$CC'" 1>&6 -echo "${as_me:-configure}:2837: testing resulting CC: '$CC' ..." 1>&5 +echo "${as_me:-configure}:3141: testing resulting CC: '$CC' ..." 1>&5 test -n "$verbose" && echo " resulting CFLAGS: '$CFLAGS'" 1>&6 -echo "${as_me:-configure}:2841: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5 +echo "${as_me:-configure}:3145: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5 test -n "$verbose" && echo " resulting CPPFLAGS: '$CPPFLAGS'" 1>&6 -echo "${as_me:-configure}:2845: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5 +echo "${as_me:-configure}:3149: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5 ;; (*) - echo "$as_me:2849: result: ok" >&5 + echo "$as_me:3153: result: ok" >&5 echo "${ECHO_T}ok" >&6 ;; esac + ;; +esac + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS "conftest.$ac_ext" >&5' ac_link='$CC -o "conftest$ac_exeext" $CFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac_ext" $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu ac_main_return="return" -echo "$as_me:2860: checking how to run the C preprocessor" >&5 +echo "$as_me:3167: checking how to run the C preprocessor" >&5 echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then @@ -2878,18 +3185,18 @@ do # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >"conftest.$ac_ext" <<_ACEOF -#line 2881 "configure" +#line 3188 "configure" #include "confdefs.h" #include Syntax error _ACEOF -if { (eval echo "$as_me:2886: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:3193: \"$ac_cpp "conftest.$ac_ext"\"") >&5 (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:2892: \$? = $ac_status" >&5 + echo "$as_me:3199: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -2912,17 +3219,17 @@ rm -f conftest.err "conftest.$ac_ext" # OK, works on sane cases. Now check whether non-existent headers # can be detected and how. cat >"conftest.$ac_ext" <<_ACEOF -#line 2915 "configure" +#line 3222 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:2919: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:3226: \"$ac_cpp "conftest.$ac_ext"\"") >&5 (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:2925: \$? = $ac_status" >&5 + echo "$as_me:3232: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -2959,7 +3266,7 @@ fi else ac_cv_prog_CPP=$CPP fi -echo "$as_me:2962: result: $CPP" >&5 +echo "$as_me:3269: result: $CPP" >&5 echo "${ECHO_T}$CPP" >&6 ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes @@ -2969,18 +3276,18 @@ do # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >"conftest.$ac_ext" <<_ACEOF -#line 2972 "configure" +#line 3279 "configure" #include "confdefs.h" #include Syntax error _ACEOF -if { (eval echo "$as_me:2977: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:3284: \"$ac_cpp "conftest.$ac_ext"\"") >&5 (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:2983: \$? = $ac_status" >&5 + echo "$as_me:3290: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -3003,17 +3310,17 @@ rm -f conftest.err "conftest.$ac_ext" # OK, works on sane cases. Now check whether non-existent headers # can be detected and how. cat >"conftest.$ac_ext" <<_ACEOF -#line 3006 "configure" +#line 3313 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:3010: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:3317: \"$ac_cpp "conftest.$ac_ext"\"") >&5 (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:3016: \$? = $ac_status" >&5 + echo "$as_me:3323: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -3041,7 +3348,7 @@ rm -f conftest.err "conftest.$ac_ext" if $ac_preproc_ok; then : else - { { echo "$as_me:3044: error: C preprocessor \"$CPP\" fails sanity check" >&5 + { { echo "$as_me:3351: error: C preprocessor \"$CPP\" fails sanity check" >&5 echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;} { (exit 1); exit 1; }; } fi @@ -3054,14 +3361,14 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu ac_main_return="return" if test $ac_cv_c_compiler_gnu = yes; then - echo "$as_me:3057: checking whether $CC needs -traditional" >&5 + echo "$as_me:3364: checking whether $CC needs -traditional" >&5 echo $ECHO_N "checking whether $CC needs -traditional... $ECHO_C" >&6 if test "${ac_cv_prog_gcc_traditional+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_pattern="Autoconf.*'x'" cat >"conftest.$ac_ext" <<_ACEOF -#line 3064 "configure" +#line 3371 "configure" #include "confdefs.h" #include int Autoconf = TIOCGETP; @@ -3076,7 +3383,7 @@ rm -rf conftest* if test $ac_cv_prog_gcc_traditional = no; then cat >"conftest.$ac_ext" <<_ACEOF -#line 3079 "configure" +#line 3386 "configure" #include "confdefs.h" #include int Autoconf = TCGETA; @@ -3089,14 +3396,14 @@ rm -rf conftest* fi fi -echo "$as_me:3092: result: $ac_cv_prog_gcc_traditional" >&5 +echo "$as_me:3399: result: $ac_cv_prog_gcc_traditional" >&5 echo "${ECHO_T}$ac_cv_prog_gcc_traditional" >&6 if test $ac_cv_prog_gcc_traditional = yes; then CC="$CC -traditional" fi fi -echo "$as_me:3099: checking whether $CC understands -c and -o together" >&5 +echo "$as_me:3406: checking whether $CC understands -c and -o together" >&5 echo $ECHO_N "checking whether $CC understands -c and -o together... $ECHO_C" >&6 if test "${cf_cv_prog_CC_c_o+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3111,15 +3418,15 @@ CF_EOF # We do the test twice because some compilers refuse to overwrite an # existing .o file with -o, though they will create one. ac_try='$CC $CFLAGS $CPPFLAGS -c conftest.$ac_ext -o conftest2.$ac_objext >&5' -if { (eval echo "$as_me:3114: \"$ac_try\"") >&5 +if { (eval echo "$as_me:3421: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3117: \$? = $ac_status" >&5 + echo "$as_me:3424: \$? = $ac_status" >&5 (exit "$ac_status"); } && - test -f conftest2.$ac_objext && { (eval echo "$as_me:3119: \"$ac_try\"") >&5 + test -f conftest2.$ac_objext && { (eval echo "$as_me:3426: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3122: \$? = $ac_status" >&5 + echo "$as_me:3429: \$? = $ac_status" >&5 (exit "$ac_status"); }; then eval cf_cv_prog_CC_c_o=yes @@ -3130,10 +3437,10 @@ rm -rf ./conftest* fi if test "$cf_cv_prog_CC_c_o" = yes; then - echo "$as_me:3133: result: yes" >&5 + echo "$as_me:3440: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:3136: result: no" >&5 + echo "$as_me:3443: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3147,7 +3454,7 @@ else (*) LDPATH=$PATH:/sbin:/usr/sbin # Extract the first word of "ldconfig", so it can be a program name with args. set dummy ldconfig; ac_word=$2 -echo "$as_me:3150: checking for $ac_word" >&5 +echo "$as_me:3457: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_LDCONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3164,7 +3471,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_LDCONFIG="$ac_dir/$ac_word" - echo "$as_me:3167: found $ac_dir/$ac_word" >&5 + echo "$as_me:3474: found $ac_dir/$ac_word" >&5 break fi done @@ -3175,10 +3482,10 @@ fi LDCONFIG=$ac_cv_path_LDCONFIG if test -n "$LDCONFIG"; then - echo "$as_me:3178: result: $LDCONFIG" >&5 + echo "$as_me:3485: result: $LDCONFIG" >&5 echo "${ECHO_T}$LDCONFIG" >&6 else - echo "$as_me:3181: result: no" >&5 + echo "$as_me:3488: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3186,7 +3493,7 @@ fi esac fi -echo "$as_me:3189: checking if you want to ensure bool is consistent with C++" >&5 +echo "$as_me:3496: checking if you want to ensure bool is consistent with C++" >&5 echo $ECHO_N "checking if you want to ensure bool is consistent with C++... $ECHO_C" >&6 # Check whether --with-cxx or --without-cxx was given. @@ -3196,7 +3503,7 @@ if test "${with_cxx+set}" = set; then else cf_with_cxx=yes fi; -echo "$as_me:3199: result: $cf_with_cxx" >&5 +echo "$as_me:3506: result: $cf_with_cxx" >&5 echo "${ECHO_T}$cf_with_cxx" >&6 if test "X$cf_with_cxx" = Xno ; then CXX="" @@ -3214,7 +3521,7 @@ if test -n "$ac_tool_prefix"; then do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:3217: checking for $ac_word" >&5 +echo "$as_me:3524: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CXX+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3229,7 +3536,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" -echo "$as_me:3232: found $ac_dir/$ac_word" >&5 +echo "$as_me:3539: found $ac_dir/$ac_word" >&5 break done @@ -3237,10 +3544,10 @@ fi fi CXX=$ac_cv_prog_CXX if test -n "$CXX"; then - echo "$as_me:3240: result: $CXX" >&5 + echo "$as_me:3547: result: $CXX" >&5 echo "${ECHO_T}$CXX" >&6 else - echo "$as_me:3243: result: no" >&5 + echo "$as_me:3550: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3253,7 +3560,7 @@ if test -z "$CXX"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:3256: checking for $ac_word" >&5 +echo "$as_me:3563: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3268,7 +3575,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_CXX="$ac_prog" -echo "$as_me:3271: found $ac_dir/$ac_word" >&5 +echo "$as_me:3578: found $ac_dir/$ac_word" >&5 break done @@ -3276,10 +3583,10 @@ fi fi ac_ct_CXX=$ac_cv_prog_ac_ct_CXX if test -n "$ac_ct_CXX"; then - echo "$as_me:3279: result: $ac_ct_CXX" >&5 + echo "$as_me:3586: result: $ac_ct_CXX" >&5 echo "${ECHO_T}$ac_ct_CXX" >&6 else - echo "$as_me:3282: result: no" >&5 + echo "$as_me:3589: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3291,32 +3598,32 @@ test -n "$ac_ct_CXX" || ac_ct_CXX="g++" fi # Provide some information about the compiler. -echo "$as_me:3294:" \ +echo "$as_me:3601:" \ "checking for C++ compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` -{ (eval echo "$as_me:3297: \"$ac_compiler --version &5\"") >&5 +{ (eval echo "$as_me:3604: \"$ac_compiler --version &5\"") >&5 (eval $ac_compiler --version &5) 2>&5 ac_status=$? - echo "$as_me:3300: \$? = $ac_status" >&5 + echo "$as_me:3607: \$? = $ac_status" >&5 (exit "$ac_status"); } -{ (eval echo "$as_me:3302: \"$ac_compiler -v &5\"") >&5 +{ (eval echo "$as_me:3609: \"$ac_compiler -v &5\"") >&5 (eval $ac_compiler -v &5) 2>&5 ac_status=$? - echo "$as_me:3305: \$? = $ac_status" >&5 + echo "$as_me:3612: \$? = $ac_status" >&5 (exit "$ac_status"); } -{ (eval echo "$as_me:3307: \"$ac_compiler -V &5\"") >&5 +{ (eval echo "$as_me:3614: \"$ac_compiler -V &5\"") >&5 (eval $ac_compiler -V &5) 2>&5 ac_status=$? - echo "$as_me:3310: \$? = $ac_status" >&5 + echo "$as_me:3617: \$? = $ac_status" >&5 (exit "$ac_status"); } -echo "$as_me:3313: checking whether we are using the GNU C++ compiler" >&5 +echo "$as_me:3620: checking whether we are using the GNU C++ compiler" >&5 echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6 if test "${ac_cv_cxx_compiler_gnu+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 3319 "configure" +#line 3626 "configure" #include "confdefs.h" int @@ -3331,16 +3638,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:3334: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3641: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3337: \$? = $ac_status" >&5 + echo "$as_me:3644: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:3340: \"$ac_try\"") >&5 + { (eval echo "$as_me:3647: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3343: \$? = $ac_status" >&5 + echo "$as_me:3650: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_compiler_gnu=yes else @@ -3352,19 +3659,19 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" ac_cv_cxx_compiler_gnu=$ac_compiler_gnu fi -echo "$as_me:3355: result: $ac_cv_cxx_compiler_gnu" >&5 +echo "$as_me:3662: result: $ac_cv_cxx_compiler_gnu" >&5 echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6 GXX=`test $ac_compiler_gnu = yes && echo yes` ac_test_CXXFLAGS=${CXXFLAGS+set} ac_save_CXXFLAGS=$CXXFLAGS CXXFLAGS="-g" -echo "$as_me:3361: checking whether $CXX accepts -g" >&5 +echo "$as_me:3668: checking whether $CXX accepts -g" >&5 echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6 if test "${ac_cv_prog_cxx_g+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 3367 "configure" +#line 3674 "configure" #include "confdefs.h" int @@ -3376,16 +3683,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:3379: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3686: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3382: \$? = $ac_status" >&5 + echo "$as_me:3689: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:3385: \"$ac_try\"") >&5 + { (eval echo "$as_me:3692: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3388: \$? = $ac_status" >&5 + echo "$as_me:3695: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_prog_cxx_g=yes else @@ -3395,7 +3702,7 @@ ac_cv_prog_cxx_g=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:3398: result: $ac_cv_prog_cxx_g" >&5 +echo "$as_me:3705: result: $ac_cv_prog_cxx_g" >&5 echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6 if test "$ac_test_CXXFLAGS" = set; then CXXFLAGS=$ac_save_CXXFLAGS @@ -3422,7 +3729,7 @@ for ac_declaration in \ 'void exit (int);' do cat >"conftest.$ac_ext" <<_ACEOF -#line 3425 "configure" +#line 3732 "configure" #include "confdefs.h" #include $ac_declaration @@ -3435,16 +3742,16 @@ exit (42); } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:3438: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3745: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3441: \$? = $ac_status" >&5 + echo "$as_me:3748: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:3444: \"$ac_try\"") >&5 + { (eval echo "$as_me:3751: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3447: \$? = $ac_status" >&5 + echo "$as_me:3754: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -3454,7 +3761,7 @@ continue fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" cat >"conftest.$ac_ext" <<_ACEOF -#line 3457 "configure" +#line 3764 "configure" #include "confdefs.h" $ac_declaration int @@ -3466,16 +3773,16 @@ exit (42); } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:3469: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3776: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3472: \$? = $ac_status" >&5 + echo "$as_me:3779: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:3475: \"$ac_try\"") >&5 + { (eval echo "$as_me:3782: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3478: \$? = $ac_status" >&5 + echo "$as_me:3785: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then break else @@ -3509,7 +3816,7 @@ ac_main_return="return" then # Several of the C++ configurations do not work, particularly when # cross-compiling (20140913 -TD) - echo "$as_me:3512: checking if $CXX works" >&5 + echo "$as_me:3819: checking if $CXX works" >&5 echo $ECHO_N "checking if $CXX works... $ECHO_C" >&6 save_CPPFLAGS="$CPPFLAGS" @@ -3517,7 +3824,7 @@ echo $ECHO_N "checking if $CXX works... $ECHO_C" >&6 CPPFLAGS="$CPPFLAGS -I${cf_includedir}" cat >"conftest.$ac_ext" <<_ACEOF -#line 3520 "configure" +#line 3827 "configure" #include "confdefs.h" #include @@ -3534,16 +3841,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:3537: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3844: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3540: \$? = $ac_status" >&5 + echo "$as_me:3847: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:3543: \"$ac_try\"") >&5 + { (eval echo "$as_me:3850: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3546: \$? = $ac_status" >&5 + echo "$as_me:3853: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cxx_works=yes else @@ -3554,11 +3861,11 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" CPPFLAGS="$save_CPPFLAGS" - echo "$as_me:3557: result: $cf_cxx_works" >&5 + echo "$as_me:3864: result: $cf_cxx_works" >&5 echo "${ECHO_T}$cf_cxx_works" >&6 if test "x$cf_cxx_works" = xno then - { echo "$as_me:3561: WARNING: Ignore $CXX, since it cannot compile hello-world." >&5 + { echo "$as_me:3868: WARNING: Ignore $CXX, since it cannot compile hello-world." >&5 echo "$as_me: WARNING: Ignore $CXX, since it cannot compile hello-world." >&2;} cf_with_cxx=no; CXX=""; GXX=""; fi @@ -3574,7 +3881,7 @@ ac_main_return="return" if test "$CXX" = "g++" ; then # Extract the first word of "g++", so it can be a program name with args. set dummy g++; ac_word=$2 -echo "$as_me:3577: checking for $ac_word" >&5 +echo "$as_me:3884: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_CXX+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3591,7 +3898,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_CXX="$ac_dir/$ac_word" - echo "$as_me:3594: found $ac_dir/$ac_word" >&5 + echo "$as_me:3901: found $ac_dir/$ac_word" >&5 break fi done @@ -3602,17 +3909,17 @@ fi CXX=$ac_cv_path_CXX if test -n "$CXX"; then - echo "$as_me:3605: result: $CXX" >&5 + echo "$as_me:3912: result: $CXX" >&5 echo "${ECHO_T}$CXX" >&6 else - echo "$as_me:3608: result: no" >&5 + echo "$as_me:3915: result: no" >&5 echo "${ECHO_T}no" >&6 fi fi case "x$CXX" in (x|xg++) - { echo "$as_me:3615: WARNING: You don't have any C++ compiler, too bad" >&5 + { echo "$as_me:3922: WARNING: You don't have any C++ compiler, too bad" >&5 echo "$as_me: WARNING: You don't have any C++ compiler, too bad" >&2;} cf_with_cxx=no; CXX=""; GXX=""; ;; @@ -3621,7 +3928,7 @@ fi GXX_VERSION=none if test "$GXX" = yes; then - echo "$as_me:3624: checking version of ${CXX:-g++}" >&5 + echo "$as_me:3931: checking version of ${CXX:-g++}" >&5 echo $ECHO_N "checking version of ${CXX:-g++}... $ECHO_C" >&6 GXX_VERSION="`${CXX:-g++} --version 2>/dev/null | sed -e '2,$d' -e 's/^[^(]*([^)][^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`" if test -z "$GXX_VERSION" @@ -3629,7 +3936,7 @@ echo $ECHO_N "checking version of ${CXX:-g++}... $ECHO_C" >&6 GXX_VERSION=unknown GXX=no fi - echo "$as_me:3632: result: $GXX_VERSION" >&5 + echo "$as_me:3939: result: $GXX_VERSION" >&5 echo "${ECHO_T}$GXX_VERSION" >&6 fi @@ -3637,12 +3944,12 @@ case "$GXX_VERSION" in ([1-9][0-9].*) ;; (1.*|2.[0-6]*) - { echo "$as_me:3640: WARNING: templates do not work" >&5 + { echo "$as_me:3947: WARNING: templates do not work" >&5 echo "$as_me: WARNING: templates do not work" >&2;} ;; esac -echo "$as_me:3645: checking if you want to build C++ binding and demo" >&5 +echo "$as_me:3952: checking if you want to build C++ binding and demo" >&5 echo $ECHO_N "checking if you want to build C++ binding and demo... $ECHO_C" >&6 # Check whether --with-cxx-binding or --without-cxx-binding was given. @@ -3652,15 +3959,15 @@ if test "${with_cxx_binding+set}" = set; then else cf_with_cxx_binding=$cf_with_cxx fi; -echo "$as_me:3655: result: $cf_with_cxx_binding" >&5 +echo "$as_me:3962: result: $cf_with_cxx_binding" >&5 echo "${ECHO_T}$cf_with_cxx_binding" >&6 -echo "$as_me:3658: checking if you want to build with Ada" >&5 +echo "$as_me:3965: checking if you want to build with Ada" >&5 echo $ECHO_N "checking if you want to build with Ada... $ECHO_C" >&6 -echo "$as_me:3660: result: $cf_with_ada" >&5 +echo "$as_me:3967: result: $cf_with_ada" >&5 echo "${ECHO_T}$cf_with_ada" >&6 -echo "$as_me:3663: checking if you want to install terminal database" >&5 +echo "$as_me:3970: checking if you want to install terminal database" >&5 echo $ECHO_N "checking if you want to install terminal database... $ECHO_C" >&6 # Check whether --enable-db-install or --disable-db-install was given. @@ -3670,10 +3977,10 @@ if test "${enable_db_install+set}" = set; then else cf_with_db_install=yes fi; -echo "$as_me:3673: result: $cf_with_db_install" >&5 +echo "$as_me:3980: result: $cf_with_db_install" >&5 echo "${ECHO_T}$cf_with_db_install" >&6 -echo "$as_me:3676: checking if you want to install manpages" >&5 +echo "$as_me:3983: checking if you want to install manpages" >&5 echo $ECHO_N "checking if you want to install manpages... $ECHO_C" >&6 # Check whether --with-manpages or --without-manpages was given. @@ -3683,10 +3990,10 @@ if test "${with_manpages+set}" = set; then else cf_with_manpages=yes fi; -echo "$as_me:3686: result: $cf_with_manpages" >&5 +echo "$as_me:3993: result: $cf_with_manpages" >&5 echo "${ECHO_T}$cf_with_manpages" >&6 -echo "$as_me:3689: checking if you want to build programs such as tic" >&5 +echo "$as_me:3996: checking if you want to build programs such as tic" >&5 echo $ECHO_N "checking if you want to build programs such as tic... $ECHO_C" >&6 # Check whether --with-progs or --without-progs was given. @@ -3696,35 +4003,10 @@ if test "${with_progs+set}" = set; then else cf_with_progs=yes fi; -echo "$as_me:3699: result: $cf_with_progs" >&5 +echo "$as_me:4006: result: $cf_with_progs" >&5 echo "${ECHO_T}$cf_with_progs" >&6 -if test -f "$srcdir/tack/tack.h" ; then - if test "x$cross_compiling" = xyes ; then - test -n "$verbose" && echo " ignoring tack because we are cross-compiling" 1>&6 - -echo "${as_me:-configure}:3706: testing ignoring tack because we are cross-compiling ..." 1>&5 - - cf_with_tack=no - else - echo "$as_me:3710: checking if you want to build the tack program" >&5 -echo $ECHO_N "checking if you want to build the tack program... $ECHO_C" >&6 - -# Check whether --with-tack or --without-tack was given. -if test "${with_tack+set}" = set; then - withval="$with_tack" - cf_with_tack=$withval -else - cf_with_tack=$cf_with_progs -fi; - echo "$as_me:3720: result: $cf_with_tack" >&5 -echo "${ECHO_T}$cf_with_tack" >&6 - fi -else - cf_with_tack=no -fi - -echo "$as_me:3727: checking if you want to build test-programs" >&5 +echo "$as_me:4009: checking if you want to build test-programs" >&5 echo $ECHO_N "checking if you want to build test-programs... $ECHO_C" >&6 # Check whether --with-tests or --without-tests was given. @@ -3734,10 +4016,10 @@ if test "${with_tests+set}" = set; then else cf_with_tests=yes fi; -echo "$as_me:3737: result: $cf_with_tests" >&5 +echo "$as_me:4019: result: $cf_with_tests" >&5 echo "${ECHO_T}$cf_with_tests" >&6 -echo "$as_me:3740: checking if you wish to install curses.h" >&5 +echo "$as_me:4022: checking if you wish to install curses.h" >&5 echo $ECHO_N "checking if you wish to install curses.h... $ECHO_C" >&6 # Check whether --with-curses-h or --without-curses-h was given. @@ -3747,12 +4029,11 @@ if test "${with_curses_h+set}" = set; then else with_curses_h=yes fi; -echo "$as_me:3750: result: $with_curses_h" >&5 +echo "$as_me:4032: result: $with_curses_h" >&5 echo "${ECHO_T}$with_curses_h" >&6 modules_to_build="ncurses" test "X$cf_with_progs" != Xno && modules_to_build="$modules_to_build progs" -test "X$cf_with_tack" != Xno && modules_to_build="$modules_to_build tack" modules_to_build="$modules_to_build panel menu form" test "$program_prefix" != NONE && @@ -3772,7 +4053,7 @@ for ac_prog in mawk gawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:3775: checking for $ac_word" >&5 +echo "$as_me:4056: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_AWK+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3787,7 +4068,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_AWK="$ac_prog" -echo "$as_me:3790: found $ac_dir/$ac_word" >&5 +echo "$as_me:4071: found $ac_dir/$ac_word" >&5 break done @@ -3795,20 +4076,31 @@ fi fi AWK=$ac_cv_prog_AWK if test -n "$AWK"; then - echo "$as_me:3798: result: $AWK" >&5 + echo "$as_me:4079: result: $AWK" >&5 echo "${ECHO_T}$AWK" >&6 else - echo "$as_me:3801: result: no" >&5 + echo "$as_me:4082: result: no" >&5 echo "${ECHO_T}no" >&6 fi test -n "$AWK" && break done -test -z "$AWK" && { { echo "$as_me:3808: error: No awk program found" >&5 +test -z "$AWK" && { { echo "$as_me:4089: error: No awk program found" >&5 echo "$as_me: error: No awk program found" >&2;} { (exit 1); exit 1; }; } +case "$cf_cv_system_name" in +(cygwin*|msys*|mingw32*|mingw64|os2*) + GLOB_FULLPATH_POSIX='/*' + GLOB_FULLPATH_OTHER='[a-zA-Z]:[\\/]*' + ;; +(*) + GLOB_FULLPATH_POSIX='/*' + GLOB_FULLPATH_OTHER=$GLOB_FULLPATH_POSIX + ;; +esac + # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or # incompatible versions: @@ -3821,7 +4113,7 @@ echo "$as_me: error: No awk program found" >&2;} # AFS /usr/afsws/bin/install, which mishandles nonexistent args # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. -echo "$as_me:3824: checking for a BSD compatible install" >&5 +echo "$as_me:4116: checking for a BSD compatible install" >&5 echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6 if test -z "$INSTALL"; then if test "${ac_cv_path_install+set}" = set; then @@ -3870,7 +4162,7 @@ fi INSTALL=$ac_install_sh fi fi -echo "$as_me:3873: result: $INSTALL" >&5 +echo "$as_me:4165: result: $INSTALL" >&5 echo "${ECHO_T}$INSTALL" >&6 # Use test -z because SunOS4 sh mishandles braces in ${var-val}. @@ -3881,8 +4173,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -case $INSTALL in -(/*) +case x$INSTALL in +(x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER) ;; (*) cf_dir=`echo "$INSTALL" | sed -e 's%/[^/]*$%%'` @@ -3895,7 +4187,7 @@ for ac_prog in lint cppcheck splint do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:3898: checking for $ac_word" >&5 +echo "$as_me:4190: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_LINT+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3910,7 +4202,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_LINT="$ac_prog" -echo "$as_me:3913: found $ac_dir/$ac_word" >&5 +echo "$as_me:4205: found $ac_dir/$ac_word" >&5 break done @@ -3918,10 +4210,10 @@ fi fi LINT=$ac_cv_prog_LINT if test -n "$LINT"; then - echo "$as_me:3921: result: $LINT" >&5 + echo "$as_me:4213: result: $LINT" >&5 echo "${ECHO_T}$LINT" >&6 else - echo "$as_me:3924: result: no" >&5 + echo "$as_me:4216: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3929,23 +4221,26 @@ fi done case "x$LINT" in +(xlint|x*/lint) # NetBSD 10 + test -z "$LINT_OPTS" && LINT_OPTS="-chapbrxzgFS -v -Ac11" + ;; (xcppcheck|x*/cppcheck) - test -z "$LINT_OPTS" && LINT_OPTS="--enable=all" + test -z "$LINT_OPTS" && LINT_OPTS="--enable=all -D__CPPCHECK__" ;; esac -echo "$as_me:3937: checking whether ln -s works" >&5 +echo "$as_me:4232: checking whether ln -s works" >&5 echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6 LN_S=$as_ln_s if test "$LN_S" = "ln -s"; then - echo "$as_me:3941: result: yes" >&5 + echo "$as_me:4236: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:3944: result: no, using $LN_S" >&5 + echo "$as_me:4239: result: no, using $LN_S" >&5 echo "${ECHO_T}no, using $LN_S" >&6 fi -echo "$as_me:3948: checking if $LN_S -f options work" >&5 +echo "$as_me:4243: checking if $LN_S -f options work" >&5 echo $ECHO_N "checking if $LN_S -f options work... $ECHO_C" >&6 rm -f conf$$.src conf$$dst @@ -3957,12 +4252,12 @@ else cf_prog_ln_sf=no fi rm -f conf$$.dst conf$$src -echo "$as_me:3960: result: $cf_prog_ln_sf" >&5 +echo "$as_me:4255: result: $cf_prog_ln_sf" >&5 echo "${ECHO_T}$cf_prog_ln_sf" >&6 test "$cf_prog_ln_sf" = yes && LN_S="$LN_S -f" -echo "$as_me:3965: checking for long file names" >&5 +echo "$as_me:4260: checking for long file names" >&5 echo $ECHO_N "checking for long file names... $ECHO_C" >&6 if test "${ac_cv_sys_long_file_names+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4001,7 +4296,7 @@ for ac_dir in . $ac_tmpdirs `eval echo "$prefix/lib" "$exec_prefix/lib"` ; do rm -rf "$ac_xdir" 2>/dev/null done fi -echo "$as_me:4004: result: $ac_cv_sys_long_file_names" >&5 +echo "$as_me:4299: result: $ac_cv_sys_long_file_names" >&5 echo "${ECHO_T}$ac_cv_sys_long_file_names" >&6 if test "$ac_cv_sys_long_file_names" = yes; then @@ -4020,7 +4315,7 @@ if test "${with_config_suffix+set}" = set; then withval="$with_config_suffix" case "x$withval" in (xyes|xno) - { echo "$as_me:4023: WARNING: expected a value for config-suffix option" >&5 + { echo "$as_me:4318: WARNING: expected a value for config-suffix option" >&5 echo "$as_me: WARNING: expected a value for config-suffix option" >&2;} ;; (*) cf_config_suffix="$withval" @@ -4030,7 +4325,7 @@ fi; # If we find pkg-config, check if we should install the ".pc" files. -echo "$as_me:4033: checking if you want to use pkg-config" >&5 +echo "$as_me:4328: checking if you want to use pkg-config" >&5 echo $ECHO_N "checking if you want to use pkg-config... $ECHO_C" >&6 # Check whether --with-pkg-config or --without-pkg-config was given. @@ -4040,7 +4335,7 @@ if test "${with_pkg_config+set}" = set; then else cf_pkg_config=yes fi; -echo "$as_me:4043: result: $cf_pkg_config" >&5 +echo "$as_me:4338: result: $cf_pkg_config" >&5 echo "${ECHO_T}$cf_pkg_config" >&6 case "$cf_pkg_config" in @@ -4052,7 +4347,7 @@ case "$cf_pkg_config" in if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 -echo "$as_me:4055: checking for $ac_word" >&5 +echo "$as_me:4350: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_PKG_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4069,7 +4364,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word" - echo "$as_me:4072: found $ac_dir/$ac_word" >&5 + echo "$as_me:4367: found $ac_dir/$ac_word" >&5 break fi done @@ -4080,10 +4375,10 @@ fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then - echo "$as_me:4083: result: $PKG_CONFIG" >&5 + echo "$as_me:4378: result: $PKG_CONFIG" >&5 echo "${ECHO_T}$PKG_CONFIG" >&6 else - echo "$as_me:4086: result: no" >&5 + echo "$as_me:4381: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4092,7 +4387,7 @@ if test -z "$ac_cv_path_PKG_CONFIG"; then ac_pt_PKG_CONFIG=$PKG_CONFIG # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -echo "$as_me:4095: checking for $ac_word" >&5 +echo "$as_me:4390: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4109,7 +4404,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_ac_pt_PKG_CONFIG="$ac_dir/$ac_word" - echo "$as_me:4112: found $ac_dir/$ac_word" >&5 + echo "$as_me:4407: found $ac_dir/$ac_word" >&5 break fi done @@ -4121,10 +4416,10 @@ fi ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG if test -n "$ac_pt_PKG_CONFIG"; then - echo "$as_me:4124: result: $ac_pt_PKG_CONFIG" >&5 + echo "$as_me:4419: result: $ac_pt_PKG_CONFIG" >&5 echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6 else - echo "$as_me:4127: result: no" >&5 + echo "$as_me:4422: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4148,43 +4443,41 @@ else cf_path_syntax="$ac_default_prefix" fi -case ".$PKG_CONFIG" in -(.\$\(*\)*|.\'*\'*) +case "x$PKG_CONFIG" in +(x\$\(*\)*|x\'*\'*) ;; -(..|./*|.\\*) +(x.|x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER) ;; -(.[a-zA-Z]:[\\/]*) # OS/2 EMX - ;; -(.\$\{*prefix\}*|.\$\{*dir\}*) +(x\$\{*prefix\}*|x\$\{*dir\}*) eval PKG_CONFIG="$PKG_CONFIG" - case ".$PKG_CONFIG" in - (.NONE/*) + case "x$PKG_CONFIG" in + (xNONE/*) PKG_CONFIG=`echo "$PKG_CONFIG" | sed -e s%NONE%$cf_path_syntax%` ;; esac ;; -(.no|.NONE/*) +(xno|xNONE/*) PKG_CONFIG=`echo "$PKG_CONFIG" | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { { echo "$as_me:4170: error: expected a pathname, not \"$PKG_CONFIG\"" >&5 + { { echo "$as_me:4463: error: expected a pathname, not \"$PKG_CONFIG\"" >&5 echo "$as_me: error: expected a pathname, not \"$PKG_CONFIG\"" >&2;} { (exit 1); exit 1; }; } ;; esac elif test "x$cf_pkg_config" != xno ; then - { echo "$as_me:4177: WARNING: pkg-config is not installed" >&5 + { echo "$as_me:4470: WARNING: pkg-config is not installed" >&5 echo "$as_me: WARNING: pkg-config is not installed" >&2;} fi case "$PKG_CONFIG" in (no|none|yes) - echo "$as_me:4183: checking for pkg-config library directory" >&5 + echo "$as_me:4476: checking for pkg-config library directory" >&5 echo $ECHO_N "checking for pkg-config library directory... $ECHO_C" >&6 ;; (*) - echo "$as_me:4187: checking for $PKG_CONFIG library directory" >&5 + echo "$as_me:4480: checking for $PKG_CONFIG library directory" >&5 echo $ECHO_N "checking for $PKG_CONFIG library directory... $ECHO_C" >&6 ;; esac @@ -4211,27 +4504,27 @@ fi; case "x$cf_search_path" in (xlibdir) PKG_CONFIG_LIBDIR='${libdir}/pkgconfig' - echo "$as_me:4214: result: $PKG_CONFIG_LIBDIR" >&5 + echo "$as_me:4507: result: $PKG_CONFIG_LIBDIR" >&5 echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6 cf_search_path= ;; (x) ;; -(x/*\ *) +(x$GLOB_FULLPATH_POSIX\ *|x$GLOB_FULLPATH_OTHER\ *) PKG_CONFIG_LIBDIR= ;; -(x/*) +(x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER) PKG_CONFIG_LIBDIR="$cf_search_path" - echo "$as_me:4225: result: $PKG_CONFIG_LIBDIR" >&5 + echo "$as_me:4518: result: $PKG_CONFIG_LIBDIR" >&5 echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6 cf_search_path= ;; (xyes|xauto) - echo "$as_me:4230: result: auto" >&5 + echo "$as_me:4523: result: auto" >&5 echo "${ECHO_T}auto" >&6 cf_search_path= # Look for the library directory using the same prefix as the executable - echo "$as_me:4234: checking for search-list" >&5 + echo "$as_me:4527: checking for search-list" >&5 echo $ECHO_N "checking for search-list... $ECHO_C" >&6 if test "x$PKG_CONFIG" != xnone then @@ -4242,7 +4535,15 @@ echo $ECHO_N "checking for search-list... $ECHO_C" >&6 pkg-config \ pkgconf do - cf_search_path=`"$PKG_CONFIG" --variable=pc_path "$cf_pkg_program" 2>/dev/null | tr : ' '` + cf_raw_search_path=`"$PKG_CONFIG" --variable=pc_path "$cf_pkg_program" 2>/dev/null` + case "$cf_raw_search_path" in + (*\\*) + cf_search_path=`echo "$cf_raw_search_path" | tr ';' ' ' | tr '\' '/'` + ;; + (*/*) + cf_search_path=`echo "$cf_raw_search_path" | tr : ' '` + ;; + esac test -n "$cf_search_path" && break done @@ -4258,11 +4559,11 @@ echo $ECHO_N "checking for search-list... $ECHO_C" >&6 "` fi - echo "$as_me:4261: result: $cf_search_path" >&5 + echo "$as_me:4562: result: $cf_search_path" >&5 echo "${ECHO_T}$cf_search_path" >&6 ;; (*) - { { echo "$as_me:4265: error: Unexpected option value: $cf_search_path" >&5 + { { echo "$as_me:4566: error: Unexpected option value: $cf_search_path" >&5 echo "$as_me: error: Unexpected option value: $cf_search_path" >&2;} { (exit 1); exit 1; }; } ;; @@ -4270,7 +4571,7 @@ esac if test -n "$cf_search_path" then - echo "$as_me:4273: checking for first directory" >&5 + echo "$as_me:4574: checking for first directory" >&5 echo $ECHO_N "checking for first directory... $ECHO_C" >&6 cf_pkg_config_path=none for cf_config in $cf_search_path @@ -4281,7 +4582,7 @@ echo $ECHO_N "checking for first directory... $ECHO_C" >&6 break fi done - echo "$as_me:4284: result: $cf_pkg_config_path" >&5 + echo "$as_me:4585: result: $cf_pkg_config_path" >&5 echo "${ECHO_T}$cf_pkg_config_path" >&6 if test "x$cf_pkg_config_path" != xnone ; then @@ -4291,7 +4592,7 @@ echo "${ECHO_T}$cf_pkg_config_path" >&6 if test -z "$PKG_CONFIG_LIBDIR" && test -n "$cf_search_path" then - echo "$as_me:4294: checking for workaround" >&5 + echo "$as_me:4595: checking for workaround" >&5 echo $ECHO_N "checking for workaround... $ECHO_C" >&6 if test "$prefix" = "NONE" ; then cf_prefix="$ac_default_prefix" @@ -4314,17 +4615,17 @@ echo $ECHO_N "checking for workaround... $ECHO_C" >&6 esac done test -z "$PKG_CONFIG_LIBDIR" && PKG_CONFIG_LIBDIR=$cf_backup - echo "$as_me:4317: result: $PKG_CONFIG_LIBDIR" >&5 + echo "$as_me:4618: result: $PKG_CONFIG_LIBDIR" >&5 echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6 fi fi if test "x$PKG_CONFIG" != xnone then - echo "$as_me:4324: checking if we should install .pc files for $PKG_CONFIG" >&5 + echo "$as_me:4625: checking if we should install .pc files for $PKG_CONFIG" >&5 echo $ECHO_N "checking if we should install .pc files for $PKG_CONFIG... $ECHO_C" >&6 else - echo "$as_me:4327: checking if we should install .pc files" >&5 + echo "$as_me:4628: checking if we should install .pc files" >&5 echo $ECHO_N "checking if we should install .pc files... $ECHO_C" >&6 fi @@ -4335,7 +4636,7 @@ if test "${enable_pc_files+set}" = set; then else enable_pc_files=no fi; -echo "$as_me:4338: result: $enable_pc_files" >&5 +echo "$as_me:4639: result: $enable_pc_files" >&5 echo "${ECHO_T}$enable_pc_files" >&6 if test "x$enable_pc_files" != xno @@ -4343,7 +4644,7 @@ then MAKE_PC_FILES= case "x$PKG_CONFIG_LIBDIR" in (xno|xnone|xyes|x) - { echo "$as_me:4346: WARNING: no PKG_CONFIG_LIBDIR was found" >&5 + { echo "$as_me:4647: WARNING: no PKG_CONFIG_LIBDIR was found" >&5 echo "$as_me: WARNING: no PKG_CONFIG_LIBDIR was found" >&2;} ;; (*) @@ -4355,26 +4656,24 @@ else cf_path_syntax="$ac_default_prefix" fi -case ".$cf_pkg_config_libdir" in -(.\$\(*\)*|.\'*\'*) +case "x$cf_pkg_config_libdir" in +(x\$\(*\)*|x\'*\'*) ;; -(..|./*|.\\*) +(x.|x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER) ;; -(.[a-zA-Z]:[\\/]*) # OS/2 EMX - ;; -(.\$\{*prefix\}*|.\$\{*dir\}*) +(x\$\{*prefix\}*|x\$\{*dir\}*) eval cf_pkg_config_libdir="$cf_pkg_config_libdir" - case ".$cf_pkg_config_libdir" in - (.NONE/*) + case "x$cf_pkg_config_libdir" in + (xNONE/*) cf_pkg_config_libdir=`echo "$cf_pkg_config_libdir" | sed -e s%NONE%$cf_path_syntax%` ;; esac ;; -(.no|.NONE/*) +(xno|xNONE/*) cf_pkg_config_libdir=`echo "$cf_pkg_config_libdir" | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { { echo "$as_me:4377: error: expected a pathname, not \"$cf_pkg_config_libdir\"" >&5 + { { echo "$as_me:4676: error: expected a pathname, not \"$cf_pkg_config_libdir\"" >&5 echo "$as_me: error: expected a pathname, not \"$cf_pkg_config_libdir\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -4388,8 +4687,8 @@ fi if test -z "$MAKE_PC_FILES" then - echo "$as_me:4391: checking for suffix to add to pc-files" >&5 -echo $ECHO_N "checking for suffix to add to pc-files... $ECHO_C" >&6 + echo "$as_me:4690: checking for suffix to add to pkg-config files" >&5 +echo $ECHO_N "checking for suffix to add to pkg-config files... $ECHO_C" >&6 # Check whether --with-pc-suffix or --without-pc-suffix was given. if test "${with_pc_suffix+set}" = set; then @@ -4403,13 +4702,13 @@ if test "${with_pc_suffix+set}" = set; then esac fi; test -z "$PC_MODULE_SUFFIX" && PC_MODULE_SUFFIX=none - echo "$as_me:4406: result: $PC_MODULE_SUFFIX" >&5 + echo "$as_me:4705: result: $PC_MODULE_SUFFIX" >&5 echo "${ECHO_T}$PC_MODULE_SUFFIX" >&6 test "$PC_MODULE_SUFFIX" = none && PC_MODULE_SUFFIX= fi -echo "$as_me:4412: checking if we should assume mixed-case filenames" >&5 +echo "$as_me:4711: checking if we should assume mixed-case filenames" >&5 echo $ECHO_N "checking if we should assume mixed-case filenames... $ECHO_C" >&6 # Check whether --enable-mixed-case or --disable-mixed-case was given. @@ -4419,11 +4718,11 @@ if test "${enable_mixed_case+set}" = set; then else enable_mixedcase=auto fi; -echo "$as_me:4422: result: $enable_mixedcase" >&5 +echo "$as_me:4721: result: $enable_mixedcase" >&5 echo "${ECHO_T}$enable_mixedcase" >&6 if test "$enable_mixedcase" = "auto" ; then -echo "$as_me:4426: checking if filesystem supports mixed-case filenames" >&5 +echo "$as_me:4725: checking if filesystem supports mixed-case filenames" >&5 echo $ECHO_N "checking if filesystem supports mixed-case filenames... $ECHO_C" >&6 if test "${cf_cv_mixedcase+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4450,7 +4749,7 @@ else fi fi -echo "$as_me:4453: result: $cf_cv_mixedcase" >&5 +echo "$as_me:4752: result: $cf_cv_mixedcase" >&5 echo "${ECHO_T}$cf_cv_mixedcase" >&6 test "$cf_cv_mixedcase" = yes && cat >>confdefs.h <<\EOF @@ -4469,7 +4768,7 @@ EOF fi # do this after mixed-case option (tags/TAGS is not as important as tic). -echo "$as_me:4472: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "$as_me:4771: checking whether ${MAKE-make} sets \${MAKE}" >&5 echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'` if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then @@ -4489,16 +4788,16 @@ fi rm -f conftest.make fi if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then - echo "$as_me:4492: result: yes" >&5 + echo "$as_me:4791: result: yes" >&5 echo "${ECHO_T}yes" >&6 SET_MAKE= else - echo "$as_me:4496: result: no" >&5 + echo "$as_me:4795: result: no" >&5 echo "${ECHO_T}no" >&6 SET_MAKE="MAKE=${MAKE-make}" fi -echo "$as_me:4501: checking for \".PHONY\" make-support" >&5 +echo "$as_me:4800: checking for \".PHONY\" make-support" >&5 echo $ECHO_N "checking for \".PHONY\" make-support... $ECHO_C" >&6 if test "${cf_cv_make_PHONY+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4553,7 +4852,7 @@ CF_EOF rm -rf conftest* fi -echo "$as_me:4556: result: $cf_cv_make_PHONY" >&5 +echo "$as_me:4855: result: $cf_cv_make_PHONY" >&5 echo "${ECHO_T}$cf_cv_make_PHONY" >&6 MAKE_NO_PHONY="#" MAKE_PHONY="#" @@ -4564,7 +4863,7 @@ for ac_prog in exctags ctags do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:4567: checking for $ac_word" >&5 +echo "$as_me:4866: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CTAGS+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4579,7 +4878,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_CTAGS="$ac_prog" -echo "$as_me:4582: found $ac_dir/$ac_word" >&5 +echo "$as_me:4881: found $ac_dir/$ac_word" >&5 break done @@ -4587,10 +4886,10 @@ fi fi CTAGS=$ac_cv_prog_CTAGS if test -n "$CTAGS"; then - echo "$as_me:4590: result: $CTAGS" >&5 + echo "$as_me:4889: result: $CTAGS" >&5 echo "${ECHO_T}$CTAGS" >&6 else - echo "$as_me:4593: result: no" >&5 + echo "$as_me:4892: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4601,7 +4900,7 @@ for ac_prog in exetags etags do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:4604: checking for $ac_word" >&5 +echo "$as_me:4903: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ETAGS+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4616,7 +4915,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ETAGS="$ac_prog" -echo "$as_me:4619: found $ac_dir/$ac_word" >&5 +echo "$as_me:4918: found $ac_dir/$ac_word" >&5 break done @@ -4624,10 +4923,10 @@ fi fi ETAGS=$ac_cv_prog_ETAGS if test -n "$ETAGS"; then - echo "$as_me:4627: result: $ETAGS" >&5 + echo "$as_me:4926: result: $ETAGS" >&5 echo "${ECHO_T}$ETAGS" >&6 else - echo "$as_me:4630: result: no" >&5 + echo "$as_me:4929: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4636,7 +4935,7 @@ done # Extract the first word of "${CTAGS:-ctags}", so it can be a program name with args. set dummy ${CTAGS:-ctags}; ac_word=$2 -echo "$as_me:4639: checking for $ac_word" >&5 +echo "$as_me:4938: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_MAKE_LOWER_TAGS+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4651,7 +4950,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_MAKE_LOWER_TAGS="yes" -echo "$as_me:4654: found $ac_dir/$ac_word" >&5 +echo "$as_me:4953: found $ac_dir/$ac_word" >&5 break done @@ -4660,17 +4959,17 @@ fi fi MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS if test -n "$MAKE_LOWER_TAGS"; then - echo "$as_me:4663: result: $MAKE_LOWER_TAGS" >&5 + echo "$as_me:4962: result: $MAKE_LOWER_TAGS" >&5 echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6 else - echo "$as_me:4666: result: no" >&5 + echo "$as_me:4965: result: no" >&5 echo "${ECHO_T}no" >&6 fi if test "$cf_cv_mixedcase" = yes ; then # Extract the first word of "${ETAGS:-etags}", so it can be a program name with args. set dummy ${ETAGS:-etags}; ac_word=$2 -echo "$as_me:4673: checking for $ac_word" >&5 +echo "$as_me:4972: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_MAKE_UPPER_TAGS+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4685,7 +4984,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_MAKE_UPPER_TAGS="yes" -echo "$as_me:4688: found $ac_dir/$ac_word" >&5 +echo "$as_me:4987: found $ac_dir/$ac_word" >&5 break done @@ -4694,10 +4993,10 @@ fi fi MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS if test -n "$MAKE_UPPER_TAGS"; then - echo "$as_me:4697: result: $MAKE_UPPER_TAGS" >&5 + echo "$as_me:4996: result: $MAKE_UPPER_TAGS" >&5 echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6 else - echo "$as_me:4700: result: no" >&5 + echo "$as_me:4999: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4717,7 +5016,7 @@ else MAKE_LOWER_TAGS="#" fi -echo "$as_me:4720: checking for makeflags variable" >&5 +echo "$as_me:5019: checking for makeflags variable" >&5 echo $ECHO_N "checking for makeflags variable... $ECHO_C" >&6 if test "${cf_cv_makeflags+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4747,7 +5046,7 @@ CF_EOF ;; (*) -echo "${as_me:-configure}:4750: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5 +echo "${as_me:-configure}:5049: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5 ;; esac @@ -4755,13 +5054,13 @@ echo "${as_me:-configure}:4750: testing given option \"$cf_option\",no match \"$ rm -f cf_makeflags.tmp fi -echo "$as_me:4758: result: $cf_cv_makeflags" >&5 +echo "$as_me:5057: result: $cf_cv_makeflags" >&5 echo "${ECHO_T}$cf_cv_makeflags" >&6 if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 -echo "$as_me:4764: checking for $ac_word" >&5 +echo "$as_me:5063: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_RANLIB+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4776,7 +5075,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" -echo "$as_me:4779: found $ac_dir/$ac_word" >&5 +echo "$as_me:5078: found $ac_dir/$ac_word" >&5 break done @@ -4784,10 +5083,10 @@ fi fi RANLIB=$ac_cv_prog_RANLIB if test -n "$RANLIB"; then - echo "$as_me:4787: result: $RANLIB" >&5 + echo "$as_me:5086: result: $RANLIB" >&5 echo "${ECHO_T}$RANLIB" >&6 else - echo "$as_me:4790: result: no" >&5 + echo "$as_me:5089: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4796,7 +5095,7 @@ if test -z "$ac_cv_prog_RANLIB"; then ac_ct_RANLIB=$RANLIB # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 -echo "$as_me:4799: checking for $ac_word" >&5 +echo "$as_me:5098: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4811,7 +5110,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_RANLIB="ranlib" -echo "$as_me:4814: found $ac_dir/$ac_word" >&5 +echo "$as_me:5113: found $ac_dir/$ac_word" >&5 break done @@ -4820,10 +5119,10 @@ fi fi ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB if test -n "$ac_ct_RANLIB"; then - echo "$as_me:4823: result: $ac_ct_RANLIB" >&5 + echo "$as_me:5122: result: $ac_ct_RANLIB" >&5 echo "${ECHO_T}$ac_ct_RANLIB" >&6 else - echo "$as_me:4826: result: no" >&5 + echo "$as_me:5125: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4835,7 +5134,7 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ld", so it can be a program name with args. set dummy ${ac_tool_prefix}ld; ac_word=$2 -echo "$as_me:4838: checking for $ac_word" >&5 +echo "$as_me:5137: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_LD+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4850,7 +5149,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_LD="${ac_tool_prefix}ld" -echo "$as_me:4853: found $ac_dir/$ac_word" >&5 +echo "$as_me:5152: found $ac_dir/$ac_word" >&5 break done @@ -4858,10 +5157,10 @@ fi fi LD=$ac_cv_prog_LD if test -n "$LD"; then - echo "$as_me:4861: result: $LD" >&5 + echo "$as_me:5160: result: $LD" >&5 echo "${ECHO_T}$LD" >&6 else - echo "$as_me:4864: result: no" >&5 + echo "$as_me:5163: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4870,7 +5169,7 @@ if test -z "$ac_cv_prog_LD"; then ac_ct_LD=$LD # Extract the first word of "ld", so it can be a program name with args. set dummy ld; ac_word=$2 -echo "$as_me:4873: checking for $ac_word" >&5 +echo "$as_me:5172: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_LD+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4885,7 +5184,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_LD="ld" -echo "$as_me:4888: found $ac_dir/$ac_word" >&5 +echo "$as_me:5187: found $ac_dir/$ac_word" >&5 break done @@ -4894,10 +5193,10 @@ fi fi ac_ct_LD=$ac_cv_prog_ac_ct_LD if test -n "$ac_ct_LD"; then - echo "$as_me:4897: result: $ac_ct_LD" >&5 + echo "$as_me:5196: result: $ac_ct_LD" >&5 echo "${ECHO_T}$ac_ct_LD" >&6 else - echo "$as_me:4900: result: no" >&5 + echo "$as_me:5199: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4909,7 +5208,7 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 -echo "$as_me:4912: checking for $ac_word" >&5 +echo "$as_me:5211: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_AR+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4924,7 +5223,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_AR="${ac_tool_prefix}ar" -echo "$as_me:4927: found $ac_dir/$ac_word" >&5 +echo "$as_me:5226: found $ac_dir/$ac_word" >&5 break done @@ -4932,10 +5231,10 @@ fi fi AR=$ac_cv_prog_AR if test -n "$AR"; then - echo "$as_me:4935: result: $AR" >&5 + echo "$as_me:5234: result: $AR" >&5 echo "${ECHO_T}$AR" >&6 else - echo "$as_me:4938: result: no" >&5 + echo "$as_me:5237: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4944,7 +5243,7 @@ if test -z "$ac_cv_prog_AR"; then ac_ct_AR=$AR # Extract the first word of "ar", so it can be a program name with args. set dummy ar; ac_word=$2 -echo "$as_me:4947: checking for $ac_word" >&5 +echo "$as_me:5246: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4959,7 +5258,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_AR="ar" -echo "$as_me:4962: found $ac_dir/$ac_word" >&5 +echo "$as_me:5261: found $ac_dir/$ac_word" >&5 break done @@ -4968,10 +5267,10 @@ fi fi ac_ct_AR=$ac_cv_prog_ac_ct_AR if test -n "$ac_ct_AR"; then - echo "$as_me:4971: result: $ac_ct_AR" >&5 + echo "$as_me:5270: result: $ac_ct_AR" >&5 echo "${ECHO_T}$ac_ct_AR" >&6 else - echo "$as_me:4974: result: no" >&5 + echo "$as_me:5273: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4983,7 +5282,7 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}nm", so it can be a program name with args. set dummy ${ac_tool_prefix}nm; ac_word=$2 -echo "$as_me:4986: checking for $ac_word" >&5 +echo "$as_me:5285: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_NM+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4998,7 +5297,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_NM="${ac_tool_prefix}nm" -echo "$as_me:5001: found $ac_dir/$ac_word" >&5 +echo "$as_me:5300: found $ac_dir/$ac_word" >&5 break done @@ -5006,10 +5305,10 @@ fi fi NM=$ac_cv_prog_NM if test -n "$NM"; then - echo "$as_me:5009: result: $NM" >&5 + echo "$as_me:5308: result: $NM" >&5 echo "${ECHO_T}$NM" >&6 else - echo "$as_me:5012: result: no" >&5 + echo "$as_me:5311: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -5018,7 +5317,7 @@ if test -z "$ac_cv_prog_NM"; then ac_ct_NM=$NM # Extract the first word of "nm", so it can be a program name with args. set dummy nm; ac_word=$2 -echo "$as_me:5021: checking for $ac_word" >&5 +echo "$as_me:5320: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_NM+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5033,7 +5332,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_NM="nm" -echo "$as_me:5036: found $ac_dir/$ac_word" >&5 +echo "$as_me:5335: found $ac_dir/$ac_word" >&5 break done @@ -5042,10 +5341,10 @@ fi fi ac_ct_NM=$ac_cv_prog_ac_ct_NM if test -n "$ac_ct_NM"; then - echo "$as_me:5045: result: $ac_ct_NM" >&5 + echo "$as_me:5344: result: $ac_ct_NM" >&5 echo "${ECHO_T}$ac_ct_NM" >&6 else - echo "$as_me:5048: result: no" >&5 + echo "$as_me:5347: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -5057,7 +5356,7 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 -echo "$as_me:5060: checking for $ac_word" >&5 +echo "$as_me:5359: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_AR+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5072,7 +5371,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_AR="${ac_tool_prefix}ar" -echo "$as_me:5075: found $ac_dir/$ac_word" >&5 +echo "$as_me:5374: found $ac_dir/$ac_word" >&5 break done @@ -5080,10 +5379,10 @@ fi fi AR=$ac_cv_prog_AR if test -n "$AR"; then - echo "$as_me:5083: result: $AR" >&5 + echo "$as_me:5382: result: $AR" >&5 echo "${ECHO_T}$AR" >&6 else - echo "$as_me:5086: result: no" >&5 + echo "$as_me:5385: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -5092,7 +5391,7 @@ if test -z "$ac_cv_prog_AR"; then ac_ct_AR=$AR # Extract the first word of "ar", so it can be a program name with args. set dummy ar; ac_word=$2 -echo "$as_me:5095: checking for $ac_word" >&5 +echo "$as_me:5394: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5107,7 +5406,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_AR="ar" -echo "$as_me:5110: found $ac_dir/$ac_word" >&5 +echo "$as_me:5409: found $ac_dir/$ac_word" >&5 break done @@ -5116,10 +5415,10 @@ fi fi ac_ct_AR=$ac_cv_prog_ac_ct_AR if test -n "$ac_ct_AR"; then - echo "$as_me:5119: result: $ac_ct_AR" >&5 + echo "$as_me:5418: result: $ac_ct_AR" >&5 echo "${ECHO_T}$ac_ct_AR" >&6 else - echo "$as_me:5122: result: no" >&5 + echo "$as_me:5421: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -5128,7 +5427,7 @@ else AR="$ac_cv_prog_AR" fi -echo "$as_me:5131: checking for options to update archives" >&5 +echo "$as_me:5430: checking for options to update archives" >&5 echo $ECHO_N "checking for options to update archives... $ECHO_C" >&6 if test "${cf_cv_ar_flags+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5165,13 +5464,13 @@ else rm -f conftest.a cat >"conftest.$ac_ext" <&5 + if { (eval echo "$as_me:5470: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5174: \$? = $ac_status" >&5 + echo "$as_me:5473: \$? = $ac_status" >&5 (exit "$ac_status"); } ; then echo "$AR $ARFLAGS $cf_ar_flags conftest.a conftest.$ac_cv_objext" >&5 $AR $ARFLAGS "$cf_ar_flags" conftest.a "conftest.$ac_cv_objext" 2>&5 1>/dev/null @@ -5182,7 +5481,7 @@ EOF else test -n "$verbose" && echo " cannot compile test-program" 1>&6 -echo "${as_me:-configure}:5185: testing cannot compile test-program ..." 1>&5 +echo "${as_me:-configure}:5484: testing cannot compile test-program ..." 1>&5 break fi @@ -5192,7 +5491,7 @@ echo "${as_me:-configure}:5185: testing cannot compile test-program ..." 1>&5 esac fi -echo "$as_me:5195: result: $cf_cv_ar_flags" >&5 +echo "$as_me:5494: result: $cf_cv_ar_flags" >&5 echo "${ECHO_T}$cf_cv_ar_flags" >&6 if test -n "$ARFLAGS" ; then @@ -5203,8 +5502,8 @@ else ARFLAGS=$cf_cv_ar_flags fi -echo "$as_me:5206: checking if you have specified an install-prefix" >&5 -echo $ECHO_N "checking if you have specified an install-prefix... $ECHO_C" >&6 +echo "$as_me:5505: checking for an installation directory prefix" >&5 +echo $ECHO_N "checking for an installation directory prefix... $ECHO_C" >&6 # Check whether --with-install-prefix or --without-install-prefix was given. if test "${with_install_prefix+set}" = set; then @@ -5216,8 +5515,34 @@ if test "${with_install_prefix+set}" = set; then ;; esac fi; -echo "$as_me:5219: result: $DESTDIR" >&5 -echo "${ECHO_T}$DESTDIR" >&6 +echo "$as_me:5518: result: ${DESTDIR:-(none)}" >&5 +echo "${ECHO_T}${DESTDIR:-(none)}" >&6 + +echo "$as_me:5521: checking if installation directory prefix should be merged" >&5 +echo $ECHO_N "checking if installation directory prefix should be merged... $ECHO_C" >&6 + +# Check whether --enable-install-prefix or --disable-install-prefix was given. +if test "${enable_install_prefix+set}" = set; then + enableval="$enable_install_prefix" + test "$enableval" != yes && enableval=no + if test "$enableval" != "no" ; then + cf_install_prefix=yes + else + cf_install_prefix=no + fi +else + enableval=no + cf_install_prefix=no + +fi; +echo "$as_me:5538: result: $cf_install_prefix" >&5 +echo "${ECHO_T}$cf_install_prefix" >&6 + +if test "$cf_install_prefix" = yes ; then + MERGE_PREFIX=':$(prefix)%=%' +else + MERGE_PREFIX='' +fi ############################################################################### @@ -5251,7 +5576,7 @@ else do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:5254: checking for $ac_word" >&5 +echo "$as_me:5579: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_BUILD_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5266,7 +5591,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_BUILD_CC="$ac_prog" -echo "$as_me:5269: found $ac_dir/$ac_word" >&5 +echo "$as_me:5594: found $ac_dir/$ac_word" >&5 break done @@ -5274,10 +5599,10 @@ fi fi BUILD_CC=$ac_cv_prog_BUILD_CC if test -n "$BUILD_CC"; then - echo "$as_me:5277: result: $BUILD_CC" >&5 + echo "$as_me:5602: result: $BUILD_CC" >&5 echo "${ECHO_T}$BUILD_CC" >&6 else - echo "$as_me:5280: result: no" >&5 + echo "$as_me:5605: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -5286,12 +5611,12 @@ done test -n "$BUILD_CC" || BUILD_CC="none" fi; - echo "$as_me:5289: checking for native build C compiler" >&5 + echo "$as_me:5614: checking for native build C compiler" >&5 echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6 - echo "$as_me:5291: result: $BUILD_CC" >&5 + echo "$as_me:5616: result: $BUILD_CC" >&5 echo "${ECHO_T}$BUILD_CC" >&6 - echo "$as_me:5294: checking for native build C preprocessor" >&5 + echo "$as_me:5619: checking for native build C preprocessor" >&5 echo $ECHO_N "checking for native build C preprocessor... $ECHO_C" >&6 # Check whether --with-build-cpp or --without-build-cpp was given. @@ -5301,10 +5626,10 @@ if test "${with_build_cpp+set}" = set; then else BUILD_CPP='${BUILD_CC} -E' fi; - echo "$as_me:5304: result: $BUILD_CPP" >&5 + echo "$as_me:5629: result: $BUILD_CPP" >&5 echo "${ECHO_T}$BUILD_CPP" >&6 - echo "$as_me:5307: checking for native build C flags" >&5 + echo "$as_me:5632: checking for native build C flags" >&5 echo $ECHO_N "checking for native build C flags... $ECHO_C" >&6 # Check whether --with-build-cflags or --without-build-cflags was given. @@ -5312,10 +5637,10 @@ if test "${with_build_cflags+set}" = set; then withval="$with_build_cflags" BUILD_CFLAGS="$withval" fi; - echo "$as_me:5315: result: $BUILD_CFLAGS" >&5 + echo "$as_me:5640: result: $BUILD_CFLAGS" >&5 echo "${ECHO_T}$BUILD_CFLAGS" >&6 - echo "$as_me:5318: checking for native build C preprocessor-flags" >&5 + echo "$as_me:5643: checking for native build C preprocessor-flags" >&5 echo $ECHO_N "checking for native build C preprocessor-flags... $ECHO_C" >&6 # Check whether --with-build-cppflags or --without-build-cppflags was given. @@ -5323,10 +5648,10 @@ if test "${with_build_cppflags+set}" = set; then withval="$with_build_cppflags" BUILD_CPPFLAGS="$withval" fi; - echo "$as_me:5326: result: $BUILD_CPPFLAGS" >&5 + echo "$as_me:5651: result: $BUILD_CPPFLAGS" >&5 echo "${ECHO_T}$BUILD_CPPFLAGS" >&6 - echo "$as_me:5329: checking for native build linker-flags" >&5 + echo "$as_me:5654: checking for native build linker-flags" >&5 echo $ECHO_N "checking for native build linker-flags... $ECHO_C" >&6 # Check whether --with-build-ldflags or --without-build-ldflags was given. @@ -5334,10 +5659,10 @@ if test "${with_build_ldflags+set}" = set; then withval="$with_build_ldflags" BUILD_LDFLAGS="$withval" fi; - echo "$as_me:5337: result: $BUILD_LDFLAGS" >&5 + echo "$as_me:5662: result: $BUILD_LDFLAGS" >&5 echo "${ECHO_T}$BUILD_LDFLAGS" >&6 - echo "$as_me:5340: checking for native build linker-libraries" >&5 + echo "$as_me:5665: checking for native build linker-libraries" >&5 echo $ECHO_N "checking for native build linker-libraries... $ECHO_C" >&6 # Check whether --with-build-libs or --without-build-libs was given. @@ -5345,7 +5670,7 @@ if test "${with_build_libs+set}" = set; then withval="$with_build_libs" BUILD_LIBS="$withval" fi; - echo "$as_me:5348: result: $BUILD_LIBS" >&5 + echo "$as_me:5673: result: $BUILD_LIBS" >&5 echo "${ECHO_T}$BUILD_LIBS" >&6 # this assumes we're on Unix. @@ -5354,7 +5679,7 @@ echo "${ECHO_T}$BUILD_LIBS" >&6 : ${BUILD_CC:='${CC}'} - echo "$as_me:5357: checking if the build-compiler \"$BUILD_CC\" works" >&5 + echo "$as_me:5682: checking if the build-compiler \"$BUILD_CC\" works" >&5 echo $ECHO_N "checking if the build-compiler \"$BUILD_CC\" works... $ECHO_C" >&6 cf_save_crossed=$cross_compiling @@ -5368,25 +5693,25 @@ echo $ECHO_N "checking if the build-compiler \"$BUILD_CC\" works... $ECHO_C" >&6 cf_ok_build_cc=unknown else cat >"conftest.$ac_ext" <<_ACEOF -#line 5371 "configure" +#line 5696 "configure" #include "confdefs.h" #include int main(int argc, char *argv[]) { - ${cf_cv_main_return:-return}(argc < 0 || argv == 0 || argv[0] == 0); + ${cf_cv_main_return:-return}(argc < 0 || argv == (void*)0 || argv[0] == (void*)0); } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:5381: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5706: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5384: \$? = $ac_status" >&5 + echo "$as_me:5709: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:5386: \"$ac_try\"") >&5 + { (eval echo "$as_me:5711: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5389: \$? = $ac_status" >&5 + echo "$as_me:5714: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_ok_build_cc=yes else @@ -5401,12 +5726,12 @@ fi cross_compiling=$cf_save_crossed ac_link=$cf_save_ac_link - echo "$as_me:5404: result: $cf_ok_build_cc" >&5 + echo "$as_me:5729: result: $cf_ok_build_cc" >&5 echo "${ECHO_T}$cf_ok_build_cc" >&6 if test "$cf_ok_build_cc" != yes then - { { echo "$as_me:5409: error: Cross-build requires two compilers. + { { echo "$as_me:5734: error: Cross-build requires two compilers. Use --with-build-cc to specify the native compiler." >&5 echo "$as_me: error: Cross-build requires two compilers. Use --with-build-cc to specify the native compiler." >&2;} @@ -5431,7 +5756,7 @@ fi ### shared, for example. cf_list_models="" -echo "$as_me:5434: checking if libtool -version-number should be used" >&5 +echo "$as_me:5759: checking if libtool -version-number should be used" >&5 echo $ECHO_N "checking if libtool -version-number should be used... $ECHO_C" >&6 # Check whether --enable-libtool-version or --disable-libtool-version was given. @@ -5448,7 +5773,7 @@ else cf_libtool_version=yes fi; -echo "$as_me:5451: result: $cf_libtool_version" >&5 +echo "$as_me:5776: result: $cf_libtool_version" >&5 echo "${ECHO_T}$cf_libtool_version" >&6 if test "$cf_libtool_version" = yes ; then @@ -5457,25 +5782,25 @@ else LIBTOOL_VERSION="-version-info" case "x$VERSION" in (x) - { echo "$as_me:5460: WARNING: VERSION was not set" >&5 + { echo "$as_me:5785: WARNING: VERSION was not set" >&5 echo "$as_me: WARNING: VERSION was not set" >&2;} ;; (x*.*.*) ABI_VERSION="$VERSION" test -n "$verbose" && echo " ABI_VERSION: $ABI_VERSION" 1>&6 -echo "${as_me:-configure}:5467: testing ABI_VERSION: $ABI_VERSION ..." 1>&5 +echo "${as_me:-configure}:5792: testing ABI_VERSION: $ABI_VERSION ..." 1>&5 ;; (x*:*:*) ABI_VERSION=`echo "$VERSION" | sed -e 's/:/./g'` test -n "$verbose" && echo " ABI_VERSION: $ABI_VERSION" 1>&6 -echo "${as_me:-configure}:5474: testing ABI_VERSION: $ABI_VERSION ..." 1>&5 +echo "${as_me:-configure}:5799: testing ABI_VERSION: $ABI_VERSION ..." 1>&5 ;; (*) - { echo "$as_me:5478: WARNING: unexpected VERSION value: $VERSION" >&5 + { echo "$as_me:5803: WARNING: unexpected VERSION value: $VERSION" >&5 echo "$as_me: WARNING: unexpected VERSION value: $VERSION" >&2;} ;; esac @@ -5497,7 +5822,7 @@ LIB_LINK='${CC}' LIB_INSTALL= LIB_UNINSTALL= -echo "$as_me:5500: checking if you want to build libraries with libtool" >&5 +echo "$as_me:5825: checking if you want to build libraries with libtool" >&5 echo $ECHO_N "checking if you want to build libraries with libtool... $ECHO_C" >&6 # Check whether --with-libtool or --without-libtool was given. @@ -5507,7 +5832,7 @@ if test "${with_libtool+set}" = set; then else with_libtool=no fi; -echo "$as_me:5510: result: $with_libtool" >&5 +echo "$as_me:5835: result: $with_libtool" >&5 echo "${ECHO_T}$with_libtool" >&6 if test "$with_libtool" != "no"; then @@ -5519,26 +5844,24 @@ else cf_path_syntax="$ac_default_prefix" fi -case ".$with_libtool" in -(.\$\(*\)*|.\'*\'*) +case "x$with_libtool" in +(x\$\(*\)*|x\'*\'*) ;; -(..|./*|.\\*) +(x.|x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER) ;; -(.[a-zA-Z]:[\\/]*) # OS/2 EMX - ;; -(.\$\{*prefix\}*|.\$\{*dir\}*) +(x\$\{*prefix\}*|x\$\{*dir\}*) eval with_libtool="$with_libtool" - case ".$with_libtool" in - (.NONE/*) + case "x$with_libtool" in + (xNONE/*) with_libtool=`echo "$with_libtool" | sed -e s%NONE%$cf_path_syntax%` ;; esac ;; -(.no|.NONE/*) +(xno|xNONE/*) with_libtool=`echo "$with_libtool" | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { { echo "$as_me:5541: error: expected a pathname, not \"$with_libtool\"" >&5 + { { echo "$as_me:5864: error: expected a pathname, not \"$with_libtool\"" >&5 echo "$as_me: error: expected a pathname, not \"$with_libtool\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -5551,7 +5874,7 @@ esac do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:5554: checking for $ac_word" >&5 +echo "$as_me:5877: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_LIBTOOL+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5566,7 +5889,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_LIBTOOL="$ac_tool_prefix$ac_prog" -echo "$as_me:5569: found $ac_dir/$ac_word" >&5 +echo "$as_me:5892: found $ac_dir/$ac_word" >&5 break done @@ -5574,10 +5897,10 @@ fi fi LIBTOOL=$ac_cv_prog_LIBTOOL if test -n "$LIBTOOL"; then - echo "$as_me:5577: result: $LIBTOOL" >&5 + echo "$as_me:5900: result: $LIBTOOL" >&5 echo "${ECHO_T}$LIBTOOL" >&6 else - echo "$as_me:5580: result: no" >&5 + echo "$as_me:5903: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -5590,7 +5913,7 @@ if test -z "$LIBTOOL"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:5593: checking for $ac_word" >&5 +echo "$as_me:5916: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_LIBTOOL+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5605,7 +5928,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_LIBTOOL="$ac_prog" -echo "$as_me:5608: found $ac_dir/$ac_word" >&5 +echo "$as_me:5931: found $ac_dir/$ac_word" >&5 break done @@ -5613,10 +5936,10 @@ fi fi ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL if test -n "$ac_ct_LIBTOOL"; then - echo "$as_me:5616: result: $ac_ct_LIBTOOL" >&5 + echo "$as_me:5939: result: $ac_ct_LIBTOOL" >&5 echo "${ECHO_T}$ac_ct_LIBTOOL" >&6 else - echo "$as_me:5619: result: no" >&5 + echo "$as_me:5942: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -5647,7 +5970,7 @@ unset LIBTOOL do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:5650: checking for $ac_word" >&5 +echo "$as_me:5973: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_LIBTOOL+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5662,7 +5985,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_LIBTOOL="$ac_tool_prefix$ac_prog" -echo "$as_me:5665: found $ac_dir/$ac_word" >&5 +echo "$as_me:5988: found $ac_dir/$ac_word" >&5 break done @@ -5670,10 +5993,10 @@ fi fi LIBTOOL=$ac_cv_prog_LIBTOOL if test -n "$LIBTOOL"; then - echo "$as_me:5673: result: $LIBTOOL" >&5 + echo "$as_me:5996: result: $LIBTOOL" >&5 echo "${ECHO_T}$LIBTOOL" >&6 else - echo "$as_me:5676: result: no" >&5 + echo "$as_me:5999: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -5686,7 +6009,7 @@ if test -z "$LIBTOOL"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:5689: checking for $ac_word" >&5 +echo "$as_me:6012: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_LIBTOOL+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5701,7 +6024,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_LIBTOOL="$ac_prog" -echo "$as_me:5704: found $ac_dir/$ac_word" >&5 +echo "$as_me:6027: found $ac_dir/$ac_word" >&5 break done @@ -5709,10 +6032,10 @@ fi fi ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL if test -n "$ac_ct_LIBTOOL"; then - echo "$as_me:5712: result: $ac_ct_LIBTOOL" >&5 + echo "$as_me:6035: result: $ac_ct_LIBTOOL" >&5 echo "${ECHO_T}$ac_ct_LIBTOOL" >&6 else - echo "$as_me:5715: result: no" >&5 + echo "$as_me:6038: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -5734,7 +6057,7 @@ test -z "$cf_cv_libtool_version" && unset cf_cv_libtool_version fi fi if test -z "$LIBTOOL" ; then - { { echo "$as_me:5737: error: Cannot find libtool" >&5 + { { echo "$as_me:6060: error: Cannot find libtool" >&5 echo "$as_me: error: Cannot find libtool" >&2;} { (exit 1); exit 1; }; } fi @@ -5750,7 +6073,7 @@ echo "$as_me: error: Cannot find libtool" >&2;} if test -n "$LIBTOOL" && test "$LIBTOOL" != none then - echo "$as_me:5753: checking version of $LIBTOOL" >&5 + echo "$as_me:6076: checking version of $LIBTOOL" >&5 echo $ECHO_N "checking version of $LIBTOOL... $ECHO_C" >&6 if test -n "$LIBTOOL" && test "$LIBTOOL" != none @@ -5761,8 +6084,9 @@ else fi test -z "$cf_cv_libtool_version" && unset cf_cv_libtool_version - echo "$as_me:5764: result: $cf_cv_libtool_version" >&5 + echo "$as_me:6087: result: $cf_cv_libtool_version" >&5 echo "${ECHO_T}$cf_cv_libtool_version" >&6 + if test -n "$cf_cv_libtool_version" then cf_check_libtool_version=`$LIBTOOL --version 2>&1 | sed -e '/^$/d' -e 's,[()],...,g' -e 's,[ ],-,g' -e '2,$d'` @@ -5770,18 +6094,19 @@ echo "${ECHO_T}$cf_cv_libtool_version" >&6 (*...GNU-libtool...*) ;; (*) - { { echo "$as_me:5773: error: This is not GNU libtool" >&5 + { { echo "$as_me:6097: error: This is not GNU libtool" >&5 echo "$as_me: error: This is not GNU libtool" >&2;} { (exit 1); exit 1; }; } ;; esac else - { { echo "$as_me:5779: error: No version found for $LIBTOOL" >&5 + { { echo "$as_me:6103: error: No version found for $LIBTOOL" >&5 echo "$as_me: error: No version found for $LIBTOOL" >&2;} { (exit 1); exit 1; }; } fi + else - { { echo "$as_me:5784: error: GNU libtool has not been found" >&5 + { { echo "$as_me:6109: error: GNU libtool has not been found" >&5 echo "$as_me: error: GNU libtool has not been found" >&2;} { (exit 1); exit 1; }; } fi @@ -5817,7 +6142,7 @@ cf_list_models="$cf_list_models libtool" else -echo "$as_me:5820: checking if you want to build shared libraries" >&5 +echo "$as_me:6145: checking if you want to build shared libraries" >&5 echo $ECHO_N "checking if you want to build shared libraries... $ECHO_C" >&6 # Check whether --with-shared or --without-shared was given. @@ -5827,11 +6152,11 @@ if test "${with_shared+set}" = set; then else with_shared=no fi; -echo "$as_me:5830: result: $with_shared" >&5 +echo "$as_me:6155: result: $with_shared" >&5 echo "${ECHO_T}$with_shared" >&6 test "x$with_shared" = "xyes" && cf_list_models="$cf_list_models shared" -echo "$as_me:5834: checking if you want to build static libraries" >&5 +echo "$as_me:6159: checking if you want to build static libraries" >&5 echo $ECHO_N "checking if you want to build static libraries... $ECHO_C" >&6 # Check whether --with-normal or --without-normal was given. @@ -5841,11 +6166,11 @@ if test "${with_normal+set}" = set; then else with_normal=yes fi; -echo "$as_me:5844: result: $with_normal" >&5 +echo "$as_me:6169: result: $with_normal" >&5 echo "${ECHO_T}$with_normal" >&6 test "x$with_normal" = "xyes" && cf_list_models="$cf_list_models normal" -echo "$as_me:5848: checking if you want to build debug libraries" >&5 +echo "$as_me:6173: checking if you want to build debug libraries" >&5 echo $ECHO_N "checking if you want to build debug libraries... $ECHO_C" >&6 # Check whether --with-debug or --without-debug was given. @@ -5855,11 +6180,11 @@ if test "${with_debug+set}" = set; then else with_debug=yes fi; -echo "$as_me:5858: result: $with_debug" >&5 +echo "$as_me:6183: result: $with_debug" >&5 echo "${ECHO_T}$with_debug" >&6 test "x$with_debug" = "xyes" && cf_list_models="$cf_list_models debug" -echo "$as_me:5862: checking if you want to build profiling libraries" >&5 +echo "$as_me:6187: checking if you want to build profiling libraries" >&5 echo $ECHO_N "checking if you want to build profiling libraries... $ECHO_C" >&6 # Check whether --with-profile or --without-profile was given. @@ -5869,7 +6194,7 @@ if test "${with_profile+set}" = set; then else with_profile=no fi; -echo "$as_me:5872: result: $with_profile" >&5 +echo "$as_me:6197: result: $with_profile" >&5 echo "${ECHO_T}$with_profile" >&6 test "x$with_profile" = "xyes" && cf_list_models="$cf_list_models profile" @@ -5877,7 +6202,7 @@ fi if test "X$cf_with_cxx_binding" != Xno; then if test "x$with_shared" = "xyes"; then -echo "$as_me:5880: checking if you want to build C++ shared libraries" >&5 +echo "$as_me:6205: checking if you want to build C++ shared libraries" >&5 echo $ECHO_N "checking if you want to build C++ shared libraries... $ECHO_C" >&6 # Check whether --with-cxx-shared or --without-cxx-shared was given. @@ -5887,26 +6212,26 @@ if test "${with_cxx_shared+set}" = set; then else with_shared_cxx=no fi; -echo "$as_me:5890: result: $with_shared_cxx" >&5 +echo "$as_me:6215: result: $with_shared_cxx" >&5 echo "${ECHO_T}$with_shared_cxx" >&6 fi fi ############################################################################### -echo "$as_me:5897: checking for specified models" >&5 +echo "$as_me:6222: checking for specified models" >&5 echo $ECHO_N "checking for specified models... $ECHO_C" >&6 test -z "$cf_list_models" && cf_list_models=normal test "$with_libtool" != "no" && cf_list_models=libtool -echo "$as_me:5901: result: $cf_list_models" >&5 +echo "$as_me:6226: result: $cf_list_models" >&5 echo "${ECHO_T}$cf_list_models" >&6 ### Use the first model as the default, and save its suffix for use in building ### up test-applications. -echo "$as_me:5906: checking for default model" >&5 +echo "$as_me:6231: checking for default model" >&5 echo $ECHO_N "checking for default model... $ECHO_C" >&6 DFT_LWR_MODEL=`echo "$cf_list_models" | $AWK '{print $1}'` -echo "$as_me:5909: result: $DFT_LWR_MODEL" >&5 +echo "$as_me:6234: result: $DFT_LWR_MODEL" >&5 echo "${ECHO_T}$DFT_LWR_MODEL" >&6 DFT_UPR_MODEL=`echo "$DFT_LWR_MODEL" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` @@ -5920,7 +6245,7 @@ LIB_NAME=ncurses LIB_DIR=../lib LIB_2ND=../../lib -echo "$as_me:5923: checking if you want to have a library-prefix" >&5 +echo "$as_me:6248: checking if you want to have a library-prefix" >&5 echo $ECHO_N "checking if you want to have a library-prefix... $ECHO_C" >&6 # Check whether --with-lib-prefix or --without-lib-prefix was given. @@ -5930,7 +6255,7 @@ if test "${with_lib_prefix+set}" = set; then else with_lib_prefix=auto fi; -echo "$as_me:5933: result: $with_lib_prefix" >&5 +echo "$as_me:6258: result: $with_lib_prefix" >&5 echo "${ECHO_T}$with_lib_prefix" >&6 if test "$with_lib_prefix" = auto @@ -5961,24 +6286,24 @@ fi LIB_SUFFIX= - echo "$as_me:5964: checking for PATH separator" >&5 + echo "$as_me:6289: checking for PATH separator" >&5 echo $ECHO_N "checking for PATH separator... $ECHO_C" >&6 case "$cf_cv_system_name" in (os2*) PATH_SEPARATOR=';' ;; (*) ${PATH_SEPARATOR:=':'} ;; esac - echo "$as_me:5971: result: $PATH_SEPARATOR" >&5 + echo "$as_me:6296: result: $PATH_SEPARATOR" >&5 echo "${ECHO_T}$PATH_SEPARATOR" >&6 # headers needed for checks... -echo "$as_me:5975: checking for ANSI C header files" >&5 +echo "$as_me:6300: checking for ANSI C header files" >&5 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 if test "${ac_cv_header_stdc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 5981 "configure" +#line 6306 "configure" #include "confdefs.h" #include #include @@ -5986,13 +6311,13 @@ else #include _ACEOF -if { (eval echo "$as_me:5989: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:6314: \"$ac_cpp "conftest.$ac_ext"\"") >&5 (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:5995: \$? = $ac_status" >&5 + echo "$as_me:6320: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -6014,7 +6339,7 @@ rm -f conftest.err "conftest.$ac_ext" if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat >"conftest.$ac_ext" <<_ACEOF -#line 6017 "configure" +#line 6342 "configure" #include "confdefs.h" #include @@ -6032,7 +6357,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat >"conftest.$ac_ext" <<_ACEOF -#line 6035 "configure" +#line 6360 "configure" #include "confdefs.h" #include @@ -6053,7 +6378,7 @@ if test $ac_cv_header_stdc = yes; then : else cat >"conftest.$ac_ext" <<_ACEOF -#line 6056 "configure" +#line 6381 "configure" #include "confdefs.h" #include #if ((' ' & 0x0FF) == 0x020) @@ -6079,15 +6404,15 @@ main (void) } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:6082: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6407: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6085: \$? = $ac_status" >&5 + echo "$as_me:6410: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:6087: \"$ac_try\"") >&5 + { (eval echo "$as_me:6412: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6090: \$? = $ac_status" >&5 + echo "$as_me:6415: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -6100,7 +6425,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes fi fi fi -echo "$as_me:6103: result: $ac_cv_header_stdc" >&5 +echo "$as_me:6428: result: $ac_cv_header_stdc" >&5 echo "${ECHO_T}$ac_cv_header_stdc" >&6 if test $ac_cv_header_stdc = yes; then @@ -6116,28 +6441,28 @@ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ inttypes.h stdint.h unistd.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:6119: checking for $ac_header" >&5 +echo "$as_me:6444: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 6125 "configure" +#line 6450 "configure" #include "confdefs.h" $ac_includes_default #include <$ac_header> _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:6131: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6456: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6134: \$? = $ac_status" >&5 + echo "$as_me:6459: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:6137: \"$ac_try\"") >&5 + { (eval echo "$as_me:6462: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6140: \$? = $ac_status" >&5 + echo "$as_me:6465: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then eval "$as_ac_Header=yes" else @@ -6147,7 +6472,7 @@ eval "$as_ac_Header=no" fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:6150: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:6475: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then cat >>confdefs.h <&5 +echo "$as_me:6485: checking whether exit is declared" >&5 echo $ECHO_N "checking whether exit is declared... $ECHO_C" >&6 if test "${ac_cv_have_decl_exit+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 6166 "configure" +#line 6491 "configure" #include "confdefs.h" $ac_includes_default int main (void) { #ifndef exit - char *p = (char *) exit; (void) p; + (void) exit; #endif ; @@ -6178,16 +6503,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:6181: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6506: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6184: \$? = $ac_status" >&5 + echo "$as_me:6509: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:6187: \"$ac_try\"") >&5 + { (eval echo "$as_me:6512: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6190: \$? = $ac_status" >&5 + echo "$as_me:6515: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_have_decl_exit=yes else @@ -6197,19 +6522,19 @@ ac_cv_have_decl_exit=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:6200: result: $ac_cv_have_decl_exit" >&5 +echo "$as_me:6525: result: $ac_cv_have_decl_exit" >&5 echo "${ECHO_T}$ac_cv_have_decl_exit" >&6 ac_header_dirent=no for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh` -echo "$as_me:6206: checking for $ac_hdr that defines DIR" >&5 +echo "$as_me:6531: checking for $ac_hdr that defines DIR" >&5 echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 6212 "configure" +#line 6537 "configure" #include "confdefs.h" #include #include <$ac_hdr> @@ -6224,16 +6549,16 @@ return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:6227: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6552: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6230: \$? = $ac_status" >&5 + echo "$as_me:6555: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:6233: \"$ac_try\"") >&5 + { (eval echo "$as_me:6558: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6236: \$? = $ac_status" >&5 + echo "$as_me:6561: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then eval "$as_ac_Header=yes" else @@ -6243,7 +6568,7 @@ eval "$as_ac_Header=no" fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:6246: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:6571: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then cat >>confdefs.h <&5 + echo "$as_me:6584: checking for opendir in -ldir" >&5 echo $ECHO_N "checking for opendir in -ldir... $ECHO_C" >&6 if test "${ac_cv_lib_dir_opendir+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6264,7 +6589,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldir $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 6267 "configure" +#line 6592 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -6273,7 +6598,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char opendir (); +char opendir (void); int main (void) { @@ -6283,16 +6608,16 @@ opendir (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:6286: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6611: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6289: \$? = $ac_status" >&5 + echo "$as_me:6614: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:6292: \"$ac_try\"") >&5 + { (eval echo "$as_me:6617: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6295: \$? = $ac_status" >&5 + echo "$as_me:6620: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_dir_opendir=yes else @@ -6303,14 +6628,14 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:6306: result: $ac_cv_lib_dir_opendir" >&5 +echo "$as_me:6631: result: $ac_cv_lib_dir_opendir" >&5 echo "${ECHO_T}$ac_cv_lib_dir_opendir" >&6 if test "$ac_cv_lib_dir_opendir" = yes; then LIBS="$LIBS -ldir" fi else - echo "$as_me:6313: checking for opendir in -lx" >&5 + echo "$as_me:6638: checking for opendir in -lx" >&5 echo $ECHO_N "checking for opendir in -lx... $ECHO_C" >&6 if test "${ac_cv_lib_x_opendir+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6318,7 +6643,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lx $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 6321 "configure" +#line 6646 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -6327,7 +6652,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char opendir (); +char opendir (void); int main (void) { @@ -6337,16 +6662,16 @@ opendir (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:6340: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6665: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6343: \$? = $ac_status" >&5 + echo "$as_me:6668: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:6346: \"$ac_try\"") >&5 + { (eval echo "$as_me:6671: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6349: \$? = $ac_status" >&5 + echo "$as_me:6674: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_x_opendir=yes else @@ -6357,7 +6682,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:6360: result: $ac_cv_lib_x_opendir" >&5 +echo "$as_me:6685: result: $ac_cv_lib_x_opendir" >&5 echo "${ECHO_T}$ac_cv_lib_x_opendir" >&6 if test "$ac_cv_lib_x_opendir" = yes; then LIBS="$LIBS -lx" @@ -6367,7 +6692,7 @@ fi ############################################################################### -echo "$as_me:6370: checking if you want to build a separate terminfo library" >&5 +echo "$as_me:6695: checking if you want to build a separate terminfo library" >&5 echo $ECHO_N "checking if you want to build a separate terminfo library... $ECHO_C" >&6 # Check whether --with-termlib or --without-termlib was given. @@ -6377,10 +6702,10 @@ if test "${with_termlib+set}" = set; then else with_termlib=no fi; -echo "$as_me:6380: result: $with_termlib" >&5 +echo "$as_me:6705: result: $with_termlib" >&5 echo "${ECHO_T}$with_termlib" >&6 -echo "$as_me:6383: checking if you want to build a separate tic library" >&5 +echo "$as_me:6708: checking if you want to build a separate tic library" >&5 echo $ECHO_N "checking if you want to build a separate tic library... $ECHO_C" >&6 # Check whether --with-ticlib or --without-ticlib was given. @@ -6390,7 +6715,7 @@ if test "${with_ticlib+set}" = set; then else with_ticlib=no fi; -echo "$as_me:6393: result: $with_ticlib" >&5 +echo "$as_me:6718: result: $with_ticlib" >&5 echo "${ECHO_T}$with_ticlib" >&6 if test X"$CC_G_OPT" = X"" ; then @@ -6403,7 +6728,7 @@ if test X"$CXX_G_OPT" = X"" ; then test -n "$GXX" && test "x${ac_cv_prog_cxx_g}" != xyes && CXX_G_OPT='' fi -echo "$as_me:6406: checking for default loader flags" >&5 +echo "$as_me:6731: checking for default loader flags" >&5 echo $ECHO_N "checking for default loader flags... $ECHO_C" >&6 case "$DFT_LWR_MODEL" in (libtool) LD_MODEL='' ;; @@ -6412,13 +6737,13 @@ case "$DFT_LWR_MODEL" in (profile) LD_MODEL='-pg';; (shared) LD_MODEL='' ;; esac -echo "$as_me:6415: result: $LD_MODEL" >&5 -echo "${ECHO_T}$LD_MODEL" >&6 +echo "$as_me:6740: result: ${LD_MODEL:-(none)}" >&5 +echo "${ECHO_T}${LD_MODEL:-(none)}" >&6 case "$DFT_LWR_MODEL" in (shared) -echo "$as_me:6421: checking if rpath option should be used" >&5 +echo "$as_me:6746: checking if rpath option should be used" >&5 echo $ECHO_N "checking if rpath option should be used... $ECHO_C" >&6 # Check whether --enable-rpath or --disable-rpath was given. @@ -6428,10 +6753,10 @@ if test "${enable_rpath+set}" = set; then else cf_cv_enable_rpath=no fi; -echo "$as_me:6431: result: $cf_cv_enable_rpath" >&5 +echo "$as_me:6756: result: $cf_cv_enable_rpath" >&5 echo "${ECHO_T}$cf_cv_enable_rpath" >&6 -echo "$as_me:6434: checking if shared libraries should be relinked during install" >&5 +echo "$as_me:6759: checking if shared libraries should be relinked during install" >&5 echo $ECHO_N "checking if shared libraries should be relinked during install... $ECHO_C" >&6 # Check whether --enable-relink or --disable-relink was given. @@ -6441,7 +6766,7 @@ if test "${enable_relink+set}" = set; then else cf_cv_do_relink=yes fi; -echo "$as_me:6444: result: $cf_cv_do_relink" >&5 +echo "$as_me:6769: result: $cf_cv_do_relink" >&5 echo "${ECHO_T}$cf_cv_do_relink" >&6 ;; esac @@ -6452,7 +6777,7 @@ rel_builddir=.. LD_RPATH_OPT= if test "x$cf_cv_enable_rpath" != xno then - echo "$as_me:6455: checking for an rpath option" >&5 + echo "$as_me:6780: checking for an rpath option" >&5 echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6 case "$cf_cv_system_name" in (irix*) @@ -6483,12 +6808,12 @@ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6 (*) ;; esac - echo "$as_me:6486: result: $LD_RPATH_OPT" >&5 + echo "$as_me:6811: result: $LD_RPATH_OPT" >&5 echo "${ECHO_T}$LD_RPATH_OPT" >&6 case "x$LD_RPATH_OPT" in (x-R*) - echo "$as_me:6491: checking if we need a space after rpath option" >&5 + echo "$as_me:6816: checking if we need a space after rpath option" >&5 echo $ECHO_N "checking if we need a space after rpath option... $ECHO_C" >&6 cf_save_LIBS="$LIBS" @@ -6509,7 +6834,7 @@ done LIBS="$cf_add_libs" cat >"conftest.$ac_ext" <<_ACEOF -#line 6512 "configure" +#line 6837 "configure" #include "confdefs.h" int @@ -6521,16 +6846,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:6524: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6849: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6527: \$? = $ac_status" >&5 + echo "$as_me:6852: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:6530: \"$ac_try\"") >&5 + { (eval echo "$as_me:6855: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6533: \$? = $ac_status" >&5 + echo "$as_me:6858: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_rpath_space=no else @@ -6540,7 +6865,7 @@ cf_rpath_space=yes fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS="$cf_save_LIBS" - echo "$as_me:6543: result: $cf_rpath_space" >&5 + echo "$as_me:6868: result: $cf_rpath_space" >&5 echo "${ECHO_T}$cf_rpath_space" >&6 test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT " ;; @@ -6562,8 +6887,8 @@ fi cf_ld_rpath_opt= test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT" - echo "$as_me:6565: checking if release/abi version should be used for shared libs" >&5 -echo $ECHO_N "checking if release/abi version should be used for shared libs... $ECHO_C" >&6 + echo "$as_me:6890: checking whether to use release or ABI version in shared library file names" >&5 +echo $ECHO_N "checking whether to use release or ABI version in shared library file names... $ECHO_C" >&6 # Check whether --with-shlib-version or --without-shlib-version was given. if test "${with_shlib_version+set}" = set; then @@ -6577,9 +6902,9 @@ if test "${with_shlib_version+set}" = set; then cf_cv_shlib_version=$withval ;; (*) - echo "$as_me:6580: result: $withval" >&5 + echo "$as_me:6905: result: $withval" >&5 echo "${ECHO_T}$withval" >&6 - { { echo "$as_me:6582: error: option value must be one of: rel, abi, or auto" >&5 + { { echo "$as_me:6907: error: option value must be one of: rel, abi, or auto" >&5 echo "$as_me: error: option value must be one of: rel, abi, or auto" >&2;} { (exit 1); exit 1; }; } ;; @@ -6588,7 +6913,7 @@ echo "$as_me: error: option value must be one of: rel, abi, or auto" >&2;} else cf_cv_shlib_version=auto fi; - echo "$as_me:6591: result: $cf_cv_shlib_version" >&5 + echo "$as_me:6916: result: $cf_cv_shlib_version" >&5 echo "${ECHO_T}$cf_cv_shlib_version" >&6 cf_cv_rm_so_locs=no @@ -6611,35 +6936,35 @@ echo "${ECHO_T}$cf_cv_shlib_version" >&6 if test "$cf_try_fPIC" = yes then - echo "$as_me:6614: checking which $CC option to use" >&5 + echo "$as_me:6939: checking which $CC option to use" >&5 echo $ECHO_N "checking which $CC option to use... $ECHO_C" >&6 cf_save_CFLAGS="$CFLAGS" for CC_SHARED_OPTS in -fPIC -fpic '' do CFLAGS="$cf_save_CFLAGS $CC_SHARED_OPTS" cat >"conftest.$ac_ext" <<_ACEOF -#line 6621 "configure" +#line 6946 "configure" #include "confdefs.h" #include int main (void) { -int x = 1 +int x = 1; (void)x ; return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:6633: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6958: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6636: \$? = $ac_status" >&5 + echo "$as_me:6961: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:6639: \"$ac_try\"") >&5 + { (eval echo "$as_me:6964: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6642: \$? = $ac_status" >&5 + echo "$as_me:6967: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then break else @@ -6648,7 +6973,7 @@ cat "conftest.$ac_ext" >&5 fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" done - echo "$as_me:6651: result: $CC_SHARED_OPTS" >&5 + echo "$as_me:6976: result: $CC_SHARED_OPTS" >&5 echo "${ECHO_T}$CC_SHARED_OPTS" >&6 CFLAGS="$cf_save_CFLAGS" fi @@ -6719,7 +7044,7 @@ CF_EOF MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -dynamiclib -install_name ${libdir}/`basename $@` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $@' test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=abi cf_cv_shlib_version_infix=yes - echo "$as_me:6722: checking if ld -search_paths_first works" >&5 + echo "$as_me:7047: checking if ld -search_paths_first works" >&5 echo $ECHO_N "checking if ld -search_paths_first works... $ECHO_C" >&6 if test "${cf_cv_ldflags_search_paths_first+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6728,7 +7053,7 @@ else cf_save_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS -Wl,-search_paths_first" cat >"conftest.$ac_ext" <<_ACEOF -#line 6731 "configure" +#line 7056 "configure" #include "confdefs.h" int @@ -6740,16 +7065,16 @@ int i; } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:6743: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7068: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6746: \$? = $ac_status" >&5 + echo "$as_me:7071: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:6749: \"$ac_try\"") >&5 + { (eval echo "$as_me:7074: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6752: \$? = $ac_status" >&5 + echo "$as_me:7077: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ldflags_search_paths_first=yes else @@ -6760,7 +7085,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LDFLAGS=$cf_save_LDFLAGS fi -echo "$as_me:6763: result: $cf_cv_ldflags_search_paths_first" >&5 +echo "$as_me:7088: result: $cf_cv_ldflags_search_paths_first" >&5 echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6 if test "$cf_cv_ldflags_search_paths_first" = yes; then LDFLAGS="$LDFLAGS -Wl,-search_paths_first" @@ -7090,11 +7415,11 @@ CF_EOF # tested with SunOS 5.5.1 (solaris 2.5.1) and gcc 2.7.2 # tested with SunOS 5.10 (solaris 10) and gcc 3.4.3 if test "$DFT_LWR_MODEL" = "shared" ; then - LOCAL_LDFLAGS="-R \$(LOCAL_LIBDIR):\${libdir}" + LOCAL_LDFLAGS="-R\$(LOCAL_LIBDIR):\${libdir}" LOCAL_LDFLAGS2="$LOCAL_LDFLAGS" fi if test "$cf_cv_enable_rpath" = yes ; then - EXTRA_LDFLAGS="-R \${libdir} $EXTRA_LDFLAGS" + EXTRA_LDFLAGS="-R\${libdir} $EXTRA_LDFLAGS" fi test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel @@ -7110,7 +7435,7 @@ CF_EOF do CFLAGS="$cf_shared_opts $cf_save_CFLAGS" cat >"conftest.$ac_ext" <<_ACEOF -#line 7113 "configure" +#line 7438 "configure" #include "confdefs.h" #include int @@ -7122,16 +7447,16 @@ printf("Hello\\n"); } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:7125: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:7450: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7128: \$? = $ac_status" >&5 + echo "$as_me:7453: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:7131: \"$ac_try\"") >&5 + { (eval echo "$as_me:7456: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7134: \$? = $ac_status" >&5 + echo "$as_me:7459: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then break else @@ -7142,9 +7467,9 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done CFLAGS="$cf_save_CFLAGS" CC_SHARED_OPTS=$cf_shared_opts - MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -dy -G -h '$cf_cv_shared_soname' -o $@' + MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -dy -G -Wl,-h,'$cf_cv_shared_soname' -o $@' else - MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -shared -dy -G -h '$cf_cv_shared_soname' -o $@' + MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -shared -dy -G -Wl,-h,'$cf_cv_shared_soname' -o $@' fi ;; (sysv5uw7*|unix_sv*) @@ -7168,7 +7493,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes ;; (*) - { echo "$as_me:7171: WARNING: ignored --with-shlib-version" >&5 + { echo "$as_me:7496: WARNING: ignored --with-shlib-version" >&5 echo "$as_me: WARNING: ignored --with-shlib-version" >&2;} ;; esac @@ -7178,30 +7503,30 @@ echo "$as_me: WARNING: ignored --with-shlib-version" >&2;} if test -n "$cf_try_cflags" then cat > conftest.$ac_ext < int main(int argc, char *argv[]) { printf("hello\\n"); - return (argv[argc-1] == 0) ; + return (argv[argc-1] == NULL) ; } EOF cf_save_CFLAGS="$CFLAGS" for cf_opt in $cf_try_cflags do CFLAGS="$cf_save_CFLAGS -$cf_opt" - echo "$as_me:7193: checking if CFLAGS option -$cf_opt works" >&5 + echo "$as_me:7518: checking if CFLAGS option -$cf_opt works" >&5 echo $ECHO_N "checking if CFLAGS option -$cf_opt works... $ECHO_C" >&6 - if { (eval echo "$as_me:7195: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:7520: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7198: \$? = $ac_status" >&5 + echo "$as_me:7523: \$? = $ac_status" >&5 (exit "$ac_status"); }; then - echo "$as_me:7200: result: yes" >&5 + echo "$as_me:7525: result: yes" >&5 echo "${ECHO_T}yes" >&6 cf_save_CFLAGS="$CFLAGS" else - echo "$as_me:7204: result: no" >&5 + echo "$as_me:7529: result: no" >&5 echo "${ECHO_T}no" >&6 fi done @@ -7216,17 +7541,17 @@ echo "${ECHO_T}no" >&6 test -n "$verbose" && echo " CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6 -echo "${as_me:-configure}:7219: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5 +echo "${as_me:-configure}:7544: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5 test -n "$verbose" && echo " MK_SHARED_LIB: $MK_SHARED_LIB" 1>&6 -echo "${as_me:-configure}:7223: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5 +echo "${as_me:-configure}:7548: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5 for model in $cf_list_models ; do case "$model" in (libtool) -echo "$as_me:7229: checking for additional libtool options" >&5 +echo "$as_me:7554: checking for additional libtool options" >&5 echo $ECHO_N "checking for additional libtool options... $ECHO_C" >&6 # Check whether --with-libtool-opts or --without-libtool-opts was given. @@ -7236,7 +7561,7 @@ if test "${with_libtool_opts+set}" = set; then else with_libtool_opts=no fi; -echo "$as_me:7239: result: $with_libtool_opts" >&5 +echo "$as_me:7564: result: $with_libtool_opts" >&5 echo "${ECHO_T}$with_libtool_opts" >&6 case .$with_libtool_opts in @@ -7247,7 +7572,7 @@ case .$with_libtool_opts in ;; esac -echo "$as_me:7250: checking if exported-symbols file should be used" >&5 +echo "$as_me:7575: checking if exported-symbols file should be used" >&5 echo $ECHO_N "checking if exported-symbols file should be used... $ECHO_C" >&6 # Check whether --with-export-syms or --without-export-syms was given. @@ -7262,7 +7587,7 @@ then with_export_syms='${top_srcdir}/package/${PACKAGE}.sym' fi -echo "$as_me:7265: result: $with_export_syms" >&5 +echo "$as_me:7590: result: $with_export_syms" >&5 echo "${ECHO_T}$with_export_syms" >&6 if test "x$with_export_syms" != xno then @@ -7273,15 +7598,15 @@ fi ;; (shared) if test "$CC_SHARED_OPTS" = "unknown"; then - { { echo "$as_me:7276: error: Shared libraries are not supported in this version" >&5 + { { echo "$as_me:7601: error: Shared libraries are not supported in this version" >&5 echo "$as_me: error: Shared libraries are not supported in this version" >&2;} { (exit 1); exit 1; }; } fi # workaround for inept transition to PIE vs PIC... - echo "$as_me:7281: checking if current CFLAGS link properly" >&5 + echo "$as_me:7606: checking if current CFLAGS link properly" >&5 echo $ECHO_N "checking if current CFLAGS link properly... $ECHO_C" >&6 cat >"conftest.$ac_ext" <<_ACEOF -#line 7284 "configure" +#line 7609 "configure" #include "confdefs.h" #include int @@ -7293,16 +7618,16 @@ printf("Hello work\\n"); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:7296: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7621: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7299: \$? = $ac_status" >&5 + echo "$as_me:7624: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:7302: \"$ac_try\"") >&5 + { (eval echo "$as_me:7627: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7305: \$? = $ac_status" >&5 + echo "$as_me:7630: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cflags_work=yes else @@ -7311,18 +7636,21 @@ cat "conftest.$ac_ext" >&5 cf_cflags_work=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - echo "$as_me:7314: result: $cf_cflags_work" >&5 + echo "$as_me:7639: result: $cf_cflags_work" >&5 echo "${ECHO_T}$cf_cflags_work" >&6 if test "$cf_cflags_work" = no then test -n "$verbose" && echo " try to work around by appending shared-options" 1>&6 -echo "${as_me:-configure}:7320: testing try to work around by appending shared-options ..." 1>&5 +echo "${as_me:-configure}:7645: testing try to work around by appending shared-options ..." 1>&5 CFLAGS="$CFLAGS $CC_SHARED_OPTS" fi -echo "$as_me:7325: checking if versioned-symbols file should be used" >&5 +if test "$with_libtool" = "yes" ; then + : +elif test "$with_shared" = "yes" ; then +echo "$as_me:7653: checking if versioned-symbols file should be used" >&5 echo $ECHO_N "checking if versioned-symbols file should be used... $ECHO_C" >&6 # Check whether --with-versioned-syms or --without-versioned-syms was given. @@ -7339,19 +7667,19 @@ case "x$with_versioned_syms" in ;; (xno) ;; -(x/*) - test -f "$with_versioned_syms" || { { echo "$as_me:7343: error: expected a filename: $with_versioned_syms" >&5 +(x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER) + test -f "$with_versioned_syms" || { { echo "$as_me:7671: error: expected a filename: $with_versioned_syms" >&5 echo "$as_me: error: expected a filename: $with_versioned_syms" >&2;} { (exit 1); exit 1; }; } ;; (*) - test -f "$with_versioned_syms" || { { echo "$as_me:7348: error: expected a filename: $with_versioned_syms" >&5 + test -f "$with_versioned_syms" || { { echo "$as_me:7676: error: expected a filename: $with_versioned_syms" >&5 echo "$as_me: error: expected a filename: $with_versioned_syms" >&2;} { (exit 1); exit 1; }; } with_versioned_syms=`pwd`/"$with_versioned_syms" ;; esac -echo "$as_me:7354: result: $with_versioned_syms" >&5 +echo "$as_me:7682: result: $with_versioned_syms" >&5 echo "${ECHO_T}$with_versioned_syms" >&6 RESULTING_SYMS= @@ -7367,19 +7695,21 @@ then MK_SHARED_LIB=`echo "$MK_SHARED_LIB" | sed -e "s%-Wl,%\\${VERSIONED_SYMS} -Wl,%"` test -n "$verbose" && echo " MK_SHARED_LIB: $MK_SHARED_LIB" 1>&6 -echo "${as_me:-configure}:7370: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5 +echo "${as_me:-configure}:7698: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5 + LIB_CREATE="$MK_SHARED_LIB" ;; (*-dy\ *) VERSIONED_SYMS="-Wl,-M,\${RESULTING_SYMS}" MK_SHARED_LIB=`echo "$MK_SHARED_LIB" | sed -e "s%-dy%\\${VERSIONED_SYMS} -dy%"` test -n "$verbose" && echo " MK_SHARED_LIB: $MK_SHARED_LIB" 1>&6 -echo "${as_me:-configure}:7378: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5 +echo "${as_me:-configure}:7707: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5 + LIB_CREATE="$MK_SHARED_LIB" ;; (*) - { echo "$as_me:7382: WARNING: this system does not support versioned-symbols" >&5 + { echo "$as_me:7712: WARNING: this system does not support versioned-symbols" >&5 echo "$as_me: WARNING: this system does not support versioned-symbols" >&2;} ;; esac @@ -7391,7 +7721,7 @@ echo "$as_me: WARNING: this system does not support versioned-symbols" >&2;} # symbols. if test "x$VERSIONED_SYMS" != "x" then - echo "$as_me:7394: checking if wildcards can be used to selectively omit symbols" >&5 + echo "$as_me:7724: checking if wildcards can be used to selectively omit symbols" >&5 echo $ECHO_N "checking if wildcards can be used to selectively omit symbols... $ECHO_C" >&6 WILDCARD_SYMS=no @@ -7428,16 +7758,16 @@ local: } submodule_1.0; EOF cat >conftest.$ac_ext <conftest.mk <&5 + echo "$as_me:7792: result: $WILDCARD_SYMS" >&5 echo "${ECHO_T}$WILDCARD_SYMS" >&6 rm -f conftest.* fi +fi + fi ;; @@ -7472,7 +7804,7 @@ done ### Checks for special libraries, must be done up-front. SHLIB_LIST="" -echo "$as_me:7475: checking if you want to link with the GPM mouse library" >&5 +echo "$as_me:7807: checking if you want to link with the GPM mouse library" >&5 echo $ECHO_N "checking if you want to link with the GPM mouse library... $ECHO_C" >&6 # Check whether --with-gpm or --without-gpm was given. @@ -7482,27 +7814,27 @@ if test "${with_gpm+set}" = set; then else with_gpm=maybe fi; -echo "$as_me:7485: result: $with_gpm" >&5 +echo "$as_me:7817: result: $with_gpm" >&5 echo "${ECHO_T}$with_gpm" >&6 if test "$with_gpm" != no ; then - echo "$as_me:7489: checking for gpm.h" >&5 + echo "$as_me:7821: checking for gpm.h" >&5 echo $ECHO_N "checking for gpm.h... $ECHO_C" >&6 if test "${ac_cv_header_gpm_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 7495 "configure" +#line 7827 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:7499: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:7831: \"$ac_cpp "conftest.$ac_ext"\"") >&5 (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:7505: \$? = $ac_status" >&5 + echo "$as_me:7837: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -7521,7 +7853,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:7524: result: $ac_cv_header_gpm_h" >&5 +echo "$as_me:7856: result: $ac_cv_header_gpm_h" >&5 echo "${ECHO_T}$ac_cv_header_gpm_h" >&6 if test "$ac_cv_header_gpm_h" = yes; then @@ -7532,7 +7864,7 @@ EOF if test "$with_gpm" != yes && test "$with_gpm" != maybe ; then test -n "$verbose" && echo " assuming we really have GPM library" 1>&6 -echo "${as_me:-configure}:7535: testing assuming we really have GPM library ..." 1>&5 +echo "${as_me:-configure}:7867: testing assuming we really have GPM library ..." 1>&5 cat >>confdefs.h <<\EOF #define HAVE_LIBGPM 1 @@ -7540,7 +7872,7 @@ EOF with_gpm=yes else - echo "$as_me:7543: checking for Gpm_Open in -lgpm" >&5 + echo "$as_me:7875: checking for Gpm_Open in -lgpm" >&5 echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6 if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7548,7 +7880,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 7551 "configure" +#line 7883 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -7557,7 +7889,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char Gpm_Open (); +char Gpm_Open (void); int main (void) { @@ -7567,16 +7899,16 @@ Gpm_Open (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:7570: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7902: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7573: \$? = $ac_status" >&5 + echo "$as_me:7905: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:7576: \"$ac_try\"") >&5 + { (eval echo "$as_me:7908: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7579: \$? = $ac_status" >&5 + echo "$as_me:7911: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_gpm_Gpm_Open=yes else @@ -7587,18 +7919,18 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:7590: result: $ac_cv_lib_gpm_Gpm_Open" >&5 +echo "$as_me:7922: result: $ac_cv_lib_gpm_Gpm_Open" >&5 echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6 if test "$ac_cv_lib_gpm_Gpm_Open" = yes; then with_gpm=yes else if test "$with_gpm" = maybe; then - { echo "$as_me:7597: WARNING: Cannot link with GPM library" >&5 + { echo "$as_me:7929: WARNING: Cannot link with GPM library" >&5 echo "$as_me: WARNING: Cannot link with GPM library" >&2;} with_gpm=no else - { { echo "$as_me:7601: error: Cannot link with GPM library" >&5 + { { echo "$as_me:7933: error: Cannot link with GPM library" >&5 echo "$as_me: error: Cannot link with GPM library" >&2;} { (exit 1); exit 1; }; } fi @@ -7609,7 +7941,7 @@ fi else - test "$with_gpm" != maybe && { echo "$as_me:7612: WARNING: Cannot find GPM header" >&5 + test "$with_gpm" != maybe && { echo "$as_me:7944: WARNING: Cannot find GPM header" >&5 echo "$as_me: WARNING: Cannot find GPM header" >&2;} with_gpm=no @@ -7618,7 +7950,7 @@ fi fi if test "$with_gpm" != no ; then - echo "$as_me:7621: checking if you want to load GPM dynamically" >&5 + echo "$as_me:7953: checking if you want to load GPM dynamically" >&5 echo $ECHO_N "checking if you want to load GPM dynamically... $ECHO_C" >&6 # Check whether --with-dlsym or --without-dlsym was given. @@ -7628,18 +7960,18 @@ if test "${with_dlsym+set}" = set; then else with_dlsym=yes fi; - echo "$as_me:7631: result: $with_dlsym" >&5 + echo "$as_me:7963: result: $with_dlsym" >&5 echo "${ECHO_T}$with_dlsym" >&6 if test "x$with_dlsym" = xyes ; then cf_have_dlsym=no -echo "$as_me:7636: checking for dlsym" >&5 +echo "$as_me:7968: checking for dlsym" >&5 echo $ECHO_N "checking for dlsym... $ECHO_C" >&6 if test "${ac_cv_func_dlsym+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 7642 "configure" +#line 7974 "configure" #include "confdefs.h" #define dlsym autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -7670,16 +8002,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:7673: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8005: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7676: \$? = $ac_status" >&5 + echo "$as_me:8008: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:7679: \"$ac_try\"") >&5 + { (eval echo "$as_me:8011: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7682: \$? = $ac_status" >&5 + echo "$as_me:8014: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_dlsym=yes else @@ -7689,14 +8021,14 @@ ac_cv_func_dlsym=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:7692: result: $ac_cv_func_dlsym" >&5 +echo "$as_me:8024: result: $ac_cv_func_dlsym" >&5 echo "${ECHO_T}$ac_cv_func_dlsym" >&6 if test "$ac_cv_func_dlsym" = yes; then cf_have_dlsym=yes else cf_have_libdl=no -echo "$as_me:7699: checking for dlsym in -ldl" >&5 +echo "$as_me:8031: checking for dlsym in -ldl" >&5 echo $ECHO_N "checking for dlsym in -ldl... $ECHO_C" >&6 if test "${ac_cv_lib_dl_dlsym+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7704,7 +8036,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 7707 "configure" +#line 8039 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -7713,7 +8045,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char dlsym (); +char dlsym (void); int main (void) { @@ -7723,16 +8055,16 @@ dlsym (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:7726: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8058: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7729: \$? = $ac_status" >&5 + echo "$as_me:8061: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:7732: \"$ac_try\"") >&5 + { (eval echo "$as_me:8064: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7735: \$? = $ac_status" >&5 + echo "$as_me:8067: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_dl_dlsym=yes else @@ -7743,7 +8075,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:7746: result: $ac_cv_lib_dl_dlsym" >&5 +echo "$as_me:8078: result: $ac_cv_lib_dl_dlsym" >&5 echo "${ECHO_T}$ac_cv_lib_dl_dlsym" >&6 if test "$ac_cv_lib_dl_dlsym" = yes; then @@ -7772,18 +8104,21 @@ done LIBS="$cf_add_libs" } - echo "$as_me:7775: checking whether able to link to dl*() functions" >&5 + echo "$as_me:8107: checking whether able to link to dl*() functions" >&5 echo $ECHO_N "checking whether able to link to dl*() functions... $ECHO_C" >&6 cat >"conftest.$ac_ext" <<_ACEOF -#line 7778 "configure" +#line 8110 "configure" #include "confdefs.h" -#include + + #include + #include + int main (void) { void *obj; - if ((obj = dlopen("filename", 0)) != 0) { + if ((obj = dlopen("filename", 0)) != NULL) { if (dlsym(obj, "symbolname") == 0) { dlclose(obj); } @@ -7793,16 +8128,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:7796: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8131: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7799: \$? = $ac_status" >&5 + echo "$as_me:8134: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:7802: \"$ac_try\"") >&5 + { (eval echo "$as_me:8137: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7805: \$? = $ac_status" >&5 + echo "$as_me:8140: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cat >>confdefs.h <<\EOF @@ -7813,15 +8148,15 @@ else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 - { { echo "$as_me:7816: error: Cannot link test program for libdl" >&5 + { { echo "$as_me:8151: error: Cannot link test program for libdl" >&5 echo "$as_me: error: Cannot link test program for libdl" >&2;} { (exit 1); exit 1; }; } fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - echo "$as_me:7821: result: ok" >&5 + echo "$as_me:8156: result: ok" >&5 echo "${ECHO_T}ok" >&6 else - { { echo "$as_me:7824: error: Cannot find dlsym function" >&5 + { { echo "$as_me:8159: error: Cannot find dlsym function" >&5 echo "$as_me: error: Cannot find dlsym function" >&2;} { (exit 1); exit 1; }; } fi @@ -7829,12 +8164,12 @@ fi if test "x$with_gpm" != xyes ; then test -n "$verbose" && echo " assuming soname for gpm is $with_gpm" 1>&6 -echo "${as_me:-configure}:7832: testing assuming soname for gpm is $with_gpm ..." 1>&5 +echo "${as_me:-configure}:8167: testing assuming soname for gpm is $with_gpm ..." 1>&5 cf_cv_gpm_soname="$with_gpm" else -echo "$as_me:7837: checking for soname of gpm library" >&5 +echo "$as_me:8172: checking for soname of gpm library" >&5 echo $ECHO_N "checking for soname of gpm library... $ECHO_C" >&6 if test "${cf_cv_gpm_soname+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7868,15 +8203,15 @@ for cf_add_1lib in $cf_add_0lib; do done LIBS="$cf_add_libs" - if { (eval echo "$as_me:7871: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:8206: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7874: \$? = $ac_status" >&5 + echo "$as_me:8209: \$? = $ac_status" >&5 (exit "$ac_status"); } ; then - if { (eval echo "$as_me:7876: \"$ac_link\"") >&5 + if { (eval echo "$as_me:8211: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7879: \$? = $ac_status" >&5 + echo "$as_me:8214: \$? = $ac_status" >&5 (exit "$ac_status"); } ; then cf_cv_gpm_soname="`ldd \"conftest$ac_exeext\" 2>/dev/null | sed -e 's,^.*/,,' -e 's, .*$,,' | ${FGREP-fgrep} libgpm.`" test -z "$cf_cv_gpm_soname" && cf_cv_gpm_soname=unknown @@ -7887,7 +8222,7 @@ LIBS="$cf_save_LIBS" fi fi -echo "$as_me:7890: result: $cf_cv_gpm_soname" >&5 +echo "$as_me:8225: result: $cf_cv_gpm_soname" >&5 echo "${ECHO_T}$cf_cv_gpm_soname" >&6 fi @@ -7955,7 +8290,7 @@ cat >>confdefs.h <<\EOF #define HAVE_LIBGPM 1 EOF -echo "$as_me:7958: checking for Gpm_Wgetch in -lgpm" >&5 +echo "$as_me:8293: checking for Gpm_Wgetch in -lgpm" >&5 echo $ECHO_N "checking for Gpm_Wgetch in -lgpm... $ECHO_C" >&6 if test "${ac_cv_lib_gpm_Gpm_Wgetch+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7963,7 +8298,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 7966 "configure" +#line 8301 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -7972,7 +8307,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char Gpm_Wgetch (); +char Gpm_Wgetch (void); int main (void) { @@ -7982,16 +8317,16 @@ Gpm_Wgetch (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:7985: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8320: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7988: \$? = $ac_status" >&5 + echo "$as_me:8323: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:7991: \"$ac_try\"") >&5 + { (eval echo "$as_me:8326: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7994: \$? = $ac_status" >&5 + echo "$as_me:8329: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_gpm_Gpm_Wgetch=yes else @@ -8002,11 +8337,11 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:8005: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5 +echo "$as_me:8340: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5 echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Wgetch" >&6 if test "$ac_cv_lib_gpm_Gpm_Wgetch" = yes; then -echo "$as_me:8009: checking if GPM is weakly bound to curses library" >&5 +echo "$as_me:8344: checking if GPM is weakly bound to curses library" >&5 echo $ECHO_N "checking if GPM is weakly bound to curses library... $ECHO_C" >&6 if test "${cf_cv_check_gpm_wgetch+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -8030,15 +8365,15 @@ CF_EOF # to rely on the static library, noting that some packagers may not # include it. LIBS="-static -lgpm -dynamic $LIBS" - if { (eval echo "$as_me:8033: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:8368: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8036: \$? = $ac_status" >&5 + echo "$as_me:8371: \$? = $ac_status" >&5 (exit "$ac_status"); } ; then - if { (eval echo "$as_me:8038: \"$ac_link\"") >&5 + if { (eval echo "$as_me:8373: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8041: \$? = $ac_status" >&5 + echo "$as_me:8376: \$? = $ac_status" >&5 (exit "$ac_status"); } ; then cf_cv_check_gpm_wgetch="`nm \"conftest$ac_exeext\" | ${EGREP-egrep} '\' | ${EGREP-egrep} '\<[vVwW]\>'`" test -n "$cf_cv_check_gpm_wgetch" && cf_cv_check_gpm_wgetch=yes @@ -8050,11 +8385,11 @@ CF_EOF fi fi -echo "$as_me:8053: result: $cf_cv_check_gpm_wgetch" >&5 +echo "$as_me:8388: result: $cf_cv_check_gpm_wgetch" >&5 echo "${ECHO_T}$cf_cv_check_gpm_wgetch" >&6 if test "$cf_cv_check_gpm_wgetch" != yes ; then - { echo "$as_me:8057: WARNING: GPM library is already linked with curses - read the FAQ" >&5 + { echo "$as_me:8392: WARNING: GPM library is already linked with curses - read the FAQ" >&5 echo "$as_me: WARNING: GPM library is already linked with curses - read the FAQ" >&2;} fi @@ -8062,7 +8397,7 @@ fi fi -echo "$as_me:8065: checking if you want to use PCRE2 for regular-expressions" >&5 +echo "$as_me:8400: checking if you want to use PCRE2 for regular-expressions" >&5 echo $ECHO_N "checking if you want to use PCRE2 for regular-expressions... $ECHO_C" >&6 # Check whether --with-pcre2 or --without-pcre2 was given. @@ -8071,7 +8406,7 @@ if test "${with_pcre2+set}" = set; then fi; test -z "$with_pcre2" && with_pcre2=no -echo "$as_me:8074: result: $with_pcre2" >&5 +echo "$as_me:8409: result: $with_pcre2" >&5 echo "${ECHO_T}$with_pcre2" >&6 if test "x$with_pcre2" != xno ; then @@ -8082,17 +8417,31 @@ if test "x$with_pcre2" != xno ; then if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "$cf_with_pcre2"; then test -n "$verbose" && echo " found package $cf_with_pcre2" 1>&6 -echo "${as_me:-configure}:8085: testing found package $cf_with_pcre2 ..." 1>&5 +echo "${as_me:-configure}:8420: testing found package $cf_with_pcre2 ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags "$cf_with_pcre2" 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs "$cf_with_pcre2" 2>/dev/null`" test -n "$verbose" && echo " package $cf_with_pcre2 CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:8091: testing package $cf_with_pcre2 CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:8426: testing package $cf_with_pcre2 CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:8095: testing package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:8430: testing package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs ..." 1>&5 + +for cf_required in $cf_with_pcre2 +do + # check for duplicates + for cf_require_pkg in $REQUIRE_PKG + do + if test "$cf_required" = "$cf_require_pkg" + then + cf_required= + break + fi + done + test -n "$cf_required" && REQUIRE_PKG="$REQUIRE_PKG $cf_required" +done cf_fix_cppflags=no cf_new_cflags= @@ -8216,7 +8565,7 @@ else fi done - cf_with_pcre2_ok=yes || { { echo "$as_me:8219: error: Cannot find PCRE2 library" >&5 + cf_with_pcre2_ok=yes || { { echo "$as_me:8568: error: Cannot find PCRE2 library" >&5 echo "$as_me: error: Cannot find PCRE2 library" >&2;} { (exit 1); exit 1; }; } @@ -8229,7 +8578,7 @@ EOF (*pcre2-posix*|*pcreposix*) ;; (*) - echo "$as_me:8232: checking for regcomp in -lpcre2-posix" >&5 + echo "$as_me:8581: checking for regcomp in -lpcre2-posix" >&5 echo $ECHO_N "checking for regcomp in -lpcre2-posix... $ECHO_C" >&6 if test "${ac_cv_lib_pcre2_posix_regcomp+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -8237,7 +8586,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lpcre2-posix $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 8240 "configure" +#line 8589 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -8246,7 +8595,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char regcomp (); +char regcomp (void); int main (void) { @@ -8256,16 +8605,16 @@ regcomp (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:8259: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8608: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8262: \$? = $ac_status" >&5 + echo "$as_me:8611: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:8265: \"$ac_try\"") >&5 + { (eval echo "$as_me:8614: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8268: \$? = $ac_status" >&5 + echo "$as_me:8617: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_pcre2_posix_regcomp=yes else @@ -8276,7 +8625,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:8279: result: $ac_cv_lib_pcre2_posix_regcomp" >&5 +echo "$as_me:8628: result: $ac_cv_lib_pcre2_posix_regcomp" >&5 echo "${ECHO_T}$ac_cv_lib_pcre2_posix_regcomp" >&6 if test "$ac_cv_lib_pcre2_posix_regcomp" = yes; then @@ -8297,7 +8646,7 @@ done LIBS="$cf_add_libs" else - echo "$as_me:8300: checking for regcomp in -lpcreposix" >&5 + echo "$as_me:8649: checking for regcomp in -lpcreposix" >&5 echo $ECHO_N "checking for regcomp in -lpcreposix... $ECHO_C" >&6 if test "${ac_cv_lib_pcreposix_regcomp+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -8305,7 +8654,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lpcreposix $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 8308 "configure" +#line 8657 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -8314,7 +8663,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char regcomp (); +char regcomp (void); int main (void) { @@ -8324,16 +8673,16 @@ regcomp (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:8327: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8676: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8330: \$? = $ac_status" >&5 + echo "$as_me:8679: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:8333: \"$ac_try\"") >&5 + { (eval echo "$as_me:8682: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8336: \$? = $ac_status" >&5 + echo "$as_me:8685: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_pcreposix_regcomp=yes else @@ -8344,7 +8693,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:8347: result: $ac_cv_lib_pcreposix_regcomp" >&5 +echo "$as_me:8696: result: $ac_cv_lib_pcreposix_regcomp" >&5 echo "${ECHO_T}$ac_cv_lib_pcreposix_regcomp" >&6 if test "$ac_cv_lib_pcreposix_regcomp" = yes; then @@ -8365,7 +8714,7 @@ done LIBS="$cf_add_libs" else - { { echo "$as_me:8368: error: Cannot find PCRE2 POSIX library" >&5 + { { echo "$as_me:8717: error: Cannot find PCRE2 POSIX library" >&5 echo "$as_me: error: Cannot find PCRE2 POSIX library" >&2;} { (exit 1); exit 1; }; } fi @@ -8380,23 +8729,23 @@ fi for ac_header in pcre2posix.h pcreposix.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:8383: checking for $ac_header" >&5 +echo "$as_me:8732: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 8389 "configure" +#line 8738 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:8393: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:8742: \"$ac_cpp "conftest.$ac_ext"\"") >&5 (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:8399: \$? = $ac_status" >&5 + echo "$as_me:8748: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -8415,7 +8764,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:8418: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:8767: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then cat >>confdefs.h <&5 +echo "$as_me:8780: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 8437 "configure" +#line 8786 "configure" #include "confdefs.h" #define $ac_func autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -8465,16 +8814,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:8468: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8817: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8471: \$? = $ac_status" >&5 + echo "$as_me:8820: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:8474: \"$ac_try\"") >&5 + { (eval echo "$as_me:8823: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8477: \$? = $ac_status" >&5 + echo "$as_me:8826: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then eval "$as_ac_var=yes" else @@ -8484,7 +8833,7 @@ eval "$as_ac_var=no" fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:8487: result: `eval echo '${'"$as_ac_var"'}'`" >&5 +echo "$as_me:8836: result: `eval echo '${'"$as_ac_var"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then cat >>confdefs.h </dev/null ; then -echo "$as_me:8501: checking if you want to use sysmouse" >&5 +echo "$as_me:8850: checking if you want to use sysmouse" >&5 echo $ECHO_N "checking if you want to use sysmouse... $ECHO_C" >&6 # Check whether --with-sysmouse or --without-sysmouse was given. @@ -8510,7 +8859,7 @@ else fi; if test "$cf_with_sysmouse" != no ; then cat >"conftest.$ac_ext" <<_ACEOF -#line 8513 "configure" +#line 8862 "configure" #include "confdefs.h" #include @@ -8533,16 +8882,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:8536: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8885: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8539: \$? = $ac_status" >&5 + echo "$as_me:8888: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:8542: \"$ac_try\"") >&5 + { (eval echo "$as_me:8891: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8545: \$? = $ac_status" >&5 + echo "$as_me:8894: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_with_sysmouse=yes else @@ -8552,7 +8901,7 @@ cf_with_sysmouse=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:8555: result: $cf_with_sysmouse" >&5 +echo "$as_me:8904: result: $cf_with_sysmouse" >&5 echo "${ECHO_T}$cf_with_sysmouse" >&6 test "$cf_with_sysmouse" = yes && cat >>confdefs.h <<\EOF @@ -8562,7 +8911,7 @@ EOF fi # pretend that ncurses==ncursesw==ncursest -echo "$as_me:8565: checking if you want to disable library suffixes" >&5 +echo "$as_me:8914: checking if you want to disable library suffixes" >&5 echo $ECHO_N "checking if you want to disable library suffixes... $ECHO_C" >&6 # Check whether --enable-lib-suffixes or --disable-lib-suffixes was given. @@ -8579,13 +8928,13 @@ else disable_lib_suffixes=no fi; -echo "$as_me:8582: result: $disable_lib_suffixes" >&5 +echo "$as_me:8931: result: $disable_lib_suffixes" >&5 echo "${ECHO_T}$disable_lib_suffixes" >&6 ### If we're building with rpath, try to link non-standard libs that way too. if test "$DFT_LWR_MODEL" = "shared" && test "x$cf_cv_enable_rpath" != xno; then -echo "$as_me:8588: checking if rpath-hack should be disabled" >&5 +echo "$as_me:8937: checking if rpath-hack should be disabled" >&5 echo $ECHO_N "checking if rpath-hack should be disabled... $ECHO_C" >&6 # Check whether --enable-rpath-hack or --disable-rpath-hack was given. @@ -8603,22 +8952,22 @@ else fi; if test "x$enable_rpath_hack" = xno; then cf_disable_rpath_hack=yes; else cf_disable_rpath_hack=no; fi -echo "$as_me:8606: result: $cf_disable_rpath_hack" >&5 +echo "$as_me:8955: result: $cf_disable_rpath_hack" >&5 echo "${ECHO_T}$cf_disable_rpath_hack" >&6 if test "$enable_rpath_hack" = yes ; then -echo "$as_me:8611: checking for updated LDFLAGS" >&5 +echo "$as_me:8960: checking for updated LDFLAGS" >&5 echo $ECHO_N "checking for updated LDFLAGS... $ECHO_C" >&6 if test -n "$LD_RPATH_OPT" ; then - echo "$as_me:8614: result: maybe" >&5 + echo "$as_me:8963: result: maybe" >&5 echo "${ECHO_T}maybe" >&6 for ac_prog in ldd do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:8621: checking for $ac_word" >&5 +echo "$as_me:8970: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_cf_ldd_prog+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -8633,7 +8982,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_cf_ldd_prog="$ac_prog" -echo "$as_me:8636: found $ac_dir/$ac_word" >&5 +echo "$as_me:8985: found $ac_dir/$ac_word" >&5 break done @@ -8641,10 +8990,10 @@ fi fi cf_ldd_prog=$ac_cv_prog_cf_ldd_prog if test -n "$cf_ldd_prog"; then - echo "$as_me:8644: result: $cf_ldd_prog" >&5 + echo "$as_me:8993: result: $cf_ldd_prog" >&5 echo "${ECHO_T}$cf_ldd_prog" >&6 else - echo "$as_me:8647: result: no" >&5 + echo "$as_me:8996: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -8658,7 +9007,7 @@ test -n "$cf_ldd_prog" || cf_ldd_prog="no" cf_rpath_oops= cat >"conftest.$ac_ext" <<_ACEOF -#line 8661 "configure" +#line 9010 "configure" #include "confdefs.h" #include int @@ -8670,16 +9019,16 @@ printf("Hello"); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:8673: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9022: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8676: \$? = $ac_status" >&5 + echo "$as_me:9025: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:8679: \"$ac_try\"") >&5 + { (eval echo "$as_me:9028: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8682: \$? = $ac_status" >&5 + echo "$as_me:9031: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_rpath_oops=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} ' not found' | sed -e 's% =>.*$%%' |sort | uniq` cf_rpath_list=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} / | sed -e 's%^.*[ ]/%/%' -e 's%/[^/][^/]*$%%' |sort | uniq` @@ -8707,7 +9056,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" then test -n "$verbose" && echo " ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6 -echo "${as_me:-configure}:8710: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5 +echo "${as_me:-configure}:9059: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5 LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib" break @@ -8719,11 +9068,11 @@ echo "${as_me:-configure}:8710: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS test -n "$verbose" && echo " ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6 -echo "${as_me:-configure}:8722: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:9071: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 test -n "$verbose" && echo " ...checking LDFLAGS $LDFLAGS" 1>&6 -echo "${as_me:-configure}:8726: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:9075: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5 cf_rpath_dst= for cf_rpath_src in $LDFLAGS @@ -8760,7 +9109,7 @@ do then test -n "$verbose" && echo " ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6 -echo "${as_me:-configure}:8763: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 +echo "${as_me:-configure}:9112: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS" fi @@ -8773,11 +9122,11 @@ LDFLAGS=$cf_rpath_dst test -n "$verbose" && echo " ...checked LDFLAGS $LDFLAGS" 1>&6 -echo "${as_me:-configure}:8776: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:9125: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5 test -n "$verbose" && echo " ...checking LIBS $LIBS" 1>&6 -echo "${as_me:-configure}:8780: testing ...checking LIBS $LIBS ..." 1>&5 +echo "${as_me:-configure}:9129: testing ...checking LIBS $LIBS ..." 1>&5 cf_rpath_dst= for cf_rpath_src in $LIBS @@ -8814,7 +9163,7 @@ do then test -n "$verbose" && echo " ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6 -echo "${as_me:-configure}:8817: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 +echo "${as_me:-configure}:9166: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS" fi @@ -8827,14 +9176,14 @@ LIBS=$cf_rpath_dst test -n "$verbose" && echo " ...checked LIBS $LIBS" 1>&6 -echo "${as_me:-configure}:8830: testing ...checked LIBS $LIBS ..." 1>&5 +echo "${as_me:-configure}:9179: testing ...checked LIBS $LIBS ..." 1>&5 test -n "$verbose" && echo " ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6 -echo "${as_me:-configure}:8834: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:9183: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 else - echo "$as_me:8837: result: no" >&5 + echo "$as_me:9186: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -8848,7 +9197,7 @@ fi EXTRA_PKG_LDFLAGS="$LDFLAGS $EXTRA_LDFLAGS" if test -n "$EXTRA_PKG_LDFLAGS" then - echo "$as_me:8851: checking if you want to disable extra LDFLAGS for package-scripts" >&5 + echo "$as_me:9200: checking if you want to disable extra LDFLAGS for package-scripts" >&5 echo $ECHO_N "checking if you want to disable extra LDFLAGS for package-scripts... $ECHO_C" >&6 # Check whether --enable-pkg-ldflags or --disable-pkg-ldflags was given. @@ -8865,7 +9214,7 @@ else disable_pkg_ldflags=no fi; - echo "$as_me:8868: result: $disable_pkg_ldflags" >&5 + echo "$as_me:9217: result: $disable_pkg_ldflags" >&5 echo "${ECHO_T}$disable_pkg_ldflags" >&6 test "$disable_pkg_ldflags" = yes && EXTRA_PKG_LDFLAGS= fi @@ -8873,8 +9222,8 @@ fi ############################################################################### ### use option --with-extra-suffix to append suffix to headers and libraries -echo "$as_me:8876: checking if you wish to append extra suffix to header/library paths" >&5 -echo $ECHO_N "checking if you wish to append extra suffix to header/library paths... $ECHO_C" >&6 +echo "$as_me:9225: checking for extra suffix to append to header/library paths" >&5 +echo $ECHO_N "checking for extra suffix to append to header/library paths... $ECHO_C" >&6 EXTRA_SUFFIX= # Check whether --with-extra-suffix or --without-extra-suffix was given. @@ -8892,11 +9241,11 @@ if test "${with_extra_suffix+set}" = set; then esac fi; -echo "$as_me:8895: result: $EXTRA_SUFFIX" >&5 -echo "${ECHO_T}$EXTRA_SUFFIX" >&6 +echo "$as_me:9244: result: ${EXTRA_SUFFIX:-(none)}" >&5 +echo "${ECHO_T}${EXTRA_SUFFIX:-(none)}" >&6 ### use option --disable-overwrite to leave out the link to -lcurses -echo "$as_me:8899: checking if you wish to install ncurses overwriting curses" >&5 +echo "$as_me:9248: checking if you wish to install ncurses overwriting curses" >&5 echo $ECHO_N "checking if you wish to install ncurses overwriting curses... $ECHO_C" >&6 # Check whether --enable-overwrite or --disable-overwrite was given. @@ -8906,10 +9255,10 @@ if test "${enable_overwrite+set}" = set; then else if test "$prefix" = "/usr" ; then with_overwrite=yes; else with_overwrite=no; fi fi; -echo "$as_me:8909: result: $with_overwrite" >&5 +echo "$as_me:9258: result: $with_overwrite" >&5 echo "${ECHO_T}$with_overwrite" >&6 -echo "$as_me:8912: checking if external terminfo-database is used" >&5 +echo "$as_me:9261: checking if external terminfo-database is used" >&5 echo $ECHO_N "checking if external terminfo-database is used... $ECHO_C" >&6 # Check whether --enable-database or --disable-database was given. @@ -8919,7 +9268,7 @@ if test "${enable_database+set}" = set; then else use_database=yes fi; -echo "$as_me:8922: result: $use_database" >&5 +echo "$as_me:9271: result: $use_database" >&5 echo "${ECHO_T}$use_database" >&6 case "$host_os" in @@ -8935,7 +9284,7 @@ NCURSES_USE_DATABASE=0 if test "$use_database" != no ; then NCURSES_USE_DATABASE=1 - echo "$as_me:8938: checking which terminfo source-file will be installed" >&5 + echo "$as_me:9287: checking which terminfo source-file will be installed" >&5 echo $ECHO_N "checking which terminfo source-file will be installed... $ECHO_C" >&6 # Check whether --with-database or --without-database was given. @@ -8943,10 +9292,10 @@ if test "${with_database+set}" = set; then withval="$with_database" TERMINFO_SRC=$withval fi; - echo "$as_me:8946: result: $TERMINFO_SRC" >&5 + echo "$as_me:9295: result: $TERMINFO_SRC" >&5 echo "${ECHO_T}$TERMINFO_SRC" >&6 - echo "$as_me:8949: checking whether to use hashed database instead of directory/tree" >&5 + echo "$as_me:9298: checking whether to use hashed database instead of directory/tree" >&5 echo $ECHO_N "checking whether to use hashed database instead of directory/tree... $ECHO_C" >&6 # Check whether --with-hashed-db or --without-hashed-db was given. @@ -8956,14 +9305,14 @@ if test "${with_hashed_db+set}" = set; then else with_hashed_db=no fi; - echo "$as_me:8959: result: $with_hashed_db" >&5 + echo "$as_me:9308: result: $with_hashed_db" >&5 echo "${ECHO_T}$with_hashed_db" >&6 else with_hashed_db=no fi -echo "$as_me:8965: checking for list of fallback descriptions" >&5 -echo $ECHO_N "checking for list of fallback descriptions... $ECHO_C" >&6 +echo "$as_me:9314: checking for list of fallback terminal descriptions" >&5 +echo $ECHO_N "checking for list of fallback terminal descriptions... $ECHO_C" >&6 # Check whether --with-fallbacks or --without-fallbacks was given. if test "${with_fallbacks+set}" = set; then @@ -8972,15 +9321,15 @@ if test "${with_fallbacks+set}" = set; then else with_fallback= fi; -echo "$as_me:8975: result: $with_fallback" >&5 -echo "${ECHO_T}$with_fallback" >&6 +echo "$as_me:9324: result: ${with_fallback:-(none)}" >&5 +echo "${ECHO_T}${with_fallback:-(none)}" >&6 case ".$with_fallback" in (.|.no) FALLBACK_LIST= ;; (.yes) - { echo "$as_me:8983: WARNING: expected a list of terminal descriptions" >&5 + { echo "$as_me:9332: WARNING: expected a list of terminal descriptions" >&5 echo "$as_me: WARNING: expected a list of terminal descriptions" >&2;} ;; (*) @@ -8996,7 +9345,7 @@ esac if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}tic", so it can be a program name with args. set dummy ${ac_tool_prefix}tic; ac_word=$2 -echo "$as_me:8999: checking for $ac_word" >&5 +echo "$as_me:9348: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_TIC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9011,7 +9360,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_TIC="${ac_tool_prefix}tic" -echo "$as_me:9014: found $ac_dir/$ac_word" >&5 +echo "$as_me:9363: found $ac_dir/$ac_word" >&5 break done @@ -9019,10 +9368,10 @@ fi fi TIC=$ac_cv_prog_TIC if test -n "$TIC"; then - echo "$as_me:9022: result: $TIC" >&5 + echo "$as_me:9371: result: $TIC" >&5 echo "${ECHO_T}$TIC" >&6 else - echo "$as_me:9025: result: no" >&5 + echo "$as_me:9374: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -9031,7 +9380,7 @@ if test -z "$ac_cv_prog_TIC"; then ac_ct_TIC=$TIC # Extract the first word of "tic", so it can be a program name with args. set dummy tic; ac_word=$2 -echo "$as_me:9034: checking for $ac_word" >&5 +echo "$as_me:9383: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_TIC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9046,7 +9395,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_TIC="tic" -echo "$as_me:9049: found $ac_dir/$ac_word" >&5 +echo "$as_me:9398: found $ac_dir/$ac_word" >&5 break done @@ -9054,10 +9403,10 @@ fi fi ac_ct_TIC=$ac_cv_prog_ac_ct_TIC if test -n "$ac_ct_TIC"; then - echo "$as_me:9057: result: $ac_ct_TIC" >&5 + echo "$as_me:9406: result: $ac_ct_TIC" >&5 echo "${ECHO_T}$ac_ct_TIC" >&6 else - echo "$as_me:9060: result: no" >&5 + echo "$as_me:9409: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -9069,7 +9418,7 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}infocmp", so it can be a program name with args. set dummy ${ac_tool_prefix}infocmp; ac_word=$2 -echo "$as_me:9072: checking for $ac_word" >&5 +echo "$as_me:9421: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_INFOCMP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9084,7 +9433,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_INFOCMP="${ac_tool_prefix}infocmp" -echo "$as_me:9087: found $ac_dir/$ac_word" >&5 +echo "$as_me:9436: found $ac_dir/$ac_word" >&5 break done @@ -9092,10 +9441,10 @@ fi fi INFOCMP=$ac_cv_prog_INFOCMP if test -n "$INFOCMP"; then - echo "$as_me:9095: result: $INFOCMP" >&5 + echo "$as_me:9444: result: $INFOCMP" >&5 echo "${ECHO_T}$INFOCMP" >&6 else - echo "$as_me:9098: result: no" >&5 + echo "$as_me:9447: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -9104,7 +9453,7 @@ if test -z "$ac_cv_prog_INFOCMP"; then ac_ct_INFOCMP=$INFOCMP # Extract the first word of "infocmp", so it can be a program name with args. set dummy infocmp; ac_word=$2 -echo "$as_me:9107: checking for $ac_word" >&5 +echo "$as_me:9456: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_INFOCMP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9119,7 +9468,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_INFOCMP="infocmp" -echo "$as_me:9122: found $ac_dir/$ac_word" >&5 +echo "$as_me:9471: found $ac_dir/$ac_word" >&5 break done @@ -9127,10 +9476,10 @@ fi fi ac_ct_INFOCMP=$ac_cv_prog_ac_ct_INFOCMP if test -n "$ac_ct_INFOCMP"; then - echo "$as_me:9130: result: $ac_ct_INFOCMP" >&5 + echo "$as_me:9479: result: $ac_ct_INFOCMP" >&5 echo "${ECHO_T}$ac_ct_INFOCMP" >&6 else - echo "$as_me:9133: result: no" >&5 + echo "$as_me:9482: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -9145,10 +9494,10 @@ then # Check whether --with-tic-path or --without-tic-path was given. if test "${with_tic_path+set}" = set; then withval="$with_tic_path" - echo "$as_me:9148: checking for tic program for fallbacks" >&5 + echo "$as_me:9497: checking for tic program for fallbacks" >&5 echo $ECHO_N "checking for tic program for fallbacks... $ECHO_C" >&6 TIC=$withval - echo "$as_me:9151: result: $TIC" >&5 + echo "$as_me:9500: result: $TIC" >&5 echo "${ECHO_T}$TIC" >&6 if test "x$prefix" != xNONE; then @@ -9157,26 +9506,24 @@ else cf_path_syntax="$ac_default_prefix" fi -case ".$TIC" in -(.\$\(*\)*|.\'*\'*) - ;; -(..|./*|.\\*) +case "x$TIC" in +(x\$\(*\)*|x\'*\'*) ;; -(.[a-zA-Z]:[\\/]*) # OS/2 EMX +(x.|x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER) ;; -(.\$\{*prefix\}*|.\$\{*dir\}*) +(x\$\{*prefix\}*|x\$\{*dir\}*) eval TIC="$TIC" - case ".$TIC" in - (.NONE/*) + case "x$TIC" in + (xNONE/*) TIC=`echo "$TIC" | sed -e s%NONE%$cf_path_syntax%` ;; esac ;; -(.no|.NONE/*) +(xno|xNONE/*) TIC=`echo "$TIC" | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { { echo "$as_me:9179: error: expected a pathname, not \"$TIC\"" >&5 + { { echo "$as_me:9526: error: expected a pathname, not \"$TIC\"" >&5 echo "$as_me: error: expected a pathname, not \"$TIC\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -9189,7 +9536,7 @@ for ac_prog in $TIC tic do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:9192: checking for $ac_word" >&5 +echo "$as_me:9539: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_TIC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9206,7 +9553,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_TIC="$ac_dir/$ac_word" - echo "$as_me:9209: found $ac_dir/$ac_word" >&5 + echo "$as_me:9556: found $ac_dir/$ac_word" >&5 break fi done @@ -9217,10 +9564,10 @@ fi TIC=$ac_cv_path_TIC if test -n "$TIC"; then - echo "$as_me:9220: result: $TIC" >&5 + echo "$as_me:9567: result: $TIC" >&5 echo "${ECHO_T}$TIC" >&6 else - echo "$as_me:9223: result: no" >&5 + echo "$as_me:9570: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -9242,22 +9589,20 @@ else cf_path_syntax="$ac_default_prefix" fi -case ".$cf_temp" in -(.\$\(*\)*|.\'*\'*) +case "x$cf_temp" in +(x\$\(*\)*|x\'*\'*) ;; -(..|./*|.\\*) +(x.|x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER) ;; -(.[a-zA-Z]:[\\/]*) # OS/2 EMX - ;; -(.\$\{*prefix\}*|.\$\{*dir\}*) +(x\$\{*prefix\}*|x\$\{*dir\}*) eval cf_temp="$cf_temp" - case ".$cf_temp" in - (.NONE/*) + case "x$cf_temp" in + (xNONE/*) cf_temp=`echo "$cf_temp" | sed -e s%NONE%$cf_path_syntax%` ;; esac ;; -(.no|.NONE/*) +(xno|xNONE/*) cf_temp=`echo "$cf_temp" | sed -e s%NONE%$cf_path_syntax%` ;; (*) @@ -9279,7 +9624,7 @@ IFS="$cf_save_ifs" if test -n "$cf_path_prog" ; then -echo "${as_me:-configure}:9282: testing defining path for ${cf_path_prog} ..." 1>&5 +echo "${as_me:-configure}:9627: testing defining path for ${cf_path_prog} ..." 1>&5 cat >>confdefs.h <&5 + { echo "$as_me:9642: WARNING: no tic program found for fallbacks" >&5 echo "$as_me: WARNING: no tic program found for fallbacks" >&2;} fi @@ -9303,10 +9648,10 @@ fi; # Check whether --with-infocmp-path or --without-infocmp-path was given. if test "${with_infocmp_path+set}" = set; then withval="$with_infocmp_path" - echo "$as_me:9306: checking for infocmp program for fallbacks" >&5 + echo "$as_me:9651: checking for infocmp program for fallbacks" >&5 echo $ECHO_N "checking for infocmp program for fallbacks... $ECHO_C" >&6 INFOCMP=$withval - echo "$as_me:9309: result: $INFOCMP" >&5 + echo "$as_me:9654: result: $INFOCMP" >&5 echo "${ECHO_T}$INFOCMP" >&6 if test "x$prefix" != xNONE; then @@ -9315,26 +9660,24 @@ else cf_path_syntax="$ac_default_prefix" fi -case ".$INFOCMP" in -(.\$\(*\)*|.\'*\'*) - ;; -(..|./*|.\\*) +case "x$INFOCMP" in +(x\$\(*\)*|x\'*\'*) ;; -(.[a-zA-Z]:[\\/]*) # OS/2 EMX +(x.|x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER) ;; -(.\$\{*prefix\}*|.\$\{*dir\}*) +(x\$\{*prefix\}*|x\$\{*dir\}*) eval INFOCMP="$INFOCMP" - case ".$INFOCMP" in - (.NONE/*) + case "x$INFOCMP" in + (xNONE/*) INFOCMP=`echo "$INFOCMP" | sed -e s%NONE%$cf_path_syntax%` ;; esac ;; -(.no|.NONE/*) +(xno|xNONE/*) INFOCMP=`echo "$INFOCMP" | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { { echo "$as_me:9337: error: expected a pathname, not \"$INFOCMP\"" >&5 + { { echo "$as_me:9680: error: expected a pathname, not \"$INFOCMP\"" >&5 echo "$as_me: error: expected a pathname, not \"$INFOCMP\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -9347,7 +9690,7 @@ for ac_prog in $INFOCMP infocmp do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:9350: checking for $ac_word" >&5 +echo "$as_me:9693: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_INFOCMP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9364,7 +9707,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_INFOCMP="$ac_dir/$ac_word" - echo "$as_me:9367: found $ac_dir/$ac_word" >&5 + echo "$as_me:9710: found $ac_dir/$ac_word" >&5 break fi done @@ -9375,10 +9718,10 @@ fi INFOCMP=$ac_cv_path_INFOCMP if test -n "$INFOCMP"; then - echo "$as_me:9378: result: $INFOCMP" >&5 + echo "$as_me:9721: result: $INFOCMP" >&5 echo "${ECHO_T}$INFOCMP" >&6 else - echo "$as_me:9381: result: no" >&5 + echo "$as_me:9724: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -9400,22 +9743,20 @@ else cf_path_syntax="$ac_default_prefix" fi -case ".$cf_temp" in -(.\$\(*\)*|.\'*\'*) +case "x$cf_temp" in +(x\$\(*\)*|x\'*\'*) ;; -(..|./*|.\\*) +(x.|x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER) ;; -(.[a-zA-Z]:[\\/]*) # OS/2 EMX - ;; -(.\$\{*prefix\}*|.\$\{*dir\}*) +(x\$\{*prefix\}*|x\$\{*dir\}*) eval cf_temp="$cf_temp" - case ".$cf_temp" in - (.NONE/*) + case "x$cf_temp" in + (xNONE/*) cf_temp=`echo "$cf_temp" | sed -e s%NONE%$cf_path_syntax%` ;; esac ;; -(.no|.NONE/*) +(xno|xNONE/*) cf_temp=`echo "$cf_temp" | sed -e s%NONE%$cf_path_syntax%` ;; (*) @@ -9437,7 +9778,7 @@ IFS="$cf_save_ifs" if test -n "$cf_path_prog" ; then -echo "${as_me:-configure}:9440: testing defining path for ${cf_path_prog} ..." 1>&5 +echo "${as_me:-configure}:9781: testing defining path for ${cf_path_prog} ..." 1>&5 cat >>confdefs.h <&5 + { echo "$as_me:9796: WARNING: no infocmp program found for fallbacks" >&5 echo "$as_me: WARNING: no infocmp program found for fallbacks" >&2;} fi @@ -9462,7 +9803,7 @@ fi; test -z "$INFOCMP" && FALLBACK_LIST= if test -z "$FALLBACK_LIST" then - { echo "$as_me:9465: WARNING: ignoring fallback option because tic/infocmp are not available" >&5 + { echo "$as_me:9806: WARNING: ignoring fallback option because tic/infocmp are not available" >&5 echo "$as_me: WARNING: ignoring fallback option because tic/infocmp are not available" >&2;} fi fi @@ -9470,7 +9811,7 @@ fi USE_FALLBACKS= test -z "$FALLBACK_LIST" && USE_FALLBACKS="#" -echo "$as_me:9473: checking if you want modern xterm or antique" >&5 +echo "$as_me:9814: checking if you want modern xterm or antique" >&5 echo $ECHO_N "checking if you want modern xterm or antique... $ECHO_C" >&6 # Check whether --with-xterm-new or --without-xterm-new was given. @@ -9484,12 +9825,12 @@ case "$with_xterm_new" in (no) with_xterm_new=xterm-old;; (*) with_xterm_new=xterm-new;; esac -echo "$as_me:9487: result: $with_xterm_new" >&5 +echo "$as_me:9828: result: $with_xterm_new" >&5 echo "${ECHO_T}$with_xterm_new" >&6 WHICH_XTERM=$with_xterm_new case $host_os in -(*linux-gnu|*cygwin|*mingw32|*msys) +(linux*gnu|linux*gnuabi64|linux*gnuabin32|linux*gnueabi|linux*gnueabihf|linux*gnux32|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys|mingw*|linux*uclibc|linux*musl) want_xterm_kbs=DEL ;; (*) @@ -9497,7 +9838,7 @@ case $host_os in ;; esac -echo "$as_me:9500: checking if xterm backspace sends BS or DEL" >&5 +echo "$as_me:9841: checking if xterm backspace sends BS or DEL" >&5 echo $ECHO_N "checking if xterm backspace sends BS or DEL... $ECHO_C" >&6 # Check whether --with-xterm-kbs or --without-xterm-kbs was given. @@ -9505,7 +9846,7 @@ if test "${with_xterm_kbs+set}" = set; then withval="$with_xterm_kbs" with_xterm_kbs=$withval else - with_xterm_kbs=BS + with_xterm_kbs=auto fi; case x$with_xterm_kbs in (xyes|xno|xBS|xbs|x8) @@ -9514,18 +9855,21 @@ case x$with_xterm_kbs in (xDEL|xdel|x127) with_xterm_kbs=DEL ;; +(xauto) + with_xterm_kbs=$want_xterm_kbs + ;; (*) with_xterm_kbs=$withval ;; esac -echo "$as_me:9521: result: $with_xterm_kbs" >&5 +echo "$as_me:9865: result: $with_xterm_kbs" >&5 echo "${ECHO_T}$with_xterm_kbs" >&6 XTERM_KBS=$with_xterm_kbs if test "x$with_xterm_kbs" != "x$want_xterm_kbs" then - { echo "$as_me:9527: WARNING: expected --with-xterm-kbs=$want_xterm_kbs for $host_os" >&5 -echo "$as_me: WARNING: expected --with-xterm-kbs=$want_xterm_kbs for $host_os" >&2;} + { echo "$as_me:9871: WARNING: expected --with-xterm-kbs=$want_xterm_kbs for $host_os, have $with_xterm_kbs" >&5 +echo "$as_me: WARNING: expected --with-xterm-kbs=$want_xterm_kbs for $host_os, have $with_xterm_kbs" >&2;} fi MAKE_TERMINFO= @@ -9534,7 +9878,7 @@ if test "$use_database" = no ; then MAKE_TERMINFO="#" else -echo "$as_me:9537: checking for list of terminfo directories" >&5 +echo "$as_me:9881: checking for list of terminfo directories" >&5 echo $ECHO_N "checking for list of terminfo directories... $ECHO_C" >&6 # Check whether --with-terminfo-dirs or --without-terminfo-dirs was given. @@ -9555,26 +9899,24 @@ else cf_path_syntax="$ac_default_prefix" fi -case ".$cf_src_path" in -(.\$\(*\)*|.\'*\'*) - ;; -(..|./*|.\\*) +case "x$cf_src_path" in +(x\$\(*\)*|x\'*\'*) ;; -(.[a-zA-Z]:[\\/]*) # OS/2 EMX +(x.|x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER) ;; -(.\$\{*prefix\}*|.\$\{*dir\}*) +(x\$\{*prefix\}*|x\$\{*dir\}*) eval cf_src_path="$cf_src_path" - case ".$cf_src_path" in - (.NONE/*) + case "x$cf_src_path" in + (xNONE/*) cf_src_path=`echo "$cf_src_path" | sed -e s%NONE%$cf_path_syntax%` ;; esac ;; -(.no|.NONE/*) +(xno|xNONE/*) cf_src_path=`echo "$cf_src_path" | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { { echo "$as_me:9577: error: expected a pathname, not \"$cf_src_path\"" >&5 + { { echo "$as_me:9919: error: expected a pathname, not \"$cf_src_path\"" >&5 echo "$as_me: error: expected a pathname, not \"$cf_src_path\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -9597,7 +9939,7 @@ case "x$cf_dst_eval" in ;; esac -echo "$as_me:9600: result: $TERMINFO_DIRS" >&5 +echo "$as_me:9942: result: $TERMINFO_DIRS" >&5 echo "${ECHO_T}$TERMINFO_DIRS" >&6 test -n "$TERMINFO_DIRS" && cat >>confdefs.h <&5 + { echo "$as_me:9951: WARNING: ignoring non-directory/file TERMINFO value" >&5 echo "$as_me: WARNING: ignoring non-directory/file TERMINFO value" >&2;} unset TERMINFO ;; esac -echo "$as_me:9615: checking for default terminfo directory" >&5 +echo "$as_me:9957: checking for default terminfo directory" >&5 echo $ECHO_N "checking for default terminfo directory... $ECHO_C" >&6 # Check whether --with-default-terminfo-dir or --without-default-terminfo-dir was given. @@ -9629,26 +9971,24 @@ else cf_path_syntax="$ac_default_prefix" fi -case ".$withval" in -(.\$\(*\)*|.\'*\'*) +case "x$withval" in +(x\$\(*\)*|x\'*\'*) ;; -(..|./*|.\\*) +(x.|x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER) ;; -(.[a-zA-Z]:[\\/]*) # OS/2 EMX - ;; -(.\$\{*prefix\}*|.\$\{*dir\}*) +(x\$\{*prefix\}*|x\$\{*dir\}*) eval withval="$withval" - case ".$withval" in - (.NONE/*) + case "x$withval" in + (xNONE/*) withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%` ;; esac ;; -(.no|.NONE/*) +(xno|xNONE/*) withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { { echo "$as_me:9651: error: expected a pathname, not \"$withval\"" >&5 + { { echo "$as_me:9991: error: expected a pathname, not \"$withval\"" >&5 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -9657,7 +9997,7 @@ esac fi eval TERMINFO="$withval" -echo "$as_me:9660: result: $TERMINFO" >&5 +echo "$as_me:10000: result: $TERMINFO" >&5 echo "${ECHO_T}$TERMINFO" >&6 cat >>confdefs.h <&5 +echo "$as_me:10011: checking if big-core option selected" >&5 echo $ECHO_N "checking if big-core option selected... $ECHO_C" >&6 # Check whether --enable-big-core or --disable-big-core was given. @@ -9680,12 +10020,12 @@ else with_big_core=no else cat >"conftest.$ac_ext" <<_ACEOF -#line 9683 "configure" +#line 10023 "configure" #include "confdefs.h" #include #include -int main() { +int main(void) { unsigned long n = 6000000L; char *s = malloc(n); if (s != 0) @@ -9694,15 +10034,15 @@ int main() { } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:9697: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10037: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9700: \$? = $ac_status" >&5 + echo "$as_me:10040: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:9702: \"$ac_try\"") >&5 + { (eval echo "$as_me:10042: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9705: \$? = $ac_status" >&5 + echo "$as_me:10045: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then with_big_core=yes else @@ -9714,7 +10054,7 @@ fi rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext" fi fi; -echo "$as_me:9717: result: $with_big_core" >&5 +echo "$as_me:10057: result: $with_big_core" >&5 echo "${ECHO_T}$with_big_core" >&6 test "x$with_big_core" = "xyes" && cat >>confdefs.h <<\EOF @@ -9724,7 +10064,7 @@ EOF ### ISO C only guarantees 512-char strings, we have tables which load faster ### when constructed using "big" strings. More than the C compiler, the awk ### program is a limit on most vendor UNIX systems. Check that we can build. -echo "$as_me:9727: checking if big-strings option selected" >&5 +echo "$as_me:10067: checking if big-strings option selected" >&5 echo $ECHO_N "checking if big-strings option selected... $ECHO_C" >&6 # Check whether --enable-big-strings or --disable-big-strings was given. @@ -9748,14 +10088,14 @@ else esac fi; -echo "$as_me:9751: result: $with_big_strings" >&5 +echo "$as_me:10091: result: $with_big_strings" >&5 echo "${ECHO_T}$with_big_strings" >&6 USE_BIG_STRINGS=0 test "x$with_big_strings" = "xyes" && USE_BIG_STRINGS=1 ### use option --enable-termcap to compile in the termcap fallback support -echo "$as_me:9758: checking if you want termcap-fallback support" >&5 +echo "$as_me:10098: checking if you want termcap-fallback support" >&5 echo $ECHO_N "checking if you want termcap-fallback support... $ECHO_C" >&6 # Check whether --enable-termcap or --disable-termcap was given. @@ -9765,14 +10105,14 @@ if test "${enable_termcap+set}" = set; then else with_termcap=no fi; -echo "$as_me:9768: result: $with_termcap" >&5 +echo "$as_me:10108: result: $with_termcap" >&5 echo "${ECHO_T}$with_termcap" >&6 NCURSES_USE_TERMCAP=0 if test "x$with_termcap" != "xyes" ; then if test "$use_database" = no ; then if test -z "$with_fallback" ; then - { { echo "$as_me:9775: error: You have disabled the database w/o specifying fallbacks" >&5 + { { echo "$as_me:10115: error: You have disabled the database w/o specifying fallbacks" >&5 echo "$as_me: error: You have disabled the database w/o specifying fallbacks" >&2;} { (exit 1); exit 1; }; } fi @@ -9785,13 +10125,13 @@ EOF else if test "$with_ticlib" != no ; then - { { echo "$as_me:9788: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5 + { { echo "$as_me:10128: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5 echo "$as_me: error: Options --with-ticlib and --enable-termcap cannot be combined" >&2;} { (exit 1); exit 1; }; } fi NCURSES_USE_TERMCAP=1 - echo "$as_me:9794: checking for list of termcap files" >&5 + echo "$as_me:10134: checking for list of termcap files" >&5 echo $ECHO_N "checking for list of termcap files... $ECHO_C" >&6 # Check whether --with-termpath or --without-termpath was given. @@ -9812,26 +10152,24 @@ else cf_path_syntax="$ac_default_prefix" fi -case ".$cf_src_path" in -(.\$\(*\)*|.\'*\'*) +case "x$cf_src_path" in +(x\$\(*\)*|x\'*\'*) ;; -(..|./*|.\\*) +(x.|x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER) ;; -(.[a-zA-Z]:[\\/]*) # OS/2 EMX - ;; -(.\$\{*prefix\}*|.\$\{*dir\}*) +(x\$\{*prefix\}*|x\$\{*dir\}*) eval cf_src_path="$cf_src_path" - case ".$cf_src_path" in - (.NONE/*) + case "x$cf_src_path" in + (xNONE/*) cf_src_path=`echo "$cf_src_path" | sed -e s%NONE%$cf_path_syntax%` ;; esac ;; -(.no|.NONE/*) +(xno|xNONE/*) cf_src_path=`echo "$cf_src_path" | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { { echo "$as_me:9834: error: expected a pathname, not \"$cf_src_path\"" >&5 + { { echo "$as_me:10172: error: expected a pathname, not \"$cf_src_path\"" >&5 echo "$as_me: error: expected a pathname, not \"$cf_src_path\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -9854,7 +10192,7 @@ case "x$cf_dst_eval" in ;; esac - echo "$as_me:9857: result: $TERMPATH" >&5 + echo "$as_me:10195: result: $TERMPATH" >&5 echo "${ECHO_T}$TERMPATH" >&6 test -n "$TERMPATH" && cat >>confdefs.h <>confdefs.h <&5 + echo "$as_me:10203: checking if fast termcap-loader is needed" >&5 echo $ECHO_N "checking if fast termcap-loader is needed... $ECHO_C" >&6 # Check whether --enable-getcap or --disable-getcap was given. @@ -9872,14 +10210,14 @@ if test "${enable_getcap+set}" = set; then else with_getcap=no fi; - echo "$as_me:9875: result: $with_getcap" >&5 + echo "$as_me:10213: result: $with_getcap" >&5 echo "${ECHO_T}$with_getcap" >&6 test "x$with_getcap" = "xyes" && cat >>confdefs.h <<\EOF #define USE_GETCAP 1 EOF - echo "$as_me:9882: checking if translated termcaps will be cached in ~/.terminfo" >&5 + echo "$as_me:10220: checking if translated termcaps will be cached in ~/.terminfo" >&5 echo $ECHO_N "checking if translated termcaps will be cached in ~/.terminfo... $ECHO_C" >&6 # Check whether --enable-getcap-cache or --disable-getcap-cache was given. @@ -9889,7 +10227,7 @@ if test "${enable_getcap_cache+set}" = set; then else with_getcap_cache=no fi; - echo "$as_me:9892: result: $with_getcap_cache" >&5 + echo "$as_me:10230: result: $with_getcap_cache" >&5 echo "${ECHO_T}$with_getcap_cache" >&6 test "x$with_getcap_cache" = "xyes" && cat >>confdefs.h <<\EOF @@ -9899,7 +10237,7 @@ EOF fi ### Use option --disable-home-terminfo to completely remove ~/.terminfo -echo "$as_me:9902: checking if ~/.terminfo is wanted" >&5 +echo "$as_me:10240: checking if ~/.terminfo is wanted" >&5 echo $ECHO_N "checking if ~/.terminfo is wanted... $ECHO_C" >&6 # Check whether --enable-home-terminfo or --disable-home-terminfo was given. @@ -9909,14 +10247,14 @@ if test "${enable_home_terminfo+set}" = set; then else with_home_terminfo=yes fi; -echo "$as_me:9912: result: $with_home_terminfo" >&5 +echo "$as_me:10250: result: $with_home_terminfo" >&5 echo "${ECHO_T}$with_home_terminfo" >&6 test "x$with_home_terminfo" = "xyes" && cat >>confdefs.h <<\EOF #define USE_HOME_TERMINFO 1 EOF -echo "$as_me:9919: checking if you want to permit root to use ncurses environment variables" >&5 +echo "$as_me:10257: checking if you want to permit root to use ncurses environment variables" >&5 echo $ECHO_N "checking if you want to permit root to use ncurses environment variables... $ECHO_C" >&6 # Check whether --enable-root-environ or --disable-root-environ was given. @@ -9926,30 +10264,47 @@ if test "${enable_root_environ+set}" = set; then else with_root_environ=yes fi; -echo "$as_me:9929: result: $with_root_environ" >&5 +echo "$as_me:10267: result: $with_root_environ" >&5 echo "${ECHO_T}$with_root_environ" >&6 test "x$with_root_environ" = xyes && cat >>confdefs.h <<\EOF #define USE_ROOT_ENVIRON 1 EOF -echo "$as_me:9936: checking if you want to permit setuid programs to access all files" >&5 +echo "$as_me:10274: checking if you want to permit setuid programs to access all files" >&5 echo $ECHO_N "checking if you want to permit setuid programs to access all files... $ECHO_C" >&6 -# Check whether --enable-root-environ or --disable-root-environ was given. -if test "${enable_root_environ+set}" = set; then - enableval="$enable_root_environ" +# Check whether --enable-root-access or --disable-root-access was given. +if test "${enable_root_access+set}" = set; then + enableval="$enable_root_access" with_root_access=$enableval else with_root_access=yes fi; -echo "$as_me:9946: result: $with_root_access" >&5 +echo "$as_me:10284: result: $with_root_access" >&5 echo "${ECHO_T}$with_root_access" >&6 test "x$with_root_access" = xyes && cat >>confdefs.h <<\EOF #define USE_ROOT_ACCESS 1 EOF +echo "$as_me:10291: checking if you want to permit setuid use of ncurses environment variables" >&5 +echo $ECHO_N "checking if you want to permit setuid use of ncurses environment variables... $ECHO_C" >&6 + +# Check whether --enable-setuid-environ or --disable-setuid-environ was given. +if test "${enable_setuid_environ+set}" = set; then + enableval="$enable_setuid_environ" + with_setuid_environ=$enableval +else + with_setuid_environ=$with_root_environ +fi; +echo "$as_me:10301: result: $with_setuid_environ" >&5 +echo "${ECHO_T}$with_setuid_environ" >&6 +test "x$with_setuid_environ" = xyes && +cat >>confdefs.h <<\EOF +#define USE_SETUID_ENVIRON 1 +EOF + ### Use option --enable-symlinks to make tic use symlinks, not hard links ### to reduce storage requirements for the terminfo database. @@ -9958,23 +10313,23 @@ unistd.h \ do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:9961: checking for $ac_header" >&5 +echo "$as_me:10316: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 9967 "configure" +#line 10322 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:9971: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:10326: \"$ac_cpp "conftest.$ac_ext"\"") >&5 (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:9977: \$? = $ac_status" >&5 + echo "$as_me:10332: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -9993,7 +10348,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:9996: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:10351: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then cat >>confdefs.h <&5 +echo "$as_me:10366: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 10017 "configure" +#line 10372 "configure" #include "confdefs.h" #define $ac_func autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -10045,16 +10400,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:10048: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10403: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10051: \$? = $ac_status" >&5 + echo "$as_me:10406: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:10054: \"$ac_try\"") >&5 + { (eval echo "$as_me:10409: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10057: \$? = $ac_status" >&5 + echo "$as_me:10412: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then eval "$as_ac_var=yes" else @@ -10064,7 +10419,7 @@ eval "$as_ac_var=no" fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:10067: result: `eval echo '${'"$as_ac_var"'}'`" >&5 +echo "$as_me:10422: result: `eval echo '${'"$as_ac_var"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then cat >>confdefs.h <&5 +echo "$as_me:10439: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 10090 "configure" +#line 10445 "configure" #include "confdefs.h" #define $ac_func autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -10118,16 +10473,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:10121: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10476: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10124: \$? = $ac_status" >&5 + echo "$as_me:10479: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:10127: \"$ac_try\"") >&5 + { (eval echo "$as_me:10482: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10130: \$? = $ac_status" >&5 + echo "$as_me:10485: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then eval "$as_ac_var=yes" else @@ -10137,7 +10492,7 @@ eval "$as_ac_var=no" fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:10140: result: `eval echo '${'"$as_ac_var"'}'`" >&5 +echo "$as_me:10495: result: `eval echo '${'"$as_ac_var"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then cat >>confdefs.h <&5 + echo "$as_me:10506: checking if link/symlink functions work" >&5 echo $ECHO_N "checking if link/symlink functions work... $ECHO_C" >&6 if test "${cf_cv_link_funcs+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -10161,7 +10516,7 @@ else eval 'ac_cv_func_'$cf_func'=error' else cat >"conftest.$ac_ext" <<_ACEOF -#line 10164 "configure" +#line 10519 "configure" #include "confdefs.h" $ac_includes_default @@ -10169,11 +10524,11 @@ $ac_includes_default int main(void) { int fail = 0; - char *src = "conftest.tmp"; - char *dst = "conftest.chk"; + char src[] = "conftest.tmp"; + char dst[] = "conftest.chk"; struct stat src_sb, dst_sb; FILE *fp = fopen(src, "w"); - if (fp == 0) { fail = 3; } else { + if (fp == NULL) { fail = 3; } else { fclose(fp); stat(src, &src_sb); if ($cf_func(src, dst) < 0) { fail = 1; @@ -10195,15 +10550,15 @@ int main(void) _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:10198: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10553: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10201: \$? = $ac_status" >&5 + echo "$as_me:10556: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:10203: \"$ac_try\"") >&5 + { (eval echo "$as_me:10558: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10206: \$? = $ac_status" >&5 + echo "$as_me:10561: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_link_funcs="$cf_cv_link_funcs $cf_func" @@ -10221,7 +10576,7 @@ fi test -z "$cf_cv_link_funcs" && cf_cv_link_funcs=no fi -echo "$as_me:10224: result: $cf_cv_link_funcs" >&5 +echo "$as_me:10579: result: $cf_cv_link_funcs" >&5 echo "${ECHO_T}$cf_cv_link_funcs" >&6 test "$ac_cv_func_link" = yes && cat >>confdefs.h <<\EOF @@ -10241,7 +10596,7 @@ with_symlinks=no # soft links (symbolic links) are useful for some systems where hard links do # not work, or to make it simpler to copy terminfo trees around. if test "x$ac_cv_func_symlink" = xyes ; then - echo "$as_me:10244: checking if tic should use symbolic links" >&5 + echo "$as_me:10599: checking if tic should use symbolic links" >&5 echo $ECHO_N "checking if tic should use symbolic links... $ECHO_C" >&6 # Check whether --enable-symlinks or --disable-symlinks was given. @@ -10251,21 +10606,21 @@ if test "${enable_symlinks+set}" = set; then else with_symlinks=no fi; - echo "$as_me:10254: result: $with_symlinks" >&5 + echo "$as_me:10609: result: $with_symlinks" >&5 echo "${ECHO_T}$with_symlinks" >&6 fi # If we have hard links and did not choose to use soft links instead, there is # no reason to make this choice optional - use the hard links. if test "$with_symlinks" = no ; then - echo "$as_me:10261: checking if tic should use hard links" >&5 + echo "$as_me:10616: checking if tic should use hard links" >&5 echo $ECHO_N "checking if tic should use hard links... $ECHO_C" >&6 if test "x$ac_cv_func_link" = xyes ; then with_links=yes else with_links=no fi - echo "$as_me:10268: result: $with_links" >&5 + echo "$as_me:10623: result: $with_links" >&5 echo "${ECHO_T}$with_links" >&6 fi @@ -10281,7 +10636,7 @@ EOF ### use option --enable-broken-linker to force on use of broken-linker support -echo "$as_me:10284: checking if you want broken-linker support code" >&5 +echo "$as_me:10639: checking if you want broken-linker support code" >&5 echo $ECHO_N "checking if you want broken-linker support code... $ECHO_C" >&6 # Check whether --enable-broken_linker or --disable-broken_linker was given. @@ -10291,7 +10646,7 @@ if test "${enable_broken_linker+set}" = set; then else with_broken_linker=no fi; -echo "$as_me:10294: result: $with_broken_linker" >&5 +echo "$as_me:10649: result: $with_broken_linker" >&5 echo "${ECHO_T}$with_broken_linker" >&6 : "${BROKEN_LINKER:=0}" @@ -10305,7 +10660,7 @@ EOF fi ### use option --enable-bsdpad to have tputs process BSD-style prefix padding -echo "$as_me:10308: checking if tputs should process BSD-style prefix padding" >&5 +echo "$as_me:10663: checking if tputs should process BSD-style prefix padding" >&5 echo $ECHO_N "checking if tputs should process BSD-style prefix padding... $ECHO_C" >&6 # Check whether --enable-bsdpad or --disable-bsdpad was given. @@ -10315,7 +10670,7 @@ if test "${enable_bsdpad+set}" = set; then else with_bsdpad=no fi; -echo "$as_me:10318: result: $with_bsdpad" >&5 +echo "$as_me:10673: result: $with_bsdpad" >&5 echo "${ECHO_T}$with_bsdpad" >&6 test "x$with_bsdpad" = xyes && cat >>confdefs.h <<\EOF @@ -10334,14 +10689,14 @@ NCURSES_WINT_T=0 # Check to define _XOPEN_SOURCE "automatically" CPPFLAGS_before_XOPEN="$CPPFLAGS" -echo "$as_me:10337: checking if the POSIX test-macros are already defined" >&5 +echo "$as_me:10692: checking if the POSIX test-macros are already defined" >&5 echo $ECHO_N "checking if the POSIX test-macros are already defined... $ECHO_C" >&6 if test "${cf_cv_posix_visible+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 10344 "configure" +#line 10699 "configure" #include "confdefs.h" #include int @@ -10360,16 +10715,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:10363: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10718: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10366: \$? = $ac_status" >&5 + echo "$as_me:10721: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:10369: \"$ac_try\"") >&5 + { (eval echo "$as_me:10724: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10372: \$? = $ac_status" >&5 + echo "$as_me:10727: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_posix_visible=no else @@ -10380,7 +10735,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:10383: result: $cf_cv_posix_visible" >&5 +echo "$as_me:10738: result: $cf_cv_posix_visible" >&5 echo "${ECHO_T}$cf_cv_posix_visible" >&6 if test "$cf_cv_posix_visible" = no; then @@ -10418,18 +10773,18 @@ case "$host_os" in cf_xopen_source="-D_SGI_SOURCE" cf_XOPEN_SOURCE= ;; -(linux*gnu|linux*gnuabi64|linux*gnuabin32|linux*gnueabi|linux*gnueabihf|linux*gnux32|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys|mingw*) +(linux*gnu|linux*gnuabi64|linux*gnuabin32|linux*gnueabi|linux*gnueabihf|linux*gnux32|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys|mingw*|linux*uclibc) cf_gnu_xopen_source=$cf_XOPEN_SOURCE -echo "$as_me:10425: checking if this is the GNU C library" >&5 +echo "$as_me:10780: checking if this is the GNU C library" >&5 echo $ECHO_N "checking if this is the GNU C library... $ECHO_C" >&6 if test "${cf_cv_gnu_library+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 10432 "configure" +#line 10787 "configure" #include "confdefs.h" #include int @@ -10448,16 +10803,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:10451: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10806: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10454: \$? = $ac_status" >&5 + echo "$as_me:10809: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:10457: \"$ac_try\"") >&5 + { (eval echo "$as_me:10812: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10460: \$? = $ac_status" >&5 + echo "$as_me:10815: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_gnu_library=yes else @@ -10468,7 +10823,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:10471: result: $cf_cv_gnu_library" >&5 +echo "$as_me:10826: result: $cf_cv_gnu_library" >&5 echo "${ECHO_T}$cf_cv_gnu_library" >&6 if test x$cf_cv_gnu_library = xyes; then @@ -10476,7 +10831,7 @@ if test x$cf_cv_gnu_library = xyes; then # With glibc 2.19 (13 years after this check was begun), _DEFAULT_SOURCE # was changed to help a little. newlib incorporated the change about 4 # years later. - echo "$as_me:10479: checking if _DEFAULT_SOURCE can be used as a basis" >&5 + echo "$as_me:10834: checking if _DEFAULT_SOURCE can be used as a basis" >&5 echo $ECHO_N "checking if _DEFAULT_SOURCE can be used as a basis... $ECHO_C" >&6 if test "${cf_cv_gnu_library_219+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -10488,7 +10843,7 @@ else CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE" cat >"conftest.$ac_ext" <<_ACEOF -#line 10491 "configure" +#line 10846 "configure" #include "confdefs.h" #include int @@ -10507,16 +10862,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:10510: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10865: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10513: \$? = $ac_status" >&5 + echo "$as_me:10868: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:10516: \"$ac_try\"") >&5 + { (eval echo "$as_me:10871: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10519: \$? = $ac_status" >&5 + echo "$as_me:10874: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_gnu_library_219=yes else @@ -10528,12 +10883,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" CPPFLAGS="$cf_save" fi -echo "$as_me:10531: result: $cf_cv_gnu_library_219" >&5 +echo "$as_me:10886: result: $cf_cv_gnu_library_219" >&5 echo "${ECHO_T}$cf_cv_gnu_library_219" >&6 if test "x$cf_cv_gnu_library_219" = xyes; then cf_save="$CPPFLAGS" - echo "$as_me:10536: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5 + echo "$as_me:10891: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5 echo $ECHO_N "checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE... $ECHO_C" >&6 if test "${cf_cv_gnu_dftsrc_219+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -10638,7 +10993,7 @@ if test -n "$cf_new_extra_cppflags" ; then fi cat >"conftest.$ac_ext" <<_ACEOF -#line 10641 "configure" +#line 10996 "configure" #include "confdefs.h" #include @@ -10658,16 +11013,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:10661: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11016: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10664: \$? = $ac_status" >&5 + echo "$as_me:11019: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:10667: \"$ac_try\"") >&5 + { (eval echo "$as_me:11022: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10670: \$? = $ac_status" >&5 + echo "$as_me:11025: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_gnu_dftsrc_219=yes else @@ -10678,7 +11033,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:10681: result: $cf_cv_gnu_dftsrc_219" >&5 +echo "$as_me:11036: result: $cf_cv_gnu_dftsrc_219" >&5 echo "${ECHO_T}$cf_cv_gnu_dftsrc_219" >&6 test "x$cf_cv_gnu_dftsrc_219" = "xyes" || CPPFLAGS="$cf_save" else @@ -10687,14 +11042,14 @@ echo "${ECHO_T}$cf_cv_gnu_dftsrc_219" >&6 if test "x$cf_cv_gnu_dftsrc_219" != xyes; then - echo "$as_me:10690: checking if we must define _GNU_SOURCE" >&5 + echo "$as_me:11045: checking if we must define _GNU_SOURCE" >&5 echo $ECHO_N "checking if we must define _GNU_SOURCE... $ECHO_C" >&6 if test "${cf_cv_gnu_source+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 10697 "configure" +#line 11052 "configure" #include "confdefs.h" #include int @@ -10709,16 +11064,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:10712: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11067: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10715: \$? = $ac_status" >&5 + echo "$as_me:11070: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:10718: \"$ac_try\"") >&5 + { (eval echo "$as_me:11073: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10721: \$? = $ac_status" >&5 + echo "$as_me:11076: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_gnu_source=no else @@ -10825,7 +11180,7 @@ if test -n "$cf_new_extra_cppflags" ; then fi cat >"conftest.$ac_ext" <<_ACEOF -#line 10828 "configure" +#line 11183 "configure" #include "confdefs.h" #include int @@ -10840,16 +11195,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:10843: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11198: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10846: \$? = $ac_status" >&5 + echo "$as_me:11201: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:10849: \"$ac_try\"") >&5 + { (eval echo "$as_me:11204: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10852: \$? = $ac_status" >&5 + echo "$as_me:11207: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_gnu_source=no else @@ -10864,12 +11219,12 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:10867: result: $cf_cv_gnu_source" >&5 +echo "$as_me:11222: result: $cf_cv_gnu_source" >&5 echo "${ECHO_T}$cf_cv_gnu_source" >&6 if test "$cf_cv_gnu_source" = yes then - echo "$as_me:10872: checking if we should also define _DEFAULT_SOURCE" >&5 + echo "$as_me:11227: checking if we should also define _DEFAULT_SOURCE" >&5 echo $ECHO_N "checking if we should also define _DEFAULT_SOURCE... $ECHO_C" >&6 if test "${cf_cv_default_source+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -10879,7 +11234,7 @@ else CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE" cat >"conftest.$ac_ext" <<_ACEOF -#line 10882 "configure" +#line 11237 "configure" #include "confdefs.h" #include int @@ -10894,16 +11249,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:10897: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11252: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10900: \$? = $ac_status" >&5 + echo "$as_me:11255: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:10903: \"$ac_try\"") >&5 + { (eval echo "$as_me:11258: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10906: \$? = $ac_status" >&5 + echo "$as_me:11261: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_default_source=no else @@ -10914,7 +11269,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:10917: result: $cf_cv_default_source" >&5 +echo "$as_me:11272: result: $cf_cv_default_source" >&5 echo "${ECHO_T}$cf_cv_default_source" >&6 if test "$cf_cv_default_source" = yes then @@ -10928,6 +11283,9 @@ echo "${ECHO_T}$cf_cv_default_source" >&6 fi + ;; +linux*musl) + cf_xopen_source="-D_BSD_SOURCE" ;; (minix*) cf_xopen_source="-D_NETBSD_SOURCE" # POSIX.1-2001 features are ifdef'd with this... @@ -10951,16 +11309,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \ sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'` -echo "$as_me:10954: checking if we should define _POSIX_C_SOURCE" >&5 +echo "$as_me:11312: checking if we should define _POSIX_C_SOURCE" >&5 echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6 if test "${cf_cv_posix_c_source+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -echo "${as_me:-configure}:10960: testing if the symbol is already defined go no further ..." 1>&5 +echo "${as_me:-configure}:11318: testing if the symbol is already defined go no further ..." 1>&5 cat >"conftest.$ac_ext" <<_ACEOF -#line 10963 "configure" +#line 11321 "configure" #include "confdefs.h" #include int @@ -10975,16 +11333,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:10978: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11336: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10981: \$? = $ac_status" >&5 + echo "$as_me:11339: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:10984: \"$ac_try\"") >&5 + { (eval echo "$as_me:11342: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10987: \$? = $ac_status" >&5 + echo "$as_me:11345: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_posix_c_source=no else @@ -11005,7 +11363,7 @@ cf_want_posix_source=no esac if test "$cf_want_posix_source" = yes ; then cat >"conftest.$ac_ext" <<_ACEOF -#line 11008 "configure" +#line 11366 "configure" #include "confdefs.h" #include int @@ -11020,16 +11378,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:11023: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11381: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11026: \$? = $ac_status" >&5 + echo "$as_me:11384: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:11029: \"$ac_try\"") >&5 + { (eval echo "$as_me:11387: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11032: \$? = $ac_status" >&5 + echo "$as_me:11390: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -11040,7 +11398,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "${as_me:-configure}:11043: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 +echo "${as_me:-configure}:11401: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 CFLAGS="$cf_trim_CFLAGS" CPPFLAGS="$cf_trim_CPPFLAGS" @@ -11048,10 +11406,10 @@ echo "${as_me:-configure}:11043: testing ifdef from value $cf_POSIX_C_SOURCE ... test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source" -echo "${as_me:-configure}:11051: testing if the second compile does not leave our definition intact error ..." 1>&5 +echo "${as_me:-configure}:11409: testing if the second compile does not leave our definition intact error ..." 1>&5 cat >"conftest.$ac_ext" <<_ACEOF -#line 11054 "configure" +#line 11412 "configure" #include "confdefs.h" #include int @@ -11066,16 +11424,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:11069: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11427: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11072: \$? = $ac_status" >&5 + echo "$as_me:11430: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:11075: \"$ac_try\"") >&5 + { (eval echo "$as_me:11433: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11078: \$? = $ac_status" >&5 + echo "$as_me:11436: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -11091,7 +11449,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:11094: result: $cf_cv_posix_c_source" >&5 +echo "$as_me:11452: result: $cf_cv_posix_c_source" >&5 echo "${ECHO_T}$cf_cv_posix_c_source" >&6 if test "$cf_cv_posix_c_source" != no ; then @@ -11208,7 +11566,7 @@ fi # cf_cv_posix_visible # OpenBSD 6.x has broken locale support, both compile-time and runtime. # see https://www.mail-archive.com/bugs@openbsd.org/msg13200.html # Abusing the conformance level is a workaround. - { echo "$as_me:11211: WARNING: this system does not provide usable locale support" >&5 + { echo "$as_me:11569: WARNING: this system does not provide usable locale support" >&5 echo "$as_me: WARNING: this system does not provide usable locale support" >&2;} cf_xopen_source="-D_BSD_SOURCE" cf_XOPEN_SOURCE=700 @@ -11240,14 +11598,14 @@ echo "$as_me: WARNING: this system does not provide usable locale support" >&2;} ;; (*) -echo "$as_me:11243: checking if we should define _XOPEN_SOURCE" >&5 +echo "$as_me:11601: checking if we should define _XOPEN_SOURCE" >&5 echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6 if test "${cf_cv_xopen_source+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 11250 "configure" +#line 11608 "configure" #include "confdefs.h" $ac_includes_default @@ -11265,16 +11623,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:11268: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11626: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11271: \$? = $ac_status" >&5 + echo "$as_me:11629: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:11274: \"$ac_try\"") >&5 + { (eval echo "$as_me:11632: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11277: \$? = $ac_status" >&5 + echo "$as_me:11635: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_xopen_source=no else @@ -11286,7 +11644,7 @@ cf_save="$CPPFLAGS" CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" cat >"conftest.$ac_ext" <<_ACEOF -#line 11289 "configure" +#line 11647 "configure" #include "confdefs.h" $ac_includes_default @@ -11304,16 +11662,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:11307: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11665: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11310: \$? = $ac_status" >&5 + echo "$as_me:11668: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:11313: \"$ac_try\"") >&5 + { (eval echo "$as_me:11671: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11316: \$? = $ac_status" >&5 + echo "$as_me:11674: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_xopen_source=no else @@ -11328,7 +11686,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:11331: result: $cf_cv_xopen_source" >&5 +echo "$as_me:11689: result: $cf_cv_xopen_source" >&5 echo "${ECHO_T}$cf_cv_xopen_source" >&6 if test "$cf_cv_xopen_source" != no ; then @@ -11488,16 +11846,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \ sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'` -echo "$as_me:11491: checking if we should define _POSIX_C_SOURCE" >&5 +echo "$as_me:11849: checking if we should define _POSIX_C_SOURCE" >&5 echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6 if test "${cf_cv_posix_c_source+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -echo "${as_me:-configure}:11497: testing if the symbol is already defined go no further ..." 1>&5 +echo "${as_me:-configure}:11855: testing if the symbol is already defined go no further ..." 1>&5 cat >"conftest.$ac_ext" <<_ACEOF -#line 11500 "configure" +#line 11858 "configure" #include "confdefs.h" #include int @@ -11512,16 +11870,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:11515: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11873: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11518: \$? = $ac_status" >&5 + echo "$as_me:11876: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:11521: \"$ac_try\"") >&5 + { (eval echo "$as_me:11879: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11524: \$? = $ac_status" >&5 + echo "$as_me:11882: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_posix_c_source=no else @@ -11542,7 +11900,7 @@ cf_want_posix_source=no esac if test "$cf_want_posix_source" = yes ; then cat >"conftest.$ac_ext" <<_ACEOF -#line 11545 "configure" +#line 11903 "configure" #include "confdefs.h" #include int @@ -11557,16 +11915,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:11560: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11918: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11563: \$? = $ac_status" >&5 + echo "$as_me:11921: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:11566: \"$ac_try\"") >&5 + { (eval echo "$as_me:11924: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11569: \$? = $ac_status" >&5 + echo "$as_me:11927: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -11577,7 +11935,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "${as_me:-configure}:11580: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 +echo "${as_me:-configure}:11938: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 CFLAGS="$cf_trim_CFLAGS" CPPFLAGS="$cf_trim_CPPFLAGS" @@ -11585,10 +11943,10 @@ echo "${as_me:-configure}:11580: testing ifdef from value $cf_POSIX_C_SOURCE ... test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source" -echo "${as_me:-configure}:11588: testing if the second compile does not leave our definition intact error ..." 1>&5 +echo "${as_me:-configure}:11946: testing if the second compile does not leave our definition intact error ..." 1>&5 cat >"conftest.$ac_ext" <<_ACEOF -#line 11591 "configure" +#line 11949 "configure" #include "confdefs.h" #include int @@ -11603,16 +11961,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:11606: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11964: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11609: \$? = $ac_status" >&5 + echo "$as_me:11967: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:11612: \"$ac_try\"") >&5 + { (eval echo "$as_me:11970: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11615: \$? = $ac_status" >&5 + echo "$as_me:11973: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -11628,7 +11986,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:11631: result: $cf_cv_posix_c_source" >&5 +echo "$as_me:11989: result: $cf_cv_posix_c_source" >&5 echo "${ECHO_T}$cf_cv_posix_c_source" >&6 if test "$cf_cv_posix_c_source" != no ; then @@ -11738,13 +12096,13 @@ fi fi # cf_cv_posix_visible # Some of these niche implementations use copy/paste, double-check... - if test "$cf_cv_xopen_source" != no ; then - test -n "$verbose" && echo " checking if _POSIX_C_SOURCE inteferes" 1>&6 + if test "$cf_cv_xopen_source" = no ; then + test -n "$verbose" && echo " checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE" 1>&6 -echo "${as_me:-configure}:11744: testing checking if _POSIX_C_SOURCE inteferes ..." 1>&5 +echo "${as_me:-configure}:12102: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5 cat >"conftest.$ac_ext" <<_ACEOF -#line 11747 "configure" +#line 12105 "configure" #include "confdefs.h" $ac_includes_default @@ -11762,23 +12120,23 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:11765: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12123: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11768: \$? = $ac_status" >&5 + echo "$as_me:12126: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:11771: \"$ac_try\"") >&5 + { (eval echo "$as_me:12129: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11774: \$? = $ac_status" >&5 + echo "$as_me:12132: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 - { echo "$as_me:11781: WARNING: _POSIX_C_SOURCE definition is not usable" >&5 + { echo "$as_me:12139: WARNING: _POSIX_C_SOURCE definition is not usable" >&5 echo "$as_me: WARNING: _POSIX_C_SOURCE definition is not usable" >&2;} CPPFLAGS="$cf_save_xopen_cppflags" fi @@ -11801,7 +12159,7 @@ do test "$CFLAGS" != "$cf_old_cflag" || break test -n "$verbose" && echo " removing old option $cf_add_cflags from CFLAGS" 1>&6 -echo "${as_me:-configure}:11804: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5 +echo "${as_me:-configure}:12162: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5 CFLAGS="$cf_old_cflag" done @@ -11813,7 +12171,7 @@ do test "$CPPFLAGS" != "$cf_old_cflag" || break test -n "$verbose" && echo " removing old option $cf_add_cflags from CPPFLAGS" 1>&6 -echo "${as_me:-configure}:11816: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5 +echo "${as_me:-configure}:12174: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5 CPPFLAGS="$cf_old_cflag" done @@ -11901,7 +12259,7 @@ done if test -n "$cf_new_cflags" ; then test -n "$verbose" && echo " add to \$CFLAGS $cf_new_cflags" 1>&6 -echo "${as_me:-configure}:11904: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 +echo "${as_me:-configure}:12262: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 test -n "$CFLAGS" && CFLAGS="$CFLAGS " CFLAGS="${CFLAGS}$cf_new_cflags" @@ -11911,7 +12269,7 @@ fi if test -n "$cf_new_cppflags" ; then test -n "$verbose" && echo " add to \$CPPFLAGS $cf_new_cppflags" 1>&6 -echo "${as_me:-configure}:11914: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 +echo "${as_me:-configure}:12272: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" @@ -11921,7 +12279,7 @@ fi if test -n "$cf_new_extra_cppflags" ; then test -n "$verbose" && echo " add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6 -echo "${as_me:-configure}:11924: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 +echo "${as_me:-configure}:12282: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" @@ -11933,10 +12291,10 @@ done fi if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then - echo "$as_me:11936: checking if _XOPEN_SOURCE really is set" >&5 + echo "$as_me:12294: checking if _XOPEN_SOURCE really is set" >&5 echo $ECHO_N "checking if _XOPEN_SOURCE really is set... $ECHO_C" >&6 cat >"conftest.$ac_ext" <<_ACEOF -#line 11939 "configure" +#line 12297 "configure" #include "confdefs.h" #include int @@ -11951,16 +12309,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:11954: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12312: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11957: \$? = $ac_status" >&5 + echo "$as_me:12315: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:11960: \"$ac_try\"") >&5 + { (eval echo "$as_me:12318: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11963: \$? = $ac_status" >&5 + echo "$as_me:12321: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_XOPEN_SOURCE_set=yes else @@ -11969,12 +12327,12 @@ cat "conftest.$ac_ext" >&5 cf_XOPEN_SOURCE_set=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" - echo "$as_me:11972: result: $cf_XOPEN_SOURCE_set" >&5 + echo "$as_me:12330: result: $cf_XOPEN_SOURCE_set" >&5 echo "${ECHO_T}$cf_XOPEN_SOURCE_set" >&6 if test "$cf_XOPEN_SOURCE_set" = yes then cat >"conftest.$ac_ext" <<_ACEOF -#line 11977 "configure" +#line 12335 "configure" #include "confdefs.h" #include int @@ -11989,16 +12347,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:11992: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12350: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11995: \$? = $ac_status" >&5 + echo "$as_me:12353: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:11998: \"$ac_try\"") >&5 + { (eval echo "$as_me:12356: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12001: \$? = $ac_status" >&5 + echo "$as_me:12359: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_XOPEN_SOURCE_set_ok=yes else @@ -12009,19 +12367,19 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_XOPEN_SOURCE_set_ok" = no then - { echo "$as_me:12012: WARNING: _XOPEN_SOURCE is lower than requested" >&5 + { echo "$as_me:12370: WARNING: _XOPEN_SOURCE is lower than requested" >&5 echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;} fi else -echo "$as_me:12017: checking if we should define _XOPEN_SOURCE" >&5 +echo "$as_me:12375: checking if we should define _XOPEN_SOURCE" >&5 echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6 if test "${cf_cv_xopen_source+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 12024 "configure" +#line 12382 "configure" #include "confdefs.h" $ac_includes_default @@ -12039,16 +12397,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:12042: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12400: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12045: \$? = $ac_status" >&5 + echo "$as_me:12403: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:12048: \"$ac_try\"") >&5 + { (eval echo "$as_me:12406: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12051: \$? = $ac_status" >&5 + echo "$as_me:12409: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_xopen_source=no else @@ -12060,7 +12418,7 @@ cf_save="$CPPFLAGS" CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" cat >"conftest.$ac_ext" <<_ACEOF -#line 12063 "configure" +#line 12421 "configure" #include "confdefs.h" $ac_includes_default @@ -12078,16 +12436,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:12081: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12439: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12084: \$? = $ac_status" >&5 + echo "$as_me:12442: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:12087: \"$ac_try\"") >&5 + { (eval echo "$as_me:12445: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12090: \$? = $ac_status" >&5 + echo "$as_me:12448: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_xopen_source=no else @@ -12102,7 +12460,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:12105: result: $cf_cv_xopen_source" >&5 +echo "$as_me:12463: result: $cf_cv_xopen_source" >&5 echo "${ECHO_T}$cf_cv_xopen_source" >&6 if test "$cf_cv_xopen_source" != no ; then @@ -12253,14 +12611,14 @@ CPPFLAGS_after_XOPEN="$CPPFLAGS" # Work around breakage on OS X -echo "$as_me:12256: checking if SIGWINCH is defined" >&5 +echo "$as_me:12614: checking if SIGWINCH is defined" >&5 echo $ECHO_N "checking if SIGWINCH is defined... $ECHO_C" >&6 if test "${cf_cv_define_sigwinch+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 12263 "configure" +#line 12621 "configure" #include "confdefs.h" #include @@ -12275,23 +12633,23 @@ int x = SIGWINCH; (void)x } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:12278: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12636: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12281: \$? = $ac_status" >&5 + echo "$as_me:12639: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:12284: \"$ac_try\"") >&5 + { (eval echo "$as_me:12642: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12287: \$? = $ac_status" >&5 + echo "$as_me:12645: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_define_sigwinch=yes else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 cat >"conftest.$ac_ext" <<_ACEOF -#line 12294 "configure" +#line 12652 "configure" #include "confdefs.h" #undef _XOPEN_SOURCE @@ -12309,16 +12667,16 @@ int x = SIGWINCH; (void)x } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:12312: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12670: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12315: \$? = $ac_status" >&5 + echo "$as_me:12673: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:12318: \"$ac_try\"") >&5 + { (eval echo "$as_me:12676: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12321: \$? = $ac_status" >&5 + echo "$as_me:12679: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_define_sigwinch=maybe else @@ -12332,11 +12690,11 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:12335: result: $cf_cv_define_sigwinch" >&5 +echo "$as_me:12693: result: $cf_cv_define_sigwinch" >&5 echo "${ECHO_T}$cf_cv_define_sigwinch" >&6 if test "$cf_cv_define_sigwinch" = maybe ; then -echo "$as_me:12339: checking for actual SIGWINCH definition" >&5 +echo "$as_me:12697: checking for actual SIGWINCH definition" >&5 echo $ECHO_N "checking for actual SIGWINCH definition... $ECHO_C" >&6 if test "${cf_cv_fixup_sigwinch+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -12347,7 +12705,7 @@ cf_sigwinch=32 while test "$cf_sigwinch" != 1 do cat >"conftest.$ac_ext" <<_ACEOF -#line 12350 "configure" +#line 12708 "configure" #include "confdefs.h" #undef _XOPEN_SOURCE @@ -12369,16 +12727,16 @@ int x = SIGWINCH; (void)x } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:12372: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12730: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12375: \$? = $ac_status" >&5 + echo "$as_me:12733: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:12378: \"$ac_try\"") >&5 + { (eval echo "$as_me:12736: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12381: \$? = $ac_status" >&5 + echo "$as_me:12739: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_fixup_sigwinch=$cf_sigwinch break @@ -12392,7 +12750,7 @@ cf_sigwinch="`expr "$cf_sigwinch" - 1`" done fi -echo "$as_me:12395: result: $cf_cv_fixup_sigwinch" >&5 +echo "$as_me:12753: result: $cf_cv_fixup_sigwinch" >&5 echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6 if test "$cf_cv_fixup_sigwinch" != unknown ; then @@ -12402,13 +12760,13 @@ fi # Checks for CODESET support. -echo "$as_me:12405: checking for nl_langinfo and CODESET" >&5 +echo "$as_me:12763: checking for nl_langinfo and CODESET" >&5 echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6 if test "${am_cv_langinfo_codeset+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 12411 "configure" +#line 12769 "configure" #include "confdefs.h" $ac_includes_default @@ -12422,16 +12780,16 @@ char* cs = nl_langinfo(CODESET); (void)cs } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:12425: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12783: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12428: \$? = $ac_status" >&5 + echo "$as_me:12786: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:12431: \"$ac_try\"") >&5 + { (eval echo "$as_me:12789: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12434: \$? = $ac_status" >&5 + echo "$as_me:12792: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then am_cv_langinfo_codeset=yes else @@ -12442,7 +12800,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:12445: result: $am_cv_langinfo_codeset" >&5 +echo "$as_me:12803: result: $am_cv_langinfo_codeset" >&5 echo "${ECHO_T}$am_cv_langinfo_codeset" >&6 if test "$am_cv_langinfo_codeset" = yes; then @@ -12456,7 +12814,7 @@ EOF NCURSES_OK_WCHAR_T= NCURSES_OK_WINT_T= -echo "$as_me:12459: checking if you want wide-character code" >&5 +echo "$as_me:12817: checking if you want wide-character code" >&5 echo $ECHO_N "checking if you want wide-character code... $ECHO_C" >&6 # Check whether --enable-widec or --disable-widec was given. @@ -12464,9 +12822,9 @@ if test "${enable_widec+set}" = set; then enableval="$enable_widec" with_widec=$enableval else - with_widec=no + with_widec=$cf_dft_widec fi; -echo "$as_me:12469: result: $with_widec" >&5 +echo "$as_me:12827: result: $with_widec" >&5 echo "${ECHO_T}$with_widec" >&6 NCURSES_WCWIDTH_GRAPHICS=1 @@ -12488,7 +12846,7 @@ EOF (*_XOPEN_SOURCE=*) ;; (*) - { echo "$as_me:12491: WARNING: _XOPEN_SOURCE feature test macro appears to be predefined" >&5 + { echo "$as_me:12849: WARNING: _XOPEN_SOURCE feature test macro appears to be predefined" >&5 echo "$as_me: WARNING: _XOPEN_SOURCE feature test macro appears to be predefined" >&2;} # CPPFLAGS="$CPPFLAGS -DNCURSES_WIDECHAR" CPPFLAGS_after_XOPEN="$CPPFLAGS_after_XOPEN -DNCURSES_WIDECHAR" @@ -12501,23 +12859,23 @@ wctype.h \ do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:12504: checking for $ac_header" >&5 +echo "$as_me:12862: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 12510 "configure" +#line 12868 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:12514: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:12872: \"$ac_cpp "conftest.$ac_ext"\"") >&5 (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:12520: \$? = $ac_status" >&5 + echo "$as_me:12878: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -12536,7 +12894,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:12539: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:12897: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then cat >>confdefs.h <&5 +echo "$as_me:12907: checking if wchar.h can be used as is" >&5 echo $ECHO_N "checking if wchar.h can be used as is... $ECHO_C" >&6 if test "${cf_cv_wchar_h_okay+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 12556 "configure" +#line 12914 "configure" #include "confdefs.h" $ac_includes_default @@ -12569,22 +12927,22 @@ main (void) { wint_t foo = 0; - int bar = iswpunct(foo) + int bar = iswpunct(foo); (void) bar ; return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:12578: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12936: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12581: \$? = $ac_status" >&5 + echo "$as_me:12939: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:12584: \"$ac_try\"") >&5 + { (eval echo "$as_me:12942: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12587: \$? = $ac_status" >&5 + echo "$as_me:12945: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_wchar_h_okay=yes else @@ -12594,16 +12952,16 @@ cf_cv_wchar_h_okay=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:12597: result: $cf_cv_wchar_h_okay" >&5 +echo "$as_me:12955: result: $cf_cv_wchar_h_okay" >&5 echo "${ECHO_T}$cf_cv_wchar_h_okay" >&6 if test "$cf_cv_wchar_h_okay" = no then -echo "$as_me:12603: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5 +echo "$as_me:12961: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5 echo $ECHO_N "checking if we must define _XOPEN_SOURCE_EXTENDED... $ECHO_C" >&6 cat >"conftest.$ac_ext" <<_ACEOF -#line 12606 "configure" +#line 12964 "configure" #include "confdefs.h" #include @@ -12619,16 +12977,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:12622: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12980: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12625: \$? = $ac_status" >&5 + echo "$as_me:12983: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:12628: \"$ac_try\"") >&5 + { (eval echo "$as_me:12986: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12631: \$? = $ac_status" >&5 + echo "$as_me:12989: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_result=no else @@ -12637,16 +12995,16 @@ cat "conftest.$ac_ext" >&5 cf_result=yes fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" -echo "$as_me:12640: result: $cf_result" >&5 +echo "$as_me:12998: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" = yes ; then CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED" elif test "x" != "x" ; then - echo "$as_me:12646: checking checking for compatible value versus " >&5 + echo "$as_me:13004: checking checking for compatible value versus " >&5 echo $ECHO_N "checking checking for compatible value versus ... $ECHO_C" >&6 cat >"conftest.$ac_ext" <<_ACEOF -#line 12649 "configure" +#line 13007 "configure" #include "confdefs.h" #include @@ -12662,16 +13020,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:12665: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:13023: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12668: \$? = $ac_status" >&5 + echo "$as_me:13026: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:12671: \"$ac_try\"") >&5 + { (eval echo "$as_me:13029: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12674: \$? = $ac_status" >&5 + echo "$as_me:13032: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_result=yes else @@ -12680,7 +13038,7 @@ cat "conftest.$ac_ext" >&5 cf_result=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" - echo "$as_me:12683: result: $cf_result" >&5 + echo "$as_me:13041: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" = no ; then # perhaps we can override it - try... @@ -12690,7 +13048,7 @@ fi fi -echo "$as_me:12693: checking if wcwidth agrees graphics are single-width" >&5 +echo "$as_me:13051: checking if wcwidth agrees graphics are single-width" >&5 echo $ECHO_N "checking if wcwidth agrees graphics are single-width... $ECHO_C" >&6 if test "${cf_cv_wcwidth_graphics+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -12761,7 +13119,7 @@ if test "$cross_compiling" = yes; then cf_cv_wcwidth_graphics=unknown else cat >"conftest.$ac_ext" <<_ACEOF -#line 12764 "configure" +#line 13122 "configure" #include "confdefs.h" $ac_includes_default @@ -12775,7 +13133,7 @@ int main(void) { FILE *fp; - int value; + unsigned value; char buffer[MY_LEN + 1]; char notes[MY_LEN + 1]; int totals = 0; @@ -12785,15 +13143,15 @@ main(void) setlocale(LC_ALL, "en_US.UTF-8") || setlocale(LC_ALL, "en_US.utf8") || setlocale(LC_ALL, "en_US.utf-8")) { - if ((fp = fopen("conftest.in", "r")) != 0) { - while (fgets(buffer, MY_LEN, fp) != 0) { + if ((fp = fopen("conftest.in", "r")) != NULL) { + while (fgets(buffer, MY_LEN, fp) != NULL) { if (*buffer == '-') { fprintf(stderr, "\\t%s", buffer); } else if (sscanf(buffer, "%x %s", &value, notes) == 2) { ++totals; - if (wcwidth(value) == 1) + if (wcwidth((int)value) == 1) ++passed; - fprintf(stderr, "%d\\t%s", wcwidth(value), buffer); + fprintf(stderr, "%d\\t%s", wcwidth((int)value), buffer); } else { fprintf(stderr, "?\\t%s", buffer); } @@ -12806,15 +13164,15 @@ main(void) _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:12809: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13167: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12812: \$? = $ac_status" >&5 + echo "$as_me:13170: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:12814: \"$ac_try\"") >&5 + { (eval echo "$as_me:13172: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12817: \$? = $ac_status" >&5 + echo "$as_me:13175: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_wcwidth_graphics=yes else @@ -12827,7 +13185,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes fi fi -echo "$as_me:12830: result: $cf_cv_wcwidth_graphics" >&5 +echo "$as_me:13188: result: $cf_cv_wcwidth_graphics" >&5 echo "${ECHO_T}$cf_cv_wcwidth_graphics" >&6 test "$cf_cv_wcwidth_graphics" = no && NCURSES_WCWIDTH_GRAPHICS=0 @@ -12838,13 +13196,13 @@ echo "${ECHO_T}$cf_cv_wcwidth_graphics" >&6 for ac_func in putwc btowc wctob wmemchr mbtowc wctomb mblen mbrlen mbrtowc wcsrtombs mbsrtowcs wcstombs mbstowcs do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:12841: checking for $ac_func" >&5 +echo "$as_me:13199: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 12847 "configure" +#line 13205 "configure" #include "confdefs.h" #define $ac_func autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -12875,16 +13233,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:12878: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13236: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12881: \$? = $ac_status" >&5 + echo "$as_me:13239: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:12884: \"$ac_try\"") >&5 + { (eval echo "$as_me:13242: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12887: \$? = $ac_status" >&5 + echo "$as_me:13245: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then eval "$as_ac_var=yes" else @@ -12894,7 +13252,7 @@ eval "$as_ac_var=no" fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:12897: result: `eval echo '${'"$as_ac_var"'}'`" >&5 +echo "$as_me:13255: result: `eval echo '${'"$as_ac_var"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then cat >>confdefs.h <&5 +echo "$as_me:13270: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 12918 "configure" +#line 13276 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:12922: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:13280: \"$ac_cpp "conftest.$ac_ext"\"") >&5 (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:12928: \$? = $ac_status" >&5 + echo "$as_me:13286: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -12944,7 +13302,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:12947: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:13305: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then cat >>confdefs.h <&5 +echo "$as_me:13315: checking for multibyte character support" >&5 echo $ECHO_N "checking for multibyte character support... $ECHO_C" >&6 if test "${cf_cv_utf8_lib+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -12962,7 +13320,7 @@ else cf_save_LIBS="$LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 12965 "configure" +#line 13323 "configure" #include "confdefs.h" $ac_includes_default @@ -12979,16 +13337,16 @@ putwc(0,0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:12982: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13340: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12985: \$? = $ac_status" >&5 + echo "$as_me:13343: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:12988: \"$ac_try\"") >&5 + { (eval echo "$as_me:13346: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12991: \$? = $ac_status" >&5 + echo "$as_me:13349: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_utf8_lib=yes else @@ -13000,12 +13358,12 @@ cat "conftest.$ac_ext" >&5 cf_cv_header_path_utf8= cf_cv_library_path_utf8= -echo "${as_me:-configure}:13003: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5 +echo "${as_me:-configure}:13361: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5 cf_save_LIBS="$LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 13008 "configure" +#line 13366 "configure" #include "confdefs.h" #include @@ -13018,16 +13376,16 @@ putwc(0,0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:13021: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13379: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13024: \$? = $ac_status" >&5 + echo "$as_me:13382: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:13027: \"$ac_try\"") >&5 + { (eval echo "$as_me:13385: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13030: \$? = $ac_status" >&5 + echo "$as_me:13388: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_find_linkage_utf8=yes @@ -13041,7 +13399,7 @@ cat "conftest.$ac_ext" >&5 LIBS="-lutf8 $cf_save_LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 13044 "configure" +#line 13402 "configure" #include "confdefs.h" #include @@ -13054,16 +13412,16 @@ putwc(0,0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:13057: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13415: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13060: \$? = $ac_status" >&5 + echo "$as_me:13418: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:13063: \"$ac_try\"") >&5 + { (eval echo "$as_me:13421: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13066: \$? = $ac_status" >&5 + echo "$as_me:13424: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_find_linkage_utf8=yes @@ -13080,9 +13438,9 @@ cat "conftest.$ac_ext" >&5 test -n "$verbose" && echo " find linkage for utf8 library" 1>&6 -echo "${as_me:-configure}:13083: testing find linkage for utf8 library ..." 1>&5 +echo "${as_me:-configure}:13441: testing find linkage for utf8 library ..." 1>&5 -echo "${as_me:-configure}:13085: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5 +echo "${as_me:-configure}:13443: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5 cf_save_CPPFLAGS="$CPPFLAGS" cf_test_CPPFLAGS="$CPPFLAGS" @@ -13173,7 +13531,7 @@ cf_search="$cf_search $cf_header_path_list" if test -d "$cf_cv_header_path_utf8" ; then test -n "$verbose" && echo " ... testing $cf_cv_header_path_utf8" 1>&6 -echo "${as_me:-configure}:13176: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5 +echo "${as_me:-configure}:13534: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5 CPPFLAGS="$cf_save_CPPFLAGS" @@ -13181,7 +13539,7 @@ echo "${as_me:-configure}:13176: testing ... testing $cf_cv_header_path_utf8 ... CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8" cat >"conftest.$ac_ext" <<_ACEOF -#line 13184 "configure" +#line 13542 "configure" #include "confdefs.h" #include @@ -13194,21 +13552,21 @@ putwc(0,0); } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:13197: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:13555: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13200: \$? = $ac_status" >&5 + echo "$as_me:13558: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:13203: \"$ac_try\"") >&5 + { (eval echo "$as_me:13561: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13206: \$? = $ac_status" >&5 + echo "$as_me:13564: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then test -n "$verbose" && echo " ... found utf8 headers in $cf_cv_header_path_utf8" 1>&6 -echo "${as_me:-configure}:13211: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5 +echo "${as_me:-configure}:13569: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5 cf_cv_find_linkage_utf8=maybe cf_test_CPPFLAGS="$CPPFLAGS" @@ -13226,7 +13584,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_cv_find_linkage_utf8" = maybe ; then -echo "${as_me:-configure}:13229: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5 +echo "${as_me:-configure}:13587: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5 cf_save_LIBS="$LIBS" cf_save_LDFLAGS="$LDFLAGS" @@ -13301,13 +13659,13 @@ cf_search="$cf_library_path_list $cf_search" if test -d "$cf_cv_library_path_utf8" ; then test -n "$verbose" && echo " ... testing $cf_cv_library_path_utf8" 1>&6 -echo "${as_me:-configure}:13304: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5 +echo "${as_me:-configure}:13662: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5 CPPFLAGS="$cf_test_CPPFLAGS" LIBS="-lutf8 $cf_save_LIBS" LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_utf8" cat >"conftest.$ac_ext" <<_ACEOF -#line 13310 "configure" +#line 13668 "configure" #include "confdefs.h" #include @@ -13320,21 +13678,21 @@ putwc(0,0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:13323: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13681: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13326: \$? = $ac_status" >&5 + echo "$as_me:13684: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:13329: \"$ac_try\"") >&5 + { (eval echo "$as_me:13687: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13332: \$? = $ac_status" >&5 + echo "$as_me:13690: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then test -n "$verbose" && echo " ... found utf8 library in $cf_cv_library_path_utf8" 1>&6 -echo "${as_me:-configure}:13337: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5 +echo "${as_me:-configure}:13695: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5 cf_cv_find_linkage_utf8=yes cf_cv_library_file_utf8="-lutf8" @@ -13376,7 +13734,7 @@ fi fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:13379: result: $cf_cv_utf8_lib" >&5 +echo "$as_me:13737: result: $cf_cv_utf8_lib" >&5 echo "${ECHO_T}$cf_cv_utf8_lib" >&6 # HAVE_LIBUTF8_H is used by ncurses if curses.h is shared between @@ -13414,7 +13772,7 @@ if test -n "$cf_cv_header_path_utf8" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 13417 "configure" +#line 13775 "configure" #include "confdefs.h" #include int @@ -13426,16 +13784,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:13429: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:13787: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13432: \$? = $ac_status" >&5 + echo "$as_me:13790: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:13435: \"$ac_try\"") >&5 + { (eval echo "$as_me:13793: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13438: \$? = $ac_status" >&5 + echo "$as_me:13796: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -13452,7 +13810,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:13455: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:13813: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -13488,7 +13846,7 @@ if test -n "$cf_cv_library_path_utf8" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:13491: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:13849: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -13520,14 +13878,14 @@ fi fi # This is needed on Tru64 5.0 to declare mbstate_t -echo "$as_me:13523: checking if we must include wchar.h to declare mbstate_t" >&5 +echo "$as_me:13881: checking if we must include wchar.h to declare mbstate_t" >&5 echo $ECHO_N "checking if we must include wchar.h to declare mbstate_t... $ECHO_C" >&6 if test "${cf_cv_mbstate_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 13530 "configure" +#line 13888 "configure" #include "confdefs.h" #include @@ -13539,29 +13897,29 @@ cat >"conftest.$ac_ext" <<_ACEOF int main (void) { -mbstate_t state +mbstate_t state; (void)state ; return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:13548: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:13906: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13551: \$? = $ac_status" >&5 + echo "$as_me:13909: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:13554: \"$ac_try\"") >&5 + { (eval echo "$as_me:13912: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13557: \$? = $ac_status" >&5 + echo "$as_me:13915: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_mbstate_t=no else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 cat >"conftest.$ac_ext" <<_ACEOF -#line 13564 "configure" +#line 13922 "configure" #include "confdefs.h" #include @@ -13574,22 +13932,22 @@ cat >"conftest.$ac_ext" <<_ACEOF int main (void) { -mbstate_t value +mbstate_t value; (void) value ; return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:13583: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:13941: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13586: \$? = $ac_status" >&5 + echo "$as_me:13944: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:13589: \"$ac_try\"") >&5 + { (eval echo "$as_me:13947: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13592: \$? = $ac_status" >&5 + echo "$as_me:13950: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_mbstate_t=yes else @@ -13601,7 +13959,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:13604: result: $cf_cv_mbstate_t" >&5 +echo "$as_me:13962: result: $cf_cv_mbstate_t" >&5 echo "${ECHO_T}$cf_cv_mbstate_t" >&6 if test "$cf_cv_mbstate_t" = yes ; then @@ -13619,14 +13977,14 @@ if test "$cf_cv_mbstate_t" = unknown ; then fi # This is needed on Tru64 5.0 to declare wchar_t -echo "$as_me:13622: checking if we must include wchar.h to declare wchar_t" >&5 +echo "$as_me:13980: checking if we must include wchar.h to declare wchar_t" >&5 echo $ECHO_N "checking if we must include wchar.h to declare wchar_t... $ECHO_C" >&6 if test "${cf_cv_wchar_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 13629 "configure" +#line 13987 "configure" #include "confdefs.h" #include @@ -13638,29 +13996,29 @@ cat >"conftest.$ac_ext" <<_ACEOF int main (void) { -wchar_t state +wchar_t state; (void)state ; return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:13647: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14005: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13650: \$? = $ac_status" >&5 + echo "$as_me:14008: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:13653: \"$ac_try\"") >&5 + { (eval echo "$as_me:14011: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13656: \$? = $ac_status" >&5 + echo "$as_me:14014: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_wchar_t=no else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 cat >"conftest.$ac_ext" <<_ACEOF -#line 13663 "configure" +#line 14021 "configure" #include "confdefs.h" #include @@ -13673,22 +14031,22 @@ cat >"conftest.$ac_ext" <<_ACEOF int main (void) { -wchar_t value +wchar_t value; (void) value ; return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:13682: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14040: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13685: \$? = $ac_status" >&5 + echo "$as_me:14043: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:13688: \"$ac_try\"") >&5 + { (eval echo "$as_me:14046: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13691: \$? = $ac_status" >&5 + echo "$as_me:14049: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_wchar_t=yes else @@ -13700,7 +14058,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:13703: result: $cf_cv_wchar_t" >&5 +echo "$as_me:14061: result: $cf_cv_wchar_t" >&5 echo "${ECHO_T}$cf_cv_wchar_t" >&6 if test "$cf_cv_wchar_t" = yes ; then @@ -13723,14 +14081,14 @@ if test "$cf_cv_wchar_t" != unknown ; then fi # This is needed on Tru64 5.0 to declare wint_t -echo "$as_me:13726: checking if we must include wchar.h to declare wint_t" >&5 +echo "$as_me:14084: checking if we must include wchar.h to declare wint_t" >&5 echo $ECHO_N "checking if we must include wchar.h to declare wint_t... $ECHO_C" >&6 if test "${cf_cv_wint_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 13733 "configure" +#line 14091 "configure" #include "confdefs.h" #include @@ -13742,29 +14100,29 @@ cat >"conftest.$ac_ext" <<_ACEOF int main (void) { -wint_t state +wint_t state; (void)state ; return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:13751: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14109: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13754: \$? = $ac_status" >&5 + echo "$as_me:14112: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:13757: \"$ac_try\"") >&5 + { (eval echo "$as_me:14115: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13760: \$? = $ac_status" >&5 + echo "$as_me:14118: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_wint_t=no else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 cat >"conftest.$ac_ext" <<_ACEOF -#line 13767 "configure" +#line 14125 "configure" #include "confdefs.h" #include @@ -13777,22 +14135,22 @@ cat >"conftest.$ac_ext" <<_ACEOF int main (void) { -wint_t value +wint_t value; (void) value ; return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:13786: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14144: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13789: \$? = $ac_status" >&5 + echo "$as_me:14147: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:13792: \"$ac_try\"") >&5 + { (eval echo "$as_me:14150: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13795: \$? = $ac_status" >&5 + echo "$as_me:14153: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_wint_t=yes else @@ -13804,7 +14162,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:13807: result: $cf_cv_wint_t" >&5 +echo "$as_me:14165: result: $cf_cv_wint_t" >&5 echo "${ECHO_T}$cf_cv_wint_t" >&6 if test "$cf_cv_wint_t" = yes ; then @@ -13836,7 +14194,7 @@ EOF fi ### use option --disable-lp64 to allow long chtype -echo "$as_me:13839: checking whether to enable _LP64 definition in curses.h" >&5 +echo "$as_me:14197: checking whether to enable _LP64 definition in curses.h" >&5 echo $ECHO_N "checking whether to enable _LP64 definition in curses.h... $ECHO_C" >&6 # Check whether --enable-lp64 or --disable-lp64 was given. @@ -13846,7 +14204,7 @@ if test "${enable_lp64+set}" = set; then else with_lp64=$cf_dft_with_lp64 fi; -echo "$as_me:13849: result: $with_lp64" >&5 +echo "$as_me:14207: result: $with_lp64" >&5 echo "${ECHO_T}$with_lp64" >&6 if test "x$with_lp64" = xyes ; then @@ -13862,7 +14220,7 @@ if test "${enable_largefile+set}" = set; then fi; if test "$enable_largefile" != no; then - echo "$as_me:13865: checking for special C compiler options needed for large files" >&5 + echo "$as_me:14223: checking for special C compiler options needed for large files" >&5 echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6 if test "${ac_cv_sys_largefile_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -13874,7 +14232,7 @@ else # IRIX 6.2 and later do not support large files by default, # so use the C compiler's -n32 option if that helps. cat >"conftest.$ac_ext" <<_ACEOF -#line 13877 "configure" +#line 14235 "configure" #include "confdefs.h" #include /* Check that off_t can represent 2**63 - 1 correctly. @@ -13894,16 +14252,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:13897: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14255: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13900: \$? = $ac_status" >&5 + echo "$as_me:14258: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:13903: \"$ac_try\"") >&5 + { (eval echo "$as_me:14261: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13906: \$? = $ac_status" >&5 + echo "$as_me:14264: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then break else @@ -13913,16 +14271,16 @@ fi rm -f "conftest.$ac_objext" CC="$CC -n32" rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:13916: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14274: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13919: \$? = $ac_status" >&5 + echo "$as_me:14277: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:13922: \"$ac_try\"") >&5 + { (eval echo "$as_me:14280: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13925: \$? = $ac_status" >&5 + echo "$as_me:14283: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_sys_largefile_CC=' -n32'; break else @@ -13936,13 +14294,13 @@ rm -f "conftest.$ac_objext" rm -f "conftest.$ac_ext" fi fi -echo "$as_me:13939: result: $ac_cv_sys_largefile_CC" >&5 +echo "$as_me:14297: result: $ac_cv_sys_largefile_CC" >&5 echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6 if test "$ac_cv_sys_largefile_CC" != no; then CC=$CC$ac_cv_sys_largefile_CC fi - echo "$as_me:13945: checking for _FILE_OFFSET_BITS value needed for large files" >&5 + echo "$as_me:14303: checking for _FILE_OFFSET_BITS value needed for large files" >&5 echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6 if test "${ac_cv_sys_file_offset_bits+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -13950,7 +14308,7 @@ else while :; do ac_cv_sys_file_offset_bits=no cat >"conftest.$ac_ext" <<_ACEOF -#line 13953 "configure" +#line 14311 "configure" #include "confdefs.h" #include /* Check that off_t can represent 2**63 - 1 correctly. @@ -13970,16 +14328,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:13973: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14331: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13976: \$? = $ac_status" >&5 + echo "$as_me:14334: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:13979: \"$ac_try\"") >&5 + { (eval echo "$as_me:14337: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13982: \$? = $ac_status" >&5 + echo "$as_me:14340: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then break else @@ -13988,7 +14346,7 @@ cat "conftest.$ac_ext" >&5 fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" cat >"conftest.$ac_ext" <<_ACEOF -#line 13991 "configure" +#line 14349 "configure" #include "confdefs.h" #define _FILE_OFFSET_BITS 64 #include @@ -14009,16 +14367,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:14012: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14370: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14015: \$? = $ac_status" >&5 + echo "$as_me:14373: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:14018: \"$ac_try\"") >&5 + { (eval echo "$as_me:14376: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14021: \$? = $ac_status" >&5 + echo "$as_me:14379: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_sys_file_offset_bits=64; break else @@ -14029,7 +14387,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" break done fi -echo "$as_me:14032: result: $ac_cv_sys_file_offset_bits" >&5 +echo "$as_me:14390: result: $ac_cv_sys_file_offset_bits" >&5 echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6 if test "$ac_cv_sys_file_offset_bits" != no; then @@ -14039,7 +14397,7 @@ EOF fi rm -rf conftest* - echo "$as_me:14042: checking for _LARGE_FILES value needed for large files" >&5 + echo "$as_me:14400: checking for _LARGE_FILES value needed for large files" >&5 echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6 if test "${ac_cv_sys_large_files+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -14047,7 +14405,7 @@ else while :; do ac_cv_sys_large_files=no cat >"conftest.$ac_ext" <<_ACEOF -#line 14050 "configure" +#line 14408 "configure" #include "confdefs.h" #include /* Check that off_t can represent 2**63 - 1 correctly. @@ -14067,16 +14425,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:14070: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14428: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14073: \$? = $ac_status" >&5 + echo "$as_me:14431: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:14076: \"$ac_try\"") >&5 + { (eval echo "$as_me:14434: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14079: \$? = $ac_status" >&5 + echo "$as_me:14437: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then break else @@ -14085,7 +14443,7 @@ cat "conftest.$ac_ext" >&5 fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" cat >"conftest.$ac_ext" <<_ACEOF -#line 14088 "configure" +#line 14446 "configure" #include "confdefs.h" #define _LARGE_FILES 1 #include @@ -14106,16 +14464,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:14109: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14467: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14112: \$? = $ac_status" >&5 + echo "$as_me:14470: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:14115: \"$ac_try\"") >&5 + { (eval echo "$as_me:14473: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14118: \$? = $ac_status" >&5 + echo "$as_me:14476: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_sys_large_files=1; break else @@ -14126,7 +14484,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" break done fi -echo "$as_me:14129: result: $ac_cv_sys_large_files" >&5 +echo "$as_me:14487: result: $ac_cv_sys_large_files" >&5 echo "${ECHO_T}$ac_cv_sys_large_files" >&6 if test "$ac_cv_sys_large_files" != no; then @@ -14139,7 +14497,7 @@ rm -rf conftest* fi if test "$enable_largefile" != no ; then - echo "$as_me:14142: checking for _LARGEFILE_SOURCE value needed for large files" >&5 + echo "$as_me:14500: checking for _LARGEFILE_SOURCE value needed for large files" >&5 echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6 if test "${ac_cv_sys_largefile_source+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -14147,28 +14505,31 @@ else while :; do ac_cv_sys_largefile_source=no cat >"conftest.$ac_ext" <<_ACEOF -#line 14150 "configure" +#line 14508 "configure" #include "confdefs.h" #include + #include int main (void) { -return !fseeko; + + int (*my_fseeko)(FILE *, off_t, int) = fseeko; + return my_fseeko(stdin, 0, 0); ; return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:14162: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14523: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14165: \$? = $ac_status" >&5 + echo "$as_me:14526: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:14168: \"$ac_try\"") >&5 + { (eval echo "$as_me:14529: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14171: \$? = $ac_status" >&5 + echo "$as_me:14532: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then break else @@ -14177,29 +14538,32 @@ cat "conftest.$ac_ext" >&5 fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" cat >"conftest.$ac_ext" <<_ACEOF -#line 14180 "configure" +#line 14541 "configure" #include "confdefs.h" #define _LARGEFILE_SOURCE 1 #include + #include int main (void) { -return !fseeko; + + int (*my_fseeko)(FILE *, off_t, int) = fseeko; + return my_fseeko(stdin, 0, 0); ; return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:14193: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14557: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14196: \$? = $ac_status" >&5 + echo "$as_me:14560: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:14199: \"$ac_try\"") >&5 + { (eval echo "$as_me:14563: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14202: \$? = $ac_status" >&5 + echo "$as_me:14566: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_sys_largefile_source=1; break else @@ -14210,7 +14574,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" break done fi -echo "$as_me:14213: result: $ac_cv_sys_largefile_source" >&5 +echo "$as_me:14577: result: $ac_cv_sys_largefile_source" >&5 echo "${ECHO_T}$ac_cv_sys_largefile_source" >&6 if test "$ac_cv_sys_largefile_source" != no; then @@ -14224,34 +14588,36 @@ rm -rf conftest* # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug # in glibc 2.1.3, but that breaks too many other things. # If you want fseeko and ftello with glibc, upgrade to a fixed glibc. -echo "$as_me:14227: checking for fseeko" >&5 +echo "$as_me:14591: checking for fseeko" >&5 echo $ECHO_N "checking for fseeko... $ECHO_C" >&6 if test "${ac_cv_func_fseeko+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 14233 "configure" +#line 14597 "configure" #include "confdefs.h" #include + #include int main (void) { -return fseeko && fseeko (stdin, 0, 0); +int (*my_fseeko)(FILE *, off_t, int) = fseeko; + return my_fseeko && my_fseeko (stdin, 0, 0); ; return 0; } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:14245: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14611: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14248: \$? = $ac_status" >&5 + echo "$as_me:14614: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:14251: \"$ac_try\"") >&5 + { (eval echo "$as_me:14617: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14254: \$? = $ac_status" >&5 + echo "$as_me:14620: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_fseeko=yes else @@ -14261,7 +14627,7 @@ ac_cv_func_fseeko=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:14264: result: $ac_cv_func_fseeko" >&5 +echo "$as_me:14630: result: $ac_cv_func_fseeko" >&5 echo "${ECHO_T}$ac_cv_func_fseeko" >&6 if test $ac_cv_func_fseeko = yes; then @@ -14300,28 +14666,32 @@ fi fi - echo "$as_me:14303: checking whether to use struct dirent64" >&5 + echo "$as_me:14669: checking whether to use struct dirent64" >&5 echo $ECHO_N "checking whether to use struct dirent64... $ECHO_C" >&6 if test "${cf_cv_struct_dirent64+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 14310 "configure" +#line 14676 "configure" #include "confdefs.h" #pragma GCC diagnostic error "-Wincompatible-pointer-types" #include #include +#ifndef __REDIRECT +/* if transitional largefile support is setup, this is true */ +extern struct dirent64 * readdir(DIR *); +#endif + int main (void) { - /* if transitional largefile support is setup, this is true */ - extern struct dirent64 * readdir(DIR *); - struct dirent64 *x = readdir((DIR *)0); - struct dirent *y = readdir((DIR *)0); + DIR *dp = opendir("."); + struct dirent64 *x = readdir(dp); + struct dirent *y = readdir(dp); int z = x - y; (void)z; @@ -14330,16 +14700,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:14333: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14703: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14336: \$? = $ac_status" >&5 + echo "$as_me:14706: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:14339: \"$ac_try\"") >&5 + { (eval echo "$as_me:14709: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14342: \$? = $ac_status" >&5 + echo "$as_me:14712: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_struct_dirent64=yes else @@ -14350,7 +14720,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:14353: result: $cf_cv_struct_dirent64" >&5 +echo "$as_me:14723: result: $cf_cv_struct_dirent64" >&5 echo "${ECHO_T}$cf_cv_struct_dirent64" >&6 test "$cf_cv_struct_dirent64" = yes && cat >>confdefs.h <<\EOF @@ -14360,7 +14730,7 @@ EOF fi ### use option --disable-tparm-varargs to make tparm() conform to X/Open -echo "$as_me:14363: checking if you want tparm not to use X/Open fixed-parameter list" >&5 +echo "$as_me:14733: checking if you want tparm not to use X/Open fixed-parameter list" >&5 echo $ECHO_N "checking if you want tparm not to use X/Open fixed-parameter list... $ECHO_C" >&6 # Check whether --enable-tparm-varargs or --disable-tparm-varargs was given. @@ -14370,14 +14740,14 @@ if test "${enable_tparm_varargs+set}" = set; then else with_tparm_varargs=yes fi; -echo "$as_me:14373: result: $with_tparm_varargs" >&5 +echo "$as_me:14743: result: $with_tparm_varargs" >&5 echo "${ECHO_T}$with_tparm_varargs" >&6 NCURSES_TPARM_VARARGS=0 test "x$with_tparm_varargs" = xyes && NCURSES_TPARM_VARARGS=1 ### use option --disable-tic-depends to make libtic not explicitly depend on ncurses/ncursesw if test "$with_ticlib" != no ; then -echo "$as_me:14380: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5 +echo "$as_me:14750: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5 echo $ECHO_N "checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library... $ECHO_C" >&6 # Check whether --enable-tic-depends or --disable-tic-depends was given. @@ -14387,14 +14757,14 @@ if test "${enable_tic_depends+set}" = set; then else with_tic_depends=yes fi; -echo "$as_me:14390: result: $with_tic_depends" >&5 +echo "$as_me:14760: result: $with_tic_depends" >&5 echo "${ECHO_T}$with_tic_depends" >&6 else with_tic_depends=no fi ### use option --enable-wattr-macros to enable wattr* macros in curses.h -echo "$as_me:14397: checking if you want to enable wattr* macros" >&5 +echo "$as_me:14767: checking if you want to enable wattr* macros" >&5 echo $ECHO_N "checking if you want to enable wattr* macros... $ECHO_C" >&6 # Check whether --enable-wattr-macros or --disable-wattr-macros was given. @@ -14406,15 +14776,15 @@ else fi; if [ "x$with_wattr_macros" != xyes ]; then NCURSES_WATTR_MACROS=0 - echo "$as_me:14409: result: no" >&5 + echo "$as_me:14779: result: no" >&5 echo "${ECHO_T}no" >&6 else NCURSES_WATTR_MACROS=1 - echo "$as_me:14413: result: yes" >&5 + echo "$as_me:14783: result: yes" >&5 echo "${ECHO_T}yes" >&6 fi -echo "$as_me:14417: checking for X11 rgb file" >&5 +echo "$as_me:14787: checking for X11 rgb file" >&5 echo $ECHO_N "checking for X11 rgb file... $ECHO_C" >&6 # Check whether --with-x11-rgb or --without-x11-rgb was given. @@ -14459,26 +14829,24 @@ else cf_path_syntax="$ac_default_prefix" fi -case ".$cf_path" in -(.\$\(*\)*|.\'*\'*) +case "x$cf_path" in +(x\$\(*\)*|x\'*\'*) ;; -(..|./*|.\\*) +(x.|x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER) ;; -(.[a-zA-Z]:[\\/]*) # OS/2 EMX - ;; -(.\$\{*prefix\}*|.\$\{*dir\}*) +(x\$\{*prefix\}*|x\$\{*dir\}*) eval cf_path="$cf_path" - case ".$cf_path" in - (.NONE/*) + case "x$cf_path" in + (xNONE/*) cf_path=`echo "$cf_path" | sed -e s%NONE%$cf_path_syntax%` ;; esac ;; -(.no|.NONE/*) +(xno|xNONE/*) cf_path=`echo "$cf_path" | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { { echo "$as_me:14481: error: expected a pathname, not \"$cf_path\"" >&5 + { { echo "$as_me:14849: error: expected a pathname, not \"$cf_path\"" >&5 echo "$as_me: error: expected a pathname, not \"$cf_path\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -14486,7 +14854,7 @@ esac fi -echo "$as_me:14489: result: $RGB_PATH" >&5 +echo "$as_me:14857: result: $RGB_PATH" >&5 echo "${ECHO_T}$RGB_PATH" >&6 cat >>confdefs.h <&5 + +echo "$as_me:14872: checking for type of bool" >&5 echo $ECHO_N "checking for type of bool... $ECHO_C" >&6 # Check whether --with-bool or --without-bool was given. @@ -14510,10 +14879,17 @@ if test "${with_bool+set}" = set; then else NCURSES_BOOL=auto fi; -echo "$as_me:14513: result: $NCURSES_BOOL" >&5 +echo "$as_me:14882: result: $NCURSES_BOOL" >&5 echo "${ECHO_T}$NCURSES_BOOL" >&6 +case x$NCURSES_BOOL in +(x|xyes|xno) + { { echo "$as_me:14886: error: expected a type name for bool" >&5 +echo "$as_me: error: expected a type name for bool" >&2;} + { (exit 1); exit 1; }; } + ;; +esac -echo "$as_me:14516: checking for alternate terminal capabilities file" >&5 +echo "$as_me:14892: checking for alternate terminal capabilities file" >&5 echo $ECHO_N "checking for alternate terminal capabilities file... $ECHO_C" >&6 # Check whether --with-caps or --without-caps was given. @@ -14525,15 +14901,16 @@ else fi; if test ! -f "${srcdir}/include/${TERMINFO_CAPS}" then - { echo "$as_me:14528: WARNING: file not found: \"${srcdir}/include/${TERMINFO_CAPS}\"" >&5 + { echo "$as_me:14904: WARNING: file not found: \"${srcdir}/include/${TERMINFO_CAPS}\"" >&5 echo "$as_me: WARNING: file not found: \"${srcdir}/include/${TERMINFO_CAPS}\"" >&2;} TERMINFO_CAPS=Caps fi -echo "$as_me:14532: result: $TERMINFO_CAPS" >&5 +echo "$as_me:14908: result: $TERMINFO_CAPS" >&5 echo "${ECHO_T}$TERMINFO_CAPS" >&6 ### use option --with-chtype to override chtype's type -echo "$as_me:14536: checking for type of chtype" >&5 + +echo "$as_me:14913: checking for type of chtype" >&5 echo $ECHO_N "checking for type of chtype... $ECHO_C" >&6 # Check whether --with-chtype or --without-chtype was given. @@ -14543,11 +14920,19 @@ if test "${with_chtype+set}" = set; then else NCURSES_CHTYPE=$cf_dft_chtype fi; -echo "$as_me:14546: result: $NCURSES_CHTYPE" >&5 +echo "$as_me:14923: result: $NCURSES_CHTYPE" >&5 echo "${ECHO_T}$NCURSES_CHTYPE" >&6 +case x$NCURSES_CHTYPE in +(x|xyes|xno) + { { echo "$as_me:14927: error: expected a type name for chtype" >&5 +echo "$as_me: error: expected a type name for chtype" >&2;} + { (exit 1); exit 1; }; } + ;; +esac ### use option --with-ospeed to override ospeed's type -echo "$as_me:14550: checking for type of ospeed" >&5 + +echo "$as_me:14935: checking for type of ospeed" >&5 echo $ECHO_N "checking for type of ospeed... $ECHO_C" >&6 # Check whether --with-ospeed or --without-ospeed was given. @@ -14557,12 +14942,20 @@ if test "${with_ospeed+set}" = set; then else NCURSES_OSPEED=short fi; -echo "$as_me:14560: result: $NCURSES_OSPEED" >&5 +echo "$as_me:14945: result: $NCURSES_OSPEED" >&5 echo "${ECHO_T}$NCURSES_OSPEED" >&6 +case x$NCURSES_OSPEED in +(x|xyes|xno) + { { echo "$as_me:14949: error: expected a type name for ospeed" >&5 +echo "$as_me: error: expected a type name for ospeed" >&2;} + { (exit 1); exit 1; }; } + ;; +esac ### use option --with-mmask-t to override mmask_t's type -echo "$as_me:14564: checking for type of mmask_t" >&5 -echo $ECHO_N "checking for type of mmask_t... $ECHO_C" >&6 + +echo "$as_me:14957: checking for type of mmask-t" >&5 +echo $ECHO_N "checking for type of mmask-t... $ECHO_C" >&6 # Check whether --with-mmask-t or --without-mmask-t was given. if test "${with_mmask_t+set}" = set; then @@ -14571,11 +14964,18 @@ if test "${with_mmask_t+set}" = set; then else NCURSES_MMASK_T=$cf_dft_mmask_t fi; -echo "$as_me:14574: result: $NCURSES_MMASK_T" >&5 +echo "$as_me:14967: result: $NCURSES_MMASK_T" >&5 echo "${ECHO_T}$NCURSES_MMASK_T" >&6 +case x$NCURSES_MMASK_T in +(x|xyes|xno) + { { echo "$as_me:14971: error: expected a type name for mmask-t" >&5 +echo "$as_me: error: expected a type name for mmask-t" >&2;} + { (exit 1); exit 1; }; } + ;; +esac ### use option --with-ccharw-max to override CCHARW_MAX size -echo "$as_me:14578: checking for size CCHARW_MAX" >&5 +echo "$as_me:14978: checking for size CCHARW_MAX" >&5 echo $ECHO_N "checking for size CCHARW_MAX... $ECHO_C" >&6 # Check whether --with-ccharw-max or --without-ccharw-max was given. @@ -14585,16 +14985,16 @@ if test "${with_ccharw_max+set}" = set; then else NCURSES_CCHARW_MAX=$cf_dft_ccharw_max fi; -echo "$as_me:14588: result: $NCURSES_CCHARW_MAX" >&5 +echo "$as_me:14988: result: $NCURSES_CCHARW_MAX" >&5 echo "${ECHO_T}$NCURSES_CCHARW_MAX" >&6 -echo "$as_me:14591: checking for signed char" >&5 +echo "$as_me:14991: checking for signed char" >&5 echo $ECHO_N "checking for signed char... $ECHO_C" >&6 if test "${ac_cv_type_signed_char+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 14597 "configure" +#line 14997 "configure" #include "confdefs.h" $ac_includes_default int @@ -14609,16 +15009,16 @@ if (sizeof (signed char)) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:14612: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15012: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14615: \$? = $ac_status" >&5 + echo "$as_me:15015: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:14618: \"$ac_try\"") >&5 + { (eval echo "$as_me:15018: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14621: \$? = $ac_status" >&5 + echo "$as_me:15021: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_type_signed_char=yes else @@ -14628,10 +15028,10 @@ ac_cv_type_signed_char=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:14631: result: $ac_cv_type_signed_char" >&5 +echo "$as_me:15031: result: $ac_cv_type_signed_char" >&5 echo "${ECHO_T}$ac_cv_type_signed_char" >&6 -echo "$as_me:14634: checking size of signed char" >&5 +echo "$as_me:15034: checking size of signed char" >&5 echo $ECHO_N "checking size of signed char... $ECHO_C" >&6 if test "${ac_cv_sizeof_signed_char+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -14640,7 +15040,7 @@ else if test "$cross_compiling" = yes; then # Depending upon the size, compute the lo and hi bounds. cat >"conftest.$ac_ext" <<_ACEOF -#line 14643 "configure" +#line 15043 "configure" #include "confdefs.h" $ac_includes_default int @@ -14652,21 +15052,21 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= 0)] } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:14655: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15055: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14658: \$? = $ac_status" >&5 + echo "$as_me:15058: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:14661: \"$ac_try\"") >&5 + { (eval echo "$as_me:15061: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14664: \$? = $ac_status" >&5 + echo "$as_me:15064: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_lo=0 ac_mid=0 while :; do cat >"conftest.$ac_ext" <<_ACEOF -#line 14669 "configure" +#line 15069 "configure" #include "confdefs.h" $ac_includes_default int @@ -14678,16 +15078,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)] } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:14681: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15081: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14684: \$? = $ac_status" >&5 + echo "$as_me:15084: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:14687: \"$ac_try\"") >&5 + { (eval echo "$as_me:15087: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14690: \$? = $ac_status" >&5 + echo "$as_me:15090: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_hi=$ac_mid; break else @@ -14703,7 +15103,7 @@ cat "conftest.$ac_ext" >&5 ac_hi=-1 ac_mid=-1 while :; do cat >"conftest.$ac_ext" <<_ACEOF -#line 14706 "configure" +#line 15106 "configure" #include "confdefs.h" $ac_includes_default int @@ -14715,16 +15115,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= $ac_mid)] } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:14718: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15118: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14721: \$? = $ac_status" >&5 + echo "$as_me:15121: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:14724: \"$ac_try\"") >&5 + { (eval echo "$as_me:15124: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14727: \$? = $ac_status" >&5 + echo "$as_me:15127: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_lo=$ac_mid; break else @@ -14740,7 +15140,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" while test "x$ac_lo" != "x$ac_hi"; do ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"` cat >"conftest.$ac_ext" <<_ACEOF -#line 14743 "configure" +#line 15143 "configure" #include "confdefs.h" $ac_includes_default int @@ -14752,16 +15152,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)] } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:14755: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15155: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14758: \$? = $ac_status" >&5 + echo "$as_me:15158: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:14761: \"$ac_try\"") >&5 + { (eval echo "$as_me:15161: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14764: \$? = $ac_status" >&5 + echo "$as_me:15164: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_hi=$ac_mid else @@ -14774,12 +15174,12 @@ done ac_cv_sizeof_signed_char=$ac_lo else if test "$cross_compiling" = yes; then - { { echo "$as_me:14777: error: cannot run test program while cross compiling" >&5 + { { echo "$as_me:15177: error: cannot run test program while cross compiling" >&5 echo "$as_me: error: cannot run test program while cross compiling" >&2;} { (exit 1); exit 1; }; } else cat >"conftest.$ac_ext" <<_ACEOF -#line 14782 "configure" +#line 15182 "configure" #include "confdefs.h" $ac_includes_default int @@ -14795,15 +15195,15 @@ fclose (f); } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:14798: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15198: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14801: \$? = $ac_status" >&5 + echo "$as_me:15201: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:14803: \"$ac_try\"") >&5 + { (eval echo "$as_me:15203: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14806: \$? = $ac_status" >&5 + echo "$as_me:15206: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_sizeof_signed_char=`cat conftest.val` else @@ -14819,7 +15219,7 @@ else ac_cv_sizeof_signed_char=0 fi fi -echo "$as_me:14822: result: $ac_cv_sizeof_signed_char" >&5 +echo "$as_me:15222: result: $ac_cv_sizeof_signed_char" >&5 echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6 cat >>confdefs.h <&5 -echo $ECHO_N "checking if you want to use signed Boolean array in term.h... $ECHO_C" >&6 +echo "$as_me:15233: checking whether to use signed chars for Boolean array in term.h" >&5 +echo $ECHO_N "checking whether to use signed chars for Boolean array in term.h... $ECHO_C" >&6 # Check whether --enable-signed-char or --disable-signed-char was given. if test "${enable_signed_char+set}" = set; then @@ -14840,13 +15240,14 @@ if test "${enable_signed_char+set}" = set; then else with_signed_char=$cf_dft_signed_char fi; -echo "$as_me:14843: result: $with_signed_char" >&5 +echo "$as_me:15243: result: $with_signed_char" >&5 echo "${ECHO_T}$with_signed_char" >&6 test "x$with_signed_char" != xyes && NCURSES_SBOOL="char" ### use option --with-tparm-arg to override tparm's argument type -echo "$as_me:14848: checking for type of tparm args" >&5 -echo $ECHO_N "checking for type of tparm args... $ECHO_C" >&6 + +echo "$as_me:15249: checking for type of tparm-arg" >&5 +echo $ECHO_N "checking for type of tparm-arg... $ECHO_C" >&6 # Check whether --with-tparm-arg or --without-tparm-arg was given. if test "${with_tparm_arg+set}" = set; then @@ -14855,11 +15256,18 @@ if test "${with_tparm_arg+set}" = set; then else NCURSES_TPARM_ARG=$cf_dft_tparm_arg fi; -echo "$as_me:14858: result: $NCURSES_TPARM_ARG" >&5 +echo "$as_me:15259: result: $NCURSES_TPARM_ARG" >&5 echo "${ECHO_T}$NCURSES_TPARM_ARG" >&6 +case x$NCURSES_TPARM_ARG in +(x|xyes|xno) + { { echo "$as_me:15263: error: expected a type name for tparm-arg" >&5 +echo "$as_me: error: expected a type name for tparm-arg" >&2;} + { (exit 1); exit 1; }; } + ;; +esac ### Enable compiling-in rcs id's -echo "$as_me:14862: checking if RCS identifiers should be compiled-in" >&5 +echo "$as_me:15270: checking if RCS identifiers should be compiled-in" >&5 echo $ECHO_N "checking if RCS identifiers should be compiled-in... $ECHO_C" >&6 # Check whether --with-rcs-ids or --without-rcs-ids was given. @@ -14869,7 +15277,7 @@ if test "${with_rcs_ids+set}" = set; then else with_rcs_ids=no fi; -echo "$as_me:14872: result: $with_rcs_ids" >&5 +echo "$as_me:15280: result: $with_rcs_ids" >&5 echo "${ECHO_T}$with_rcs_ids" >&6 test "x$with_rcs_ids" = xyes && cat >>confdefs.h <<\EOF @@ -14878,7 +15286,7 @@ EOF ############################################################################### -echo "$as_me:14881: checking format of man-pages" >&5 +echo "$as_me:15289: checking format of man-pages" >&5 echo $ECHO_N "checking format of man-pages... $ECHO_C" >&6 # Check whether --with-manpage-format or --without-manpage-format was given. @@ -14969,10 +15377,10 @@ case "$MANPAGE_FORMAT" in ;; esac -echo "$as_me:14972: result: $MANPAGE_FORMAT" >&5 +echo "$as_me:15380: result: $MANPAGE_FORMAT" >&5 echo "${ECHO_T}$MANPAGE_FORMAT" >&6 if test -n "$cf_unknown" ; then - { echo "$as_me:14975: WARNING: Unexpected manpage-format $cf_unknown" >&5 + { echo "$as_me:15383: WARNING: Unexpected manpage-format $cf_unknown" >&5 echo "$as_me: WARNING: Unexpected manpage-format $cf_unknown" >&2;} fi @@ -14980,6 +15388,7 @@ cf_manpage_format=no cf_manpage_inboth=no cf_manpage_so_strip= cf_manpage_compress= +cf_manpage_coptions= for cf_item in $MANPAGE_FORMAT do @@ -14999,6 +15408,7 @@ case "$cf_item" in (gzip) cf_manpage_so_strip="gz" cf_manpage_compress=gzip + cf_manpage_coptions=-n ;; (bzip2) cf_manpage_so_strip="bz2" @@ -15011,7 +15421,7 @@ case "$cf_item" in esac done -echo "$as_me:15014: checking for manpage renaming" >&5 +echo "$as_me:15424: checking for manpage renaming" >&5 echo $ECHO_N "checking for manpage renaming... $ECHO_C" >&6 # Check whether --with-manpage-renames or --without-manpage-renames was given. @@ -15040,15 +15450,15 @@ if test "$MANPAGE_RENAMES" = man/man_db.renames ; then elif test "$MANPAGE_RENAMES" = no ; then : elif test ! -f "$MANPAGE_RENAMES" ; then - { { echo "$as_me:15043: error: not a filename: $MANPAGE_RENAMES" >&5 + { { echo "$as_me:15453: error: not a filename: $MANPAGE_RENAMES" >&5 echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:15048: result: $MANPAGE_RENAMES" >&5 +echo "$as_me:15458: result: $MANPAGE_RENAMES" >&5 echo "${ECHO_T}$MANPAGE_RENAMES" >&6 -echo "$as_me:15051: checking if manpage aliases will be installed" >&5 +echo "$as_me:15461: checking if manpage aliases will be installed" >&5 echo $ECHO_N "checking if manpage aliases will be installed... $ECHO_C" >&6 # Check whether --with-manpage-aliases or --without-manpage-aliases was given. @@ -15059,7 +15469,7 @@ else MANPAGE_ALIASES=yes fi; -echo "$as_me:15062: result: $MANPAGE_ALIASES" >&5 +echo "$as_me:15472: result: $MANPAGE_ALIASES" >&5 echo "${ECHO_T}$MANPAGE_ALIASES" >&6 case "x$LN_S" in @@ -15073,7 +15483,7 @@ esac MANPAGE_SYMLINKS=no if test "$MANPAGE_ALIASES" = yes ; then -echo "$as_me:15076: checking if manpage symlinks should be used" >&5 +echo "$as_me:15486: checking if manpage symlinks should be used" >&5 echo $ECHO_N "checking if manpage symlinks should be used... $ECHO_C" >&6 # Check whether --with-manpage-symlinks or --without-manpage-symlinks was given. @@ -15086,17 +15496,17 @@ fi; if test "$cf_use_symlinks" = no; then if test "$MANPAGE_SYMLINKS" = yes ; then - { echo "$as_me:15089: WARNING: cannot make symlinks" >&5 + { echo "$as_me:15499: WARNING: cannot make symlinks" >&5 echo "$as_me: WARNING: cannot make symlinks" >&2;} MANPAGE_SYMLINKS=no fi fi -echo "$as_me:15095: result: $MANPAGE_SYMLINKS" >&5 +echo "$as_me:15505: result: $MANPAGE_SYMLINKS" >&5 echo "${ECHO_T}$MANPAGE_SYMLINKS" >&6 fi -echo "$as_me:15099: checking for manpage tbl" >&5 +echo "$as_me:15509: checking for manpage tbl" >&5 echo $ECHO_N "checking for manpage tbl... $ECHO_C" >&6 # Check whether --with-manpage-tbl or --without-manpage-tbl was given. @@ -15107,7 +15517,7 @@ else MANPAGE_TBL=no fi; -echo "$as_me:15110: result: $MANPAGE_TBL" >&5 +echo "$as_me:15520: result: $MANPAGE_TBL" >&5 echo "${ECHO_T}$MANPAGE_TBL" >&6 if test "$prefix" = "NONE" ; then @@ -15135,6 +15545,7 @@ NCURSES_PATCH="$NCURSES_PATCH" NCURSES_OSPEED="$NCURSES_OSPEED" TERMINFO="$TERMINFO" +TERMINFO_DIRS="$TERMINFO_DIRS" INSTALL="$INSTALL" INSTALL_DATA="$INSTALL_DATA" @@ -15273,14 +15684,17 @@ CF_EOF if test "$with_overwrite" != yes ; then cat >>$cf_edit_man <\$TMP.out + sed -e "/\\#[ ]*include/s,\$TMP.out mv \$TMP.out \$TMP CF_EOF fi if test "$with_curses_h" != yes ; then cat >>$cf_edit_man <\$TMP.out + sed -e "/\\#[ ]*include/s,curses.h,ncurses.h," \ + < \$TMP >\$TMP.out mv \$TMP.out \$TMP CF_EOF fi @@ -15295,7 +15709,7 @@ CF_EOF if test -n "$cf_manpage_compress" ; then cat >>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <&5 +echo "$as_me:15841: checking if you want to build with function extensions" >&5 echo $ECHO_N "checking if you want to build with function extensions... $ECHO_C" >&6 # Check whether --enable-ext-funcs or --disable-ext-funcs was given. @@ -15424,7 +15848,7 @@ if test "${enable_ext_funcs+set}" = set; then else with_ext_funcs=yes fi; -echo "$as_me:15427: result: $with_ext_funcs" >&5 +echo "$as_me:15851: result: $with_ext_funcs" >&5 echo "${ECHO_T}$with_ext_funcs" >&6 if test "x$with_ext_funcs" = xyes ; then NCURSES_EXT_FUNCS=1 @@ -15461,10 +15885,6 @@ cat >>confdefs.h <<\EOF #define HAVE_USE_DEFAULT_COLORS 1 EOF -cat >>confdefs.h <<\EOF -#define HAVE_USE_EXTENDED_NAMES 1 -EOF - cat >>confdefs.h <<\EOF #define HAVE_USE_SCREEN 1 EOF @@ -15478,13 +15898,14 @@ cat >>confdefs.h <<\EOF EOF GENERATED_EXT_FUNCS=generated - test "x$with_ext_funcs" = xyes || cf_dft_ext_spfuncs=no else + cf_dft_ext_spfuncs=no + cf_dft_ext_colors=no NCURSES_EXT_FUNCS=0 GENERATED_EXT_FUNCS= fi -echo "$as_me:15487: checking if you want to build with SCREEN extensions" >&5 +echo "$as_me:15908: checking if you want to build with SCREEN extensions" >&5 echo $ECHO_N "checking if you want to build with SCREEN extensions... $ECHO_C" >&6 # Check whether --enable-sp-funcs or --disable-sp-funcs was given. @@ -15494,7 +15915,7 @@ if test "${enable_sp_funcs+set}" = set; then else with_sp_funcs=$cf_dft_ext_spfuncs fi; -echo "$as_me:15497: result: $with_sp_funcs" >&5 +echo "$as_me:15918: result: $with_sp_funcs" >&5 echo "${ECHO_T}$with_sp_funcs" >&6 if test "x$with_sp_funcs" = xyes ; then NCURSES_SP_FUNCS=1 @@ -15513,7 +15934,7 @@ else GENERATED_SP_FUNCS= fi -echo "$as_me:15516: checking if you want to build with terminal-driver" >&5 +echo "$as_me:15937: checking if you want to build with terminal-driver" >&5 echo $ECHO_N "checking if you want to build with terminal-driver... $ECHO_C" >&6 # Check whether --enable-term-driver or --disable-term-driver was given. @@ -15523,7 +15944,7 @@ if test "${enable_term_driver+set}" = set; then else with_term_driver=no fi; -echo "$as_me:15526: result: $with_term_driver" >&5 +echo "$as_me:15947: result: $with_term_driver" >&5 echo "${ECHO_T}$with_term_driver" >&6 if test "x$with_term_driver" = xyes ; then @@ -15532,19 +15953,19 @@ cat >>confdefs.h <<\EOF EOF if test "x$with_termlib" != xno ; then - { { echo "$as_me:15535: error: The term-driver option conflicts with the termlib option" >&5 + { { echo "$as_me:15956: error: The term-driver option conflicts with the termlib option" >&5 echo "$as_me: error: The term-driver option conflicts with the termlib option" >&2;} { (exit 1); exit 1; }; } fi if test "x$with_sp_funcs" != xyes ; then - { { echo "$as_me:15540: error: The term-driver option relies upon sp-funcs" >&5 + { { echo "$as_me:15961: error: The term-driver option relies upon sp-funcs" >&5 echo "$as_me: error: The term-driver option relies upon sp-funcs" >&2;} { (exit 1); exit 1; }; } fi fi ### use option --enable-const to turn on use of const beyond that in XSI. -echo "$as_me:15547: checking for extended use of const keyword" >&5 +echo "$as_me:15968: checking for extended use of const keyword" >&5 echo $ECHO_N "checking for extended use of const keyword... $ECHO_C" >&6 # Check whether --enable-const or --disable-const was given. @@ -15554,7 +15975,7 @@ if test "${enable_const+set}" = set; then else with_ext_const=$cf_dft_ext_const fi; -echo "$as_me:15557: result: $with_ext_const" >&5 +echo "$as_me:15978: result: $with_ext_const" >&5 echo "${ECHO_T}$with_ext_const" >&6 NCURSES_CONST='/*nothing*/' if test "x$with_ext_const" = xyes ; then @@ -15562,7 +15983,7 @@ if test "x$with_ext_const" = xyes ; then fi ### use option --enable-ext-colors to turn on use of colors beyond 16. -echo "$as_me:15565: checking if you want to use extended colors" >&5 +echo "$as_me:15986: checking if you want to use extended colors" >&5 echo $ECHO_N "checking if you want to use extended colors... $ECHO_C" >&6 # Check whether --enable-ext-colors or --disable-ext-colors was given. @@ -15572,12 +15993,12 @@ if test "${enable_ext_colors+set}" = set; then else with_ext_colors=$cf_dft_ext_colors fi; -echo "$as_me:15575: result: $with_ext_colors" >&5 +echo "$as_me:15996: result: $with_ext_colors" >&5 echo "${ECHO_T}$with_ext_colors" >&6 NCURSES_EXT_COLORS=0 if test "x$with_ext_colors" = xyes ; then if test "x$with_widec" != xyes ; then - { echo "$as_me:15580: WARNING: This option applies only to wide-character library" >&5 + { echo "$as_me:16001: WARNING: This option applies only to wide-character library" >&5 echo "$as_me: WARNING: This option applies only to wide-character library" >&2;} else # cannot be ABI 5 since it changes sizeof(cchar_t) @@ -15588,7 +16009,7 @@ if test "${with_abi_version+set}" != set; then cf_cv_rel_version=6.0 cf_cv_abi_version=6 cf_cv_abi_default=6 - { echo "$as_me:15591: WARNING: overriding ABI version to $cf_cv_abi_default" >&5 + { echo "$as_me:16012: WARNING: overriding ABI version to $cf_cv_abi_default" >&5 echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;} ;; esac @@ -15616,7 +16037,7 @@ EOF fi ### use option --enable-ext-mouse to modify coding to support 5-button mice -echo "$as_me:15619: checking if you want to use extended mouse encoding" >&5 +echo "$as_me:16040: checking if you want to use extended mouse encoding" >&5 echo $ECHO_N "checking if you want to use extended mouse encoding... $ECHO_C" >&6 # Check whether --enable-ext-mouse or --disable-ext-mouse was given. @@ -15626,7 +16047,7 @@ if test "${enable_ext_mouse+set}" = set; then else with_ext_mouse=$cf_dft_ext_mouse fi; -echo "$as_me:15629: result: $with_ext_mouse" >&5 +echo "$as_me:16050: result: $with_ext_mouse" >&5 echo "${ECHO_T}$with_ext_mouse" >&6 if test "x$with_ext_mouse" = xyes ; then @@ -15636,7 +16057,7 @@ if test "${with_abi_version+set}" != set; then cf_cv_rel_version=6.0 cf_cv_abi_version=6 cf_cv_abi_default=6 - { echo "$as_me:15639: WARNING: overriding ABI version to $cf_cv_abi_default" >&5 + { echo "$as_me:16060: WARNING: overriding ABI version to $cf_cv_abi_default" >&5 echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;} ;; esac @@ -15644,20 +16065,16 @@ fi fi -case $cf_cv_abi_default in -(5) +if test $cf_cv_abi_default -le 5 ; then NCURSES_MOUSE_VERSION=1 - ;; -(6) +elif test $cf_cv_abi_default -le 6 ; then NCURSES_MOUSE_VERSION=2 - ;; -([789]) +else NCURSES_MOUSE_VERSION=3 - ;; -esac +fi ### use option --enable-ext-putwin to turn on extended screendumps -echo "$as_me:15660: checking if you want to use extended putwin/screendump" >&5 +echo "$as_me:16077: checking if you want to use extended putwin/screendump" >&5 echo $ECHO_N "checking if you want to use extended putwin/screendump... $ECHO_C" >&6 # Check whether --enable-ext-putwin or --disable-ext-putwin was given. @@ -15667,7 +16084,7 @@ if test "${enable_ext_putwin+set}" = set; then else with_ext_putwin=$cf_dft_ext_putwin fi; -echo "$as_me:15670: result: $with_ext_putwin" >&5 +echo "$as_me:16087: result: $with_ext_putwin" >&5 echo "${ECHO_T}$with_ext_putwin" >&6 if test "x$with_ext_putwin" = xyes ; then @@ -15677,7 +16094,7 @@ EOF fi -echo "$as_me:15680: checking if you want \$NCURSES_NO_PADDING code" >&5 +echo "$as_me:16097: checking if you want \$NCURSES_NO_PADDING code" >&5 echo $ECHO_N "checking if you want \$NCURSES_NO_PADDING code... $ECHO_C" >&6 # Check whether --enable-no-padding or --disable-no-padding was given. @@ -15687,7 +16104,7 @@ if test "${enable_no_padding+set}" = set; then else with_no_padding=$with_ext_funcs fi; -echo "$as_me:15690: result: $with_no_padding" >&5 +echo "$as_me:16107: result: $with_no_padding" >&5 echo "${ECHO_T}$with_no_padding" >&6 test "x$with_no_padding" = xyes && cat >>confdefs.h <<\EOF @@ -15695,7 +16112,7 @@ cat >>confdefs.h <<\EOF EOF ### use option --enable-sigwinch to turn on use of SIGWINCH logic -echo "$as_me:15698: checking if you want SIGWINCH handler" >&5 +echo "$as_me:16115: checking if you want SIGWINCH handler" >&5 echo $ECHO_N "checking if you want SIGWINCH handler... $ECHO_C" >&6 # Check whether --enable-sigwinch or --disable-sigwinch was given. @@ -15705,15 +16122,22 @@ if test "${enable_sigwinch+set}" = set; then else with_sigwinch=$with_ext_funcs fi; -echo "$as_me:15708: result: $with_sigwinch" >&5 +echo "$as_me:16125: result: $with_sigwinch" >&5 echo "${ECHO_T}$with_sigwinch" >&6 -test "x$with_sigwinch" = xyes && +if test "x$with_sigwinch" = xyes +then + cat >>confdefs.h <<\EOF #define USE_SIGWINCH 1 EOF + cf_cv_enable_sigwinch=1 +else + cf_cv_enable_sigwinch=0 +fi + ### use option --enable-tcap-names to allow user to define new capabilities -echo "$as_me:15716: checking if you want user-definable terminal capabilities like termcap" >&5 +echo "$as_me:16140: checking if you want user-definable terminal capabilities like termcap" >&5 echo $ECHO_N "checking if you want user-definable terminal capabilities like termcap... $ECHO_C" >&6 # Check whether --enable-tcap-names or --disable-tcap-names was given. @@ -15723,14 +16147,21 @@ if test "${enable_tcap_names+set}" = set; then else with_tcap_names=$with_ext_funcs fi; -echo "$as_me:15726: result: $with_tcap_names" >&5 +echo "$as_me:16150: result: $with_tcap_names" >&5 echo "${ECHO_T}$with_tcap_names" >&6 NCURSES_XNAMES=0 -test "x$with_tcap_names" = xyes && NCURSES_XNAMES=1 +if test "x$with_tcap_names" = xyes; then + NCURSES_XNAMES=1 + +cat >>confdefs.h <<\EOF +#define NCURSES_XNAMES 1 +EOF + +fi ############################################################################## -echo "$as_me:15733: checking if you want to link with the pthread library" >&5 +echo "$as_me:16164: checking if you want to link with the pthread library" >&5 echo $ECHO_N "checking if you want to link with the pthread library... $ECHO_C" >&6 # Check whether --with-pthread or --without-pthread was given. @@ -15740,27 +16171,27 @@ if test "${with_pthread+set}" = set; then else with_pthread=no fi; -echo "$as_me:15743: result: $with_pthread" >&5 +echo "$as_me:16174: result: $with_pthread" >&5 echo "${ECHO_T}$with_pthread" >&6 if test "$with_pthread" != no ; then - echo "$as_me:15747: checking for pthread.h" >&5 + echo "$as_me:16178: checking for pthread.h" >&5 echo $ECHO_N "checking for pthread.h... $ECHO_C" >&6 if test "${ac_cv_header_pthread_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 15753 "configure" +#line 16184 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:15757: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:16188: \"$ac_cpp "conftest.$ac_ext"\"") >&5 (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:15763: \$? = $ac_status" >&5 + echo "$as_me:16194: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -15779,7 +16210,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:15782: result: $ac_cv_header_pthread_h" >&5 +echo "$as_me:16213: result: $ac_cv_header_pthread_h" >&5 echo "${ECHO_T}$ac_cv_header_pthread_h" >&6 if test "$ac_cv_header_pthread_h" = yes; then @@ -15789,7 +16220,7 @@ EOF for cf_lib_pthread in pthread c_r do - echo "$as_me:15792: checking if we can link with the $cf_lib_pthread library" >&5 + echo "$as_me:16223: checking if we can link with the $cf_lib_pthread library" >&5 echo $ECHO_N "checking if we can link with the $cf_lib_pthread library... $ECHO_C" >&6 cf_save_LIBS="$LIBS" @@ -15810,7 +16241,7 @@ done LIBS="$cf_add_libs" cat >"conftest.$ac_ext" <<_ACEOF -#line 15813 "configure" +#line 16244 "configure" #include "confdefs.h" #include @@ -15827,16 +16258,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:15830: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16261: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15833: \$? = $ac_status" >&5 + echo "$as_me:16264: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:15836: \"$ac_try\"") >&5 + { (eval echo "$as_me:16267: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15839: \$? = $ac_status" >&5 + echo "$as_me:16270: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then with_pthread=yes else @@ -15846,7 +16277,7 @@ with_pthread=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS="$cf_save_LIBS" - echo "$as_me:15849: result: $with_pthread" >&5 + echo "$as_me:16280: result: $with_pthread" >&5 echo "${ECHO_T}$with_pthread" >&6 test "$with_pthread" = yes && break done @@ -15874,7 +16305,7 @@ cat >>confdefs.h <<\EOF EOF else - { { echo "$as_me:15877: error: Cannot link with pthread library" >&5 + { { echo "$as_me:16308: error: Cannot link with pthread library" >&5 echo "$as_me: error: Cannot link with pthread library" >&2;} { (exit 1); exit 1; }; } fi @@ -15884,13 +16315,13 @@ fi fi if test "x$with_pthread" != xno; then - echo "$as_me:15887: checking for pthread_kill" >&5 + echo "$as_me:16318: checking for pthread_kill" >&5 echo $ECHO_N "checking for pthread_kill... $ECHO_C" >&6 if test "${ac_cv_func_pthread_kill+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 15893 "configure" +#line 16324 "configure" #include "confdefs.h" #define pthread_kill autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -15921,16 +16352,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:15924: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16355: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15927: \$? = $ac_status" >&5 + echo "$as_me:16358: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:15930: \"$ac_try\"") >&5 + { (eval echo "$as_me:16361: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15933: \$? = $ac_status" >&5 + echo "$as_me:16364: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_pthread_kill=yes else @@ -15940,11 +16371,11 @@ ac_cv_func_pthread_kill=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:15943: result: $ac_cv_func_pthread_kill" >&5 +echo "$as_me:16374: result: $ac_cv_func_pthread_kill" >&5 echo "${ECHO_T}$ac_cv_func_pthread_kill" >&6 if test "$ac_cv_func_pthread_kill" = yes; then - echo "$as_me:15947: checking if you want to allow EINTR in wgetch with pthreads" >&5 + echo "$as_me:16378: checking if you want to allow EINTR in wgetch with pthreads" >&5 echo $ECHO_N "checking if you want to allow EINTR in wgetch with pthreads... $ECHO_C" >&6 # Check whether --enable-pthreads-eintr or --disable-pthreads-eintr was given. @@ -15954,7 +16385,7 @@ if test "${enable_pthreads_eintr+set}" = set; then else use_pthreads_eintr=no fi; - echo "$as_me:15957: result: $use_pthreads_eintr" >&5 + echo "$as_me:16388: result: $use_pthreads_eintr" >&5 echo "${ECHO_T}$use_pthreads_eintr" >&6 if test "x$use_pthreads_eintr" = xyes ; then @@ -15965,7 +16396,7 @@ EOF fi fi - echo "$as_me:15968: checking if you want to use weak-symbols for pthreads" >&5 + echo "$as_me:16399: checking if you want to use weak-symbols for pthreads" >&5 echo $ECHO_N "checking if you want to use weak-symbols for pthreads... $ECHO_C" >&6 # Check whether --enable-weak-symbols or --disable-weak-symbols was given. @@ -15975,18 +16406,18 @@ if test "${enable_weak_symbols+set}" = set; then else use_weak_symbols=no fi; - echo "$as_me:15978: result: $use_weak_symbols" >&5 + echo "$as_me:16409: result: $use_weak_symbols" >&5 echo "${ECHO_T}$use_weak_symbols" >&6 if test "x$use_weak_symbols" = xyes ; then -echo "$as_me:15982: checking if $CC supports weak symbols" >&5 +echo "$as_me:16413: checking if $CC supports weak symbols" >&5 echo $ECHO_N "checking if $CC supports weak symbols... $ECHO_C" >&6 if test "${cf_cv_weak_symbols+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 15989 "configure" +#line 16420 "configure" #include "confdefs.h" #include @@ -16012,16 +16443,16 @@ weak_symbol(fopen); } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:16015: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16446: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16018: \$? = $ac_status" >&5 + echo "$as_me:16449: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:16021: \"$ac_try\"") >&5 + { (eval echo "$as_me:16452: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16024: \$? = $ac_status" >&5 + echo "$as_me:16455: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_weak_symbols=yes else @@ -16032,7 +16463,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:16035: result: $cf_cv_weak_symbols" >&5 +echo "$as_me:16466: result: $cf_cv_weak_symbols" >&5 echo "${ECHO_T}$cf_cv_weak_symbols" >&6 else @@ -16082,7 +16513,7 @@ fi # opaque outside of that, so there is no --enable-opaque option. We can use # this option without --with-pthreads, but this will be always set for # pthreads. -echo "$as_me:16085: checking if you want reentrant code" >&5 +echo "$as_me:16516: checking if you want reentrant code" >&5 echo $ECHO_N "checking if you want reentrant code... $ECHO_C" >&6 # Check whether --enable-reentrant or --disable-reentrant was given. @@ -16092,7 +16523,7 @@ if test "${enable_reentrant+set}" = set; then else with_reentrant=no fi; -echo "$as_me:16095: result: $with_reentrant" >&5 +echo "$as_me:16526: result: $with_reentrant" >&5 echo "${ECHO_T}$with_reentrant" >&6 if test "x$with_reentrant" = xyes ; then cf_cv_enable_reentrant=1 @@ -16181,7 +16612,7 @@ if test "${with_abi_version+set}" != set; then cf_cv_rel_version=6.0 cf_cv_abi_version=6 cf_cv_abi_default=6 - { echo "$as_me:16184: WARNING: overriding ABI version to $cf_cv_abi_default" >&5 + { echo "$as_me:16615: WARNING: overriding ABI version to $cf_cv_abi_default" >&5 echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_default" >&2;} ;; esac @@ -16193,15 +16624,15 @@ else NCURSES_SIZE_T=$cf_dft_ordinate_type fi -echo "$as_me:16196: checking if you want opaque curses-library structures" >&5 -echo $ECHO_N "checking if you want opaque curses-library structures... $ECHO_C" >&6 +echo "$as_me:16627: checking whether curses library structures should be opaque" >&5 +echo $ECHO_N "checking whether curses library structures should be opaque... $ECHO_C" >&6 # Check whether --enable-opaque-curses or --disable-opaque-curses was given. if test "${enable_opaque_curses+set}" = set; then enableval="$enable_opaque_curses" - test "$enableval" != yes && enableval=no - if test "$enableval" != "no" ; then - enable_opaque_curses=yes + test "$enableval" != no && enableval=yes + if test "$enableval" != "yes" ; then + enable_opaque_curses=no else test "$cf_cv_enable_reentrant" = 1 && enable_opaque_curses=yes @@ -16209,58 +16640,79 @@ if test "${enable_opaque_curses+set}" = set; then fi else - enableval=no + enableval=yes test "$cf_cv_enable_reentrant" = 1 && enable_opaque_curses=yes test "$cf_cv_enable_reentrant" = 1 || enable_opaque_curses=$cf_dft_opaque_curses fi; -echo "$as_me:16218: result: $enable_opaque_curses" >&5 +echo "$as_me:16649: result: $enable_opaque_curses" >&5 echo "${ECHO_T}$enable_opaque_curses" >&6 test "$cf_cv_enable_reentrant" = 1 && \ test "$enable_opaque_curses" = no && \ -{ { echo "$as_me:16223: error: reentrant configuration requires opaque library" >&5 +{ { echo "$as_me:16654: error: reentrant configuration requires opaque library" >&5 echo "$as_me: error: reentrant configuration requires opaque library" >&2;} { (exit 1); exit 1; }; } -echo "$as_me:16227: checking if you want opaque form-library structures" >&5 -echo $ECHO_N "checking if you want opaque form-library structures... $ECHO_C" >&6 +echo "$as_me:16658: checking whether form library structures should be opaque" >&5 +echo $ECHO_N "checking whether form library structures should be opaque... $ECHO_C" >&6 # Check whether --enable-opaque-form or --disable-opaque-form was given. if test "${enable_opaque_form+set}" = set; then enableval="$enable_opaque_form" - enable_opaque_form=yes + test "$enableval" != no && enableval=yes + if test "$enableval" != "yes" ; then + enable_opaque_form=no + else + enable_opaque_form=$cf_dft_opaque_curses + fi else - enable_opaque_form=no + enableval=yes + enable_opaque_form=$cf_dft_opaque_curses + fi; -echo "$as_me:16237: result: $enable_opaque_form" >&5 +echo "$as_me:16675: result: $enable_opaque_form" >&5 echo "${ECHO_T}$enable_opaque_form" >&6 -echo "$as_me:16240: checking if you want opaque menu-library structures" >&5 -echo $ECHO_N "checking if you want opaque menu-library structures... $ECHO_C" >&6 +echo "$as_me:16678: checking whether menu library structures should be opaque" >&5 +echo $ECHO_N "checking whether menu library structures should be opaque... $ECHO_C" >&6 # Check whether --enable-opaque-menu or --disable-opaque-menu was given. if test "${enable_opaque_menu+set}" = set; then enableval="$enable_opaque_menu" - enable_opaque_menu=yes + test "$enableval" != no && enableval=yes + if test "$enableval" != "yes" ; then + enable_opaque_menu=no + else + enable_opaque_menu=$cf_dft_opaque_curses + fi else - enable_opaque_menu=no + enableval=yes + enable_opaque_menu=$cf_dft_opaque_curses + fi; -echo "$as_me:16250: result: $enable_opaque_menu" >&5 +echo "$as_me:16695: result: $enable_opaque_menu" >&5 echo "${ECHO_T}$enable_opaque_menu" >&6 -echo "$as_me:16253: checking if you want opaque panel-library structures" >&5 -echo $ECHO_N "checking if you want opaque panel-library structures... $ECHO_C" >&6 +echo "$as_me:16698: checking whether panel library structures should be opaque" >&5 +echo $ECHO_N "checking whether panel library structures should be opaque... $ECHO_C" >&6 # Check whether --enable-opaque-panel or --disable-opaque-panel was given. if test "${enable_opaque_panel+set}" = set; then enableval="$enable_opaque_panel" - enable_opaque_panel=yes + test "$enableval" != no && enableval=yes + if test "$enableval" != "yes" ; then + enable_opaque_panel=no + else + enable_opaque_panel=$cf_dft_opaque_curses + fi else - enable_opaque_panel=no + enableval=yes + enable_opaque_panel=$cf_dft_opaque_curses + fi; -echo "$as_me:16263: result: $enable_opaque_panel" >&5 +echo "$as_me:16715: result: $enable_opaque_panel" >&5 echo "${ECHO_T}$enable_opaque_panel" >&6 NCURSES_OPAQUE=0; test "$enable_opaque_curses" = yes && NCURSES_OPAQUE=1 @@ -16270,7 +16722,7 @@ NCURSES_OPAQUE_PANEL=0; test "$enable_opaque_panel" = yes && NCURSES_OPAQUE_PAN ### Allow using a different wrap-prefix if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then - echo "$as_me:16273: checking for prefix used to wrap public variables" >&5 + echo "$as_me:16725: checking for prefix used to wrap public variables" >&5 echo $ECHO_N "checking for prefix used to wrap public variables... $ECHO_C" >&6 # Check whether --with-wrap-prefix or --without-wrap-prefix was given. @@ -16280,7 +16732,7 @@ if test "${with_wrap_prefix+set}" = set; then else NCURSES_WRAP_PREFIX=_nc_ fi; - echo "$as_me:16283: result: $NCURSES_WRAP_PREFIX" >&5 + echo "$as_me:16735: result: $NCURSES_WRAP_PREFIX" >&5 echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6 else NCURSES_WRAP_PREFIX=_nc_ @@ -16293,7 +16745,7 @@ EOF ############################################################################### # These options are relatively safe to experiment with. -echo "$as_me:16296: checking if you want all development code" >&5 +echo "$as_me:16748: checking if you want all development code" >&5 echo $ECHO_N "checking if you want all development code... $ECHO_C" >&6 # Check whether --with-develop or --without-develop was given. @@ -16303,11 +16755,29 @@ if test "${with_develop+set}" = set; then else with_develop=no fi; -echo "$as_me:16306: result: $with_develop" >&5 +echo "$as_me:16758: result: $with_develop" >&5 echo "${ECHO_T}$with_develop" >&6 +### use option --enable-check-size to detect screensize with CPR +echo "$as_me:16762: checking if you want to check screensize of serial terminals" >&5 +echo $ECHO_N "checking if you want to check screensize of serial terminals... $ECHO_C" >&6 + +# Check whether --enable-check-size or --disable-check-size was given. +if test "${enable_check_size+set}" = set; then + enableval="$enable_check_size" + +else + enable_check_size=$with_develop +fi; +echo "$as_me:16772: result: $enable_check_size" >&5 +echo "${ECHO_T}$enable_check_size" >&6 +test "x$enable_check_size" = xyes && +cat >>confdefs.h <<\EOF +#define USE_CHECK_SIZE 1 +EOF + ### use option --enable-hard-tabs to turn on use of hard-tabs optimize -echo "$as_me:16310: checking if you want hard-tabs code" >&5 +echo "$as_me:16780: checking if you want hard-tabs code" >&5 echo $ECHO_N "checking if you want hard-tabs code... $ECHO_C" >&6 # Check whether --enable-hard-tabs or --disable-hard-tabs was given. @@ -16317,7 +16787,7 @@ if test "${enable_hard_tabs+set}" = set; then else enable_hard_tabs=$with_develop fi; -echo "$as_me:16320: result: $enable_hard_tabs" >&5 +echo "$as_me:16790: result: $enable_hard_tabs" >&5 echo "${ECHO_T}$enable_hard_tabs" >&6 test "x$enable_hard_tabs" = xyes && cat >>confdefs.h <<\EOF @@ -16325,7 +16795,7 @@ cat >>confdefs.h <<\EOF EOF ### use option --enable-xmc-glitch to turn on use of magic-cookie optimize -echo "$as_me:16328: checking if you want limited support for xmc" >&5 +echo "$as_me:16798: checking if you want limited support for xmc" >&5 echo $ECHO_N "checking if you want limited support for xmc... $ECHO_C" >&6 # Check whether --enable-xmc-glitch or --disable-xmc-glitch was given. @@ -16335,7 +16805,7 @@ if test "${enable_xmc_glitch+set}" = set; then else enable_xmc_glitch=$with_develop fi; -echo "$as_me:16338: result: $enable_xmc_glitch" >&5 +echo "$as_me:16808: result: $enable_xmc_glitch" >&5 echo "${ECHO_T}$enable_xmc_glitch" >&6 test "x$enable_xmc_glitch" = xyes && cat >>confdefs.h <<\EOF @@ -16345,7 +16815,7 @@ EOF ############################################################################### # These are just experimental, probably should not be in a package: -echo "$as_me:16348: checking if you do not want to assume colors are white-on-black" >&5 +echo "$as_me:16818: checking if you do not want to assume colors are white-on-black" >&5 echo $ECHO_N "checking if you do not want to assume colors are white-on-black... $ECHO_C" >&6 # Check whether --enable-assumed-color or --disable-assumed-color was given. @@ -16355,7 +16825,7 @@ if test "${enable_assumed_color+set}" = set; then else with_assumed_color=yes fi; -echo "$as_me:16358: result: $with_assumed_color" >&5 +echo "$as_me:16828: result: $with_assumed_color" >&5 echo "${ECHO_T}$with_assumed_color" >&6 test "x$with_assumed_color" = xyes && cat >>confdefs.h <<\EOF @@ -16363,7 +16833,7 @@ cat >>confdefs.h <<\EOF EOF ### use option --enable-hashmap to turn on use of hashmap scrolling logic -echo "$as_me:16366: checking if you want hashmap scrolling-optimization code" >&5 +echo "$as_me:16836: checking if you want hashmap scrolling-optimization code" >&5 echo $ECHO_N "checking if you want hashmap scrolling-optimization code... $ECHO_C" >&6 # Check whether --enable-hashmap or --disable-hashmap was given. @@ -16373,7 +16843,7 @@ if test "${enable_hashmap+set}" = set; then else with_hashmap=yes fi; -echo "$as_me:16376: result: $with_hashmap" >&5 +echo "$as_me:16846: result: $with_hashmap" >&5 echo "${ECHO_T}$with_hashmap" >&6 test "x$with_hashmap" = xyes && cat >>confdefs.h <<\EOF @@ -16381,7 +16851,7 @@ cat >>confdefs.h <<\EOF EOF ### use option --enable-colorfgbg to turn on use of $COLORFGBG environment -echo "$as_me:16384: checking if you want colorfgbg code" >&5 +echo "$as_me:16854: checking if you want colorfgbg code" >&5 echo $ECHO_N "checking if you want colorfgbg code... $ECHO_C" >&6 # Check whether --enable-colorfgbg or --disable-colorfgbg was given. @@ -16391,7 +16861,7 @@ if test "${enable_colorfgbg+set}" = set; then else with_colorfgbg=no fi; -echo "$as_me:16394: result: $with_colorfgbg" >&5 +echo "$as_me:16864: result: $with_colorfgbg" >&5 echo "${ECHO_T}$with_colorfgbg" >&6 test "x$with_colorfgbg" = xyes && cat >>confdefs.h <<\EOF @@ -16399,7 +16869,7 @@ cat >>confdefs.h <<\EOF EOF ### use option --enable-fvisibility to turn on use of gcc-specific feature -echo "$as_me:16402: checking if you want to use gcc -fvisibility option" >&5 +echo "$as_me:16872: checking if you want to use gcc -fvisibility option" >&5 echo $ECHO_N "checking if you want to use gcc -fvisibility option... $ECHO_C" >&6 # Check whether --enable-fvisibility or --disable-fvisibility was given. @@ -16409,14 +16879,14 @@ if test "${enable_fvisibility+set}" = set; then else cf_with_fvisibility=no fi; -echo "$as_me:16412: result: $cf_with_fvisibility" >&5 +echo "$as_me:16882: result: $cf_with_fvisibility" >&5 echo "${ECHO_T}$cf_with_fvisibility" >&6 NCURSES_IMPEXP= NCURSES_CXX_IMPEXP= if test "x$cf_with_fvisibility" = xyes; then -echo "$as_me:16419: checking if $CC -fvisibility=hidden option works" >&5 +echo "$as_me:16889: checking if $CC -fvisibility=hidden option works" >&5 echo $ECHO_N "checking if $CC -fvisibility=hidden option works... $ECHO_C" >&6 if test "${cf_cv_fvisibility_hidden+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -16425,7 +16895,7 @@ else cf_save_cflags="$CFLAGS" CFLAGS="$CFLAGS -fvisibility=hidden" cat >"conftest.$ac_ext" <<_ACEOF -#line 16428 "configure" +#line 16898 "configure" #include "confdefs.h" __attribute__ ((visibility("default"))) int somefunc() {return 42;} @@ -16441,16 +16911,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:16444: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16914: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16447: \$? = $ac_status" >&5 + echo "$as_me:16917: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:16450: \"$ac_try\"") >&5 + { (eval echo "$as_me:16920: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16453: \$? = $ac_status" >&5 + echo "$as_me:16923: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_fvisibility_hidden=yes else @@ -16462,7 +16932,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" CFLAGS=$cf_save_cflags fi -echo "$as_me:16465: result: $cf_cv_fvisibility_hidden" >&5 +echo "$as_me:16935: result: $cf_cv_fvisibility_hidden" >&5 echo "${ECHO_T}$cf_cv_fvisibility_hidden" >&6 if test "x$cf_cv_fvisibility_hidden" = xyes @@ -16577,7 +17047,7 @@ ac_link='$CXX -o "conftest$ac_exeext" $CXXFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ac_main_return="return" -echo "$as_me:16580: checking if $CXX -fvisibility=hidden option works" >&5 +echo "$as_me:17050: checking if $CXX -fvisibility=hidden option works" >&5 echo $ECHO_N "checking if $CXX -fvisibility=hidden option works... $ECHO_C" >&6 if test "${cf_cv_fvisibility_hidden2+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -16586,7 +17056,7 @@ else cf_save_cflags="$CXXFLAGS" CXXFLAGS="$CXXFLAGS -fvisibility=hidden" cat >"conftest.$ac_ext" <<_ACEOF -#line 16589 "configure" +#line 17059 "configure" #include "confdefs.h" __attribute__ ((visibility("default"))) int somefunc() {return 42;} @@ -16602,16 +17072,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:16605: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17075: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16608: \$? = $ac_status" >&5 + echo "$as_me:17078: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:16611: \"$ac_try\"") >&5 + { (eval echo "$as_me:17081: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16614: \$? = $ac_status" >&5 + echo "$as_me:17084: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_fvisibility_hidden2=yes else @@ -16623,7 +17093,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" CXXFLAGS=$cf_save_cflags fi -echo "$as_me:16626: result: $cf_cv_fvisibility_hidden2" >&5 +echo "$as_me:17096: result: $cf_cv_fvisibility_hidden2" >&5 echo "${ECHO_T}$cf_cv_fvisibility_hidden2" >&6 if test "x$cf_cv_fvisibility_hidden2" = xyes @@ -16746,7 +17216,7 @@ ac_main_return="return" fi ### use option --enable-interop to turn on use of bindings used for interop -echo "$as_me:16749: checking if you want interop bindings" >&5 +echo "$as_me:17219: checking if you want interop bindings" >&5 echo $ECHO_N "checking if you want interop bindings... $ECHO_C" >&6 # Check whether --enable-interop or --disable-interop was given. @@ -16756,13 +17226,13 @@ if test "${enable_interop+set}" = set; then else with_exp_interop=$cf_dft_interop fi; -echo "$as_me:16759: result: $with_exp_interop" >&5 +echo "$as_me:17229: result: $with_exp_interop" >&5 echo "${ECHO_T}$with_exp_interop" >&6 NCURSES_INTEROP_FUNCS=0 test "x$with_exp_interop" = xyes && NCURSES_INTEROP_FUNCS=1 -echo "$as_me:16765: checking if you want experimental safe-sprintf code" >&5 +echo "$as_me:17235: checking if you want experimental safe-sprintf code" >&5 echo $ECHO_N "checking if you want experimental safe-sprintf code... $ECHO_C" >&6 # Check whether --enable-safe-sprintf or --disable-safe-sprintf was given. @@ -16772,13 +17242,13 @@ if test "${enable_safe_sprintf+set}" = set; then else with_safe_sprintf=no fi; -echo "$as_me:16775: result: $with_safe_sprintf" >&5 +echo "$as_me:17245: result: $with_safe_sprintf" >&5 echo "${ECHO_T}$with_safe_sprintf" >&6 ### use option --disable-scroll-hints to turn off use of scroll-hints scrolling logic # when hashmap is used scroll hints are useless if test "$with_hashmap" = no ; then -echo "$as_me:16781: checking if you want to experiment without scrolling-hints code" >&5 +echo "$as_me:17251: checking if you want to experiment without scrolling-hints code" >&5 echo $ECHO_N "checking if you want to experiment without scrolling-hints code... $ECHO_C" >&6 # Check whether --enable-scroll-hints or --disable-scroll-hints was given. @@ -16788,7 +17258,7 @@ if test "${enable_scroll_hints+set}" = set; then else with_scroll_hints=yes fi; -echo "$as_me:16791: result: $with_scroll_hints" >&5 +echo "$as_me:17261: result: $with_scroll_hints" >&5 echo "${ECHO_T}$with_scroll_hints" >&6 test "x$with_scroll_hints" = xyes && cat >>confdefs.h <<\EOF @@ -16797,7 +17267,7 @@ EOF fi -echo "$as_me:16800: checking if you want wgetch-events code" >&5 +echo "$as_me:17270: checking if you want wgetch-events code" >&5 echo $ECHO_N "checking if you want wgetch-events code... $ECHO_C" >&6 # Check whether --enable-wgetch-events or --disable-wgetch-events was given. @@ -16807,7 +17277,7 @@ if test "${enable_wgetch_events+set}" = set; then else with_wgetch_events=no fi; -echo "$as_me:16810: result: $with_wgetch_events" >&5 +echo "$as_me:17280: result: $with_wgetch_events" >&5 echo "${ECHO_T}$with_wgetch_events" >&6 if test "x$with_wgetch_events" = xyes ; then @@ -16822,7 +17292,7 @@ fi case "$cf_cv_system_name" in (*mingw32*|*mingw64*|*-msvc*) - echo "$as_me:16825: checking if you want experimental-Windows driver" >&5 + echo "$as_me:17295: checking if you want experimental-Windows driver" >&5 echo $ECHO_N "checking if you want experimental-Windows driver... $ECHO_C" >&6 # Check whether --enable-exp-win32 or --disable-exp-win32 was given. @@ -16832,7 +17302,7 @@ if test "${enable_exp_win32+set}" = set; then else with_exp_win32=no fi; - echo "$as_me:16835: result: $with_exp_win32" >&5 + echo "$as_me:17305: result: $with_exp_win32" >&5 echo "${ECHO_T}$with_exp_win32" >&6 if test "x$with_exp_win32" = xyes then @@ -16858,7 +17328,7 @@ esac ### use option --disable-echo to suppress full display compiling commands -echo "$as_me:16861: checking if you want to see long compiling messages" >&5 +echo "$as_me:17331: checking if you want to see long compiling messages" >&5 echo $ECHO_N "checking if you want to see long compiling messages... $ECHO_C" >&6 # Check whether --enable-echo or --disable-echo was given. @@ -16892,7 +17362,7 @@ else ECHO_CC='' fi; -echo "$as_me:16895: result: $enableval" >&5 +echo "$as_me:17365: result: $enableval" >&5 echo "${ECHO_T}$enableval" >&6 if test "x$enable_echo" = xyes; then @@ -16905,7 +17375,7 @@ fi # --disable-stripping is used for debugging -echo "$as_me:16908: checking if you want to install stripped executables" >&5 +echo "$as_me:17378: checking if you want to install stripped executables" >&5 echo $ECHO_N "checking if you want to install stripped executables... $ECHO_C" >&6 # Check whether --enable-stripping or --disable-stripping was given. @@ -16922,7 +17392,7 @@ else enable_stripping=yes fi; -echo "$as_me:16925: result: $enable_stripping" >&5 +echo "$as_me:17395: result: $enable_stripping" >&5 echo "${ECHO_T}$enable_stripping" >&6 if test "$enable_stripping" = yes @@ -16933,7 +17403,7 @@ else fi : "${INSTALL:=install}" -echo "$as_me:16936: checking if install accepts -p option" >&5 +echo "$as_me:17406: checking if install accepts -p option" >&5 echo $ECHO_N "checking if install accepts -p option... $ECHO_C" >&6 if test "${cf_cv_install_p+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -16964,10 +17434,10 @@ else rm -rf ./conftest* fi -echo "$as_me:16967: result: $cf_cv_install_p" >&5 +echo "$as_me:17437: result: $cf_cv_install_p" >&5 echo "${ECHO_T}$cf_cv_install_p" >&6 -echo "$as_me:16970: checking if install needs to be told about ownership" >&5 +echo "$as_me:17440: checking if install needs to be told about ownership" >&5 echo $ECHO_N "checking if install needs to be told about ownership... $ECHO_C" >&6 case `$ac_config_guess` in (*minix) @@ -16978,7 +17448,7 @@ case `$ac_config_guess` in ;; esac -echo "$as_me:16981: result: $with_install_o" >&5 +echo "$as_me:17451: result: $with_install_o" >&5 echo "${ECHO_T}$with_install_o" >&6 if test "x$with_install_o" = xyes then @@ -16987,6 +17457,72 @@ else INSTALL_OPT_O= fi +if test -n "$INSTALL_OPT_S" +then + echo "$as_me:17462: checking if you want to specify strip-program" >&5 +echo $ECHO_N "checking if you want to specify strip-program... $ECHO_C" >&6 + +# Check whether --with-strip-program or --without-strip-program was given. +if test "${with_strip_program+set}" = set; then + withval="$with_strip_program" + with_strip_program=$withval +else + with_strip_program=no +fi; + echo "$as_me:17472: result: $with_strip_program" >&5 +echo "${ECHO_T}$with_strip_program" >&6 + if test "$with_strip_program" != no + then + echo "$as_me:17476: checking if strip-program is supported with this installer" >&5 +echo $ECHO_N "checking if strip-program is supported with this installer... $ECHO_C" >&6 + cf_install_program=`echo "$INSTALL" | sed -e 's%[ ]*[ ]-.%%'` + check_install_strip=no + if test -f "$cf_install_program" + then + check_install_version=`"$cf_install_program" --version 2>/dev/null | head -n 1 | grep coreutils` + if test -n "$check_install_version" + then + check_install_strip="option" + else + for check_strip_variable in STRIPBIN STRIP + do + if strings "$cf_install_program" | grep "^$check_strip_variable$" >/dev/null + then + check_install_strip="environ" + break + fi + done + fi + fi + echo "$as_me:17497: result: $check_install_strip" >&5 +echo "${ECHO_T}$check_install_strip" >&6 + case "$check_install_strip" in + (no) + { echo "$as_me:17501: WARNING: $cf_install_program does not support strip program option" >&5 +echo "$as_me: WARNING: $cf_install_program does not support strip program option" >&2;} + with_strip_program=no + ;; + (environ) + cat >install.tmp <<-CF_EOF + #! $SHELL + STRIPBIN="$with_strip_program" \\ + STRIP="$with_strip_program" \\ + $INSTALL "$@" + CF_EOF + INSTALL="`pwd`/install.tmp" + chmod +x "$INSTALL" + test -n "$verbose" && echo " created $INSTALL" 1>&6 + +echo "${as_me:-configure}:17516: testing created $INSTALL ..." 1>&5 + + ;; + (option) + INSTALL_OPT_S="$INSTALL_OPT_S --strip-program=\"$with_strip_program\"" + ;; + esac + fi +fi + # If we're avoiding relinking of shared libraries during install, that is to # avoid modifying the build-tree. For the same reason, avoid doing ranlib if # the install program has "-p" (for preserving timestamps). @@ -17003,7 +17539,7 @@ fi ### use option --enable-warnings to turn on all gcc warnings -echo "$as_me:17006: checking if you want to use C11 _Noreturn feature" >&5 +echo "$as_me:17542: checking if you want to use C11 _Noreturn feature" >&5 echo $ECHO_N "checking if you want to use C11 _Noreturn feature... $ECHO_C" >&6 # Check whether --enable-stdnoreturn or --disable-stdnoreturn was given. @@ -17020,17 +17556,17 @@ else enable_stdnoreturn=no fi; -echo "$as_me:17023: result: $enable_stdnoreturn" >&5 +echo "$as_me:17559: result: $enable_stdnoreturn" >&5 echo "${ECHO_T}$enable_stdnoreturn" >&6 if test $enable_stdnoreturn = yes; then -echo "$as_me:17027: checking for C11 _Noreturn feature" >&5 +echo "$as_me:17563: checking for C11 _Noreturn feature" >&5 echo $ECHO_N "checking for C11 _Noreturn feature... $ECHO_C" >&6 if test "${cf_cv_c11_noreturn+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 17033 "configure" +#line 17569 "configure" #include "confdefs.h" $ac_includes_default @@ -17046,16 +17582,16 @@ if (feof(stdin)) giveup() } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:17049: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:17585: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17052: \$? = $ac_status" >&5 + echo "$as_me:17588: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:17055: \"$ac_try\"") >&5 + { (eval echo "$as_me:17591: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17058: \$? = $ac_status" >&5 + echo "$as_me:17594: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_c11_noreturn=yes else @@ -17066,7 +17602,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:17069: result: $cf_cv_c11_noreturn" >&5 +echo "$as_me:17605: result: $cf_cv_c11_noreturn" >&5 echo "${ECHO_T}$cf_cv_c11_noreturn" >&6 else cf_cv_c11_noreturn=no, @@ -17122,16 +17658,16 @@ then then test -n "$verbose" && echo " repairing CFLAGS: $CFLAGS" 1>&6 -echo "${as_me:-configure}:17125: testing repairing CFLAGS: $CFLAGS ..." 1>&5 +echo "${as_me:-configure}:17661: testing repairing CFLAGS: $CFLAGS ..." 1>&5 CFLAGS="$cf_temp_flags" test -n "$verbose" && echo " ... fixed $CFLAGS" 1>&6 -echo "${as_me:-configure}:17130: testing ... fixed $CFLAGS ..." 1>&5 +echo "${as_me:-configure}:17666: testing ... fixed $CFLAGS ..." 1>&5 test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 -echo "${as_me:-configure}:17134: testing ... extra $EXTRA_CFLAGS ..." 1>&5 +echo "${as_me:-configure}:17670: testing ... extra $EXTRA_CFLAGS ..." 1>&5 fi ;; @@ -17170,16 +17706,16 @@ then then test -n "$verbose" && echo " repairing CPPFLAGS: $CPPFLAGS" 1>&6 -echo "${as_me:-configure}:17173: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5 +echo "${as_me:-configure}:17709: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5 CPPFLAGS="$cf_temp_flags" test -n "$verbose" && echo " ... fixed $CPPFLAGS" 1>&6 -echo "${as_me:-configure}:17178: testing ... fixed $CPPFLAGS ..." 1>&5 +echo "${as_me:-configure}:17714: testing ... fixed $CPPFLAGS ..." 1>&5 test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 -echo "${as_me:-configure}:17182: testing ... extra $EXTRA_CFLAGS ..." 1>&5 +echo "${as_me:-configure}:17718: testing ... extra $EXTRA_CFLAGS ..." 1>&5 fi ;; @@ -17218,23 +17754,23 @@ then then test -n "$verbose" && echo " repairing LDFLAGS: $LDFLAGS" 1>&6 -echo "${as_me:-configure}:17221: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:17757: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5 LDFLAGS="$cf_temp_flags" test -n "$verbose" && echo " ... fixed $LDFLAGS" 1>&6 -echo "${as_me:-configure}:17226: testing ... fixed $LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:17762: testing ... fixed $LDFLAGS ..." 1>&5 test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 -echo "${as_me:-configure}:17230: testing ... extra $EXTRA_CFLAGS ..." 1>&5 +echo "${as_me:-configure}:17766: testing ... extra $EXTRA_CFLAGS ..." 1>&5 fi ;; esac fi -echo "$as_me:17237: checking if you want to turn on gcc warnings" >&5 +echo "$as_me:17773: checking if you want to turn on gcc warnings" >&5 echo $ECHO_N "checking if you want to turn on gcc warnings... $ECHO_C" >&6 # Check whether --enable-warnings or --disable-warnings was given. @@ -17251,7 +17787,7 @@ else enable_warnings=no fi; -echo "$as_me:17254: result: $enable_warnings" >&5 +echo "$as_me:17790: result: $enable_warnings" >&5 echo "${ECHO_T}$enable_warnings" >&6 if test "$enable_warnings" = "yes" then @@ -17275,10 +17811,10 @@ do done cat >"conftest.$ac_ext" <<_ACEOF -#line 17278 "configure" +#line 17814 "configure" #include "confdefs.h" -#include +$ac_includes_default #include int @@ -17290,31 +17826,32 @@ String foo = malloc(1); free((void*)foo) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:17293: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:17829: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17296: \$? = $ac_status" >&5 + echo "$as_me:17832: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:17299: \"$ac_try\"") >&5 + { (eval echo "$as_me:17835: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17302: \$? = $ac_status" >&5 + echo "$as_me:17838: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then -echo "$as_me:17305: checking for X11/Xt const-feature" >&5 +echo "$as_me:17841: checking for X11/Xt const-feature" >&5 echo $ECHO_N "checking for X11/Xt const-feature... $ECHO_C" >&6 if test "${cf_cv_const_x_string+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 17312 "configure" +#line 17848 "configure" #include "confdefs.h" +#undef _CONST_X_STRING #define _CONST_X_STRING /* X11R7.8 (perhaps) */ #undef XTSTRINGDEFINES /* X11R5 and later */ -#include +$ac_includes_default #include int @@ -17326,16 +17863,16 @@ String foo = malloc(1); *foo = 0 } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:17329: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:17866: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17332: \$? = $ac_status" >&5 + echo "$as_me:17869: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:17335: \"$ac_try\"") >&5 + { (eval echo "$as_me:17872: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17338: \$? = $ac_status" >&5 + echo "$as_me:17875: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_const_x_string=no @@ -17350,7 +17887,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:17353: result: $cf_cv_const_x_string" >&5 +echo "$as_me:17890: result: $cf_cv_const_x_string" >&5 echo "${ECHO_T}$cf_cv_const_x_string" >&6 LIBS="$cf_save_LIBS_CF_CONST_X_STRING" @@ -17379,7 +17916,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi cat > "conftest.$ac_ext" <&5 + { echo "$as_me:17935: checking for $CC warning options..." >&5 echo "$as_me: checking for $CC warning options..." >&6;} cf_save_CFLAGS="$CFLAGS" EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall" @@ -17411,12 +17948,12 @@ echo "$as_me: checking for $CC warning options..." >&6;} wd981 do CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" - if { (eval echo "$as_me:17414: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:17951: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17417: \$? = $ac_status" >&5 + echo "$as_me:17954: \$? = $ac_status" >&5 (exit "$ac_status"); }; then - test -n "$verbose" && echo "$as_me:17419: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:17956: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt" fi @@ -17424,7 +17961,7 @@ echo "${ECHO_T}... -$cf_opt" >&6 CFLAGS="$cf_save_CFLAGS" elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown" then - { echo "$as_me:17427: checking for $CC warning options..." >&5 + { echo "$as_me:17964: checking for $CC warning options..." >&5 echo "$as_me: checking for $CC warning options..." >&6;} cf_save_CFLAGS="$CFLAGS" cf_warn_CONST="" @@ -17447,12 +17984,12 @@ echo "$as_me: checking for $CC warning options..." >&6;} Wundef Wno-inline $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas Wswitch-enum do CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" - if { (eval echo "$as_me:17450: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:17987: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17453: \$? = $ac_status" >&5 + echo "$as_me:17990: \$? = $ac_status" >&5 (exit "$ac_status"); }; then - test -n "$verbose" && echo "$as_me:17455: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:17992: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 case "$cf_opt" in (Winline) @@ -17460,7 +17997,7 @@ echo "${ECHO_T}... -$cf_opt" >&6 ([34].*) test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6 -echo "${as_me:-configure}:17463: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 +echo "${as_me:-configure}:18000: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 continue;; esac @@ -17470,7 +18007,7 @@ echo "${as_me:-configure}:17463: testing feature is broken in gcc $GCC_VERSION . ([12].*) test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6 -echo "${as_me:-configure}:17473: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 +echo "${as_me:-configure}:18010: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 continue;; esac @@ -17503,10 +18040,10 @@ cat > conftest.i <&5 + { echo "$as_me:18043: checking for $CC __attribute__ directives..." >&5 echo "$as_me: checking for $CC __attribute__ directives..." >&6;} cat > "conftest.$ac_ext" < #include "confdefs.h" #include "conftest.h" @@ -17556,12 +18093,12 @@ EOF ;; esac - if { (eval echo "$as_me:17559: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:18096: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17562: \$? = $ac_status" >&5 + echo "$as_me:18099: \$? = $ac_status" >&5 (exit "$ac_status"); }; then - test -n "$verbose" && echo "$as_me:17564: result: ... $cf_attribute" >&5 + test -n "$verbose" && echo "$as_me:18101: result: ... $cf_attribute" >&5 echo "${ECHO_T}... $cf_attribute" >&6 cat conftest.h >>confdefs.h case "$cf_attribute" in @@ -17633,12 +18170,12 @@ INTEL_CPLUSPLUS=no if test "$GCC" = yes ; then case "$host_os" in (linux*|gnu*) - echo "$as_me:17636: checking if this is really Intel C++ compiler" >&5 + echo "$as_me:18173: checking if this is really Intel C++ compiler" >&5 echo $ECHO_N "checking if this is really Intel C++ compiler... $ECHO_C" >&6 cf_save_CFLAGS="$CXXFLAGS" CXXFLAGS="$CXXFLAGS -no-gcc" cat >"conftest.$ac_ext" <<_ACEOF -#line 17641 "configure" +#line 18178 "configure" #include "confdefs.h" int @@ -17655,16 +18192,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:17658: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:18195: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17661: \$? = $ac_status" >&5 + echo "$as_me:18198: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:17664: \"$ac_try\"") >&5 + { (eval echo "$as_me:18201: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17667: \$? = $ac_status" >&5 + echo "$as_me:18204: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then INTEL_CPLUSPLUS=yes cf_save_CFLAGS="$cf_save_CFLAGS -we147" @@ -17675,7 +18212,7 @@ cat "conftest.$ac_ext" >&5 fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" CXXFLAGS="$cf_save_CFLAGS" - echo "$as_me:17678: result: $INTEL_CPLUSPLUS" >&5 + echo "$as_me:18215: result: $INTEL_CPLUSPLUS" >&5 echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6 ;; esac @@ -17684,11 +18221,11 @@ fi CLANG_CPLUSPLUS=no if test "$GCC" = yes ; then - echo "$as_me:17687: checking if this is really Clang C++ compiler" >&5 + echo "$as_me:18224: checking if this is really Clang C++ compiler" >&5 echo $ECHO_N "checking if this is really Clang C++ compiler... $ECHO_C" >&6 cf_save_CFLAGS="$CXXFLAGS" cat >"conftest.$ac_ext" <<_ACEOF -#line 17691 "configure" +#line 18228 "configure" #include "confdefs.h" int @@ -17705,16 +18242,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:17708: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:18245: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17711: \$? = $ac_status" >&5 + echo "$as_me:18248: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:17714: \"$ac_try\"") >&5 + { (eval echo "$as_me:18251: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17717: \$? = $ac_status" >&5 + echo "$as_me:18254: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then CLANG_CPLUSPLUS=yes @@ -17724,7 +18261,7 @@ cat "conftest.$ac_ext" >&5 fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" CXXFLAGS="$cf_save_CFLAGS" - echo "$as_me:17727: result: $CLANG_CPLUSPLUS" >&5 + echo "$as_me:18264: result: $CLANG_CPLUSPLUS" >&5 echo "${ECHO_T}$CLANG_CPLUSPLUS" >&6 fi @@ -17733,30 +18270,30 @@ CLANG_VERSION=none if test "x$CLANG_CPLUSPLUS" = "xyes" ; then case "$CC" in (c[1-9][0-9]|*/c[1-9][0-9]) - { echo "$as_me:17736: WARNING: replacing broken compiler alias $CC" >&5 + { echo "$as_me:18273: WARNING: replacing broken compiler alias $CC" >&5 echo "$as_me: WARNING: replacing broken compiler alias $CC" >&2;} CFLAGS="$CFLAGS -std=`echo "$CC" | sed -e 's%.*/%%'`" CC=clang ;; esac - echo "$as_me:17743: checking version of $CC" >&5 + echo "$as_me:18280: checking version of $CC" >&5 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6 CLANG_VERSION="`$CC --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(CLANG[^)]*) //' -e 's/^.*(Debian[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`" test -z "$CLANG_VERSION" && CLANG_VERSION=unknown - echo "$as_me:17747: result: $CLANG_VERSION" >&5 + echo "$as_me:18284: result: $CLANG_VERSION" >&5 echo "${ECHO_T}$CLANG_VERSION" >&6 for cf_clang_opt in \ -Qunused-arguments \ -Wno-error=implicit-function-declaration do - echo "$as_me:17754: checking if option $cf_clang_opt works" >&5 + echo "$as_me:18291: checking if option $cf_clang_opt works" >&5 echo $ECHO_N "checking if option $cf_clang_opt works... $ECHO_C" >&6 cf_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $cf_clang_opt" cat >"conftest.$ac_ext" <<_ACEOF -#line 17759 "configure" +#line 18296 "configure" #include "confdefs.h" #include @@ -17770,16 +18307,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:17773: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18310: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17776: \$? = $ac_status" >&5 + echo "$as_me:18313: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:17779: \"$ac_try\"") >&5 + { (eval echo "$as_me:18316: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17782: \$? = $ac_status" >&5 + echo "$as_me:18319: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_clang_optok=yes @@ -17790,13 +18327,13 @@ cat "conftest.$ac_ext" >&5 cf_clang_optok=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - echo "$as_me:17793: result: $cf_clang_optok" >&5 + echo "$as_me:18330: result: $cf_clang_optok" >&5 echo "${ECHO_T}$cf_clang_optok" >&6 CFLAGS="$cf_save_CFLAGS" if test "$cf_clang_optok" = yes; then test -n "$verbose" && echo " adding option $cf_clang_opt" 1>&6 -echo "${as_me:-configure}:17799: testing adding option $cf_clang_opt ..." 1>&5 +echo "${as_me:-configure}:18336: testing adding option $cf_clang_opt ..." 1>&5 test -n "$CFLAGS" && CFLAGS="$CFLAGS " CFLAGS="${CFLAGS}$cf_clang_opt" @@ -17813,7 +18350,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ac_main_return="return" cat > conftest.$ac_ext <&5 + { echo "$as_me:18371: checking for $CC warning options..." >&5 echo "$as_me: checking for $CC warning options..." >&6;} cf_save_CXXFLAGS="$CXXFLAGS" EXTRA_CXXFLAGS="-Wall" @@ -17848,12 +18385,12 @@ echo "$as_me: checking for $CC warning options..." >&6;} wd981 do CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -$cf_opt" - if { (eval echo "$as_me:17851: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:18388: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17854: \$? = $ac_status" >&5 + echo "$as_me:18391: \$? = $ac_status" >&5 (exit "$ac_status"); }; then - test -n "$verbose" && echo "$as_me:17856: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:18393: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt" fi @@ -17862,7 +18399,7 @@ echo "${ECHO_T}... -$cf_opt" >&6 elif test "$GXX" = yes then - { echo "$as_me:17865: checking for $CXX warning options..." >&5 + { echo "$as_me:18402: checking for $CXX warning options..." >&5 echo "$as_me: checking for $CXX warning options..." >&6;} cf_save_CXXFLAGS="$CXXFLAGS" EXTRA_CXXFLAGS="-W -Wall" @@ -17892,16 +18429,16 @@ echo "$as_me: checking for $CXX warning options..." >&6;} Wundef $cf_gxx_extra_warnings Wno-unused do CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt" - if { (eval echo "$as_me:17895: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:18432: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17898: \$? = $ac_status" >&5 + echo "$as_me:18435: \$? = $ac_status" >&5 (exit "$ac_status"); }; then - test -n "$verbose" && echo "$as_me:17900: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:18437: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt" else - test -n "$verbose" && echo "$as_me:17904: result: ... no -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:18441: result: ... no -$cf_opt" >&5 echo "${ECHO_T}... no -$cf_opt" >&6 fi done @@ -17919,7 +18456,7 @@ ac_main_return="return" fi fi -echo "$as_me:17922: checking if you want to work around bogus compiler/loader warnings" >&5 +echo "$as_me:18459: checking if you want to work around bogus compiler/loader warnings" >&5 echo $ECHO_N "checking if you want to work around bogus compiler/loader warnings... $ECHO_C" >&6 # Check whether --enable-string-hacks or --disable-string-hacks was given. @@ -17929,7 +18466,7 @@ if test "${enable_string_hacks+set}" = set; then else enable_string_hacks=no fi; -echo "$as_me:17932: result: $enable_string_hacks" >&5 +echo "$as_me:18469: result: $enable_string_hacks" >&5 echo "${ECHO_T}$enable_string_hacks" >&6 if test "x$enable_string_hacks" = "xyes"; then @@ -17938,15 +18475,15 @@ cat >>confdefs.h <<\EOF #define USE_STRING_HACKS 1 EOF - { echo "$as_me:17941: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5 + { echo "$as_me:18478: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5 echo "$as_me: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&2;} - echo "$as_me:17943: checking for strlcat" >&5 + echo "$as_me:18480: checking for strlcat" >&5 echo $ECHO_N "checking for strlcat... $ECHO_C" >&6 if test "${ac_cv_func_strlcat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 17949 "configure" +#line 18486 "configure" #include "confdefs.h" #define strlcat autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -17977,16 +18514,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:17980: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18517: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17983: \$? = $ac_status" >&5 + echo "$as_me:18520: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:17986: \"$ac_try\"") >&5 + { (eval echo "$as_me:18523: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17989: \$? = $ac_status" >&5 + echo "$as_me:18526: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_strlcat=yes else @@ -17996,7 +18533,7 @@ ac_cv_func_strlcat=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:17999: result: $ac_cv_func_strlcat" >&5 +echo "$as_me:18536: result: $ac_cv_func_strlcat" >&5 echo "${ECHO_T}$ac_cv_func_strlcat" >&6 if test "$ac_cv_func_strlcat" = yes; then @@ -18006,7 +18543,7 @@ EOF else - echo "$as_me:18009: checking for strlcat in -lbsd" >&5 + echo "$as_me:18546: checking for strlcat in -lbsd" >&5 echo $ECHO_N "checking for strlcat in -lbsd... $ECHO_C" >&6 if test "${ac_cv_lib_bsd_strlcat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -18014,7 +18551,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lbsd $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 18017 "configure" +#line 18554 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -18023,7 +18560,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char strlcat (); +char strlcat (void); int main (void) { @@ -18033,16 +18570,16 @@ strlcat (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:18036: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18573: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18039: \$? = $ac_status" >&5 + echo "$as_me:18576: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:18042: \"$ac_try\"") >&5 + { (eval echo "$as_me:18579: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18045: \$? = $ac_status" >&5 + echo "$as_me:18582: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_bsd_strlcat=yes else @@ -18053,7 +18590,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:18056: result: $ac_cv_lib_bsd_strlcat" >&5 +echo "$as_me:18593: result: $ac_cv_lib_bsd_strlcat" >&5 echo "${ECHO_T}$ac_cv_lib_bsd_strlcat" >&6 if test "$ac_cv_lib_bsd_strlcat" = yes; then @@ -18076,23 +18613,23 @@ LIBS="$cf_add_libs" for ac_header in bsd/string.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:18079: checking for $ac_header" >&5 +echo "$as_me:18616: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 18085 "configure" +#line 18622 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:18089: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:18626: \"$ac_cpp "conftest.$ac_ext"\"") >&5 (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:18095: \$? = $ac_status" >&5 + echo "$as_me:18632: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -18111,7 +18648,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:18114: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:18651: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then cat >>confdefs.h <&5 +echo "$as_me:18672: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 18141 "configure" +#line 18678 "configure" #include "confdefs.h" #define $ac_func autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -18169,16 +18706,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:18172: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18709: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18175: \$? = $ac_status" >&5 + echo "$as_me:18712: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:18178: \"$ac_try\"") >&5 + { (eval echo "$as_me:18715: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18181: \$? = $ac_status" >&5 + echo "$as_me:18718: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then eval "$as_ac_var=yes" else @@ -18188,7 +18725,7 @@ eval "$as_ac_var=no" fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:18191: result: `eval echo '${'"$as_ac_var"'}'`" >&5 +echo "$as_me:18728: result: `eval echo '${'"$as_ac_var"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then cat >>confdefs.h <&5 +echo "$as_me:18741: checking if you want to enable runtime assertions" >&5 echo $ECHO_N "checking if you want to enable runtime assertions... $ECHO_C" >&6 # Check whether --enable-assertions or --disable-assertions was given. @@ -18211,7 +18748,7 @@ if test "${enable_assertions+set}" = set; then else with_assertions=no fi; -echo "$as_me:18214: result: $with_assertions" >&5 +echo "$as_me:18751: result: $with_assertions" >&5 echo "${ECHO_T}$with_assertions" >&6 if test -n "$GCC" then @@ -18227,7 +18764,7 @@ fi ### use option --disable-leaks to suppress "permanent" leaks, for testing -echo "$as_me:18230: checking if you want to use dmalloc for testing" >&5 +echo "$as_me:18767: checking if you want to use dmalloc for testing" >&5 echo $ECHO_N "checking if you want to use dmalloc for testing... $ECHO_C" >&6 # Check whether --with-dmalloc or --without-dmalloc was given. @@ -18249,7 +18786,7 @@ EOF else with_dmalloc= fi; -echo "$as_me:18252: result: ${with_dmalloc:-no}" >&5 +echo "$as_me:18789: result: ${with_dmalloc:-no}" >&5 echo "${ECHO_T}${with_dmalloc:-no}" >&6 case ".$with_cflags" in @@ -18363,23 +18900,23 @@ fi esac if test "$with_dmalloc" = yes ; then - echo "$as_me:18366: checking for dmalloc.h" >&5 + echo "$as_me:18903: checking for dmalloc.h" >&5 echo $ECHO_N "checking for dmalloc.h... $ECHO_C" >&6 if test "${ac_cv_header_dmalloc_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 18372 "configure" +#line 18909 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:18376: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:18913: \"$ac_cpp "conftest.$ac_ext"\"") >&5 (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:18382: \$? = $ac_status" >&5 + echo "$as_me:18919: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -18398,11 +18935,11 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:18401: result: $ac_cv_header_dmalloc_h" >&5 +echo "$as_me:18938: result: $ac_cv_header_dmalloc_h" >&5 echo "${ECHO_T}$ac_cv_header_dmalloc_h" >&6 if test "$ac_cv_header_dmalloc_h" = yes; then -echo "$as_me:18405: checking for dmalloc_debug in -ldmalloc" >&5 +echo "$as_me:18942: checking for dmalloc_debug in -ldmalloc" >&5 echo $ECHO_N "checking for dmalloc_debug in -ldmalloc... $ECHO_C" >&6 if test "${ac_cv_lib_dmalloc_dmalloc_debug+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -18410,7 +18947,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldmalloc $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 18413 "configure" +#line 18950 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -18419,7 +18956,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char dmalloc_debug (); +char dmalloc_debug (void); int main (void) { @@ -18429,16 +18966,16 @@ dmalloc_debug (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:18432: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18969: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18435: \$? = $ac_status" >&5 + echo "$as_me:18972: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:18438: \"$ac_try\"") >&5 + { (eval echo "$as_me:18975: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18441: \$? = $ac_status" >&5 + echo "$as_me:18978: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_dmalloc_dmalloc_debug=yes else @@ -18449,7 +18986,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:18452: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5 +echo "$as_me:18989: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5 echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6 if test "$ac_cv_lib_dmalloc_dmalloc_debug" = yes; then cat >>confdefs.h <&5 +echo "$as_me:19004: checking if you want to use dbmalloc for testing" >&5 echo $ECHO_N "checking if you want to use dbmalloc for testing... $ECHO_C" >&6 # Check whether --with-dbmalloc or --without-dbmalloc was given. @@ -18486,7 +19023,7 @@ EOF else with_dbmalloc= fi; -echo "$as_me:18489: result: ${with_dbmalloc:-no}" >&5 +echo "$as_me:19026: result: ${with_dbmalloc:-no}" >&5 echo "${ECHO_T}${with_dbmalloc:-no}" >&6 case ".$with_cflags" in @@ -18600,23 +19137,23 @@ fi esac if test "$with_dbmalloc" = yes ; then - echo "$as_me:18603: checking for dbmalloc.h" >&5 + echo "$as_me:19140: checking for dbmalloc.h" >&5 echo $ECHO_N "checking for dbmalloc.h... $ECHO_C" >&6 if test "${ac_cv_header_dbmalloc_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 18609 "configure" +#line 19146 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:18613: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:19150: \"$ac_cpp "conftest.$ac_ext"\"") >&5 (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:18619: \$? = $ac_status" >&5 + echo "$as_me:19156: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -18635,11 +19172,11 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:18638: result: $ac_cv_header_dbmalloc_h" >&5 +echo "$as_me:19175: result: $ac_cv_header_dbmalloc_h" >&5 echo "${ECHO_T}$ac_cv_header_dbmalloc_h" >&6 if test "$ac_cv_header_dbmalloc_h" = yes; then -echo "$as_me:18642: checking for debug_malloc in -ldbmalloc" >&5 +echo "$as_me:19179: checking for debug_malloc in -ldbmalloc" >&5 echo $ECHO_N "checking for debug_malloc in -ldbmalloc... $ECHO_C" >&6 if test "${ac_cv_lib_dbmalloc_debug_malloc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -18647,7 +19184,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldbmalloc $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 18650 "configure" +#line 19187 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -18656,7 +19193,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char debug_malloc (); +char debug_malloc (void); int main (void) { @@ -18666,16 +19203,16 @@ debug_malloc (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:18669: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19206: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18672: \$? = $ac_status" >&5 + echo "$as_me:19209: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:18675: \"$ac_try\"") >&5 + { (eval echo "$as_me:19212: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18678: \$? = $ac_status" >&5 + echo "$as_me:19215: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_dbmalloc_debug_malloc=yes else @@ -18686,7 +19223,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:18689: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5 +echo "$as_me:19226: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5 echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6 if test "$ac_cv_lib_dbmalloc_debug_malloc" = yes; then cat >>confdefs.h <&5 +echo "$as_me:19241: checking if you want to use valgrind for testing" >&5 echo $ECHO_N "checking if you want to use valgrind for testing... $ECHO_C" >&6 # Check whether --with-valgrind or --without-valgrind was given. @@ -18723,7 +19260,7 @@ EOF else with_valgrind= fi; -echo "$as_me:18726: result: ${with_valgrind:-no}" >&5 +echo "$as_me:19263: result: ${with_valgrind:-no}" >&5 echo "${ECHO_T}${with_valgrind:-no}" >&6 case ".$with_cflags" in @@ -18836,7 +19373,7 @@ fi ;; esac -echo "$as_me:18839: checking if you want to perform memory-leak testing" >&5 +echo "$as_me:19376: checking if you want to perform memory-leak testing" >&5 echo $ECHO_N "checking if you want to perform memory-leak testing... $ECHO_C" >&6 # Check whether --enable-leaks or --disable-leaks was given. @@ -18847,7 +19384,7 @@ else enable_leaks=yes fi; if test "x$enable_leaks" = xno; then with_no_leaks=yes; else with_no_leaks=no; fi -echo "$as_me:18850: result: $with_no_leaks" >&5 +echo "$as_me:19387: result: $with_no_leaks" >&5 echo "${ECHO_T}$with_no_leaks" >&6 if test "$enable_leaks" = no ; then @@ -18899,7 +19436,7 @@ case "$CFLAGS $CPPFLAGS" in ;; esac -echo "$as_me:18902: checking whether to add trace feature to all models" >&5 +echo "$as_me:19439: checking whether to add trace feature to all models" >&5 echo $ECHO_N "checking whether to add trace feature to all models... $ECHO_C" >&6 # Check whether --with-trace or --without-trace was given. @@ -18909,110 +19446,16 @@ if test "${with_trace+set}" = set; then else cf_with_trace=$cf_all_traces fi; -echo "$as_me:18912: result: $cf_with_trace" >&5 +echo "$as_me:19449: result: $cf_with_trace" >&5 echo "${ECHO_T}$cf_with_trace" >&6 if test "x$cf_with_trace" = xyes ; then LIB_TRACING=all ADA_TRACE=TRUE -cf_fix_cppflags=no -cf_new_cflags= -cf_new_cppflags= -cf_new_extra_cppflags= - -for cf_add_cflags in -DTRACE -do -case "$cf_fix_cppflags" in -(no) - case "$cf_add_cflags" in - (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) - case "$cf_add_cflags" in - (-D*) - cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'` - - test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ - && test -z "${cf_tst_cflags}" \ - && cf_fix_cppflags=yes - - if test "$cf_fix_cppflags" = yes ; then - - test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " - cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" - - continue - elif test "${cf_tst_cflags}" = "\"'" ; then - - test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " - cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" - - continue - fi - ;; - esac - case "$CPPFLAGS" in - (*$cf_add_cflags) - ;; - (*) - case "$cf_add_cflags" in - (-D*) - cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` - -CPPFLAGS=`echo "$CPPFLAGS" | \ - sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ - -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` - - ;; - esac - - test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags " - cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags" - - ;; - esac - ;; - (*) - - test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags " - cf_new_cflags="${cf_new_cflags}$cf_add_cflags" - - ;; - esac - ;; -(yes) - - test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " - cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" - - cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^[^"]*"'\''//'` - - test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ - && test -z "${cf_tst_cflags}" \ - && cf_fix_cppflags=no - ;; -esac -done - -if test -n "$cf_new_cflags" ; then - - test -n "$CFLAGS" && CFLAGS="$CFLAGS " - CFLAGS="${CFLAGS}$cf_new_cflags" - -fi - -if test -n "$cf_new_cppflags" ; then - - test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " - CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" - -fi - -if test -n "$cf_new_extra_cppflags" ; then - - test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " - EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" - -fi +cat >>confdefs.h <<\EOF +#define TRACE 1 +EOF cat >>confdefs.h <<\EOF #define HAVE__TRACEF 1 @@ -19023,7 +19466,7 @@ else ADA_TRACE=FALSE fi -echo "$as_me:19026: checking if we want to use GNAT projects" >&5 +echo "$as_me:19469: checking if we want to use GNAT projects" >&5 echo $ECHO_N "checking if we want to use GNAT projects... $ECHO_C" >&6 # Check whether --enable-gnat-projects or --disable-gnat-projects was given. @@ -19040,7 +19483,7 @@ else enable_gnat_projects=yes fi; -echo "$as_me:19043: result: $enable_gnat_projects" >&5 +echo "$as_me:19486: result: $enable_gnat_projects" >&5 echo "${ECHO_T}$enable_gnat_projects" >&6 ### Checks for libraries. @@ -19053,14 +19496,14 @@ case "$cf_cv_system_name" in CPPFLAGS="$CPPFLAGS -DWINVER=0x0501 -DWIN32_LEAN_AND_MEAN" fi -echo "$as_me:19056: checking if ssp library is needed" >&5 +echo "$as_me:19499: checking if ssp library is needed" >&5 echo $ECHO_N "checking if ssp library is needed... $ECHO_C" >&6 if test "${cf_cv_need_libssp+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 19063 "configure" +#line 19506 "configure" #include "confdefs.h" #include @@ -19077,16 +19520,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:19080: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19523: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19083: \$? = $ac_status" >&5 + echo "$as_me:19526: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:19086: \"$ac_try\"") >&5 + { (eval echo "$as_me:19529: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19089: \$? = $ac_status" >&5 + echo "$as_me:19532: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_need_libssp=no else @@ -19096,7 +19539,7 @@ cat "conftest.$ac_ext" >&5 cf_save_LIBS="$LIBS" LIBS="$LIBS -lssp" cat >"conftest.$ac_ext" <<_ACEOF -#line 19099 "configure" +#line 19542 "configure" #include "confdefs.h" #include @@ -19113,16 +19556,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:19116: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19559: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19119: \$? = $ac_status" >&5 + echo "$as_me:19562: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:19122: \"$ac_try\"") >&5 + { (eval echo "$as_me:19565: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19125: \$? = $ac_status" >&5 + echo "$as_me:19568: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_need_libssp=yes else @@ -19136,7 +19579,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:19139: result: $cf_cv_need_libssp" >&5 +echo "$as_me:19582: result: $cf_cv_need_libssp" >&5 echo "${ECHO_T}$cf_cv_need_libssp" >&6 if test "x$cf_cv_need_libssp" = xyes @@ -19165,14 +19608,14 @@ fi ;; esac -echo "$as_me:19168: checking if -lm needed for math functions" >&5 +echo "$as_me:19611: checking if -lm needed for math functions" >&5 echo $ECHO_N "checking if -lm needed for math functions... $ECHO_C" >&6 if test "${cf_cv_need_libm+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 19175 "configure" +#line 19618 "configure" #include "confdefs.h" #include @@ -19188,16 +19631,16 @@ double x = rand(); printf("result = %g\\n", pow(sin(x),x)) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:19191: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19634: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19194: \$? = $ac_status" >&5 + echo "$as_me:19637: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:19197: \"$ac_try\"") >&5 + { (eval echo "$as_me:19640: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19200: \$? = $ac_status" >&5 + echo "$as_me:19643: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_need_libm=no else @@ -19207,7 +19650,7 @@ cf_cv_need_libm=yes fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:19210: result: $cf_cv_need_libm" >&5 +echo "$as_me:19653: result: $cf_cv_need_libm" >&5 echo "${ECHO_T}$cf_cv_need_libm" >&6 if test "$cf_cv_need_libm" = yes @@ -19215,14 +19658,14 @@ then cf_save_LIBS="$LIBS" LIBS="$LIBS -lm" - echo "$as_me:19218: checking if -lm is available for math functions" >&5 + echo "$as_me:19661: checking if -lm is available for math functions" >&5 echo $ECHO_N "checking if -lm is available for math functions... $ECHO_C" >&6 if test "${cf_cv_have_libm+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 19225 "configure" +#line 19668 "configure" #include "confdefs.h" #include @@ -19238,16 +19681,16 @@ double x = rand(); printf("result = %g\\n", pow(sin(x),x)) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:19241: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19684: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19244: \$? = $ac_status" >&5 + echo "$as_me:19687: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:19247: \"$ac_try\"") >&5 + { (eval echo "$as_me:19690: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19250: \$? = $ac_status" >&5 + echo "$as_me:19693: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_have_libm=yes else @@ -19257,7 +19700,7 @@ cf_cv_have_libm=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:19260: result: $cf_cv_have_libm" >&5 +echo "$as_me:19703: result: $cf_cv_have_libm" >&5 echo "${ECHO_T}$cf_cv_have_libm" >&6 LIBS="$cf_save_LIBS" @@ -19279,13 +19722,13 @@ EOF fi ### Checks for header files. -echo "$as_me:19282: checking whether time.h and sys/time.h may both be included" >&5 +echo "$as_me:19725: checking whether time.h and sys/time.h may both be included" >&5 echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6 if test "${ac_cv_header_time+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 19288 "configure" +#line 19731 "configure" #include "confdefs.h" #include #include @@ -19301,16 +19744,16 @@ return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:19304: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:19747: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19307: \$? = $ac_status" >&5 + echo "$as_me:19750: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:19310: \"$ac_try\"") >&5 + { (eval echo "$as_me:19753: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19313: \$? = $ac_status" >&5 + echo "$as_me:19756: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_header_time=yes else @@ -19320,7 +19763,7 @@ ac_cv_header_time=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:19323: result: $ac_cv_header_time" >&5 +echo "$as_me:19766: result: $ac_cv_header_time" >&5 echo "${ECHO_T}$ac_cv_header_time" >&6 if test $ac_cv_header_time = yes; then @@ -19335,7 +19778,7 @@ cf_regex_libs= case "$host_os" in (mingw*) # -lsystre -ltre -lintl -liconv - echo "$as_me:19338: checking for regcomp in -lsystre" >&5 + echo "$as_me:19781: checking for regcomp in -lsystre" >&5 echo $ECHO_N "checking for regcomp in -lsystre... $ECHO_C" >&6 if test "${ac_cv_lib_systre_regcomp+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -19343,7 +19786,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lsystre $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 19346 "configure" +#line 19789 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -19352,7 +19795,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char regcomp (); +char regcomp (void); int main (void) { @@ -19362,16 +19805,16 @@ regcomp (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:19365: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19808: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19368: \$? = $ac_status" >&5 + echo "$as_me:19811: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:19371: \"$ac_try\"") >&5 + { (eval echo "$as_me:19814: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19374: \$? = $ac_status" >&5 + echo "$as_me:19817: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_systre_regcomp=yes else @@ -19382,11 +19825,11 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:19385: result: $ac_cv_lib_systre_regcomp" >&5 +echo "$as_me:19828: result: $ac_cv_lib_systre_regcomp" >&5 echo "${ECHO_T}$ac_cv_lib_systre_regcomp" >&6 if test "$ac_cv_lib_systre_regcomp" = yes; then - echo "$as_me:19389: checking for libiconv_open in -liconv" >&5 + echo "$as_me:19832: checking for libiconv_open in -liconv" >&5 echo $ECHO_N "checking for libiconv_open in -liconv... $ECHO_C" >&6 if test "${ac_cv_lib_iconv_libiconv_open+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -19394,7 +19837,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-liconv $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 19397 "configure" +#line 19840 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -19403,7 +19846,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char libiconv_open (); +char libiconv_open (void); int main (void) { @@ -19413,16 +19856,16 @@ libiconv_open (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:19416: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19859: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19419: \$? = $ac_status" >&5 + echo "$as_me:19862: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:19422: \"$ac_try\"") >&5 + { (eval echo "$as_me:19865: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19425: \$? = $ac_status" >&5 + echo "$as_me:19868: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_iconv_libiconv_open=yes else @@ -19433,7 +19876,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:19436: result: $ac_cv_lib_iconv_libiconv_open" >&5 +echo "$as_me:19879: result: $ac_cv_lib_iconv_libiconv_open" >&5 echo "${ECHO_T}$ac_cv_lib_iconv_libiconv_open" >&6 if test "$ac_cv_lib_iconv_libiconv_open" = yes; then @@ -19455,7 +19898,7 @@ LIBS="$cf_add_libs" fi - echo "$as_me:19458: checking for libintl_gettext in -lintl" >&5 + echo "$as_me:19901: checking for libintl_gettext in -lintl" >&5 echo $ECHO_N "checking for libintl_gettext in -lintl... $ECHO_C" >&6 if test "${ac_cv_lib_intl_libintl_gettext+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -19463,7 +19906,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lintl $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 19466 "configure" +#line 19909 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -19472,7 +19915,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char libintl_gettext (); +char libintl_gettext (void); int main (void) { @@ -19482,16 +19925,16 @@ libintl_gettext (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:19485: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19928: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19488: \$? = $ac_status" >&5 + echo "$as_me:19931: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:19491: \"$ac_try\"") >&5 + { (eval echo "$as_me:19934: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19494: \$? = $ac_status" >&5 + echo "$as_me:19937: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_intl_libintl_gettext=yes else @@ -19502,7 +19945,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:19505: result: $ac_cv_lib_intl_libintl_gettext" >&5 +echo "$as_me:19948: result: $ac_cv_lib_intl_libintl_gettext" >&5 echo "${ECHO_T}$ac_cv_lib_intl_libintl_gettext" >&6 if test "$ac_cv_lib_intl_libintl_gettext" = yes; then @@ -19524,7 +19967,7 @@ LIBS="$cf_add_libs" fi - echo "$as_me:19527: checking for tre_regcomp in -ltre" >&5 + echo "$as_me:19970: checking for tre_regcomp in -ltre" >&5 echo $ECHO_N "checking for tre_regcomp in -ltre... $ECHO_C" >&6 if test "${ac_cv_lib_tre_tre_regcomp+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -19532,7 +19975,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ltre $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 19535 "configure" +#line 19978 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -19541,7 +19984,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char tre_regcomp (); +char tre_regcomp (void); int main (void) { @@ -19551,16 +19994,16 @@ tre_regcomp (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:19554: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19997: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19557: \$? = $ac_status" >&5 + echo "$as_me:20000: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:19560: \"$ac_try\"") >&5 + { (eval echo "$as_me:20003: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19563: \$? = $ac_status" >&5 + echo "$as_me:20006: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_tre_tre_regcomp=yes else @@ -19571,7 +20014,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:19574: result: $ac_cv_lib_tre_tre_regcomp" >&5 +echo "$as_me:20017: result: $ac_cv_lib_tre_tre_regcomp" >&5 echo "${ECHO_T}$ac_cv_lib_tre_tre_regcomp" >&6 if test "$ac_cv_lib_tre_tre_regcomp" = yes; then @@ -19613,7 +20056,7 @@ LIBS="$cf_add_libs" else - echo "$as_me:19616: checking for regcomp in -lgnurx" >&5 + echo "$as_me:20059: checking for regcomp in -lgnurx" >&5 echo $ECHO_N "checking for regcomp in -lgnurx... $ECHO_C" >&6 if test "${ac_cv_lib_gnurx_regcomp+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -19621,7 +20064,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lgnurx $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 19624 "configure" +#line 20067 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -19630,7 +20073,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char regcomp (); +char regcomp (void); int main (void) { @@ -19640,16 +20083,16 @@ regcomp (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:19643: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20086: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19646: \$? = $ac_status" >&5 + echo "$as_me:20089: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:19649: \"$ac_try\"") >&5 + { (eval echo "$as_me:20092: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19652: \$? = $ac_status" >&5 + echo "$as_me:20095: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_gnurx_regcomp=yes else @@ -19660,7 +20103,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:19663: result: $ac_cv_lib_gnurx_regcomp" >&5 +echo "$as_me:20106: result: $ac_cv_lib_gnurx_regcomp" >&5 echo "${ECHO_T}$ac_cv_lib_gnurx_regcomp" >&6 if test "$ac_cv_lib_gnurx_regcomp" = yes; then @@ -19688,13 +20131,13 @@ fi ;; (*) cf_regex_libs="regex re" - echo "$as_me:19691: checking for regcomp" >&5 + echo "$as_me:20134: checking for regcomp" >&5 echo $ECHO_N "checking for regcomp... $ECHO_C" >&6 if test "${ac_cv_func_regcomp+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 19697 "configure" +#line 20140 "configure" #include "confdefs.h" #define regcomp autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -19725,16 +20168,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:19728: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20171: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19731: \$? = $ac_status" >&5 + echo "$as_me:20174: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:19734: \"$ac_try\"") >&5 + { (eval echo "$as_me:20177: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19737: \$? = $ac_status" >&5 + echo "$as_me:20180: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_regcomp=yes else @@ -19744,7 +20187,7 @@ ac_cv_func_regcomp=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:19747: result: $ac_cv_func_regcomp" >&5 +echo "$as_me:20190: result: $ac_cv_func_regcomp" >&5 echo "${ECHO_T}$ac_cv_func_regcomp" >&6 if test "$ac_cv_func_regcomp" = yes; then cf_regex_func=regcomp @@ -19753,7 +20196,7 @@ else for cf_regex_lib in $cf_regex_libs do as_ac_Lib=`echo "ac_cv_lib_$cf_regex_lib''_regcomp" | $as_tr_sh` -echo "$as_me:19756: checking for regcomp in -l$cf_regex_lib" >&5 +echo "$as_me:20199: checking for regcomp in -l$cf_regex_lib" >&5 echo $ECHO_N "checking for regcomp in -l$cf_regex_lib... $ECHO_C" >&6 if eval "test \"\${$as_ac_Lib+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -19761,7 +20204,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-l$cf_regex_lib $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 19764 "configure" +#line 20207 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -19770,7 +20213,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char regcomp (); +char regcomp (void); int main (void) { @@ -19780,16 +20223,16 @@ regcomp (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:19783: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20226: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19786: \$? = $ac_status" >&5 + echo "$as_me:20229: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:19789: \"$ac_try\"") >&5 + { (eval echo "$as_me:20232: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19792: \$? = $ac_status" >&5 + echo "$as_me:20235: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then eval "$as_ac_Lib=yes" else @@ -19800,7 +20243,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:19803: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5 +echo "$as_me:20246: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_Lib"'}'`" >&6 if test "`eval echo '${'"$as_ac_Lib"'}'`" = yes; then @@ -19832,13 +20275,13 @@ fi esac if test "$cf_regex_func" = no ; then - echo "$as_me:19835: checking for compile" >&5 + echo "$as_me:20278: checking for compile" >&5 echo $ECHO_N "checking for compile... $ECHO_C" >&6 if test "${ac_cv_func_compile+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 19841 "configure" +#line 20284 "configure" #include "confdefs.h" #define compile autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -19869,16 +20312,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:19872: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20315: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19875: \$? = $ac_status" >&5 + echo "$as_me:20318: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:19878: \"$ac_try\"") >&5 + { (eval echo "$as_me:20321: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19881: \$? = $ac_status" >&5 + echo "$as_me:20324: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_compile=yes else @@ -19888,13 +20331,13 @@ ac_cv_func_compile=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:19891: result: $ac_cv_func_compile" >&5 +echo "$as_me:20334: result: $ac_cv_func_compile" >&5 echo "${ECHO_T}$ac_cv_func_compile" >&6 if test "$ac_cv_func_compile" = yes; then cf_regex_func=compile else - echo "$as_me:19897: checking for compile in -lgen" >&5 + echo "$as_me:20340: checking for compile in -lgen" >&5 echo $ECHO_N "checking for compile in -lgen... $ECHO_C" >&6 if test "${ac_cv_lib_gen_compile+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -19902,7 +20345,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lgen $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 19905 "configure" +#line 20348 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -19911,7 +20354,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char compile (); +char compile (void); int main (void) { @@ -19921,16 +20364,16 @@ compile (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:19924: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20367: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19927: \$? = $ac_status" >&5 + echo "$as_me:20370: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:19930: \"$ac_try\"") >&5 + { (eval echo "$as_me:20373: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19933: \$? = $ac_status" >&5 + echo "$as_me:20376: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_gen_compile=yes else @@ -19941,7 +20384,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:19944: result: $ac_cv_lib_gen_compile" >&5 +echo "$as_me:20387: result: $ac_cv_lib_gen_compile" >&5 echo "${ECHO_T}$ac_cv_lib_gen_compile" >&6 if test "$ac_cv_lib_gen_compile" = yes; then @@ -19969,11 +20412,11 @@ fi fi if test "$cf_regex_func" = no ; then - { echo "$as_me:19972: WARNING: cannot find regular expression library" >&5 + { echo "$as_me:20415: WARNING: cannot find regular expression library" >&5 echo "$as_me: WARNING: cannot find regular expression library" >&2;} fi -echo "$as_me:19976: checking for regular-expression headers" >&5 +echo "$as_me:20419: checking for regular-expression headers" >&5 echo $ECHO_N "checking for regular-expression headers... $ECHO_C" >&6 if test "${cf_cv_regex_hdrs+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -19985,7 +20428,7 @@ case "$cf_regex_func" in for cf_regex_hdr in regexp.h regexpr.h do cat >"conftest.$ac_ext" <<_ACEOF -#line 19988 "configure" +#line 20431 "configure" #include "confdefs.h" #include <$cf_regex_hdr> int @@ -20002,16 +20445,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:20005: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20448: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20008: \$? = $ac_status" >&5 + echo "$as_me:20451: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:20011: \"$ac_try\"") >&5 + { (eval echo "$as_me:20454: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20014: \$? = $ac_status" >&5 + echo "$as_me:20457: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_regex_hdrs=$cf_regex_hdr @@ -20028,15 +20471,16 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" for cf_regex_hdr in regex.h do cat >"conftest.$ac_ext" <<_ACEOF -#line 20031 "configure" +#line 20474 "configure" #include "confdefs.h" #include +#include #include <$cf_regex_hdr> int main (void) { - regex_t *p = 0; + regex_t *p = NULL; int x = regcomp(p, "", 0); int y = regexec(p, "", 0, 0, 0); (void)x; @@ -20048,16 +20492,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:20051: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20495: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20054: \$? = $ac_status" >&5 + echo "$as_me:20498: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:20057: \"$ac_try\"") >&5 + { (eval echo "$as_me:20501: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20060: \$? = $ac_status" >&5 + echo "$as_me:20504: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_regex_hdrs=$cf_regex_hdr @@ -20073,11 +20517,11 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" esac fi -echo "$as_me:20076: result: $cf_cv_regex_hdrs" >&5 +echo "$as_me:20520: result: $cf_cv_regex_hdrs" >&5 echo "${ECHO_T}$cf_cv_regex_hdrs" >&6 case "$cf_cv_regex_hdrs" in - (no) { echo "$as_me:20080: WARNING: no regular expression header found" >&5 + (no) { echo "$as_me:20524: WARNING: no regular expression header found" >&5 echo "$as_me: WARNING: no regular expression header found" >&2;} ;; (regex.h) cat >>confdefs.h <<\EOF @@ -20097,12 +20541,15 @@ EOF esac for ac_header in \ +alloca.h \ fcntl.h \ getopt.h \ limits.h \ locale.h \ +malloc.h \ math.h \ poll.h \ +sys/auxv.h \ sys/ioctl.h \ sys/param.h \ sys/poll.h \ @@ -20114,23 +20561,23 @@ wctype.h \ do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:20117: checking for $ac_header" >&5 +echo "$as_me:20564: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 20123 "configure" +#line 20570 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:20127: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:20574: \"$ac_cpp "conftest.$ac_ext"\"") >&5 (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:20133: \$? = $ac_status" >&5 + echo "$as_me:20580: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -20149,7 +20596,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:20152: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:20599: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then cat >>confdefs.h <&5 +echo "$as_me:20612: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 20171 "configure" +#line 20618 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:20175: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:20622: \"$ac_cpp "conftest.$ac_ext"\"") >&5 (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:20181: \$? = $ac_status" >&5 + echo "$as_me:20628: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -20197,7 +20644,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:20200: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:20647: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then cat >>confdefs.h <&5 +echo "$as_me:20657: checking for header declaring getopt variables" >&5 echo $ECHO_N "checking for header declaring getopt variables... $ECHO_C" >&6 if test "${cf_cv_getopt_header+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -20217,7 +20664,7 @@ cf_cv_getopt_header=none for cf_header in stdio.h stdlib.h unistd.h getopt.h do cat >"conftest.$ac_ext" <<_ACEOF -#line 20220 "configure" +#line 20667 "configure" #include "confdefs.h" #include <$cf_header> @@ -20230,16 +20677,16 @@ int x = optind; char *y = optarg; (void)x; (void)y } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:20233: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:20680: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20236: \$? = $ac_status" >&5 + echo "$as_me:20683: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:20239: \"$ac_try\"") >&5 + { (eval echo "$as_me:20686: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20242: \$? = $ac_status" >&5 + echo "$as_me:20689: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_getopt_header=$cf_header break @@ -20251,7 +20698,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:20254: result: $cf_cv_getopt_header" >&5 +echo "$as_me:20701: result: $cf_cv_getopt_header" >&5 echo "${ECHO_T}$cf_cv_getopt_header" >&6 if test "$cf_cv_getopt_header" != none ; then @@ -20268,14 +20715,14 @@ EOF fi -echo "$as_me:20271: checking if external environ is declared" >&5 +echo "$as_me:20718: checking if external environ is declared" >&5 echo $ECHO_N "checking if external environ is declared... $ECHO_C" >&6 if test "${cf_cv_dcl_environ+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 20278 "configure" +#line 20725 "configure" #include "confdefs.h" $ac_includes_default @@ -20288,16 +20735,16 @@ void* x = (void*) environ; (void)x } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:20291: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:20738: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20294: \$? = $ac_status" >&5 + echo "$as_me:20741: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:20297: \"$ac_try\"") >&5 + { (eval echo "$as_me:20744: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20300: \$? = $ac_status" >&5 + echo "$as_me:20747: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_dcl_environ=yes else @@ -20308,7 +20755,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:20311: result: $cf_cv_dcl_environ" >&5 +echo "$as_me:20758: result: $cf_cv_dcl_environ" >&5 echo "${ECHO_T}$cf_cv_dcl_environ" >&6 if test "$cf_cv_dcl_environ" = no ; then @@ -20323,14 +20770,14 @@ fi # It's possible (for near-UNIX clones) that the data doesn't exist -echo "$as_me:20326: checking if external environ exists" >&5 +echo "$as_me:20773: checking if external environ exists" >&5 echo $ECHO_N "checking if external environ exists... $ECHO_C" >&6 if test "${cf_cv_have_environ+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 20333 "configure" +#line 20780 "configure" #include "confdefs.h" #undef environ @@ -20345,16 +20792,16 @@ environ = 2 } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:20348: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20795: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20351: \$? = $ac_status" >&5 + echo "$as_me:20798: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:20354: \"$ac_try\"") >&5 + { (eval echo "$as_me:20801: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20357: \$? = $ac_status" >&5 + echo "$as_me:20804: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_have_environ=yes else @@ -20365,7 +20812,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:20368: result: $cf_cv_have_environ" >&5 +echo "$as_me:20815: result: $cf_cv_have_environ" >&5 echo "${ECHO_T}$cf_cv_have_environ" >&6 if test "$cf_cv_have_environ" = yes ; then @@ -20378,13 +20825,13 @@ EOF fi -echo "$as_me:20381: checking for getenv" >&5 +echo "$as_me:20828: checking for getenv" >&5 echo $ECHO_N "checking for getenv... $ECHO_C" >&6 if test "${ac_cv_func_getenv+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 20387 "configure" +#line 20834 "configure" #include "confdefs.h" #define getenv autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -20415,16 +20862,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:20418: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20865: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20421: \$? = $ac_status" >&5 + echo "$as_me:20868: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:20424: \"$ac_try\"") >&5 + { (eval echo "$as_me:20871: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20427: \$? = $ac_status" >&5 + echo "$as_me:20874: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_getenv=yes else @@ -20434,19 +20881,19 @@ ac_cv_func_getenv=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:20437: result: $ac_cv_func_getenv" >&5 +echo "$as_me:20884: result: $ac_cv_func_getenv" >&5 echo "${ECHO_T}$ac_cv_func_getenv" >&6 for ac_func in putenv setenv strdup do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:20443: checking for $ac_func" >&5 +echo "$as_me:20890: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 20449 "configure" +#line 20896 "configure" #include "confdefs.h" #define $ac_func autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -20477,16 +20924,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:20480: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20927: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20483: \$? = $ac_status" >&5 + echo "$as_me:20930: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:20486: \"$ac_try\"") >&5 + { (eval echo "$as_me:20933: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20489: \$? = $ac_status" >&5 + echo "$as_me:20936: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then eval "$as_ac_var=yes" else @@ -20496,7 +20943,7 @@ eval "$as_ac_var=no" fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:20499: result: `eval echo '${'"$as_ac_var"'}'`" >&5 +echo "$as_me:20946: result: `eval echo '${'"$as_ac_var"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then cat >>confdefs.h <&5 +echo "$as_me:20956: checking if getenv returns consistent values" >&5 echo $ECHO_N "checking if getenv returns consistent values... $ECHO_C" >&6 if test "${cf_cv_consistent_getenv+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -20516,7 +20963,7 @@ if test "$cross_compiling" = yes; then cf_cv_consistent_getenv=unknown else cat >"conftest.$ac_ext" <<_ACEOF -#line 20519 "configure" +#line 20966 "configure" #include "confdefs.h" $ac_includes_default @@ -20560,7 +21007,7 @@ int main(void) for (j = 0; environ[j]; ++j) { mynames[j] = str_alloc(environ[j]); equals = strchr(mynames[j], '='); - if (equals != 0) { + if (equals != NULL) { *equals++ = '\\0'; myvalues[j] = str_alloc(equals); } else { @@ -20585,7 +21032,7 @@ int main(void) } } } while (found); - sprintf(value, "%lu:%p", (unsigned long) k, &mynames[j]); + sprintf(value, "%lu:%p", (unsigned long) k, (void*)&mynames[j]); set_value(name, value); mynames[j] = str_alloc(name); myvalues[j] = str_alloc(value); @@ -20621,15 +21068,15 @@ int main(void) _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:20624: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21071: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20627: \$? = $ac_status" >&5 + echo "$as_me:21074: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:20629: \"$ac_try\"") >&5 + { (eval echo "$as_me:21076: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20632: \$? = $ac_status" >&5 + echo "$as_me:21079: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_consistent_getenv=yes else @@ -20642,7 +21089,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes fi fi -echo "$as_me:20645: result: $cf_cv_consistent_getenv" >&5 +echo "$as_me:21092: result: $cf_cv_consistent_getenv" >&5 echo "${ECHO_T}$cf_cv_consistent_getenv" >&6 if test "x$cf_cv_consistent_getenv" = xno @@ -20657,18 +21104,18 @@ fi if test "x$cf_cv_consistent_getenv" = xno && \ test "x$cf_with_trace" = xyes then - { echo "$as_me:20660: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&5 + { echo "$as_me:21107: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&5 echo "$as_me: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&2;} fi -echo "$as_me:20664: checking if sys/time.h works with sys/select.h" >&5 +echo "$as_me:21111: checking if sys/time.h works with sys/select.h" >&5 echo $ECHO_N "checking if sys/time.h works with sys/select.h... $ECHO_C" >&6 if test "${cf_cv_sys_time_select+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 20671 "configure" +#line 21118 "configure" #include "confdefs.h" #include @@ -20688,16 +21135,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:20691: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:21138: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20694: \$? = $ac_status" >&5 + echo "$as_me:21141: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:20697: \"$ac_try\"") >&5 + { (eval echo "$as_me:21144: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20700: \$? = $ac_status" >&5 + echo "$as_me:21147: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_sys_time_select=yes else @@ -20709,7 +21156,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:20712: result: $cf_cv_sys_time_select" >&5 +echo "$as_me:21159: result: $cf_cv_sys_time_select" >&5 echo "${ECHO_T}$cf_cv_sys_time_select" >&6 test "$cf_cv_sys_time_select" = yes && cat >>confdefs.h <<\EOF @@ -20724,13 +21171,13 @@ ac_link='$CC -o "conftest$ac_exeext" $CFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac_ex ac_compiler_gnu=$ac_cv_c_compiler_gnu ac_main_return="return" -echo "$as_me:20727: checking for an ANSI C-conforming const" >&5 +echo "$as_me:21174: checking for an ANSI C-conforming const" >&5 echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6 if test "${ac_cv_c_const+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 20733 "configure" +#line 21180 "configure" #include "confdefs.h" int @@ -20762,16 +21209,19 @@ main (void) char const *s = 0 ? (char *) 0 : (char const *) 0; *t++ = 0; + (void)s; (void)x; (void)zero; } { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */ int x[] = {25, 17}; const int *foo = &x[0]; ++foo; + (void)foo; } { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */ typedef const int *iptr; iptr p = 0; ++p; + (void)p; } { /* AIX XL C 1.02.0.0 rejects this saying "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ @@ -20780,6 +21230,7 @@ main (void) } { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ const int foo = 10; + (void)foo; } #endif @@ -20788,16 +21239,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:20791: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:21242: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20794: \$? = $ac_status" >&5 + echo "$as_me:21245: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:20797: \"$ac_try\"") >&5 + { (eval echo "$as_me:21248: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20800: \$? = $ac_status" >&5 + echo "$as_me:21251: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_c_const=yes else @@ -20807,7 +21258,7 @@ ac_cv_c_const=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:20810: result: $ac_cv_c_const" >&5 +echo "$as_me:21261: result: $ac_cv_c_const" >&5 echo "${ECHO_T}$ac_cv_c_const" >&6 if test $ac_cv_c_const = no; then @@ -20817,7 +21268,7 @@ EOF fi -echo "$as_me:20820: checking for inline" >&5 +echo "$as_me:21271: checking for inline" >&5 echo $ECHO_N "checking for inline... $ECHO_C" >&6 if test "${ac_cv_c_inline+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -20825,25 +21276,25 @@ else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat >"conftest.$ac_ext" <<_ACEOF -#line 20828 "configure" +#line 21279 "configure" #include "confdefs.h" #ifndef __cplusplus -static $ac_kw int static_foo () {return 0; } -$ac_kw int foo () {return 0; } +static $ac_kw int static_foo (void) {return 0; } +$ac_kw int foo (void) {return 0; } #endif _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:20837: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:21288: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20840: \$? = $ac_status" >&5 + echo "$as_me:21291: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:20843: \"$ac_try\"") >&5 + { (eval echo "$as_me:21294: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20846: \$? = $ac_status" >&5 + echo "$as_me:21297: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_c_inline=$ac_kw; break else @@ -20854,7 +21305,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:20857: result: $ac_cv_c_inline" >&5 +echo "$as_me:21308: result: $ac_cv_c_inline" >&5 echo "${ECHO_T}$ac_cv_c_inline" >&6 case $ac_cv_c_inline in inline | yes) ;; @@ -20880,7 +21331,7 @@ if test "$ac_cv_c_inline" != no ; then : elif test "$GCC" = yes then - echo "$as_me:20883: checking if $CC supports options to tune inlining" >&5 + echo "$as_me:21334: checking if $CC supports options to tune inlining" >&5 echo $ECHO_N "checking if $CC supports options to tune inlining... $ECHO_C" >&6 if test "${cf_cv_gcc_inline+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -20889,7 +21340,7 @@ else cf_save_CFLAGS=$CFLAGS CFLAGS="$CFLAGS --param max-inline-insns-single=1200" cat >"conftest.$ac_ext" <<_ACEOF -#line 20892 "configure" +#line 21343 "configure" #include "confdefs.h" inline int foo(void) { return 1; } int @@ -20901,16 +21352,16 @@ ${cf_cv_main_return:-return} foo() } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:20904: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:21355: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20907: \$? = $ac_status" >&5 + echo "$as_me:21358: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:20910: \"$ac_try\"") >&5 + { (eval echo "$as_me:21361: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20913: \$? = $ac_status" >&5 + echo "$as_me:21364: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_gcc_inline=yes else @@ -20922,7 +21373,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" CFLAGS=$cf_save_CFLAGS fi -echo "$as_me:20925: result: $cf_cv_gcc_inline" >&5 +echo "$as_me:21376: result: $cf_cv_gcc_inline" >&5 echo "${ECHO_T}$cf_cv_gcc_inline" >&6 if test "$cf_cv_gcc_inline" = yes ; then @@ -21028,7 +21479,7 @@ fi fi fi -echo "$as_me:21031: checking for signal global datatype" >&5 +echo "$as_me:21482: checking for signal global datatype" >&5 echo $ECHO_N "checking for signal global datatype... $ECHO_C" >&6 if test "${cf_cv_sig_atomic_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -21040,7 +21491,7 @@ else "int" do cat >"conftest.$ac_ext" <<_ACEOF -#line 21043 "configure" +#line 21494 "configure" #include "confdefs.h" #include @@ -21064,16 +21515,16 @@ signal(SIGINT, handler); } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:21067: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:21518: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:21070: \$? = $ac_status" >&5 + echo "$as_me:21521: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:21073: \"$ac_try\"") >&5 + { (eval echo "$as_me:21524: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21076: \$? = $ac_status" >&5 + echo "$as_me:21527: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_sig_atomic_t=$cf_type else @@ -21087,7 +21538,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:21090: result: $cf_cv_sig_atomic_t" >&5 +echo "$as_me:21541: result: $cf_cv_sig_atomic_t" >&5 echo "${ECHO_T}$cf_cv_sig_atomic_t" >&6 test "$cf_cv_sig_atomic_t" != no && cat >>confdefs.h <&5 +echo "$as_me:21550: checking for type of chtype" >&5 echo $ECHO_N "checking for type of chtype... $ECHO_C" >&6 if test "${cf_cv_typeof_chtype+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -21106,7 +21557,7 @@ else cf_cv_typeof_chtype=long else cat >"conftest.$ac_ext" <<_ACEOF -#line 21109 "configure" +#line 21560 "configure" #include "confdefs.h" $ac_includes_default @@ -21114,7 +21565,7 @@ $ac_includes_default int main(void) { FILE *fp = fopen("cf_test.out", "w"); - if (fp != 0) { + if (fp != NULL) { char *result = "long"; if (sizeof(unsigned long) > sizeof(unsigned int)) { int n; @@ -21141,15 +21592,15 @@ int main(void) _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:21144: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21595: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21147: \$? = $ac_status" >&5 + echo "$as_me:21598: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:21149: \"$ac_try\"") >&5 + { (eval echo "$as_me:21600: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21152: \$? = $ac_status" >&5 + echo "$as_me:21603: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_typeof_chtype=`cat cf_test.out` else @@ -21164,7 +21615,7 @@ fi fi -echo "$as_me:21167: result: $cf_cv_typeof_chtype" >&5 +echo "$as_me:21618: result: $cf_cv_typeof_chtype" >&5 echo "${ECHO_T}$cf_cv_typeof_chtype" >&6 cat >>confdefs.h <&5 +echo "$as_me:21630: checking if unsigned literals are legal" >&5 echo $ECHO_N "checking if unsigned literals are legal... $ECHO_C" >&6 if test "${cf_cv_unsigned_literals+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 21186 "configure" +#line 21637 "configure" #include "confdefs.h" int main (void) { -long x = 1L + 1UL + 1U + 1 +long x = 1L + 1UL + 1U + 1; (void)x ; return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:21198: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:21649: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:21201: \$? = $ac_status" >&5 + echo "$as_me:21652: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:21204: \"$ac_try\"") >&5 + { (eval echo "$as_me:21655: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21207: \$? = $ac_status" >&5 + echo "$as_me:21658: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_unsigned_literals=yes else @@ -21216,7 +21667,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:21219: result: $cf_cv_unsigned_literals" >&5 +echo "$as_me:21670: result: $cf_cv_unsigned_literals" >&5 echo "${ECHO_T}$cf_cv_unsigned_literals" >&6 cf_cv_1UL="1" @@ -21232,14 +21683,14 @@ test "$cf_cv_typeof_mmask_t" = unsigned && cf_cv_typeof_mmask_t="" ### Checks for external-data -echo "$as_me:21235: checking if external errno is declared" >&5 +echo "$as_me:21686: checking if external errno is declared" >&5 echo $ECHO_N "checking if external errno is declared... $ECHO_C" >&6 if test "${cf_cv_dcl_errno+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 21242 "configure" +#line 21693 "configure" #include "confdefs.h" $ac_includes_default @@ -21253,16 +21704,16 @@ int x = (int) errno; (void)x } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:21256: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:21707: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:21259: \$? = $ac_status" >&5 + echo "$as_me:21710: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:21262: \"$ac_try\"") >&5 + { (eval echo "$as_me:21713: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21265: \$? = $ac_status" >&5 + echo "$as_me:21716: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_dcl_errno=yes else @@ -21273,7 +21724,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:21276: result: $cf_cv_dcl_errno" >&5 +echo "$as_me:21727: result: $cf_cv_dcl_errno" >&5 echo "${ECHO_T}$cf_cv_dcl_errno" >&6 if test "$cf_cv_dcl_errno" = no ; then @@ -21288,14 +21739,14 @@ fi # It's possible (for near-UNIX clones) that the data doesn't exist -echo "$as_me:21291: checking if external errno exists" >&5 +echo "$as_me:21742: checking if external errno exists" >&5 echo $ECHO_N "checking if external errno exists... $ECHO_C" >&6 if test "${cf_cv_have_errno+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 21298 "configure" +#line 21749 "configure" #include "confdefs.h" #undef errno @@ -21310,16 +21761,16 @@ errno = 2 } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:21313: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21764: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21316: \$? = $ac_status" >&5 + echo "$as_me:21767: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:21319: \"$ac_try\"") >&5 + { (eval echo "$as_me:21770: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21322: \$? = $ac_status" >&5 + echo "$as_me:21773: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_have_errno=yes else @@ -21330,7 +21781,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:21333: result: $cf_cv_have_errno" >&5 +echo "$as_me:21784: result: $cf_cv_have_errno" >&5 echo "${ECHO_T}$cf_cv_have_errno" >&6 if test "$cf_cv_have_errno" = yes ; then @@ -21343,7 +21794,7 @@ EOF fi -echo "$as_me:21346: checking if data-only library module links" >&5 +echo "$as_me:21797: checking if data-only library module links" >&5 echo $ECHO_N "checking if data-only library module links... $ECHO_C" >&6 if test "${cf_cv_link_dataonly+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -21351,36 +21802,40 @@ else rm -f conftest.a cat >conftest.$ac_ext <&5 + if { (eval echo "$as_me:21808: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:21360: \$? = $ac_status" >&5 + echo "$as_me:21811: \$? = $ac_status" >&5 (exit "$ac_status"); } ; then mv conftest.o data.o && \ ( $AR $ARFLAGS conftest.a data.o ) 2>&5 1>/dev/null fi rm -f conftest.$ac_ext data.o cat >conftest.$ac_ext <&5 + if { (eval echo "$as_me:21835: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:21383: \$? = $ac_status" >&5 + echo "$as_me:21838: \$? = $ac_status" >&5 (exit "$ac_status"); }; then mv conftest.o func.o && \ ( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null @@ -21393,26 +21848,26 @@ EOF cf_cv_link_dataonly=unknown else cat >"conftest.$ac_ext" <<_ACEOF -#line 21396 "configure" +#line 21851 "configure" #include "confdefs.h" + extern int testfunc(void); int main(void) { - extern int testfunc(); ${cf_cv_main_return:-return} (!testfunc()); } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:21407: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21862: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21410: \$? = $ac_status" >&5 + echo "$as_me:21865: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:21412: \"$ac_try\"") >&5 + { (eval echo "$as_me:21867: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21415: \$? = $ac_status" >&5 + echo "$as_me:21870: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_link_dataonly=yes else @@ -21427,7 +21882,7 @@ fi fi -echo "$as_me:21430: result: $cf_cv_link_dataonly" >&5 +echo "$as_me:21885: result: $cf_cv_link_dataonly" >&5 echo "${ECHO_T}$cf_cv_link_dataonly" >&6 if test "$cf_cv_link_dataonly" = no ; then @@ -21441,36 +21896,162 @@ fi ### Checks for library functions. -echo "$as_me:21444: checking for clock_gettime" >&5 +cf_save_libs="$LIBS" +echo "$as_me:21900: checking for clock_gettime" >&5 echo $ECHO_N "checking for clock_gettime... $ECHO_C" >&6 +if test "${ac_cv_func_clock_gettime+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >"conftest.$ac_ext" <<_ACEOF +#line 21906 "configure" +#include "confdefs.h" +#define clock_gettime autoconf_temporary +#include /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef clock_gettime + +#ifdef __cplusplus +extern "C" +#endif + +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char clock_gettime (void); + +int +main (void) +{ + +/* The GNU C library defines stubs for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_clock_gettime) || defined (__stub___clock_gettime) +#error found stub for clock_gettime +#endif + + return clock_gettime (); + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:21937: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:21940: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:21943: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:21946: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_clock_gettime=yes +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +ac_cv_func_clock_gettime=no +fi +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" +fi +echo "$as_me:21956: result: $ac_cv_func_clock_gettime" >&5 +echo "${ECHO_T}$ac_cv_func_clock_gettime" >&6 +if test "$ac_cv_func_clock_gettime" = yes; then + cf_cv_test_clock_gettime=yes +else + echo "$as_me:21961: checking for clock_gettime in -lrt" >&5 +echo $ECHO_N "checking for clock_gettime in -lrt... $ECHO_C" >&6 +if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lrt $LIBS" +cat >"conftest.$ac_ext" <<_ACEOF +#line 21969 "configure" +#include "confdefs.h" + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char clock_gettime (void); +int +main (void) +{ +clock_gettime (); + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:21988: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:21991: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:21994: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:21997: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_rt_clock_gettime=yes +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +ac_cv_lib_rt_clock_gettime=no +fi +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:22008: result: $ac_cv_lib_rt_clock_gettime" >&5 +echo "${ECHO_T}$ac_cv_lib_rt_clock_gettime" >&6 +if test "$ac_cv_lib_rt_clock_gettime" = yes; then + LIBS="-lrt $LIBS" + cf_cv_test_clock_gettime=yes +else + cf_cv_test_clock_gettime=no +fi + +fi + +if test "$cf_cv_test_clock_gettime" = yes ; then +echo "$as_me:22020: checking if clock_gettime links" >&5 +echo $ECHO_N "checking if clock_gettime links... $ECHO_C" >&6 if test "${cf_cv_func_clock_gettime+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 21451 "configure" +#line 22027 "configure" #include "confdefs.h" + +$ac_includes_default #include + int main (void) { struct timespec ts; - int rc = clock_gettime(CLOCK_REALTIME, &ts); (void) rc; (void)ts + int rc = clock_gettime(CLOCK_REALTIME, &ts) + + clock_gettime(CLOCK_MONOTONIC, &ts); + (void) rc; (void)ts ; return 0; } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:21464: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22045: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21467: \$? = $ac_status" >&5 + echo "$as_me:22048: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:21470: \"$ac_try\"") >&5 + { (eval echo "$as_me:22051: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21473: \$? = $ac_status" >&5 + echo "$as_me:22054: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_func_clock_gettime=yes else @@ -21481,8 +22062,11 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:21484: result: $cf_cv_func_clock_gettime" >&5 +echo "$as_me:22065: result: $cf_cv_func_clock_gettime" >&5 echo "${ECHO_T}$cf_cv_func_clock_gettime" >&6 +else + cf_cv_func_clock_gettime=no +fi if test "$cf_cv_func_clock_gettime" = yes then @@ -21492,13 +22076,13 @@ cat >>confdefs.h <<\EOF EOF else -echo "$as_me:21495: checking for gettimeofday" >&5 +echo "$as_me:22079: checking for gettimeofday" >&5 echo $ECHO_N "checking for gettimeofday... $ECHO_C" >&6 if test "${ac_cv_func_gettimeofday+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 21501 "configure" +#line 22085 "configure" #include "confdefs.h" #define gettimeofday autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -21529,16 +22113,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:21532: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22116: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21535: \$? = $ac_status" >&5 + echo "$as_me:22119: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:21538: \"$ac_try\"") >&5 + { (eval echo "$as_me:22122: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21541: \$? = $ac_status" >&5 + echo "$as_me:22125: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_gettimeofday=yes else @@ -21548,7 +22132,7 @@ ac_cv_func_gettimeofday=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:21551: result: $ac_cv_func_gettimeofday" >&5 +echo "$as_me:22135: result: $ac_cv_func_gettimeofday" >&5 echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6 if test "$ac_cv_func_gettimeofday" = yes; then @@ -21558,7 +22142,7 @@ EOF else -echo "$as_me:21561: checking for gettimeofday in -lbsd" >&5 +echo "$as_me:22145: checking for gettimeofday in -lbsd" >&5 echo $ECHO_N "checking for gettimeofday in -lbsd... $ECHO_C" >&6 if test "${ac_cv_lib_bsd_gettimeofday+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -21566,7 +22150,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lbsd $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 21569 "configure" +#line 22153 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -21575,7 +22159,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char gettimeofday (); +char gettimeofday (void); int main (void) { @@ -21585,16 +22169,16 @@ gettimeofday (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:21588: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22172: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21591: \$? = $ac_status" >&5 + echo "$as_me:22175: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:21594: \"$ac_try\"") >&5 + { (eval echo "$as_me:22178: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21597: \$? = $ac_status" >&5 + echo "$as_me:22181: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_bsd_gettimeofday=yes else @@ -21605,7 +22189,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:21608: result: $ac_cv_lib_bsd_gettimeofday" >&5 +echo "$as_me:22192: result: $ac_cv_lib_bsd_gettimeofday" >&5 echo "${ECHO_T}$ac_cv_lib_bsd_gettimeofday" >&6 if test "$ac_cv_lib_bsd_gettimeofday" = yes; then @@ -21637,18 +22221,18 @@ fi for ac_func in \ fpathconf \ getcwd \ +getauxval \ getegid \ geteuid \ getopt \ +getuid \ issetugid \ localeconv \ poll \ -putenv \ remove \ select \ setbuf \ setbuffer \ -setenv \ setfsuid \ setvbuf \ sigaction \ @@ -21664,13 +22248,13 @@ vsnprintf \ do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:21667: checking for $ac_func" >&5 +echo "$as_me:22251: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 21673 "configure" +#line 22257 "configure" #include "confdefs.h" #define $ac_func autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -21701,16 +22285,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:21704: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22288: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21707: \$? = $ac_status" >&5 + echo "$as_me:22291: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:21710: \"$ac_try\"") >&5 + { (eval echo "$as_me:22294: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21713: \$? = $ac_status" >&5 + echo "$as_me:22297: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then eval "$as_ac_var=yes" else @@ -21720,7 +22304,7 @@ eval "$as_ac_var=no" fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:21723: result: `eval echo '${'"$as_ac_var"'}'`" >&5 +echo "$as_me:22307: result: `eval echo '${'"$as_ac_var"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then cat >>confdefs.h <&5 +echo "$as_me:22317: checking if _PATH_TTYS is defined in ttyent.h" >&5 echo $ECHO_N "checking if _PATH_TTYS is defined in ttyent.h... $ECHO_C" >&6 if test "${cf_cv_PATH_TTYS+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 21740 "configure" +#line 22324 "configure" #include "confdefs.h" #include @@ -21752,16 +22336,16 @@ FILE *fp = fopen(_PATH_TTYS, "r"); (void)fp } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:21755: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:22339: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:21758: \$? = $ac_status" >&5 + echo "$as_me:22342: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:21761: \"$ac_try\"") >&5 + { (eval echo "$as_me:22345: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21764: \$? = $ac_status" >&5 + echo "$as_me:22348: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_PATH_TTYS=yes else @@ -21771,7 +22355,7 @@ cf_cv_PATH_TTYS=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:21774: result: $cf_cv_PATH_TTYS" >&5 +echo "$as_me:22358: result: $cf_cv_PATH_TTYS" >&5 echo "${ECHO_T}$cf_cv_PATH_TTYS" >&6 if test $cf_cv_PATH_TTYS = no @@ -21793,7 +22377,7 @@ fi if test $cf_cv_PATH_TTYS != no then - echo "$as_me:21796: checking if _PATH_TTYS file exists" >&5 + echo "$as_me:22380: checking if _PATH_TTYS file exists" >&5 echo $ECHO_N "checking if _PATH_TTYS file exists... $ECHO_C" >&6 if test "${cf_cv_have_PATH_TTYS+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -21803,7 +22387,7 @@ else cf_cv_have_PATH_TTYS=unknown else cat >"conftest.$ac_ext" <<_ACEOF -#line 21806 "configure" +#line 22390 "configure" #include "confdefs.h" $ac_includes_default @@ -21812,19 +22396,19 @@ $ac_includes_default int main(void) { FILE *fp = fopen(_PATH_TTYS, "r"); - ${cf_cv_main_return:-return} (fp == 0); + ${cf_cv_main_return:-return} (fp == NULL); } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:21819: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22403: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21822: \$? = $ac_status" >&5 + echo "$as_me:22406: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:21824: \"$ac_try\"") >&5 + { (eval echo "$as_me:22408: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21827: \$? = $ac_status" >&5 + echo "$as_me:22411: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_have_PATH_TTYS=yes else @@ -21836,7 +22420,7 @@ fi rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext" fi fi -echo "$as_me:21839: result: $cf_cv_have_PATH_TTYS" >&5 +echo "$as_me:22423: result: $cf_cv_have_PATH_TTYS" >&5 echo "${ECHO_T}$cf_cv_have_PATH_TTYS" >&6 test "$cf_cv_have_PATH_TTYS" = no && cf_cv_PATH_TTYS=no fi @@ -21848,14 +22432,14 @@ cat >>confdefs.h <<\EOF #define HAVE_PATH_TTYS 1 EOF - echo "$as_me:21851: checking for getttynam" >&5 + echo "$as_me:22435: checking for getttynam" >&5 echo $ECHO_N "checking for getttynam... $ECHO_C" >&6 if test "${cf_cv_func_getttynam+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 21858 "configure" +#line 22442 "configure" #include "confdefs.h" #include int @@ -21867,16 +22451,16 @@ struct ttyent *fp = getttynam("/dev/tty"); (void)fp } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:21870: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22454: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21873: \$? = $ac_status" >&5 + echo "$as_me:22457: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:21876: \"$ac_try\"") >&5 + { (eval echo "$as_me:22460: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21879: \$? = $ac_status" >&5 + echo "$as_me:22463: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_func_getttynam=yes else @@ -21886,7 +22470,7 @@ cf_cv_func_getttynam=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:21889: result: $cf_cv_func_getttynam" >&5 +echo "$as_me:22473: result: $cf_cv_func_getttynam" >&5 echo "${ECHO_T}$cf_cv_func_getttynam" >&6 test "$cf_cv_func_getttynam" = yes && cat >>confdefs.h <<\EOF #define HAVE_GETTTYNAM 1 @@ -21896,7 +22480,7 @@ fi if test "x$ac_cv_func_getopt" = xno && \ test "x$cf_with_progs$cf_with_tests" != xnono; then - { { echo "$as_me:21899: error: getopt is required for building programs" >&5 + { { echo "$as_me:22483: error: getopt is required for building programs" >&5 echo "$as_me: error: getopt is required for building programs" >&2;} { (exit 1); exit 1; }; } fi @@ -21905,7 +22489,7 @@ if test "x$with_safe_sprintf" = xyes then if test "x$ac_cv_func_vsnprintf" = xyes then - { echo "$as_me:21908: WARNING: will use vsnprintf instead of safe-sprintf option" >&5 + { echo "$as_me:22492: WARNING: will use vsnprintf instead of safe-sprintf option" >&5 echo "$as_me: WARNING: will use vsnprintf instead of safe-sprintf option" >&2;} else @@ -21918,14 +22502,14 @@ fi if test "x$with_getcap" = "xyes" ; then -echo "$as_me:21921: checking for terminal-capability database functions" >&5 +echo "$as_me:22505: checking for terminal-capability database functions" >&5 echo $ECHO_N "checking for terminal-capability database functions... $ECHO_C" >&6 if test "${cf_cv_cgetent+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 21928 "configure" +#line 22512 "configure" #include "confdefs.h" $ac_includes_default @@ -21945,16 +22529,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:21948: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22532: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21951: \$? = $ac_status" >&5 + echo "$as_me:22535: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:21954: \"$ac_try\"") >&5 + { (eval echo "$as_me:22538: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21957: \$? = $ac_status" >&5 + echo "$as_me:22541: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_cgetent=yes else @@ -21965,7 +22549,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:21968: result: $cf_cv_cgetent" >&5 +echo "$as_me:22552: result: $cf_cv_cgetent" >&5 echo "${ECHO_T}$cf_cv_cgetent" >&6 if test "$cf_cv_cgetent" = yes @@ -21975,14 +22559,14 @@ cat >>confdefs.h <<\EOF #define HAVE_BSD_CGETENT 1 EOF -echo "$as_me:21978: checking if cgetent uses const parameter" >&5 +echo "$as_me:22562: checking if cgetent uses const parameter" >&5 echo $ECHO_N "checking if cgetent uses const parameter... $ECHO_C" >&6 if test "${cf_cv_cgetent_const+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 21985 "configure" +#line 22569 "configure" #include "confdefs.h" #pragma GCC diagnostic error "-Wincompatible-pointer-types-discards-qualifiers" @@ -22005,16 +22589,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:22008: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22592: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22011: \$? = $ac_status" >&5 + echo "$as_me:22595: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:22014: \"$ac_try\"") >&5 + { (eval echo "$as_me:22598: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22017: \$? = $ac_status" >&5 + echo "$as_me:22601: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_cgetent_const=yes else @@ -22025,7 +22609,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:22028: result: $cf_cv_cgetent_const" >&5 +echo "$as_me:22612: result: $cf_cv_cgetent_const" >&5 echo "${ECHO_T}$cf_cv_cgetent_const" >&6 if test "$cf_cv_cgetent_const" = yes then @@ -22039,35 +22623,35 @@ fi fi -echo "$as_me:22042: checking for isascii" >&5 +echo "$as_me:22626: checking for isascii" >&5 echo $ECHO_N "checking for isascii... $ECHO_C" >&6 if test "${cf_cv_have_isascii+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 22049 "configure" +#line 22633 "configure" #include "confdefs.h" #include int main (void) { -int x = isascii(' ') +int x = isascii(' '); (void)x ; return 0; } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:22061: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22645: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22064: \$? = $ac_status" >&5 + echo "$as_me:22648: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:22067: \"$ac_try\"") >&5 + { (eval echo "$as_me:22651: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22070: \$? = $ac_status" >&5 + echo "$as_me:22654: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_have_isascii=yes else @@ -22078,7 +22662,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:22081: result: $cf_cv_have_isascii" >&5 +echo "$as_me:22665: result: $cf_cv_have_isascii" >&5 echo "${ECHO_T}$cf_cv_have_isascii" >&6 test "$cf_cv_have_isascii" = yes && cat >>confdefs.h <<\EOF @@ -22086,10 +22670,10 @@ cat >>confdefs.h <<\EOF EOF if test "$ac_cv_func_sigaction" = yes; then -echo "$as_me:22089: checking whether sigaction needs _POSIX_SOURCE" >&5 +echo "$as_me:22673: checking whether sigaction needs _POSIX_SOURCE" >&5 echo $ECHO_N "checking whether sigaction needs _POSIX_SOURCE... $ECHO_C" >&6 cat >"conftest.$ac_ext" <<_ACEOF -#line 22092 "configure" +#line 22676 "configure" #include "confdefs.h" #include @@ -22097,22 +22681,22 @@ cat >"conftest.$ac_ext" <<_ACEOF int main (void) { -struct sigaction act +struct sigaction act; (void)act ; return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:22106: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:22690: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:22109: \$? = $ac_status" >&5 + echo "$as_me:22693: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:22112: \"$ac_try\"") >&5 + { (eval echo "$as_me:22696: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22115: \$? = $ac_status" >&5 + echo "$as_me:22699: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then sigact_bad=no else @@ -22120,7 +22704,7 @@ else cat "conftest.$ac_ext" >&5 cat >"conftest.$ac_ext" <<_ACEOF -#line 22123 "configure" +#line 22707 "configure" #include "confdefs.h" #define _POSIX_SOURCE @@ -22129,22 +22713,22 @@ cat >"conftest.$ac_ext" <<_ACEOF int main (void) { -struct sigaction act +struct sigaction act; (void)act ; return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:22138: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:22722: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:22141: \$? = $ac_status" >&5 + echo "$as_me:22725: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:22144: \"$ac_try\"") >&5 + { (eval echo "$as_me:22728: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22147: \$? = $ac_status" >&5 + echo "$as_me:22731: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then sigact_bad=yes @@ -22160,11 +22744,11 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" -echo "$as_me:22163: result: $sigact_bad" >&5 +echo "$as_me:22747: result: $sigact_bad" >&5 echo "${ECHO_T}$sigact_bad" >&6 fi -echo "$as_me:22167: checking if nanosleep really works" >&5 +echo "$as_me:22751: checking if nanosleep really works" >&5 echo $ECHO_N "checking if nanosleep really works... $ECHO_C" >&6 if test "${cf_cv_func_nanosleep+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -22174,7 +22758,7 @@ if test "$cross_compiling" = yes; then cf_cv_func_nanosleep=unknown else cat >"conftest.$ac_ext" <<_ACEOF -#line 22177 "configure" +#line 22761 "configure" #include "confdefs.h" $ac_includes_default @@ -22200,15 +22784,15 @@ int main(void) { _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:22203: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22787: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22206: \$? = $ac_status" >&5 + echo "$as_me:22790: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:22208: \"$ac_try\"") >&5 + { (eval echo "$as_me:22792: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22211: \$? = $ac_status" >&5 + echo "$as_me:22795: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_func_nanosleep=yes else @@ -22220,7 +22804,7 @@ fi rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext" fi fi -echo "$as_me:22223: result: $cf_cv_func_nanosleep" >&5 +echo "$as_me:22807: result: $cf_cv_func_nanosleep" >&5 echo "${ECHO_T}$cf_cv_func_nanosleep" >&6 test "$cf_cv_func_nanosleep" = "yes" && @@ -22237,23 +22821,23 @@ sys/termio.h \ do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:22240: checking for $ac_header" >&5 +echo "$as_me:22824: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 22246 "configure" +#line 22830 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:22250: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:22834: \"$ac_cpp "conftest.$ac_ext"\"") >&5 (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:22256: \$? = $ac_status" >&5 + echo "$as_me:22840: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -22272,7 +22856,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:22275: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:22859: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then cat >>confdefs.h <&5 + echo "$as_me:22876: checking whether termios.h needs _POSIX_SOURCE" >&5 echo $ECHO_N "checking whether termios.h needs _POSIX_SOURCE... $ECHO_C" >&6 cat >"conftest.$ac_ext" <<_ACEOF -#line 22295 "configure" +#line 22879 "configure" #include "confdefs.h" #include int main (void) { -struct termios foo; int x = foo.c_iflag = 1; (void)x +struct termios foo; int x = (int)(foo.c_iflag = 1); (void)x ; return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:22307: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:22891: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:22310: \$? = $ac_status" >&5 + echo "$as_me:22894: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:22313: \"$ac_try\"") >&5 + { (eval echo "$as_me:22897: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22316: \$? = $ac_status" >&5 + echo "$as_me:22900: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then termios_bad=no else @@ -22321,7 +22905,7 @@ else cat "conftest.$ac_ext" >&5 cat >"conftest.$ac_ext" <<_ACEOF -#line 22324 "configure" +#line 22908 "configure" #include "confdefs.h" #define _POSIX_SOURCE @@ -22329,22 +22913,22 @@ cat "conftest.$ac_ext" >&5 int main (void) { -struct termios foo; int x = foo.c_iflag = 2; (void)x +struct termios foo; int x = (int)(foo.c_iflag = 2); (void)x ; return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:22338: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:22922: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:22341: \$? = $ac_status" >&5 + echo "$as_me:22925: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:22344: \"$ac_try\"") >&5 + { (eval echo "$as_me:22928: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22347: \$? = $ac_status" >&5 + echo "$as_me:22931: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then termios_bad=unknown else @@ -22360,19 +22944,19 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" - echo "$as_me:22363: result: $termios_bad" >&5 + echo "$as_me:22947: result: $termios_bad" >&5 echo "${ECHO_T}$termios_bad" >&6 fi fi -echo "$as_me:22368: checking for tcgetattr" >&5 +echo "$as_me:22952: checking for tcgetattr" >&5 echo $ECHO_N "checking for tcgetattr... $ECHO_C" >&6 if test "${cf_cv_have_tcgetattr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 22375 "configure" +#line 22959 "configure" #include "confdefs.h" #include @@ -22400,16 +22984,16 @@ tcgetattr(1, &foo); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:22403: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22987: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22406: \$? = $ac_status" >&5 + echo "$as_me:22990: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:22409: \"$ac_try\"") >&5 + { (eval echo "$as_me:22993: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22412: \$? = $ac_status" >&5 + echo "$as_me:22996: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_have_tcgetattr=yes else @@ -22419,46 +23003,56 @@ cf_cv_have_tcgetattr=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:22422: result: $cf_cv_have_tcgetattr" >&5 +echo "$as_me:23006: result: $cf_cv_have_tcgetattr" >&5 echo "${ECHO_T}$cf_cv_have_tcgetattr" >&6 test "$cf_cv_have_tcgetattr" = yes && cat >>confdefs.h <<\EOF #define HAVE_TCGETATTR 1 EOF -echo "$as_me:22429: checking for vsscanf function or workaround" >&5 +echo "$as_me:23013: checking for vsscanf function or workaround" >&5 echo $ECHO_N "checking for vsscanf function or workaround... $ECHO_C" >&6 if test "${cf_cv_func_vsscanf+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 22436 "configure" +#line 23020 "configure" #include "confdefs.h" #include #include + +static void +myfunc(const char *str, const char *fmt, ...) +{ + va_list ap; + va_start(ap, fmt); + vsscanf(str, fmt, ap); + va_end(ap); +} + int main (void) { - va_list ap; - vsscanf("from", "%d", ap) + myfunc("55", "%d"); + ; return 0; } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:22452: \"$ac_link\"") >&5 +if { (eval echo "$as_me:23046: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22455: \$? = $ac_status" >&5 + echo "$as_me:23049: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:22458: \"$ac_try\"") >&5 + { (eval echo "$as_me:23052: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22461: \$? = $ac_status" >&5 + echo "$as_me:23055: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_func_vsscanf=vsscanf else @@ -22466,7 +23060,7 @@ else cat "conftest.$ac_ext" >&5 cat >"conftest.$ac_ext" <<_ACEOF -#line 22469 "configure" +#line 23063 "configure" #include "confdefs.h" #include @@ -22488,16 +23082,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:22491: \"$ac_link\"") >&5 +if { (eval echo "$as_me:23085: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22494: \$? = $ac_status" >&5 + echo "$as_me:23088: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:22497: \"$ac_try\"") >&5 + { (eval echo "$as_me:23091: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22500: \$? = $ac_status" >&5 + echo "$as_me:23094: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_func_vsscanf=vfscanf else @@ -22505,7 +23099,7 @@ else cat "conftest.$ac_ext" >&5 cat >"conftest.$ac_ext" <<_ACEOF -#line 22508 "configure" +#line 23102 "configure" #include "confdefs.h" #include @@ -22527,16 +23121,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:22530: \"$ac_link\"") >&5 +if { (eval echo "$as_me:23124: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22533: \$? = $ac_status" >&5 + echo "$as_me:23127: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:22536: \"$ac_try\"") >&5 + { (eval echo "$as_me:23130: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22539: \$? = $ac_status" >&5 + echo "$as_me:23133: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_func_vsscanf=_doscan else @@ -22551,7 +23145,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:22554: result: $cf_cv_func_vsscanf" >&5 +echo "$as_me:23148: result: $cf_cv_func_vsscanf" >&5 echo "${ECHO_T}$cf_cv_func_vsscanf" >&6 case "$cf_cv_func_vsscanf" in @@ -22577,23 +23171,23 @@ unistd.h \ do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:22580: checking for $ac_header" >&5 +echo "$as_me:23174: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 22586 "configure" +#line 23180 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:22590: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:23184: \"$ac_cpp "conftest.$ac_ext"\"") >&5 (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:22596: \$? = $ac_status" >&5 + echo "$as_me:23190: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -22612,7 +23206,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:22615: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:23209: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then cat >>confdefs.h <&5 +echo "$as_me:23219: checking for working mkstemp" >&5 echo $ECHO_N "checking for working mkstemp... $ECHO_C" >&6 if test "${cf_cv_func_mkstemp+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -22633,14 +23227,14 @@ if test "$cross_compiling" = yes; then cf_cv_func_mkstemp=maybe else cat >"conftest.$ac_ext" <<_ACEOF -#line 22636 "configure" +#line 23230 "configure" #include "confdefs.h" $ac_includes_default int main(void) { - char *tmpl = "conftestXXXXXX"; + static char tmpl[] = "conftestXXXXXX"; char name[2][80]; int n; int result = 0; @@ -22668,15 +23262,15 @@ int main(void) _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:22671: \"$ac_link\"") >&5 +if { (eval echo "$as_me:23265: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22674: \$? = $ac_status" >&5 + echo "$as_me:23268: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:22676: \"$ac_try\"") >&5 + { (eval echo "$as_me:23270: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22679: \$? = $ac_status" >&5 + echo "$as_me:23273: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_func_mkstemp=yes @@ -22691,16 +23285,16 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes fi fi -echo "$as_me:22694: result: $cf_cv_func_mkstemp" >&5 +echo "$as_me:23288: result: $cf_cv_func_mkstemp" >&5 echo "${ECHO_T}$cf_cv_func_mkstemp" >&6 if test "x$cf_cv_func_mkstemp" = xmaybe ; then - echo "$as_me:22697: checking for mkstemp" >&5 + echo "$as_me:23291: checking for mkstemp" >&5 echo $ECHO_N "checking for mkstemp... $ECHO_C" >&6 if test "${ac_cv_func_mkstemp+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 22703 "configure" +#line 23297 "configure" #include "confdefs.h" #define mkstemp autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -22731,16 +23325,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:22734: \"$ac_link\"") >&5 +if { (eval echo "$as_me:23328: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22737: \$? = $ac_status" >&5 + echo "$as_me:23331: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:22740: \"$ac_try\"") >&5 + { (eval echo "$as_me:23334: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22743: \$? = $ac_status" >&5 + echo "$as_me:23337: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_mkstemp=yes else @@ -22750,7 +23344,7 @@ ac_cv_func_mkstemp=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:22753: result: $ac_cv_func_mkstemp" >&5 +echo "$as_me:23347: result: $ac_cv_func_mkstemp" >&5 echo "${ECHO_T}$ac_cv_func_mkstemp" >&6 fi @@ -22771,21 +23365,21 @@ else fi if test "x$cross_compiling" = xyes ; then - { echo "$as_me:22774: WARNING: cross compiling: assume setvbuf params not reversed" >&5 + { echo "$as_me:23368: WARNING: cross compiling: assume setvbuf params not reversed" >&5 echo "$as_me: WARNING: cross compiling: assume setvbuf params not reversed" >&2;} else - echo "$as_me:22777: checking whether setvbuf arguments are reversed" >&5 + echo "$as_me:23371: checking whether setvbuf arguments are reversed" >&5 echo $ECHO_N "checking whether setvbuf arguments are reversed... $ECHO_C" >&6 if test "${ac_cv_func_setvbuf_reversed+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else if test "$cross_compiling" = yes; then - { { echo "$as_me:22783: error: cannot run test program while cross compiling" >&5 + { { echo "$as_me:23377: error: cannot run test program while cross compiling" >&5 echo "$as_me: error: cannot run test program while cross compiling" >&2;} { (exit 1); exit 1; }; } else cat >"conftest.$ac_ext" <<_ACEOF -#line 22788 "configure" +#line 23382 "configure" #include "confdefs.h" #include /* If setvbuf has the reversed format, exit 0. */ @@ -22798,19 +23392,19 @@ main (void) if (setvbuf(stdout, _IOLBF, (char *) main, BUFSIZ) != 0) $ac_main_return(1); putc('\r', stdout); - $ac_main_return(0); /* Non-reversed systems segv here. */ + $ac_main_return(0); /* Non-reversed systems segv here. */ } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:22805: \"$ac_link\"") >&5 +if { (eval echo "$as_me:23399: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22808: \$? = $ac_status" >&5 + echo "$as_me:23402: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:22810: \"$ac_try\"") >&5 + { (eval echo "$as_me:23404: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22813: \$? = $ac_status" >&5 + echo "$as_me:23407: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_setvbuf_reversed=yes else @@ -22823,7 +23417,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes fi rm -f core ./core.* ./*.core fi -echo "$as_me:22826: result: $ac_cv_func_setvbuf_reversed" >&5 +echo "$as_me:23420: result: $ac_cv_func_setvbuf_reversed" >&5 echo "${ECHO_T}$ac_cv_func_setvbuf_reversed" >&6 if test $ac_cv_func_setvbuf_reversed = yes; then @@ -22834,13 +23428,13 @@ EOF fi fi -echo "$as_me:22837: checking for intptr_t" >&5 +echo "$as_me:23431: checking for intptr_t" >&5 echo $ECHO_N "checking for intptr_t... $ECHO_C" >&6 if test "${ac_cv_type_intptr_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 22843 "configure" +#line 23437 "configure" #include "confdefs.h" $ac_includes_default int @@ -22855,16 +23449,16 @@ if (sizeof (intptr_t)) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:22858: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:23452: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:22861: \$? = $ac_status" >&5 + echo "$as_me:23455: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:22864: \"$ac_try\"") >&5 + { (eval echo "$as_me:23458: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22867: \$? = $ac_status" >&5 + echo "$as_me:23461: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_type_intptr_t=yes else @@ -22874,7 +23468,7 @@ ac_cv_type_intptr_t=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:22877: result: $ac_cv_type_intptr_t" >&5 +echo "$as_me:23471: result: $ac_cv_type_intptr_t" >&5 echo "${ECHO_T}$ac_cv_type_intptr_t" >&6 if test "$ac_cv_type_intptr_t" = yes; then : @@ -22886,13 +23480,13 @@ EOF fi -echo "$as_me:22889: checking for ssize_t" >&5 +echo "$as_me:23483: checking for ssize_t" >&5 echo $ECHO_N "checking for ssize_t... $ECHO_C" >&6 if test "${ac_cv_type_ssize_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 22895 "configure" +#line 23489 "configure" #include "confdefs.h" $ac_includes_default int @@ -22907,16 +23501,16 @@ if (sizeof (ssize_t)) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:22910: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:23504: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:22913: \$? = $ac_status" >&5 + echo "$as_me:23507: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:22916: \"$ac_try\"") >&5 + { (eval echo "$as_me:23510: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22919: \$? = $ac_status" >&5 + echo "$as_me:23513: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_type_ssize_t=yes else @@ -22926,7 +23520,7 @@ ac_cv_type_ssize_t=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:22929: result: $ac_cv_type_ssize_t" >&5 +echo "$as_me:23523: result: $ac_cv_type_ssize_t" >&5 echo "${ECHO_T}$ac_cv_type_ssize_t" >&6 if test "$ac_cv_type_ssize_t" = yes; then : @@ -22938,36 +23532,36 @@ EOF fi -echo "$as_me:22941: checking for type sigaction_t" >&5 +echo "$as_me:23535: checking for type sigaction_t" >&5 echo $ECHO_N "checking for type sigaction_t... $ECHO_C" >&6 if test "${cf_cv_type_sigaction+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 22948 "configure" +#line 23542 "configure" #include "confdefs.h" #include int main (void) { -sigaction_t x +sigaction_t x; (void)x ; return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:22961: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:23555: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:22964: \$? = $ac_status" >&5 + echo "$as_me:23558: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:22967: \"$ac_try\"") >&5 + { (eval echo "$as_me:23561: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22970: \$? = $ac_status" >&5 + echo "$as_me:23564: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_type_sigaction=yes else @@ -22978,14 +23572,14 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:22981: result: $cf_cv_type_sigaction" >&5 +echo "$as_me:23575: result: $cf_cv_type_sigaction" >&5 echo "${ECHO_T}$cf_cv_type_sigaction" >&6 test "$cf_cv_type_sigaction" = yes && cat >>confdefs.h <<\EOF #define HAVE_TYPE_SIGACTION 1 EOF -echo "$as_me:22988: checking declaration of size-change" >&5 +echo "$as_me:23582: checking declaration of size-change" >&5 echo $ECHO_N "checking declaration of size-change... $ECHO_C" >&6 if test "${cf_cv_sizechange+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -23006,7 +23600,7 @@ do fi cat >"conftest.$ac_ext" <<_ACEOF -#line 23009 "configure" +#line 23603 "configure" #include "confdefs.h" #include #ifdef HAVE_TERMIOS_H @@ -23056,16 +23650,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:23059: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:23653: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:23062: \$? = $ac_status" >&5 + echo "$as_me:23656: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:23065: \"$ac_try\"") >&5 + { (eval echo "$as_me:23659: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23068: \$? = $ac_status" >&5 + echo "$as_me:23662: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_sizechange=yes else @@ -23084,7 +23678,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:23087: result: $cf_cv_sizechange" >&5 +echo "$as_me:23681: result: $cf_cv_sizechange" >&5 echo "${ECHO_T}$cf_cv_sizechange" >&6 if test "$cf_cv_sizechange" != no ; then @@ -23102,13 +23696,13 @@ EOF esac fi -echo "$as_me:23105: checking for memmove" >&5 +echo "$as_me:23699: checking for memmove" >&5 echo $ECHO_N "checking for memmove... $ECHO_C" >&6 if test "${ac_cv_func_memmove+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 23111 "configure" +#line 23705 "configure" #include "confdefs.h" #define memmove autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -23139,16 +23733,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:23142: \"$ac_link\"") >&5 +if { (eval echo "$as_me:23736: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:23145: \$? = $ac_status" >&5 + echo "$as_me:23739: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:23148: \"$ac_try\"") >&5 + { (eval echo "$as_me:23742: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23151: \$? = $ac_status" >&5 + echo "$as_me:23745: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_memmove=yes else @@ -23158,19 +23752,19 @@ ac_cv_func_memmove=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:23161: result: $ac_cv_func_memmove" >&5 +echo "$as_me:23755: result: $ac_cv_func_memmove" >&5 echo "${ECHO_T}$ac_cv_func_memmove" >&6 if test "$ac_cv_func_memmove" = yes; then : else -echo "$as_me:23167: checking for bcopy" >&5 +echo "$as_me:23761: checking for bcopy" >&5 echo $ECHO_N "checking for bcopy... $ECHO_C" >&6 if test "${ac_cv_func_bcopy+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 23173 "configure" +#line 23767 "configure" #include "confdefs.h" #define bcopy autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -23201,16 +23795,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:23204: \"$ac_link\"") >&5 +if { (eval echo "$as_me:23798: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:23207: \$? = $ac_status" >&5 + echo "$as_me:23801: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:23210: \"$ac_try\"") >&5 + { (eval echo "$as_me:23804: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23213: \$? = $ac_status" >&5 + echo "$as_me:23807: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_bcopy=yes else @@ -23220,11 +23814,11 @@ ac_cv_func_bcopy=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:23223: result: $ac_cv_func_bcopy" >&5 +echo "$as_me:23817: result: $ac_cv_func_bcopy" >&5 echo "${ECHO_T}$ac_cv_func_bcopy" >&6 if test "$ac_cv_func_bcopy" = yes; then - echo "$as_me:23227: checking if bcopy does overlapping moves" >&5 + echo "$as_me:23821: checking if bcopy does overlapping moves" >&5 echo $ECHO_N "checking if bcopy does overlapping moves... $ECHO_C" >&6 if test "${cf_cv_good_bcopy+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -23234,7 +23828,7 @@ else cf_cv_good_bcopy=unknown else cat >"conftest.$ac_ext" <<_ACEOF -#line 23237 "configure" +#line 23831 "configure" #include "confdefs.h" $ac_includes_default @@ -23250,15 +23844,15 @@ int main(void) { _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:23253: \"$ac_link\"") >&5 +if { (eval echo "$as_me:23847: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:23256: \$? = $ac_status" >&5 + echo "$as_me:23850: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:23258: \"$ac_try\"") >&5 + { (eval echo "$as_me:23852: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23261: \$? = $ac_status" >&5 + echo "$as_me:23855: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_good_bcopy=yes else @@ -23271,7 +23865,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes fi fi -echo "$as_me:23274: result: $cf_cv_good_bcopy" >&5 +echo "$as_me:23868: result: $cf_cv_good_bcopy" >&5 echo "${ECHO_T}$cf_cv_good_bcopy" >&6 else @@ -23298,13 +23892,13 @@ tty >/dev/null 2>&1 || { for ac_func in posix_openpt do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:23301: checking for $ac_func" >&5 +echo "$as_me:23895: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 23307 "configure" +#line 23901 "configure" #include "confdefs.h" #define $ac_func autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -23335,16 +23929,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:23338: \"$ac_link\"") >&5 +if { (eval echo "$as_me:23932: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:23341: \$? = $ac_status" >&5 + echo "$as_me:23935: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:23344: \"$ac_try\"") >&5 + { (eval echo "$as_me:23938: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23347: \$? = $ac_status" >&5 + echo "$as_me:23941: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then eval "$as_ac_var=yes" else @@ -23354,7 +23948,7 @@ eval "$as_ac_var=no" fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:23357: result: `eval echo '${'"$as_ac_var"'}'`" >&5 +echo "$as_me:23951: result: `eval echo '${'"$as_ac_var"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then cat >>confdefs.h <&5 +echo "$as_me:23961: checking if poll really works" >&5 echo $ECHO_N "checking if poll really works... $ECHO_C" >&6 if test "${cf_cv_working_poll+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -23374,7 +23968,7 @@ if test "$cross_compiling" = yes; then cf_cv_working_poll=unknown else cat >"conftest.$ac_ext" <<_ACEOF -#line 23377 "configure" +#line 23971 "configure" #include "confdefs.h" $ac_includes_default @@ -23427,15 +24021,15 @@ int main(void) { } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:23430: \"$ac_link\"") >&5 +if { (eval echo "$as_me:24024: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:23433: \$? = $ac_status" >&5 + echo "$as_me:24027: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:23435: \"$ac_try\"") >&5 + { (eval echo "$as_me:24029: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23438: \$? = $ac_status" >&5 + echo "$as_me:24032: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_working_poll=yes else @@ -23447,21 +24041,81 @@ fi rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext" fi fi -echo "$as_me:23450: result: $cf_cv_working_poll" >&5 +echo "$as_me:24044: result: $cf_cv_working_poll" >&5 echo "${ECHO_T}$cf_cv_working_poll" >&6 test "$cf_cv_working_poll" = "yes" && cat >>confdefs.h <<\EOF -#define HAVE_WORKING_POLL 1 +#define HAVE_WORKING_POLL 1 +EOF + +echo "$as_me:24051: checking if MB_LEN_MAX is usable" >&5 +echo $ECHO_N "checking if MB_LEN_MAX is usable... $ECHO_C" >&6 +if test "${cf_cv_mb_len_max+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + +cat >"conftest.$ac_ext" <<_ACEOF +#line 24058 "configure" +#include "confdefs.h" + +$ac_includes_default +#include +int +main (void) +{ + +#if defined(MB_LEN_MAX) && MB_LEN_MAX >= 6 + ${cf_cv_main_return:-return}(0); +#else +#error MB_LEN_MAX is not usable +#endif + + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:24078: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:24081: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:24084: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:24087: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_mb_len_max=yes +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +cf_cv_mb_len_max=no +fi +rm -f "conftest.$ac_objext" "conftest.$ac_ext" +fi +echo "$as_me:24097: result: $cf_cv_mb_len_max" >&5 +echo "${ECHO_T}$cf_cv_mb_len_max" >&6 +if test "$cf_cv_mb_len_max" = yes +then + +cat >>confdefs.h <<\EOF +#define HAVE_CONSISTENT_MB_LEN_MAX 1 EOF -echo "$as_me:23457: checking for va_copy" >&5 +else + { echo "$as_me:24107: WARNING: MB_LEN_MAX is missing/inconsistent in system headers" >&5 +echo "$as_me: WARNING: MB_LEN_MAX is missing/inconsistent in system headers" >&2;} +fi + +echo "$as_me:24111: checking for va_copy" >&5 echo $ECHO_N "checking for va_copy... $ECHO_C" >&6 if test "${cf_cv_have_va_copy+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 23464 "configure" +#line 24118 "configure" #include "confdefs.h" #include @@ -23478,16 +24132,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:23481: \"$ac_link\"") >&5 +if { (eval echo "$as_me:24135: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:23484: \$? = $ac_status" >&5 + echo "$as_me:24138: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:23487: \"$ac_try\"") >&5 + { (eval echo "$as_me:24141: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23490: \$? = $ac_status" >&5 + echo "$as_me:24144: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_have_va_copy=yes else @@ -23497,7 +24151,7 @@ cf_cv_have_va_copy=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:23500: result: $cf_cv_have_va_copy" >&5 +echo "$as_me:24154: result: $cf_cv_have_va_copy" >&5 echo "${ECHO_T}$cf_cv_have_va_copy" >&6 if test "$cf_cv_have_va_copy" = yes; @@ -23509,14 +24163,14 @@ EOF else # !cf_cv_have_va_copy -echo "$as_me:23512: checking for __va_copy" >&5 +echo "$as_me:24166: checking for __va_copy" >&5 echo $ECHO_N "checking for __va_copy... $ECHO_C" >&6 if test "${cf_cv_have___va_copy+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 23519 "configure" +#line 24173 "configure" #include "confdefs.h" #include @@ -23533,16 +24187,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:23536: \"$ac_link\"") >&5 +if { (eval echo "$as_me:24190: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:23539: \$? = $ac_status" >&5 + echo "$as_me:24193: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:23542: \"$ac_try\"") >&5 + { (eval echo "$as_me:24196: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23545: \$? = $ac_status" >&5 + echo "$as_me:24199: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_have___va_copy=yes else @@ -23552,7 +24206,7 @@ cf_cv_have___va_copy=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:23555: result: $cf_cv_have___va_copy" >&5 +echo "$as_me:24209: result: $cf_cv_have___va_copy" >&5 echo "${ECHO_T}$cf_cv_have___va_copy" >&6 if test "$cf_cv_have___va_copy" = yes @@ -23564,14 +24218,14 @@ EOF else # !cf_cv_have___va_copy -echo "$as_me:23567: checking for __builtin_va_copy" >&5 +echo "$as_me:24221: checking for __builtin_va_copy" >&5 echo $ECHO_N "checking for __builtin_va_copy... $ECHO_C" >&6 if test "${cf_cv_have___builtin_va_copy+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 23574 "configure" +#line 24228 "configure" #include "confdefs.h" #include @@ -23588,16 +24242,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:23591: \"$ac_link\"") >&5 +if { (eval echo "$as_me:24245: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:23594: \$? = $ac_status" >&5 + echo "$as_me:24248: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:23597: \"$ac_try\"") >&5 + { (eval echo "$as_me:24251: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23600: \$? = $ac_status" >&5 + echo "$as_me:24254: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_have___builtin_va_copy=yes else @@ -23607,7 +24261,7 @@ cf_cv_have___builtin_va_copy=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:23610: result: $cf_cv_have___builtin_va_copy" >&5 +echo "$as_me:24264: result: $cf_cv_have___builtin_va_copy" >&5 echo "${ECHO_T}$cf_cv_have___builtin_va_copy" >&6 test "$cf_cv_have___builtin_va_copy" = yes && @@ -23625,14 +24279,14 @@ case "${cf_cv_have_va_copy}${cf_cv_have___va_copy}${cf_cv_have___builtin_va_copy ;; (*) - echo "$as_me:23628: checking if we can simply copy va_list" >&5 + echo "$as_me:24282: checking if we can simply copy va_list" >&5 echo $ECHO_N "checking if we can simply copy va_list... $ECHO_C" >&6 if test "${cf_cv_pointer_va_list+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 23635 "configure" +#line 24289 "configure" #include "confdefs.h" #include @@ -23649,16 +24303,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:23652: \"$ac_link\"") >&5 +if { (eval echo "$as_me:24306: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:23655: \$? = $ac_status" >&5 + echo "$as_me:24309: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:23658: \"$ac_try\"") >&5 + { (eval echo "$as_me:24312: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23661: \$? = $ac_status" >&5 + echo "$as_me:24315: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_pointer_va_list=yes else @@ -23668,19 +24322,19 @@ cf_cv_pointer_va_list=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:23671: result: $cf_cv_pointer_va_list" >&5 +echo "$as_me:24325: result: $cf_cv_pointer_va_list" >&5 echo "${ECHO_T}$cf_cv_pointer_va_list" >&6 if test "$cf_cv_pointer_va_list" = no then - echo "$as_me:23676: checking if we can copy va_list indirectly" >&5 + echo "$as_me:24330: checking if we can copy va_list indirectly" >&5 echo $ECHO_N "checking if we can copy va_list indirectly... $ECHO_C" >&6 if test "${cf_cv_array_va_list+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 23683 "configure" +#line 24337 "configure" #include "confdefs.h" #include @@ -23697,16 +24351,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:23700: \"$ac_link\"") >&5 +if { (eval echo "$as_me:24354: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:23703: \$? = $ac_status" >&5 + echo "$as_me:24357: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:23706: \"$ac_try\"") >&5 + { (eval echo "$as_me:24360: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23709: \$? = $ac_status" >&5 + echo "$as_me:24363: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_array_va_list=yes else @@ -23716,7 +24370,7 @@ cf_cv_array_va_list=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:23719: result: $cf_cv_array_va_list" >&5 +echo "$as_me:24373: result: $cf_cv_array_va_list" >&5 echo "${ECHO_T}$cf_cv_array_va_list" >&6 test "$cf_cv_array_va_list" = yes && cat >>confdefs.h <<\EOF @@ -23727,13 +24381,13 @@ EOF ;; esac -echo "$as_me:23730: checking for pid_t" >&5 +echo "$as_me:24384: checking for pid_t" >&5 echo $ECHO_N "checking for pid_t... $ECHO_C" >&6 if test "${ac_cv_type_pid_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 23736 "configure" +#line 24390 "configure" #include "confdefs.h" $ac_includes_default int @@ -23748,16 +24402,16 @@ if (sizeof (pid_t)) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:23751: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:24405: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:23754: \$? = $ac_status" >&5 + echo "$as_me:24408: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:23757: \"$ac_try\"") >&5 + { (eval echo "$as_me:24411: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23760: \$? = $ac_status" >&5 + echo "$as_me:24414: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_type_pid_t=yes else @@ -23767,7 +24421,7 @@ ac_cv_type_pid_t=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:23770: result: $ac_cv_type_pid_t" >&5 +echo "$as_me:24424: result: $ac_cv_type_pid_t" >&5 echo "${ECHO_T}$ac_cv_type_pid_t" >&6 if test "$ac_cv_type_pid_t" = yes; then : @@ -23782,23 +24436,23 @@ fi for ac_header in unistd.h vfork.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:23785: checking for $ac_header" >&5 +echo "$as_me:24439: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 23791 "configure" +#line 24445 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:23795: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:24449: \"$ac_cpp "conftest.$ac_ext"\"") >&5 (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:23801: \$? = $ac_status" >&5 + echo "$as_me:24455: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -23817,7 +24471,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:23820: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:24474: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then cat >>confdefs.h <&5 +echo "$as_me:24487: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 23839 "configure" +#line 24493 "configure" #include "confdefs.h" #define $ac_func autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -23867,16 +24521,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:23870: \"$ac_link\"") >&5 +if { (eval echo "$as_me:24524: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:23873: \$? = $ac_status" >&5 + echo "$as_me:24527: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:23876: \"$ac_try\"") >&5 + { (eval echo "$as_me:24530: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23879: \$? = $ac_status" >&5 + echo "$as_me:24533: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then eval "$as_ac_var=yes" else @@ -23886,7 +24540,7 @@ eval "$as_ac_var=no" fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:23889: result: `eval echo '${'"$as_ac_var"'}'`" >&5 +echo "$as_me:24543: result: `eval echo '${'"$as_ac_var"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then cat >>confdefs.h <&5 + echo "$as_me:24555: checking for working fork" >&5 echo $ECHO_N "checking for working fork... $ECHO_C" >&6 if test "${ac_cv_func_fork_works+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -23921,15 +24575,15 @@ else } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:23924: \"$ac_link\"") >&5 +if { (eval echo "$as_me:24578: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:23927: \$? = $ac_status" >&5 + echo "$as_me:24581: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:23929: \"$ac_try\"") >&5 + { (eval echo "$as_me:24583: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23932: \$? = $ac_status" >&5 + echo "$as_me:24586: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_fork_works=yes else @@ -23941,7 +24595,7 @@ fi rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext" fi fi -echo "$as_me:23944: result: $ac_cv_func_fork_works" >&5 +echo "$as_me:24598: result: $ac_cv_func_fork_works" >&5 echo "${ECHO_T}$ac_cv_func_fork_works" >&6 fi @@ -23955,12 +24609,12 @@ if test "x$ac_cv_func_fork_works" = xcross; then ac_cv_func_fork_works=yes ;; esac - { echo "$as_me:23958: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5 + { echo "$as_me:24612: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5 echo "$as_me: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&2;} fi ac_cv_func_vfork_works=$ac_cv_func_vfork if test "x$ac_cv_func_vfork" = xyes; then - echo "$as_me:23963: checking for working vfork" >&5 + echo "$as_me:24617: checking for working vfork" >&5 echo $ECHO_N "checking for working vfork... $ECHO_C" >&6 if test "${ac_cv_func_vfork_works+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -23969,7 +24623,7 @@ else ac_cv_func_vfork_works=cross else cat >"conftest.$ac_ext" <<_ACEOF -#line 23972 "configure" +#line 24626 "configure" #include "confdefs.h" /* Thanks to Paul Eggert for this test. */ #include @@ -23988,11 +24642,7 @@ else static variable whose address is put into a register that is clobbered by the vfork. */ static -#ifdef __cplusplus sparc_address_test (int arg) -# else -sparc_address_test (arg) int arg; -#endif { static pid_t child; if (!child) { @@ -24035,7 +24685,7 @@ main (void) /* Convince the compiler that p..p7 are live; otherwise, it might use the same hardware register for all 8 local variables. */ if (p != p1 || p != p2 || p != p3 || p != p4 - || p != p5 || p != p6 || p != p7) + || p != p5 || p != p6 || p != p7) _exit(1); /* On some systems (e.g. IRIX 3.3), vfork doesn't separate parent @@ -24050,31 +24700,31 @@ main (void) while (wait(&status) != child) ; $ac_main_return( - /* Was there some problem with vforking? */ - child < 0 + /* Was there some problem with vforking? */ + child < 0 - /* Did the child fail? (This shouldn't happen.) */ - || status + /* Did the child fail? (This shouldn't happen.) */ + || status - /* Did the vfork/compiler bug occur? */ - || parent != getpid() + /* Did the vfork/compiler bug occur? */ + || parent != getpid() - /* Did the file descriptor bug occur? */ - || fstat(fileno(stdout), &st) != 0 - ); + /* Did the file descriptor bug occur? */ + || fstat(fileno(stdout), &st) != 0 + ); } } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:24069: \"$ac_link\"") >&5 +if { (eval echo "$as_me:24719: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:24072: \$? = $ac_status" >&5 + echo "$as_me:24722: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:24074: \"$ac_try\"") >&5 + { (eval echo "$as_me:24724: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:24077: \$? = $ac_status" >&5 + echo "$as_me:24727: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_vfork_works=yes else @@ -24086,13 +24736,13 @@ fi rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext" fi fi -echo "$as_me:24089: result: $ac_cv_func_vfork_works" >&5 +echo "$as_me:24739: result: $ac_cv_func_vfork_works" >&5 echo "${ECHO_T}$ac_cv_func_vfork_works" >&6 fi; if test "x$ac_cv_func_fork_works" = xcross; then ac_cv_func_vfork_works=ac_cv_func_vfork - { echo "$as_me:24095: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5 + { echo "$as_me:24745: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5 echo "$as_me: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&2;} fi @@ -24117,7 +24767,7 @@ EOF fi -echo "$as_me:24120: checking if fopen accepts explicit binary mode" >&5 +echo "$as_me:24770: checking if fopen accepts explicit binary mode" >&5 echo $ECHO_N "checking if fopen accepts explicit binary mode... $ECHO_C" >&6 if test "${cf_cv_fopen_bin_r+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -24127,7 +24777,7 @@ else cf_cv_fopen_bin_r=unknown else cat >"conftest.$ac_ext" <<_ACEOF -#line 24130 "configure" +#line 24780 "configure" #include "confdefs.h" $ac_includes_default @@ -24136,14 +24786,14 @@ int main(void) { FILE *fp = fopen("conftest.tmp", "wb"); int rc = 0; - if (fp != 0) { + if (fp != NULL) { int p, q; for (p = 0; p < 256; ++p) { fputc(p, fp); } fclose(fp); fp = fopen("conftest.tmp", "rb"); - if (fp != 0) { + if (fp != NULL) { for (p = 0; p < 256; ++p) { q = fgetc(fp); if (q != p) { @@ -24162,15 +24812,15 @@ int main(void) _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:24165: \"$ac_link\"") >&5 +if { (eval echo "$as_me:24815: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:24168: \$? = $ac_status" >&5 + echo "$as_me:24818: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:24170: \"$ac_try\"") >&5 + { (eval echo "$as_me:24820: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:24173: \$? = $ac_status" >&5 + echo "$as_me:24823: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_fopen_bin_r=yes else @@ -24183,16 +24833,228 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes fi fi -echo "$as_me:24186: result: $cf_cv_fopen_bin_r" >&5 +echo "$as_me:24836: result: $cf_cv_fopen_bin_r" >&5 echo "${ECHO_T}$cf_cv_fopen_bin_r" >&6 test "x$cf_cv_fopen_bin_r" != xno && cat >>confdefs.h <<\EOF #define USE_FOPEN_BIN_R 1 EOF + echo "$as_me:24843: checking for cc_t" >&5 +echo $ECHO_N "checking for cc_t... $ECHO_C" >&6 +if test "${ac_cv_type_cc_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >"conftest.$ac_ext" <<_ACEOF +#line 24849 "configure" +#include "confdefs.h" + +$ac_includes_default +#include + +int +main (void) +{ +if ((cc_t *) 0) + return 0; +if (sizeof (cc_t)) + return 0; + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:24867: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:24870: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:24873: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:24876: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_type_cc_t=yes +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +ac_cv_type_cc_t=no +fi +rm -f "conftest.$ac_objext" "conftest.$ac_ext" +fi +echo "$as_me:24886: result: $ac_cv_type_cc_t" >&5 +echo "${ECHO_T}$ac_cv_type_cc_t" >&6 +if test "$ac_cv_type_cc_t" = yes; then + +cat >>confdefs.h <&5 +echo $ECHO_N "checking for speed_t... $ECHO_C" >&6 +if test "${ac_cv_type_speed_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >"conftest.$ac_ext" <<_ACEOF +#line 24902 "configure" +#include "confdefs.h" + +$ac_includes_default +#include + +int +main (void) +{ +if ((speed_t *) 0) + return 0; +if (sizeof (speed_t)) + return 0; + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:24920: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:24923: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:24926: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:24929: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_type_speed_t=yes +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +ac_cv_type_speed_t=no +fi +rm -f "conftest.$ac_objext" "conftest.$ac_ext" +fi +echo "$as_me:24939: result: $ac_cv_type_speed_t" >&5 +echo "${ECHO_T}$ac_cv_type_speed_t" >&6 +if test "$ac_cv_type_speed_t" = yes; then + +cat >>confdefs.h <&5 +echo $ECHO_N "checking for tcflag_t... $ECHO_C" >&6 +if test "${ac_cv_type_tcflag_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >"conftest.$ac_ext" <<_ACEOF +#line 24955 "configure" +#include "confdefs.h" + +$ac_includes_default +#include + +int +main (void) +{ +if ((tcflag_t *) 0) + return 0; +if (sizeof (tcflag_t)) + return 0; + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:24973: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:24976: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:24979: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:24982: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_type_tcflag_t=yes +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +ac_cv_type_tcflag_t=no +fi +rm -f "conftest.$ac_objext" "conftest.$ac_ext" +fi +echo "$as_me:24992: result: $ac_cv_type_tcflag_t" >&5 +echo "${ECHO_T}$ac_cv_type_tcflag_t" >&6 +if test "$ac_cv_type_tcflag_t" = yes; then + +cat >>confdefs.h <&5 +echo $ECHO_N "checking for sigset_t... $ECHO_C" >&6 +if test "${ac_cv_type_sigset_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >"conftest.$ac_ext" <<_ACEOF +#line 25008 "configure" +#include "confdefs.h" + +$ac_includes_default +#include + +int +main (void) +{ +if ((sigset_t *) 0) + return 0; +if (sizeof (sigset_t)) + return 0; + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:25026: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:25029: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:25032: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:25035: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_type_sigset_t=yes +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +ac_cv_type_sigset_t=no +fi +rm -f "conftest.$ac_objext" "conftest.$ac_ext" +fi +echo "$as_me:25045: result: $ac_cv_type_sigset_t" >&5 +echo "${ECHO_T}$ac_cv_type_sigset_t" >&6 +if test "$ac_cv_type_sigset_t" = yes; then + +cat >>confdefs.h <&5 +echo "$as_me:25057: checking for openpty in -lutil" >&5 echo $ECHO_N "checking for openpty in -lutil... $ECHO_C" >&6 if test "${ac_cv_lib_util_openpty+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -24200,7 +25062,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lutil $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 24203 "configure" +#line 25065 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -24209,7 +25071,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char openpty (); +char openpty (void); int main (void) { @@ -24219,16 +25081,16 @@ openpty (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:24222: \"$ac_link\"") >&5 +if { (eval echo "$as_me:25084: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:24225: \$? = $ac_status" >&5 + echo "$as_me:25087: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:24228: \"$ac_try\"") >&5 + { (eval echo "$as_me:25090: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:24231: \$? = $ac_status" >&5 + echo "$as_me:25093: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_util_openpty=yes else @@ -24239,7 +25101,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:24242: result: $ac_cv_lib_util_openpty" >&5 +echo "$as_me:25104: result: $ac_cv_lib_util_openpty" >&5 echo "${ECHO_T}$ac_cv_lib_util_openpty" >&6 if test "$ac_cv_lib_util_openpty" = yes; then cf_cv_lib_util=yes @@ -24247,7 +25109,7 @@ else cf_cv_lib_util=no fi -echo "$as_me:24250: checking for openpty header" >&5 +echo "$as_me:25112: checking for openpty header" >&5 echo $ECHO_N "checking for openpty header... $ECHO_C" >&6 if test "${cf_cv_func_openpty+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -24274,7 +25136,7 @@ LIBS="$cf_add_libs" for cf_header in pty.h libutil.h util.h do cat >"conftest.$ac_ext" <<_ACEOF -#line 24277 "configure" +#line 25139 "configure" #include "confdefs.h" #include <$cf_header> @@ -24285,22 +25147,23 @@ main (void) int x = openpty((int *)0, (int *)0, (char *)0, (struct termios *)0, (struct winsize *)0); + (void)x; ; return 0; } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:24294: \"$ac_link\"") >&5 +if { (eval echo "$as_me:25157: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:24297: \$? = $ac_status" >&5 + echo "$as_me:25160: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:24300: \"$ac_try\"") >&5 + { (eval echo "$as_me:25163: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:24303: \$? = $ac_status" >&5 + echo "$as_me:25166: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_func_openpty=$cf_header @@ -24318,7 +25181,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS="$cf_save_LIBS" fi -echo "$as_me:24321: result: $cf_cv_func_openpty" >&5 +echo "$as_me:25184: result: $cf_cv_func_openpty" >&5 echo "${ECHO_T}$cf_cv_func_openpty" >&6 if test "$cf_cv_func_openpty" != no ; then @@ -24391,7 +25254,7 @@ if test -n "$with_hashed_db/include" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 24394 "configure" +#line 25257 "configure" #include "confdefs.h" #include int @@ -24403,16 +25266,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:24406: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:25269: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:24409: \$? = $ac_status" >&5 + echo "$as_me:25272: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:24412: \"$ac_try\"") >&5 + { (eval echo "$as_me:25275: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:24415: \$? = $ac_status" >&5 + echo "$as_me:25278: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -24429,7 +25292,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:24432: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:25295: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -24465,7 +25328,7 @@ if test -n "$with_hashed_db/lib" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:24468: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:25331: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -24476,7 +25339,7 @@ fi else case "$with_hashed_db" in (./*|../*|/*) - { echo "$as_me:24479: WARNING: no such directory $with_hashed_db" >&5 + { echo "$as_me:25342: WARNING: no such directory $with_hashed_db" >&5 echo "$as_me: WARNING: no such directory $with_hashed_db" >&2;} ;; (*) @@ -24548,7 +25411,7 @@ if test -n "$cf_item" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 24551 "configure" +#line 25414 "configure" #include "confdefs.h" #include int @@ -24560,16 +25423,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:24563: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:25426: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:24566: \$? = $ac_status" >&5 + echo "$as_me:25429: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:24569: \"$ac_try\"") >&5 + { (eval echo "$as_me:25432: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:24572: \$? = $ac_status" >&5 + echo "$as_me:25435: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -24586,7 +25449,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:24589: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:25452: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -24666,7 +25529,7 @@ if test -n "$cf_item" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:24669: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:25532: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -24683,23 +25546,23 @@ fi fi esac -echo "$as_me:24686: checking for db.h" >&5 +echo "$as_me:25549: checking for db.h" >&5 echo $ECHO_N "checking for db.h... $ECHO_C" >&6 if test "${ac_cv_header_db_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 24692 "configure" +#line 25555 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:24696: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:25559: \"$ac_cpp "conftest.$ac_ext"\"") >&5 (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:24702: \$? = $ac_status" >&5 + echo "$as_me:25565: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -24718,11 +25581,11 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:24721: result: $ac_cv_header_db_h" >&5 +echo "$as_me:25584: result: $ac_cv_header_db_h" >&5 echo "${ECHO_T}$ac_cv_header_db_h" >&6 if test "$ac_cv_header_db_h" = yes; then -echo "$as_me:24725: checking for version of db" >&5 +echo "$as_me:25588: checking for version of db" >&5 echo $ECHO_N "checking for version of db... $ECHO_C" >&6 if test "${cf_cv_hashed_db_version+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -24733,10 +25596,10 @@ cf_cv_hashed_db_version=unknown for cf_db_version in 1 2 3 4 5 6 do -echo "${as_me:-configure}:24736: testing checking for db version $cf_db_version ..." 1>&5 +echo "${as_me:-configure}:25599: testing checking for db version $cf_db_version ..." 1>&5 cat >"conftest.$ac_ext" <<_ACEOF -#line 24739 "configure" +#line 25602 "configure" #include "confdefs.h" $ac_includes_default @@ -24766,16 +25629,16 @@ DBT *foo = 0 } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:24769: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:25632: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:24772: \$? = $ac_status" >&5 + echo "$as_me:25635: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:24775: \"$ac_try\"") >&5 + { (eval echo "$as_me:25638: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:24778: \$? = $ac_status" >&5 + echo "$as_me:25641: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_hashed_db_version=$cf_db_version @@ -24789,16 +25652,16 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:24792: result: $cf_cv_hashed_db_version" >&5 +echo "$as_me:25655: result: $cf_cv_hashed_db_version" >&5 echo "${ECHO_T}$cf_cv_hashed_db_version" >&6 if test "$cf_cv_hashed_db_version" = unknown ; then - { { echo "$as_me:24796: error: Cannot determine version of db" >&5 + { { echo "$as_me:25659: error: Cannot determine version of db" >&5 echo "$as_me: error: Cannot determine version of db" >&2;} { (exit 1); exit 1; }; } else -echo "$as_me:24801: checking for db libraries" >&5 +echo "$as_me:25664: checking for db libraries" >&5 echo $ECHO_N "checking for db libraries... $ECHO_C" >&6 if test "${cf_cv_hashed_db_libs+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -24828,10 +25691,10 @@ LIBS="$cf_add_libs" fi -echo "${as_me:-configure}:24831: testing checking for library $cf_db_libs ..." 1>&5 +echo "${as_me:-configure}:25694: testing checking for library $cf_db_libs ..." 1>&5 cat >"conftest.$ac_ext" <<_ACEOF -#line 24834 "configure" +#line 25697 "configure" #include "confdefs.h" $ac_includes_default @@ -24844,7 +25707,7 @@ main (void) char *path = "/tmp/foo"; #ifdef DB_VERSION_MAJOR #if DB_VERSION_MAJOR >= 4 - DB *result = 0; + DB *result = NULL; db_create(&result, NULL, 0); result->open(result, NULL, @@ -24854,7 +25717,7 @@ main (void) DB_CREATE, 0644); #elif DB_VERSION_MAJOR >= 3 - DB *result = 0; + DB *result = NULL; db_create(&result, NULL, 0); result->open(result, path, @@ -24863,7 +25726,7 @@ main (void) DB_CREATE, 0644); #elif DB_VERSION_MAJOR >= 2 - DB *result = 0; + DB *result = NULL; db_open(path, DB_HASH, DB_CREATE, @@ -24879,23 +25742,23 @@ main (void) DB_HASH, 0); #endif - ${cf_cv_main_return:-return}(result != 0) + ${cf_cv_main_return:-return}(result != NULL) ; return 0; } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:24889: \"$ac_link\"") >&5 +if { (eval echo "$as_me:25752: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:24892: \$? = $ac_status" >&5 + echo "$as_me:25755: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:24895: \"$ac_try\"") >&5 + { (eval echo "$as_me:25758: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:24898: \$? = $ac_status" >&5 + echo "$as_me:25761: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then if test -n "$cf_db_libs" ; then @@ -24915,11 +25778,11 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" done fi -echo "$as_me:24918: result: $cf_cv_hashed_db_libs" >&5 +echo "$as_me:25781: result: $cf_cv_hashed_db_libs" >&5 echo "${ECHO_T}$cf_cv_hashed_db_libs" >&6 if test "$cf_cv_hashed_db_libs" = unknown ; then - { { echo "$as_me:24922: error: Cannot determine library for db" >&5 + { { echo "$as_me:25785: error: Cannot determine library for db" >&5 echo "$as_me: error: Cannot determine library for db" >&2;} { (exit 1); exit 1; }; } elif test "$cf_cv_hashed_db_libs" != default ; then @@ -24945,7 +25808,7 @@ fi else - { { echo "$as_me:24948: error: Cannot find db.h" >&5 + { { echo "$as_me:25811: error: Cannot find db.h" >&5 echo "$as_me: error: Cannot find db.h" >&2;} { (exit 1); exit 1; }; } @@ -24960,138 +25823,138 @@ fi # Just in case, check if the C compiler has a bool type. -echo "$as_me:24963: checking if we should include stdbool.h" >&5 -echo $ECHO_N "checking if we should include stdbool.h... $ECHO_C" >&6 - +echo "$as_me:25826: checking if we can include stdbool.h" >&5 +echo $ECHO_N "checking if we can include stdbool.h... $ECHO_C" >&6 if test "${cf_cv_header_stdbool_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 24971 "configure" +#line 25833 "configure" #include "confdefs.h" +$ac_includes_default +#include + int main (void) { -bool foo = false +bool foo = false; (void)foo ; return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:24983: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:25848: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:24986: \$? = $ac_status" >&5 + echo "$as_me:25851: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:24989: \"$ac_try\"") >&5 + { (eval echo "$as_me:25854: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:24992: \$? = $ac_status" >&5 + echo "$as_me:25857: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - cf_cv_header_stdbool_h=0 + cf_cv_header_stdbool_h=yes else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 cat >"conftest.$ac_ext" <<_ACEOF -#line 24999 "configure" +#line 25864 "configure" #include "confdefs.h" -#ifndef __BEOS__ -#include -#endif - int main (void) { -bool foo = false +bool foo = false; (void)foo ; return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:25015: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:25876: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:25018: \$? = $ac_status" >&5 + echo "$as_me:25879: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:25021: \"$ac_try\"") >&5 + { (eval echo "$as_me:25882: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:25024: \$? = $ac_status" >&5 + echo "$as_me:25885: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - cf_cv_header_stdbool_h=1 + cf_cv_header_stdbool_h=no else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 -cf_cv_header_stdbool_h=0 fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi +echo "$as_me:25896: result: $cf_cv_header_stdbool_h" >&5 +echo "${ECHO_T}$cf_cv_header_stdbool_h" >&6 -if test "$cf_cv_header_stdbool_h" = 1 -then echo "$as_me:25038: result: yes" >&5 -echo "${ECHO_T}yes" >&6 -else echo "$as_me:25040: result: no" >&5 -echo "${ECHO_T}no" >&6 +if test "$cf_cv_header_stdbool_h" = yes +then USE_STDBOOL_H=1 +else USE_STDBOOL_H=0 fi -echo "$as_me:25044: checking for builtin bool type" >&5 +echo "$as_me:25904: checking for builtin bool type" >&5 echo $ECHO_N "checking for builtin bool type... $ECHO_C" >&6 - if test "${cf_cv_cc_bool_type+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 25052 "configure" +#line 25911 "configure" #include "confdefs.h" -#include -#include +$ac_includes_default int main (void) { -bool x = false +bool x = false; (void)x ; return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:25067: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:25925: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:25070: \$? = $ac_status" >&5 + echo "$as_me:25928: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:25073: \"$ac_try\"") >&5 + { (eval echo "$as_me:25931: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:25076: \$? = $ac_status" >&5 + echo "$as_me:25934: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - cf_cv_cc_bool_type=1 + cf_cv_cc_bool_type=yes else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 -cf_cv_cc_bool_type=0 +cf_cv_cc_bool_type=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" - fi +echo "$as_me:25944: result: $cf_cv_cc_bool_type" >&5 +echo "${ECHO_T}$cf_cv_cc_bool_type" >&6 -if test "$cf_cv_cc_bool_type" = 1 -then echo "$as_me:25089: result: yes" >&5 -echo "${ECHO_T}yes" >&6 -else echo "$as_me:25091: result: no" >&5 -echo "${ECHO_T}no" >&6 +if test "$cf_cv_cc_bool_type" = yes; then + USE_BUILTIN_BOOL=1 +else + USE_BUILTIN_BOOL=0 fi +test "$cf_cv_header_stdbool_h" = yes && +cat >>confdefs.h <<\EOF +#define USE_STDBOOL_H 1 +EOF + # Check for C++ compiler characteristics (and ensure that it's there!) if test -n "$CXX" ; then ac_ext=cc @@ -25105,10 +25968,10 @@ if test -n "$GXX" ; then cf_save="$LIBS" LIBS="$LIBS $CXXLIBS" - echo "$as_me:25108: checking if we already have C++ library" >&5 + echo "$as_me:25971: checking if we already have C++ library" >&5 echo $ECHO_N "checking if we already have C++ library... $ECHO_C" >&6 cat >"conftest.$ac_ext" <<_ACEOF -#line 25111 "configure" +#line 25974 "configure" #include "confdefs.h" #include @@ -25122,16 +25985,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:25125: \"$ac_link\"") >&5 +if { (eval echo "$as_me:25988: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:25128: \$? = $ac_status" >&5 + echo "$as_me:25991: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:25131: \"$ac_try\"") >&5 + { (eval echo "$as_me:25994: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:25134: \$? = $ac_status" >&5 + echo "$as_me:25997: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_have_libstdcpp=yes else @@ -25140,7 +26003,7 @@ cat "conftest.$ac_ext" >&5 cf_have_libstdcpp=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - echo "$as_me:25143: result: $cf_have_libstdcpp" >&5 + echo "$as_me:26006: result: $cf_have_libstdcpp" >&5 echo "${ECHO_T}$cf_have_libstdcpp" >&6 LIBS="$cf_save" @@ -25159,7 +26022,7 @@ echo "${ECHO_T}$cf_have_libstdcpp" >&6 ;; esac - echo "$as_me:25162: checking for library $cf_stdcpp_libname" >&5 + echo "$as_me:26025: checking for library $cf_stdcpp_libname" >&5 echo $ECHO_N "checking for library $cf_stdcpp_libname... $ECHO_C" >&6 if test "${cf_cv_libstdcpp+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -25185,7 +26048,7 @@ done LIBS="$cf_add_libs" cat >"conftest.$ac_ext" <<_ACEOF -#line 25188 "configure" +#line 26051 "configure" #include "confdefs.h" #include @@ -25199,16 +26062,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:25202: \"$ac_link\"") >&5 +if { (eval echo "$as_me:26065: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:25205: \$? = $ac_status" >&5 + echo "$as_me:26068: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:25208: \"$ac_try\"") >&5 + { (eval echo "$as_me:26071: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:25211: \$? = $ac_status" >&5 + echo "$as_me:26074: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_libstdcpp=yes else @@ -25220,7 +26083,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS="$cf_save" fi -echo "$as_me:25223: result: $cf_cv_libstdcpp" >&5 +echo "$as_me:26086: result: $cf_cv_libstdcpp" >&5 echo "${ECHO_T}$cf_cv_libstdcpp" >&6 test "$cf_cv_libstdcpp" = yes && { cf_add_libs="$CXXLIBS" @@ -25242,7 +26105,7 @@ CXXLIBS="$cf_add_libs" fi fi - echo "$as_me:25245: checking whether $CXX understands -c and -o together" >&5 + echo "$as_me:26108: checking whether $CXX understands -c and -o together" >&5 echo $ECHO_N "checking whether $CXX understands -c and -o together... $ECHO_C" >&6 if test "${cf_cv_prog_CXX_c_o+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -25257,15 +26120,15 @@ CF_EOF # We do the test twice because some compilers refuse to overwrite an # existing .o file with -o, though they will create one. ac_try='$CXX $CXXFLAGS $CPPFLAGS -c conftest.$ac_ext -o conftest2.$ac_objext >&5' -if { (eval echo "$as_me:25260: \"$ac_try\"") >&5 +if { (eval echo "$as_me:26123: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:25263: \$? = $ac_status" >&5 + echo "$as_me:26126: \$? = $ac_status" >&5 (exit "$ac_status"); } && - test -f conftest2.$ac_objext && { (eval echo "$as_me:25265: \"$ac_try\"") >&5 + test -f conftest2.$ac_objext && { (eval echo "$as_me:26128: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:25268: \$? = $ac_status" >&5 + echo "$as_me:26131: \$? = $ac_status" >&5 (exit "$ac_status"); }; then eval cf_cv_prog_CXX_c_o=yes @@ -25276,10 +26139,10 @@ rm -rf ./conftest* fi if test "$cf_cv_prog_CXX_c_o" = yes; then - echo "$as_me:25279: result: yes" >&5 + echo "$as_me:26142: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:25282: result: no" >&5 + echo "$as_me:26145: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -25299,7 +26162,7 @@ case "$cf_cv_system_name" in ;; esac if test "$GXX" = yes; then - echo "$as_me:25302: checking for lib$cf_gpp_libname" >&5 + echo "$as_me:26165: checking for lib$cf_gpp_libname" >&5 echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6 cf_save="$LIBS" @@ -25320,7 +26183,7 @@ done LIBS="$cf_add_libs" cat >"conftest.$ac_ext" <<_ACEOF -#line 25323 "configure" +#line 26186 "configure" #include "confdefs.h" #include <$cf_gpp_libname/builtin.h> @@ -25334,16 +26197,16 @@ two_arg_error_handler_t foo2 = lib_error_handler } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:25337: \"$ac_link\"") >&5 +if { (eval echo "$as_me:26200: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:25340: \$? = $ac_status" >&5 + echo "$as_me:26203: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:25343: \"$ac_try\"") >&5 + { (eval echo "$as_me:26206: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:25346: \$? = $ac_status" >&5 + echo "$as_me:26209: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cxx_library=yes @@ -25380,7 +26243,7 @@ else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 cat >"conftest.$ac_ext" <<_ACEOF -#line 25383 "configure" +#line 26246 "configure" #include "confdefs.h" #include @@ -25394,16 +26257,16 @@ two_arg_error_handler_t foo2 = lib_error_handler } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:25397: \"$ac_link\"") >&5 +if { (eval echo "$as_me:26260: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:25400: \$? = $ac_status" >&5 + echo "$as_me:26263: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:25403: \"$ac_try\"") >&5 + { (eval echo "$as_me:26266: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:25406: \$? = $ac_status" >&5 + echo "$as_me:26269: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cxx_library=yes @@ -25436,7 +26299,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS="$cf_save" - echo "$as_me:25439: result: $cf_cxx_library" >&5 + echo "$as_me:26302: result: $cf_cxx_library" >&5 echo "${ECHO_T}$cf_cxx_library" >&6 fi @@ -25452,7 +26315,7 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS "conftest.$ac_ext" >&5' ac_link='$CXX -o "conftest$ac_exeext" $CXXFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac_ext" $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ac_main_return="return" -echo "$as_me:25455: checking how to run the C++ preprocessor" >&5 +echo "$as_me:26318: checking how to run the C++ preprocessor" >&5 echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6 if test -z "$CXXCPP"; then if test "${ac_cv_prog_CXXCPP+set}" = set; then @@ -25469,18 +26332,18 @@ do # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >"conftest.$ac_ext" <<_ACEOF -#line 25472 "configure" +#line 26335 "configure" #include "confdefs.h" #include Syntax error _ACEOF -if { (eval echo "$as_me:25477: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:26340: \"$ac_cpp "conftest.$ac_ext"\"") >&5 (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:25483: \$? = $ac_status" >&5 + echo "$as_me:26346: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_cxx_preproc_warn_flag @@ -25503,17 +26366,17 @@ rm -f conftest.err "conftest.$ac_ext" # OK, works on sane cases. Now check whether non-existent headers # can be detected and how. cat >"conftest.$ac_ext" <<_ACEOF -#line 25506 "configure" +#line 26369 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:25510: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:26373: \"$ac_cpp "conftest.$ac_ext"\"") >&5 (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:25516: \$? = $ac_status" >&5 + echo "$as_me:26379: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_cxx_preproc_warn_flag @@ -25550,7 +26413,7 @@ fi else ac_cv_prog_CXXCPP=$CXXCPP fi -echo "$as_me:25553: result: $CXXCPP" >&5 +echo "$as_me:26416: result: $CXXCPP" >&5 echo "${ECHO_T}$CXXCPP" >&6 ac_preproc_ok=false for ac_cxx_preproc_warn_flag in '' yes @@ -25560,18 +26423,18 @@ do # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >"conftest.$ac_ext" <<_ACEOF -#line 25563 "configure" +#line 26426 "configure" #include "confdefs.h" #include Syntax error _ACEOF -if { (eval echo "$as_me:25568: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:26431: \"$ac_cpp "conftest.$ac_ext"\"") >&5 (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:25574: \$? = $ac_status" >&5 + echo "$as_me:26437: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_cxx_preproc_warn_flag @@ -25594,17 +26457,17 @@ rm -f conftest.err "conftest.$ac_ext" # OK, works on sane cases. Now check whether non-existent headers # can be detected and how. cat >"conftest.$ac_ext" <<_ACEOF -#line 25597 "configure" +#line 26460 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:25601: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:26464: \"$ac_cpp "conftest.$ac_ext"\"") >&5 (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:25607: \$? = $ac_status" >&5 + echo "$as_me:26470: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_cxx_preproc_warn_flag @@ -25632,7 +26495,7 @@ rm -f conftest.err "conftest.$ac_ext" if $ac_preproc_ok; then : else - { { echo "$as_me:25635: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5 + { { echo "$as_me:26498: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5 echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;} { (exit 1); exit 1; }; } fi @@ -25644,26 +26507,26 @@ ac_link='$CXX -o "conftest$ac_exeext" $CXXFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ac_main_return="return" -for ac_header in typeinfo +for ac_header in new exception typeinfo do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:25650: checking for $ac_header" >&5 +echo "$as_me:26513: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 25656 "configure" +#line 26519 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:25660: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:26523: \"$ac_cpp "conftest.$ac_ext"\"") >&5 (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:25666: \$? = $ac_status" >&5 + echo "$as_me:26529: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_cxx_preproc_warn_flag @@ -25682,7 +26545,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:25685: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:26548: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then cat >>confdefs.h <&5 +echo "$as_me:26561: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 25704 "configure" +#line 26567 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:25708: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:26571: \"$ac_cpp "conftest.$ac_ext"\"") >&5 (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:25714: \$? = $ac_status" >&5 + echo "$as_me:26577: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_cxx_preproc_warn_flag @@ -25730,7 +26593,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:25733: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:26596: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then cat >>confdefs.h <&5 + echo "$as_me:26607: checking if iostream uses std-namespace" >&5 echo $ECHO_N "checking if iostream uses std-namespace... $ECHO_C" >&6 cat >"conftest.$ac_ext" <<_ACEOF -#line 25747 "configure" +#line 26610 "configure" #include "confdefs.h" #include @@ -25761,16 +26624,16 @@ cerr << "testing" << endl; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:25764: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:26627: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:25767: \$? = $ac_status" >&5 + echo "$as_me:26630: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:25770: \"$ac_try\"") >&5 + { (eval echo "$as_me:26633: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:25773: \$? = $ac_status" >&5 + echo "$as_me:26636: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_iostream_namespace=yes else @@ -25779,7 +26642,7 @@ cat "conftest.$ac_ext" >&5 cf_iostream_namespace=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" - echo "$as_me:25782: result: $cf_iostream_namespace" >&5 + echo "$as_me:26645: result: $cf_iostream_namespace" >&5 echo "${ECHO_T}$cf_iostream_namespace" >&6 if test "$cf_iostream_namespace" = yes ; then @@ -25790,145 +26653,56 @@ EOF fi fi -echo "$as_me:25793: checking if we should include stdbool.h" >&5 -echo $ECHO_N "checking if we should include stdbool.h... $ECHO_C" >&6 - -if test "${cf_cv_header_stdbool_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - - cat >"conftest.$ac_ext" <<_ACEOF -#line 25801 "configure" -#include "confdefs.h" - -int -main (void) -{ -bool foo = false - ; - return 0; -} -_ACEOF -rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:25813: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:25816: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:25819: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:25822: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - cf_cv_header_stdbool_h=0 -else - echo "$as_me: failed program was:" >&5 -cat "conftest.$ac_ext" >&5 -cat >"conftest.$ac_ext" <<_ACEOF -#line 25829 "configure" -#include "confdefs.h" - -#ifndef __BEOS__ -#include -#endif - -int -main (void) -{ -bool foo = false - ; - return 0; -} -_ACEOF -rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:25845: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:25848: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:25851: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:25854: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - cf_cv_header_stdbool_h=1 -else - echo "$as_me: failed program was:" >&5 -cat "conftest.$ac_ext" >&5 -cf_cv_header_stdbool_h=0 -fi -rm -f "conftest.$ac_objext" "conftest.$ac_ext" -fi -rm -f "conftest.$ac_objext" "conftest.$ac_ext" -fi - -if test "$cf_cv_header_stdbool_h" = 1 -then echo "$as_me:25868: result: yes" >&5 -echo "${ECHO_T}yes" >&6 -else echo "$as_me:25870: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - -echo "$as_me:25874: checking for builtin bool type" >&5 +echo "$as_me:26656: checking for builtin bool type" >&5 echo $ECHO_N "checking for builtin bool type... $ECHO_C" >&6 - if test "${cf_cv_builtin_bool+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 25882 "configure" +#line 26663 "configure" #include "confdefs.h" -#include -#include +$ac_includes_default int main (void) { -bool x = false +bool x = false; (void)x ; return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:25897: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:26677: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:25900: \$? = $ac_status" >&5 + echo "$as_me:26680: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:25903: \"$ac_try\"") >&5 + { (eval echo "$as_me:26683: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:25906: \$? = $ac_status" >&5 + echo "$as_me:26686: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - cf_cv_builtin_bool=1 + cf_cv_builtin_bool=yes else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 -cf_cv_builtin_bool=0 +cf_cv_builtin_bool=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" - -fi - -if test "$cf_cv_builtin_bool" = 1 -then echo "$as_me:25919: result: yes" >&5 -echo "${ECHO_T}yes" >&6 -else echo "$as_me:25921: result: no" >&5 -echo "${ECHO_T}no" >&6 fi +echo "$as_me:26696: result: $cf_cv_builtin_bool" >&5 +echo "${ECHO_T}$cf_cv_builtin_bool" >&6 -echo "$as_me:25925: checking for bool" >&5 +echo "$as_me:26699: checking for bool" >&5 echo $ECHO_N "checking for bool... $ECHO_C" >&6 if test "${ac_cv_type_bool+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 25931 "configure" +#line 26705 "configure" #include "confdefs.h" $ac_includes_default @@ -25945,7 +26719,7 @@ $ac_includes_default #else -#if $cf_cv_header_stdbool_h +#if $USE_STDBOOL_H #include #endif @@ -25963,16 +26737,16 @@ if (sizeof (bool)) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:25966: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:26740: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:25969: \$? = $ac_status" >&5 + echo "$as_me:26743: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:25972: \"$ac_try\"") >&5 + { (eval echo "$as_me:26746: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:25975: \$? = $ac_status" >&5 + echo "$as_me:26749: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_type_bool=yes else @@ -25982,10 +26756,10 @@ ac_cv_type_bool=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:25985: result: $ac_cv_type_bool" >&5 +echo "$as_me:26759: result: $ac_cv_type_bool" >&5 echo "${ECHO_T}$ac_cv_type_bool" >&6 -echo "$as_me:25988: checking size of bool" >&5 +echo "$as_me:26762: checking size of bool" >&5 echo $ECHO_N "checking size of bool... $ECHO_C" >&6 if test "${ac_cv_sizeof_bool+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -25994,7 +26768,7 @@ else if test "$cross_compiling" = yes; then # Depending upon the size, compute the lo and hi bounds. cat >"conftest.$ac_ext" <<_ACEOF -#line 25997 "configure" +#line 26771 "configure" #include "confdefs.h" $ac_includes_default @@ -26011,7 +26785,7 @@ $ac_includes_default #else -#if $cf_cv_header_stdbool_h +#if $USE_STDBOOL_H #include #endif @@ -26026,21 +26800,21 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= 0)] } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:26029: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:26803: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:26032: \$? = $ac_status" >&5 + echo "$as_me:26806: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:26035: \"$ac_try\"") >&5 + { (eval echo "$as_me:26809: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:26038: \$? = $ac_status" >&5 + echo "$as_me:26812: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_lo=0 ac_mid=0 while :; do cat >"conftest.$ac_ext" <<_ACEOF -#line 26043 "configure" +#line 26817 "configure" #include "confdefs.h" $ac_includes_default @@ -26057,7 +26831,7 @@ $ac_includes_default #else -#if $cf_cv_header_stdbool_h +#if $USE_STDBOOL_H #include #endif @@ -26072,16 +26846,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)] } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:26075: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:26849: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:26078: \$? = $ac_status" >&5 + echo "$as_me:26852: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:26081: \"$ac_try\"") >&5 + { (eval echo "$as_me:26855: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:26084: \$? = $ac_status" >&5 + echo "$as_me:26858: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_hi=$ac_mid; break else @@ -26097,7 +26871,7 @@ cat "conftest.$ac_ext" >&5 ac_hi=-1 ac_mid=-1 while :; do cat >"conftest.$ac_ext" <<_ACEOF -#line 26100 "configure" +#line 26874 "configure" #include "confdefs.h" $ac_includes_default @@ -26114,7 +26888,7 @@ $ac_includes_default #else -#if $cf_cv_header_stdbool_h +#if $USE_STDBOOL_H #include #endif @@ -26129,16 +26903,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= $ac_mid)] } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:26132: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:26906: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:26135: \$? = $ac_status" >&5 + echo "$as_me:26909: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:26138: \"$ac_try\"") >&5 + { (eval echo "$as_me:26912: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:26141: \$? = $ac_status" >&5 + echo "$as_me:26915: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_lo=$ac_mid; break else @@ -26154,7 +26928,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" while test "x$ac_lo" != "x$ac_hi"; do ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"` cat >"conftest.$ac_ext" <<_ACEOF -#line 26157 "configure" +#line 26931 "configure" #include "confdefs.h" $ac_includes_default @@ -26171,7 +26945,7 @@ $ac_includes_default #else -#if $cf_cv_header_stdbool_h +#if $USE_STDBOOL_H #include #endif @@ -26186,16 +26960,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)] } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:26189: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:26963: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:26192: \$? = $ac_status" >&5 + echo "$as_me:26966: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:26195: \"$ac_try\"") >&5 + { (eval echo "$as_me:26969: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:26198: \$? = $ac_status" >&5 + echo "$as_me:26972: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_hi=$ac_mid else @@ -26208,12 +26982,12 @@ done ac_cv_sizeof_bool=$ac_lo else if test "$cross_compiling" = yes; then - { { echo "$as_me:26211: error: cannot run test program while cross compiling" >&5 + { { echo "$as_me:26985: error: cannot run test program while cross compiling" >&5 echo "$as_me: error: cannot run test program while cross compiling" >&2;} { (exit 1); exit 1; }; } else cat >"conftest.$ac_ext" <<_ACEOF -#line 26216 "configure" +#line 26990 "configure" #include "confdefs.h" $ac_includes_default @@ -26230,7 +27004,7 @@ $ac_includes_default #else -#if $cf_cv_header_stdbool_h +#if $USE_STDBOOL_H #include #endif @@ -26249,15 +27023,15 @@ fclose (f); } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:26252: \"$ac_link\"") >&5 +if { (eval echo "$as_me:27026: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:26255: \$? = $ac_status" >&5 + echo "$as_me:27029: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:26257: \"$ac_try\"") >&5 + { (eval echo "$as_me:27031: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:26260: \$? = $ac_status" >&5 + echo "$as_me:27034: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_sizeof_bool=`cat conftest.val` else @@ -26273,13 +27047,13 @@ else ac_cv_sizeof_bool=0 fi fi -echo "$as_me:26276: result: $ac_cv_sizeof_bool" >&5 +echo "$as_me:27050: result: $ac_cv_sizeof_bool" >&5 echo "${ECHO_T}$ac_cv_sizeof_bool" >&6 cat >>confdefs.h <&5 +echo "$as_me:27056: checking for type of bool" >&5 echo $ECHO_N "checking for type of bool... $ECHO_C" >&6 if test "${cf_cv_type_of_bool+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -26298,7 +27072,7 @@ else else cat >"conftest.$ac_ext" <<_ACEOF -#line 26301 "configure" +#line 27075 "configure" #include "confdefs.h" $ac_includes_default @@ -26315,7 +27089,7 @@ $ac_includes_default #else -#if $cf_cv_header_stdbool_h +#if $USE_STDBOOL_H #include #endif @@ -26324,7 +27098,7 @@ $ac_includes_default int main(void) { FILE *fp = fopen("cf_test.out", "w"); - if (fp != 0) { + if (fp != NULL) { bool x = true; if ((bool)(-x) >= 0) fputs("unsigned ", fp); @@ -26339,15 +27113,15 @@ int main(void) _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:26342: \"$ac_link\"") >&5 +if { (eval echo "$as_me:27116: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:26345: \$? = $ac_status" >&5 + echo "$as_me:27119: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:26347: \"$ac_try\"") >&5 + { (eval echo "$as_me:27121: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:26350: \$? = $ac_status" >&5 + echo "$as_me:27124: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_type_of_bool=`cat cf_test.out` if test -z "$cf_cv_type_of_bool"; then @@ -26364,19 +27138,19 @@ fi rm -f cf_test.out fi -echo "$as_me:26367: result: $cf_cv_type_of_bool" >&5 +echo "$as_me:27141: result: $cf_cv_type_of_bool" >&5 echo "${ECHO_T}$cf_cv_type_of_bool" >&6 if test "$cf_cv_type_of_bool" = unknown ; then case .$NCURSES_BOOL in (.auto|.) NCURSES_BOOL=unsigned;; esac - { echo "$as_me:26374: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 + { echo "$as_me:27148: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 echo "$as_me: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;} cf_cv_type_of_bool=$NCURSES_BOOL fi -echo "$as_me:26379: checking for special defines needed for etip.h" >&5 +echo "$as_me:27153: checking for special defines needed for etip.h" >&5 echo $ECHO_N "checking for special defines needed for etip.h... $ECHO_C" >&6 cf_save_CXXFLAGS="$CXXFLAGS" cf_result="none" @@ -26394,7 +27168,7 @@ do test -n "$cf_math" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_math}" test -n "$cf_excp" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_excp}" cat >"conftest.$ac_ext" <<_ACEOF -#line 26397 "configure" +#line 27171 "configure" #include "confdefs.h" #include @@ -26408,16 +27182,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:26411: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:27185: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:26414: \$? = $ac_status" >&5 + echo "$as_me:27188: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:26417: \"$ac_try\"") >&5 + { (eval echo "$as_me:27191: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:26420: \$? = $ac_status" >&5 + echo "$as_me:27194: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then test -n "$cf_math" && cat >>confdefs.h <&5 -echo "${ECHO_T}$cf_result" >&6 +echo "$as_me:27215: result: ${cf_result:-(none)}" >&5 +echo "${ECHO_T}${cf_result:-(none)}" >&6 CXXFLAGS="$cf_save_CXXFLAGS" if test -n "$CXX"; then -echo "$as_me:26446: checking if $CXX accepts override keyword" >&5 +echo "$as_me:27220: checking if $CXX accepts override keyword" >&5 echo $ECHO_N "checking if $CXX accepts override keyword... $ECHO_C" >&6 if test "${cf_cv_cpp_override+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -26460,7 +27234,7 @@ ac_main_return="return" cf_cv_cpp_override=unknown else cat >"conftest.$ac_ext" <<_ACEOF -#line 26463 "configure" +#line 27237 "configure" #include "confdefs.h" class base @@ -26479,15 +27253,15 @@ int main(void) { } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:26482: \"$ac_link\"") >&5 +if { (eval echo "$as_me:27256: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:26485: \$? = $ac_status" >&5 + echo "$as_me:27259: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:26487: \"$ac_try\"") >&5 + { (eval echo "$as_me:27261: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:26490: \$? = $ac_status" >&5 + echo "$as_me:27264: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_cpp_override=yes else @@ -26506,7 +27280,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ac_main_return="return" fi -echo "$as_me:26509: result: $cf_cv_cpp_override" >&5 +echo "$as_me:27283: result: $cf_cv_cpp_override" >&5 echo "${ECHO_T}$cf_cv_cpp_override" >&6 fi test "$cf_cv_cpp_override" = yes && @@ -26515,7 +27289,7 @@ cat >>confdefs.h <<\EOF EOF if test -n "$CXX"; then -echo "$as_me:26518: checking if $CXX accepts parameter initialization" >&5 +echo "$as_me:27292: checking if $CXX accepts parameter initialization" >&5 echo $ECHO_N "checking if $CXX accepts parameter initialization... $ECHO_C" >&6 if test "${cf_cv_cpp_param_init+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -26532,7 +27306,7 @@ ac_main_return="return" cf_cv_cpp_param_init=unknown else cat >"conftest.$ac_ext" <<_ACEOF -#line 26535 "configure" +#line 27309 "configure" #include "confdefs.h" class TEST { @@ -26551,15 +27325,15 @@ int main(void) { } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:26554: \"$ac_link\"") >&5 +if { (eval echo "$as_me:27328: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:26557: \$? = $ac_status" >&5 + echo "$as_me:27331: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:26559: \"$ac_try\"") >&5 + { (eval echo "$as_me:27333: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:26562: \$? = $ac_status" >&5 + echo "$as_me:27336: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_cpp_param_init=yes else @@ -26578,7 +27352,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ac_main_return="return" fi -echo "$as_me:26581: result: $cf_cv_cpp_param_init" >&5 +echo "$as_me:27355: result: $cf_cv_cpp_param_init" >&5 echo "${ECHO_T}$cf_cv_cpp_param_init" >&6 fi test "$cf_cv_cpp_param_init" = yes && @@ -26588,7 +27362,7 @@ EOF if test -n "$CXX"; then -echo "$as_me:26591: checking if $CXX accepts static_cast" >&5 +echo "$as_me:27365: checking if $CXX accepts static_cast" >&5 echo $ECHO_N "checking if $CXX accepts static_cast... $ECHO_C" >&6 if test "${cf_cv_cpp_static_cast+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -26602,7 +27376,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ac_main_return="return" cat >"conftest.$ac_ext" <<_ACEOF -#line 26605 "configure" +#line 27379 "configure" #include "confdefs.h" class NCursesPanel @@ -26646,16 +27420,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:26649: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:27423: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:26652: \$? = $ac_status" >&5 + echo "$as_me:27426: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:26655: \"$ac_try\"") >&5 + { (eval echo "$as_me:27429: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:26658: \$? = $ac_status" >&5 + echo "$as_me:27432: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_cpp_static_cast=yes else @@ -26673,7 +27447,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ac_main_return="return" fi -echo "$as_me:26676: result: $cf_cv_cpp_static_cast" >&5 +echo "$as_me:27450: result: $cf_cv_cpp_static_cast" >&5 echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6 fi @@ -26705,7 +27479,7 @@ EOF else cf_cxx_library=no - cf_cv_builtin_bool=1 + cf_cv_builtin_bool=yes # Just because we are not configuring against C++ right now does not # mean that a user will not want to use C++. Some distributors disable @@ -26718,17 +27492,16 @@ else if test "$NCURSES_BOOL" != auto ; then cf_cv_type_of_bool=$NCURSES_BOOL - cf_cv_header_stdbool_h=0 + USE_STDBOOL_H=0 else - if test "$cf_cv_header_stdbool_h" = 1 ; then -echo "$as_me:26725: checking for bool" >&5 +echo "$as_me:27498: checking for bool" >&5 echo $ECHO_N "checking for bool... $ECHO_C" >&6 if test "${ac_cv_type_bool+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 26731 "configure" +#line 27504 "configure" #include "confdefs.h" $ac_includes_default @@ -26745,7 +27518,7 @@ $ac_includes_default #else -#if $cf_cv_header_stdbool_h +#if $USE_STDBOOL_H #include #endif @@ -26763,16 +27536,16 @@ if (sizeof (bool)) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:26766: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:27539: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:26769: \$? = $ac_status" >&5 + echo "$as_me:27542: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:26772: \"$ac_try\"") >&5 + { (eval echo "$as_me:27545: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:26775: \$? = $ac_status" >&5 + echo "$as_me:27548: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_type_bool=yes else @@ -26782,10 +27555,10 @@ ac_cv_type_bool=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:26785: result: $ac_cv_type_bool" >&5 +echo "$as_me:27558: result: $ac_cv_type_bool" >&5 echo "${ECHO_T}$ac_cv_type_bool" >&6 -echo "$as_me:26788: checking size of bool" >&5 +echo "$as_me:27561: checking size of bool" >&5 echo $ECHO_N "checking size of bool... $ECHO_C" >&6 if test "${ac_cv_sizeof_bool+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -26794,7 +27567,7 @@ else if test "$cross_compiling" = yes; then # Depending upon the size, compute the lo and hi bounds. cat >"conftest.$ac_ext" <<_ACEOF -#line 26797 "configure" +#line 27570 "configure" #include "confdefs.h" $ac_includes_default @@ -26811,7 +27584,7 @@ $ac_includes_default #else -#if $cf_cv_header_stdbool_h +#if $USE_STDBOOL_H #include #endif @@ -26826,21 +27599,21 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= 0)] } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:26829: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:27602: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:26832: \$? = $ac_status" >&5 + echo "$as_me:27605: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:26835: \"$ac_try\"") >&5 + { (eval echo "$as_me:27608: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:26838: \$? = $ac_status" >&5 + echo "$as_me:27611: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_lo=0 ac_mid=0 while :; do cat >"conftest.$ac_ext" <<_ACEOF -#line 26843 "configure" +#line 27616 "configure" #include "confdefs.h" $ac_includes_default @@ -26857,7 +27630,7 @@ $ac_includes_default #else -#if $cf_cv_header_stdbool_h +#if $USE_STDBOOL_H #include #endif @@ -26872,16 +27645,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)] } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:26875: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:27648: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:26878: \$? = $ac_status" >&5 + echo "$as_me:27651: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:26881: \"$ac_try\"") >&5 + { (eval echo "$as_me:27654: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:26884: \$? = $ac_status" >&5 + echo "$as_me:27657: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_hi=$ac_mid; break else @@ -26897,7 +27670,7 @@ cat "conftest.$ac_ext" >&5 ac_hi=-1 ac_mid=-1 while :; do cat >"conftest.$ac_ext" <<_ACEOF -#line 26900 "configure" +#line 27673 "configure" #include "confdefs.h" $ac_includes_default @@ -26914,7 +27687,7 @@ $ac_includes_default #else -#if $cf_cv_header_stdbool_h +#if $USE_STDBOOL_H #include #endif @@ -26929,16 +27702,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= $ac_mid)] } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:26932: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:27705: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:26935: \$? = $ac_status" >&5 + echo "$as_me:27708: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:26938: \"$ac_try\"") >&5 + { (eval echo "$as_me:27711: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:26941: \$? = $ac_status" >&5 + echo "$as_me:27714: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_lo=$ac_mid; break else @@ -26954,7 +27727,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" while test "x$ac_lo" != "x$ac_hi"; do ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"` cat >"conftest.$ac_ext" <<_ACEOF -#line 26957 "configure" +#line 27730 "configure" #include "confdefs.h" $ac_includes_default @@ -26971,7 +27744,7 @@ $ac_includes_default #else -#if $cf_cv_header_stdbool_h +#if $USE_STDBOOL_H #include #endif @@ -26986,16 +27759,16 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)] } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:26989: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:27762: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:26992: \$? = $ac_status" >&5 + echo "$as_me:27765: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:26995: \"$ac_try\"") >&5 + { (eval echo "$as_me:27768: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:26998: \$? = $ac_status" >&5 + echo "$as_me:27771: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_hi=$ac_mid else @@ -27008,12 +27781,12 @@ done ac_cv_sizeof_bool=$ac_lo else if test "$cross_compiling" = yes; then - { { echo "$as_me:27011: error: cannot run test program while cross compiling" >&5 + { { echo "$as_me:27784: error: cannot run test program while cross compiling" >&5 echo "$as_me: error: cannot run test program while cross compiling" >&2;} { (exit 1); exit 1; }; } else cat >"conftest.$ac_ext" <<_ACEOF -#line 27016 "configure" +#line 27789 "configure" #include "confdefs.h" $ac_includes_default @@ -27030,7 +27803,7 @@ $ac_includes_default #else -#if $cf_cv_header_stdbool_h +#if $USE_STDBOOL_H #include #endif @@ -27049,15 +27822,15 @@ fclose (f); } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:27052: \"$ac_link\"") >&5 +if { (eval echo "$as_me:27825: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:27055: \$? = $ac_status" >&5 + echo "$as_me:27828: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:27057: \"$ac_try\"") >&5 + { (eval echo "$as_me:27830: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:27060: \$? = $ac_status" >&5 + echo "$as_me:27833: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_sizeof_bool=`cat conftest.val` else @@ -27073,13 +27846,13 @@ else ac_cv_sizeof_bool=0 fi fi -echo "$as_me:27076: result: $ac_cv_sizeof_bool" >&5 +echo "$as_me:27849: result: $ac_cv_sizeof_bool" >&5 echo "${ECHO_T}$ac_cv_sizeof_bool" >&6 cat >>confdefs.h <&5 +echo "$as_me:27855: checking for type of bool" >&5 echo $ECHO_N "checking for type of bool... $ECHO_C" >&6 if test "${cf_cv_type_of_bool+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -27098,7 +27871,7 @@ else else cat >"conftest.$ac_ext" <<_ACEOF -#line 27101 "configure" +#line 27874 "configure" #include "confdefs.h" $ac_includes_default @@ -27115,7 +27888,7 @@ $ac_includes_default #else -#if $cf_cv_header_stdbool_h +#if $USE_STDBOOL_H #include #endif @@ -27124,7 +27897,7 @@ $ac_includes_default int main(void) { FILE *fp = fopen("cf_test.out", "w"); - if (fp != 0) { + if (fp != NULL) { bool x = true; if ((bool)(-x) >= 0) fputs("unsigned ", fp); @@ -27139,15 +27912,15 @@ int main(void) _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:27142: \"$ac_link\"") >&5 +if { (eval echo "$as_me:27915: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:27145: \$? = $ac_status" >&5 + echo "$as_me:27918: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:27147: \"$ac_try\"") >&5 + { (eval echo "$as_me:27920: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:27150: \$? = $ac_status" >&5 + echo "$as_me:27923: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_type_of_bool=`cat cf_test.out` if test -z "$cf_cv_type_of_bool"; then @@ -27164,28 +27937,18 @@ fi rm -f cf_test.out fi -echo "$as_me:27167: result: $cf_cv_type_of_bool" >&5 +echo "$as_me:27940: result: $cf_cv_type_of_bool" >&5 echo "${ECHO_T}$cf_cv_type_of_bool" >&6 if test "$cf_cv_type_of_bool" = unknown ; then case .$NCURSES_BOOL in (.auto|.) NCURSES_BOOL=unsigned;; esac - { echo "$as_me:27174: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 + { echo "$as_me:27947: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 echo "$as_me: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;} cf_cv_type_of_bool=$NCURSES_BOOL -fi - - else - echo "$as_me:27180: checking for fallback type of bool" >&5 -echo $ECHO_N "checking for fallback type of bool... $ECHO_C" >&6 - case "$host_cpu" in - (i?86) cf_cv_type_of_bool=char ;; - (*) cf_cv_type_of_bool=int ;; - esac - echo "$as_me:27186: result: $cf_cv_type_of_bool" >&5 -echo "${ECHO_T}$cf_cv_type_of_bool" >&6 - fi +fi + fi fi @@ -27195,11 +27958,11 @@ fi # specify the type of bool in a configure-script option and postpone # integration with the C++ compiler provided that the types are compatible. USE_CXX_BOOL=1 -if test "$cf_cv_cc_bool_type" = 1 +if test "$USE_BUILTIN_BOOL" = 1 then # oops: C has a bool. Unlikely, but C++ could differ. USE_CXX_BOOL=0 -elif test "$cf_cv_builtin_bool" = 0 +elif test "$cf_cv_builtin_bool" = no then # C++ has no bool USE_CXX_BOOL=0 @@ -27212,246 +27975,18 @@ if test -f "${srcdir}/Ada95/Makefile.in" ; then if test "$cf_with_ada" != "no" ; then if test "$with_libtool" != "no"; then - { echo "$as_me:27215: WARNING: libtool does not support Ada - disabling feature" >&5 + { echo "$as_me:27978: WARNING: libtool does not support Ada - disabling feature" >&5 echo "$as_me: WARNING: libtool does not support Ada - disabling feature" >&2;} cf_with_ada=no fi fi if test "$cf_with_ada" != "no" ; then - -for cf_prog_gnat in gnat gnatmake gprconfig gprbuild -do - -cf_upper_prog_gnat=`echo "${cf_prog_gnat}" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` - - unset ac_cv_path_cf_TEMP_gnat - unset cf_TEMP_gnat - # Extract the first word of "$cf_prog_gnat", so it can be a program name with args. -set dummy $cf_prog_gnat; ac_word=$2 -echo "$as_me:27232: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_cf_TEMP_gnat+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $cf_TEMP_gnat in - [\\/]* | ?:[\\/]*) - ac_cv_path_cf_TEMP_gnat="$cf_TEMP_gnat" # Let the user override the test with a path. - ;; - *) - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - if $as_executable_p "$ac_dir/$ac_word"; then - ac_cv_path_cf_TEMP_gnat="$ac_dir/$ac_word" - echo "$as_me:27249: found $ac_dir/$ac_word" >&5 - break -fi -done - - test -z "$ac_cv_path_cf_TEMP_gnat" && ac_cv_path_cf_TEMP_gnat="no" - ;; -esac -fi -cf_TEMP_gnat=$ac_cv_path_cf_TEMP_gnat - -if test -n "$cf_TEMP_gnat"; then - echo "$as_me:27261: result: $cf_TEMP_gnat" >&5 -echo "${ECHO_T}$cf_TEMP_gnat" >&6 -else - echo "$as_me:27264: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - eval "cf_cv_PATH_$cf_upper_prog_gnat=$ac_cv_path_cf_TEMP_gnat" - - if test "x$cf_TEMP_gnat" != xno; then - unset cf_cv_gnat_version - unset cf_TEMP_gnat - -echo "$as_me:27274: checking for $cf_prog_gnat version" >&5 -echo $ECHO_N "checking for $cf_prog_gnat version... $ECHO_C" >&6 -if test "${cf_cv_gnat_version+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - -cf_cv_gnat_version=`$cf_prog_gnat --version 2>&1 | \ - grep '[0-9].[0-9][0-9]*' |\ - sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'` - -fi -echo "$as_me:27285: result: $cf_cv_gnat_version" >&5 -echo "${ECHO_T}$cf_cv_gnat_version" >&6 -test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no -eval cf_TEMP_gnat=$cf_cv_gnat_version; unset cf_cv_gnat_version - - fi - eval "cf_cv_VERSION_$cf_upper_prog_gnat=$cf_TEMP_gnat" - - unset cf_TEMP_gnat - unset cf_cv_gnat_version - unset ac_cv_path_cf_TEMP_gnat -done - -if test "x$cf_cv_VERSION_GNATMAKE" = "xno"; then - cf_ada_make= - cf_cv_prog_gnat_correct=no -else - cf_ada_make=gnatmake - if test "x$cf_cv_VERSION_GPRCONFIG" = "xno"; then - # gprconfig is newer than gnatmake; we can continue... - cf_ada_config="##" - else - rm -rf ./conftest* ./*~conftest* - if mkdir conftest.src - then - cf_ada_config="" - cd conftest.src - for cf_gprconfig in Ada C - do - echo "$as_me:27314: checking for gprconfig name for $cf_gprconfig" >&5 -echo $ECHO_N "checking for gprconfig name for $cf_gprconfig... $ECHO_C" >&6 - if test "$cf_gprconfig" = C - then - for cf_gprconfig_param in \ - "$cf_gprconfig,,,,GNATGCC" \ - "$cf_gprconfig,,,,GCC" \ - "$cf_gprconfig" - do - cf_gprconfig_value=`echo s| gprconfig --config=$cf_gprconfig_param 2>&5 | ${AWK:-awk} '/^\*/{print $3;}' | head -n 1` - test -n "$cf_gprconfig_value" && break - done - else - cf_gprconfig_param=$cf_gprconfig - cf_gprconfig_value=`echo s| gprconfig --config=$cf_gprconfig_param 2>&5 | ${AWK:-awk} '/^\*/{print $3;}' | head -n 1` - fi - if test -n "$cf_gprconfig_value" - then - eval "cf_ada_config_$cf_gprconfig=$cf_gprconfig_value" - echo "$as_me:27333: result: $cf_gprconfig_value" >&5 -echo "${ECHO_T}$cf_gprconfig_value" >&6 - else - echo "$as_me:27336: result: missing" >&5 -echo "${ECHO_T}missing" >&6 - cf_ada_config="#" - break - fi - done - cd .. - rm -rf ./conftest* ./*~conftest* - fi - fi - if test "x$cf_ada_config" != "x#" - then - -echo "$as_me:27349: checking for gnat version" >&5 -echo $ECHO_N "checking for gnat version... $ECHO_C" >&6 -if test "${cf_cv_gnat_version+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - -cf_cv_gnat_version=`${cf_ada_make:-gnatmake} --version 2>&1 | \ - grep '[0-9].[0-9][0-9]*' |\ - sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'` - -fi -echo "$as_me:27360: result: $cf_cv_gnat_version" >&5 -echo "${ECHO_T}$cf_cv_gnat_version" >&6 -test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no - -case "$cf_cv_gnat_version" in -(3.1[1-9]*|3.[2-9]*|[4-9].*|[1-9][0-9].[0-9]*|20[0-9][0-9]) - cf_cv_prog_gnat_correct=yes - ;; -(*) - { echo "$as_me:27369: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5 -echo "$as_me: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;} - cf_cv_prog_gnat_correct=no - ;; -esac - - # Extract the first word of "m4", so it can be a program name with args. -set dummy m4; ac_word=$2 -echo "$as_me:27377: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_M4_exists+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$M4_exists"; then - ac_cv_prog_M4_exists="$M4_exists" # Let the user override the test. -else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_M4_exists="yes" -echo "$as_me:27392: found $ac_dir/$ac_word" >&5 -break -done - - test -z "$ac_cv_prog_M4_exists" && ac_cv_prog_M4_exists="no" -fi -fi -M4_exists=$ac_cv_prog_M4_exists -if test -n "$M4_exists"; then - echo "$as_me:27401: result: $M4_exists" >&5 -echo "${ECHO_T}$M4_exists" >&6 -else - echo "$as_me:27404: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - if test "$ac_cv_prog_M4_exists" = no; then - cf_cv_prog_gnat_correct=no - { echo "$as_me:27410: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5 -echo "$as_me: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&2;} - fi - if test "$cf_cv_prog_gnat_correct" = yes; then - echo "$as_me:27414: checking if GNAT works" >&5 -echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6 - -rm -rf ./conftest* ./*~conftest* -cat >>conftest.ads <>conftest.adb <&5 2>&1 ) ; then - if ( ./conftest 1>&5 2>&1 ) ; then - cf_cv_prog_gnat_correct=yes - else - cf_cv_prog_gnat_correct=no - fi -else - cf_cv_prog_gnat_correct=no -fi -rm -rf ./conftest* ./*~conftest* - - echo "$as_me:27442: result: $cf_cv_prog_gnat_correct" >&5 -echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6 - fi - else - cf_cv_prog_gnat_correct=no - fi -fi - if test "x$cf_cv_prog_gnat_correct" = xyes; then ADAFLAGS="$ADAFLAGS -gnatpn" - echo "$as_me:27454: checking optimization options for ADAFLAGS" >&5 + echo "$as_me:27989: checking optimization options for ADAFLAGS" >&5 echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6 case "$CFLAGS" in (*-g*) @@ -27468,10 +28003,10 @@ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6 ;; esac - echo "$as_me:27471: result: $ADAFLAGS" >&5 + echo "$as_me:28006: result: $ADAFLAGS" >&5 echo "${ECHO_T}$ADAFLAGS" >&6 -echo "$as_me:27474: checking if GNATPREP supports -T option" >&5 +echo "$as_me:28009: checking if GNATPREP supports -T option" >&5 echo $ECHO_N "checking if GNATPREP supports -T option... $ECHO_C" >&6 if test "${cf_cv_gnatprep_opt_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -27481,11 +28016,11 @@ cf_cv_gnatprep_opt_t=no gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes fi -echo "$as_me:27484: result: $cf_cv_gnatprep_opt_t" >&5 +echo "$as_me:28019: result: $cf_cv_gnatprep_opt_t" >&5 echo "${ECHO_T}$cf_cv_gnatprep_opt_t" >&6 test "$cf_cv_gnatprep_opt_t" = yes && GNATPREP_OPTS="-T $GNATPREP_OPTS" -echo "$as_me:27488: checking if GNAT supports generics" >&5 +echo "$as_me:28023: checking if GNAT supports generics" >&5 echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6 case "$cf_cv_gnat_version" in (3.1[1-9]*|3.[2-9]*|[4-9].*|[1-9][0-9].[0-9]*|20[0-9][0-9]) @@ -27495,7 +28030,7 @@ case "$cf_cv_gnat_version" in cf_gnat_generics=no ;; esac -echo "$as_me:27498: result: $cf_gnat_generics" >&5 +echo "$as_me:28033: result: $cf_gnat_generics" >&5 echo "${ECHO_T}$cf_gnat_generics" >&6 if test "$cf_gnat_generics" = yes @@ -27507,7 +28042,7 @@ else cf_generic_objects= fi -echo "$as_me:27510: checking if GNAT supports SIGINT" >&5 +echo "$as_me:28045: checking if GNAT supports SIGINT" >&5 echo $ECHO_N "checking if GNAT supports SIGINT... $ECHO_C" >&6 if test "${cf_cv_gnat_sigint+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -27555,7 +28090,7 @@ fi rm -rf ./conftest* ./*~conftest* fi -echo "$as_me:27558: result: $cf_cv_gnat_sigint" >&5 +echo "$as_me:28093: result: $cf_cv_gnat_sigint" >&5 echo "${ECHO_T}$cf_cv_gnat_sigint" >&6 if test "$cf_cv_gnat_sigint" = yes ; then @@ -27568,7 +28103,7 @@ cf_gnat_libraries=no cf_gnat_projects=no if test "$enable_gnat_projects" != no ; then -echo "$as_me:27571: checking if GNAT supports project files" >&5 +echo "$as_me:28106: checking if GNAT supports project files" >&5 echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6 case "$cf_cv_gnat_version" in (3.[0-9]*) @@ -27631,15 +28166,15 @@ CF_EOF esac ;; esac -echo "$as_me:27634: result: $cf_gnat_projects" >&5 +echo "$as_me:28169: result: $cf_gnat_projects" >&5 echo "${ECHO_T}$cf_gnat_projects" >&6 fi # enable_gnat_projects if test "$cf_gnat_projects" = yes then - echo "$as_me:27640: checking if GNAT supports libraries" >&5 + echo "$as_me:28175: checking if GNAT supports libraries" >&5 echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6 - echo "$as_me:27642: result: $cf_gnat_libraries" >&5 + echo "$as_me:28177: result: $cf_gnat_libraries" >&5 echo "${ECHO_T}$cf_gnat_libraries" >&6 fi @@ -27659,7 +28194,7 @@ then then USE_GNAT_MAKE_GPR="" else - { echo "$as_me:27662: WARNING: use old makefile rules since tools are missing" >&5 + { echo "$as_me:28197: WARNING: use old makefile rules since tools are missing" >&5 echo "$as_me: WARNING: use old makefile rules since tools are missing" >&2;} fi fi @@ -27671,8 +28206,8 @@ else USE_GNAT_LIBRARIES="#" fi -echo "$as_me:27674: checking for ada-compiler" >&5 -echo $ECHO_N "checking for ada-compiler... $ECHO_C" >&6 +echo "$as_me:28209: checking for Ada95 compiler" >&5 +echo $ECHO_N "checking for Ada95 compiler... $ECHO_C" >&6 # Check whether --with-ada-compiler or --without-ada-compiler was given. if test "${with_ada_compiler+set}" = set; then @@ -27682,13 +28217,13 @@ else cf_ada_compiler=gnatmake fi; -echo "$as_me:27685: result: $cf_ada_compiler" >&5 +echo "$as_me:28220: result: $cf_ada_compiler" >&5 echo "${ECHO_T}$cf_ada_compiler" >&6 cf_ada_package=terminal_interface -echo "$as_me:27690: checking for ada-include" >&5 -echo $ECHO_N "checking for ada-include... $ECHO_C" >&6 +echo "$as_me:28225: checking for Ada95 include directory" >&5 +echo $ECHO_N "checking for Ada95 include directory... $ECHO_C" >&6 # Check whether --with-ada-include or --without-ada-include was given. if test "${with_ada_include+set}" = set; then @@ -27704,26 +28239,24 @@ else cf_path_syntax="$ac_default_prefix" fi -case ".$withval" in -(.\$\(*\)*|.\'*\'*) - ;; -(..|./*|.\\*) +case "x$withval" in +(x\$\(*\)*|x\'*\'*) ;; -(.[a-zA-Z]:[\\/]*) # OS/2 EMX +(x.|x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER) ;; -(.\$\{*prefix\}*|.\$\{*dir\}*) +(x\$\{*prefix\}*|x\$\{*dir\}*) eval withval="$withval" - case ".$withval" in - (.NONE/*) + case "x$withval" in + (xNONE/*) withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%` ;; esac ;; -(.no|.NONE/*) +(xno|xNONE/*) withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { { echo "$as_me:27726: error: expected a pathname, not \"$withval\"" >&5 + { { echo "$as_me:28259: error: expected a pathname, not \"$withval\"" >&5 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -27732,11 +28265,11 @@ esac fi eval ADA_INCLUDE="$withval" -echo "$as_me:27735: result: $ADA_INCLUDE" >&5 +echo "$as_me:28268: result: $ADA_INCLUDE" >&5 echo "${ECHO_T}$ADA_INCLUDE" >&6 -echo "$as_me:27738: checking for ada-objects" >&5 -echo $ECHO_N "checking for ada-objects... $ECHO_C" >&6 +echo "$as_me:28271: checking for Ada95 object directory" >&5 +echo $ECHO_N "checking for Ada95 object directory... $ECHO_C" >&6 # Check whether --with-ada-objects or --without-ada-objects was given. if test "${with_ada_objects+set}" = set; then @@ -27752,26 +28285,24 @@ else cf_path_syntax="$ac_default_prefix" fi -case ".$withval" in -(.\$\(*\)*|.\'*\'*) +case "x$withval" in +(x\$\(*\)*|x\'*\'*) ;; -(..|./*|.\\*) +(x.|x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER) ;; -(.[a-zA-Z]:[\\/]*) # OS/2 EMX - ;; -(.\$\{*prefix\}*|.\$\{*dir\}*) +(x\$\{*prefix\}*|x\$\{*dir\}*) eval withval="$withval" - case ".$withval" in - (.NONE/*) + case "x$withval" in + (xNONE/*) withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%` ;; esac ;; -(.no|.NONE/*) +(xno|xNONE/*) withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { { echo "$as_me:27774: error: expected a pathname, not \"$withval\"" >&5 + { { echo "$as_me:28305: error: expected a pathname, not \"$withval\"" >&5 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -27780,11 +28311,11 @@ esac fi eval ADA_OBJECTS="$withval" -echo "$as_me:27783: result: $ADA_OBJECTS" >&5 +echo "$as_me:28314: result: $ADA_OBJECTS" >&5 echo "${ECHO_T}$ADA_OBJECTS" >&6 -echo "$as_me:27786: checking if an Ada95 shared-library should be built" >&5 -echo $ECHO_N "checking if an Ada95 shared-library should be built... $ECHO_C" >&6 +echo "$as_me:28317: checking whether to build an Ada95 shared library" >&5 +echo $ECHO_N "checking whether to build an Ada95 shared library... $ECHO_C" >&6 # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given. if test "${with_ada_sharedlib+set}" = set; then @@ -27793,19 +28324,25 @@ if test "${with_ada_sharedlib+set}" = set; then else with_ada_sharedlib=no fi; -echo "$as_me:27796: result: $with_ada_sharedlib" >&5 -echo "${ECHO_T}$with_ada_sharedlib" >&6 +cf_ada_sharedlib_warn=no if test "x$with_ada_sharedlib" != xno then if test "x$cf_gnat_projects" != xyes then - { echo "$as_me:27803: WARNING: disabling shared-library since GNAT projects are not supported" >&5 -echo "$as_me: WARNING: disabling shared-library since GNAT projects are not supported" >&2;} with_ada_sharedlib=no + cf_ada_sharedlib_warn=yes fi fi +echo "$as_me:28338: result: $with_ada_sharedlib" >&5 +echo "${ECHO_T}$with_ada_sharedlib" >&6 +if test "x$cf_ada_sharedlib_warn" != xno +then + { echo "$as_me:28342: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5 +echo "$as_me: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&2;} +fi + ADA_SHAREDLIB='lib$(LIB_NAME).so.1' MAKE_ADA_SHAREDLIB="#" @@ -27820,8 +28357,8 @@ fi # allow the Ada binding to be renamed -echo "$as_me:27823: checking for ada-libname" >&5 -echo $ECHO_N "checking for ada-libname... $ECHO_C" >&6 +echo "$as_me:28360: checking for Ada95 curses library name" >&5 +echo $ECHO_N "checking for Ada95 curses library name... $ECHO_C" >&6 # Check whether --with-ada-libname or --without-ada-libname was given. if test "${with_ada_libname+set}" = set; then @@ -27836,7 +28373,7 @@ case "x$ADA_LIBNAME" in ;; esac -echo "$as_me:27839: result: $ADA_LIBNAME" >&5 +echo "$as_me:28376: result: $ADA_LIBNAME" >&5 echo "${ECHO_T}$ADA_LIBNAME" >&6 fi @@ -27847,13 +28384,13 @@ fi # do this "late" to avoid conflict with header-checks if test "x$with_widec" = xyes ; then - echo "$as_me:27850: checking for wchar_t" >&5 + echo "$as_me:28387: checking for wchar_t" >&5 echo $ECHO_N "checking for wchar_t... $ECHO_C" >&6 if test "${ac_cv_type_wchar_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 27856 "configure" +#line 28393 "configure" #include "confdefs.h" $ac_includes_default int @@ -27868,16 +28405,16 @@ if (sizeof (wchar_t)) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:27871: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:28408: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:27874: \$? = $ac_status" >&5 + echo "$as_me:28411: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:27877: \"$ac_try\"") >&5 + { (eval echo "$as_me:28414: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:27880: \$? = $ac_status" >&5 + echo "$as_me:28417: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_type_wchar_t=yes else @@ -27887,10 +28424,10 @@ ac_cv_type_wchar_t=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:27890: result: $ac_cv_type_wchar_t" >&5 +echo "$as_me:28427: result: $ac_cv_type_wchar_t" >&5 echo "${ECHO_T}$ac_cv_type_wchar_t" >&6 -echo "$as_me:27893: checking size of wchar_t" >&5 +echo "$as_me:28430: checking size of wchar_t" >&5 echo $ECHO_N "checking size of wchar_t... $ECHO_C" >&6 if test "${ac_cv_sizeof_wchar_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -27899,7 +28436,7 @@ else if test "$cross_compiling" = yes; then # Depending upon the size, compute the lo and hi bounds. cat >"conftest.$ac_ext" <<_ACEOF -#line 27902 "configure" +#line 28439 "configure" #include "confdefs.h" $ac_includes_default int @@ -27911,21 +28448,21 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) >= 0)] } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:27914: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:28451: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:27917: \$? = $ac_status" >&5 + echo "$as_me:28454: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:27920: \"$ac_try\"") >&5 + { (eval echo "$as_me:28457: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:27923: \$? = $ac_status" >&5 + echo "$as_me:28460: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_lo=0 ac_mid=0 while :; do cat >"conftest.$ac_ext" <<_ACEOF -#line 27928 "configure" +#line 28465 "configure" #include "confdefs.h" $ac_includes_default int @@ -27937,16 +28474,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) <= $ac_mid)] } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:27940: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:28477: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:27943: \$? = $ac_status" >&5 + echo "$as_me:28480: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:27946: \"$ac_try\"") >&5 + { (eval echo "$as_me:28483: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:27949: \$? = $ac_status" >&5 + echo "$as_me:28486: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_hi=$ac_mid; break else @@ -27962,7 +28499,7 @@ cat "conftest.$ac_ext" >&5 ac_hi=-1 ac_mid=-1 while :; do cat >"conftest.$ac_ext" <<_ACEOF -#line 27965 "configure" +#line 28502 "configure" #include "confdefs.h" $ac_includes_default int @@ -27974,16 +28511,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) >= $ac_mid)] } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:27977: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:28514: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:27980: \$? = $ac_status" >&5 + echo "$as_me:28517: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:27983: \"$ac_try\"") >&5 + { (eval echo "$as_me:28520: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:27986: \$? = $ac_status" >&5 + echo "$as_me:28523: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_lo=$ac_mid; break else @@ -27999,7 +28536,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" while test "x$ac_lo" != "x$ac_hi"; do ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"` cat >"conftest.$ac_ext" <<_ACEOF -#line 28002 "configure" +#line 28539 "configure" #include "confdefs.h" $ac_includes_default int @@ -28011,16 +28548,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) <= $ac_mid)] } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:28014: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:28551: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:28017: \$? = $ac_status" >&5 + echo "$as_me:28554: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:28020: \"$ac_try\"") >&5 + { (eval echo "$as_me:28557: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:28023: \$? = $ac_status" >&5 + echo "$as_me:28560: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_hi=$ac_mid else @@ -28033,12 +28570,12 @@ done ac_cv_sizeof_wchar_t=$ac_lo else if test "$cross_compiling" = yes; then - { { echo "$as_me:28036: error: cannot run test program while cross compiling" >&5 + { { echo "$as_me:28573: error: cannot run test program while cross compiling" >&5 echo "$as_me: error: cannot run test program while cross compiling" >&2;} { (exit 1); exit 1; }; } else cat >"conftest.$ac_ext" <<_ACEOF -#line 28041 "configure" +#line 28578 "configure" #include "confdefs.h" $ac_includes_default int @@ -28054,15 +28591,15 @@ fclose (f); } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:28057: \"$ac_link\"") >&5 +if { (eval echo "$as_me:28594: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:28060: \$? = $ac_status" >&5 + echo "$as_me:28597: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:28062: \"$ac_try\"") >&5 + { (eval echo "$as_me:28599: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:28065: \$? = $ac_status" >&5 + echo "$as_me:28602: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_sizeof_wchar_t=`cat conftest.val` else @@ -28078,7 +28615,7 @@ else ac_cv_sizeof_wchar_t=0 fi fi -echo "$as_me:28081: result: $ac_cv_sizeof_wchar_t" >&5 +echo "$as_me:28618: result: $ac_cv_sizeof_wchar_t" >&5 echo "${ECHO_T}$ac_cv_sizeof_wchar_t" >&6 cat >>confdefs.h <&6 -echo "${as_me:-configure}:28094: testing test failed (assume 2) ..." 1>&5 +echo "${as_me:-configure}:28631: testing test failed (assume 2) ..." 1>&5 sed /SIZEOF_WCHAR_T/d confdefs.h >confdefs.tmp mv confdefs.tmp confdefs.h @@ -28109,7 +28646,7 @@ fi ### chooses to split module lists into libraries. ### ### (see CF_LIB_RULES). -echo "$as_me:28112: checking for library subsets" >&5 +echo "$as_me:28649: checking for library subsets" >&5 echo $ECHO_N "checking for library subsets... $ECHO_C" >&6 LIB_SUBSETS= @@ -28138,7 +28675,7 @@ LIB_SUBSETS="${LIB_SUBSETS}base" if test "$with_term_driver" != no ; then LIB_SUBSETS="${LIB_SUBSETS}+port_drivers" case "$cf_cv_system_name" in - (*mingw32*|*mingw64*) + (*mingw32*|*mingw64*|*msys*|*cygwin*) if test "x$with_exp_win32" = xyes ; then LIB_SUBSETS="${LIB_SUBSETS}+port_tinfo+port_win32" else @@ -28163,7 +28700,7 @@ fi test "x$with_widec" = xyes && LIB_SUBSETS="${LIB_SUBSETS}+widechar" test "x$with_ext_funcs" = xyes && LIB_SUBSETS="${LIB_SUBSETS}+ext_funcs" -echo "$as_me:28166: result: $LIB_SUBSETS" >&5 +echo "$as_me:28703: result: $LIB_SUBSETS" >&5 echo "${ECHO_T}$LIB_SUBSETS" >&6 ### Construct the list of include-directories to be generated @@ -28194,7 +28731,7 @@ elif test "$includedir" != "/usr/include"; then fi ### Build up pieces for makefile rules -echo "$as_me:28197: checking default library suffix" >&5 +echo "$as_me:28734: checking default library suffix" >&5 echo $ECHO_N "checking default library suffix... $ECHO_C" >&6 case $DFT_LWR_MODEL in @@ -28205,10 +28742,10 @@ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6 (shared) DFT_ARG_SUFFIX='' ;; esac test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}" -echo "$as_me:28208: result: $DFT_ARG_SUFFIX" >&5 +echo "$as_me:28745: result: $DFT_ARG_SUFFIX" >&5 echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6 -echo "$as_me:28211: checking default library-dependency suffix" >&5 +echo "$as_me:28748: checking default library-dependency suffix" >&5 echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6 case X$DFT_LWR_MODEL in @@ -28291,10 +28828,10 @@ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6 DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}" DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}" fi -echo "$as_me:28294: result: $DFT_DEP_SUFFIX" >&5 +echo "$as_me:28831: result: $DFT_DEP_SUFFIX" >&5 echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6 -echo "$as_me:28297: checking default object directory" >&5 +echo "$as_me:28834: checking default object directory" >&5 echo $ECHO_N "checking default object directory... $ECHO_C" >&6 case $DFT_LWR_MODEL in @@ -28310,11 +28847,11 @@ echo $ECHO_N "checking default object directory... $ECHO_C" >&6 DFT_OBJ_SUBDIR='obj_s' ;; esac esac -echo "$as_me:28313: result: $DFT_OBJ_SUBDIR" >&5 +echo "$as_me:28850: result: $DFT_OBJ_SUBDIR" >&5 echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6 if test "x$cf_with_cxx" = xyes ; then -echo "$as_me:28317: checking c++ library-dependency suffix" >&5 +echo "$as_me:28854: checking c++ library-dependency suffix" >&5 echo $ECHO_N "checking c++ library-dependency suffix... $ECHO_C" >&6 if test "$with_libtool" != "no"; then # libtool thinks it can make c++ shared libraries (perhaps only g++) @@ -28407,7 +28944,7 @@ else fi fi -echo "$as_me:28410: result: $CXX_LIB_SUFFIX" >&5 +echo "$as_me:28947: result: $CXX_LIB_SUFFIX" >&5 echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6 fi @@ -28583,19 +29120,19 @@ fi if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED" then - echo "$as_me:28586: checking if linker supports switching between static/dynamic" >&5 + echo "$as_me:29123: checking if linker supports switching between static/dynamic" >&5 echo $ECHO_N "checking if linker supports switching between static/dynamic... $ECHO_C" >&6 rm -f libconftest.a cat >conftest.$ac_ext < int cf_ldflags_static(FILE *fp) { return fflush(fp); } EOF - if { (eval echo "$as_me:28595: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:29132: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:28598: \$? = $ac_status" >&5 + echo "$as_me:29135: \$? = $ac_status" >&5 (exit "$ac_status"); } ; then ( $AR $ARFLAGS libconftest.a conftest.o ) 2>&5 1>/dev/null ( eval $RANLIB libconftest.a ) 2>&5 >/dev/null @@ -28606,10 +29143,10 @@ EOF LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 28609 "configure" +#line 29146 "configure" #include "confdefs.h" -#line 28612 "configure" +#line 29149 "configure" #include int cf_ldflags_static(FILE *fp); @@ -28624,16 +29161,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:28627: \"$ac_link\"") >&5 +if { (eval echo "$as_me:29164: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:28630: \$? = $ac_status" >&5 + echo "$as_me:29167: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:28633: \"$ac_try\"") >&5 + { (eval echo "$as_me:29170: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:28636: \$? = $ac_status" >&5 + echo "$as_me:29173: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then # some linkers simply ignore the -dynamic @@ -28656,7 +29193,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" rm -f libconftest.* LIBS="$cf_save_LIBS" - echo "$as_me:28659: result: $cf_ldflags_static" >&5 + echo "$as_me:29196: result: $cf_ldflags_static" >&5 echo "${ECHO_T}$cf_ldflags_static" >&6 if test "$cf_ldflags_static" != yes @@ -28672,7 +29209,7 @@ fi ;; esac -echo "$as_me:28675: checking where we will install curses.h" >&5 +echo "$as_me:29212: checking where we will install curses.h" >&5 echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6 includesubdir= @@ -28682,7 +29219,7 @@ if test "$with_overwrite" = no && \ then includesubdir="/ncurses${USE_LIB_SUFFIX}" fi -echo "$as_me:28685: result: ${includedir}${includesubdir}" >&5 +echo "$as_me:29222: result: ${includedir}${includesubdir}" >&5 echo "${ECHO_T}${includedir}${includesubdir}" >&6 ### Resolve a conflict between normal and wide-curses by forcing applications @@ -28690,7 +29227,7 @@ echo "${ECHO_T}${includedir}${includesubdir}" >&6 if test "$with_overwrite" != no ; then if test "$NCURSES_LIBUTF8" = 1 ; then NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)' - { echo "$as_me:28693: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5 + { echo "$as_me:29230: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5 echo "$as_me: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&2;} fi fi @@ -28707,9 +29244,6 @@ case "$cf_cv_system_name" in *) ;; esac -# used to separate tack out of the tree -NCURSES_TREE= - ### predefined stuff for the test programs cat >>confdefs.h <<\EOF @@ -28718,7 +29252,7 @@ EOF # pkgsrc uses these -echo "$as_me:28721: checking for desired basename for form library" >&5 +echo "$as_me:29255: checking for desired basename for form library" >&5 echo $ECHO_N "checking for desired basename for form library... $ECHO_C" >&6 # Check whether --with-form-libname or --without-form-libname was given. @@ -28738,10 +29272,10 @@ case "x$FORM_NAME" in ;; esac -echo "$as_me:28741: result: $FORM_NAME" >&5 +echo "$as_me:29275: result: $FORM_NAME" >&5 echo "${ECHO_T}$FORM_NAME" >&6 -echo "$as_me:28744: checking for desired basename for menu library" >&5 +echo "$as_me:29278: checking for desired basename for menu library" >&5 echo $ECHO_N "checking for desired basename for menu library... $ECHO_C" >&6 # Check whether --with-menu-libname or --without-menu-libname was given. @@ -28761,10 +29295,10 @@ case "x$MENU_NAME" in ;; esac -echo "$as_me:28764: result: $MENU_NAME" >&5 +echo "$as_me:29298: result: $MENU_NAME" >&5 echo "${ECHO_T}$MENU_NAME" >&6 -echo "$as_me:28767: checking for desired basename for panel library" >&5 +echo "$as_me:29301: checking for desired basename for panel library" >&5 echo $ECHO_N "checking for desired basename for panel library... $ECHO_C" >&6 # Check whether --with-panel-libname or --without-panel-libname was given. @@ -28784,10 +29318,10 @@ case "x$PANEL_NAME" in ;; esac -echo "$as_me:28787: result: $PANEL_NAME" >&5 +echo "$as_me:29321: result: $PANEL_NAME" >&5 echo "${ECHO_T}$PANEL_NAME" >&6 -echo "$as_me:28790: checking for desired basename for cxx library" >&5 +echo "$as_me:29324: checking for desired basename for cxx library" >&5 echo $ECHO_N "checking for desired basename for cxx library... $ECHO_C" >&6 # Check whether --with-cxx-libname or --without-cxx-libname was given. @@ -28807,13 +29341,13 @@ case "x$CXX_NAME" in ;; esac -echo "$as_me:28810: result: $CXX_NAME" >&5 +echo "$as_me:29344: result: $CXX_NAME" >&5 echo "${ECHO_T}$CXX_NAME" >&6 ### Construct the list of subdirectories for which we'll customize makefiles ### with the appropriate compile-rules. -echo "$as_me:28816: checking for src modules" >&5 +echo "$as_me:29350: checking for src modules" >&5 echo $ECHO_N "checking for src modules... $ECHO_C" >&6 # dependencies and linker-arguments for test-programs @@ -28833,14 +29367,6 @@ for cf_dir in $modules_to_build do if test -f "$srcdir/$cf_dir/modules" ; then - # We may/may not have tack in the distribution, though the - # makefile is. - if test "$cf_dir" = tack ; then - if test "x$cf_with_tack" != "xyes"; then - continue - fi - fi - if test -z "$cf_cv_src_modules"; then cf_cv_src_modules=$cf_dir else @@ -28851,9 +29377,7 @@ do # well. These are header files that are the same name as their # directory. Ncurses is the only library that does not follow # that pattern. - if test "$cf_dir" = tack ; then - continue - elif test -f "$srcdir/${cf_dir}/${cf_dir}.h" ; then + if test -f "$srcdir/${cf_dir}/${cf_dir}.h" ; then cf_have_include=`echo "$cf_dir" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` @@ -28882,7 +29406,7 @@ eval TEST_ROOT="\$${cf_map_lib_basename}_NAME" fi fi done -echo "$as_me:28885: result: $cf_cv_src_modules" >&5 +echo "$as_me:29409: result: $cf_cv_src_modules" >&5 echo "${ECHO_T}$cf_cv_src_modules" >&6 TEST_ARGS="-L${LIB_DIR} $TEST_ARGS" @@ -29043,7 +29567,7 @@ case "$cf_cv_system_name" in (*-D_XOPEN_SOURCE_EXTENDED*) test -n "$verbose" && echo " moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6 -echo "${as_me:-configure}:29046: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5 +echo "${as_me:-configure}:29570: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5 CFLAGS="$CFLAGS -D_XOPEN_SOURCE_EXTENDED" CPPFLAGS=`echo "x$CPPFLAGS" | sed -e 's/^.//' -e 's/-D_XOPEN_SOURCE_EXTENDED//'` @@ -29054,8 +29578,8 @@ esac # Help to automatically enable the extended curses features when using either # the *-config or the ".pc" files by adding defines. -echo "$as_me:29057: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5 -echo $ECHO_N "checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script... $ECHO_C" >&6 +echo "$as_me:29581: checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script" >&5 +echo $ECHO_N "checking for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script... $ECHO_C" >&6 PKG_CFLAGS= for cf_loop1 in $CPPFLAGS_after_XOPEN do @@ -29070,9 +29594,20 @@ do done test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1" done -echo "$as_me:29073: result: $PKG_CFLAGS" >&5 +echo "$as_me:29597: result: $PKG_CFLAGS" >&5 echo "${ECHO_T}$PKG_CFLAGS" >&6 +case "$cf_cv_system_name" in +(cygwin*|msys*|mingw32*|mingw64|os2*) + GLOB_FULLPATH_POSIX='/*' + GLOB_FULLPATH_OTHER='[a-zA-Z]:[\\/]*' + ;; +(*) + GLOB_FULLPATH_POSIX='/*' + GLOB_FULLPATH_OTHER=$GLOB_FULLPATH_POSIX + ;; +esac + # AC_CHECK_SIZEOF demands a literal parameter, no variables. So we do this. case "x$NCURSES_OSPEED" in (*short*) @@ -29131,7 +29666,7 @@ then cf_filter_syms=$cf_dft_filter_syms test -n "$verbose" && echo " will map symbols to ABI=$cf_cv_abi_default" 1>&6 -echo "${as_me:-configure}:29134: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5 +echo "${as_me:-configure}:29669: testing will map symbols to ABI=$cf_cv_abi_default ..." 1>&5 fi @@ -29158,7 +29693,7 @@ fi # This is used for the *-config script and *.pc data files. -echo "$as_me:29161: checking for linker search path" >&5 +echo "$as_me:29696: checking for linker search path" >&5 echo $ECHO_N "checking for linker search path... $ECHO_C" >&6 if test "${cf_cv_ld_searchpath+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -29206,7 +29741,7 @@ then cf_pathlist="$cf_pathlist /lib /usr/lib" ;; (*) - { echo "$as_me:29209: WARNING: problem with Solaris architecture" >&5 + { echo "$as_me:29744: WARNING: problem with Solaris architecture" >&5 echo "$as_me: WARNING: problem with Solaris architecture" >&2;} ;; esac @@ -29247,15 +29782,11 @@ done test -z "$cf_cv_ld_searchpath" && cf_cv_ld_searchpath=/usr/lib fi -echo "$as_me:29250: result: $cf_cv_ld_searchpath" >&5 +echo "$as_me:29785: result: $cf_cv_ld_searchpath" >&5 echo "${ECHO_T}$cf_cv_ld_searchpath" >&6 LD_SEARCHPATH=`echo "$cf_cv_ld_searchpath"|sed -e 's/ /|/g'` -cat >>confdefs.h <<\EOF -#define HAVE_CURSES_DATA_BOOLNAMES 1 -EOF - ac_config_files="$ac_config_files include/MKterm.h.awk include/curses.head:include/curses.h.in include/ncurses_dll.h include/termcap.h include/unctrl.h man/man_db.renames $SUB_MAKEFILES Makefile" ac_config_commands="$ac_config_commands default" cat >confcache <<\_ACEOF @@ -29268,7 +29799,7 @@ cat >confcache <<\_ACEOF # config.status only pays attention to the cache file if you give it # the --recheck option to rerun configure. # -# `ac_cv_env_foo' variables (set or unset) will be overriden when +# `ac_cv_env_foo' variables (set or unset) will be overridden when # loading this file, other *unset* `ac_cv_foo' will be assigned the # following values. @@ -29337,7 +29868,7 @@ DEFS=-DHAVE_CONFIG_H : "${CONFIG_STATUS=./config.status}" ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ echo "$as_me:29340: creating $CONFIG_STATUS" >&5 +{ echo "$as_me:29871: creating $CONFIG_STATUS" >&5 echo "$as_me: creating $CONFIG_STATUS" >&6;} cat >"$CONFIG_STATUS" <<_ACEOF #! $SHELL @@ -29473,7 +30004,7 @@ EOF cat >>"$CONFIG_STATUS" <>"$CONFIG_STATUS" <<\EOF echo "$ac_cs_version"; exit 0 ;; --he | --h) # Conflict between --help and --header - { { echo "$as_me:29521: error: ambiguous option: $1 + { { echo "$as_me:30052: error: ambiguous option: $1 Try \`$0 --help' for more information." >&5 echo "$as_me: error: ambiguous option: $1 Try \`$0 --help' for more information." >&2;} @@ -29537,7 +30068,7 @@ Try \`$0 --help' for more information." >&2;} ac_need_defaults=false;; # This is an error. - -*) { { echo "$as_me:29540: error: unrecognized option: $1 + -*) { { echo "$as_me:30071: error: unrecognized option: $1 Try \`$0 --help' for more information." >&5 echo "$as_me: error: unrecognized option: $1 Try \`$0 --help' for more information." >&2;} @@ -29556,7 +30087,7 @@ cat >&5 << _ACEOF ## Running config.status. ## ## ----------------------- ## -This file was extended by $as_me 2.52.20230114, executed with +This file was extended by $as_me 2.52.20250126, executed with CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS CONFIG_LINKS = $CONFIG_LINKS @@ -29583,6 +30114,8 @@ DFT_LWR_MODEL="$DFT_LWR_MODEL" ECHO_LD="$ECHO_LD" EXTRA_SUFFIX="$EXTRA_SUFFIX" FORM_NAME="$FORM_NAME" +GLOB_FULLPATH_OTHER="$GLOB_FULLPATH_OTHER" +GLOB_FULLPATH_POSIX="$GLOB_FULLPATH_POSIX" LDCONFIG="$LDCONFIG" LIBTOOL_VERSION="$LIBTOOL_VERSION" LIB_NAME="$LIB_NAME" @@ -29667,7 +30200,7 @@ do "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; "include/ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/ncurses_cfg.h:include/ncurses_cfg.hin" ;; - *) { { echo "$as_me:29670: error: invalid argument: $ac_config_target" >&5 + *) { { echo "$as_me:30203: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac @@ -29767,6 +30300,7 @@ s,@VERSION@,$VERSION,;t t s,@VERSION_MAJOR@,$VERSION_MAJOR,;t t s,@VERSION_MINOR@,$VERSION_MINOR,;t t s,@VERSION_PATCH@,$VERSION_PATCH,;t t +s,@PROGRAM@,$PROGRAM,;t t s,@PACKAGE@,$PACKAGE,;t t s,@build@,$build,;t t s,@build_cpu@,$build_cpu,;t t @@ -29781,6 +30315,13 @@ s,@target_cpu@,$target_cpu,;t t s,@target_vendor@,$target_vendor,;t t s,@target_os@,$target_os,;t t s,@FGREP@,$FGREP,;t t +s,@cf_TEMP_gnat@,$cf_TEMP_gnat,;t t +s,@M4_exists@,$M4_exists,;t t +s,@cf_ada_make@,$cf_ada_make,;t t +s,@cf_ada_config@,$cf_ada_config,;t t +s,@cf_ada_config_Ada@,$cf_ada_config_Ada,;t t +s,@cf_ada_config_C@,$cf_ada_config_C,;t t +s,@cf_cv_path_gnatgcc@,$cf_cv_path_gnatgcc,;t t s,@CC@,$CC,;t t s,@CFLAGS@,$CFLAGS,;t t s,@LDFLAGS@,$LDFLAGS,;t t @@ -29798,6 +30339,8 @@ s,@AWK@,$AWK,;t t s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t s,@INSTALL_DATA@,$INSTALL_DATA,;t t +s,@GLOB_FULLPATH_POSIX@,$GLOB_FULLPATH_POSIX,;t t +s,@GLOB_FULLPATH_OTHER@,$GLOB_FULLPATH_OTHER,;t t s,@LINT@,$LINT,;t t s,@LINT_OPTS@,$LINT_OPTS,;t t s,@LINT_LIBS@,$LINT_LIBS,;t t @@ -29826,6 +30369,7 @@ s,@NM@,$NM,;t t s,@ac_ct_NM@,$ac_ct_NM,;t t s,@ARFLAGS@,$ARFLAGS,;t t s,@DESTDIR@,$DESTDIR,;t t +s,@MERGE_PREFIX@,$MERGE_PREFIX,;t t s,@BUILD_CC@,$BUILD_CC,;t t s,@BUILD_CPP@,$BUILD_CPP,;t t s,@BUILD_CFLAGS@,$BUILD_CFLAGS,;t t @@ -29878,6 +30422,7 @@ s,@EXPORT_SYMS@,$EXPORT_SYMS,;t t s,@RESULTING_SYMS@,$RESULTING_SYMS,;t t s,@VERSIONED_SYMS@,$VERSIONED_SYMS,;t t s,@WILDCARD_SYMS@,$WILDCARD_SYMS,;t t +s,@REQUIRE_PKG@,$REQUIRE_PKG,;t t s,@cf_ldd_prog@,$cf_ldd_prog,;t t s,@EXTRA_PKG_LDFLAGS@,$EXTRA_PKG_LDFLAGS,;t t s,@EXTRA_SUFFIX@,$EXTRA_SUFFIX,;t t @@ -29914,10 +30459,17 @@ s,@RGB_PATH@,$RGB_PATH,;t t s,@no_x11_rgb@,$no_x11_rgb,;t t s,@NCURSES_BOOL@,$NCURSES_BOOL,;t t s,@TERMINFO_CAPS@,$TERMINFO_CAPS,;t t +s,@NCURSES_CHTYPE@,$NCURSES_CHTYPE,;t t s,@NCURSES_OSPEED@,$NCURSES_OSPEED,;t t +s,@NCURSES_MMASK_T@,$NCURSES_MMASK_T,;t t s,@NCURSES_CCHARW_MAX@,$NCURSES_CCHARW_MAX,;t t s,@NCURSES_SBOOL@,$NCURSES_SBOOL,;t t s,@NCURSES_TPARM_ARG@,$NCURSES_TPARM_ARG,;t t +s,@cf_manpage_format@,$cf_manpage_format,;t t +s,@cf_manpage_inboth@,$cf_manpage_inboth,;t t +s,@cf_manpage_so_strip@,$cf_manpage_so_strip,;t t +s,@cf_manpage_compress@,$cf_manpage_compress,;t t +s,@cf_manpage_coptions@,$cf_manpage_coptions,;t t s,@MANPAGE_RENAMES@,$MANPAGE_RENAMES,;t t s,@NCURSES_EXT_FUNCS@,$NCURSES_EXT_FUNCS,;t t s,@GENERATED_EXT_FUNCS@,$GENERATED_EXT_FUNCS,;t t @@ -29926,6 +30478,7 @@ s,@GENERATED_SP_FUNCS@,$GENERATED_SP_FUNCS,;t t s,@NCURSES_CONST@,$NCURSES_CONST,;t t s,@NCURSES_EXT_COLORS@,$NCURSES_EXT_COLORS,;t t s,@NCURSES_MOUSE_VERSION@,$NCURSES_MOUSE_VERSION,;t t +s,@cf_cv_enable_sigwinch@,$cf_cv_enable_sigwinch,;t t s,@NCURSES_XNAMES@,$NCURSES_XNAMES,;t t s,@PTHREAD@,$PTHREAD,;t t s,@cf_cv_enable_reentrant@,$cf_cv_enable_reentrant,;t t @@ -29965,18 +30518,14 @@ s,@cf_cv_typeof_mmask_t@,$cf_cv_typeof_mmask_t,;t t s,@HAVE_VSSCANF@,$HAVE_VSSCANF,;t t s,@TEST_LIBS@,$TEST_LIBS,;t t s,@TEST_LIBS2@,$TEST_LIBS2,;t t +s,@USE_STDBOOL_H@,$USE_STDBOOL_H,;t t +s,@USE_BUILTIN_BOOL@,$USE_BUILTIN_BOOL,;t t s,@CXXCPP@,$CXXCPP,;t t s,@CXXLDFLAGS@,$CXXLDFLAGS,;t t s,@CXX_AR@,$CXX_AR,;t t s,@CXX_ARFLAGS@,$CXX_ARFLAGS,;t t s,@CXXLIBS@,$CXXLIBS,;t t s,@USE_CXX_BOOL@,$USE_CXX_BOOL,;t t -s,@cf_TEMP_gnat@,$cf_TEMP_gnat,;t t -s,@M4_exists@,$M4_exists,;t t -s,@cf_ada_make@,$cf_ada_make,;t t -s,@cf_ada_config@,$cf_ada_config,;t t -s,@cf_ada_config_Ada@,$cf_ada_config_Ada,;t t -s,@cf_ada_config_C@,$cf_ada_config_C,;t t s,@GNATPREP_OPTS@,$GNATPREP_OPTS,;t t s,@cf_compile_generics@,$cf_compile_generics,;t t s,@cf_generic_objects@,$cf_generic_objects,;t t @@ -30019,7 +30568,6 @@ s,@WITH_OVERWRITE@,$WITH_OVERWRITE,;t t s,@TICS_LIST@,$TICS_LIST,;t t s,@TINFO_LIST@,$TINFO_LIST,;t t s,@SHLIB_LIST@,$SHLIB_LIST,;t t -s,@NCURSES_TREE@,$NCURSES_TREE,;t t s,@FORM_NAME@,$FORM_NAME,;t t s,@MENU_NAME@,$MENU_NAME,;t t s,@PANEL_NAME@,$PANEL_NAME,;t t @@ -30076,14 +30624,14 @@ EOF # is no need to browse any of the substitutions). # These are the two extra sed commands mentioned above. (echo ':t - /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat "$tmp"/subs.frag) >"$tmp"/subs-$ac_sed_frag.sed + /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && sed -e 's/\\\\*$//g' -e 's/$/\\/' -e 's/;t t\\/;t t/' -e 't' -e '3,'$ac_max_sed_lines's/$/\\/' "$tmp"/subs.frag) >"$tmp"/subs-$ac_sed_frag.sed # It is possible to make a multiline substitution using escaped newlines. # Ensure that we do not split the substitution between script fragments. ac_BEG=$ac_end ac_END=`expr "$ac_end" + "$ac_max_sed_lines"` sed "1,${ac_BEG}d; ${ac_END}p; q" "$tmp"/subs.sed >"$tmp"/subs.next if test -s "$tmp"/subs.next; then - grep '^s,@[^@,][^@,]*@,.*\\$' "$tmp"/subs.next >"$tmp"/subs.edit + grep '^s,@[^@,][^@,]*@,.*$' "$tmp"/subs.next | grep -v '^s,@.*;t t$' >"$tmp"/subs.edit if test ! -s "$tmp"/subs.edit; then grep "^s,@[^@,][^@,]*@,.*,;t t$" "$tmp"/subs.next >"$tmp"/subs.edit if test ! -s "$tmp"/subs.edit; then @@ -30181,7 +30729,7 @@ done; } esac if test x"$ac_file" != x-; then - { echo "$as_me:30184: creating $ac_file" >&5 + { echo "$as_me:30732: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} rm -f "$ac_file" fi @@ -30199,7 +30747,7 @@ echo "$as_me: creating $ac_file" >&6;} -) echo "$tmp"/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:30202: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:30750: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo "$f";; @@ -30212,7 +30760,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo "$srcdir/$f" else # /dev/null tree - { { echo "$as_me:30215: error: cannot find input file: $f" >&5 + { { echo "$as_me:30763: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -30228,7 +30776,7 @@ cat >>"$CONFIG_STATUS" <<\EOF if test -n "$ac_seen"; then ac_used=`grep '@datarootdir@' "$ac_item"` if test -z "$ac_used"; then - { echo "$as_me:30231: WARNING: datarootdir was used implicitly but not set: + { echo "$as_me:30779: WARNING: datarootdir was used implicitly but not set: $ac_seen" >&5 echo "$as_me: WARNING: datarootdir was used implicitly but not set: $ac_seen" >&2;} @@ -30237,7 +30785,7 @@ $ac_seen" >&2;} fi ac_seen=`grep '${datarootdir}' "$ac_item"` if test -n "$ac_seen"; then - { echo "$as_me:30240: WARNING: datarootdir was used explicitly but not set: + { echo "$as_me:30788: WARNING: datarootdir was used explicitly but not set: $ac_seen" >&5 echo "$as_me: WARNING: datarootdir was used explicitly but not set: $ac_seen" >&2;} @@ -30265,11 +30813,11 @@ s,@INSTALL@,$ac_INSTALL,;t t " $ac_file_inputs | (eval "$ac_sed_cmds") >"$tmp"/out rm -f "$tmp"/stdin EOF -: "${FGREP:=grep -F}" -: "${EGREP:=grep -E}" +test -n "${FGREP}" || FGREP="grep -F" +test -n "${EGREP}" || EGREP="grep -E" cat >>"$CONFIG_STATUS" <>"$CONFIG_STATUS" <<\EOF if test x"$ac_file" != x-; then @@ -30282,7 +30830,7 @@ cat >>"$CONFIG_STATUS" <<\EOF ac_init=`$EGREP '[ ]*'$ac_name'[ ]*=' "$ac_file"` if test -z "$ac_init"; then ac_seen=`echo "$ac_seen" |sed -e 's,^,'"$ac_file"':,'` - { echo "$as_me:30285: WARNING: Variable $ac_name is used but was not set: + { echo "$as_me:30833: WARNING: Variable $ac_name is used but was not set: $ac_seen" >&5 echo "$as_me: WARNING: Variable $ac_name is used but was not set: $ac_seen" >&2;} @@ -30293,7 +30841,7 @@ $ac_seen" >&2;} $EGREP -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>"$tmp"/out if test -s "$tmp"/out; then ac_seen=`sed -e 's,^,'"$ac_file"':,' < "$tmp"/out` - { echo "$as_me:30296: WARNING: Some variables may not be substituted: + { echo "$as_me:30844: WARNING: Some variables may not be substituted: $ac_seen" >&5 echo "$as_me: WARNING: Some variables may not be substituted: $ac_seen" >&2;} @@ -30342,7 +30890,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue * ) ac_file_in=$ac_file.in ;; esac - test x"$ac_file" != x- && { echo "$as_me:30345: creating $ac_file" >&5 + test x"$ac_file" != x- && { echo "$as_me:30893: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} # First look for the input files in the build tree, otherwise in the @@ -30353,7 +30901,7 @@ echo "$as_me: creating $ac_file" >&6;} -) echo "$tmp"/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:30356: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:30904: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -30366,7 +30914,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo "$srcdir/$f" else # /dev/null tree - { { echo "$as_me:30369: error: cannot find input file: $f" >&5 + { { echo "$as_me:30917: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -30424,7 +30972,7 @@ cat >>"$CONFIG_STATUS" <<\EOF rm -f "$tmp"/in if test x"$ac_file" != x-; then if cmp -s "$ac_file" "$tmp/config.h" 2>/dev/null; then - { echo "$as_me:30427: $ac_file is unchanged" >&5 + { echo "$as_me:30975: $ac_file is unchanged" >&5 echo "$as_me: $ac_file is unchanged" >&6;} else ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ @@ -30811,7 +31359,7 @@ cf_ITEM=`echo "$cf_item" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQ (cygdll|msysdll|mingw|msvcdll) test "x$with_shared_cxx" = xno && test -n "$verbose" && echo " overriding CXX_MODEL to SHARED" 1>&6 -echo "${as_me:-configure}:30814: testing overriding CXX_MODEL to SHARED ..." 1>&5 +echo "${as_me:-configure}:31362: testing overriding CXX_MODEL to SHARED ..." 1>&5 with_shared_cxx=yes ;; @@ -31168,22 +31716,10 @@ cat >> Makefile <> Makefile <>headers.sh <>headers.sh < #include -int main() { +int main(void) { unsigned long n = 6000000L; char *s = malloc(n); if (s != 0) @@ -872,16 +833,24 @@ AC_ARG_ENABLE(root-environ, [with_root_environ=$enableval], [with_root_environ=yes]) AC_MSG_RESULT($with_root_environ) -test "x$with_root_environ" = xyes && AC_DEFINE(USE_ROOT_ENVIRON,1,[Define to 1 if root is allowed to use ncurses environment]) +test "x$with_root_environ" = xyes && AC_DEFINE(USE_ROOT_ENVIRON,1,[Define to 1 if root/setuid application is allowed to use ncurses environment]) AC_MSG_CHECKING(if you want to permit setuid programs to access all files) -AC_ARG_ENABLE(root-environ, +AC_ARG_ENABLE(root-access, [ --disable-root-access restrict file-access when running setuid], [with_root_access=$enableval], [with_root_access=yes]) AC_MSG_RESULT($with_root_access) test "x$with_root_access" = xyes && AC_DEFINE(USE_ROOT_ACCESS,1,[Define to 1 if setuid is allowed all file-access]) +AC_MSG_CHECKING(if you want to permit setuid use of ncurses environment variables) +AC_ARG_ENABLE(setuid-environ, + [ --disable-setuid-environ restrict setuid use of ncurses environment variables], + [with_setuid_environ=$enableval], + [with_setuid_environ=$with_root_environ]) +AC_MSG_RESULT($with_setuid_environ) +test "x$with_setuid_environ" = xyes && AC_DEFINE(USE_SETUID_ENVIRON,1,[Define to 1 if setuid/setgid application is allowed to use ncurses environment]) + ### Use option --enable-symlinks to make tic use symlinks, not hard links ### to reduce storage requirements for the terminfo database. CF_LINK_FUNCS @@ -953,9 +922,9 @@ NCURSES_OK_WINT_T= AC_MSG_CHECKING(if you want wide-character code) AC_ARG_ENABLE(widec, - [ --enable-widec compile with wide-char/UTF-8 code], + [ --disable-widec compile without wide character and UTF-8 support], [with_widec=$enableval], - [with_widec=no]) + [with_widec=$cf_dft_widec]) AC_MSG_RESULT($with_widec) NCURSES_WCWIDTH_GRAPHICS=1 @@ -965,8 +934,8 @@ if test "x$with_widec" = xyes ; then if test "x$disable_lib_suffixes" = xno ; then LIB_SUFFIX="w${LIB_SUFFIX}" fi - AC_DEFINE(USE_WIDEC_SUPPORT,1,[Define to 1 to compile with wide-char/UTF-8 code]) - AC_DEFINE(NCURSES_WIDECHAR,1,[Define to 1 to compile with wide-char/UTF-8 code]) + AC_DEFINE(USE_WIDEC_SUPPORT,1,[Define to 1 to compile with wide character and UTF-8 support]) + AC_DEFINE(NCURSES_WIDECHAR,1,[Define to 1 to compile with wide character and UTF-8 support]) case "$CPPFLAGS" in (*_XOPEN_SOURCE=*) ;; @@ -1067,13 +1036,10 @@ AC_SUBST(NCURSES_WATTR_MACROS) CF_WITH_X11_RGB ### use option --with-bool to override bool's type -AC_MSG_CHECKING(for type of bool) -AC_ARG_WITH(bool, - [ --with-bool=TYPE override fallback type of bool variable], - [NCURSES_BOOL="$withval"], - [NCURSES_BOOL=auto]) -AC_MSG_RESULT($NCURSES_BOOL) -AC_SUBST(NCURSES_BOOL) +CF_WITH_TYPE(bool, + [ --with-bool=TYPE fall back to TYPE for curses 'bool' typedef], + NCURSES_BOOL, + auto) AC_MSG_CHECKING(for alternate terminal capabilities file) AC_ARG_WITH(caps, @@ -1089,29 +1055,22 @@ AC_MSG_RESULT($TERMINFO_CAPS) AC_SUBST(TERMINFO_CAPS) ### use option --with-chtype to override chtype's type -AC_MSG_CHECKING(for type of chtype) -AC_ARG_WITH(chtype, +CF_WITH_TYPE(chtype, [ --with-chtype=TYPE override type of chtype], - [NCURSES_CHTYPE="$withval"], - [NCURSES_CHTYPE=$cf_dft_chtype]) -AC_MSG_RESULT($NCURSES_CHTYPE) + NCURSES_CHTYPE, + $cf_dft_chtype) ### use option --with-ospeed to override ospeed's type -AC_MSG_CHECKING(for type of ospeed) -AC_ARG_WITH(ospeed, +CF_WITH_TYPE(ospeed, [ --with-ospeed=TYPE override type of ospeed variable], - [NCURSES_OSPEED="$withval"], - [NCURSES_OSPEED=short]) -AC_MSG_RESULT($NCURSES_OSPEED) -AC_SUBST(NCURSES_OSPEED) + NCURSES_OSPEED, + short) ### use option --with-mmask-t to override mmask_t's type -AC_MSG_CHECKING(for type of mmask_t) -AC_ARG_WITH(mmask-t, +CF_WITH_TYPE(mmask-t, [ --with-mmask-t=TYPE override type of mmask_t], - [NCURSES_MMASK_T="$withval"], - [NCURSES_MMASK_T=$cf_dft_mmask_t]) -AC_MSG_RESULT($NCURSES_MMASK_T) + NCURSES_MMASK_T, + $cf_dft_mmask_t) ### use option --with-ccharw-max to override CCHARW_MAX size AC_MSG_CHECKING(for size CCHARW_MAX) @@ -1128,9 +1087,9 @@ if test "$ac_cv_sizeof_signed_char" = 1 ; then else NCURSES_SBOOL="char" fi -AC_MSG_CHECKING(if you want to use signed Boolean array in term.h) +AC_MSG_CHECKING(whether to use signed chars for Boolean array in term.h) AC_ARG_ENABLE(signed-char, - [ --enable-signed-char compile using signed Boolean's in term.h], + [ --enable-signed-char use signed chars for Boolean array in term.h], [with_signed_char=$enableval], [with_signed_char=$cf_dft_signed_char]) AC_MSG_RESULT($with_signed_char) @@ -1138,13 +1097,10 @@ test "x$with_signed_char" != xyes && NCURSES_SBOOL="char" AC_SUBST(NCURSES_SBOOL) ### use option --with-tparm-arg to override tparm's argument type -AC_MSG_CHECKING(for type of tparm args) -AC_ARG_WITH(tparm-arg, +CF_WITH_TYPE(tparm-arg, [ --with-tparm-arg=TYPE override parameter type of tparm], - [NCURSES_TPARM_ARG="$withval"], - [NCURSES_TPARM_ARG=$cf_dft_tparm_arg]) -AC_MSG_RESULT($NCURSES_TPARM_ARG) -AC_SUBST(NCURSES_TPARM_ARG) + NCURSES_TPARM_ARG, + $cf_dft_tparm_arg) ### Enable compiling-in rcs id's AC_MSG_CHECKING(if RCS identifiers should be compiled-in) @@ -1178,13 +1134,13 @@ if test "x$with_ext_funcs" = xyes ; then AC_DEFINE(HAVE_RESIZE_TERM,1,[Define to 1 to enable resize_term() function in test-programs]) AC_DEFINE(HAVE_TERM_ENTRY_H,1,[Define to 1 to enable term_entry() function in test-programs]) AC_DEFINE(HAVE_USE_DEFAULT_COLORS,1,[Define to 1 to enable use_default_colors() function in test-programs]) - AC_DEFINE(HAVE_USE_EXTENDED_NAMES,1,[Define to 1 to enable use_extended_names() function in test-programs]) AC_DEFINE(HAVE_USE_SCREEN,1,[Define to 1 to enable use_screen() function in test-programs]) AC_DEFINE(HAVE_USE_WINDOW,1,[Define to 1 to enable use_window() function in test-programs]) AC_DEFINE(HAVE_WRESIZE,1,[Define to 1 to enable wresize() function in test-programs]) GENERATED_EXT_FUNCS=generated - test "x$with_ext_funcs" = xyes || cf_dft_ext_spfuncs=no else + cf_dft_ext_spfuncs=no + cf_dft_ext_colors=no NCURSES_EXT_FUNCS=0 GENERATED_EXT_FUNCS= fi @@ -1272,17 +1228,13 @@ if test "x$with_ext_mouse" = xyes ; then CF_NCURSES_ABI_6 fi -case $cf_cv_abi_default in -(5) +if test $cf_cv_abi_default -le 5 ; then NCURSES_MOUSE_VERSION=1 - ;; -(6) +elif test $cf_cv_abi_default -le 6 ; then NCURSES_MOUSE_VERSION=2 - ;; -([[789]]) +else NCURSES_MOUSE_VERSION=3 - ;; -esac +fi AC_SUBST(NCURSES_MOUSE_VERSION) @@ -1312,7 +1264,14 @@ AC_ARG_ENABLE(sigwinch, [with_sigwinch=$enableval], [with_sigwinch=$with_ext_funcs]) AC_MSG_RESULT($with_sigwinch) -test "x$with_sigwinch" = xyes && AC_DEFINE(USE_SIGWINCH,1,[Define to 1 to compile with SIGWINCH handler]) +if test "x$with_sigwinch" = xyes +then + AC_DEFINE(USE_SIGWINCH,1,[Define to 1 to compile with SIGWINCH handler]) + cf_cv_enable_sigwinch=1 +else + cf_cv_enable_sigwinch=0 +fi +AC_SUBST(cf_cv_enable_sigwinch) ### use option --enable-tcap-names to allow user to define new capabilities AC_MSG_CHECKING(if you want user-definable terminal capabilities like termcap) @@ -1322,7 +1281,10 @@ AC_ARG_ENABLE(tcap-names, [with_tcap_names=$with_ext_funcs]) AC_MSG_RESULT($with_tcap_names) NCURSES_XNAMES=0 -test "x$with_tcap_names" = xyes && NCURSES_XNAMES=1 +if test "x$with_tcap_names" = xyes; then + NCURSES_XNAMES=1 + AC_DEFINE(NCURSES_XNAMES,1,[Define to 1 to compile with user-definable terminal capabilities]) +fi AC_SUBST(NCURSES_XNAMES) ############################################################################## @@ -1419,10 +1381,10 @@ AC_SUBST(cf_cv_enable_opaque) AC_SUBST(NCURSES_SIZE_T) -AC_MSG_CHECKING(if you want opaque curses-library structures) -CF_ARG_ENABLE(opaque-curses, - [ --enable-opaque-curses make curses WINDOW, etc., "opaque"], - [enable_opaque_curses=yes],[ +AC_MSG_CHECKING(whether curses library structures should be opaque) +CF_ARG_DISABLE(opaque-curses, + [ --disable-opaque-curses do not make WINDOW, etc., structures opaque], + [enable_opaque_curses=no],[ test "$cf_cv_enable_reentrant" = 1 && enable_opaque_curses=yes test "$cf_cv_enable_reentrant" = 1 || enable_opaque_curses=$cf_dft_opaque_curses ]) @@ -1432,22 +1394,22 @@ test "$cf_cv_enable_reentrant" = 1 && \ test "$enable_opaque_curses" = no && \ AC_MSG_ERROR(reentrant configuration requires opaque library) -AC_MSG_CHECKING(if you want opaque form-library structures) -AC_ARG_ENABLE(opaque-form, - [ --enable-opaque-form make form-library structures "opaque"], - [enable_opaque_form=yes],[enable_opaque_form=no]) +AC_MSG_CHECKING(whether form library structures should be opaque) +CF_ARG_DISABLE(opaque-form, + [ --disable-opaque-form do not make form library structures opaque], + [enable_opaque_form=no],[enable_opaque_form=$cf_dft_opaque_curses]) AC_MSG_RESULT($enable_opaque_form) -AC_MSG_CHECKING(if you want opaque menu-library structures) -AC_ARG_ENABLE(opaque-menu, - [ --enable-opaque-menu make menu-library structures "opaque"], - [enable_opaque_menu=yes],[enable_opaque_menu=no]) +AC_MSG_CHECKING(whether menu library structures should be opaque) +CF_ARG_DISABLE(opaque-menu, + [ --disable-opaque-menu do not make menu library structures opaque], + [enable_opaque_menu=no],[enable_opaque_menu=$cf_dft_opaque_curses]) AC_MSG_RESULT($enable_opaque_menu) -AC_MSG_CHECKING(if you want opaque panel-library structures) -AC_ARG_ENABLE(opaque-panel, - [ --enable-opaque-panel make panel-library structures "opaque"], - [enable_opaque_panel=yes],[enable_opaque_panel=no]) +AC_MSG_CHECKING(whether panel library structures should be opaque) +CF_ARG_DISABLE(opaque-panel, + [ --disable-opaque-panel do not make panel library structures opaque], + [enable_opaque_panel=no],[enable_opaque_panel=$cf_dft_opaque_curses]) AC_MSG_RESULT($enable_opaque_panel) NCURSES_OPAQUE=0; test "$enable_opaque_curses" = yes && NCURSES_OPAQUE=1 @@ -1484,6 +1446,14 @@ AC_ARG_WITH(develop, [with_develop=no]) AC_MSG_RESULT($with_develop) +### use option --enable-check-size to detect screensize with CPR +AC_MSG_CHECKING(if you want to check screensize of serial terminals) +AC_ARG_ENABLE(check-size, + [ --enable-check-size compile-in code to detect screensize of serial terminals],, + [enable_check_size=$with_develop]) +AC_MSG_RESULT($enable_check_size) +test "x$enable_check_size" = xyes && AC_DEFINE(USE_CHECK_SIZE,1,[Define to 1 to compile-in code to detect screensize]) + ### use option --enable-hard-tabs to turn on use of hard-tabs optimize AC_MSG_CHECKING(if you want hard-tabs code) AC_ARG_ENABLE(hard-tabs, @@ -1727,7 +1697,7 @@ AC_MSG_RESULT($cf_with_trace) if test "x$cf_with_trace" = xyes ; then LIB_TRACING=all ADA_TRACE=TRUE - CF_ADD_CFLAGS(-DTRACE) + AC_DEFINE(TRACE,1,[Define to 1 if we have support trace functions]) AC_DEFINE(HAVE__TRACEF,1,[Define to 1 if we have _tracef function]) else LIB_TRACING=DEBUG @@ -1762,12 +1732,15 @@ CF_REGEX dnl These are some other potentially nonportable headers. AC_CHECK_HEADERS( \ +alloca.h \ fcntl.h \ getopt.h \ limits.h \ locale.h \ +malloc.h \ math.h \ poll.h \ +sys/auxv.h \ sys/ioctl.h \ sys/param.h \ sys/poll.h \ @@ -1827,18 +1800,18 @@ CF_FUNC_GETTIME AC_CHECK_FUNCS( \ fpathconf \ getcwd \ +getauxval \ getegid \ geteuid \ getopt \ +getuid \ issetugid \ localeconv \ poll \ -putenv \ remove \ select \ setbuf \ setbuffer \ -setenv \ setfsuid \ setvbuf \ sigaction \ @@ -1896,9 +1869,14 @@ CF_TYPE_SIGACTION CF_SIZECHANGE CF_FUNC_MEMMOVE CF_FUNC_POLL +CF_MB_LEN_MAX CF_VA_COPY AC_FUNC_VFORK CF_FOPEN_BIN_R +CF_CHECK_TYPE2(cc_t,termios.h) +CF_CHECK_TYPE2(speed_t,termios.h) +CF_CHECK_TYPE2(tcflag_t,termios.h) +CF_CHECK_TYPE2(sigset_t,signal.h) # special check for test/ditto.c CF_FUNC_OPENPTY @@ -1925,6 +1903,14 @@ fi # Just in case, check if the C compiler has a bool type. CF_BOOL_DECL(cf_cv_cc_bool_type) +if test "$cf_cv_cc_bool_type" = yes; then + USE_BUILTIN_BOOL=1 +else + USE_BUILTIN_BOOL=0 +fi +AC_SUBST(USE_BUILTIN_BOOL) + +test "$cf_cv_header_stdbool_h" = yes && AC_DEFINE(USE_STDBOOL_H,1,[Define to 1 if we can include stdbool.h]) # Check for C++ compiler characteristics (and ensure that it's there!) if test -n "$CXX" ; then @@ -1944,7 +1930,7 @@ if test -n "$CXX" ; then ;; esac - AC_CHECK_HEADERS(typeinfo) + AC_CHECK_HEADERS(new exception typeinfo) CF_CXX_IOSTREAM_NAMESPACE CF_BOOL_DECL CF_BOOL_SIZE @@ -1955,7 +1941,7 @@ if test -n "$CXX" ; then CF_CXX_AR_FLAGS else cf_cxx_library=no - cf_cv_builtin_bool=1 + cf_cv_builtin_bool=yes # Just because we are not configuring against C++ right now does not # mean that a user will not want to use C++. Some distributors disable @@ -1968,18 +1954,9 @@ else if test "$NCURSES_BOOL" != auto ; then cf_cv_type_of_bool=$NCURSES_BOOL - cf_cv_header_stdbool_h=0 + USE_STDBOOL_H=0 else - if test "$cf_cv_header_stdbool_h" = 1 ; then - CF_BOOL_SIZE - else - AC_MSG_CHECKING(for fallback type of bool) - case "$host_cpu" in - (i?86) cf_cv_type_of_bool=char ;; - (*) cf_cv_type_of_bool=int ;; - esac - AC_MSG_RESULT($cf_cv_type_of_bool) - fi + CF_BOOL_SIZE fi fi AC_SUBST(CXXLIBS) @@ -1990,11 +1967,11 @@ AC_SUBST(CXXLIBS) # specify the type of bool in a configure-script option and postpone # integration with the C++ compiler provided that the types are compatible. USE_CXX_BOOL=1 -if test "$cf_cv_cc_bool_type" = 1 +if test "$USE_BUILTIN_BOOL" = 1 then # oops: C has a bool. Unlikely, but C++ could differ. USE_CXX_BOOL=0 -elif test "$cf_cv_builtin_bool" = 0 +elif test "$cf_cv_builtin_bool" = no then # C++ has no bool USE_CXX_BOOL=0 @@ -2023,7 +2000,6 @@ dnl libtool -TD 20070714 dnl Check for availability of GNU Ada Translator (GNAT). dnl At the moment we support no other Ada compiler. if test "$cf_with_ada" != "no" ; then - CF_PROG_GNAT if test "x$cf_cv_prog_gnat_correct" = xyes; then CF_ADD_ADAFLAGS(-gnatpn) CF_FIXUP_ADAFLAGS @@ -2104,7 +2080,7 @@ LIB_SUBSETS="${LIB_SUBSETS}base" if test "$with_term_driver" != no ; then LIB_SUBSETS="${LIB_SUBSETS}+port_drivers" case "$cf_cv_system_name" in - (*mingw32*|*mingw64*) + (*mingw32*|*mingw64*|*msys*|*cygwin*) if test "x$with_exp_win32" = xyes ; then LIB_SUBSETS="${LIB_SUBSETS}+port_tinfo+port_win32" else @@ -2344,14 +2320,11 @@ AC_SUBST(TICS_LIST) AC_SUBST(TINFO_LIST) AC_SUBST(SHLIB_LIST) -# used to separate tack out of the tree -NCURSES_TREE= -AC_SUBST(NCURSES_TREE) - ### predefined stuff for the test programs AC_DEFINE(HAVE_SLK_COLOR,1,[Define to 1 if we have slk_color for test-programs]) # pkgsrc uses these +CF_HELP_MESSAGE(Library basenames for pkgsrc:) CF_WITH_LIB_BASENAME(FORM_NAME,form) CF_WITH_LIB_BASENAME(MENU_NAME,menu) CF_WITH_LIB_BASENAME(PANEL_NAME,panel) @@ -2433,7 +2406,7 @@ esac # Help to automatically enable the extended curses features when using either # the *-config or the ".pc" files by adding defines. -AC_MSG_CHECKING(for defines to add to ncurses${USE_CFG_SUFFIX}-config script) +AC_MSG_CHECKING(for defines to add to ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script) PKG_CFLAGS= for cf_loop1 in $CPPFLAGS_after_XOPEN do @@ -2450,6 +2423,7 @@ do done AC_MSG_RESULT($PKG_CFLAGS) AC_SUBST(PKG_CFLAGS) +CF_GLOB_FULLPATH # AC_CHECK_SIZEOF demands a literal parameter, no variables. So we do this. case "x$NCURSES_OSPEED" in @@ -2539,8 +2513,6 @@ AC_SUBST(PRIVATE_LIBS) # This is used for the *-config script and *.pc data files. CF_LD_SEARCHPATH -AC_DEFINE(HAVE_CURSES_DATA_BOOLNAMES,1,[definition needed for in-tree build of tack]) - AC_OUTPUT( \ include/MKterm.h.awk \ include/curses.head:include/curses.h.in \ @@ -2573,6 +2545,8 @@ DFT_LWR_MODEL="$DFT_LWR_MODEL" ECHO_LD="$ECHO_LD" EXTRA_SUFFIX="$EXTRA_SUFFIX" FORM_NAME="$FORM_NAME" +GLOB_FULLPATH_OTHER="$GLOB_FULLPATH_OTHER" +GLOB_FULLPATH_POSIX="$GLOB_FULLPATH_POSIX" LDCONFIG="$LDCONFIG" LIBTOOL_VERSION="$LIBTOOL_VERSION" LIB_NAME="$LIB_NAME" diff --git a/dist.mk b/dist.mk index e8161fec..95a8358c 100644 --- a/dist.mk +++ b/dist.mk @@ -1,5 +1,5 @@ ############################################################################## -# Copyright 2018-2022,2023 Thomas E. Dickey # +# Copyright 2018-2024,2025 Thomas E. Dickey # # Copyright 1998-2017,2018 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # @@ -26,7 +26,7 @@ # use or other dealings in this Software without prior written # # authorization. # ############################################################################## -# $Id: dist.mk,v 1.1530 2023/03/11 12:02:16 tom Exp $ +# $Id: dist.mk,v 1.1658 2025/03/01 10:08:08 tom Exp $ # Makefile for creating ncurses distributions. # # This only needs to be used directly as a makefile by developers, but @@ -37,8 +37,8 @@ SHELL = /bin/sh # These define the major/minor/patch versions of ncurses. NCURSES_MAJOR = 6 -NCURSES_MINOR = 4 -NCURSES_PATCH = 20230311 +NCURSES_MINOR = 5 +NCURSES_PATCH = 20250301 # We don't append the patch to the version, since this only applies to releases VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) @@ -63,7 +63,7 @@ GNATHTML= gnathtml # would remove some text. The man program on Redhat 6.1 appears to work with # man2html if we set the top/bottom margins to 6 (the default is 7). Newer # versions of 'man' leave no margin (and make it harder to sync with pages). -MAN2HTML= man2html -botm=0 -topm=0 -cgiurl '$$title.$$section$$subsection.html' -index +MAN2HTML= man2html -botm=0 -topm=0 -cgiurl '$$title.$$section$$subsection.html' -index -mixsecs ALL = ANNOUNCE doc/html/announce.html doc/ncurses-intro.doc doc/hackguide.doc manhtml adahtml @@ -124,8 +124,9 @@ manhtml: @echo 's///g' >> subst.tmp @echo 's/<\/I>/<\/EM>/g' >> subst.tmp @misc/csort < subst.tmp | uniq > subst.sed - @echo '/<\/TITLE>/a\' >> subst.sed - @echo '\' >> subst.sed + @echo 's%[_-]*_-[_-]*%_%g' >> subst.sed + @echo '/<\/TITLE>/a\\' >> subst.sed + @echo '\\' >> subst.sed @rm -f subst.tmp @for f in man/*.[0-9]* ; do \ m=`basename $$f` ;\ @@ -134,8 +135,9 @@ manhtml: if [ -f doc/html/$$g ]; then chmod +w doc/html/$$g; fi;\ echo "Converting $$m to HTML" ;\ echo ' -ADACURSES 1 User Commands +adacurses6\-config 1 2023-10-07 ncurses 6.4 User commands -

        ADACURSES 1 User Commands

        +

        adacurses6\-config 1 2023-10-07 ncurses 6.4 User commands

        -ADACURSES(1)                     User Commands                    ADACURSES(1)
+adacurses6-config(1)             User commands            adacurses6-config(1)

        NAME

        -       adacurses6-config - helper script for AdaCurses libraries
+       adacurses6-config - configuration helper for AdaCurses libraries

        SYNOPSIS

        -       adacurses6-config [options]
+       adacurses6-config [--cflags] [--libs]
+
+       adacurses6-config --version
+
+       adacurses6-config --help

        DESCRIPTION

        -       This  is  a shell script which simplifies configuring an application to
-       use the AdaCurses library binding to ncurses.
+       This  program  development  aid  simplifies  the process of configuring
+       applications to use the AdaCurses library binding to ncurses.

        OPTIONS

        -       --cflags
-              echos the gnat (Ada  compiler)  flags  needed  to  compile  with
-              AdaCurses.
+       --cflags   reports the GNAT (Ada compiler) flags needed to compile with
+                  AdaCurses.
 
-       --libs echos the gnat libraries needed to link with AdaCurses.
+       --libs     reports the GNAT libraries needed to link with AdaCurses.
 
-       --version
-              echos  the  release+patchdate  version  of the ncurses libraries
-              used to configure and build AdaCurses.
+       --version  reports  the  release  and  patch  date  information  of the
+                  ncurses libraries used to configure and build AdaCurses  and
+                  exits successfully.
 
-       --help prints a list of the adacurses6-config script's options.
+       --help     issues a usage message and exits successfully.
 
-       If no options are given, adacurses6-config prints  the  combination  of
-       --cflags and --libs that gnatmake expects (see example).
+       Omitting options implies "--cflags --libs".

        EXAMPLE

        -       For  example,  supposing  that  you  want to compile the "Hello World!"
-       program for AdaCurses.  Make a file named "hello.adb":
-              with Terminal_Interface.Curses; use Terminal_Interface.Curses;
-
-              procedure Hello is
-
-                 Visibility : Cursor_Visibility := Invisible;
-                 done : Boolean := False;
-                 c : Key_Code;
+       Consider a program using AdaCurses to write the message "Hello, world!"
+       in the center of the screen and wait for the user to press the "q"  key
+       before exiting.  Populate a file hello.adb with the following.
 
-              begin
+           with Terminal_Interface.Curses; use Terminal_Interface.Curses;
 
-                 Init_Screen;
-                 Set_Echo_Mode (False);
+           procedure Hello is
+              Visibility : Cursor_Visibility := Invisible;
+              Message : constant String := "Hello, World!";
+              done : Boolean := False;
+              c : Key_Code;
+           begin
+              Init_Screen;
+              Set_Echo_Mode (False);
+              Set_Cursor_Visibility (Visibility);
+              Set_Timeout_Mode (Standard_Window, Non_Blocking, 0);
 
-                 Set_Cursor_Visibility (Visibility);
-                 Set_Timeout_Mode (Standard_Window, Non_Blocking, 0);
+              Move_Cursor (Line => Lines / 2,
+                           Column => (Columns - Message'Length) / 2);
+              Add (Str => Message);
 
-                 Move_Cursor (Line => Lines / 2, Column => (Columns - 12) / 2);
-                 Add (Str => "Hello World!");
+              while not done loop
+                 c := Get_Keystroke (Standard_Window);
 
-                 while not done loop
+                 case c is
+                     when Character'Pos ('q') => done := True;
+                     when others => null;
+                 end case;
 
-                    c := Get_Keystroke (Standard_Window);
-                    case c is
-                    when Character'Pos ('q') => done := True;
-                    when others => null;
-                    end case;
+                 Nap_Milli_Seconds (50);
+              end loop;
 
-                    Nap_Milli_Seconds (50);
-                 end loop;
+              End_Windows;
 
-                 End_Windows;
-
-              end Hello;
+           end Hello;
 
        Then, using
-              gnatmake `adacurses-config --cflags`  hello  -largs  `adacurses-
-              config --libs`
-
-       or (simpler):
-              gnatmake hello `adacurses-config`
-
-       you will compile and link the program.
+           gnatmake `adacurses6-config --cflags` hello \
+               -largs `adacurses6-config --libs`
+       or, more simply,
+           gnatmake hello `adacurses6-config`
+       you can compile and link the program.

        SEE ALSO

                curses(3x)
 
-       This describes ncurses version 6.4 (patch 20230311).
-
 
 
-                                                                  ADACURSES(1)
+ncurses 6.4                       2023-10-07              adacurses6-config(1)
          diff --git a/doc/html/man/adacursesw6-config.1.html b/doc/html/man/adacursesw6-config.1.html new file mode 100644 index 00000000..3ded34ae --- /dev/null +++ b/doc/html/man/adacursesw6-config.1.html @@ -0,0 +1,144 @@ + + + + + + +adacursesw6\-config 1 2024-04-20 ncurses 6.5 User commands + + + + +

          adacursesw6\-config 1 2024-04-20 ncurses 6.5 User commands

          +
          +adacursesw6-config(1)            User commands           adacursesw6-config(1)
+
+
+
+
+

          NAME

          +       adacursesw6-config - configuration helper for AdaCurses libraries
+
+
+

          SYNOPSIS

          +       adacursesw6-config [--cflags] [--libs]
+
+       adacursesw6-config --version
+
+       adacursesw6-config --help
+
+
+

          DESCRIPTION

          +       This  program  development  aid  simplifies  the process of configuring
+       applications to use the AdaCurses library binding to ncurses.
+
+
+

          OPTIONS

          +       --cflags   reports the GNAT (Ada compiler) flags needed to compile with
+                  AdaCurses.
+
+       --libs     reports the GNAT libraries needed to link with AdaCurses.
+
+       --version  reports  the  release  and  patch  date  information  of the
+                  ncurses libraries used to configure and build AdaCurses  and
+                  exits successfully.
+
+       --help     issues a usage message and exits successfully.
+
+       Omitting options implies "--cflags --libs".
+
+
+

          EXAMPLES

          +       Consider a program using AdaCurses to write the message "Hello, world!"
+       in the center of the screen and wait for the user to press the "q"  key
+       before exiting.  Populate a file hello.adb with the following.
+
+           with Terminal_Interface.Curses; use Terminal_Interface.Curses;
+
+           procedure Hello is
+              Visibility : Cursor_Visibility := Invisible;
+              Message : constant String := "Hello, World!";
+              done : Boolean := False;
+              c : Key_Code;
+           begin
+              Init_Screen;
+              Set_Echo_Mode (False);
+              Set_Cursor_Visibility (Visibility);
+              Set_Timeout_Mode (Standard_Window, Non_Blocking, 0);
+
+              Move_Cursor (Line => Lines / 2,
+                           Column => (Columns - Message'Length) / 2);
+              Add (Str => Message);
+
+              while not done loop
+                 c := Get_Keystroke (Standard_Window);
+
+                 case c is
+                     when Character'Pos ('q') => done := True;
+                     when others => null;
+                 end case;
+
+                 Nap_Milli_Seconds (50);
+              end loop;
+
+              End_Windows;
+
+           end Hello;
+
+       Then, using
+           gnatmake `adacursesw6-config --cflags` hello \
+               -largs `adacursesw6-config --libs`
+       or, more simply,
+           gnatmake hello `adacursesw6-config`
+       you can compile and link the program.
+
+
+

          SEE ALSO

          +       curses(3x)
+
+
+
+ncurses 6.5                       2024-04-20             adacursesw6-config(1)
+
          +
          + +
          + + diff --git a/doc/html/man/captoinfo.1m.html b/doc/html/man/captoinfo.1m.html index d7c30af4..b1ebedcf 100644 --- a/doc/html/man/captoinfo.1m.html +++ b/doc/html/man/captoinfo.1m.html @@ -1,7 +1,7 @@ -captoinfo 1m +captoinfo 1m 2025-01-18 ncurses 6.5 User commands -

          captoinfo 1m

          +

          captoinfo 1m 2025-01-18 ncurses 6.5 User commands

          -captoinfo(1m)                                                    captoinfo(1m)
+captoinfo(1m)                    User commands                   captoinfo(1m)
 
 
 
@@ -52,175 +52,162 @@ 
          captoinfo 1m

          SYNOPSIS

          -       captoinfo [-vn width]  [-V] [-1] [-w width] file ...
+       captoinfo [tic-option] [file ...]
 
+       captoinfo -V
 
-

          DESCRIPTION

          -       captoinfo  looks in each given text file for termcap descriptions.  For
-       each one found,  an  equivalent  terminfo  description  is  written  to
-       standard  output.   Termcap  tc capabilities are translated directly to
-       terminfo use capabilities.
-
-       If no file is given, then the environment variable TERMCAP is used  for
-       the  filename  or entry.  If TERMCAP is a full pathname to a file, only
-       the terminal whose name is specified in the environment  variable  TERM
-       is  extracted  from  that file.  If the environment variable TERMCAP is
-       not set, then the file /usr/share/terminfo is read.
-
-       -v   print out tracing information on standard  error  as  the  program
-            runs.
-
-       -V   print  out the version of the program in use on standard error and
-            exit.
 
-       -1   cause the fields to print out  one  to  a  line.   Otherwise,  the
-            fields  will be printed several to a line to a maximum width of 60
-            characters.
-
-       -w   change the output to width characters.
+

          DESCRIPTION

          +       captoinfo  translates  terminal  descriptions.   It looks in each given
+       text file for termcap entries  and,  for  each  one  found,  writes  an
+       equivalent terminfo description to the standard output stream.  termcap
+       tc capabilities translate to terminfo "use" capabilities.
+
+       If no files are specified, captoinfo  interprets  the  content  of  the
+       environment  variable  TERMCAP  as  a  file name, and extracts only the
+       entry for the terminal named in the environment variable TERM from  it.
+       If  the  environment  variable  TERMCAP  is  not  set,  captoinfo reads
+       /etc/termcap.
+
+       This utility is implemented as a link to tic(1m), with the latter's  -I
+       option  implied.  You can use other tic options such as -1, -f, -v, -w,
+       and -x.  The -V option reports the version of ncurses  associated  with
+       this program and exits with a successful status.
+
+
+

          Translations from Nonstandard Capabilities

          +       captoinfo  translates  some  obsolete,  nonstandard  capabilities  into
+       standard terminfo capabilities.  It issues a diagnostic to the standard
+       error  stream  for  each,  inviting  the  user to check that it has not
+       mistakenly translated an unknown or mistyped capability name.
+
+                 termcap Code
+              Obsolete   Standard    Origin      terminfo capability
+              ---------------------------------------------------------
+                 BO         mr        AT&T      enter_reverse_mode
+                 CI         vi        AT&T      cursor_invisible
+                 CV         ve        AT&T      cursor_normal
+                 DS         mh        AT&T      enter_dim_mode
+                 EE         me        AT&T      exit_attribute_mode
+                 FE         LF        AT&T      label_on
+                 FL         LO        AT&T      label_off
+                 XS         mk        AT&T      enter_secure_mode
+                 EN         @7        XENIX     key_end
+                 GE         ae        XENIX     exit_alt_charset_mode
+                 GS         as        XENIX     enter_alt_charset_mode
+                 HM         kh        XENIX     key_home
+                 LD         kL        XENIX     key_dl
+                 PD         kN        XENIX     key_npage
+                 PN         po        XENIX     prtr_off
+                 PS         pf        XENIX     prtr_on
+                 PU         kP        XENIX     key_ppage
+                 RT         @8        XENIX     kent
+                 UP         ku        XENIX     kcuu1
+                 KA         k;      Tektronix   key_f10
+                 KB         F1      Tektronix   key_f11
+                 KC         F2      Tektronix   key_f12
+                 KD         F3      Tektronix   key_f13
+                 KE         F4      Tektronix   key_f14
+                 KF         F5      Tektronix   key_f15
+                 BC         Sb      Tektronix   set_background
+                 FC         Sf      Tektronix   set_foreground
+
+                 HS         mh        IRIX      enter_dim_mode
+
+       XENIX termcap had a set of extension capabilities, corresponding to box
+       drawing characters of CCSID ("code page") 437, as follows.
+
+                      termcap Code            Graphic
+                      -----------------------------------------
+                           G2        upper left corner
+                           G3        lower left corner
+                           G1        upper right corner
+                           G4        lower right corner
+                           GR        tee pointing right
+                           GL        tee pointing left
+                           GU        tee pointing up
+                           GD        tee pointing down
+                           GH        horizontal line
+                           GV        vertical line
+                           GC        intersection
+                           G6        double upper left corner
+                           G7        double lower left corner
+                           G5        double upper right corner
+                           G8        double lower right corner
+                           Gr        double tee pointing right
+                           Gr        double tee pointing left
+                           Gu        double tee pointing up
+                           Gd        double tee pointing down
+                           Gh        double horizontal line
+                           Gv        double vertical line
+                           Gc        double intersection
+                           GG        ACS magic cookie count
+
+       captoinfo  composes  single-line  capabilities into an acsc string, and
+       discards GG and double-line capabilities with a warning diagnostic.
+
+       IBM's AIX has a terminfo facility descended  from  SVr1  terminfo,  but
+       which  is  incompatible with the SVr4 format.  captoinfo translates the
+       following AIX extensions.
+
+                                    IBM    X/Open
+                                   ---------------
+                                   ksel    kslt
+                                   kbtab   kcbt
+                                   font0   s0ds
+                                   font1   s1ds
+                                   font2   s2ds
+                                   font3   s3ds
+
+       Additionally, this program translates the AIX  box1  capability  to  an
+       acsc string.
+
+       The   HP-UX   terminfo   library   supports  two  nonstandard  terminfo
+       capabilities, meml (memory lock) and memu (memory  unlock).   captoinfo
+       discards these with a warning message.

          FILES

          -       /usr/share/terminfo Compiled terminal description database.
-
-
-

          TRANSLATIONS FROM NONSTANDARD CAPABILITIES

          -       Some obsolete nonstandard capabilities will automatically be translated
-       into  standard  (SVr4/XSI  Curses)  terminfo capabilities by captoinfo.
-       Whenever one of these automatic translations is done, the program  will
-       issue an notification to stderr, inviting the user to check that it has
-       not mistakenly translated a completely unknown  and  random  capability
-       and/or syntax error.
-
-       Nonstd   Std    From           Terminfo
-        name    name                 capability
-       -----------------------------------------------
-       BO       mr     AT&T    enter_reverse_mode
-       CI       vi     AT&T    cursor_invisible
-       CV       ve     AT&T    cursor_normal
-       DS       mh     AT&T    enter_dim_mode
-       EE       me     AT&T    exit_attribute_mode
-       FE       LF     AT&T    label_on
-       FL       LO     AT&T    label_off
-       XS       mk     AT&T    enter_secure_mode
-       EN       @7     XENIX   key_end
-       GE       ae     XENIX   exit_alt_charset_mode
-       GS       as     XENIX   enter_alt_charset_mode
-       HM       kh     XENIX   key_home
-       LD       kL     XENIX   key_dl
-       PD       kN     XENIX   key_npage
-       PN       po     XENIX   prtr_off
-       PS       pf     XENIX   prtr_on
-       PU       kP     XENIX   key_ppage
-
-       RT       @8     XENIX   kent
-       UP       ku     XENIX   kcuu1
-       KA       k;     Tek     key_f10
-       KB       F1     Tek     key_f11
-       KC       F2     Tek     key_f12
-       KD       F3     Tek     key_f13
-       KE       F4     Tek     key_f14
-       KF       F5     Tek     key_f15
-       BC       Sb     Tek     set_background
-       FC       Sf     Tek     set_foreground
-       HS       mh     Iris    enter_dim_mode
-
-       XENIX  termcap  also  used  to have a set of extension capabilities for
-       forms drawing, designed to take  advantage  of  the  IBM  PC  high-half
-       graphics.  They were as follows:
-
-       Cap          Graphic
-       -----------------------------
-       G2    upper left
-       G3    lower left
-       G1    upper right
-       G4    lower right
-       GR    pointing right
-       GL    pointing left
-       GU    pointing up
-       GD    pointing down
-       GH    horizontal line
-       GV    vertical line
-       GC    intersection
-       G6    upper left
-       G7    lower left
-       G5    upper right
-       G8    lower right
-       Gr    tee pointing right
-       Gr    tee pointing left
-       Gu    tee pointing up
-       Gd    tee pointing down
-       Gh    horizontal line
-       Gv    vertical line
-       Gc    intersection
-       GG    acs magic cookie count
-
-       If   the   single-line  capabilities  occur  in  an  entry,  they  will
-       automatically  be  composed  into  an  acsc  string.   The  double-line
-       capabilities and GG are discarded with a warning message.
-
-       IBM's  AIX  has  a  terminfo  facility descended from SVr1 terminfo but
-       incompatible with the SVr4 format.  The following  AIX  extensions  are
-       automatically translated:
-
-        IBM    XSI
-       -------------
-       ksel    kslt
-       kbtab   kcbt
-       font0   s0ds
-       font1   s1ds
-       font2   s2ds
-       font3   s3ds
-
-       Additionally,  the AIX box1 capability will be automatically translated
-       to an acsc string.
-
-       Hewlett-Packard's terminfo library supports  two  nonstandard  terminfo
-       capabilities  meml  (memory lock) and memu (memory unlock).  These will
-       be discarded with a warning message.
-
-
-

          NOTES

          -       This utility is actually a link to tic(1m), running in  -I  mode.   You
-       can use other tic options such as -f and  -x.
-
-       The  verbose option is not identical to SVr4's.  Under SVr4, instead of
-       following the -v with a trace level n, you repeat it n times.
+       /etc/termcap
+              default termcap terminal capability database

          PORTABILITY

          -       X/Open Curses, Issue 7 (2009) describes tic  briefly,  but  omits  this
-       program.  SVr4 systems provide captoinfo as a separate application from
-       tic.
-
-       NetBSD does not provide this application.
+       X/Open  Curses  Issue 7  (2009)  describes  tic briefly, but omits this
+       program.
 
+       SVr4 systems provide captoinfo as a separate application from tic.  Its
+       -v  option  does not accept a trace level argument n; repeat -v n times
+       instead.
 
-

          SEE ALSO

          -       infocmp(1m), curses(3x), terminfo(5)
-
-       This describes ncurses version 6.4 (patch 20230311).
+       NetBSD does not provide this application.
 
 
-

          AUTHOR

          +

          AUTHORS

                  Eric S. Raymond <esr@snark.thyrsus.com> and
        Thomas E. Dickey <dickey@invisible-island.net>
 
 
+

          SEE ALSO

          +       infocmp(1m), tic(1m), curses(3x), terminfo(5)
+
+
 
-                                                                 captoinfo(1m)
+ncurses 6.5                       2025-01-18                     captoinfo(1m)
          diff --git a/doc/html/man/clear.1.html b/doc/html/man/clear.1.html index 30ec2052..afa82507 100644 --- a/doc/html/man/clear.1.html +++ b/doc/html/man/clear.1.html @@ -1,6 +1,6 @@ -clear 1 +clear 1 2025-01-18 ncurses 6.5 User commands -

          clear 1

          +

          clear 1 2025-01-18 ncurses 6.5 User commands

          -clear(1)                    General Commands Manual                   clear(1)
+clear(1)                         User commands                        clear(1)
 
 
 
@@ -53,108 +51,104 @@ 
          clear 1

          SYNOPSIS

          -       clear [-Ttype] [-V] [-x]
+       clear [-x] [-T terminal-type]
+
+       clear -V

          DESCRIPTION

          -       clear  clears your terminal's screen if this is possible, including the
-       terminal's scrollback  buffer  (if  the  extended  "E3"  capability  is
-       defined).   clear  looks in the environment for the terminal type given
-       by the environment variable TERM, and then in the terminfo database  to
-       determine how to clear the screen.
+       clear  clears your terminal's screen and its scrollback buffer, if any.
+       clear retrieves the terminal type from the environment  variable  TERM,
+       then  consults the terminfo terminal capability database entry for that
+       type to determine how to perform these actions.
 
-       clear  writes  to  the  standard output.  You can redirect the standard
-       output to a file (which  prevents  clear  from  actually  clearing  the
-       screen),  and  later  cat  the  file to the screen, clearing it at that
-       point.
+       The capabilities to clear the screen and scrollback  buffer  are  named
+       "clear"   and   "E3",  respectively.   The  latter  is  a  user-defined
+       capability, applying an extension mechanism introduced in  ncurses  5.0
+       (1999).

          OPTIONS

          -       -T type
-            indicates  the  type  of  terminal.   Normally  this   option   is
-            unnecessary,  because  the  default  is taken from the environment
-            variable TERM.  If -T is specified, then the shell variables LINES
-            and COLUMNS will also be ignored.
+       clear recognizes the following options.
+
+       -T type  produces   instructions   suitable   for  the  terminal  type.
+                Normally, this option is  unnecessary,  because  the  terminal
+                type  is inferred from the environment variable TERM.  If this
+                option is specified, clear ignores the  environment  variables
+                LINES and COLUMNS as well.
+
+       -V       reports  the  version  of ncurses associated with this program
+                and exits with a successful status.
+
+       -x       prevents clear from attempting to clear the scrollback buffer.
 
-       -V   reports the version of ncurses which was used in this program, and
-            exits.  The options are as follows:
 
-       -x   do not attempt to clear the terminal's scrollback buffer using the
-            extended "E3" capability.
+

          PORTABILITY

          +       Neither IEEE Std 1003.1/The  Open  Group  Base  Specifications  Issue 7
+       (POSIX.1-2008) nor X/Open Curses Issue 7 documents clear.
+
+       The  latter documents tput, which could be used to replace this utility
+       either via a shell script or by an alias (such as a symbolic  link)  to
+       run tput as clear.

          HISTORY

          -       A  clear  command  appeared  in 2.79BSD dated February 24, 1979.  Later
-       that was provided in Unix 8th edition (1985).
+       A clear command using the termcap database and library appeared in 2BSD
+       (1979).  Eighth Edition Unix (1985) later included it.
 
-       AT&T adapted a different BSD program  (tset)  to  make  a  new  command
-       (tput),  and used this to replace the clear command with a shell script
-       which calls tput clear, e.g.,
+       The commercial Unix arm of AT&T adapted a different BSD program  (tset)
+       to  make  a  new  command,  tput, and replaced the clear program with a
+       shell script that called "tput clear".
 
            /usr/bin/tput ${1:+-T$1} clear 2> /dev/null
            exit
 
        In 1989, when Keith Bostic revised the BSD  tput  command  to  make  it
-       similar  to  the  AT&T  tput,  he  added  a  shell script for the clear
-       command:
+       similar to AT&T's tput, he added a clear shell script as well.
 
            exec tput clear
 
        The remainder of the script in each case is a copyright notice.
 
-       The ncurses clear command began in 1995 by adapting  the  original  BSD
-       clear command (with terminfo, of course).
-
-       The E3 extension came later:
+       In 1995, ncurses's clear began by adapting BSD's original clear command
+       to use terminfo.  The E3 extension came later.
 
-       o   In  June  1999, xterm provided an extension to the standard control
-           sequence for clearing the screen.  Rather than  clearing  just  the
+       o   In June 1999, xterm provided an extension to the  standard  control
+           sequence  for  clearing  the screen.  Rather than clearing just the
            visible part of the screen using
 
                printf '\033[2J'
 
-           one could clear the scrollback using
+           one could clear the scrollback buffer as well by using
 
                printf '\033[3J'
 
-           This  is  documented  in  XTerm  Control  Sequences  as  a  feature
-           originating with xterm.
+           instead.  "XTerm  Control  Sequences"  documents  this  feature  as
+           originating with xterm.
 
-       o   A few other terminal developers adopted the feature, e.g., PuTTY in
-           2006.
+       o   A few other terminal emulators adopted it, such as PuTTY in 2006.
 
        o   In  April  2011, a Red Hat developer submitted a patch to the Linux
-           kernel, modifying its console driver to do  the  same  thing.   The
-           Linux  change,  part  of  the  3.0  release, did not mention xterm,
-           although it was cited in the Red Hat bug report (#683733) which led
-           to the change.
+           kernel,  modifying  its  console  driver  to  do  the  same  thing.
+           Documentation  of  this  change,  appearing  in  Linux 3.0, did not
+           mention xterm, although that program was cited in the Red  Hat  bug
+           report (#683733) motivating the feature.
 
-       o   Again,  a  few  other terminal developers adopted the feature.  But
-           the next relevant step was a change to the clear program in 2013 to
-           incorporate this extension.
+       o   Subsequently,  more  terminal  developers adopted the feature.  The
+           next relevant step was to change the ncurses clear program in  2013
+           to incorporate this extension.
 
-       o   In  2013,  the E3 extension was overlooked in tput with the "clear"
-           parameter.  That was addressed in  2016  by  reorganizing  tput  to
-           share its logic with clear and tset.
-
-
-

          PORTABILITY

          -       Neither IEEE Std 1003.1/The Open  Group  Base  Specifications  Issue  7
-       (POSIX.1-2008) nor X/Open Curses Issue 7 documents tset or reset.
-
-       The latter documents tput, which could be used to replace this  utility
-       either  via  a shell script or by an alias (such as a symbolic link) to
-       run tput as clear.
+       o   In 2013, the E3 capability was not exercised by "tput clear".  That
+           oversight was addressed in 2016 by reorganizing tput to  share  its
+           logic with clear and tset.

          SEE ALSO

          -       tput(1), terminfo(5), xterm(1).
-
-       This describes ncurses version 6.4 (patch 20230311).
+       tput(1), xterm(1), terminfo(5)
 
 
 
-                                                                      clear(1)
+ncurses 6.5                       2025-01-18                          clear(1)
          diff --git a/doc/html/man/curs_add_wch.3x.html b/doc/html/man/curs_add_wch.3x.html index dcf0f8ff..62383c47 100644 --- a/doc/html/man/curs_add_wch.3x.html +++ b/doc/html/man/curs_add_wch.3x.html @@ -1,6 +1,7 @@ -curs_add_wch 3x +curs_add_wch 3x 2025-03-01 ncurses 6.5 Library calls -

          curs_add_wch 3x

          +

          curs_add_wch 3x 2025-03-01 ncurses 6.5 Library calls

          -curs_add_wch(3x)                                              curs_add_wch(3x)
+curs_add_wch(3x)                 Library calls                curs_add_wch(3x)

          NAME

                  add_wch, wadd_wch, mvadd_wch, mvwadd_wch, echo_wchar, wecho_wchar - add
-       a complex character and rendition to a curses window, then advance  the
-       cursor
+       a curses complex character to a window, possibly advancing the cursor

          SYNOPSIS

                  #include <curses.h>
 
-       int add_wch( const cchar_t *wch );
-       int wadd_wch( WINDOW *win, const cchar_t *wch );
-       int mvadd_wch( int y, int x, const cchar_t *wch );
-       int mvwadd_wch( WINDOW *win, int y, int x, const cchar_t *wch );
-
-       int echo_wchar( const cchar_t *wch );
-       int wecho_wchar( WINDOW *win, const cchar_t *wch );
+       int add_wch(const cchar_t * wch);
+       int wadd_wch(WINDOW * win, const cchar_t * wch);
+       int mvadd_wch(int y, int x, const cchar_t * wch);
+       int mvwadd_wch(WINDOW * win, int y, int x,
+             const cchar_t * wch);
+
+       int echo_wchar(const cchar_t * wch);
+       int wecho_wchar(WINDOW * win, const cchar_t *wch);
+
+       /* (integer) constants */
+       /* ... */ WACS_BLOCK;
+       /* ... */ WACS_BOARD;
+       /* ... */ WACS_BTEE;
+       /* ... */ WACS_BULLET;
+       /* ... */ WACS_CKBOARD;
+       /* ... */ WACS_DARROW;
+       /* ... */ WACS_DEGREE;
+       /* ... */ WACS_DIAMOND;
+       /* ... */ WACS_HLINE;
+       /* ... */ WACS_LANTERN;
+       /* ... */ WACS_LARROW;
+       /* ... */ WACS_LLCORNER;
+       /* ... */ WACS_LRCORNER;
+       /* ... */ WACS_LTEE;
+       /* ... */ WACS_PLMINUS;
+       /* ... */ WACS_PLUS;
+       /* ... */ WACS_RARROW;
+       /* ... */ WACS_RTEE;
+       /* ... */ WACS_S1;
+       /* ... */ WACS_S9;
+       /* ... */ WACS_TTEE;
+       /* ... */ WACS_UARROW;
+       /* ... */ WACS_ULCORNER;
+       /* ... */ WACS_URCORNER;
+       /* ... */ WACS_VLINE;
+       /* extensions */
+       /* ... */ WACS_GEQUAL;
+       /* ... */ WACS_LEQUAL;
+       /* ... */ WACS_NEQUAL;
+       /* ... */ WACS_PI;
+       /* ... */ WACS_S3;
+       /* ... */ WACS_S7;
+       /* ... */ WACS_STERLING;
+       /* extensions for thick lines */
+       /* ... */ WACS_T_BTEE;
+       /* ... */ WACS_T_HLINE;
+       /* ... */ WACS_T_LLCORNER;
+       /* ... */ WACS_T_LRCORNER;
+       /* ... */ WACS_T_LTEE;
+       /* ... */ WACS_T_PLUS;
+       /* ... */ WACS_T_RTEE;
+       /* ... */ WACS_T_TTEE;
+       /* ... */ WACS_T_ULCORNER;
+       /* ... */ WACS_T_URCORNER;
+       /* ... */ WACS_T_VLINE;
+       /* extensions for double lines */
+       /* ... */ WACS_D_BTEE;
+       /* ... */ WACS_D_HLINE;
+       /* ... */ WACS_D_LLCORNER;
+       /* ... */ WACS_D_LRCORNER;
+       /* ... */ WACS_D_LTEE;
+       /* ... */ WACS_D_PLUS;
+       /* ... */ WACS_D_RTEE;
+       /* ... */ WACS_D_TTEE;
+       /* ... */ WACS_D_ULCORNER;
+       /* ... */ WACS_D_URCORNER;
+       /* ... */ WACS_D_VLINE;

          DESCRIPTION

           
-

          add_wch

          -       The  add_wch,  wadd_wch,  mvadd_wch,  and  mvwadd_wch functions put the
-       complex character wch into the given window at  its  current  position,
-       which  is then advanced.  These functions perform wrapping and special-
-       character processing as follows:
-
-       o   If wch refers to a spacing character, then any  previous  character
-           at  that  location is removed.  A new character specified by wch is
-           placed at that location  with  rendition  specified  by  wch.   The
-           cursor then advances to the next spacing character on the screen.
-
-       o   If  wch  refers to a non-spacing character, all previous characters
-           at that location are preserved.  The non-spacing characters of  wch
-           are  added  to  the  spacing  complex  character, and the rendition
-           specified by wch is ignored.
-
-       o   If the character part of wch is a tab, newline, backspace or  other
-           control character, the window is updated and the cursor moves as if
-           addch were called.
-
-
-

          echo_wchar

          -       The echo_wchar function is functionally equivalent to a call to add_wch
-       followed  by  a  call  to  refresh(3x).   Similarly, the wecho_wchar is
-       functionally equivalent to a call to wadd_wch followed  by  a  call  to
-       wrefresh.   The  knowledge that only a single character is being output
-       is  taken  into  consideration  and,  for  non-control  characters,   a
-       considerable  performance  gain  might  be  seen  by  using  the *echo*
-       functions instead of their equivalents.
-
-
-

          Line Graphics

          -       Like addch(3x), addch_wch accepts symbols which make it simple to  draw
-       lines  and  other  frequently  used  special characters.  These symbols
-       correspond to the same VT100 line-drawing set as addch(3x).
-
-       ACS               Unicode    ASCII     acsc    Glyph
-       Name              Default    Default   char    Name
+

          wadd_wch

          +       wadd_wch writes the curses complex character wch  to  the  window  win,
+       then  may  advance  the  cursor position, analogously to the standard C
+       library's putwchar(3).  ncurses(3x)  describes  the  variants  of  this
+       function.
+
+       Construct  a curses complex character from a wchar_t with setcchar(3x).
+       Much behavior depends on whether the wide characters in wch are spacing
+       or non-spacing; see subsection "Complex Characters" below.
+
+       o   If  wch  contains  a  spacing  character, then any character at the
+           cursor is first removed.   The  complex  character  wch,  with  its
+           attributes  and  color  pair  identifier,  becomes  the base of the
+           active complex character.
+
+       o   If wch contains only non-spacing characters, they are combined with
+           the  active  complex  character.  curses ignores its attributes and
+           color pair identifier, and does not advance the cursor.
+
+       Further non-spacing characters added with wadd_wch are not  written  at
+       the  new  cursor position but combine with the active complex character
+       until another spacing character is written to the window or the  cursor
+       is moved.
+
+       If  the  cursor  is  not  at  the  bottom  of  the scrolling region and
+       advancement occurs at the right margin, the cursor automatically  wraps
+       to the beginning of the next line.
+
+       If the cursor is at the bottom of the scrolling region when advancement
+       occurs at the right margin, and scrollok(3x) is enabled  for  win,  the
+       scrolling  region  scrolls  up  one  line.   Otherwise, advancement and
+       scrolling do not occur, and waddch returns ERR.
+
+       If wch is a backspace, carriage return, line feed, or tab,  the  cursor
+       moves appropriately within the window.
+
+       o   Backspace  moves  the cursor one character left; at the left margin
+           of a window, it does nothing.
+
+       o   Carriage return moves the cursor to the left  margin  on  the  same
+           line of the window.
+
+       o   Line  feed  does a clrtoeol(3x), then advances as if from the right
+           margin.
+
+       o   Tab advances the cursor to the next tab stop (possibly on the  next
+           line);  these  are placed at every eighth column by default.  Alter
+           the   tab   interval    with    the    TABSIZE    extension;    see
+           curs_variables(3x).
+
+       If  wch  is  any other nonprintable character, it is drawn in printable
+       form using the same convention as wunctrl(3x).  Calling win_wch(3x)  on
+       the  location of a nonprintable character does not return the character
+       itself, but its wunctrl(3x) representation.
+
+       A cchar_t can be copied from  place  to  place  using  win_wch(3x)  and
+       wadd_wch.   See  curs_attr(3x)  for values of predefined constants that
+       can be usefully "or"ed with characters.  A complex character whose only
+       character  component  is  a  wide  space,  and  whose only attribute is
+       WA_NORMAL, is a  blank  character,  and  therefore  combines  with  the
+       background character; see curs_bkgrnd(3x).
+
+
+

          wecho_wchar

          +       echo_wchar   and  wecho_wchar  are  equivalent  to  calling  (w)add_wch
+       followed by (w)refresh on  stdscr  or  the  specified  window.   curses
+       interprets  these  functions  as  a  hint  that only a single (complex)
+       character is being output; for non-control characters,  a  considerable
+       performance gain may be enjoyed by employing them.
+
+
+

          Forms-Drawing Characters

          +       curses  defines  macros  starting  with  WACS_  that  can  be used with
+       wadd_wch to  write  line-drawing  and  other  symbols  to  the  screen.
+       ncurses  terms  these forms-drawing characters.  The ACS default listed
+       below is used if the acs_chars  (acsc)  terminfo  capability  does  not
+       define  a terminal-specific replacement for it, or if the terminal type
+       and locale configuration require Unicode to access these characters but
+       the  library  is  unable  to  use  Unicode.   The  "acsc  char"  column
+       corresponds to how the characters are specified in the acs_chars (acsc)
+       string capability, and the characters in it may appear on the screen if
+       the terminal type's database entry incorrectly advertises ACS  support.
+       The name "ACS" originates in the Alternate Character Set feature of the
+       DEC VT100 terminal.
+
+                       Unicode   ACS       acsc
+       Symbol          Default   Default   char   Glyph Name
        ------------------------------------------------------------------------
-       WACS_BLOCK        0x25ae     #         0       solid square block
-       WACS_BOARD        0x2592     #         h       board of squares
-       WACS_BTEE         0x2534     +         v       bottom tee
-       WACS_BULLET       0x00b7     o         ~       bullet
-       WACS_CKBOARD      0x2592     :         a       checker board (stipple)
-       WACS_DARROW       0x2193     v         .       arrow pointing down
-       WACS_DEGREE       0x00b0     '         f       degree symbol
-
-       WACS_DIAMOND      0x25c6     +         `       diamond
-       WACS_GEQUAL       0x2265     >         >       greater-than-or-equal-to
-       WACS_HLINE        0x2500     -         q       horizontal line
-       WACS_LANTERN      0x2603     #         i       lantern symbol
-       WACS_LARROW       0x2190     <         ,       arrow pointing left
-       WACS_LEQUAL       0x2264     <         y       less-than-or-equal-to
-       WACS_LLCORNER     0x2514     +         m       lower left-hand corner
-       WACS_LRCORNER     0x2518     +         j       lower right-hand corner
-       WACS_LTEE         0x2524     +         t       left tee
-       WACS_NEQUAL       0x2260     !         |       not-equal
-       WACS_PI           0x03c0     *         {       greek pi
-       WACS_PLMINUS      0x00b1     #         g       plus/minus
-       WACS_PLUS         0x253c     +         n       plus
-       WACS_RARROW       0x2192     >         +       arrow pointing right
-       WACS_RTEE         0x251c     +         u       right tee
-       WACS_S1           0x23ba     -         o       scan line 1
-       WACS_S3           0x23bb     -         p       scan line 3
-       WACS_S7           0x23bc     -         r       scan line 7
-       WACS_S9           0x23bd     _         s       scan line 9
-       WACS_STERLING     0x00a3     f         }       pound-sterling symbol
-       WACS_TTEE         0x252c     +         w       top tee
-       WACS_UARROW       0x2191     ^         -       arrow pointing up
-       WACS_ULCORNER     0x250c     +         l       upper left-hand corner
-       WACS_URCORNER     0x2510     +         k       upper right-hand corner
-       WACS_VLINE        0x2502     |         x       vertical line
-
-       The wide-character configuration of ncurses also  defines  symbols  for
-       thick lines (acsc "J" to "V"):
-
-       ACS               Unicode   ASCII     acsc    Glyph
-       Name              Default   Default   char    Name
-       -----------------------------------------------------------------------
-       WACS_T_BTEE       0x253b    +         V       thick tee pointing up
-       WACS_T_HLINE      0x2501    -         Q       thick horizontal line
-       WACS_T_LLCORNER   0x2517    +         M       thick lower left corner
-       WACS_T_LRCORNER   0x251b    +         J       thick lower right corner
-       WACS_T_LTEE       0x252b    +         T       thick tee pointing right
-       WACS_T_PLUS       0x254b    +         N       thick large plus
-       WACS_T_RTEE       0x2523    +         U       thick tee pointing left
-       WACS_T_TTEE       0x2533    +         W       thick tee pointing down
-       WACS_T_ULCORNER   0x250f    +         L       thick upper left corner
-       WACS_T_URCORNER   0x2513    +         K       thick upper right corner
-       WACS_T_VLINE      0x2503    |         X       thick vertical line
-
-       and for double-lines (acsc "A" to "I"):
-
-       ACS               Unicode   ASCII     acsc    Glyph
-       Name              Default   Default   char    Name
+       WACS_BLOCK      U+25ae    #         0      solid square block
+       WACS_BOARD      U+2592    #         h      board of squares
+       WACS_BTEE       U+2534    +         v      bottom tee
+       WACS_BULLET     U+00b7    o         ~      bullet
+       WACS_CKBOARD    U+2592    :         a      checker board (stipple)
+       WACS_DARROW     U+2193    v         .      arrow pointing down
+       WACS_DEGREE     U+00b0    '         f      degree symbol
+       WACS_DIAMOND    U+25c6    +         `      diamond
+       WACS_GEQUAL     U+2265    >         >      greater-than-or-equal-to
+       WACS_HLINE      U+2500    -         q      horizontal line
+       WACS_LANTERN    U+2603    #         i      lantern symbol
+       WACS_LARROW     U+2190    <         ,      arrow pointing left
+       WACS_LEQUAL     U+2264    <         y      less-than-or-equal-to
+       WACS_LLCORNER   U+2514    +         m      lower left-hand corner
+       WACS_LRCORNER   U+2518    +         j      lower right-hand corner
+       WACS_LTEE       U+2524    +         t      left tee
+       WACS_NEQUAL     U+2260    !         |      not-equal
+       WACS_PI         U+03c0    *         {      greek pi
+       WACS_PLMINUS    U+00b1    #         g      plus/minus
+       WACS_PLUS       U+253c    +         n      plus
+       WACS_RARROW     U+2192    >         +      arrow pointing right
+       WACS_RTEE       U+251c    +         u      right tee
+       WACS_S1         U+23ba    -         o      scan line 1
+       WACS_S3         U+23bb    -         p      scan line 3
+       WACS_S7         U+23bc    -         r      scan line 7
+       WACS_S9         U+23bd    _         s      scan line 9
+       WACS_STERLING   U+00a3    f         }      pound-sterling symbol
+       WACS_TTEE       U+252c    +         w      top tee
+       WACS_UARROW     U+2191    ^         -      arrow pointing up
+       WACS_ULCORNER   U+250c    +         l      upper left-hand corner
+       WACS_URCORNER   U+2510    +         k      upper right-hand corner
+
+       WACS_VLINE      U+2502    |         x      vertical line
+
+       The ncurses wide API also defines symbols for  thick  lines  (acsc  "J"
+       through "N", "T" through "X", and "Q"):
+
+                         Unicode   ASCII     acsc
+       ACS Name          Default   Default   Char   Glyph Name
        ------------------------------------------------------------------------
-       WACS_D_BTEE       0x2569    +         H       double tee pointing up
-       WACS_D_HLINE      0x2550    -         R       double horizontal line
-       WACS_D_LLCORNER   0x255a    +         D       double lower left corner
-       WACS_D_LRCORNER   0x255d    +         A       double lower right corner
-       WACS_D_LTEE       0x2560    +         F       double tee pointing right
-       WACS_D_PLUS       0x256c    +         E       double large plus
-       WACS_D_RTEE       0x2563    +         G       double tee pointing left
-       WACS_D_TTEE       0x2566    +         I       double tee pointing down
-       WACS_D_ULCORNER   0x2554    +         C       double upper left corner
-       WACS_D_URCORNER   0x2557    +         B       double upper right corner
-       WACS_D_VLINE      0x2551    |         Y       double vertical line
+       WACS_T_BTEE       U+253b    +         V      thick tee pointing up
+       WACS_T_HLINE      U+2501    -         Q      thick horizontal line
+       WACS_T_LLCORNER   U+2517    +         M      thick lower left corner
+       WACS_T_LRCORNER   U+251b    +         J      thick lower right corner
+       WACS_T_LTEE       U+252b    +         T      thick tee pointing right
+       WACS_T_PLUS       U+254b    +         N      thick large plus
+       WACS_T_RTEE       U+2523    +         U      thick tee pointing left
+       WACS_T_TTEE       U+2533    +         W      thick tee pointing down
+       WACS_T_ULCORNER   U+250f    +         L      thick upper left corner
+       WACS_T_URCORNER   U+2513    +         K      thick upper right corner
+       WACS_T_VLINE      U+2503    |         X      thick vertical line
+
+       and for double lines (acsc "A" through "I", plus "R" and "Y"):
+
+                         Unicode   ASCII     acsc
+       ACS Name          Default   Default   Char   Glyph Name
+       ------------------------------------------------------------------------
+       WACS_D_BTEE       U+2569    +         H      double tee pointing up
+       WACS_D_HLINE      U+2550    -         R      double horizontal line
+       WACS_D_LLCORNER   U+255a    +         D      double lower left corner
+       WACS_D_LRCORNER   U+255d    +         A      double lower right corner
+       WACS_D_LTEE       U+2560    +         F      double tee pointing right
+       WACS_D_PLUS       U+256c    +         E      double large plus
+       WACS_D_RTEE       U+2563    +         G      double tee pointing left
+       WACS_D_TTEE       U+2566    +         I      double tee pointing down
+       WACS_D_ULCORNER   U+2554    +         C      double upper left corner
+       WACS_D_URCORNER   U+2557    +         B      double upper right corner
+       WACS_D_VLINE      U+2551    |         Y      double vertical line
 
        Unicode's  descriptions  for  these  characters  differs  slightly from
-       ncurses, by introducing the term "light"  (along  with  less  important
+       ncurses, by introducing the term "light"  (along  with  less  important
        details).   Here are its descriptions for the normal, thick, and double
        horizontal lines:
 
@@ -187,75 +296,85 @@ 
          curs_add_wch 3x

          RETURN VALUE

          -       All routines return the integer ERR upon failure and OK on success.
-
-       X/Open does not  define  any  error  conditions.   This  implementation
-       returns an error
+       These functions return OK on success and ERR on failure.
 
-       o   if the window pointer is null or
+       In ncurses, they return ERR if
 
-       o   if it is not possible to add a complete character in the window.
+       o   the curses screen has not been initialized,
 
-       The latter may be due to different causes:
+       o   (for functions taking a WINDOW pointer  argument)  win  is  a  null
+           pointer,
 
-       o   If  scrollok(3x)  is  not enabled, writing a character at the lower
-           right margin succeeds.  However, an error is returned because it is
-           not possible to wrap to a new line
+       o   wrapping  to  a new line is impossible because scrollok(3x) has not
+           been called on win (or stdscr, as applicable) when writing  to  its
+           bottom right location is attempted, or
 
-       o   If  an error is detected when converting a multibyte character to a
-           sequence of bytes, or if it is not  possible  to  add  all  of  the
-           resulting bytes in the window, an error is returned.
+       o   it  is  not  possible  to  add  a  complete character at the cursor
+           position.
 
-       Functions  with  a  "mv"  prefix  first perform a cursor movement using
-       wmove, and return an error if the position is outside the window, or if
-       the window pointer is null.
+       Functions prefixed with "mv" first perform cursor movement and fail  if
+       the position (y, x) is outside the window boundaries.

          NOTES

          -       Note that add_wch, mvadd_wch, mvwadd_wch, and echo_wchar may be macros.
+       add_wch,  mvadd_wch,  mvwadd_wch,  and echo_wchar may be implemented as
+       macros.
+
+
+

          EXTENSIONS

          +       The  symbols  WACS_S3,  WACS_S7,  WACS_LEQUAL,  WACS_GEQUAL,   WACS_PI,
+       WACS_NEQUAL,   and  WACS_STERLING  are  not  standard.   However,  many
+       publicly  available   terminfo   entries   include   acs_chars   (acsc)
+       capabilities  in which their key characters (pryz{|}) are embedded, and
+       a second-hand list of their character descriptions has come  to  light.
+       The ncurses developers invented WACS-prefixed names for them.

          PORTABILITY

          -       All  of these functions are described in the XSI Curses standard, Issue
-       4.  The defaults specified for line-drawing  characters  apply  in  the
-       POSIX locale.
+       Applications employing ncurses extensions should condition their use on
+       the visibility of the NCURSES_VERSION preprocessor macro.
+
+       These functions are described in X/Open Curses Issue 4.   It  specifies
+       no error conditions for them.
 
-       X/Open  Curses  makes it clear that the WACS_ symbols should be defined
-       as a pointer to cchar_t data, e.g., in the discussion of border_set.  A
-       few implementations are problematic:
+       The  defaults specified for forms-drawing characters apply in the POSIX
+       locale.  X/Open Curses makes it clear that the WACS_ symbols should  be
+       defined  as  a  pointer  to  cchar_t  data,  e.g., in the discussion of
+       border_set.  A few implementations are problematic:
 
-       o   NetBSD curses defines the symbols as a wchar_t within a cchar_t.
+       o   NetBSD curses defines the symbols as a wchar_t within a cchar_t.
 
-       o   HPUX curses equates some of the ACS_ symbols to the analogous WACS_
-           symbols  as  if  the  ACS_  symbols  were  wide  characters.    The
-           misdefined  symbols  are the arrows and other symbols which are not
+       o   HP-UX curses equates some of the  ACS_  symbols  to  the  analogous
+           WACS_  symbols  as  if  the ACS_ symbols were wide characters.  The
+           misdefined symbols are the arrows and other symbols which  are  not
            used for line-drawing.
 
-       X/Open Curses does not define symbols for thick- or double-lines.  SVr4
-       curses  implementations  defined their line-drawing symbols in terms of
-       intermediate  symbols.   This  implementation  extends  those  symbols,
-       providing new definitions which are not in the SVr4 implementations.
-
-       Not  all  Unicode-capable  terminals  provide  support  for VT100-style
-       alternate character  sets  (i.e.,  the  acsc  capability),  with  their
-       corresponding  line-drawing  characters.  X/Open Curses did not address
-       the  aspect  of  integrating  Unicode  with  line-drawing   characters.
-       Existing  implementations  of Unix curses (AIX, HPUX, Solaris) use only
-       the acsc character-mapping to provide this feature.  As a result, those
-       implementations  can  only  use  single-byte  line-drawing  characters.
-       Ncurses 5.3 (2002) provided a table of Unicode values  to  solve  these
-       problems.  NetBSD curses incorporated that table in 2010.
-
-       In  this  implementation,  the  Unicode  values are used instead of the
-       terminal description's acsc mapping as discussed in ncurses(3x) for the
-       environment  variable  NCURSES_NO_UTF8_ACS.   In contrast, for the same
-       cases, the line-drawing characters described in curs_addch(3x) will use
+       X/Open  Curses  does  not  specify  symbols for thick- or double-lines.
+       SVr4 curses implementations defined their line-drawing symbols in terms
+       of  intermediate symbols.  ncurses extends those symbols, providing new
+       definitions not found in SVr4 implementations.
+
+       Not all  Unicode-capable  terminals  provide  support  for  VT100-style
+       alternate character sets (i.e., the acsc_chars (acsc) capability), with
+       their corresponding line-drawing characters.   X/Open  Curses  did  not
+       address the aspect of integrating Unicode with line-drawing characters.
+       Existing implementations of System V curses (AIX, HP-UX,  Solaris)  use
+       only  the  acsc_chars (acsc) character-mapping to provide this feature.
+       As a result, those  implementations  can  use  only  single-byte  line-
+       drawing  characters.   ncurses  5.3  (2002) provided a table of Unicode
+       values to solve these problems.  NetBSD curses incorporated that  table
+       in 2010.
+
+       ncurses   uses   the  Unicode  values  instead  of  the  terminal  type
+       description's acsc_chars (acsc) mapping as discussed in ncurses(3x) for
+       the  environment  variable  NCURSES_NO_UTF8_ACS.   In contrast, for the
+       same cases, the line-drawing characters described in addch(3x) will use
        only the ASCII default values.
 
        Having  Unicode available does not solve all of the problems with line-
-       drawing for curses:
+       drawing for curses:
 
-       o   The closest Unicode equivalents to the VT100 graphics  S1,  S3,  S7
+       o   The closest Unicode equivalents to the VT100 graphics S1,  S3,  S7,
            and  S9 frequently are not displayed at the regular intervals which
            the terminal used.
 
@@ -268,29 +387,69 @@ 
          curs_add_wch 3x
          
 
            Unicode  6.0  (2010)  does provide two lantern symbols: U+1F383 and
            U+1F3EE.  Those were not available  in  2002,  and  are  irrelevant
-           since  they  lie  outside the BMP and as a result are not generally
-           available in terminals.  They are not storm lanterns, in any case.
+           since they lie outside the Basic Multilingual Plane and as a result
+           are unavailable on many terminals.  They are not storm lanterns, in
+           any case.
 
            Most storm lanterns have a tapering glass chimney (to guard against
            tipping); some have a wire grid protecting the chimney.
 
-           For  the  tapering  appearance,   U+2603 was adequate.  In use on a
+           For the tapering appearance,  U+2603 was adequate.   In  use  on  a
            terminal, no one can tell what the image represents.  Unicode calls
            it a snowman.
 
            Others have suggested these alternatives: <section> U+00A7 (section
-           mark), <Theta> U+0398 (theta), <Phi> U+03A6 (phi),  <delta>  U+03B4
+           mark),  <Theta>  U+0398 (theta), <Phi> U+03A6 (phi), <delta> U+03B4
            (delta),  U+2327 (x in a rectangle),  U+256C (forms double vertical
            and horizontal), and  U+2612 (ballot box with x).
 
 
+

          Complex Characters

          +       The  complex  character  type  cchar_t  can  store  more  than one wide
+       character (wchar_t).  X/Open Curses does not mention this  possibility,
+       specifying  behavior  only  where  wch  is  a  single character, either
+       spacing or non-spacing.
+
+       ncurses assumes that wch is constructed using setcchar(3x), and in turn
+       that the result
+
+       o   contains at most one spacing character at the beginning of its list
+           of wide characters, and zero or more non-spacing characters, or
+
+       o   holds one non-spacing character.
+
+       In the latter case, ncurses  adds  the  non-spacing  character  to  the
+       active complex character.
+
+
+

          HISTORY

          +       X/Open  Curses Issue 4 (1995) initially specified these functions.  The
+       System V  Interface  Definition  (SVID)  Version 4  of  the  same  year
+       specified  functions named waddwch (and the usual variants), echowchar,
+       and wechowchar.  These were later additions to SVr4.x, not appearing in
+       the  first SVr4 (1989).  They differed from X/Open's later wadd_wch and
+       wecho_wchar in that they each took an argument of type wchar_t  instead
+       of cchar_t.  SVID defined no  WACS_ symbols.
+
+       X/Open  Curses  Issue 4  also  defined  many  of  the  WACS_ constants,
+       excepting  WACS_GEQUAL,  WACS_LEQUAL,  WACS_NEQUAL,  WACS_PI,  WACS_S3,
+       WACS_S7,  and  WACS_STERLING;  and  those  for drawing thick and double
+       lines.
+
+       ncurses 5.3 (2002) furnished the remaining WACS_ constants.
+
+

          SEE ALSO

          -       curses(3x), curs_addch(3x), curs_attr(3x), curs_clear(3x),
-       curs_outopts(3x), curs_refresh(3x), putwc(3)
+       curs_addch(3x) describes comparable functions of the ncurses library in
+       its non-wide-character configuration.
+
+       curses(3x),   curs_addwstr(3x),   curs_add_wchstr(3x),   curs_attr(3x),
+       curs_bkgrnd(3x), curs_clear(3x),  curs_getcchar(3x),  curs_outopts(3x),
+       curs_refresh(3x), curs_variables(3x), putwc(3)
 
 
 
-                                                              curs_add_wch(3x)
+ncurses 6.5                       2025-03-01                  curs_add_wch(3x)
          diff --git a/doc/html/man/curs_add_wchstr.3x.html b/doc/html/man/curs_add_wchstr.3x.html index 5e93f68f..85c59f44 100644 --- a/doc/html/man/curs_add_wchstr.3x.html +++ b/doc/html/man/curs_add_wchstr.3x.html @@ -1,6 +1,6 @@ -curs_add_wchstr 3x +curs_add_wchstr 3x 2025-02-01 ncurses 6.5 Library calls -

          curs_add_wchstr 3x

          +

          curs_add_wchstr 3x 2025-02-01 ncurses 6.5 Library calls

          -curs_add_wchstr(3x)                                        curs_add_wchstr(3x)
+curs_add_wchstr(3x)              Library calls             curs_add_wchstr(3x)

          NAME

          -       add_wchstr, add_wchnstr, wadd_wchstr, wadd_wchnstr, mvadd_wchstr,
-       mvadd_wchnstr, mvwadd_wchstr, mvwadd_wchnstr - add an array of complex
-       characters (and attributes) to a curses window
+       add_wchstr,   wadd_wchstr,  mvadd_wchstr,  mvwadd_wchstr,  add_wchnstr,
+       wadd_wchnstr, mvadd_wchnstr, mvwadd_wchnstr  -  add  a  curses  complex
+       character string to a window

          SYNOPSIS

                  #include <curses.h>
 
-       int add_wchstr(const cchar_t *wchstr);
-       int add_wchnstr(const cchar_t *wchstr, int n);
-       int wadd_wchstr(WINDOW * win, const cchar_t *wchstr);
-       int wadd_wchnstr(WINDOW * win, const cchar_t *wchstr, int n);
+       int add_wchstr(const cchar_t * wchstr);
+       int wadd_wchstr(WINDOW *  win, const cchar_t * wchstr);
+       int mvadd_wchstr(int y, int x, const cchar_t * wchstr);
+       int mvwadd_wchstr(WINDOW * win, int y, int x,
+             const cchar_t * wchstr);
 
-       int mvadd_wchstr(int y, int x, const cchar_t *wchstr);
-       int mvadd_wchnstr(int y, int x, const cchar_t *wchstr, int n);
-       int mvwadd_wchstr(WINDOW *win, int y, int x, const cchar_t *wchstr);
-       int mvwadd_wchnstr(WINDOW *win, int y, int x, const cchar_t *wchstr, int n);
+       int add_wchnstr(const cchar_t * wchstr, int n);
+       int wadd_wchnstr(WINDOW *  win, const cchar_t * wchstr,
+             int n);
+       int mvadd_wchnstr(int y, int x, const cchar_t * wchstr,
+             int n);
+       int mvwadd_wchnstr(WINDOW * win, int y, int x,
+             const cchar_t * wchstr, int n);

          DESCRIPTION

          -       These  functions copy the (null-terminated) array of complex characters
-       wchstr into the window image structure starting at the  current  cursor
-       position.   The four functions with n as the last argument copy at most
-       n elements, but no more than will fit on the line.  If  n=-1  then  the
-       whole  array  is  copied, to the maximum number of characters that will
-       fit on the line.
+       wadd_wchstr  copies  the  string  of  complex  characters wchstr to the
+       window win.  A null complex character  terminates  the  string.   If  a
+       complex  character  does  not  completely  fit  at the end of the line,
+       curses  fills  its  remaining  cells  with  the   window's   background
+       character;  see  bkgrnd(3x).  wadd_wchnstr does the same, but copies at
+       most n characters, or as many as possible  if  n  is  -1.   ncurses(3x)
+       describes the variants of these functions.
 
-       The window cursor is not advanced.  These functions  work  faster  than
-       waddnstr.  On the other hand:
+       Because  these  functions do not call wadd_wch(3x) internally, they are
+       faster than waddwstr(3x) and waddnwstr(3x).  On the other hand, they
 
-       o   they  do  not perform checking (such as for the newline, backspace,
-           or carriage return characters),
+       o   do  not  treat  the  backspace,  carriage  return,  or  line   feed
+           characters specially;
 
-       o   they do not advance the current cursor position,
+       o   do not represent unprintable characters with wunctrl(3x);
 
-       o   they do not expand other control characters to ^-escapes, and
+       o   do  not  update  the  cursor  position to follow the last character
+           written;
 
-       o   they truncate the string if it crosses  the  right  margin,  rather
-           than wrapping it around to the new line.
-
-       These  functions  end  successfully  on encountering a null cchar_t, or
-       when they have filled the current line.  If a complex character  cannot
-       completely  fit  at  the end of the current line, the remaining columns
-       are filled with the background character and rendition.
+       o   truncate the string at  the  window's  right  margin,  rather  than
+           wrapping it to the next line and potentially scrolling.

          RETURN VALUE

          -       All functions return the integer ERR upon failure and OK on success.
+       These functions return OK on success and ERR on failure.
+
+       In ncurses, they return ERR if
+
+       o   win is NULL or
 
-       X/Open does not define any error conditions.  This  implementation  re-
-       turns an error if the window pointer is null.
+       o   wchstr is NULL.
 
-       Functions  with  a  "mv"  prefix  first perform a cursor movement using
-       wmove, and return an error if the position is outside the window, or if
-       the window pointer is null.
+       Functions  prefixed with "mv" first perform cursor movement and fail if
+       the position (y, x) is outside the window boundaries.

          NOTES

          -       All functions except wadd_wchnstr may be macros.
+       All of these  functions  except  wadd_wchnstr  may  be  implemented  as
+       macros.

          PORTABILITY

          -       These entry points are described in the XSI Curses standard, Issue 4.
+       X/Open Curses Issue 4 describes these functions.  It specifies no error
+       conditions for them.
+
+
+

          HISTORY

          +       X/Open Curses Issue 4 (1995) initially specified these functions.   The
+       System V  Interface  Definition  Version 4  of  the same year specified
+       functions named waddwchstr and waddwchnstr (and  the  usual  variants).
+       These  were  later additions to SVr4.x, not appearing in the first SVr4
+       (1989).  They differed from X/Open's later wadd_wchstr and wadd_wchnstr
+       in that they each took an argument of type wchar_t instead of cchar_t.

          SEE ALSO

          -       curses(3x), curs_addwstr(3x).
+       curs_addchstr(3x) describes comparable functions of the ncurses library
+       in its non-wide-character configuration.
 
-       Comparable  functions in the narrow-character (ncurses) library are de-
-       scribed in curs_addchstr(3x).
+       curses(3x), curs_addwstr(3x), curs_add_wch(3x)
 
 
 
-                                                           curs_add_wchstr(3x)
+ncurses 6.5                       2025-02-01               curs_add_wchstr(3x)
          diff --git a/doc/html/man/curs_addch.3x.html b/doc/html/man/curs_addch.3x.html index 49fc983a..77b991bc 100644 --- a/doc/html/man/curs_addch.3x.html +++ b/doc/html/man/curs_addch.3x.html @@ -1,7 +1,7 @@ -curs_addch 3x +curs_addch 3x 2025-03-01 ncurses 6.5 Library calls -

          curs_addch 3x

          +

          curs_addch 3x 2025-03-01 ncurses 6.5 Library calls

          -curs_addch(3x)                                                  curs_addch(3x)
+curs_addch(3x)                   Library calls                  curs_addch(3x)

          NAME

          -       addch, waddch, mvaddch, mvwaddch, echochar, wechochar - add a character
-       (with attributes) to a curses window, then advance the cursor
+       addch,  waddch,  mvaddch,  mvwaddch, echochar, wechochar - add a curses
+       character to a window and advance the cursor

          SYNOPSIS

                  #include <curses.h>
 
        int addch(const chtype ch);
-       int waddch(WINDOW *win, const chtype ch);
+       int waddch(WINDOW * win, const chtype ch);
        int mvaddch(int y, int x, const chtype ch);
-       int mvwaddch(WINDOW *win, int y, int x, const chtype ch);
+       int mvwaddch(WINDOW * win, int y, int x, const chtype ch);
 
        int echochar(const chtype ch);
-       int wechochar(WINDOW *win, const chtype ch);
+       int wechochar(WINDOW * win, const chtype ch);
+
+       /* (integer) constants */
+       /* ... */ ACS_BLOCK;
+       /* ... */ ACS_BOARD;
+       /* ... */ ACS_BTEE;
+       /* ... */ ACS_BULLET;
+       /* ... */ ACS_CKBOARD;
+       /* ... */ ACS_DARROW;
+       /* ... */ ACS_DEGREE;
+       /* ... */ ACS_DIAMOND;
+       /* ... */ ACS_HLINE;
+       /* ... */ ACS_LANTERN;
+       /* ... */ ACS_LARROW;
+       /* ... */ ACS_LLCORNER;
+       /* ... */ ACS_LRCORNER;
+       /* ... */ ACS_LTEE;
+       /* ... */ ACS_PLMINUS;
+       /* ... */ ACS_PLUS;
+       /* ... */ ACS_RARROW;
+       /* ... */ ACS_RTEE;
+       /* ... */ ACS_S1;
+       /* ... */ ACS_S9;
+       /* ... */ ACS_TTEE;
+       /* ... */ ACS_UARROW;
+       /* ... */ ACS_ULCORNER;
+       /* ... */ ACS_URCORNER;
+       /* ... */ ACS_VLINE;
+       /* extensions */
+       /* ... */ ACS_GEQUAL;
+       /* ... */ ACS_LEQUAL;
+       /* ... */ ACS_NEQUAL;
+       /* ... */ ACS_PI;
+       /* ... */ ACS_S3;
+       /* ... */ ACS_S7;
+       /* ... */ ACS_STERLING;

          DESCRIPTION

           
-

          Adding characters

          -       The addch, waddch, mvaddch and mvwaddch routines put the  character  ch
-       into  the  given  window  at its current window position, which is then
-       advanced.  They are  analogous  to  putchar(3)  in  stdio(3).   If  the
-       advance is at the right margin:
+

          waddch

          +       waddch writes the curses character ch to the window win, then  advances
+       the   cursor   position,   analogously  to  the  standard  C  library's
+       putchar(3).  ncurses(3x) describes the variants of this function.
 
-       o   The cursor automatically wraps to the beginning of the next line.
+       Construct a curses character from a  char  by  assignment.   Subsection
+       "Video  Attributes"  of  attron(3x)  describes  how  to  manipulate its
+       attributes and color pair.  (A color  pair  selection  is  not  honored
+       unless initialized; see start_color(3x).)
 
-       o   At  the bottom of the current scrolling region, and if scrollok(3x)
-           is enabled, the scrolling region is scrolled up one line.
+       If  the  cursor  is  not  at  the  bottom  of  the scrolling region and
+       advancement occurs at the right margin, the cursor automatically  wraps
+       to the beginning of the next line.
 
-       o   If scrollok(3x) is not enabled, writing a character  at  the  lower
-           right margin succeeds.  However, an error is returned because it is
-           not possible to wrap to a new line
+       If the cursor is at the bottom of the scrolling region when advancement
+       occurs at the right margin, and scrollok(3x) is enabled  for  win,  the
+       scrolling  region  scrolls  up  one  line.   Otherwise, advancement and
+       scrolling do not occur, and waddch returns ERR.
 
-       If ch is a tab, newline, carriage return or backspace,  the  cursor  is
-       moved appropriately within the window:
+       If ch is a backspace, carriage return, line feed, or  tab,  the  cursor
+       moves appropriately within the window.
 
-       o   Backspace  moves the cursor one character left; at the left edge of
-           a window it does nothing.
+       o   Backspace  moves  the cursor one character left; at the left margin
+           of a window, it does nothing.
 
-       o   Carriage return moves the cursor to the window left margin  on  the
-           current line.
+       o   Carriage return moves the cursor to the left  margin  on  the  same
+           line of the window.
 
-       o   Newline  does  a clrtoeol, then moves the cursor to the window left
-           margin on the next line, scrolling the window if on the last line.
+       o   Line  feed  does a clrtoeol(3x), then advances as if from the right
+           margin.
 
-       o   Tabs are considered to be at every eighth column.  The tab interval
-           may be altered by setting the TABSIZE variable.
+       o   Tab advances the cursor to the next tab stop (possibly on the  next
+           line);  these  are placed at every eighth column by default.  Alter
+           the   tab   interval    with    the    TABSIZE    extension;    see
+           curs_variables(3x).
 
        If  ch  is  any  other nonprintable character, it is drawn in printable
-       form, using the same convention as unctrl(3x):
-
-       o   Control characters are displayed in the ^X notation.
-
-       o   Values above 128 are either meta characters (if the screen has  not
-           been  initialized,  or  if  meta(3x)  has been called with a TRUE E
-           parameter),  shown  in  the  M-X  notation,  or  are  displayed  as
-           themselves.   In  the latter case, the values may not be printable;
-           this follows the X/Open specification.
-
-       Calling winch after adding a nonprintable character does not return the
-       character  itself,  but instead returns the printable representation of
-       the character.
-
-       Video attributes can be combined with a character  argument  passed  to
-       addch  or  related  functions by logical-ORing them into the character.
-       (Thus, text, including attributes, can be  copied  from  one  place  to
-       another  using  inch(3x)  and  addch.)   See the curs_attr(3x) page for
-       values of predefined video attribute constants  that  can  be  usefully
-       OR'ed into characters.
-
-
-

          Echoing characters

          -       The  echochar  and wechochar routines are equivalent to a call to addch
-       followed by a call to refresh(3x), or a call to waddch  followed  by  a
-       call  to wrefresh.  The knowledge that only a single character is being
-       output  is  used  and,  for  non-control  characters,  a   considerable
-       performance  gain  may be seen by using these routines instead of their
-       equivalents.
-
-
-

          Line Graphics

          -       The following variables may be used to add line drawing  characters  to
-       the  screen  with  routines of the addch family.  The default character
-       listed below is used if the acsc capability does not define a terminal-
-       specific   replacement   for   it,   or  if  the  terminal  and  locale
-       configuration requires  Unicode  but  the  library  is  unable  to  use
-       Unicode.
-
-       The names are taken from VT100 nomenclature.
-
-       ACS            ACS       acsc   Glyph
-       Name           Default   char   Name
-       ---------------------------------------------------------
-       ACS_BLOCK      #         0      solid square block
-       ACS_BOARD      #         h      board of squares
-       ACS_BTEE       +         v      bottom tee
-       ACS_BULLET     o         ~      bullet
-       ACS_CKBOARD    :         a      checker board (stipple)
-       ACS_DARROW     v         .      arrow pointing down
-       ACS_DEGREE     '         f      degree symbol
-       ACS_DIAMOND    +         `      diamond
-       ACS_GEQUAL     >         >      greater-than-or-equal-to
-       ACS_HLINE      -         q      horizontal line
-       ACS_LANTERN    #         i      lantern symbol
-       ACS_LARROW     <         ,      arrow pointing left
-       ACS_LEQUAL     <         y      less-than-or-equal-to
-       ACS_LLCORNER   +         m      lower left-hand corner
-       ACS_LRCORNER   +         j      lower right-hand corner
-       ACS_LTEE       +         t      left tee
-       ACS_NEQUAL     !         |      not-equal
-       ACS_PI         *         {      greek pi
-       ACS_PLMINUS    #         g      plus/minus
-       ACS_PLUS       +         n      plus
-       ACS_RARROW     >         +      arrow pointing right
-       ACS_RTEE       +         u      right tee
-       ACS_S1         -         o      scan line 1
-       ACS_S3         -         p      scan line 3
-       ACS_S7         -         r      scan line 7
-       ACS_S9         _         s      scan line 9
-       ACS_STERLING   f         }      pound-sterling symbol
-       ACS_TTEE       +         w      top tee
-       ACS_UARROW     ^         -      arrow pointing up
-       ACS_ULCORNER   +         l      upper left-hand corner
-       ACS_URCORNER   +         k      upper right-hand corner
-       ACS_VLINE      |         x      vertical line
+       form using the same convention as unctrl(3x).  Calling winch(3x) on the
+       location  of  a  nonprintable  character  does not return the character
+       itself, but its unctrl(3x) representation.
+
+       The object or expression ch may contain attributes and/or a color  pair
+       identifier.   (A  chtype  can  be  copied  from  place  to  place using
+       winch(3x) and waddch.)  See  curs_attr(3x)  for  values  of  predefined
+       constants  that  can  be  usefully  "or"ed with characters.  A ch whose
+       character component is a space, and whose only attribute  is  A_NORMAL,
+       is  a  blank  character,  and  therefore  combines  with the background
+       character; see curs_bkgd(3x).
+
+
+

          wechochar

          +       echochar and wechochar are equivalent to calling (w)addch  followed  by
+       (w)refresh  on stdscr or the specified window.  curses interprets these
+       functions as a hint to its optimizer that only a single character  cell
+       in  the  window  is  being  altered  between refreshes; for non-control
+       characters, a considerable performance gain may be enjoyed by employing
+       them.
+
+
+

          Forms-Drawing Characters

          +       curses  defines  macros starting with ACS_ that can be used with waddch
+       to write line-drawing and other symbols to the screen.   ncurses  terms
+       these  forms-drawing  characters.  The ACS default listed below is used
+       if the acs_chars (acsc) terminfo capability does not define a terminal-
+       specific  replacement  for  it,  or  if  the  terminal  type and locale
+       configuration require  Unicode  to  access  these  characters  but  the
+       library  is  unable to use Unicode.  The "acsc char" column corresponds
+       to how the characters are specified  in  the  acs_chars  (acsc)  string
+       capability,  and  the  characters in it may appear on the screen if the
+       terminal type's database entry incorrectly advertises ACS support.  The
+       name "ACS" originates in the Alternate Character Set feature of the DEC
+       VT100 terminal.
+
+                      ACS       acsc
+       Symbol         Default   char   Glyph Name
+       ------------------------------------------------------------------------
+       ACS_BLOCK      #         0      solid square block
+       ACS_BOARD      #         h      board of squares
+
+       ACS_BTEE       +         v      bottom tee
+       ACS_BULLET     o         ~      bullet
+       ACS_CKBOARD    :         a      checker board (stipple)
+       ACS_DARROW     v         .      arrow pointing down
+       ACS_DEGREE     '         f      degree symbol
+       ACS_DIAMOND    +         `      diamond
+       ACS_GEQUAL     >         >      greater-than-or-equal-to
+       ACS_HLINE      -         q      horizontal line
+       ACS_LANTERN    #         i      lantern symbol
+       ACS_LARROW     <         ,      arrow pointing left
+       ACS_LEQUAL     <         y      less-than-or-equal-to
+       ACS_LLCORNER   +         m      lower left-hand corner
+       ACS_LRCORNER   +         j      lower right-hand corner
+       ACS_LTEE       +         t      left tee
+       ACS_NEQUAL     !         |      not-equal
+       ACS_PI         *         {      greek pi
+       ACS_PLMINUS    #         g      plus/minus
+       ACS_PLUS       +         n      plus
+       ACS_RARROW     >         +      arrow pointing right
+       ACS_RTEE       +         u      right tee
+       ACS_S1         -         o      scan line 1
+       ACS_S3         -         p      scan line 3
+       ACS_S7         -         r      scan line 7
+       ACS_S9         _         s      scan line 9
+       ACS_STERLING   f         }      pound-sterling symbol
+       ACS_TTEE       +         w      top tee
+       ACS_UARROW     ^         -      arrow pointing up
+       ACS_ULCORNER   +         l      upper left-hand corner
+       ACS_URCORNER   +         k      upper right-hand corner
+       ACS_VLINE      |         x      vertical line

          RETURN VALUE

          -       All routines return the integer ERR upon failure and OK on success (the
-       SVr4 manuals specify only "an  integer  value  other  than  ERR")  upon
-       successful  completion, unless otherwise noted in the preceding routine
-       descriptions.
+       These functions return OK on success and ERR on failure.
 
-       Functions with a "mv" prefix first  perform  a  cursor  movement  using
-       wmove, and return an error if the position is outside the window, or if
-       the window pointer is null.
+       In ncurses, they return ERR if
 
-       If it is not  possible  to  add  a  complete  character,  an  error  is
-       returned:
+       o   the curses screen has not been initialized,
 
-       o   If  scrollok(3x)  is  not enabled, writing a character at the lower
-           right margin succeeds.  However, an error is returned because it is
-           not possible to wrap to a new line
+       o   (for functions taking a WINDOW pointer  argument)  win  is  a  null
+           pointer,
 
-       o   If  an error is detected when converting a multibyte character to a
-           sequence of bytes, or if it is not  possible  to  add  all  of  the
-           resulting bytes in the window, an error is returned.
+       o   wrapping  to  a new line is impossible because scrollok(3x) has not
+           been called on win (or stdscr, as applicable) when a write  to  its
+           bottom right location is attempted, or
+
+       o   it  is  not  possible  to  add  a  complete character at the cursor
+           position.
+
+       The last may be due to different causes:
+
+       o   conversion of a wide character to a  multibyte  character  sequence
+           can fail, or
+
+       o   at  least one of the bytes resulting from wide character conversion
+           to a multibyte character sequence cannot be added  to  the  window.
+           See  section  "PORTABILITY"  below regarding the use of waddch with
+           wide characters.
+
+       Functions prefixed with "mv" first perform cursor movement and fail  if
+       the position (y, x) is outside the window boundaries.

          NOTES

          -       Note that addch, mvaddch, mvwaddch, and echochar may be macros.
+       addch, mvaddch, mvwaddch, and echochar may be implemented as macros.
+
+
+

          EXTENSIONS

          +       The symbols ACS_S3, ACS_S7, ACS_LEQUAL, ACS_GEQUAL, ACS_PI, ACS_NEQUAL,
+       and ACS_STERLING were not documented in any publicly released  System V
+       and  are  not  standard.   However,  many  publicly  available terminfo
+       entries include  acs_chars  (acsc)  capabilities  in  which  their  key
+       characters  (pryz{|})  are  embedded,  and  a second-hand list of their
+       character descriptions has  come  to  light.   The  ncurses  developers
+       invented ACS-prefixed names for them.

          PORTABILITY

          -       All  these functions are described in the XSI Curses standard, Issue 4.
+       Applications employing ncurses extensions should condition their use on
+       the visibility of the NCURSES_VERSION preprocessor macro.
+
+       X/Open Curses Issue 4 describes these functions.  It specifies no error
+       conditions for them.
+
+       SVr4  describes  a  successful  return  value only as "an integer value
+       other than ERR".
+
        The defaults specified for forms-drawing characters apply in the  POSIX
        locale.

          ACS Symbols

          -       X/Open Curses states that the ACS_ definitions are char constants.  For
-       the  wide-character  implementation  (see  curs_add_wch),   there   are
-       analogous   WACS_   definitions  which  are  cchar_t  constants.   Some
-       implementations are problematic:
-
-       o   Some implementations define the ACS symbols to a constant (such  as
-           Solaris), while others define those to entries in an array.
-
-           This  implementation uses an array acs_map, as done in SVr4 curses.
-           NetBSD also uses an array, actually named _acs_char, with a #define
-           for compatibility.
-
-       o   HPUX curses equates some of the ACS_ symbols to the analogous WACS_
-           symbols  as  if  the  ACS_  symbols  were  wide  characters.    The
-           misdefined  symbols  are the arrows and other symbols which are not
-           used for line-drawing.
-
-       o   X/Open Curses (issues 2 through 7) has a  typographical  error  for
-           the  ACS_LANTERN  symbol,  equating  its  "VT100+  Character"  to I
-           (capital I), while the header files for SVr4 curses and the various
-           implementations use i (lowercase).
-
-           None  of the terminal descriptions on Unix platforms use uppercase-
-           I,  except  for  Solaris  (i.e.,  screen's  terminal   description,
-           apparently  based on the X/Open documentation around 1995).  On the
-           other hand, the terminal description gs6300 (AT&T PC6300 with EMOTS
-           Terminal Emulator) uses lowercase-i.
+       X/Open  Curses  states  that  the  ACS_ definitions are char constants.
+       Some implementations are problematic.
 
-       Some  ACS  symbols  (ACS_S3,  ACS_S7,  ACS_LEQUAL,  ACS_GEQUAL, ACS_PI,
-       ACS_NEQUAL, ACS_STERLING) were not documented in any publicly  released
-       System  V.   However,  many  publicly  available terminfos include acsc
-       strings in which their key characters (pryz{|})  are  embedded,  and  a
-       second-hand  list  of  their  character descriptions has come to light.
-       The ACS-prefixed names for them were invented for ncurses(3x).
+       o   Solaris curses, for example, defines the ACS symbols as  constants;
+           others define them as elements of an array.
 
-       The displayed values for the ACS_ and WACS_ constants depend on
+           SVr4  used  an array, acs_map, as does ncurses.  NetBSD curses also
+           uses an array, actually  named  _acs_char,  with  a  "#define"  for
+           compatibility.
 
-       o   the library configuration, i.e., ncurses versus ncursesw, where the
-           latter  is  capable  of displaying Unicode while the former is not,
-           and
+       o   HP-UX  curses  equates  some  of  the ACS_ symbols to the analogous
+           WACS_ symbols as if the ACS_  symbols  were  wide  characters  (see
+           curs_add_wch(3x)).   The  misdefined  symbols  are  the  arrows and
+           others that are not used for line drawing.
 
-       o   whether the locale uses UTF-8 encoding.
+       o   X/Open Curses (Issues 2 through 7) has a  typographical  error  for
+           the  ACS_LANTERN  symbol,  equating  its  "VT100+ Character" to "I"
+           (capital I), while the header  files  for  SVr4  curses  and  other
+           implementations use "i" (small i).
 
-       In certain cases,  the  terminal  is  unable  to  display  line-drawing
-       characters   except   by   using   UTF-8   (see   the   discussion   of
-       NCURSES_NO_UTF8_ACS in ncurses(3x)).
+           None  of  the terminal descriptions on Unix platforms use uppercase
+           I, except  for  Solaris  (in  its  terminfo  entry  for  screen(1),
+           apparently  based on the X/Open documentation around 1995).  On the
+           other hand, its gs6300 (AT&T PC6300 with EMOTS  Terminal  Emulator)
+           description uses lowercase i.
 
+       The displayed values of ACS_ constants depend on
 
-

          Character Set

          -       X/Open Curses assumes that the parameter passed to  waddch  contains  a
-       single  character.   As  discussed in curs_attr(3x), that character may
-       have been more than eight bits in an SVr3 or SVr4  implementation,  but
-       in  the  X/Open Curses model, the details are not given.  The important
-       distinction between SVr4 curses and X/Open  Curses  is  that  the  non-
-       character  information  (attributes  and  color) was separated from the
-       character information which is packed in a chtype to pass to waddch.
+       o   the  ncurses  ABI--for  example,  wide-character  versus  non-wide-
+           character configurations  (the  former  is  capable  of  displaying
+           Unicode while the latter is not), and
 
-       In this implementation,  chtype  holds  an  eight-bit  character.   But
-       ncurses  allows  multibyte  characters  to be passed in a succession of
-       calls to waddch.  The other implementations do not do this; a  call  to
-       waddch  passes  exactly  one  character which may be rendered as one or
-       more cells on the screen depending on whether it is printable.
+       o   whether the locale uses UTF-8 encoding.
+
+       In  certain  cases,  the  terminal  is  unable to display forms-drawing
+       characters  except  by  using  UTF-8;  see  the   discussion   of   the
+       NCURSES_NO_UTF8_ACS environment variable in ncurses(3x).
+
+
+

          Character Set

          +       X/Open  Curses  assumes  that the parameter passed to waddch contains a
+       single character.  That character may have been more  than  eight  bits
+       wide  in  an  SVr3 or SVr4 implementation, but X/Open Curses leaves the
+       width of a non-wide character code unspecified.  The  standard  further
+       does  not specify the internal structure of a chtype, though the use of
+       bit operations to combine the character  code  with  attributes  and  a
+       color pair identifier into a chtype for passage to waddch is common.  A
+       portable application uses only the macros discussed in curs_attr(3x) to
+       manipulate a chtype.
 
-       Depending on the locale settings, ncurses will inspect the byte  passed
-       in  each  call  to waddch, and check if the latest call will continue a
-       multibyte sequence.  When a character is complete, ncurses displays the
-       character and moves to the next position in the screen.
+       In ncurses, chtype holds an eight-bit character, but the library allows
+       a multibyte character sequence to be passed via a succession  of  calls
+       to  waddch.   Other  implementations  do  not;  a waddch call transmits
+       exactly one character, which may be rendered  in  one  or  more  screen
+       locations  depending  on  whether  it  is  printable  (see unctrl(3x)).
+       Depending on the locale, ncurses  inspects  the  byte  passed  in  each
+       waddch  call  and  checks whether the latest call continues a multibyte
+       character.   When  a  character  is  complete,  ncurses  displays   the
+       character   and  advances  the  cursor.   If  the  calling  application
+       interrupts the succession of bytes in a multibyte character sequence by
+       changing  the  current  location--for  example, with wmove(3x)--ncurses
+       discards the incomplete character.
 
-       If  the  calling  application  interrupts  the succession of bytes in a
-       multibyte character by moving the current location (e.g., using wmove),
-       ncurses discards the partially built character, starting over again.
+       For  portability  to  other  implementations,  do  not  rely  upon  the
+       foregoing  behavior.  Check whether a character can be represented as a
+       single byte in the current locale.
 
-       For  portability  to  other  implementations,  do  not  rely  upon this
-       behavior:
+       o   If it can, call either waddch or wadd_wch.
 
-       o   check if a character can be represented as a  single  byte  in  the
-           current locale before attempting call waddch, and
+       o   If it cannot, use only wadd_wch.
 
-       o   call wadd_wch for characters which cannot be handled by waddch.
 
+

          HISTORY

          +       4BSD (1980) introduced waddch and its variants.
 
-

          TABSIZE

          -       The  TABSIZE  variable  is  implemented  in  SVr4 and other versions of
-       curses, but is not part of X/Open curses  (see  curs_variables(3x)  for
-       more details).
+       SVr3 (1987) added the echochar and wechochar functions and most of  the
+       ACS_  constants, except for ACS_GEQUAL, ACS_LEQUAL, ACS_NEQUAL, ACS_PI,
+       ACS_S3, ACS_S7, and ACS_STERLING.
 
-       If ch is a carriage return, the cursor is moved to the beginning of the
-       current row of the window.  This is true of other implementations,  but
-       is not documented.
+       ncurses 1.9.6 (1995) furnished the remaining ACS_ constants.

          SEE ALSO

          -       curses(3x),      curs_attr(3x),      curs_clear(3x),     curs_inch(3x),
-       curs_outopts(3x), curs_refresh(3x), curs_variables(3x), putc(3).
+       curs_add_wch(3x) describes comparable functions of the ncurses  library
+       in its wide-character configuration (ncursesw).
 
-       Comparable functions  in  the  wide-character  (ncursesw)  library  are
-       described in curs_add_wch(3x).
+       curses(3x),    curs_addchstr(3x),    curs_addstr(3x),    curs_attr(3x),
+       curs_bkgd(3x),   curs_clear(3x),    curs_inch(3x),    curs_outopts(3x),
+       curs_refresh(3x), curs_variables(3x), putchar(3)
 
 
 
-                                                                curs_addch(3x)
+ncurses 6.5                       2025-03-01                    curs_addch(3x)
          diff --git a/doc/html/man/curs_addchstr.3x.html b/doc/html/man/curs_addchstr.3x.html index 60798eae..ccff8452 100644 --- a/doc/html/man/curs_addchstr.3x.html +++ b/doc/html/man/curs_addchstr.3x.html @@ -1,6 +1,6 @@ -curs_addchstr 3x +curs_addchstr 3x 2025-02-01 ncurses 6.5 Library calls -

          curs_addchstr 3x

          +

          curs_addchstr 3x 2025-02-01 ncurses 6.5 Library calls

          -curs_addchstr(3x)                                            curs_addchstr(3x)
+curs_addchstr(3x)                Library calls               curs_addchstr(3x)

          NAME

          -       addchstr, addchnstr, waddchstr, waddchnstr, mvaddchstr, mvaddchnstr,
-       mvwaddchstr, mvwaddchnstr - add a string of characters (and attributes)
-       to a curses window
+       addchstr,  waddchstr,  mvaddchstr,  mvwaddchstr, addchnstr, waddchnstr,
+       mvaddchnstr, mvwaddchnstr - add a curses character string to a window

          SYNOPSIS

                  #include <curses.h>
 
-       int addchstr(const chtype *chstr);
-       int addchnstr(const chtype *chstr, int n);
-       int waddchstr(WINDOW *win, const chtype *chstr);
-       int waddchnstr(WINDOW *win, const chtype *chstr, int n);
+       int addchstr(const chtype * chstr);
+       int waddchstr(WINDOW * win, const chtype * chstr);
+       int mvaddchstr(int y, int x, const chtype * chstr);
+       int mvwaddchstr(WINDOW * win, int y, int x,
+             const chtype * chstr);
 
-       int mvaddchstr(int y, int x, const chtype *chstr);
-       int mvaddchnstr(int y, int x, const chtype *chstr, int n);
-       int mvwaddchstr(WINDOW *win, int y, int x, const chtype *chstr);
-       int mvwaddchnstr(WINDOW *win, int y, int x, const chtype *chstr, int n);
+       int addchnstr(const chtype * chstr, int n);
+       int waddchnstr(WINDOW * win, const chtype * chstr, int n);
+       int mvaddchnstr(int y, int x, const chtype * chstr, int n);
+       int mvwaddchnstr(WINDOW * win, int y, int x,
+             const chtype * chstr, int n);

          DESCRIPTION

          -       These  functions copy the (null-terminated) chstr array into the window
-       image structure starting at the  current  cursor  position.   The  four
-       functions  with  n as the last argument copy at most n elements, but no
-       more than will fit on the line.   If  n=-1  then  the  whole  array  is
-       copied, to the maximum number of characters that will fit on the line.
+       waddchstr copies the string of curses characters chstr  to  the  window
+       win.   A  null curses character terminates the string.  waddchnstr does
+       the same, but copies at most n characters, or as many as possible if  n
+       is -1.  ncurses(3x) describes the variants of these functions.
 
-       The  window  cursor  is not advanced.  These functions work faster than
-       waddnstr.  On the other hand:
+       Because  these  functions  do  not call waddch(3x) internally, they are
+       faster than waddstr(3x) and waddnstr(3x).  On the other hand, they
 
-       o   they do not perform checking (such as for the  newline,  backspace,
-           or carriage return characters),
+       o   do  not  treat  the  backspace,  carriage  return,  or  line   feed
+           characters specially;
 
-       o   they do not advance the current cursor position,
+       o   do not represent unprintable characters with unctrl(3x);
 
-       o   they do not expand other control characters to ^-escapes, and
+       o   do  not  update  the  cursor  position to follow the last character
+           written;
 
-       o   they  truncate  the  string  if it crosses the right margin, rather
-           than wrapping it around to the new line.
+       o   truncate the string at  the  window's  right  margin,  rather  than
+           wrapping it to the next line and potentially scrolling.

          RETURN VALUE

          -       All functions return the integer ERR upon failure and OK on success.
+       These functions return OK on success and ERR on failure.
 
-       X/Open does not define any error conditions.  This  implementation  re-
-       turns an error if the window pointer is null.
+       In ncurses, they return ERR if
 
-       Functions  with  a  "mv"  prefix  first perform a cursor movement using
-       wmove, and return an error if the position is outside the window, or if
-       the window pointer is null.
+       o   win is NULL or
+
+       o   chstr is NULL.
+
+       Functions  prefixed with "mv" first perform cursor movement and fail if
+       the position (y, x) is outside the window boundaries.

          NOTES

          -       All functions except waddchnstr may be macros.
+       All of these functions except waddchnstr may be implemented as macros.

          PORTABILITY

          -       These entry points are described in the XSI Curses standard, Issue 4.
+       X/Open Curses Issue 4 describes these functions.  It specifies no error
+       conditions for them.
+
+       SVr4  describes  a  successful  return  value only as "an integer value
+       other than ERR".
+
+
+

          HISTORY

          +       SVr3.1 (1987) introduced these functions.

          SEE ALSO

          -       curses(3x), curs_addstr(3x).
+       curs_add_wchstr(3x)  describes  comparable  functions  of  the  ncurses
+       library in its wide-character configuration (ncursesw).
 
-       Comparable  functions  in the wide-character (ncursesw) library are de-
-       scribed in curs_add_wchstr(3x).
+       curses(3x), curs_addch(3x), curs_addstr(3x)
 
 
 
-                                                             curs_addchstr(3x)
+ncurses 6.5                       2025-02-01                 curs_addchstr(3x)
          diff --git a/doc/html/man/curs_addstr.3x.html b/doc/html/man/curs_addstr.3x.html index 4ce1379b..c8bbc76f 100644 --- a/doc/html/man/curs_addstr.3x.html +++ b/doc/html/man/curs_addstr.3x.html @@ -1,6 +1,6 @@ -curs_addstr 3x +curs_addstr 3x 2025-02-01 ncurses 6.5 Library calls -

          curs_addstr 3x

          +

          curs_addstr 3x 2025-02-01 ncurses 6.5 Library calls

          -curs_addstr(3x)                                                curs_addstr(3x)
+curs_addstr(3x)                  Library calls                 curs_addstr(3x)

          NAME

          -       addstr, addnstr, waddstr, waddnstr, mvaddstr, mvaddnstr, mvwaddstr,
-       mvwaddnstr - add a string of characters to a curses window and advance
-       cursor
+       addstr,  waddstr,  mvaddstr,  mvwaddstr,  addnstr, waddnstr, mvaddnstr,
+       mvwaddnstr - add a string to a curses window and advance the cursor

          SYNOPSIS

                  #include <curses.h>
 
-       int addstr(const char *str);
-       int addnstr(const char *str, int n);
-       int waddstr(WINDOW *win, const char *str);
-       int waddnstr(WINDOW *win, const char *str, int n);
+       int addstr(const char * str);
+       int waddstr(WINDOW * win, const char * str);
+       int mvaddstr(int y, int x, const char * str);
+       int mvwaddstr(WINDOW * win, int y, int x, const char * str);
 
-       int mvaddstr(int y, int x, const char *str);
-       int mvaddnstr(int y, int x, const char *str, int n);
-       int mvwaddstr(WINDOW *win, int y, int x, const char *str);
-       int mvwaddnstr(WINDOW *win, int y, int x, const char *str, int n);
+       int addnstr(const char * str, int n);
+       int waddnstr(WINDOW * win, const char * str, int n);
+       int mvaddnstr(int y, int x, const char * str, int n);
+       int mvwaddnstr(WINDOW * win, int y, int x, const char * str,
+             int n);

          DESCRIPTION

          -       These functions write the (null-terminated) character string str on the
-       given window.  It is similar to calling waddch once for  each  byte  in
-       the string.
-
-       The mv functions perform cursor movement once, before writing any char-
-       acters.  Thereafter, the cursor is advanced as a side-effect of writing
-       to the window.
-
-       The  four  functions with n as the last argument write at most n bytes,
-       or until a terminating null is reached.  If n is -1,  then  the  entire
-       string will be added.
+       waddstr writes the characters of the (null-terminated)  string  str  to
+       the  window  win,  as  if  by  calling waddch(3x) for each char in str.
+       waddnstr is similar, but writes at most n  characters.   If  n  is  -1,
+       waddnstr  writes the entire string.  ncurses(3x) describes the variants
+       of these functions.

          RETURN VALUE

          -       All functions return the integer ERR upon failure and OK on success.
+       These functions return OK on success and ERR on failure.
 
-       X/Open  does  not define any error conditions.  This implementation re-
-       turns an error
+       In ncurses, they return ERR if
 
-       o   if the window pointer is null or
+       o   win is NULL,
 
-       o   if the string pointer is null or
+       o   str is NULL, or
 
-       o   if the corresponding calls to waddch return an error.
+       o   an internal waddch(3x) call returns ERR.
 
-       Functions with a "mv" prefix first  perform  a  cursor  movement  using
-       wmove, and return an error if the position is outside the window, or if
-       the window pointer is null.  If an error is returned by the  wmove,  no
-       characters are added to the window.
-
-       If  an  error  is  returned  by waddch (e.g., because the window is not
-       large enough, or an illegal byte sequence was detected)  only  part  of
-       the  string  may be added.  Aside from that, there is a special case in
-       waddch where an error may be  returned  after  successfully  writing  a
-       character  to  the  lower-right corner of a window when scrollok(3x) is
-       disabled.
+       Functions prefixed with "mv" first perform cursor movement and fail  if
+       the position (y, x) is outside the window boundaries.

          NOTES

          -       All of these functions except waddnstr may be macros.
+       All of these functions except waddnstr may be implemented as macros.

          PORTABILITY

          -       These functions are described in the XSI Curses standard, Issue 4.
+       X/Open Curses Issue 4 describes these functions.  It specifies no error
+       conditions for them.
+
+       SVr4 describes a successful return value  only  as  "an  integer  value
+       other than ERR".
+
+
+

          HISTORY

          +       4BSD  (1980)  introduced  waddstr  along  with its variants, the latter
+       defined as macros.
+
+       SVr3.1 (1987) added waddnstr (and its variants) redefining waddstr as a
+       macro wrapping it.

          SEE ALSO

          -       curses(3x), curs_addch(3x).
+       curs_addwstr(3x)  describes comparable functions of the ncurses library
+       in its wide-character configuration (ncursesw).
+
+       curses(3x), curs_addch(3x), curs_addchstr(3x)
 
 
 
-                                                               curs_addstr(3x)
+ncurses 6.5                       2025-02-01                   curs_addstr(3x)
          diff --git a/doc/html/man/curs_addwstr.3x.html b/doc/html/man/curs_addwstr.3x.html index ce6d21b0..8257601d 100644 --- a/doc/html/man/curs_addwstr.3x.html +++ b/doc/html/man/curs_addwstr.3x.html @@ -1,6 +1,6 @@ -curs_addwstr 3x +curs_addwstr 3x 2025-02-01 ncurses 6.5 Library calls -

          curs_addwstr 3x

          +

          curs_addwstr 3x 2025-02-01 ncurses 6.5 Library calls

          -curs_addwstr(3x)                                              curs_addwstr(3x)
+curs_addwstr(3x)                 Library calls                curs_addwstr(3x)

          NAME

          -       addwstr, addnwstr, waddwstr, waddnwstr, mvaddwstr, mvaddnwstr,
-       mvwaddwstr, mvwaddnwstr - add a string of wide characters to a curses
-       window and advance cursor
+       addwstr,   waddwstr,   mvaddwstr,   mvwaddwstr,   addnwstr,  waddnwstr,
+       mvaddnwstr, mvwaddnwstr - add  a  wide-character  string  to  a  curses
+       window and advance the cursor

          SYNOPSIS

                  #include <curses.h>
 
-       int addwstr(const wchar_t *wstr);
-       int addnwstr(const wchar_t *wstr, int n);
-       int waddwstr(WINDOW *win, const wchar_t *wstr);
-       int waddnwstr(WINDOW *win, const wchar_t *wstr, int n);
+       int addwstr(const wchar_t * wstr);
+       int waddwstr(WINDOW * win, const wchar_t * wstr);
+       int mvaddwstr(int y, int x, const wchar_t * wstr);
+       int mvwaddwstr(WINDOW * win, int y, int x,
+             const wchar_t * wstr);
 
-       int mvaddwstr(int y, int x, const wchar_t *wstr);
-       int mvaddnwstr(int y, int x, const wchar_t *wstr, int n);
-       int mvwaddwstr(WINDOW *win, int y, int x, const wchar_t *wstr);
-       int mvwaddnwstr(WINDOW *win, int y, int x, const wchar_t *wstr, int n);
+       int addnwstr(const wchar_t * wstr, int n);
+       int waddnwstr(WINDOW * win, const wchar_t * wstr, int n);
+       int mvaddnwstr(int y, int x, const wchar_t * wstr, int n);
+       int mvwaddnwstr(WINDOW * win, int y, int x,
+             const wchar_t * wstr, int n);

          DESCRIPTION

          -       These  functions  write the characters of the (null-terminated) wchar_t
-       character string wstr on the given window.  It is similar to construct-
-       ing a cchar_t for each wchar_t in the string, then calling wadd_wch for
-       the resulting cchar_t.
-
-       The mv functions perform cursor movement once, before writing any char-
-       acters.  Thereafter, the cursor is advanced as a side-effect of writing
-       to the window.
-
-       The four functions with n as the last argument write at most n  wchar_t
-       characters,  or  until a terminating null is reached.  If n is -1, then
-       the entire string will be added.
+       waddwstr  writes  the  characters  of  the (wide-null-terminated) wide-
+       character string wstr to the  window  win,  as  if  by  constructing  a
+       cchar_t  for  each  wchar_t in wstr, then calling wadd_wch(3x) with the
+       resulting cchar_t.  curses processes spacing and non-spacing characters
+       in wstr one at a time.  waddnwstr is similar, but writes at most n wide
+       characters.  If n is -1,  waddnwstr  writes  the  entire  wide  string.
+       ncurses(3x) describes the variants of these functions.

          RETURN VALUE

          -       All functions return the integer ERR upon failure and OK on success.
+       These functions return OK on success and ERR on failure.
 
-       X/Open does not define any error conditions.  This  implementation  re-
-       turns an error
+       In ncurses, they return ERR if
 
-       o   if the window pointer is null or
+       o   win is NULL,
 
-       o   if the string pointer is null or
+       o   wstr is NULL, or
 
-       o   if the corresponding calls to wadd_wch return an error.
+       o   an internal wadd_wch(3x) call returns ERR.
 
-       Functions  with  a  "mv"  prefix  first perform a cursor movement using
-       wmove, and return an error if the position is outside the window, or if
-       the window pointer is null.
+       Functions  prefixed with "mv" first perform cursor movement and fail if
+       the position (y, x) is outside the window boundaries.

          NOTES

          -       All of these functions except waddnwstr may be macros.
+       All of these functions except waddnwstr may be implemented as macros.

          PORTABILITY

          -       These functions are described in the XSI Curses standard, Issue 4.
+       X/Open Curses Issue 4 describes these functions.
+
+       SVr4 describes a successful return value  only  as  "an  integer  value
+       other than ERR".
+
+
+

          HISTORY

          +       X/Open  Curses Issue 4 (1995) initially specified these functions.  The
+       System V Interface Definition Version 4  of  the  same  year  specified
+       functions named waddwstr and waddnwstr (and the usual variants).  These
+       were later additions to SVr4.x, not appearing in the first SVr4 (1989).

          SEE ALSO

          -       curses(3x), curs_add_wch(3x)
+       curs_addstr(3x) describes comparable functions of the  ncurses  library
+       in its non-wide-character configuration.
+
+       curses(3x), curs_add_wch(3x), curs_add_wchstr(3x)
 
 
 
-                                                              curs_addwstr(3x)
+ncurses 6.5                       2025-02-01                  curs_addwstr(3x)
          diff --git a/doc/html/man/curs_attr.3x.html b/doc/html/man/curs_attr.3x.html index 70dc7455..7beefe79 100644 --- a/doc/html/man/curs_attr.3x.html +++ b/doc/html/man/curs_attr.3x.html @@ -1,7 +1,7 @@ -curs_attr 3x +curs_attr 3x 2025-02-15 ncurses 6.5 Library calls -

          curs_attr 3x

          +

          curs_attr 3x 2025-02-15 ncurses 6.5 Library calls

          -curs_attr(3x)                                                    curs_attr(3x)
+curs_attr(3x)                    Library calls                   curs_attr(3x)
 
 
 
@@ -71,9 +50,9 @@ 
          curs_attr 3x

          NAME

                  attr_get, wattr_get, attr_set, wattr_set, attr_off, wattr_off, attr_on,
        wattr_on, attroff, wattroff, attron, wattron, attrset, wattrset, chgat,
-       wchgat, mvchgat, mvwchgat, color_set, wcolor_set, standend, wstandend,
-       standout, wstandout - curses character and window attribute control
-       routines
+       wchgat,  mvchgat, mvwchgat, color_set, wcolor_set, standend, wstandend,
+       standout, wstandout -  manipulate  attributes  of  character  cells  in
+       curses windows

          SYNOPSIS

          @@ -89,7 +68,7 @@ 
          curs_attr 3x
          
        int attr_on(attr_t attrs, void *opts);
        int wattr_on(WINDOW *win, attr_t attrs, void *opts);
 
-       int attroff(int attrs);
+       int attroff(int attrs);
        int wattroff(WINDOW *win, int attrs);
        int attron(int attrs);
        int wattron(WINDOW *win, int attrs);
@@ -101,11 +80,11 @@ 
          curs_attr 3x
          
              int n, attr_t attr, short pair, const void *opts);
        int mvchgat(int y, int x,
              int n, attr_t attr, short pair, const void *opts);
-       int mvwchgat(WINDOW *win, int y, int x,
-             int n, attr_t attr, short pair, const void *opts);
+       int mvwchgat(WINDOW *win, int y, int x,
+             int n, attr_t attr, short pair, const void *opts);
 
        int color_set(short pair, void* opts);
-       int wcolor_set(WINDOW *win, short pair, void* opts);
+       int wcolor_set(WINDOW *win, short pair, void* opts);
 
        int standend(void);
        int wstandend(WINDOW *win);
@@ -117,97 +96,95 @@ 
          curs_attr 3x
          
        These  routines  manipulate the current attributes of the named window,
        which then apply to all characters that are  written  into  the  window
        with  waddch,  waddstr  and  wprintw.  Attributes are a property of the
-       character, and move with the character through any  scrolling  and  in-
-       sert/delete  line/character  operations.   To the extent possible, they
+       character, and move  with  the  character  through  any  scrolling  and
+       insert/delete  line/character operations.  To the extent possible, they
        are displayed as appropriate modifications to the graphic rendition  of
        characters put on the screen.
 
        These  routines do not affect the attributes used when erasing portions
-       of the window.  See curs_bkgd(3x) for functions which  modify  the  at-
-       tributes used for erasing and clearing.
-
-       Routines  which  do  not have a WINDOW* parameter apply to stdscr.  For
-       example, attr_set is the stdscr variant of wattr_set.
+       of the window.   See  curs_bkgd(3x)  for  functions  which  modify  the
+       attributes used for erasing and clearing.
 
 
-

          Window attributes

          +

          Window Attributes

                  There are two sets of functions:
 
-       o   functions for manipulating the window attributes  and  color:  wat-
-           tr_set and wattr_get.
+       o   functions   for  manipulating  the  window  attributes  and  color:
+           wattr_set and wattr_get.
 
-       o   functions  for manipulating only the window attributes (not color):
+       o   functions for manipulating only the window attributes (not  color):
            wattr_on and wattr_off.
 
-       The wattr_set function sets the current attributes of the given  window
+       The  wattr_set function sets the current attributes of the given window
        to attrs, with color specified by pair.
 
        Use wattr_get to retrieve attributes for the given window.
 
-       Use  attr_on  and  wattr_on  to turn on window attributes, i.e., values
-       OR'd together in attr, without affecting  other  attributes.   Use  at-
-       tr_off  and  wattr_off to turn off window attributes, again values OR'd
-       together in attr, without affecting other attributes.
+       Use attr_on and wattr_on to turn on  window  attributes,  i.e.,  values
+       logically "or"-ed together in attr, without affecting other attributes.
+       Use attr_off and wattr_off to turn off window attributes, again  values
+       logically "or"-ed together in attr, without affecting other attributes.
 
 
-

          Legacy window attributes

          -       The X/Open window attribute routines which set or get, turn on  or  off
-       are extensions of older routines which assume that color pairs are OR'd
-       into the attribute parameter.  These newer routines use similar  names,
-       because X/Open simply added an underscore (_) for the newer names.
+

          Legacy Window Attributes

          +       The  X/Open  window attribute routines which set or get, turn on or off
+       are extensions of older routines which  assume  that  color  pairs  are
+       logically  "or"-ed  into the attribute parameter.  These newer routines
+       use similar names, because X/Open simply added an  underscore  (_)  for
+       the newer names.
 
-       The int datatype used in the legacy routines is treated as if it is the
-       same size as chtype (used by addch(3x)).  It holds the common video at-
-       tributes  (such  as  bold,  reverse),  as well as a few bits for color.
-       Those bits correspond to the A_COLOR symbol.  The COLOR_PAIR macro pro-
-       vides  a value which can be OR'd into the attribute parameter.  For ex-
-       ample, as long as that value fits into the  A_COLOR  mask,  then  these
-       calls produce similar results:
+       The int datatype used in the legacy routines is treated as if it is the
+       same size as chtype (used by addch(3x)).  It  holds  the  common  video
+       attributes  (such  as  bold, reverse), as well as a few bits for color.
+       Those bits correspond to the  A_COLOR  symbol.   The  COLOR_PAIR  macro
+       provides  a  value  which  can  be logically "or"-ed into the attribute
+       parameter.  For example, as long as that value fits  into  the  A_COLOR
+       mask, then these calls produce similar results:
 
            attrset(A_BOLD | COLOR_PAIR(pair));
            attr_set(A_BOLD, pair, NULL);
 
        However, if the value does not fit, then the COLOR_PAIR macro uses only
-       the bits that fit.  For example, because in ncurses A_COLOR  has  eight
+       the bits that fit.  For example, because in ncurses A_COLOR  has  eight
        (8) bits, then COLOR_PAIR(259) is 4 (i.e., 259 is 4 more than the limit
        255).
 
-       The PAIR_NUMBER macro extracts a pair number from an int  (or  chtype).
+       The PAIR_NUMBER macro extracts a pair number from an int  (or  chtype).
        For  example,  the input and output values in these statements would be
        the same:
 
            int value = A_BOLD | COLOR_PAIR(input);
            int output = PAIR_NUMBER(value);
 
-       The attrset routine is a legacy feature predating SVr4 curses but  kept
-       in X/Open Curses for the same reason that SVr4 curses kept it: compati-
-       bility.
+       The attrset routine is a legacy feature predating SVr4 curses but  kept
+       in  X/Open  Curses  for  the  same  reason  that  SVr4  curses kept it:
+       compatibility.
 
        The remaining attr* functions operate exactly  like  the  corresponding
-       attr_*  functions,  except  that they take arguments of type int rather
-       than attr_t.
+       attr_*  functions,  except  that they take arguments of type int rather
+       than attr_t.
 
        There is no corresponding attrget function as such  in  X/Open  Curses,
-       although ncurses provides getattrs (see curs_legacy(3x)).
+       although ncurses provides getattrs (see curs_legacy(3x)).
 
 
-

          Change character rendition

          -       The  routine  chgat changes the attributes of a given number of charac-
-       ters starting at the current cursor location of stdscr.   It  does  not
-       update  the cursor and does not perform wrapping.  A character count of
-       -1 or greater than the remaining  window  width  means  to  change  at-
-       tributes  all the way to the end of the current line.  The wchgat func-
-       tion generalizes this to any window; the mvwchgat function does a  cur-
-       sor move before acting.
+

          Change Character Rendition

          +       The  routine  chgat  changes  the  attributes  of  a  given  number  of
+       characters starting at the current cursor location of stdscr.  It  does
+       not update the cursor and does not perform wrapping.  A character count
+       of -1 or greater than  the  remaining  window  width  means  to  change
+       attributes  all  the  way  to  the end of the current line.  The wchgat
+       function generalizes this to any window; the mvwchgat function  does  a
+       cursor move before acting.
 
-       In  these  functions, the color pair argument is a color-pair index (as
+       In  these  functions, the color pair argument is a color pair index (as
        in the first argument of init_pair, see curs_color(3x)).
 
 
-

          Change window color

          +

          Change Window Color

                  The routine color_set sets the current color of the given window to the
-       foreground/background  combination  described by the color pair parame-
-       ter.
+       foreground/background   combination   described   by   the  color  pair
+       parameter.

          Standout

          @@ -215,23 +192,23 @@ 
          curs_attr 3x
          
        standend  is  the  same as attrset(A_NORMAL) or attrset(0), that is, it
        turns off all attributes.
 
-       X/Open does not mark these "restricted", because
+       X/Open Curses does not mark these "restricted", because
 
        o   they have well established legacy use, and
 
-       o   there is no ambiguity about the way the attributes  might  be  com-
-           bined with a color pair.
+       o   there is no  ambiguity  about  the  way  the  attributes  might  be
+           combined with a color pair.
 
 
-

          VIDEO ATTRIBUTES

          -       The following video attributes, defined in <curses.h>, can be passed to
-       the routines attron, attroff, and attrset, or OR'd with the  characters
-       passed to addch (see curs_addch(3x)).
+

          Video Attributes

          +       The  following  video attributes, defined in curses.h, can be passed to
+       attron, attroff, attrset, and logically "or"-ed with characters  passed
+       to addch(3x).
 
               Name           Description
               -----------------------------------------------------------------
               A_NORMAL       Normal display (no highlight)
-              A_STANDOUT     Best highlighting mode of the terminal.
+              A_STANDOUT     Best highlighting mode available
               A_UNDERLINE    Underlining
               A_REVERSE      Reverse video
               A_BLINK        Blinking
@@ -241,14 +218,15 @@ 
          curs_attr 3x
          
               A_INVIS        Invisible or blank mode
               A_ALTCHARSET   Alternate character set
               A_ITALIC       Italics (non-X/Open extension)
-              A_CHARTEXT     Bit-mask to extract a character
-              A_COLOR        Bit-mask to extract a color (legacy routines)
+              A_ATTRIBUTES   Mask to extract character code
+              A_CHARTEXT     Mask to extract attributes
+              A_COLOR        Mask to extract color pair identifier
 
-       These  video  attributes are supported by attr_on and related functions
-       (which also support the attributes recognized by attron, etc.):
+       attr_on,  attr_off,  and  attr_set support the foregoing as well as the
+       following additional attributes.
 
               Name            Description
-              -----------------------------------------
+              -----------------------------------------------------------------
               WA_HORIZONTAL   Horizontal highlight
               WA_LEFT         Left highlight
               WA_LOW          Low highlight
@@ -256,203 +234,97 @@ 
          curs_attr 3x
          
               WA_TOP          Top highlight
               WA_VERTICAL     Vertical highlight
 
-       The return values of many of these routines are  not  meaningful  (they
-       are  implemented  as macro-expanded assignments and simply return their
-       argument).  The SVr4 manual page claims (falsely) that  these  routines
-       always return 1.
-
-
-

          NOTES

          -       These functions may be macros:
-
-              attroff,  wattroff, attron, wattron, attrset, wattrset, standend
-              and standout.
-
-       Color pair values can only be OR'd with attributes if the  pair  number
-       is less than 256.  The alternate functions such as color_set can pass a
-       color pair value directly.  However, ncurses ABI 4 and 5 simply OR this
-       value  within  the  alternate functions.  You must use ncurses ABI 6 to
-       support more than 256 color pairs.
-
-
-

          HISTORY

          -       X/Open Curses is largely based  on  SVr4  curses,  adding  support  for
-       "wide-characters"  (not  specific to Unicode).  Some of the X/Open dif-
-       ferences from SVr4 curses address the way video attributes can  be  ap-
-       plied  to  wide-characters.   But aside from that, attrset and attr_set
-       are similar.  SVr4 curses provided the basic features for  manipulating
-       video  attributes.  However, earlier versions of curses provided a part
-       of these features.
-
-       As seen in 2.8BSD, curses assumed 7-bit characters,  using  the  eighth
-       bit  of  a byte to represent the standout feature (often implemented as
-       bold and/or reverse video).  The BSD curses library provided  functions
-       standout  and  standend which were carried along into X/Open Curses due
-       to their pervasive use in legacy applications.
-
-       Some terminals in the 1980s  could  support  a  variety  of  video  at-
-       tributes,  although the BSD curses library could do nothing with those.
-       System V (1983) provided an improved curses library.  It defined the A_
-       symbols  for  use  by  applications to manipulate the other attributes.
-       There are few useful references for the chronology.
-
-       Goodheart's book UNIX Curses Explained (1991)  describes  SVr3  (1987),
-       commenting on several functions:
-
-       o   the  attron,  attroff, attrset functions (and most of the functions
-           found in SVr4 but not in BSD curses) were introduced by System V,
-
-       o   the alternate character set feature with A_ALTCHARSET was added  in
-           SVr2 and improved in SVr3 (by adding acs_map[]),
-
-       o   start_color  and  related color-functions were introduced by System
-           V.3.2,
-
-       o   pads, soft-keys were added in SVr3, and
-
-       Goodheart did not mention the background character or the cchar_t type.
-       Those are respectively SVr4 and X/Open features.  He did mention the A_
-       constants, but did not indicate their values.  Those were not the  same
-       in different systems, even for those marked as System V.
-
-       Different  Unix  systems  used  different  sizes  for the bit-fields in
-       chtype for characters and colors, and took into account  the  different
-       integer sizes (32-bit versus 64-bit).
-
-       This  table  showing  the number of bits for A_COLOR and A_CHARTEXT was
-       gleaned from the curses header files for various operating systems  and
-       architectures.   The inferred architecture and notes reflect the format
-       and size of the defined constants as well as clues such as  the  alter-
-       nate  character  set implementation.  A 32-bit library can be used on a
-       64-bit system, but not necessarily the reverse.
-
-              Year   System        Arch    Color   Char   Notes
-              ----------------------------------------------------------------
-              1992   Solaris 5.2   32      6       17     SVr4 curses
-              1992   HPUX 9        32      no      8      SVr2 curses
-              1992   AIX 3.2       32      no      23     SVr2 curses
-              1994   OSF/1 r3      32      no      23     SVr2 curses
-              1995   HP-UX 10.00   32      6       16     SVr3 "curses_colr"
-              1995   HP-UX 10.00   32      6       8      SVr4, X/Open curses
-              1995   Solaris 5.4   32/64   7       16     X/Open curses
-              1996   AIX 4.2       32      7       16     X/Open curses
-              1996   OSF/1 r4      32      6       16     X/Open curses
-
-              1997   HP-UX 11.00   32      6       8      X/Open curses
-              2000   U/Win         32/64   7/31    16     uses chtype
-
-       Notes:
-
-          Regarding HP-UX,
-
-          o   HP-UX 10.20 (1996) added support for 64-bit  PA-RISC  processors
-              in 1996.
-
-          o   HP-UX  10.30 (1997) marked "curses_colr" obsolete.  That version
-              of curses was dropped with HP-UX 11.30 in 2006.
-
-          Regarding OSF/1 (and Tru64),
-
-          o   These used 64-bit hardware.  Like ncurses, the OSF/1 curses  in-
-              terface is not customized for 32-bit and 64-bit versions.
-
-          o   Unlike other systems which evolved from AT&T code, OSF/1 provid-
-              ed a new implementation for X/Open curses.
-
-          Regarding Solaris,
-
-          o   The initial release of Solaris was in 1992.
 
-          o   The xpg4 (X/Open) curses was developed by MKS from 1990 to 1995.
-              Sun's copyright began in 1996.
-
-          o   Sun updated the X/Open curses interface after 64-bit support was
-              introduced in 1997, but did not modify the  SVr4  curses  inter-
-              face.
-
-          Regarding U/Win,
+

          RETURN VALUE

          +       These functions return OK on success and ERR on failure.
 
-          o   Development  of  the  curses  library  began in 1991, stopped in
-              2000.
+       In ncurses, they return ERR if win is NULL.
 
-          o   Color support was added in 1998.
+       wcolor_set returns ERR if pair is outside the range 0..COLOR_PAIRS-1.
 
-          o   The library uses only chtype (no cchar_t).
+       wattr_get does not fail if its attrs or pair parameter is NULL.
 
-       Once X/Open curses was adopted in the mid-1990s, the  constraint  of  a
-       32-bit interface with many colors and wide-characters for chtype became
-       a moot point.  The cchar_t structure (whose size and  members  are  not
-       specified in X/Open Curses) could be extended as needed.
+       Functions prefixed with "mv" first perform cursor movement and fail  if
+       the position (y, x) is outside the window boundaries.
 
-       Other interfaces are rarely used now:
 
-       o   BSD  curses was improved slightly in 1993/1994 using Keith Bostic's
-           modification to make the library 8-bit clean for nvi(1).  He  moved
-           standout attribute to a structure member.
+

          NOTES

          +       attr_on,  attr_off,  attr_set,  wattr_set,  chgat,  mvchgat,  mvwchgat,
+       wchgat, and color_set are part of ncurses's wide-character API, and are
+       not available in its non-wide configuration.
 
-           The  resulting  4.4BSD curses was replaced by ncurses over the next
-           ten years.
+       attron,  wattron,  attroff,  wattroff, attrset, wattrset, standout, and
+       standend may be implemented as macros.
 
-       o   U/Win is rarely used now.
+       Color pair values may be logically "or"-ed with attributes if the  pair
+       number is less than 256.  The alternate functions such as color_set can
+       pass a color pair value directly.  However, ncurses ABI 4 and 5  simply
+       logically "or" this value within the alternate functions.  You must use
+       ncurses ABI 6 to support more than 256 color pairs.

          EXTENSIONS

                  This implementation provides the A_ITALIC attribute for terminals which
-       have  the  enter_italics_mode (sitm) and exit_italics_mode (ritm) capa-
-       bilities.  Italics are not mentioned in X/Open Curses.  Unlike the oth-
-       er  video attributes, A_ITALIC is unrelated to the set_attributes capa-
-       bilities.  This implementation makes the  assumption  that  exit_attri-
-       bute_mode may also reset italics.
+       have   the   enter_italics_mode  (sitm)  and  exit_italics_mode  (ritm)
+       capabilities.  Italics are not mentioned in X/Open Curses.  Unlike  the
+       other  video  attributes,  A_ITALIC  is unrelated to the set_attributes
+       capabilities.   This   implementation   makes   the   assumption   that
+       exit_attribute_mode may also reset italics.
 
        Each  of  the functions added by XSI Curses has a parameter opts, which
-       X/Open Curses still (after more than twenty  years)  documents  as  re-
-       served for future use, saying that it should be NULL.  This implementa-
-       tion uses that parameter in ABI 6 for the functions which have a color-
-       pair parameter to support extended color pairs:
+       X/Open Curses  still  (after  more  than  twenty  years)  documents  as
+       reserved  for  future  use,  saying  that  it  should  be  NULL.   This
+       implementation uses that parameter in ABI 6  for  the  functions  which
+       have a color pair parameter to support extended color pairs:
 
        o   For functions which modify the color, e.g., wattr_set and wattr_on,
-           if opts is set it is treated as a pointer to int, and used  to  set
-           the color pair instead of the short pair parameter.
+           if opts is set it is treated as a pointer to int, and used  to  set
+           the color pair instead of the short pair parameter.
 
        o   For functions which retrieve the color, e.g., wattr_get, if opts is
-           set it is treated as a pointer to int, and  used  to  retrieve  the
-           color  pair  as  an int value, in addition to retrieving it via the
-           standard pointer to short parameter.
+           set it is treated as a pointer to int, and  used  to  retrieve  the
+           color  pair  as  an int value, in addition to retrieving it via the
+           standard pointer to short parameter.
 
        o   For functions which turn attributes off, e.g., wattr_off, the  opts
-           parameter is ignored except except to check that it is NULL.
+           parameter is ignored except to check that it is NULL.

          PORTABILITY

          -       These functions are supported in the XSI Curses standard, Issue 4.  The
-       standard defined the dedicated type for highlights, attr_t,  which  was
-       not defined in SVr4 curses.  The functions taking attr_t arguments were
-       not supported under SVr4.
+       These  functions  are described in X/Open Curses Issue 4.  It specifies
+       no error conditions for them.
+
+       The standard defined the dedicated type for highlights,  attr_t,  which
+       was  not defined in SVr4 curses.  The functions taking attr_t arguments
+       were not supported under SVr4.
+
+       SVr4 describes the functions not taking attr_t  or  pair  arguments  as
+       always returning 1.
 
        Very old versions of this library did not force an update of the screen
-       when  changing  the  attributes.   Use  touchwin to force the screen to
+       when changing the attributes.  Use touchwin  to  force  the  screen  to
        match the updated attributes.
 
-       The XSI Curses standard states that whether the  traditional  functions
-       attron/attroff/attrset  can  manipulate  attributes other than A_BLINK,
-       A_BOLD, A_DIM, A_REVERSE, A_STANDOUT, or A_UNDERLINE is  "unspecified".
-       Under  this implementation as well as SVr4 curses, these functions cor-
-       rectly manipulate all  other  highlights  (specifically,  A_ALTCHARSET,
+       X/Open   Curses   states   that   whether   the  traditional  functions
+       attron/attroff/attrset can manipulate attributes  other  than  A_BLINK,
+       A_BOLD,  A_DIM, A_REVERSE, A_STANDOUT, or A_UNDERLINE is "unspecified".
+       Under this implementation as  well  as  SVr4  curses,  these  functions
+       correctly  manipulate all other highlights (specifically, A_ALTCHARSET,
        A_PROTECT, and A_INVIS).
 
-       XSI Curses added these entry points:
+       X/Open Curses added these entry points:
 
-              attr_get, attr_on, attr_off, attr_set, wattr_on, wattr_off, wat-
-              tr_get, wattr_set
+              attr_get,  attr_on,  attr_off,  attr_set,  wattr_on,  wattr_off,
+              wattr_get, wattr_set
 
-       The new functions are intended to work with a new series  of  highlight
+       The  new  functions are intended to work with a new series of highlight
        macros prefixed with WA_.  The older macros have direct counterparts in
        the newer set of names:
 
               Name            Description
-              ------------------------------------------------------------
+              -----------------------------------------------------------------
               WA_NORMAL       Normal display (no highlight)
-              WA_STANDOUT     Best highlighting mode of the terminal.
+              WA_STANDOUT     Best highlighting mode of the terminal
               WA_UNDERLINE    Underlining
               WA_REVERSE      Reverse video
               WA_BLINK        Blinking
@@ -460,67 +332,168 @@ 
          curs_attr 3x
          
               WA_BOLD         Extra bright or bold
               WA_ALTCHARSET   Alternate character set
 
-       XSI curses does not assign values to these symbols, nor does  it  state
-       whether or not they are related to the similarly-named A_NORMAL, etc.:
+       X/Open  Curses  does  not  assign  values to these symbols, nor does it
+       state whether or not they are related to the similarly-named  A_NORMAL,
+       etc.:
 
-       o   The  XSI  curses standard specifies that each pair of corresponding
-           A_ and WA_-using functions operates on the  same  current-highlight
+       o   X/Open  Curses  specifies  that  each  pair of corresponding A_ and
+           WA_-using  functions  operates  on   the   same   current-highlight
            information.
 
-       o   However, in some implementations, those symbols have unrelated val-
-           ues.
+       o   However,  in  some  implementations,  those  symbols have unrelated
+           values.
 
-           For example, the Solaris xpg4 (X/Open) curses declares attr_t to be
-           an unsigned short integer (16-bits), while chtype is a unsigned in-
-           teger (32-bits).  The WA_ symbols in this case are  different  from
+           For example, the Solaris xpg4 (X/Open) curses declares attr_t to be
+           an  unsigned  short  integer  (16-bits), while chtype is a unsigned
+           integer (32-bits).  The WA_ symbols in this case are different from
            the  A_  symbols because they are used for a smaller datatype which
            does not represent A_CHARTEXT or A_COLOR.
 
            In this implementation (as in many others), the values happen to be
-           the  same  because it simplifies copying information between chtype
-           and cchar_t variables.
+           the  same  because it simplifies copying information between chtype
+           and cchar_t variables.
 
-       o   Because ncurses's attr_t can hold a  color  pair  (in  the  A_COLOR
+       o   Because ncurses's attr_t can hold a  color  pair  (in  the  A_COLOR
            field),  a  call to wattr_on, wattr_off, or wattr_set may alter the
-           window's color.  If the color pair information in the attribute pa-
-           rameter is zero, no change is made to the window's color.
+           window's color.  If the color pair  information  in  the  attribute
+           parameter is zero, no change is made to the window's color.
 
-           This is consistent with SVr4 curses; X/Open Curses does not specify
+           This is consistent with SVr4 curses; X/Open Curses does not specify
            this.
 
-       The XSI standard extended conformance level adds new highlights A_HORI-
-       ZONTAL,  A_LEFT,  A_LOW,  A_RIGHT, A_TOP, A_VERTICAL (and corresponding
-       WA_ macros for each).  As of August 2013, no  known  terminal  provides
-       these highlights (i.e., via the sgr1 capability).
+       The X/Open  Curses  extended  conformance  level  adds  new  highlights
+       A_HORIZONTAL,   A_LEFT,   A_LOW,   A_RIGHT,   A_TOP,   A_VERTICAL  (and
+       corresponding WA_ macros for  each).   As  of  August  2013,  no  known
+       terminal provides these highlights (i.e., via the sgr1 capability).
 
 
-

          RETURN VALUE

          -       All routines return the integer OK on success, or ERR on failure.
+

          HISTORY

          +       4BSD  (1980) used a char to represent each cell of the terminal screen.
+       It assumed 7-bit character codes, employing the eighth bit of a byte to
+       represent  a  standout  attribute  (often  implemented  as  bold and/or
+       reverse video).   It  introduced  standout,  standend,  wstandout,  and
+       wstandend   functions   to   manipulate   this   bit.    Despite  their
+       inflexibility, they carried over into System V  curses  and  ultimately
+       X/Open Curses due to their pervasive use in legacy applications.  While
+       some 1980s terminals supported  a  variety  of  video  attributes,  BSD
+       curses could do nothing with them.
+
+       SVr2  (1984) provided an improved curses library, introducing chtype to
+       create the abstract notion of a curses character; this was  by  default
+       an  unsigned  short,  with a provision for compile-time redefinition to
+       other integral types (a freedom not necessarily available to  users  of
+       shared  libraries,  and  in any event a source license was necessary to
+       exercise  it).   It  added  the  functions  attron,  attroff,  attrset,
+       wattron, wattroff, and wattrset, and defined the A_ macros listed above
+       (except for A_ITALIC and A_COLOR) for use by applications to manipulate
+       other  attributes.  The values of these macros were not necessarily the
+       same in different systems, even among those certified as System V.
+
+       SVr3.2 (1988) added the A_COLOR macro along with a  color  system;  see
+       curs_color(3x).
+
+       X/Open  Curses  Issue 4  (1995)  is  largely  based on SVr4 curses, but
+       recognized that the wchar_t type of ISO C95 was intended to house  only
+       a  single character code, not a sequence of codes combining with a base
+       character, let alone could it reliably offer  room  for  a  color  pair
+       identifier  and  a  set  of attribute bits with a potential for further
+       growth -- thus the standard invented the curses complex character  type
+       cchar_t  and a separate type attr_t for storage of attribute bits.  The
+       new types brought along several new functions to manipulate them,  some
+       corresponding  to  existing  chtype-based functions (attr_on, attr_off,
+       attr_set, wattr_on, wattr_off, and wattr_set), and some new (chgat  and
+       its variants, color_set, and wcolor_set).
+
+       Different  Unix systems used differently sized bit fields in chtype for
+       the character code and the color pair identifier, and took into account
+       platforms' different integer sizes (32- versus 64-bit).
+
+       The  following  table  showing  the  number  of  bits  for  A_COLOR and
+       A_CHARTEXT was  gleaned  from  the  curses  header  files  for  various
+       operating  systems  and  architectures.   The inferred architecture and
+       notes reflect the format and size of the defined constants as  well  as
+       clues  such  as  the  alternate character set implementation.  A 32-bit
+       library can be used  on  a  64-bit  system,  but  not  necessarily  the
+       converse.
+
+                                     Bits
+       Year  System        Arch   Color  Char  Notes
+       ------------------------------------------------------------------------
+       1992  Solaris 5.2   32     6      17    SVr4 curses
+       1992  HP-UX 9       32     no     8     SVr2 curses
+       1992  AIX 3.2       32     no     23    SVr2 curses
+       1994  OSF/1 r3      32     no     23    SVr2 curses
+       1995  HP-UX 10.00   32     6      16    SVr3 curses_colr
+       1995  HP-UX 10.00   32     6      8     SVr4, X/Open curses
+       1995  Solaris 5.4   32/64  7      16    X/Open curses
+       1996  AIX 4.2       32     7      16    X/Open curses
+       1996  OSF/1 r4      32     6      16    X/Open curses
+       1997  HP-UX 11.00   32     6      8     X/Open curses
+       2000  UWIN          32/64  7/31   16    uses chtype
 
-       X/Open does not define any error conditions.
+       Notes:
 
-       This implementation
+          Regarding HP-UX,
 
-       o   returns an error if the window pointer is null.
+          o   HP-UX  10.20  (1996) added support for 64-bit PA-RISC processors
+              in 1996.
 
-       o   returns an error if the color pair parameter for wcolor_set is out-
-           side the range 0..COLOR_PAIRS-1.
+          o   HP-UX 10.30 (1997) marked "curses_colr" obsolete.  That  version
+              of curses was dropped with HP-UX 11.30 in 2006.
 
-       o   does not return an error if either of the parameters  of  wattr_get
-           used for retrieving attribute or color-pair values is NULL.
+          Regarding OSF/1 (and Tru64),
 
-       Functions  with  a  "mv"  prefix  first perform a cursor movement using
-       wmove, and return an error if the position is outside the window, or if
-       the window pointer is null.
+          o   These  used  64-bit  hardware.   Like  ncurses, the OSF/1 curses
+              interface is not customized for 32-bit and 64-bit versions.
+
+          o   Unlike  other  systems  which  evolved  from  AT&T  code,  OSF/1
+              provided a new implementation for X/Open Curses.
+
+          Regarding Solaris,
+
+          o   The initial release of Solaris was in 1992.
+
+          o   Its   XPG4   (X/Open   Curses-conforming)  xcurses  library  was
+              developed by Mortice Kern Systems  from  1990  to  1995.   Sun's
+              copyright began in 1996.
+
+          o   Sun updated the X/Open Curses interface after 64-bit support was
+              introduced  in  1997,  but  did  not  modify  the  SVr4   curses
+              interface.
+
+          Regarding UWIN,
+
+          o   Development  of  the  curses  library  began in 1991, stopped in
+              2000.
+
+          o   Color support was added in 1998.
+
+          o   The library uses only chtype (not cchar_t).
+
+       Once X/Open Curses was adopted in the mid-1990s, the  constraint  of  a
+       32-bit interface with many colors and wide-characters for chtype became
+       a moot point.  The cchar_t structure (whose size and  members  are  not
+       specified in X/Open Curses) could be extended as needed.
+
+       Other interfaces are rarely used now.
+
+       o   BSD  curses was improved slightly in 1993/1994 using Keith Bostic's
+           modification to make the library 8-bit clean for nvi(1).  He  moved
+           the standout attribute to a structure member.  The resulting 4.4BSD
+           curses was replaced by ncurses over the next ten years.
+
+       o   UWIN has been defunct since 2012.
+
+       ncurses 6.0 (2015) added the A_ITALIC macro.

          SEE ALSO

          -       curses(3x), curs_addch(3x), curs_addstr(3x), curs_bkgd(3x),
+       curses(3x),     curs_addch(3x),     curs_addstr(3x),     curs_bkgd(3x),
        curs_printw(3x), curs_variables(3x)
 
 
 
-                                                                 curs_attr(3x)
+ncurses 6.5                       2025-02-15                     curs_attr(3x)
          diff --git a/doc/html/man/curs_beep.3x.html b/doc/html/man/curs_beep.3x.html index 0db95efa..51ab3640 100644 --- a/doc/html/man/curs_beep.3x.html +++ b/doc/html/man/curs_beep.3x.html @@ -1,6 +1,6 @@ -curs_beep 3x +curs_beep 3x 2025-02-01 ncurses 6.5 Library calls -

          curs_beep 3x

          +

          curs_beep 3x 2025-02-01 ncurses 6.5 Library calls

          -curs_beep(3x)                                                    curs_beep(3x)
+curs_beep(3x)                    Library calls                   curs_beep(3x)

          NAME

          -       beep, flash - curses bell and screen flash routines
+       beep, flash - ring the (visual) bell of the terminal with curses

          SYNOPSIS

          @@ -58,35 +58,47 @@ 
          curs_beep 3x

          DESCRIPTION

          -       The  beep  and flash routines are used to alert the terminal user.  The
-       routine beep sounds an audible alarm  on  the  terminal,  if  possible;
-       otherwise  it  flashes  the  screen  (visible bell).  The routine flash
-       flashes the screen, and if that is not possible, sounds the alert.   If
-       neither  alert is possible, nothing happens.  Nearly all terminals have
-       an audible alert (bell or beep), but only some can flash the screen.
+       beep  and  flash  alert  the  terminal user: the former by sounding the
+       terminal's  audible  alarm,  and  the  latter  by  visibly   attracting
+       attention.    Commonly,   a   terminal  implements  a  visual  bell  by
+       momentarily reversing the character foreground and background colors on
+       the  entire  display;  even  a  monochrome  device  can do this.  These
+       functions each attempt the other alert type if  the  one  requested  is
+       unavailable.   If  neither  is  available,  curses  performs no action.
+       Nearly all terminals have an audible alert mechanism such as a bell  or
+       piezoelectric buzzer, but only some can flash the screen.

          RETURN VALUE

          -       These routines return OK if they succeed in beeping  or  flashing,  ERR
-       otherwise.
+       These functions return OK on success and ERR on failure.
+
+       In  ncurses, beep and flash return OK if the terminal type supports the
+       corresponding capability: bell (bel) for beep and flash_screen  (flash)
+       for flash.  Otherwise they return ERR.

          EXTENSIONS

          -       SVr4's  beep  and  flash  routines  always  returned  OK, so it was not
-       possible to tell when the beep or flash failed.
+       In ncurses, these functions can return ERR.

          PORTABILITY

          -       These functions are described in the  XSI  Curses  standard,  Issue  4.
-       Like SVr4, it specifies that they always return OK.
+       X/Open Curses Issue 4 describes these functions.  It specifies no error
+       conditions for them.
+
+       On SVr4 curses, they always return OK, and X/Open Curses specifies them
+       as doing so.
+
+
+

          HISTORY

          +       SVr2 (1984) introduced beep and flash.

          SEE ALSO

          -       curses(3x)
+       curses(3x), terminfo(5)
 
 
 
-                                                                 curs_beep(3x)
+ncurses 6.5                       2025-02-01                     curs_beep(3x)
          diff --git a/doc/html/man/curs_bkgd.3x.html b/doc/html/man/curs_bkgd.3x.html index d4a6a1d4..7bd389f5 100644 --- a/doc/html/man/curs_bkgd.3x.html +++ b/doc/html/man/curs_bkgd.3x.html @@ -1,6 +1,6 @@ -curs_bkgd 3x +curs_bkgd 3x 2025-01-18 ncurses 6.5 Library calls -

          curs_bkgd 3x

          +

          curs_bkgd 3x 2025-01-18 ncurses 6.5 Library calls

          -curs_bkgd(3x)                                                    curs_bkgd(3x)
+curs_bkgd(3x)                    Library calls                   curs_bkgd(3x)

          NAME

          -       bkgdset,  wbkgdset,  bkgd,  wbkgd,  getbkgd  - curses window background
-       manipulation routines
+       bkgdset,  wbkgdset,  bkgd,  wbkgd, getbkgd - manipulate background of a
+       curses window of characters

          SYNOPSIS

                  #include <curses.h>
 
-       void bkgdset(chtype ch);
-       void wbkgdset(WINDOW *win, chtype ch);
-
        int bkgd(chtype ch);
        int wbkgd(WINDOW *win, chtype ch);
 
+       void bkgdset(chtype ch);
+       void wbkgdset(WINDOW *win, chtype ch);
+
        chtype getbkgd(WINDOW *win);

          DESCRIPTION

          +       Every curses  window  has  a  background  character  property:  in  the
+       library's  non-wide  configuration,  it  is a curses character (chtype)
+       that combines a set of attributes (and, if colors are enabled, a  color
+       pair  identifier)  with  a  character  code.  When erasing (parts of) a
+       window, curses replaces the erased cells with the background character.
 
-

          bkgdset

          -       The bkgdset and wbkgdset routines set the background for a  window.   A
-       window's  background  is  a  chtype  consisting  of  any combination of
-       attributes (i.e., rendition) and a character:
-
-       o   The attribute part of the background is combined (OR'ed)  with  all
-           non-blank characters that are written into the window with waddch.
+       curses also uses the background character when writing characters to  a
+       populated window.
 
-       o   Both  the  character  and  attribute  parts  of  the background are
-           combined with blank characters that are written into the window.
+       o   The  attribute  part  of the background character combines with all
+           non-blank character cells  in  the  window,  as  populated  by  the
+           waddch(3x)  and  winsch(3x)  families  of functions (and those that
+           call them).
 
-       The background becomes a property of each character and moves with  the
-       character   through  any  scrolling  and  insert/delete  line/character
-       operations.
+       o   Both the character code and attributes of the background  character
+           combine with blank character cells in the window.
 
-       To the extent possible on a particular terminal, the attribute part  of
-       the  background  is displayed as the graphic rendition of the character
-       put on the screen.
+       The  background character's set of attributes becomes a property of the
+       character cell and move with it through any scrolling and insert/delete
+       line/character  operations.   To  the  extent  possible on the terminal
+       type, curses displays the attributes of the background character as the
+       graphic rendition of a character cell on the display.
 
 
-

          bkgd

          -       The bkgd and wbkgd functions set the background property of the current
-       or  specified  window  and  then  apply this setting to every character
-       position in that window.  According to  X/Open  Curses,  it  should  do
-       this:
+

          bkgd, wbkgd

          +       bkgd  and  wbkgd set the background property of stdscr or the specified
+       window and then apply this setting to  every  character  cell  in  that
+       window.
 
-       o   The  rendition  of  every character on the screen is changed to the
-           new background rendition.
+       o   The  rendition  of every character in the window changes to the new
+           background rendition.
 
-       o   Wherever the former background character appears, it is changed  to
-           the new background character.
-
-       Neither  X/Open Curses nor the SVr4 manual pages give details about the
-       way the rendition of characters on the screen is updated when  bkgd  or
-       wbkgd is used to change the background character.
-
-       This  implementation,  like  SVr4 curses, does not store the background
-       and window attribute contributions to each cell separately.  It updates
-       the  rendition  by  comparing  the  character, non-color attributes and
-       colors contained in the background.   For  each  cell  in  the  window,
-       whether or not it is blank:
-
-       o   The  library  first  compares  the character, and if it matches the
-           current character part of the background, it replaces that with the
+       o   Wherever the former background character appears, it changes to the
            new background character.
 
-           When bkgdset is used to set the background character, that does not
-           update each cell in the window.  A subsequent  call  to  bkgd  will
-           only  modify  the  character  in  cells  which  match  the  current
-           background character.
+       ncurses  updates  the rendition of each character cell by comparing the
+       character, non-color attributes, and color pair selection.  The library
+       applies  the following procedure to each cell in the window, whether or
+       not it is blank.
 
-       o   The library then checks if the cell uses  color,  i.e.,  its  color
+       o   ncurses first compares  the  cell's  character  to  the  previously
+           specified  background  character; if they match, ncurses writes the
+           new background character to the cell.
+
+       o   ncurses then checks whether the cell uses color; that is, its color
            pair  value  is nonzero.  If not, it simply replaces the attributes
            and color pair in the cell  with  those  from  the  new  background
            character.
 
-       o   If  the  cell uses color, and that matches the color in the current
-           background, the library removes attributes which may have come from
-           the current background and adds attributes from the new background.
-           It finishes by setting the cell to  use  the  color  from  the  new
-           background.
+       o   If  the  cell  uses color, and its background color matches that of
+           the current window background, ncurses removes attributes that  may
+           have  come  from the current background and adds those from the new
+           background.  It finishes by setting the cell's  background  to  use
+           the new window background color.
 
-       o   If  the  cell  uses color, and that does not match the color in the
-           current  background,  the  library  updates  only   the   non-color
-           attributes,  first  removing  those  which  may  have come from the
-           current  background,  and  then  adding  attributes  from  the  new
+       o   If  the  cell  uses  color, and its background color does not match
+           that of the current window background,  ncurses  updates  only  the
+           non-color  attributes, first removing those that may have come from
+           the current background, and then adding  attributes  from  the  new
            background.
 
-       If the background's character value is zero (0), a space is assumed.
+       If the new background's character is non-spacing (for example, if it is
+       a  control  character),  ncurses  retains   the   existing   background
+       character,  except  for  one  special case: ncurses treats a background
+       character code of zero (0) as a space.
 
-       If  the  terminal  does  not  support  color,  or if color has not been
-       started  with  start_color,  the  new  background   character's   color
-       attribute will be ignored.
+       If the terminal does not support  color,  or  if  color  has  not  been
+       initialized  with  start_color(3x),  ncurses ignores the new background
+       character's color pair selection.
+
+
+

          bkgdset, wbkgdset

          +       bkgdset and  wbkgdset  manipulate  the  background  of  the  applicable
+       window, without updating the character cells as bkgd and wbkgd do; only
+       future writes reflect the updated background.

          getbkgd

          -       The  getbkgd  function  returns  the  given window's current background
-       character/attribute pair.
+       getbkgd returns the given window's  background  character,  attributes,
+       and color pair as a chtype.

          RETURN VALUE

          -       These functions are described in the XSI Curses standard, Issue 4.   It
-       specifies  that  bkgd  and  wbkgd  return  ERR on failure, but gives no
-       failure conditions.
+       bkgdset and wbkgdset do not return a value.
+
+       Functions returning an int return ERR upon failure and OK upon success.
+       In ncurses, failure occurs if
 
-       The routines bkgd and wbkgd return the integer OK, unless  the  library
-       has not been initialized.
+       o   the curses screen has not been initialized, or
 
-       In  contrast, the SVr4.0 manual says bkgd and wbkgd may return OK "or a
-       non-negative integer if immedok is set", which  refers  to  the  return
-       value  from wrefresh (used to implement the immediate repainting).  The
-       SVr4 curses wrefresh returns the number of characters  written  to  the
-       screen during the refresh.  This implementation does not do that.
+       o   win is NULL.
+
+       getbkgd's return value is as described above.

          NOTES

          -       Note that bkgdset and bkgd may be macros.
+       Unusually, there is no wgetbkgd function; getbkgd behaves as one  would
+       expect wgetbkgd to, accepting a WINDOW pointer argument.
+
+       bkgd and bkgdset may be implemented as macros.
 
        X/Open  Curses  mentions that the character part of the background must
-       be a single-byte value.  This  implementation,  like  SVr4,  checks  to
-       ensure  that,  and will reuse the old background character if the check
+       be a single-byte value.  ncurses, like SVr4 curses,  checks  to  ensure
+       that  it is, and retains the existing background character if the check
        fails.

          PORTABILITY

          -       These functions are described in  the  XSI  Curses  standard,  Issue  4
-       (X/Open Curses).
+       X/Open Curses Issue 4 describes these  functions.   It  indicates  that
+       bkgd,  wbkgd,  and  getbkgd  return  ERR on failure (in the case of the
+       last, this value is cast to chtype), but specifies no error  conditions
+       for them.
+
+       SVr4  documentation  says  that  bkgd  and  wbkgd  return OK "or a non-
+       negative integer if immedok() is set", referring to  the  return  value
+       from  wrefresh,  which in SVr4 returns a count of characters written to
+       the window if its immedok property is set; in ncurses, it does not.
+
+       Neither X/Open  Curses  nor  the  SVr4  manual  pages  detail  how  the
+       rendition  of  characters  in  the  window  updates  when bkgd or wbkgd
+       changes the background character.  ncurses, like SVr4 curses, does  not
+       (in  its  non-wide  configuration)  store  the  background  and  window
+       attribute contributions to each character cell separately.
+
+
+

          HISTORY

          +       SVr3.1 (1987) introduced these functions.

          SEE ALSO

          -       curses(3x), curs_addch(3x), curs_attr(3x), curs_outopts(3x)
+       curs_bkgrnd(3x) describes  the  corresponding  functions  in  the  wide
+       configuration of ncurses.
+
+       curses(3x), curs_addch(3x), curs_attr(3x)
 
 
 
-                                                                 curs_bkgd(3x)
+ncurses 6.5                       2025-01-18                     curs_bkgd(3x)
          diff --git a/doc/html/man/curs_bkgrnd.3x.html b/doc/html/man/curs_bkgrnd.3x.html index 87b126cb..7a1496ba 100644 --- a/doc/html/man/curs_bkgrnd.3x.html +++ b/doc/html/man/curs_bkgrnd.3x.html @@ -1,6 +1,6 @@ -curs_bkgrnd 3x +curs_bkgrnd 3x 2025-02-15 ncurses 6.5 Library calls -

          curs_bkgrnd 3x

          +

          curs_bkgrnd 3x 2025-02-15 ncurses 6.5 Library calls

          -curs_bkgrnd(3x)                                                curs_bkgrnd(3x)
+curs_bkgrnd(3x)                  Library calls                 curs_bkgrnd(3x)

          NAME

          -       bkgrnd,  wbkgrnd, bkgrndset, wbkgrndset, getbkgrnd, wgetbkgrnd - curses
-       window complex background manipulation routines
+       bkgrnd,   wbkgrnd,   bkgrndset,  wbkgrndset,  getbkgrnd,  wgetbkgrnd  -
+       manipulate background of a curses window of wide characters

          SYNOPSIS

                  #include <curses.h>
 
-       int bkgrnd( const cchar_t *wch);
-       int wbkgrnd( WINDOW *win, const cchar_t *wch);
+       int bkgrnd(const cchar_t *wch);
+       int wbkgrnd(WINDOW *win, const cchar_t *wch);
 
-       void bkgrndset(const cchar_t *wch );
+       void bkgrndset(const cchar_t *wch);
        void wbkgrndset(WINDOW *win, const cchar_t *wch);
 
        int getbkgrnd(cchar_t *wch);
@@ -65,75 +65,132 @@ 
          curs_bkgrnd 3x

          DESCRIPTION

          +       Every curses  window  has  a  background  character  property:  in  the
+       library's   wide  configuration,  it  is  a  curses  complex  character
+       (cchar_t) that combines  a  set  of  attributes  (and,  if  colors  are
+       enabled,  a color pair identifier) with a character code.  When erasing
+       (parts of)  a  window,  curses  replaces  the  erased  cells  with  the
+       background character.
 
-

          bkgrndset

          -       The bkgrndset and wbkgrndset routines manipulate the background of  the
-       named  window.   The  window  background is a cchar_t consisting of any
-       combination of attributes (i.e., rendition) and a complex character.
+       curses  also uses the background character when writing characters to a
+       populated window.
 
-       o   The attribute part of the background is combined (OR'ed)  with  all
-           non-blank characters that are written into the window with waddch.
+       o   The attribute part of the background character  combines  with  all
+           non-blank  character  cells  in  the  window,  as  populated by the
+           wadd_wch(3x) and wins_wch(3x) families of functions (and those that
+           call them).
 
-       o   Both  the  character  and  attribute  parts  of  the background are
-           combined with the blank characters.
+       o   Both  the character code and attributes of the background character
+           combine with blank character cells in the window.
 
-       The background becomes a property of the character and moves  with  the
-       character   through  any  scrolling  and  insert/delete  line/character
-       operations.
+       The background character's set of attributes becomes a property of  the
+       character cell and move with it through any scrolling and insert/delete
+       line/character operations.  To the  extent  possible  on  the  terminal
+       type, curses displays the attributes of the background character as the
+       graphic rendition of a character cell on the display.
 
-       To the extent possible on a particular terminal, the attribute part  of
-       the  background  is displayed as the graphic rendition of the character
-       put on the screen.
 
+

          bkgrnd, wbkgrnd

          +       bkgrnd and wbkgrnd  set  the  background  property  of  stdscr  or  the
+       specified window and then apply this setting to every character cell in
+       that window.
 
-

          bkgrnd

          -       The bkgrnd and wbkgrnd functions set the  background  property  of  the
-       current  or  specified  window  and  then  apply  this setting to every
-       character position in that window:
+       o   The rendition of every character in the window changes to  the  new
+           background rendition.
 
-       o   The rendition of every character on the screen is  changed  to  the
-           new background rendition.
+       o   Wherever the former background character appears, it changes to the
+           new background character.
 
-       o   Wherever  the former background character appears, it is changed to
-           the new background character.
+       ncurses updates the rendition of each character cell by  comparing  the
+       character, non-color attributes, and color pair selection.  The library
+       applies to following procedure to each cell in the window,  whether  or
+       not it is blank.
 
+       o   ncurses  first  compares  the  cell's  character  to the previously
+           specified background character; if they match, ncurses  writes  the
+           new background character to the cell.
 
-

          getbkgrnd

          -       The getbkgrnd function returns the given  window's  current  background
-       character/attribute  pair  via  the  wch  pointer.  If the given window
-       pointer is null, the character is not updated (but no error returned).
+       o   ncurses then checks whether the cell uses color; that is, its color
+           pair value is nonzero.  If not, it simply replaces  the  attributes
+           and  color  pair  in  the  cell  with those from the new background
+           character.
 
+       o   If the cell uses color, and its background color  matches  that  of
+           the  current window background, ncurses removes attributes that may
+           have come from the current background and adds those from  the  new
+           background.   It  finishes  by setting the cell's background to use
+           the new window background color.
 
-

          NOTES

          -       Note that bkgrnd, bkgrndset, and getbkgrnd may be macros.
+       o   If the cell uses color, and its background  color  does  not  match
+           that  of  the  current  window background, ncurses updates only the
+           non-color attributes, first removing those that may have come  from
+           the  current  background,  and  then adding attributes from the new
+           background.
+
+       If the new background's character is non-spacing,  ncurses  reuses  the
+       old background character, except for one special case: ncurses treats a
+       background character code of zero (0) as a space.
+
+       If the terminal does not support  color,  or  if  color  has  not  been
+       initialized  with  start_color(3x),  ncurses ignores the new background
+       character's color pair selection.
+
+
+

          bkgrndset, wbkgrndset

          +       bkgrndset and wbkgrndset manipulate the background  of  the  applicable
+       window,  without updating the character cells as bkgrnd and wbkgrnd do;
+       only future writes reflect the updated background.
 
-       X/Open Curses does not provide details on how the rendition is changed.
-       This  implementation follows the approach used in SVr4 curses, which is
-       explained in the manual page for wbkgd.
+
+

          getbkgrnd, wgetbkgrnd

          +       getbkgrnd and wgetbkgrnd respectively  obtain  stdscr's  or  the  given
+       window's background character, attributes, and color pair, and store it
+       in their wch argument.

          RETURN VALUE

          -       The bkgrndset and wbkgrndset routines do not return a value.
+       bkgrndset and wbkgrndset do not return a value.
+
+       Functions returning an int return ERR upon failure and OK upon success.
+       In ncurses, failure occurs if
 
-       Upon successful completion, the other functions return OK.   Otherwise,
-       they return ERR:
+       o   the curses screen has not been initialized,
 
-       o   A null window pointer is treated as an error.
+       o   win is NULL, or
 
-       o   A null character pointer is treated as an error.
+       o   wch is NULL.
+
+
+

          NOTES

          +       bkgrnd, bkgrndset, and getbkgrnd may be implemented as macros.
+
+       Unlike  their  counterparts  in  the non-wide configuration of ncurses,
+       getbkgrnd and wgetbkgrnd store the background character in a modifiable
+       cchar_t parameter, rather than supplying it as the return value.

          PORTABILITY

          -       These  functions  are  described  in  the  XSI Curses standard, Issue 4
-       (X/Open Curses).
+       X/Open Curses Issue 4 describes these functions.  It specifies no error
+       conditions for them.
+
+       X/Open Curses does not provide details of how the rendition is updated.
+       ncurses  follows  the approach used in SVr4 curses's non-wide functions
+       for manipulating the window background.
+
+
+

          HISTORY

          +       X/Open Curses Issue 4 (1995) initially specified these functions.

          SEE ALSO

          -       curses(3x), curs_bkgd(3x)
+       curs_bkgd(3x) describes the corresponding  functions  in  the  non-wide
+       configuration of ncurses.
+
+       curses(3x), curs_add_wch(3x), curs_attr(3x)
 
 
 
-                                                               curs_bkgrnd(3x)
+ncurses 6.5                       2025-02-15                   curs_bkgrnd(3x)
          diff --git a/doc/html/man/curs_border.3x.html b/doc/html/man/curs_border.3x.html index abb2a4e6..28684f55 100644 --- a/doc/html/man/curs_border.3x.html +++ b/doc/html/man/curs_border.3x.html @@ -1,6 +1,6 @@ -curs_border 3x +curs_border 3x 2025-02-01 ncurses 6.5 Library calls -

          curs_border 3x

          +

          curs_border 3x 2025-02-01 ncurses 6.5 Library calls

          -curs_border(3x)                                                curs_border(3x)
+curs_border(3x)                  Library calls                 curs_border(3x)

          NAME

          -       border, wborder, box, hline, whline, vline, wvline, mvhline, mvwhline,
-       mvvline, mvwvline - create curses borders, horizontal and vertical
-       lines
+       border,  wborder, box, hline, whline, vline, wvline, mvhline, mvwhline,
+       mvvline, mvwvline - draw borders  and  lines  in  a  curses  window  of
+       characters

          SYNOPSIS

                  #include <curses.h>
 
        int border(chtype ls, chtype rs, chtype ts, chtype bs,
-                  chtype tl, chtype tr, chtype bl, chtype br);
+             chtype tl, chtype tr, chtype bl, chtype br);
        int wborder(WINDOW *win, chtype ls, chtype rs,
-                   chtype ts, chtype bs, chtype tl, chtype tr,
-                   chtype bl, chtype br);
+             chtype ts, chtype bs, chtype tl, chtype tr,
+             chtype bl, chtype br);
 
        int box(WINDOW *win, chtype verch, chtype horch);
 
        int hline(chtype ch, int n);
        int whline(WINDOW *win, chtype ch, int n);
-       int vline(chtype ch, int n);
-       int wvline(WINDOW *win, chtype ch, int n);
-
        int mvhline(int y, int x, chtype ch, int n);
        int mvwhline(WINDOW *win, int y, int x, chtype ch, int n);
+
+       int vline(chtype ch, int n);
+       int wvline(WINDOW *win, chtype ch, int n);
        int mvvline(int y, int x, chtype ch, int n);
        int mvwvline(WINDOW *win, int y, int x, chtype ch, int n);

          DESCRIPTION

          -       The  border,  wborder and box routines draw a box around the edges of a
-       window.  Other than the window, each argument is a character  with  at-
-       tributes:
-
+       wborder  and  border draw a box at the edges of the specified window or
+       stdscr, respectively.  Each chtype argument corresponds to a  geometric
+       component of the border as follows:
               ls - left side,
               rs - right side,
               ts - top side,
@@ -88,63 +87,78 @@ 
          curs_border 3x
          
               bl - bottom left-hand corner, and
               br - bottom right-hand corner.
 
-       If  any of these arguments is zero, then the corresponding default val-
-       ues (defined in curses.h) are used instead:
-
+       If  any chtype argument is 0, then curses uses forms-drawing characters
+       (see addch(3x)) in the following correspondence:
               ACS_VLINE,
               ACS_VLINE,
               ACS_HLINE,
               ACS_HLINE,
               ACS_ULCORNER,
               ACS_URCORNER,
-              ACS_LLCORNER,
+              ACS_LLCORNER, and
               ACS_LRCORNER.
 
-       box(win, verch, horch) is a shorthand for  the  following  call:  wbor-
-       der(win, verch, verch, horch, horch, 0, 0, 0, 0).
-
-       The  hline  and whline functions draw a horizontal (left to right) line
-       using ch starting at the current cursor position in  the  window.   The
-       current  cursor position is not changed.  The line is at most n charac-
-       ters long, or as many as fit into the window.
+       box(win, verch, horch) is shorthand for "wborder(win, verch, horch,  0,
+       0, 0, 0)".
 
-       The vline and wvline functions draw a vertical (top to bottom) line us-
-       ing ch starting at the current cursor position in the window.  The cur-
-       rent cursor position is not changed.  The line is at most n  characters
-       long, or as many as fit into the window.
+       whline  draws  a horizontal line of ch from left to right, and wvline a
+       vertical one from top to bottom, stopping once n characters  have  been
+       drawn  or  upon  reaching  the boundary of win.  These functions do not
+       update the cursor position (beyond any motion directed  by  their  "mv"
+       variants).  ncurses(3x) describes the variants of these functions.

          RETURN VALUE

          -       All  routines return the integer OK.  The SVr4.0 manual says "or a non-
-       negative integer if immedok is set", but this appears to be an error.
+       These functions return OK on success and ERR on failure.
 
-       X/Open does not define any error conditions.  This  implementation  re-
-       turns an error if the window pointer is null.
+       In ncurses,
 
-       Functions  with  a  "mv"  prefix  first perform a cursor movement using
-       wmove, and return an error if the position is outside the window, or if
-       the window pointer is null.
+       o   these functions fail if the screen is not initialized; and
+
+       o   functions  taking  a  WINDOW pointer argument fail if win is a null
+           pointer.
+
+       Functions prefixed with "mv" first perform cursor movement and fail  if
+       the position (y, x) is outside the window boundaries.

          NOTES

          -       The  borders  generated  by these functions are inside borders (this is
-       also true of SVr4 curses, though the fact is not documented).
+       Unusually,  there  is no wbox function; box behaves as one would expect
+       wbox to, accepting a WINDOW pointer argument.
 
-       Note that border and box may be macros.
+       border, box, hline, mvhline, mvwhline, vline, mvvline, and mvwvline may
+       be implemented as macros.
+
+       Borders drawn by these functions are interior borders.

          PORTABILITY

          -       These functions are described in the XSI Curses standard, Issue 4.  The
-       standard  specifies  that  they return ERR on failure, but specifies no
-       error conditions.
+       These  functions  are described in X/Open Curses Issue 4.  It specifies
+       no error conditions for them.
+
+       SVr4 documentation says that these  functions  return  OK  "or  a  non-
+       negative  integer  if  immedok() is set", referring to the return value
+       from wrefresh, which in SVr4 returns a count of characters  written  to
+       the window if its immedok property is set; in ncurses, it does not.
+
+       BSD curses drew boxes with horch in every character cell of the top and
+       bottom lines of the window, whereas SVr3.1 and  later  curses,  because
+       its box wrapped wborder, used the default corner characters.
+
+
+

          HISTORY

          +       4BSD (1980) introduced box, defining it as a function.
+
+       SVr3.1  (1987)  added  whline and wvline and their variants, as well as
+       border and wborder, redefining box as a macro wrapping the latter.

          SEE ALSO

          -       curses(3x), curs_outopts(3x).
+       curses(3x), curs_outopts(3x)
 
 
 
-                                                               curs_border(3x)
+ncurses 6.5                       2025-02-01                   curs_border(3x)
          diff --git a/doc/html/man/curs_border_set.3x.html b/doc/html/man/curs_border_set.3x.html index 589342ae..393817ce 100644 --- a/doc/html/man/curs_border_set.3x.html +++ b/doc/html/man/curs_border_set.3x.html @@ -1,6 +1,6 @@ -curs_border_set 3x +curs_border_set 3x 2025-02-01 ncurses 6.5 Library calls -

          curs_border_set 3x

          +

          curs_border_set 3x 2025-02-01 ncurses 6.5 Library calls

          -curs_border_set(3x)                                        curs_border_set(3x)
+curs_border_set(3x)              Library calls             curs_border_set(3x)

          NAME

          -       border_set, wborder_set, box_set, hline_set, whline_set, mvhline_set,
-       mvwhline_set, vline_set, wvline_set, mvvline_set, mvwvline_set - create
-       curses borders or lines using complex characters and renditions
+       border_set,  wborder_set,  box_set, hline_set, whline_set, mvhline_set,
+       mvwhline_set, vline_set, wvline_set, mvvline_set, mvwvline_set  -  draw
+       borders and lines in a curses window of wide characters

          SYNOPSIS

                  #include <curses.h>
 
-       int border_set(
-          const cchar_t *ls, const cchar_t *rs,
-          const cchar_t *ts, const cchar_t *bs,
-          const cchar_t *tl, const cchar_t *tr,
-          const cchar_t *bl, const cchar_t *br );
-       int wborder_set(
-          WINDOW *win,
-          const cchar_t *ls, const cchar_t *rs,
-          const cchar_t *ts, const cchar_t *bs,
-          const cchar_t *tl, const cchar_t *tr,
-          const cchar_t *bl, const cchar_t *br);
-       int box_set(
-          WINDOW *win,
-          const cchar_t *verch,
-          const cchar_t *horch);
-       int hline_set(
-          const cchar_t *wch, int n);
-       int whline_set(
-          WINDOW *win,
-          const cchar_t *wch, int n);
-       int mvhline_set(
-          int y, int x,
-          const cchar_t *wch, int n);
-       int mvwhline_set(
-          WINDOW *win,
-          int y, int x,
-          const cchar_t *wch, int n);
-       int vline_set(
-          const cchar_t *wch, int n);
-       int wvline_set(
-          WINDOW *win,
-          const cchar_t *wch, int n);
-       int mvvline_set(
-          int y, int x,
-          const cchar_t *wch, int n);
-       int mvwvline_set(
-          WINDOW *win,
-          int y, int x,
-          const cchar_t *wch, int n);
+       int border_set(const cchar_t *ls, const cchar_t *rs,
+             const cchar_t *ts, const cchar_t *bs,
+             const cchar_t *tl, const cchar_t *tr,
+             const cchar_t *bl, const cchar_t *br);
+       int wborder_set(WINDOW *win,
+             const cchar_t *ls, const cchar_t *rs,
+             const cchar_t *ts, const cchar_t *bs,
+             const cchar_t *tl, const cchar_t *tr,
+             const cchar_t *bl, const cchar_t *br);
+
+       int box_set(WINDOW *win, const cchar_t *verch,
+             const cchar_t *horch);
+
+       int hline_set(const cchar_t *wch, int n);
+       int whline_set(WINDOW *win, const cchar_t *wch, int n);
+       int mvhline_set(int y, int x, const cchar_t *wch,
+             int n);
+       int mvwhline_set(WINDOW *win, int y, int x,
+             const cchar_t *wch, int n);
+
+       int vline_set(const cchar_t *wch, int n);
+       int wvline_set(WINDOW *win, const cchar_t *wch, int n);
+       int mvvline_set(int y, int x, const cchar_t *wch,
+             int n);
+       int mvwvline_set(WINDOW *win, int y, int x,
+             const cchar_t *wch, int n);

          DESCRIPTION

          @@ -101,8 +88,8 @@ 
          curs_border_set 3x
          
        of the current or specified window.  These functions do not change  the
        cursor position, and do not wrap.
 
-       Other  than  the  window, each argument is a complex character with at-
-       tributes:
+       Other  than  the  window,  each  argument  is  a complex character with
+       attributes:
               ls - left side,
               rs - right side,
               ts - top side,
@@ -112,8 +99,8 @@ 
          curs_border_set 3x
          
               bl - bottom left-hand corner, and
               br - bottom right-hand corner.
 
-       If any of these arguments is zero, then the corresponding default  val-
-       ues (defined in curses.h) are used instead:
+       If any of these arguments  is  zero,  then  the  corresponding  default
+       values (defined in curses.h) are used instead:
               WACS_VLINE,
               WACS_VLINE,
               WACS_HLINE,
@@ -140,36 +127,46 @@ 
          curs_border_set 3x
          
        a line proceeding toward the last line of the window.
 
 
-

          NOTES

          -       Note  that  border_set,  hline_set,  mvhline_set,  mvvline_set,   mvwh-
-       line_set, mvwvline_set, and vline_set may be macros.
-
-

          RETURN VALUE

                  Upon successful completion, these functions return OK.  Otherwise, they
        return ERR.
 
-       Functions using a window parameter return an error if it is null.
+       Functions using a window parameter return ERR if it is null.
+
+       Functions  prefixed with "mv" first perform cursor movement and fail if
+       the position (y, x) is outside the window boundaries.
+
+
+

          NOTES

          +       border_set,   hline_set,   mvhline_set,   mvvline_set,    mvwhline_set,
+       mvwvline_set, and vline_set may be implemented as macros.
+
+
+

          PORTABILITY

          +       X/Open Curses Issue 4 describes these functions.  It specifies no error
+       conditions for them.
 
-       Functions with a "mv" prefix first  perform  a  cursor  movement  using
-       wmove, and return an error if the position is outside the window, or if
-       the window pointer is null.
+
+

          HISTORY

          +       X/Open Curses Issue 4 (1995) initially specified these functions.

          SEE ALSO

          -       ncurses(3x), curs_add_wch(3x), curs_border(3x), curs_outopts(3x)
+       curses(3x), curs_add_wch(3x), curs_border(3x), curs_outopts(3x)
 
 
 
-                                                           curs_border_set(3x)
+ncurses 6.5                       2025-02-01               curs_border_set(3x)
          diff --git a/doc/html/man/curs_clear.3x.html b/doc/html/man/curs_clear.3x.html index 5162d278..953fdd7b 100644 --- a/doc/html/man/curs_clear.3x.html +++ b/doc/html/man/curs_clear.3x.html @@ -1,6 +1,6 @@ -curs_clear 3x +curs_clear 3x 2025-01-18 ncurses 6.5 Library calls -

          curs_clear 3x

          +

          curs_clear 3x 2025-01-18 ncurses 6.5 Library calls

          -curs_clear(3x)                                                  curs_clear(3x)
+curs_clear(3x)                   Library calls                  curs_clear(3x)

          NAME

          -       erase, werase, clear, wclear, clrtobot, wclrtobot, clrtoeol, wclrtoeol
-       - clear all or part of a curses window
+       erase,  werase, clear, wclear, clrtobot, wclrtobot, clrtoeol, wclrtoeol
+       - clear all or part of a curses window

          SYNOPSIS

          @@ -69,28 +69,28 @@ 
          curs_clear 3x

          DESCRIPTION

           
-

          erase/werase

          -       The erase and werase routines copy blanks to every position in the win-
-       dow, clearing the screen.
+

          erase, werase

          +       The erase and werase routines copy blanks  to  every  position  in  the
+       window, clearing the screen.
 
        Blanks created by erasure have the current background rendition (as set
        by wbkgdset(3x)) merged into them.
 
 
-

          clear/wclear

          +

          clear, wclear

                  The clear and wclear routines are like erase and werase, but they  also
        call  clearok(3x), so that the screen is cleared completely on the next
        call to wrefresh for that window and repainted from scratch.
 
 
-

          clrtobot/wclrtobot

          +

          clrtobot, wclrtobot

                  The clrtobot and wclrtobot routines erase from the cursor to the end of
        screen.   That is, they erase all lines below the cursor in the window.
        Also, the current line to  the  right  of  the  cursor,  inclusive,  is
        erased.
 
 
-

          clrtoeol/wclrtoeol

          +

          clrtoeol, wclrtoeol

                  The clrtoeol and wclrtoeol routines erase the current line to the right
        of the cursor, inclusive, to the end of the current line.
 
@@ -98,37 +98,35 @@ 
          curs_clear 3x

          RETURN VALUE

                  All routines return the integer OK on success and ERR on failure.
 
-       X/Open defines no error conditions.  In this implementation,
+       In this implementation,
 
-       o   functions using a window pointer parameter return an error if it is
-           null
+       o   functions using a window pointer parameter return ERR if it is null
 
        o   wclrtoeol returns an error if the cursor position is about to wrap.

          NOTES

          -       Note  that  erase, werase, clear, wclear, clrtobot, and clrtoeol may be
-       macros.
+       erase, werase, clear, wclear, clrtobot, and clrtoeol may be implemented
+       as macros.

          PORTABILITY

          -       These functions are described in the XSI Curses standard, Issue 4.  The
-       standard  specifies  that  they return ERR on failure, but specifies no
-       error conditions.
+       X/Open Curses Issue 4 describes these functions.  It specifies no error
+       conditions for them.
 
-       The SVr4.0 manual says that these functions could return  "a  non-nega-
-       tive  integer  if immedok(3x) is set", referring to the return-value of
-       wrefresh.  In that implementation, wrefresh would return a count of the
-       number of characters written to the terminal.
+       SVr4 documentation says that these  functions  return  OK  "or  a  non-
+       negative  integer  if  immedok() is set", referring to the return value
+       from wrefresh, which in SVr4 returns a count of characters  written  to
+       the window if its immedok property is set; in ncurses, it does not.
 
        Some  historic  curses implementations had, as an undocumented feature,
-       the ability to do the equivalent of clearok(..., 1)  by  saying  touch-
-       win(stdscr) or clear(stdscr).  This will not work under ncurses.
+       the  ability  to  do  the  equivalent  of  clearok(...,  1)  by  saying
+       touchwin(stdscr) or clear(stdscr).  This will not work under ncurses.
 
-       This implementation, and others such as Solaris, sets the current posi-
-       tion to 0,0 after erasing via werase and wclear.  That fact is not doc-
-       umented  in  other  implementations, and may not be true of implementa-
-       tions which were not derived from SVr4 source.
+       This  implementation,  and  others  such  as  Solaris, sets the current
+       position to 0,0 after erasing via werase and wclear.  That fact is  not
+       documented   in   other   implementations,  and  may  not  be  true  of
+       implementations which were not derived from SVr4 source.
 
        Not obvious from the description, most implementations clear the screen
        after  wclear  even  for  a subwindow or derived window.  If you do not
@@ -140,7 +138,7 @@ 
          curs_clear 3x
          
 
 
 
-                                                                curs_clear(3x)
+ncurses 6.5                       2025-01-18                    curs_clear(3x)
            @@ -148,10 +146,10 @@

            curs_clear 3x

          • SYNOPSIS
          • DESCRIPTION
          • RETURN VALUE
            • diff --git a/doc/html/man/curs_color.3x.html b/doc/html/man/curs_color.3x.html index 15ad1740..d2c150eb 100644 --- a/doc/html/man/curs_color.3x.html +++ b/doc/html/man/curs_color.3x.html @@ -1,6 +1,6 @@ -curs_color 3x +curs_color 3x 2025-03-01 ncurses 6.5 Library calls -

            curs_color 3x

            +

            curs_color 3x 2025-03-01 ncurses 6.5 Library calls

            -curs_color(3x)                                                  curs_color(3x)
+curs_color(3x)                   Library calls                  curs_color(3x)

            NAME

            -       start_color, has_colors, can_change_color, init_pair, init_color,
-       init_extended_pair, init_extended_color, color_content, pair_content,
-       extended_color_content, extended_pair_content, reset_color_pairs,
-       COLOR_PAIR, PAIR_NUMBER - curses color manipulation routines
+       start_color,   has_colors,   can_change_color,  init_pair,  init_color,
+       init_extended_pair, init_extended_color,  color_content,  pair_content,
+       extended_color_content,    extended_pair_content,    reset_color_pairs,
+       COLOR_PAIR, PAIR_NUMBER, COLORS, COLOR_PAIRS,  COLOR_BLACK,  COLOR_RED,
+       COLOR_GREEN,   COLOR_YELLOW,   COLOR_BLUE,  COLOR_MAGENTA,  COLOR_CYAN,
+       COLOR_WHITE, A_COLOR - manipulate terminal colors with curses

            SYNOPSIS

                    #include <curses.h>
 
+       /* variables */
+       int COLOR_PAIRS;
+       int COLORS;
+
        int start_color(void);
 
        bool has_colors(void);
@@ -63,89 +69,98 @@ 
            curs_color 3x
            
 
        int init_pair(short pair, short f, short b);
        int init_color(short color, short r, short g, short b);
-       /* extensions */
+       /* extensions */
        int init_extended_pair(int pair, int f, int b);
        int init_extended_color(int color, int r, int g, int b);
 
        int color_content(short color, short *r, short *g, short *b);
        int pair_content(short pair, short *f, short *b);
-       /* extensions */
+       /* extensions */
        int extended_color_content(int color, int *r, int *g, int *b);
        int extended_pair_content(int pair, int *f, int *b);
 
-       /* extensions */
+       /* extension */
        void reset_color_pairs(void);
 
+       /* macros */
        int COLOR_PAIR(int n);
-       PAIR_NUMBER(attrs);
+       PAIR_NUMBER(int attr);
+       COLOR_BLACK
+       COLOR_RED
+       COLOR_GREEN
+       COLOR_YELLOW
+       COLOR_BLUE
+       COLOR_MAGENTA
+       COLOR_CYAN
+       COLOR_WHITE
+       A_COLOR

            DESCRIPTION

            Overview

            -       curses supports color attributes on terminals with that capability.  To
-       use  these  routines  start_color  must  be called, usually right after
-       initscr.  Colors are always used in pairs (referred to as color-pairs).
-       A  color-pair  consists  of  a  foreground color (for characters) and a
-       background color (for the blank field on which the characters are  dis-
-       played).   A  programmer  initializes  a  color-pair  with  the routine
-       init_pair.  After it has been initialized, COLOR_PAIR(n) can be used to
-       convert the pair to a video attribute.
+       curses supports color attributes on  terminals  with  that  capability.
+       Call  start_color  (typically  right  after initscr(3x)) to enable this
+       feature.  Colors are always used in pairs.   A  color  pair  couples  a
+       foreground  color  for characters with a background color for the blank
+       field on which characters are rendered.  init_pair initializes a  color
+       pair.   The  macro  COLOR_PAIR(n)  can then convert the pair to a video
+       attribute.
 
-       If  a  terminal is capable of redefining colors, the programmer can use
-       the routine init_color to change the definition of a color.   The  rou-
-       tines  has_colors  and can_change_color return TRUE or FALSE, depending
-       on whether the terminal has color capabilities and whether the program-
-       mer can change the colors.  The routine color_content allows a program-
-       mer to extract the amounts of red, green, and  blue  components  in  an
-       initialized  color.   The  routine  pair_content allows a programmer to
-       find out how a given color-pair is currently defined.
+       If  a  terminal  has  the  relevant  capability,   init_color   permits
+       (re)definition of a color.  has_colors and can_change_color return TRUE
+       or FALSE, depending on whether the terminal has  color  capability  and
+       whether  the  programmer  can change the colors.  color_content permits
+       extraction of the red, green, and blue  components  of  an  initialized
+       color.   pair_content  permits  discovery  of  a  color  pair's current
+       definition.
 
 
-

            Color Rendering

            -       The curses library combines these inputs to produce  the  actual  fore-
-       ground and background colors shown on the screen:
+

            Rendering

            +       curses combines the following data to render a character cell.  Any  of
+       them can include color information.
 
-       o   per-character video attributes (e.g., via waddch),
+       o   curses character attributes, as from waddch(3x) or wadd_wch(3x)
 
-       o   the window attribute (e.g., by wattrset), and
+       o   window attributes, as from wattrset(3x) or wattr_set(3x)
 
-       o   the background character (e.g., wbkgdset).
+       o   window  background  character  attributes,  as from wbkgdset(3x) or
+           wbkgrndset(3x)
 
-       Per-character and window attributes are usually set by a parameter con-
-       taining video attributes including a color pair value.  Some  functions
-       such as wattr_set use a separate parameter which is the color pair num-
-       ber.
+       Per-character and window attributes are usually set through a  function
+       parameter  containing  attributes  including  a color pair value.  Some
+       functions,  such  as  wattr_set,  use  a  separate  color  pair  number
+       parameter.
 
-       The background character is a special case:  it  includes  a  character
-       value, just as if it were passed to waddch.
+       The  background  character  is  a special case: it includes a character
+       code, just as if it were passed to waddch.
 
-       The  curses library does the actual work of combining these color pairs
+       The curses library does the actual work of combining these color  pairs
        in an internal function called from waddch:
 
        o   If the parameter passed to waddch is blank, and it uses the special
            color pair 0,
 
-           o   curses next checks the window attribute.
+           o   curses next checks the window attribute.
 
-           o   If  the window attribute does not use color pair 0, curses uses
+           o   If the window attribute does not use color pair 0, curses  uses
                the color pair from the window attribute.
 
-           o   Otherwise, curses uses the background character.
+           o   Otherwise, curses uses the background character.
 
-       o   If the parameter passed to waddch is not blank, or it does not  use
-           the  special  color  pair 0, curses prefers the color pair from the
-           parameter, if it is nonzero.  Otherwise, it tries the window attri-
-           bute next, and finally the background character.
+       o   If  the parameter passed to waddch is not blank, or it does not use
+           the special color pair 0, curses prefers the color  pair  from  the
+           parameter,  if  it  is  nonzero.   Otherwise,  it  tries the window
+           attribute next, and finally the background character.
 
-       Some  curses  functions such as wprintw call waddch.  Those do not com-
-       bine its parameter with a color pair.  Consequently those calls use on-
-       ly the window attribute or the background character.
+       Some curses functions such  as  wprintw  call  waddch.   Those  do  not
+       combine  its parameter with a color pair.  Consequently those calls use
+       only the window attribute or the background character.

            CONSTANTS

                    In <curses.h> the following macros are defined.  These are the standard
-       colors (ISO-6429).  curses also assumes that COLOR_BLACK is the default
+       colors (ISO-6429).  curses also assumes that COLOR_BLACK is the default
        background color for all terminals.
 
              COLOR_BLACK
@@ -157,366 +172,400 @@ 
            curs_color 3x
            
              COLOR_CYAN
              COLOR_WHITE
 
-       Some  terminals  support  more than the eight (8) "ANSI" colors.  There
+       Some terminals support more than the eight (8)  "ANSI"  colors.   There
        are no standard names for those additional colors.
 
+       A_COLOR  is  a  bit  mask  that extracts a color pair identifier from a
+       chtype.
+

            VARIABLES

            COLORS

            -       is initialized by start_color to the maximum number of colors the  ter-
-       minal can support.
+       is initialized by start_color to  the  maximum  number  of  colors  the
+       terminal can support.

            COLOR_PAIRS

                    is  initialized by start_color to the maximum number of color pairs the
-       terminal can support.
+       terminal can support.  Often, its value is the product COLORS x COLORS,
+       but this is not always true.
+
+       o   A  few  terminals  use the HLS color space (see start_color below),
+           ignoring this rule; and
+
+       o   terminals supporting a large number of colors are  limited  to  the
+           number of color pairs that a signed short value can represent.

            FUNCTIONS

            start_color

            -       The start_color routine requires no arguments.  It must  be  called  if
-       the  programmer wants to use colors, and before any other color manipu-
-       lation routine is called.  It is good practice  to  call  this  routine
-       right after initscr.  start_color does this:
+       The  start_color  routine  requires no arguments.  It must be called if
+       the programmer  wants  to  use  colors,  and  before  any  other  color
+       manipulation  routine  is  called.   It  is  good practice to call this
+       routine right after initscr.  start_color does this:
 
-       o   It  initializes  two  global variables, COLORS and COLOR_PAIRS (re-
-           spectively defining the maximum number of  colors  and  color-pairs
+       o   It  initializes  two  global  variables,  COLORS  and   COLOR_PAIRS
+           (respectively defining the maximum number of colors and color pairs
            the terminal can support).
 
-       o   It  initializes  the special color pair 0 to the default foreground
+       o   It initializes the special color pair 0 to the  default  foreground
            and background colors.  No other color pairs are initialized.
 
-       o   It restores the colors on the terminal to the values they had  when
+       o   It  restores the colors on the terminal to the values they had when
            the terminal was just turned on.
 
-       o   If  the  terminal supports the initc (initialize_color) capability,
-           start_color initializes its internal table  representing  the  red,
+       o   If the terminal supports the initc  (initialize_color)  capability,
+           start_color  initializes  its  internal table representing the red,
            green, and blue components of the color palette.
 
            The components depend on whether the terminal uses CGA (aka "ANSI")
-           or HLS (i.e.,  the  hls  (hue_lightness_saturation)  capability  is
-           set).   The  table  is  initialized  first  for  eight basic colors
-           (black, red, green, yellow, blue, magenta, cyan, and white),  using
+           or  HLS  (i.e.,  the  hls  (hue_lightness_saturation) capability is
+           set).  The table  is  initialized  first  for  eight  basic  colors
+           (black,  red, green, yellow, blue, magenta, cyan, and white), using
            weights that depend upon the CGA/HLS choice.  For "ANSI" colors the
-           weights are 680 or 0 depending on whether  the  corresponding  red,
-           green,  or  blue component is used or not.  That permits using 1000
-           to represent bold/bright colors.  After the  initial  eight  colors
-           (if  the  terminal  supports more than eight colors) the components
-           are initialized using the same pattern, but with weights  of  1000.
+           weights  are  680  or 0 depending on whether the corresponding red,
+           green, or blue component is used or not.  That permits  using  1000
+           to  represent  bold/bright  colors.  After the initial eight colors
+           (if the terminal supports more than eight  colors)  the  components
+           are  initialized  using the same pattern, but with weights of 1000.
            SVr4 uses a similar scheme, but uses 1000 for the components of the
            initial eight colors.
 
            start_color does not attempt to set the terminal's color palette to
-           match its built-in table.  An application may use init_color to al-
-           ter the internal table along with the terminal's color.
+           match its built-in table.  An application  may  use  init_color  to
+           alter the internal table along with the terminal's color.
 
-       These limits apply to color values and  color  pairs.   Values  outside
-       these limits are not legal, and may result in a runtime error:
+       These  limits  apply  to  color values and color pairs.  Values outside
+       these limits are not valid, and may result in a runtime error:
 
-       o   COLORS  corresponds to the terminal database's max_colors capabili-
-           ty, (see terminfo(5)).
+       o   COLORS  corresponds   to   the   terminal   database's   max_colors
+           capability, (see terminfo(5)).
 
-       o   color values are expected to be in the range 0 to COLORS-1,  inclu-
-           sive (including 0 and COLORS-1).
+       o   color  values  are  expected  to  be  in  the  range 0 to COLORS-1,
+           inclusive (including 0 and COLORS-1).
 
-       o   a  special  color value -1 is used in certain extended functions to
+       o   a special color value -1 is used in certain extended  functions  to
            denote the default color (see use_default_colors(3x)).
 
-       o   COLOR_PAIRS corresponds to the terminal database's max_pairs  capa-
-           bility, (see terminfo(5)).
+       o   COLOR_PAIRS   corresponds  to  the  terminal  database's  max_pairs
+           capability, (see terminfo(5)).
 
-       o   legal color pair values are in the range 1 to COLOR_PAIRS-1, inclu-
-           sive.
+       o   valid color pair values  are  in  the  range  1  to  COLOR_PAIRS-1,
+           inclusive.
 
        o   color pair 0 is special; it denotes "no color".
 
-           Color pair 0 is assumed to be white on black, but is actually what-
-           ever  the terminal implements before color is initialized.  It can-
-           not be modified by the application.
+           Color  pair  0  is  assumed  to  be white on black, but is actually
+           whatever the terminal implements before color is  initialized.   It
+           cannot be modified by the application.

            has_colors

            -       The has_colors routine requires no arguments.  It returns TRUE  if  the
-       terminal can manipulate colors; otherwise, it returns FALSE.  This rou-
-       tine facilitates writing terminal-independent programs.  For example, a
-       programmer  can  use  it  to  decide whether to use color or some other
-       video attribute.
+       has_colors returns TRUE if the terminal supports colors and FALSE if it
+       does not.   initscr(3x)  or  newterm(3x)  must  be  called  first,  but
+       start_color  need  not  be.   An  application  might call has_colors to
+       decide whether to use color or a video attribute like A_BOLD to  render
+       text.
+
+       Color  support  in  curses  requires that the terminal type description
+       support the capabilities max_colors (colors),  max_pairs  (pairs),  and
+       any of
+
+       o   set_foreground (setf) and set_background (setb);
+
+       o   set_a_foreground (setaf) and set_a_background (setab); or
+
+       o   set_color_pair (scp).

            can_change_color

                    The can_change_color routine requires no arguments.  It returns TRUE if
-       the  terminal  supports colors and can change their definitions; other,
-       it returns FALSE.  This routine facilitates  writing  terminal-indepen-
-       dent programs.
+       the terminal supports colors and can change their  definitions;  other,
+       it   returns   FALSE.    This  routine  facilitates  writing  terminal-
+       independent programs.

            init_pair

            -       The init_pair routine changes the definition of a color-pair.  It takes
-       three arguments: the number of the color-pair to be changed, the  fore-
-       ground color number, and the background color number.  For portable ap-
-       plications:
+       The init_pair routine changes the definition of a color pair.  It takes
+       three  arguments:  the  number  of  the  color  pair to be changed, the
+       foreground color number, and the background color number.  For portable
+       applications:
 
-       o   The first argument must be a legal color pair  value.   If  default
-           colors are used (see use_default_colors(3x)) the upper limit is ad-
-           justed to allow for extra pairs which use a default color in  fore-
-           ground and/or background.
+       o   The  first  argument  must be a valid color pair value.  If default
+           colors are used (see use_default_colors(3x))  the  upper  limit  is
+           adjusted  to  allow  for  extra  pairs which use a default color in
+           foreground and/or background.
 
-       o   The second and third arguments must be legal color values.
+       o   The second and third arguments must be valid color values.
 
-       If  the  color-pair was previously initialized, the screen is refreshed
-       and all occurrences of that color-pair are changed to the  new  defini-
-       tion.
+       If the color pair was previously initialized, the screen  is  refreshed
+       and  all  occurrences  of  that  color  pair  are  changed  to  the new
+       definition.
 
-       As  an  extension,  ncurses  allows you to set color pair 0 via the as-
-       sume_default_colors(3x) routine, or to specify the use of default  col-
-       ors  (color  number  -1) if you first invoke the use_default_colors(3x)
+       As an extension, ncurses allows  you  to  set  color  pair  0  via  the
+       assume_default_colors(3x)  routine,  or  to  specify the use of default
+       colors (color number -1) if you first invoke the use_default_colors(3x)
        routine.

            init_extended_pair

            -       Because init_pair uses signed shorts for its  parameters,  that  limits
-       color-pairs  and  color-values to 32767 on modern hardware.  The exten-
-       sion init_extended_pair uses ints for the color-pair  and  color-value,
-       allowing a larger number of colors to be supported.
+       Because  init_pair  uses  signed shorts for its parameters, that limits
+       color  pairs  and  color-values  to  32767  on  modern  hardware.   The
+       extension  init_extended_pair  uses  ints for the color pair and color-
+       value, allowing a larger number of colors to be supported.

            init_color

            -       The  init_color  routine  changes  the definition of a color.  It takes
+       The init_color routine changes the definition of  a  color.   It  takes
        four arguments: the number of the color to be changed followed by three
        RGB values (for the amounts of red, green, and blue components).
 
-       o   The  first argument must be a legal color value; default colors are
-           not allowed here.  (See the section Colors for  the  default  color
+       o   The first argument must be a valid color value; default colors  are
+           not  allowed  here.   (See the section Colors for the default color
            index.)
 
-       o   Each  of  the  last  three arguments must be a value in the range 0
+       o   Each of the last three arguments must be a value  in  the  range  0
            through 1000.
 
-       When init_color is used, all occurrences of that color  on  the  screen
+       When  init_color  is  used, all occurrences of that color on the screen
        immediately change to the new definition.

            init_extended_color

            -       Because  init_color  uses signed shorts for its parameters, that limits
-       color-values and their red, green, and blue components to 32767 on mod-
-       ern hardware.  The extension init_extended_color uses ints for the col-
-       or value and for setting the red, green, and blue components,  allowing
-       a larger number of colors to be supported.
+       Because init_color uses signed shorts for its parameters,  that  limits
+       color-values  and  their  red,  green,  and blue components to 32767 on
+       modern hardware.  The extension init_extended_color uses ints  for  the
+       color  value  and  for  setting  the  red,  green, and blue components,
+       allowing a larger number of colors to be supported.

            color_content

                    The color_content routine gives programmers a way to find the intensity
-       of the red, green, and blue (RGB) components in a color.   It  requires
-       four  arguments:  the  color  number, and three addresses of shorts for
-       storing the information about the amounts of red, green, and blue  com-
-       ponents in the given color.
+       of  the  red, green, and blue (RGB) components in a color.  It requires
+       four arguments: the color number, and three  addresses  of  shorts  for
+       storing  the  information  about  the  amounts  of red, green, and blue
+       components in the given color.
 
-       o   The  first  argument  must  be a legal color value, i.e., 0 through
+       o   The first argument must be a valid color  value,  i.e.,  0  through
            COLORS-1, inclusive.
 
-       o   The values that are stored at the addresses pointed to by the  last
-           three  arguments  are  in  the  range 0 (no component) through 1000
+       o   The  values that are stored at the addresses pointed to by the last
+           three arguments are in the range  0  (no  component)  through  1000
            (maximum amount of component), inclusive.

            extended_color_content

            -       Because color_content uses signed shorts for its parameters, that  lim-
-       its  color-values and their red, green, and blue components to 32767 on
-       modern hardware.  The extension extended_color_content  uses  ints  for
-       the  color value and for returning the red, green, and blue components,
+       Because  color_content  uses  signed  shorts  for  its parameters, that
+       limits color-values and their red, green, and blue components to  32767
+       on modern hardware.  The extension extended_color_content uses ints for
+       the color value and for returning the red, green, and blue  components,
        allowing a larger number of colors to be supported.

            pair_content

            -       The pair_content routine allows programmers to find out what  colors  a
-       given  color-pair consists of.  It requires three arguments: the color-
+       The  pair_content  routine allows programmers to find out what colors a
+       given color pair consists of.  It requires three arguments:  the  color
        pair number, and two addresses of shorts for storing the foreground and
        the background color numbers.
 
-       o   The  first argument must be a legal color value, i.e., in the range
+       o   The first argument must be a valid color value, i.e., in the  range
            1 through COLOR_PAIRS-1, inclusive.
 
-       o   The values that are stored at the addresses pointed to by the  sec-
-           ond  and  third arguments are in the range 0 through COLORS, inclu-
-           sive.
+       o   The  values  that  are  stored  at  the addresses pointed to by the
+           second and third arguments are  in  the  range  0  through  COLORS,
+           inclusive.

            extended_pair_content

                    Because pair_content uses signed shorts for its parameters, that limits
-       color-pair and color-values to 32767 on modern hardware.  The extension
-       extended_pair_content uses ints for the color pair  and  for  returning
-       the  foreground and background colors, allowing a larger number of col-
-       ors to be supported.
+       color pair and color-values to 32767 on modern hardware.  The extension
+       extended_pair_content  uses  ints  for the color pair and for returning
+       the foreground and background  colors,  allowing  a  larger  number  of
+       colors to be supported.

            reset_color_pairs

            -       The extension reset_color_pairs tells ncurses to  discard  all  of  the
-       color-pair  information  which was set with init_pair.  It also touches
-       the current- and standard-screens, allowing an  application  to  switch
+       The  extension  reset_color_pairs  tells  ncurses to discard all of the
+       color pair information which was set with init_pair.  It  also  touches
+       the  current-  and  standard-screens, allowing an application to switch
        color palettes rapidly.
 
 
-

            PAIR_NUMBER

            -       PAIR_NUMBER(attrs)  extracts  the  color value from its attrs parameter
-       and returns it as a color pair number.
-
-

            COLOR_PAIR

            -       Its inverse COLOR_PAIR(n) converts a color pair number to an attribute.
-       Attributes  can  hold color pairs in the range 0 to 255.  If you need a
-       color pair larger than that, you must use functions  such  as  attr_set
-       (which  pass  the  color  pair as a separate parameter) rather than the
-       legacy functions such as attrset.
+       COLOR_PAIR(n) converts a color pair number to an attribute.  Attributes
+       can  hold  color pairs in the range 0 to 255.  If you need a color pair
+       larger than that, you must use functions such as attr_set  (which  pass
+       the  color  pair  as  a  separate  parameter)  rather  than  the legacy
+       functions such as attrset.
 
 
-

            RETURN VALUE

            -       The routines can_change_color and has_colors return TRUE or FALSE.
+

            PAIR_NUMBER

            +       PAIR_NUMBER(attr)  extracts  the  color  information  from   its   attr
+       parameter  and  returns  it  as  a color pair number; it is the inverse
+       operation of COLOR_PAIR.
 
-       All other routines return the integer ERR upon failure and an OK  (SVr4
-       specifies  only "an integer value other than ERR") upon successful com-
-       pletion.
 
-       X/Open defines no error conditions.  SVr4 does document some error con-
-       ditions which apply in general:
+

            RETURN VALUE

            +       can_change_color and  has_colors  return  TRUE  or  FALSE.   The  other
+       functions return OK on success and ERR on failure.
 
-       o   This implementation will return ERR on attempts to use color values
-           outside the range 0 to COLORS-1 (except for the default colors  ex-
-           tension), or use color pairs outside the range 0 to COLOR_PAIRS-1.
+       In   ncurses,  functions  returning  an  int  recognize  several  error
+       conditions.
 
-           Color values used in init_color must be in the range 0 to 1000.
+       o   All return  ERR  if  the  screen  has  not  been  initialized;  see
+           initscr(3x) or newterm(3x).
 
-           An  error  is  returned  from all functions if the terminal has not
-           been initialized.
+       o   All  except  start_color  return  ERR  if  start_color has not been
+           called, or itself returned ERR.
 
-           An error is returned from secondary functions such as init_pair  if
-           start_color was not called.
+       o   start_color returns ERR if it cannot allocate memory for its  color
+           pair table.
 
-       o   SVr4  does much the same, except that it returns ERR from pair_con-
-           tent if the pair was not initialized using init_pairs  and  it  re-
-           turns  ERR  from  color_content  if  the  terminal does not support
-           changing colors.
+       o   init_color  returns  ERR  if  the  terminal  type  does not support
+           assignable color values; that is, if the  initialize_color  (initc)
+           capability is absent from its description.
 
-           This implementation does not return ERR for either case.
+       o   init_color  returns  ERR if any of its r, g, b arguments is outside
+           the range 0-1000 inclusive.
 
-       Specific functions make additional checks:
+       o   init_pair,  init_color,  init_extended_pair,   init_extended_color,
+           color_content,     pair_content,     extended_color_content,    and
+           extended_pair_content return ERR on attempts to use
 
-          init_color
-               returns an error if the terminal does not support this feature,
-               e.g.,  if  the  initialize_color  capability is absent from the
-               terminal description.
+           o   color identifiers outside the range 0-COLORS-1  inclusive,  the
+               default colors extension notwithstanding, or
 
-          start_color
-               returns an error if the color table cannot be allocated.
+           o   color   pair  identifiers  outside  the  range  0-COLOR_PAIRS-1
+               inclusive.

            NOTES

            -       In the ncurses implementation, there is  a  separate  color  activation
-       flag,  color palette, color pairs table, and associated COLORS and COL-
-       OR_PAIRS counts for each screen; the start_color function only  affects
-       the current screen.  The SVr4/XSI interface is not really designed with
-       this in mind, and historical implementations may use  a  single  shared
-       color palette.
-
-       Setting  an  implicit  background  color  via a color pair affects only
-       character cells that a character write  operation  explicitly  touches.
-       To  change the background color used when parts of a window are blanked
+       In ncurses, init_pair accepts negative foreground and background  color
+       arguments  to  support  its  use_default_colors(3x) extension, but only
+       after the latter function has been called.
+
+       The assumption that COLOR_BLACK is the  terminal's  default  background
+       color  can  be  overridden  using  ncurses's  assume_default_colors(3x)
+       extension.
+
+       In ncurses, each pointer passed to color_content and  pair_content  can
+       be  null,  in  which  case  the  library  ignores  it,  permitting  the
+       application to disregard unnecessary information.
+
+       In ncurses, each screen has a color  activation  flag,  color  palette,
+       color  pair  table,  and  associated  COLORS  and  COLOR_PAIRS  values;
+       start_color affects only the  current  screen.   The  SVr4  and  X/Open
+       Curses  interface was not really designed with this in mind; historical
+       implementations may use a single shared color palette.
+
+       Setting an implicit background color via  a  color  pair  affects  only
+       character  cells  that  a character write operation explicitly touches.
+       To change the background color used when parts of a window are  blanked
        by erasing or scrolling operations, see curs_bkgd(3x).
 
-       Several caveats apply on older x86 machines  (e.g.,  i386,  i486)  with
-       VGA-compatible graphics:
+       Several  caveats  apply  to IBM PC-compatible machines of the 80486 era
+       and earlier with CGA/EGA/VGA video.
 
-       o   COLOR_YELLOW  is  actually  brown.  To get yellow, use COLOR_YELLOW
-           combined with the A_BOLD attribute.
+       o   COLOR_YELLOW  is  actually   brown.    To   get   yellow,   combine
+           COLOR_YELLOW with the A_BOLD attribute.
 
-       o   The A_BLINK attribute should in theory cause the background  to  go
-           bright.  This often fails to work, and even some cards for which it
-           mostly works (such as the Paradise and compatibles)  do  the  wrong
-           thing  when  you try to set a bright "yellow" background (you get a
-           blinking yellow foreground instead).
+       o   The  A_BLINK attribute should in theory make the background bright.
+           This often fails to work, and even VGA  controllers  for  which  it
+           mostly  works,  such as those from Paradise and compatibles, do the
+           wrong thing when you try to set a bright "yellow" background -- you
+           get a blinking yellow foreground instead.
 
-       o   Color RGB values are not settable.
+       o   Color  RGB  values  are  not configurable on these devices (in text
+           mode).
 
 
-

            HISTORY

            -       SVr3.2 introduced color support to curses in 1987.
-
-       SVr4 made internal changes, e.g., moving  the  storage  for  the  color
-       state  from  SP (the SCREEN structure) to cur_term (the TERMINAL struc-
-       ture), but provided the same set of library functions.
-
-       SVr4 curses limits the number of color pairs  to  64,  reserving  color
-       pair  zero  (0)  as the terminal's initial uncolored state.  This limit
-       arises because the color pair information is a bitfield in  the  chtype
-       data type (denoted by A_COLOR).
-
-       Other implementations of curses had different limits:
-
-       o   PCCurses (1987-1990) provided for only eight (8) colors.
-
-       o   PDCurses  (1992-present)  inherited the 8-color limitation from PC-
-           Curses, but changed this to 256 in version 2.5 (2001),  along  with
-           changing chtype from 16-bits to 32-bits.
-
-       o   X/Open Curses (1992-present) added a new structure cchar_t to store
-           the character, attributes and color-pair values, allowing increased
-           range  of  color-pairs.   Both  color-pairs and color-values used a
-           signed short, limiting values to 15 bits.
-
-       o   ncurses (1992-present) uses eight bits for A_COLOR in  chtype  val-
-           ues.
-
-           Version  5.3  provided  a wide-character interface (2002), but left
-           color-pairs as part of the attributes-field.
-
-           Since version 6 (2015), ncurses uses a separate int for color-pairs
-           in the cchar_t values.  When those color-pair values fit in 8 bits,
-           ncurses allows color-pairs to be manipulated via the functions  us-
-           ing chtype values.
-
-       o   NetBSD  curses  used  6 bits from 2000 (when colors were first sup-
-           ported) until 2004.  At that point, NetBSD changed to use 10  bits.
-           As of 2021, that size is unchanged.  Like ncurses before version 6,
-           the NetBSD color-pair information is stored in the attributes field
-           of  cchar_t,  limiting the number of color-pairs by the size of the
-           bitfield.
+

            EXTENSIONS

            +       The functions marked as extensions originated in ncurses, and  are  not
+       found  in  SVr4  curses,  4.4BSD  curses,  or any other previous curses
+       implementation.

            PORTABILITY

            -       This implementation satisfies XSI Curses's minimum maximums for  COLORS
-       and COLOR_PAIRS.
-
-       The  init_pair  routine accepts negative values of foreground and back-
-       ground color to support the use_default_colors(3x) extension, but  only
-       if that routine has been first invoked.
+       Applications employing ncurses extensions should condition their use on
+       the visibility of the NCURSES_VERSION preprocessor macro.
 
-       The assumption that COLOR_BLACK is the default background color for all
-       terminals can be modified using  the  assume_default_colors(3x)  exten-
-       sion.
+       X/Open Curses Issue 4 describes these functions.  It specifies no error
+       conditions for them.
 
-       This  implementation checks the pointers, e.g., for the values returned
-       by color_content and pair_content, and will treat those as optional pa-
-       rameters when null.
+       ncurses satisfies X/Open  Curses's  minimum  maximums  for  COLORS  and
+       COLOR_PAIRS.
 
        X/Open  Curses  does  not  specify a limit for the number of colors and
-       color pairs which a terminal can support.  However, in its use of short
+       color pairs which a terminal can support.  However, in its use of short
        for  the  parameters,  it carries over SVr4's implementation detail for
-       the compiled terminfo database, which uses signed 16-bit numbers.  This
-       implementation  provides extended versions of those functions which use
-       short parameters, allowing applications to use larger color- and  pair-
-       numbers.
+       the compiled terminfo  database,  which  uses  signed  16-bit  numbers.
+       ncurses  provides  extended  versions  of  the  functions  using  short
+       parameters,  allowing  applications  to  use  larger  color  and   pair
+       identifiers.
+
+       SVr4  curses returns ERR from pair_content if its pair argument was not
+       initialized using init_pairs, and from color_content  if  the  terminal
+       does not support changing colors.  ncurses does neither.
 
-       The reset_color_pairs function is an extension of ncurses.
+
+

            HISTORY

            +       SVr3.2  (1987)  introduced color support with all of the symbols in the
+       synopsis above except those marked as extensions.   It  reserved  color
+       pair  0  as  the terminal's initial, "uncolored" state, and limited the
+       number of possible color pairs to 64, because the color pair datum  was
+       encoded in six bits of a chtype.
+
+       SVr4  made  only  internal changes, such as moving the storage of color
+       state from the SCREEN structure (pointed to  by  SP)  to  the  TERMINAL
+       structure (pointed to by cur_term).
+
+       Other  curses  implementations impose different limits on the number of
+       colors and color pairs.
+
+       o   PCCurses (1987-1990) provided for  only  8  colors  (and  therefore
+           required at most 8x8 = 64 color pairs).
+
+       o   PDCurses  (1992-present)  inherited  the  8-color  limitation  from
+           PCCurses, but changed this  to  256  in  version  2.5  (2001),  and
+           widened its chtype from 16 to 32 bits.
+
+       o   X/Open  Curses  (1992-present)  specified  a  new  structure  type,
+           cchar_t, to store the character code, attribute  flags,  and  color
+           pair  identifier,  allowing  an increased range of color pairs.  It
+           specifies a short as  storing  identifiers  for  colors  and  color
+           pairs,  limiting  portable  values  to 15 bits; negative values are
+           invalid in System V.
+
+       o   ncurses (1992-present), in its non-wide configuration, uses 8  bits
+           of chtype for the color pair identifier.
+
+           Version  5.3 (2002) offered a wide-character interface, but encoded
+           the color pair identifier with attributes in the character type.
+
+           Since version 6 (2015), ncurses uses a separate int for  the  color
+           pair  identifier  in  a cchar_t, introducing extension functions to
+           manage the wider type.  When a color pair value  fits  in  8  bits,
+           ncurses permits color pair data to be manipulated via the functions
+           taking chtype arguments, even  when  a  curses  window  uses  wide-
+           character cells.
+
+       o   NetBSD  curses  used 6 bits for the color pair identifier from 2000
+           (when it first added color support) until  2004.   At  that  point,
+           NetBSD  widened  the  color  pair  identifier to use 9 bits.  As of
+           2025, that size is unchanged.  Like ncurses before version  6,  the
+           NetBSD  color  pair  datum  is  stored  in  the attributes field of
+           cchar_t, limiting the number of color pairs.

            SEE ALSO

            -       curses(3x),  curs_initscr(3x),  curs_attr(3x),  curs_variables(3x), de-
-       fault_colors(3x)
+       curses(3x),   curs_attr(3x),   curs_initscr(3x),    curs_variables(3x),
+       default_colors(3x)
 
 
 
-                                                                curs_color(3x)
+ncurses 6.5                       2025-03-01                    curs_color(3x)
          • RETURN VALUE
          • NOTES
            • -
          • HISTORY
            • +
          • EXTENSIONS
          • PORTABILITY
            • +
          • HISTORY
          • SEE ALSO
          diff --git a/doc/html/man/curs_delch.3x.html b/doc/html/man/curs_delch.3x.html index dacb4aa5..a9160a20 100644 --- a/doc/html/man/curs_delch.3x.html +++ b/doc/html/man/curs_delch.3x.html @@ -1,6 +1,6 @@ -curs_delch 3x +curs_delch 3x 2025-01-18 ncurses 6.5 Library calls -

          curs_delch 3x

          +

          curs_delch 3x 2025-01-18 ncurses 6.5 Library calls

          -curs_delch(3x)                                                  curs_delch(3x)
+curs_delch(3x)                   Library calls                  curs_delch(3x)

          NAME

          -       delch, wdelch, mvdelch, mvwdelch - delete character under the cursor in
-       a curses window
+       delch,  wdelch,  mvdelch,  mvwdelch  - delete a character from a curses
+       window

          SYNOPSIS

                  #include <curses.h>
 
        int delch(void);
-       int wdelch(WINDOW *win);
+       int wdelch(WINDOW * win);
        int mvdelch(int y, int x);
-       int mvwdelch(WINDOW *win, int y, int x);
+       int mvwdelch(WINDOW * win, int y, int x);

          DESCRIPTION

          -       These routines delete the character under the cursor; all characters to
-       the  right  of  the  cursor  on the same line are moved to the left one
-       position and the last character on the line is  filled  with  a  blank.
-       The  cursor  position  does  not  change  (after  moving  to  y,  x, if
-       specified).  (This does not imply use of the hardware delete  character
-       feature.)
+       wdelch deletes the character at the cursor position in win.   It  moves
+       all  characters to the right of the cursor on the same line to the left
+       one position and replaces the contents of the rightmost position on the
+       line  with  the  window's  background  character;  see  bkgd(3x) (wide-
+       character API users: bkgrnd(3x)).  The cursor position does not  change
+       (after  moving  to  (y,  x),  if specified).  ncurses(3x) describes the
+       variants of this function.

          RETURN VALUE

          -       All  routines  return  the  integer  ERR  upon  failure and an OK (SVr4
-       specifies only "an integer  value  other  than  ERR")  upon  successful
-       completion.
+       These functions return OK on success and ERR on failure.
 
-       Functions  with  a  "mv"  prefix  first perform a cursor movement using
-       wmove, and return an error if the position is outside the window, or if
-       the window pointer is null.
+       In ncurses, they return ERR if win is NULL.
+
+       Functions prefixed with "mv" first perform cursor movement and fail  if
+       the position (y, x) is outside the window boundaries.

          NOTES

          -       Note that delch, mvdelch, and mvwdelch may be macros.
+       delch, mvdelch, and mvwdelch may be implemented as macros.
+
+       A  terminal's  delete_character  (dch1)  capability  is not necessarily
+       employed.

          PORTABILITY

          -       These functions are described in the XSI Curses standard, Issue 4.  The
-       standard specifies that they return ERR on failure,  but  specifies  no
-       error conditions.
+       X/Open Curses Issue 4 describes these functions.  It specifies no error
+       conditions for them.
+
+       SVr4  describes  a  successful  return  value only as "an integer value
+       other than ERR".
+
+
+

          HISTORY

          +       SVr2 (1984) introduced wdelch.

          SEE ALSO

          @@ -94,7 +103,7 @@ 
          curs_delch 3x
          
 
 
 
-                                                                curs_delch(3x)
+ncurses 6.5                       2025-01-18                    curs_delch(3x)
          diff --git a/doc/html/man/curs_deleteln.3x.html b/doc/html/man/curs_deleteln.3x.html index a0676f27..b19fcbf7 100644 --- a/doc/html/man/curs_deleteln.3x.html +++ b/doc/html/man/curs_deleteln.3x.html @@ -1,6 +1,6 @@ -curs_deleteln 3x +curs_deleteln 3x 2025-02-01 ncurses 6.5 Library calls -

          curs_deleteln 3x

          +

          curs_deleteln 3x 2025-02-01 ncurses 6.5 Library calls

          -curs_deleteln(3x)                                            curs_deleteln(3x)
+curs_deleteln(3x)                Library calls               curs_deleteln(3x)

          NAME

          -       deleteln,  wdeleteln, insdelln, winsdelln, insertln, winsertln - delete
-       and insert lines in a curses window
+       deleteln,  wdeleteln, insertln, winsertln, insdelln, winsdelln - delete
+       or insert lines in a curses window

          SYNOPSIS

                  #include <curses.h>
 
        int deleteln(void);
-       int wdeleteln(WINDOW *win);
-
-       int insdelln(int n);
-       int winsdelln(WINDOW *win, int n);
+       int wdeleteln(WINDOW * win);
 
        int insertln(void);
-       int winsertln(WINDOW *win);
+       int winsertln(WINDOW * win);
+
+       int insdelln(int n);
+       int winsdelln(WINDOW * win, int n);

          DESCRIPTION

          -       The deleteln and wdeleteln routines delete the line under the cursor in
-       the  window;  all  lines  below the current line are moved up one line.
-       The bottom line of the window is cleared.  The cursor position does not
-       change.
+       wdeleteln deletes the line at the cursor in win;  all  lines  below  it
+       move  up  one  line.  curses then fills the bottom line of win with the
+       background character configured  by  wbkgdset(3x)  (wide-character  API
+       users: wbkgrndset(3x)).  The cursor position does not change.
 
-       The  insdelln  and  winsdelln  routines, for positive n, insert n lines
-       into the specified window above the current line.  The n  bottom  lines
-       are  lost.  For negative n, delete n lines (starting with the one under
-       the cursor), and move the remaining lines up.  The bottom n  lines  are
-       cleared.  The current cursor position remains the same.
+       winsertln inserts a new, empty line of characters above the line at the
+       cursor in win, shifting the existing lines down by one.  The content of
+       the  window's  bottom  line is lost; curses fills the new line with the
+       background character.  The cursor position does not change.
 
-       The  insertln  and  winsertln  routines  insert  a blank line above the
-       current line and the bottom line is lost.
+       winsdelln inserts or deletes  n lines  in  win  as  n  is  positive  or
+       negative,  respectively,  as  if  by  repeatedly  calling  winsertln or
+       wdeleteln.
+
+       ncurses(3x) describes the variants of these functions.

          RETURN VALUE

          -       All routines return the integer  ERR  upon  failure  and  an  OK  (SVr4
-       specifies  only  "an  integer  value  other  than ERR") upon successful
-       completion.
+       These functions return OK on success and ERR on failure.
+
+       In ncurses, they fail if win is NULL.
 
-       X/Open defines no error conditions.  In  this  implementation,  if  the
-       window parameter is null, an error is returned.
+
+

          NOTES

          +       All of these functions except winsdelln may be implemented as macros.
+
+       These functions do not require the terminal to  possess  hardware  line
+       deletion  or  insertion  capabilities.   Even  if available, by default
+       curses does not use them; see idlok(3x).

          PORTABILITY

          -       These functions are described in the XSI Curses standard, Issue 4.  The
-       standard specifies that they return ERR on failure,  but  specifies  no
-       error conditions.
+       X/Open Curses Issue 4 describes these functions.  It specifies no error
+       conditions for them.
 
+       SVr4  describes  a  successful  return  value only as "an integer value
+       other than ERR".
 
-

          NOTES

          -       Note that all but winsdelln may be macros.
 
-       These  routines do not require a hardware line delete or insert feature
-       in  the  terminal.   In  fact,  they  will  not   use   hardware   line
-       delete/insert  unless  idlok(...,  TRUE)  has  been  set on the current
-       window.
+

          HISTORY

          +       4BSD (1980) introduced deleteln, wdeleteln, insertln, and winsertln.
+
+       SVr3.1 (1987) added insdelln and winsdelln.

          SEE ALSO

          @@ -109,7 +115,7 @@ 
          curs_deleteln 3x
          
 
 
 
-                                                             curs_deleteln(3x)
+ncurses 6.5                       2025-02-01                 curs_deleteln(3x)
          diff --git a/doc/html/man/curs_extend.3x.html b/doc/html/man/curs_extend.3x.html index f3d396ec..a3a660b5 100644 --- a/doc/html/man/curs_extend.3x.html +++ b/doc/html/man/curs_extend.3x.html @@ -1,6 +1,6 @@ -curs_extend 3x +curs_extend 3x 2025-01-18 ncurses 6.5 Library calls -

          curs_extend 3x

          +

          curs_extend 3x 2025-01-18 ncurses 6.5 Library calls

          -curs_extend(3x)                                                curs_extend(3x)
+curs_extend(3x)                  Library calls                 curs_extend(3x)

          NAME

          -       curses_version, use_extended_names - miscellaneous curses extensions
+       curses_version, use_extended_names - miscellaneous curses extensions

          SYNOPSIS

                  #include <curses.h>
 
        const char * curses_version(void);
-       int use_extended_names(bool enable);
+       int use_extended_names(bool bf);

          DESCRIPTION

          -       These  functions  are extensions to the curses library which do not fit
-       easily into other categories.
+       These  ncurses  extensions to the curses library do not fit easily into
+       other functional categories.

          curses_version

          -       Use curses_version to get the version number, including patch level  of
-       the library, prefixed by "ncurses", e.g.,
-
-              ncurses 5.0.19991023
+       curses_version returns a pointer to a string containing  the  library's
+       name  and  version  number,  including  its  patch  level,  for example
+       "ncurses 6.5.20240720".

          use_extended_names

          -       The   use_extended_names   function   controls   whether   the  calling
-       application is able to use user-defined or nonstandard names which  may
-       be  compiled  into  the terminfo description, i.e., via the terminfo or
-       termcap interfaces.  Normally these names are available for use,  since
-       the essential decision is made by using the -x option of tic to compile
-       extended terminal definitions.  However you can disable this feature to
-       ensure compatibility with other implementations of curses.
+       use_extended_names configures  whether  the  library  recognizes  user-
+       defined  or  nonstandard terminfo capability names that may be compiled
+       into  terminal  type  descriptions   via   the   curs_terminfo(3x)   or
+       curs_termcap(3x)  interfaces.   Normally  these names are available for
+       use, since the essential decision is made through use  of  tic(1)'s  -x
+       option  to  include  such  extensions  in  terminal  type descriptions.
+       use_extended_names  can  prevent   ncurses   from   recognizing   these
+       capabilities  to  ensure  compatibility  with  other implementations of
+       curses.

          RETURN VALUE

          -       curses_version  returns a pointer to static memory; you should not free
-       this in your application.
+       curses_version returns a constant string.
+
+       use_extended_names returns the previous state  of  extended  capability
+       name recognition, allowing you to save this property and restore it.
+
+
+

          NOTES

          +       The  pointer  returned  by  curses_version  corresponds  to  statically
+       allocated memory; do not attempt to free(3) it.
 
-       use_extended_names returns the previous state,  allowing  you  to  save
-       this and restore it.
+
+

          EXTENSIONS

          +       These functions are ncurses extensions,  and  are  not  found  in  SVr4
+       curses, 4.4BSD curses, or any other previous curses implementation.

          PORTABILITY

          -       These  routines  are  specific  to ncurses.  They were not supported on
-       Version 7, BSD or System V implementations.  It is recommended that any
-       code depending on them be conditioned using NCURSES_VERSION.
+       Applications employing ncurses extensions should condition their use on
+       the visibility of the NCURSES_VERSION preprocessor macro.
 
 
-

          SEE ALSO

          -       curs_getch(3x),    curs_mouse(3x),    curs_print(3x),    curs_util(3x),
-       default_colors(3x),    define_key(3x),     keybound(3x),     keyok(3x),
-       resizeterm(3x), wresize(3x).
+

          AUTHORS

          +       Thomas Dickey
 
 
-

          AUTHOR

          -       Thomas Dickey.
+

          SEE ALSO

          +       ncurses offers several other extensions to the X/Open Curses API.
+
+       curs_getch(3x),   curs_inopts(3x),   curs_mouse(3x),    curs_print(3x),
+       curs_util(3x),    default_colors(3x),   define_key(3x),   keybound(3x),
+       keyok(3x), new_pair(3x), resizeterm(3x), wresize(3x)
 
 
 
-                                                               curs_extend(3x)
+ncurses 6.5                       2025-01-18                   curs_extend(3x)
            @@ -118,9 +129,11 @@

            curs_extend 3x

        • RETURN VALUE
          • +
        • NOTES
          • +
        • EXTENSIONS
        • PORTABILITY
          • +
        • AUTHORS
        • SEE ALSO
          • -
        • AUTHOR
        diff --git a/doc/html/man/curs_get_wch.3x.html b/doc/html/man/curs_get_wch.3x.html index 903172b0..086b6841 100644 --- a/doc/html/man/curs_get_wch.3x.html +++ b/doc/html/man/curs_get_wch.3x.html @@ -1,6 +1,6 @@ -curs_get_wch 3x +curs_get_wch 3x 2025-02-15 ncurses 6.5 Library calls -

        curs_get_wch 3x

        +

        curs_get_wch 3x 2025-02-15 ncurses 6.5 Library calls

        -curs_get_wch(3x)                                              curs_get_wch(3x)
+curs_get_wch(3x)                 Library calls                curs_get_wch(3x)

        NAME

        -       get_wch, wget_wch, mvget_wch, mvwget_wch, unget_wch - get (or push
-       back) a wide character from curses terminal keyboard
+       get_wch,  wget_wch,  mvget_wch,  mvwget_wch,  unget_wch  - get (or push
+       back) a wide character from curses terminal keyboard buffer

        SYNOPSIS

                #include <curses.h>
 
-       int get_wch(wint_t *wch);
-       int wget_wch(WINDOW *win, wint_t *wch);
-       int mvget_wch(int y, int x, wint_t *wch);
-       int mvwget_wch(WINDOW *win, int y, int x, wint_t *wch);
+       int get_wch(wint_t * wch);
+       int wget_wch(WINDOW * win, wint_t * wch);
+       int mvget_wch(int y, int x, wint_t * wch);
+       int mvwget_wch(WINDOW * win, int y, int x, wint_t * wch);
 
-       int unget_wch(const wchar_t wch);
+       int unget_wch(const wchar_t wc);

        DESCRIPTION

         
-

        wget_wch

        -       The get_wch, wget_wch, mvget_wch, and mvwget_wch functions read a char-
-       acter  from  the terminal associated with the current or specified win-
-       dow.  In no-delay mode, if no input is waiting, the value  ERR  is  re-
-       turned.   In delay mode, the program waits until the system passes text
-       through to the program.  Depending on the setting of  cbreak,  this  is
-       after one character (cbreak mode), or after the first newline (nocbreak
-       mode).  In half-delay mode, the program waits until the  user  types  a
-       character or the specified timeout interval has elapsed.
-
-       Unless  noecho has been set, these routines echo the character into the
-       designated window.
-
-       If the window is not a pad and has been moved  or  modified  since  the
-       last call to wrefresh, wrefresh will be called before another character
-       is read.
-
-       If keypad is enabled, these functions respond  to  the  pressing  of  a
-       function key by setting the object pointed to by wch to the keycode as-
-       signed to the function key, and returning KEY_CODE_YES.  If a character
-       (such  as  escape) that could be the beginning of a function key is re-
-       ceived, curses sets a timer.  If the remainder of the sequence does ar-
-       rive  within  the designated time, curses passes through the character;
-       otherwise, curses returns the function key  value.   For  this  reason,
-       many  terminals  experience a delay between the time a user presses the
-       escape key and the time the escape is returned to the program.
-
-       The keycodes returned by these functions are the same as those returned
-       by wgetch:
-
-       o   The  predefined  function  keys  are listed in <curses.h> as macros
-           with values outside the range of 8-bit characters.  Their names be-
-           gin with KEY_.
-
-       o   Other  (user-defined)  function keys which may be defined using de-
-           fine_key(3x) have no names, but also are expected  to  have  values
-           outside the range of 8-bit characters.
-
-
-

        unget_wch

        -       The unget_wch function pushes the wide character wch back onto the head
-       of the input queue, so the wide character is returned by the next  call
-       to  get_wch.  The pushback of one character is guaranteed.  If the pro-
-       gram calls unget_wch too many times  without  an  intervening  call  to
-       get_wch, the operation may fail.
-
-       Unlike ungetch and wgetch, unget_wch cannot distinguish special charac-
-       ters returned by wget_wch from ordinary characters.  An application can
-       push  special  keys  which it may read via wget_wch by checking for the
-       KEY_CODE_YES result, and using ungetch for those special keys.
+

        Reading Characters

        +       wget_wch gathers a key event from the terminal keyboard associated with
+       a  curses  window  win,  returning  OK  if  a  wide  character is read,
+       KEY_CODE_YES if a function key is read, and ERR  if  no  key  event  is
+       available.  ncurses(3x) describes the variants of this function.
 
+       When  input  is pending, wget_wch stores an integer identifying the key
+       event in  wch;  for  alphanumeric  and  punctuation  keys,  this  value
+       corresponds to the character encoding used by the terminal.  Use of the
+       control key as a modifier,  by  holding  it  down  while  pressing  and
+       releasing  another key, often results in a distinct code.  The behavior
+       of other keys depends on whether win is in keypad mode; see subsections
+       "Keypad Mode" and "Predefined Key Codes" in getch(3x).
 
-

        NOTES

        -       The header file  <curses.h>  automatically  includes  the  header  file
-       <stdio.h>.
+       If  no input is pending, then if the no-delay flag is set in the window
+       (see nodelay(3x)), the function returns ERR;  otherwise,  curses  waits
+       until  the  terminal  has  input.   If  cbreak(3x)  or raw(3x) has been
+       called, this happens after one character is read.  If  nocbreak(3x)  or
+       noraw(3x)  has  been  called,  it occurs when the next newline is read.
+       (Because the terminal's canonical or "cooked"  mode  is  line-buffered,
+       multiple  wget_wch  calls  may  then  be  necessary  to empty the input
+       queue.)  If halfdelay(3x) has been called, curses waits until input  is
+       available or the specified delay elapses.
+
+       If echo(3x) has been called, and the window is not a pad, curses writes
+       the wide character from the input queue to the window  (at  the  cursor
+       position) per the following rules.
+
+       o   If  the  wide character matches the terminal's erase character (see
+           erasewchar(3x)), the cursor moves leftward one position and the new
+           position is erased as if wmove(3x) and then wdelch(3x) were called.
+           When the window's keypad mode is enabled (see below), KEY_LEFT  and
+           KEY_BACKSPACE are handled the same way.
+
+       o   curses  writes  any  other  wide  character  to the window, as with
+           wecho_wchar(3x).
 
-       Applications  should  not  define the escape key by itself as a single-
-       character function.
+       o   If the window win has been moved or modified since the last call to
+           wrefresh(3x), curses calls wrefresh on it.
 
-       When using get_wch, wget_wch, mvget_wch,  or  mvwget_wch,  applications
-       should not use nocbreak mode and echo mode at the same time.  Depending
-       on the state of the tty driver when each character is typed,  the  pro-
-       gram may produce undesirable results.
+       If  the wide character is a carriage return and nl(3x) has been called,
+       wget_wch stores the wide character code for line feed in wch instead.
 
-       All functions except wget_wch and unget_wch may be macros.
+
+

        Ungetting Characters

        +       unget_wch places wc into the input queue to be retrieved  by  the  next
+       call  to  wget_wch.  A single input queue serves all windows associated
+       with the screen.

        RETURN VALUE

        -       When get_wch, wget_wch, mvget_wch, and mvwget_wch functions successful-
-       ly report the pressing of a function  key,  they  return  KEY_CODE_YES.
-       When they successfully report a wide character, they return OK.  Other-
-       wise, they return ERR.
+       wget_wch returns OK when it reads a wide character,  KEY_CODE_YES  when
+       it reads a function key code, and ERR on failure.  wget_wch fails if
+
+       o   its timeout expires without any data arriving, or
+
+       o   execution  was  interrupted by a signal, in which case errno is set
+           to EINTR.
+
+       Functions taking a WINDOW pointer  argument  fail  if  win  is  a  null
+       pointer.
+
+       Functions  prefixed with "mv" first perform cursor movement and fail if
+       the position (y, x) is outside the window boundaries.
+
+       unget_wch returns OK on success and ERR if there is no more room in the
+       input queue.
+
+
+

        NOTES

        +       See the "NOTES" section of wgetch(3x).
 
-       Upon successful completion, unget_wch returns OK.  Otherwise, the func-
-       tion returns ERR.
+       All of these functions except wget_wch and unget_wch may be implemented
+       as macros.
 
-       Functions  with  a  "mv"  prefix  first perform a cursor movement using
-       wmove, and return an error if the position is outside the window, or if
-       the window pointer is null.
+       Unlike wgetch(3x), wget_wch and its variants store  the  value  of  the
+       input  character  in  an additional wch parameter instead of the return
+       value.
+
+       Unlike ungetch, unget_wch cannot distinguish function  key  codes  from
+       conventional   character  codes.   An  application  can  overcome  this
+       limitation by pushing function key codes with ungetch and  subsequently
+       checking the return value of wget_wch for a match with KEY_CODE_YES.
+
+
+

        EXTENSIONS

        +       See the "EXTENSIONS" section of wgetch(3x).
+
+
+

        PORTABILITY

        +       Applications employing ncurses extensions should condition their use on
+       the visibility of the NCURSES_VERSION preprocessor macro.
+
+       X/Open Curses Issue 4 describes these functions.  It specifies no error
+       conditions for them.
+
+       See  the  "PORTABILITY" section of wgetch(3x) regarding the interaction
+       of wget_wch with signal handlers.
+
+
+

        HISTORY

        +       X/Open Curses Issue 4 (1995) initially specified these functions.   The
+       System V  Interface  Definition  Version 4  of  the same year specified
+       functions named wgetwch (with its variants) ungetwch.  These were later
+       additions  to  SVr4.x,  not  appearing  in the first SVr4 (1989).  They
+       differ from X/Open's later wget_wch and unget_wch in that wgetwch takes
+       no  wch  argument,  but  returns the (wide) key code as an int (with no
+       provision for distinguishing a  character  code  from  a  function  key
+       code); and ungetwch takes a non-const int argument.

        SEE ALSO

        -       curses(3x),    curs_getch(3x),    curs_ins_wch(3x),    curs_inopts(3x),
-       curs_move(3x), curs_refresh(3x)
+       curs_getch(3x) describes comparable functions of the ncurses library in
+       its non-wide-character configuration.
 
+       curses(3x),    curs_add_wch(3x),    curs_inopts(3x),     curs_move(3x),
+       curs_refresh(3x)
 
 
-                                                              curs_get_wch(3x)
+
+ncurses 6.5                       2025-02-15                  curs_get_wch(3x)
        diff --git a/doc/html/man/curs_get_wstr.3x.html b/doc/html/man/curs_get_wstr.3x.html index 4623161f..00b9299f 100644 --- a/doc/html/man/curs_get_wstr.3x.html +++ b/doc/html/man/curs_get_wstr.3x.html @@ -1,6 +1,6 @@ -curs_get_wstr 3x +curs_get_wstr 3x 2025-02-15 ncurses 6.5 Library calls -

        curs_get_wstr 3x

        +

        curs_get_wstr 3x 2025-02-15 ncurses 6.5 Library calls

        -curs_get_wstr(3x)                                            curs_get_wstr(3x)
+curs_get_wstr(3x)                Library calls               curs_get_wstr(3x)

        NAME

        -       get_wstr, getn_wstr, wget_wstr, wgetn_wstr, mvget_wstr, mvgetn_wstr,
-       mvwget_wstr, mvwgetn_wstr - get an array of wide characters from a
-       curses terminal keyboard
+       get_wstr,  getn_wstr,  wget_wstr,  wgetn_wstr, mvget_wstr, mvgetn_wstr,
+       mvwget_wstr, mvwgetn_wstr - read a wide-character string from a  curses
+       terminal keyboard

        SYNOPSIS

                #include <curses.h>
 
-       int get_wstr(wint_t *wstr);
-       int getn_wstr(wint_t *wstr, int n);
-       int wget_wstr(WINDOW *win, wint_t *wstr);
-       int wgetn_wstr(WINDOW *win, wint_t *wstr, int n);
+       int get_wstr(wint_t * wstr);
+       int wget_wstr(WINDOW * win, wint_t * wstr);
+       int mvget_wstr(int y, int x, wint_t * wstr);
+       int mvwget_wstr(WINDOW * win, int y, int x, wint_t * wstr);
 
-       int mvget_wstr(int y, int x, wint_t *wstr);
-       int mvgetn_wstr(int y, int x, wint_t *wstr, int n);
-       int mvwget_wstr(WINDOW *win, int y, int x, wint_t *wstr);
-       int mvwgetn_wstr(WINDOW *win, int y, int x, wint_t *wstr, int n);
+       int getn_wstr(wint_t * wstr, int n);
+       int wgetn_wstr(WINDOW * win, wint_t * wstr, int n);
+       int mvgetn_wstr(int y, int x, wint_t * wstr, int n);
+       int mvwgetn_wstr(WINDOW * win, int y, int x, wint_t * wstr,
+             int n);

        DESCRIPTION

        -       The  effect  of  get_wstr is as though a series of calls to get_wch(3x)
-       were made, until a newline, other end-of-line, or end-of-file condition
-       is  processed.  An end-of-file condition is represented by WEOF, as de-
-       fined in <wchar.h>.  The newline and end-of-line conditions are  repre-
-       sented  by  the  \n  wchar_t  value.   In all instances, the end of the
-       string is terminated by a null wchar_t.  The routine  places  resulting
-       values in the area pointed to by wstr.
+       wget_wstr  populates  a user-supplied wide-character string buffer wstr
+       by repeatedly calling wget_wch(3x) with the win argument until  a  line
+       feed or carriage return character is input.  The function
 
-       The  user's  erase and kill characters are interpreted.  If keypad mode
-       is on for the window, KEY_LEFT and KEY_BACKSPACE  are  both  considered
-       equivalent to the user's kill character.
+       o   does not copy the terminating character to wstr;
 
-       Characters  input  are  echoed  only  if echo is currently on.  In that
-       case, backspace is echoed as deletion of the previous character  (typi-
-       cally a left motion).
+       o   populates  wstr with WEOF (as defined in wchar.h) if an end-of-file
+           condition occurs on the input;
 
-       The effect of wget_wstr is as though a series of calls to wget_wch were
-       made.
+       o   always terminates the string with a null wide character (after  any
+           WEOF);
 
-       The effect of mvget_wstr is as though a call to move and then a  series
-       of calls to get_wch were made.
+       o   interprets   the   screen's   erase   and   kill   characters  (see
+           erasewchar(3x) and killwchar(3x));
 
-       The  effect  of mvwget_wstr is as though a call to wmove and then a se-
-       ries of calls to wget_wch were made.
+       o   recognizes function keys only if  the  screen's  keypad  option  is
+           enabled (see keypad(3x));
 
-       The getn_wstr, mvgetn_wstr, mvwgetn_wstr, and wgetn_wstr functions  are
-       identical to the get_wstr, mvget_wstr, mvwget_wstr, and wget_wstr func-
-       tions, respectively, except that the *n_* versions read at most n char-
-       acters, letting the application prevent overflow of the input buffer.
+       o   treats the function keys KEY_LEFT and KEY_BACKSPACE the same as the
+           erase character; and
 
+       o   discards function key inputs other than those treated as the  erase
+           character, calling beep(3x).
 
-

        NOTES

        -       Using  get_wstr,  mvget_wstr,  mvwget_wstr, or wget_wstr to read a line
-       that overflows the array pointed to by wstr causes  undefined  results.
-       The use of getn_wstr, mvgetn_wstr, mvwgetn_wstr, or wgetn_wstr, respec-
-       tively, is recommended.
+       The  erase  character  replaces  the character at the end of the buffer
+       with a null wide character, while the kill character does the same  for
+       the entire buffer.
+
+       If  the  screen's  echo  option  is  enabled  (see echo(3x)), wget_wstr
+       updates win with wadd_wch(3x).  Further,
+
+       o   the erase character and its function key synonyms move  the  cursor
+           to the left, and
+
+       o   the  kill character returns the cursor to where it was located when
+           wget_wstr was called.
 
-       These functions cannot return KEY_ values because there is  no  way  to
-       distinguish a KEY_ value from a valid wchar_t value.
+       wgetn_wstr is similar, but reads at most n wide characters, aiding  the
+       application  to  avoid overrunning the buffer to which wstr points.  An
+       attempt  to  input  more  than  n  wide  characters  (other  than   the
+       terminating line feed or carriage return) is ignored with a beep.  If n
+       is negative, wgetn_wstr reads  up  to  LINE_MAX  wide  characters  (see
+       sysconf(3)).
 
-       All of these routines except wgetn_wstr may be macros.
+       ncurses(3x) describes the variants of these functions.

        RETURN VALUE

        -       All  of  these  functions return OK upon successful completion.  Other-
-       wise, they return ERR.
+       These functions return OK on success and ERR on failure.
+
+       In ncurses, they return ERR if
+
+       o   win is NULL, or
+
+       o   if an internal wget_wch(3x) call fails.
+
+       Functions  prefixed with "mv" first perform cursor movement and fail if
+       the position (y, x) is outside the window boundaries.
+
+
+

        NOTES

        +       All of these functions except wgetn_wstr may be implemented as macros.
+
+       Reading input that overruns  the  buffer  pointed  to  by  wstr  causes
+       undefined   results.    Use   the  n-infixed  functions,  and  allocate
+       sufficient storage for wstr -- at least n+1 times sizeof(wchar_t).
+
+       These functions cannot store a KEY_ value in wstr because there  is  no
+       way to distinguish it from a valid wchar_t value.
+
+       While  these  functions  conceptually  implement  a  series of calls to
+       wget_wch, they also temporarily change properties of the curses  screen
+       to  permit simple editing of the input buffer.  Each function saves the
+       screen's state, calls nl(3x), and,  if  the  screen  was  in  canonical
+       ("cooked")  mode,  cbreak(3x).  Before returning, it restores the saved
+       screen state.  Other implementations differ in detail, affecting  which
+       control   characters  they  can  accept  in  the  buffer;  see  section
+       "PORTABILITY" below.
 
-       Functions using a window parameter return an error if it is null.
+       Unlike getstr(3x) and related  functions  of  ncurses's  non-wide  API,
+       these functions do not return KEY_RESIZE if a SIGWINCH event interrupts
+       the function.
 
-              wgetn_wstr
-                   returns an error if the associated call to wget_wch failed.
 
-       Functions with a "mv" prefix first  perform  a  cursor  movement  using
-       wmove, and return an error if the position is outside the window, or if
-       the window pointer is null.
+

        EXTENSIONS

        +       getn_wstr,  wgetn_wstr,  mvgetn_wstr,  and  mvwgetn_wstr's  handing  of
+       negative n values is an ncurses extension.

        PORTABILITY

        -       These functions are described in The Single Unix Specification, Version
-       2.   No  error conditions are defined.  This implementation returns ERR
-       if the window pointer is null, or if the lower-level wget_wch call  re-
-       turns  an ERR.  In the latter case, an ERR return without other data is
-       treated as an end-of-file condition, and the returned array contains  a
-       WEOF followed by a null wchar_t.
-
-       X/Open curses documented these functions to pass an array of wchar_t in
-       1997, but that was an error because of this part of the description:
-
-              The effect of get_wstr is as though a series of calls to get_wch
-              were  made, until a newline character, end-of-line character, or
-              end-of-file character is processed.
-
-       The latter function get_wch can return a negative value, while  wchar_t
-       is  a  unsigned  type.  All of the vendors implement this using wint_t,
-       following the standard.
-
-       X/Open Curses, Issue 7 (2009) is unclear regarding whether  the  termi-
-       nating null wchar_t value is counted in the length parameter n.  X/Open
-       Curses, Issue 7 revised the corresponding description  of  wgetnstr  to
-       address this issue.  The unrevised description of wget_nwstr can be in-
-       terpreted either way.  This implementation counts the terminator in the
+       Applications employing ncurses extensions should condition their use on
+       the visibility of the NCURSES_VERSION preprocessor macro.
+
+       X/Open Curses Issue 4 describes these functions.  It specifies no error
+       conditions for them.
+
+       Issue 4  documented these functions as passing an array of wchar_t, but
+       that was an error, conflicting  with  the  following  language  in  the
+       standard.
+
+              The  effect  of  get_wstr()  is  as  though a series of calls to
+              get_wch() were made,  until  a  newline  character,  end-of-line
+              character, or end-of-file character is processed.
+
+       get_wch  can  return a negative value (WEOF), but wchar_t is a unsigned
+       type.  All of the  vendors  implement  these  functions  using  wint_t,
+       following the Issue 7 standard.
+
+       X/Open  Curses  Issue 7  is  unclear  whether the terminating null wide
+       character counts toward  the  length  parameter  n.   A  similar  issue
+       affected   wgetnstr   in   Issue 4,  Version 2;  Issue 7  revised  that
+       function's  description  to  address  the  issue,  but  not   that   of
+       wget_nwstr, leaving it ambiguous.  ncurses counts the terminator in the
        length.
 
-       X/Open  Curses  does  not specify what happens if the length n is nega-
-       tive.
+       X/Open Curses does  not  specify  what  happens  if  the  length  n  is
+       negative.
+
+       o   For  consistency  with  wgetnstr, ncurses 6.2 uses a limit based on
+           LINE_MAX.
+
+       o   Some other implementations (such as Solaris xcurses) do  the  same,
+           while others (PDCurses) do not permit a negative n.
 
-       o   For analogy with wgetnstr, ncurses  6.2  uses  a  limit  (based  on
-           LINE_MAX).
+       o   NetBSD 7  curses  imitates  ncurses  6.1  and  earlier,  treating a
+           negative n as an unbounded count of wide characters.
 
-       o   Some  other  implementations (such as Solaris xcurses) do the same,
-           while others (PDCurses) do not allow this.
+       Implementations vary in their handling of input control characters.
 
-       o   NetBSD 7 curses imitates ncurses 6.1 in this regard, treating a  -1
-           as an indefinite number of characters.
+       o   While they may enable the screen's echo option, some do not take it
+           out  of  raw  mode,  and  may  take  cbreak  mode into account when
+           deciding whether to handle echoing within wgetn_wstr or to rely  on
+           it as a side effect of calling wget_wch.
+
+           Since  1995,  ncurses has provided handlers for SIGINTR and SIGQUIT
+           events, which are typically generated at the keyboard with  ^C  and
+           ^\ respectively.  In cbreak mode, those handlers catch a signal and
+           stop  the  program,  whereas  other  implementations  write   those
+           characters into the buffer.
+
+       o   Starting  with ncurses 6.3 (2021), wgetn_wstr preserves raw mode if
+           the screen was already in that state, allowing  one  to  enter  the
+           characters  the  terminal  interprets  as interrupt and quit events
+           into the buffer, for consistency with SVr4 curses's wgetnstr.
+
+
+

        HISTORY

        +       X/Open Curses Issue 4 (1995) initially specified these functions.   The
+       System V  Interface  Definition  Version 4  of  the same year specified
+       functions named wgetwstr and wgetnwstr (and the usual variants).  These
+       were later additions to SVr4.x, not appearing in the first SVr4 (1989).
+       Except in name, their declarations did not differ from  X/Open's  later
+       wget_wstr  and wgetn_wstr until X/Open Curses Issue 7 (2009) eventually
+       changed the type of the buffer argument to a pointer to wint_t.

        SEE ALSO

        -       Functions: curses(3x), curs_get_wch(3x), curs_getstr(3x).
+       curs_getstr(3x) describes comparable functions of the  ncurses  library
+       in its non-wide-character configuration.
 
+       curses(3x), curs_get_wch(3x)
 
 
-                                                             curs_get_wstr(3x)
+
+ncurses 6.5                       2025-02-15                 curs_get_wstr(3x)
        diff --git a/doc/html/man/curs_getcchar.3x.html b/doc/html/man/curs_getcchar.3x.html index b3f0383b..e2ba839f 100644 --- a/doc/html/man/curs_getcchar.3x.html +++ b/doc/html/man/curs_getcchar.3x.html @@ -1,6 +1,6 @@ -curs_getcchar 3x +curs_getcchar 3x 2025-02-23 ncurses 6.5 Library calls -

        curs_getcchar 3x

        +

        curs_getcchar 3x 2025-02-23 ncurses 6.5 Library calls

        -curs_getcchar(3x)                                            curs_getcchar(3x)
+curs_getcchar(3x)                Library calls               curs_getcchar(3x)

        NAME

        -       getcchar,  setcchar  - Get a wide character string and rendition from a
-       cchar_t or set a cchar_t from a wide-character string
+       getcchar,  setcchar  -  convert  between  a wide-character string and a
+       curses complex character

        SYNOPSIS

                #include <curses.h>
 
-       int getcchar(
-               const cchar_t *wcval,
-               wchar_t *wch,
-               attr_t *attrs,
-               short *color_pair,
-               void *opts );
-
-       int setcchar(
-               cchar_t *wcval,
-               const wchar_t *wch,
-               const attr_t attrs,
-               short color_pair,
-               const void *opts );
+       int getcchar(const cchar_t * wch, wchar_t * wc,
+             attr_t * attrs, short * pair, void * opts);
+       int setcchar(cchar_t * wch, const wchar_t * wc,
+             const attr_t attrs, short pair, const void * opts);

        DESCRIPTION

        +       The curses complex character data type  cchar_t  is  a  structure  type
+       comprising  a  wide-character  string, a set of attributes, and a color
+       pair identifier.  The cchar_t structure is opaque; do  not  attempt  to
+       access  its  members  directly.   The  library  provides  functions  to
+       manipulate this type.
 
-

        getcchar

        -       The getcchar function gets a wide-character string and rendition from a
-       cchar_t  argument.   When  wch  is  not  a  null  pointer, the getcchar
-       function does the following:
-
-       o   Extracts information from a cchar_t value wcval
 
-       o   Stores the character attributes in the location pointed to by attrs
+

        getcchar

        +       getcchar destructures a cchar_t into its components.
 
-       o   Stores the color-pair in the location pointed to by color_pair
+       If wc is not a null pointer, getcchar:
 
-       o   Stores the wide-character string, characters referenced  by  wcval,
-           into the array pointed to by wch.
+       o   stores the wide-character string in the  curses  complex  character
+           wch into wc;
 
-       When wch is a null pointer, the getcchar function does the following:
+       o   stores the attributes in attrs; and
 
-       o   Obtains the number of wide characters pointed to by wcval
+       o   stores the color pair identifier in pair.
 
-       o   Does not change the data referenced by attrs or color_pair
+       If wc is a null pointer, getcchar counts the wchar_t wide characters in
+       wch, returns that value, and leaves attrs and pair unchanged.

        setcchar

        -       The  setcchar  function initializes the location pointed to by wcval by
-       using:
+       setcchar constructs a curses complex character wch from the  components
+       wc,  attrs, and pair.  The wide-character string wch must be terminated
+       with a null wide character L'\0' and must contain at most  one  spacing
+       character,  which,  if present, must be the first wide character in the
+       string.
 
-       o   The character attributes in attrs
+       Up  to  CCHARW_MAX - 1   non-spacing   characters   may   follow   (see
+       curs_variables(3x)).    ncurses   ignores  any  additional  non-spacing
+       characters.
 
-       o   The color pair in color_pair
+       The string may contain a single control  character  instead.   In  that
+       case, no non-spacing characters are allowed.
 
-       o   The wide-character string pointed to by wch.  The  string  must  be
-           L'\0' terminated, contain at most one spacing character, which must
-           be the first.
 
-           Up to CCHARW_MAX-1 nonspacing characters  may  follow.   Additional
-           nonspacing characters are ignored.
+

        RETURN VALUE

        +       If getcchar is passed a null pointer as its wc argument, it returns the
+       number of wide characters for a given wch that it would  store  in  wc,
+       counting  a  trailing null wide character.  If getcchar is not passed a
+       null pointer as its wc argument, it returns OK on success  and  ERR  on
+       failure.
 
-           The string may contain a single control character instead.  In that
-           case, no nonspacing characters are allowed.
+       In  ncurses,  getcchar  returns  ERR  if either attrs or pair is a null
+       pointer and wc is not.
 
+       setcchar returns OK on success and ERR on failure.
 
-

        EXTENSIONS

        -       X/Open Curses documents the opts argument as reserved for  future  use,
-       saying  that  it must be null.  This implementation uses that parameter
-       in ABI 6 for the functions which have a color-pair parameter to support
-       extended color pairs:
+       In ncurses, setcchar returns ERR if
+
+       o   wch is a null pointer,
 
-       o   For   functions  which modify the color, e.g., setcchar, if opts is
-           set it is treated as a pointer to int, and used to  set  the  color
-           pair instead of the short pair parameter.
+       o   wc starts with a (wide) control character and  contains  any  other
+           wide characters, or
 
-       o   For  functions which retrieve the color, e.g., getcchar, if opts is
-           set it is treated as a pointer to int, and  used  to  retrieve  the
-           color  pair  as  an  int  value,  in addition retrieving it via the
-           standard pointer to short parameter.
+       o   pair has a negative value.

        NOTES

        -       The wcval argument may be a value generated by a call to setcchar or by
-       a function that has a cchar_t output argument.  If wcval is constructed
-       by any other means, the effect is unspecified.
+       wch may be a value stored by setcchar or another curses function with a
+       writable cchar_t argument.  If wch is constructed by any  other  means,
+       the library's behavior is unspecified.
 
 
-

        RETURN VALUE

        -       When wch is a  null  pointer,  getcchar  returns  the  number  of  wide
-       characters referenced by wcval, including one for a trailing null.
+

        EXTENSIONS

        +       X/Open  Curses  documents the opts argument as reserved for future use,
+       saying that it must be a null pointer.  The ncurses 6 ABI uses it  with
+       functions  that  have  a color pair parameter to support extended color
+       pairs.
 
-       When  wch  is  not  a null pointer, getcchar returns OK upon successful
-       completion, and ERR otherwise.
+       o   In functions that assign colors, such as setcchar, if opts is not a
+           null pointer, ncurses treats it as a pointer to int, and interprets
+           it instead of the short pair parameter as a color pair identifier.
 
-       Upon successful completion, setcchar returns OK.  Otherwise, it returns
-       ERR.
+       o   In functions that retrieve colors, such as getcchar, if opts is not
+           a  null  pointer, ncurses treats it as a pointer to int, and stores
+           the retrieved color pair identifier there as well as in  the  short
+           pair   parameter   (which   may   therefore   undergo  a  narrowing
+           conversion).

        PORTABILITY

        -       The  CCHARW_MAX  symbol is specific to ncurses.  X/Open Curses does not
-       provide details for the layout of the cchar_t structure.  It tells what
-       data are stored in it:
+       Applications employing ncurses extensions should condition their use on
+       the visibility of the NCURSES_VERSION preprocessor macro.
 
-       o   a spacing character (wchar_t, i.e., 32-bits).
+       These  functions  are described in X/Open Curses Issue 4.  It specifies
+       no error conditions for them.
 
-       o   non-spacing characters (again, wchar_t's).
+       X/Open Curses does not detail the  layout  of  the  cchar_t  structure,
+       describing only its minimal required contents:
 
-       o   attributes  (at  least  16 bits, inferred from the various ACS- and
-           WACS-flags).
+       o   a spacing wide character (wchar_t),
 
-       o   color pair (at least 16 bits,  inferred  from  the  unsigned  short
-           type).
+       o   at least five non-spacing wide characters (wchar_t; see below),
 
-       The non-spacing characters are optional, in the sense that zero or more
-       may be stored in a cchar_t.  XOpen/Curses specifies a limit:
+       o   attributes  (at  least  15  bits' worth, inferred from the count of
+           specified WA_ constants),
+
+       o   a color pair identifier (at least 16 bits, inferred from the  short
+           type used to encode it).
+
+       Non-spacing characters are optional, in the sense that zero or more may
+       be stored in a cchar_t.  XOpen/Curses specifies a limit:
 
            Implementations may limit the number of non-spacing characters that
            can  be  associated with a spacing character, provided any limit is
            at least 5.
 
-       The Unix implementations at the time follow that limit:
+       Then-contemporary Unix implementations adhered to that limit.
+
+       o   AIX 4 and OSF/1 4 used the same declaration with a  single  spacing
+           wide character c and an array of 5 non-spacing wide characters z.
+
+       o   HP-UX 10  used  an opaque structure of 28 bytes, large enough for 6
+           wchar_t values.
 
-       o   AIX 4 and OSF1 4 use the same declaration with an array of  5  non-
-           spacing characters z and a single spacing character c.
+       o   Solaris xcurses uses a single array of 6 wchar_t values.
 
-       o   HP-UX 10  uses  an  opaque  structure with 28 bytes, which is large
-           enough for the 6 wchar_t values.
+       ncurses defined its cchar_t in 1995 using 5 as the total of spacing and
+       non-spacing  characters  (CCHARW_MAX).   That  was  probably  due  to a
+       misreading of  the  AIX 4  header  files,  because  the  X/Open  Curses
+       document  was  not  generally available at that time.  Later (in 2002),
+       this detail was overlooked when work began to implement  the  functions
+       using the structure.
 
-       o   Solaris xpg4 curses uses a single array of 6 wchar_t values.
+       In  practice,  a  mere  four  non-spacing characters may seem adequate.
+       X/Open  Curses   documents   possible   applications   of   non-spacing
+       characters,  including their use as ligatures (a feature apparently not
+       supported by any curses implementation).  Unicode does  not  limit  the
+       (analogous)  number of combining characters in a grapheme cluster; some
+       applications may be affected.  ncurses can be compiled with a different
+       CCHARW_MAX value; doing so alters the library's ABI.
 
-       This implementation's cchar_t was defined in 1995 using 5 for the total
-       of  spacing and non-spacing characters (CCHARW_MAX).  That was probably
-       due to a misreading of the  AIX 4  header  files,  because  the  X/Open
-       Curses  document  was  not generally available at that time.  Later (in
-       2002), this detail was  overlooked  when  beginning  to  implement  the
-       functions using the structure.
 
-       In  practice, even four non-spacing characters may seem enough.  X/Open
-       Curses documents possible uses for  non-spacing  characters,  including
-       using  them  for ligatures between characters (a feature apparently not
-       supported by any curses implementation).  Unicode does  not  limit  the
-       (analogous) number of combining characters, so some applications may be
-       affected.
+

        HISTORY

        +       X/Open Curses Issue 4 (1995) initially specified these functions.

        SEE ALSO

        -       Functions: curs_attr(3x), curs_color(3x), curses(3x), wcwidth(3).
+       curses(3x), curs_attr(3x), curs_color(3x), wcwidth(3)
 
 
 
-                                                             curs_getcchar(3x)
+ncurses 6.5                       2025-02-23                 curs_getcchar(3x)
          @@ -208,10 +218,11 @@

          curs_getcchar 3x

        • setcchar

        • -
      • EXTENSIONS
        • -
      • NOTES
      • RETURN VALUE
        • +
      • NOTES
        • +
      • EXTENSIONS
      • PORTABILITY
        • +
      • HISTORY
      • SEE ALSO
      diff --git a/doc/html/man/curs_getch.3x.html b/doc/html/man/curs_getch.3x.html index 5a1afc5c..3f751c7b 100644 --- a/doc/html/man/curs_getch.3x.html +++ b/doc/html/man/curs_getch.3x.html @@ -1,7 +1,7 @@ -curs_getch 3x +curs_getch 3x 2025-02-15 ncurses 6.5 Library calls -

      curs_getch 3x

      +

      curs_getch 3x 2025-02-15 ncurses 6.5 Library calls

      -curs_getch(3x)                                                  curs_getch(3x)
+curs_getch(3x)                   Library calls                  curs_getch(3x)

      NAME

              getch, wgetch, mvgetch, mvwgetch, ungetch, has_key - get (or push back)
-       characters from curses terminal keyboard
+       characters from curses terminal keyboard buffer

      SYNOPSIS

              #include <curses.h>
 
        int getch(void);
-       int wgetch(WINDOW *win);
-
+       int wgetch(WINDOW * win);
        int mvgetch(int y, int x);
-       int mvwgetch(WINDOW *win, int y, int x);
+       int mvwgetch(WINDOW * win, int y, int x);
 
-       int ungetch(int ch);
+       int ungetch(int c);
 
-       /* extension */
-       int has_key(int ch);
+       /* extension */
+       int has_key(int c);

      DESCRIPTION

       
-

      Reading characters

      -       The getch, wgetch, mvgetch and mvwgetch, routines read a character from
-       the window.  In no-delay mode, if no input is waiting, the value ERR is
-       returned.  In delay mode, the program waits  until  the  system  passes
-       text  through to the program.  Depending on the setting of cbreak, this
-       is after one character  (cbreak  mode),  or  after  the  first  newline
-       (nocbreak mode).  In half-delay mode, the program waits until a charac-
-       ter is typed or the specified timeout has been reached.
-
-       If echo is enabled, and the window is not a  pad,  then  the  character
-       will also be echoed into the designated window according to the follow-
-       ing rules:
-
-       o   If the character is the current erase  character,  left  arrow,  or
-           backspace,  the  cursor  is  moved  one  space to the left and that
-           screen position is erased as if delch had been called.
-
-       o   If the character value is any other KEY_ define, the user is alert-
-           ed with a beep call.
-
-       o   If  the character is a carriage-return, and if nl is enabled, it is
-           translated to a line-feed after echoing.
-
-       o   Otherwise the character is simply output to the screen.
-
-       If the window is not a pad, and it has been moved or modified since the
-       last call to wrefresh, wrefresh will be called before another character
-       is read.
-
-
-

      Keypad mode

      -       If keypad is TRUE, and a function key is pressed, the  token  for  that
-       function key is returned instead of the raw characters:
-
-       o   The  predefined  function  keys  are listed in <curses.h> as macros
-           with values outside the range of 8-bit characters.  Their names be-
-           gin with KEY_.
-
-       o   Other  (user-defined)  function keys which may be defined using de-
-           fine_key(3x) have no names, but also are expected  to  have  values
-           outside the range of 8-bit characters.
-
-       Thus,  a  variable  intended to hold the return value of a function key
-       must be of short size or larger.
-
-       When a character that could be the beginning of a function key  is  re-
-       ceived  (which, on modern terminals, means an escape character), curses
-       sets a timer.  If the remainder of the sequence does not come in within
-       the  designated  time,  the character is passed through; otherwise, the
-       function key value is returned.  For this reason, many terminals  expe-
-       rience  a  delay between the time a user presses the escape key and the
-       escape is returned to the program.
-
-       In ncurses, the timer normally expires after the value in ESCDELAY (see
-       curs_variables(3x)).   If notimeout is TRUE, the timer does not expire;
-       it is an infinite (or very large) value.  Because function keys usually
-       begin  with an escape character, the terminal may appear to hang in no-
-       timeout mode after  pressing  the  escape  key  until  another  key  is
-       pressed.
-
-
-

      Ungetting characters

      -       The  ungetch routine places ch back onto the input queue to be returned
-       by the next call to wgetch.  There is just one input queue for all win-
-       dows.
-
-
-

      Predefined key-codes

      -       The following special keys are defined in <curses.h>.
-
-       o   Except  for  the special case KEY_RESIZE, it is necessary to enable
-           keypad for getch to return these codes.
-
-       o   Not all of these are necessarily supported on any particular termi-
-           nal.
-
-       o   The  naming  convention  may  seem obscure, with some apparent mis-
-           spellings (such as "RSUME" for "resume").  The names correspond  to
-           the  long  terminfo capability names for the keys, and were defined
-           long ago, in the 1980s.
-
-                  Name            Key name
-                  -------------------------------------------------
-                  KEY_BREAK       Break key
-                  KEY_DOWN        The four arrow keys ...
-                  KEY_UP
-                  KEY_LEFT
-                  KEY_RIGHT
-                  KEY_HOME        Home key (upward+left arrow)
-                  KEY_BACKSPACE   Backspace
-                  KEY_F0          Function keys; space for 64 keys
-                                  is reserved.
-                  KEY_F(n)        For 0 <= n <= 63
-                  KEY_DL          Delete line
-                  KEY_IL          Insert line
-                  KEY_DC          Delete character
-                  KEY_IC          Insert char or enter insert mode
-                  KEY_EIC         Exit insert char mode
-                  KEY_CLEAR       Clear screen
-                  KEY_EOS         Clear to end of screen
-                  KEY_EOL         Clear to end of line
-                  KEY_SF          Scroll 1 line forward
-                  KEY_SR          Scroll 1 line backward (reverse)
-                  KEY_NPAGE       Next page
-                  KEY_PPAGE       Previous page
-                  KEY_STAB        Set tab
-                  KEY_CTAB        Clear tab
-                  KEY_CATAB       Clear all tabs
-                  KEY_ENTER       Enter or send
-                  KEY_SRESET      Soft (partial) reset
-                  KEY_RESET       Reset or hard reset
-
-                  KEY_PRINT       Print or copy
-                  KEY_LL          Home down or bottom (lower left)
-                  KEY_A1          Upper left of keypad
-                  KEY_A3          Upper right of keypad
-                  KEY_B2          Center of keypad
-                  KEY_C1          Lower left of keypad
-                  KEY_C3          Lower right of keypad
-                  KEY_BTAB        Back tab key
-                  KEY_BEG         Beg(inning) key
-                  KEY_CANCEL      Cancel key
-                  KEY_CLOSE       Close key
-                  KEY_COMMAND     Cmd (command) key
-                  KEY_COPY        Copy key
-                  KEY_CREATE      Create key
-                  KEY_END         End key
-                  KEY_EXIT        Exit key
-                  KEY_FIND        Find key
-                  KEY_HELP        Help key
-                  KEY_MARK        Mark key
-                  KEY_MESSAGE     Message key
-                  KEY_MOUSE       Mouse event occurred
-                  KEY_MOVE        Move key
-                  KEY_NEXT        Next object key
-                  KEY_OPEN        Open key
-                  KEY_OPTIONS     Options key
-                  KEY_PREVIOUS    Previous object key
-                  KEY_REDO        Redo key
-                  KEY_REFERENCE   Ref(erence) key
-                  KEY_REFRESH     Refresh key
-                  KEY_REPLACE     Replace key
-                  KEY_RESIZE      Screen resized
-                  KEY_RESTART     Restart key
-                  KEY_RESUME      Resume key
-                  KEY_SAVE        Save key
-                  KEY_SBEG        Shifted beginning key
-                  KEY_SCANCEL     Shifted cancel key
-                  KEY_SCOMMAND    Shifted command key
-                  KEY_SCOPY       Shifted copy key
-                  KEY_SCREATE     Shifted create key
-                  KEY_SDC         Shifted delete char key
-                  KEY_SDL         Shifted delete line key
-                  KEY_SELECT      Select key
-                  KEY_SEND        Shifted end key
-                  KEY_SEOL        Shifted clear line key
-                  KEY_SEXIT       Shifted exit key
-                  KEY_SFIND       Shifted find key
-                  KEY_SHELP       Shifted help key
-                  KEY_SHOME       Shifted home key
-                  KEY_SIC         Shifted insert key
-                  KEY_SLEFT       Shifted left arrow key
-                  KEY_SMESSAGE    Shifted message key
-                  KEY_SMOVE       Shifted move key
-                  KEY_SNEXT       Shifted next key
-                  KEY_SOPTIONS    Shifted options key
-                  KEY_SPREVIOUS   Shifted prev key
-                  KEY_SPRINT      Shifted print key
-                  KEY_SREDO       Shifted redo key
-                  KEY_SREPLACE    Shifted replace key
-                  KEY_SRIGHT      Shifted right arrow key
-                  KEY_SRSUME      Shifted resume key
-                  KEY_SSAVE       Shifted save key
-                  KEY_SSUSPEND    Shifted suspend key
-                  KEY_SUNDO       Shifted undo key
-                  KEY_SUSPEND     Suspend key
-                  KEY_UNDO        Undo key
-
-       Keypad is arranged like this:
-
-                                +-----+------+-------+
-                                | A1  |  up  |  A3   |
-                                +-----+------+-------+
-                                |left |  B2  | right |
-                                +-----+------+-------+
-                                | C1  | down |  C3   |
-                                +-----+------+-------+
-       A few of these predefined values do not correspond to a real key:
-
-       o   KEY_RESIZE  is  returned when the SIGWINCH signal has been detected
-           (see  initscr(3x)  and  resizeterm(3x)).   This  code  is  returned
-           whether or not keypad has been enabled.
-
-       o   KEY_MOUSE  is returned for mouse-events (see curs_mouse(3x)).  This
-           code relies upon whether or not keypad(3x) has  been  enabled,  be-
-           cause  (e.g., with xterm(1) mouse prototocol) ncurses must read es-
-           cape sequences, just like a function key.
-
-
-

      Testing key-codes

      -       The has_key routine takes a key-code value from the above list, and re-
-       turns TRUE or FALSE according to whether the current terminal type rec-
-       ognizes a key with that value.
-
-       The library also supports these extensions:
-
-          define_key
-               defines a key-code for a given string (see define_key(3x)).
-
-          key_defined
-               checks if there is a key-code defined for a given  string  (see
-               key_defined(3x)).
+

      Reading Characters

      +       wgetch gathers a key event from the terminal keyboard associated with a
+       curses   window  win.   ncurses(3x)  describes  the  variants  of  this
+       function.
+
+       When input is pending, wgetch returns an integer  identifying  the  key
+       event; for alphanumeric and punctuation keys, this value corresponds to
+       the character encoding used by the terminal.  Use of the control key as
+       a  modifier,  by  holding  it down while pressing and releasing another
+       key, often results in a distinct code.   The  behavior  of  other  keys
+       depends  on whether win is in keypad mode; see subsection "Keypad Mode"
+       below.
+
+       If no input is pending, then if the no-delay flag is set in the  window
+       (see  nodelay(3x)),  the  function returns ERR; otherwise, curses waits
+       until the terminal has  input.   If  cbreak(3x)  or  raw(3x)  has  been
+       called,  this  happens after one character is read.  If nocbreak(3x) or
+       noraw(3x) has been called, it occurs when the  next  newline  is  read.
+       (Because  the  terminal's  canonical or "cooked" mode is line-buffered,
+       multiple wgetch calls may then be necessary to empty the input  queue.)
+       If halfdelay(3x) has been called, curses waits until input is available
+       or the specified delay elapses.
+
+       If echo(3x) has been called, and the window is not a pad, curses writes
+       the returned character c to the window (at the cursor position) per the
+       following rules.
+
+       o   If c matches the terminal's erase  character  (see  erasechar(3x)),
+           the  cursor  moves  leftward  one  position and the new position is
+           erased as if wmove(3x) and then wdelch(3x) were called.   When  the
+           window's   keypad   mode  is  enabled  (see  below),  KEY_LEFT  and
+           KEY_BACKSPACE are handled the same way.
+
+       o   curses writes any other c to the window, as with wechochar(3x).
+
+       o   If the window win has been moved or modified since the last call to
+           wrefresh(3x), curses calls wrefresh on it.
+
+       If  c  is  a carriage return and nl(3x) has been called, wgetch returns
+       the character code for line feed instead.
+
+
+

      Keypad Mode

      +       To curses, key strokes not from the alphabetic section of the  keyboard
+       (those    corresponding    to    the    ECMA-6    character    set--see
+       ascii(7)--optionally modified by either the control or shift keys)  are
+       treated as function keys.  (In curses, the term "function key" includes
+       but is not limited to keycaps engraved with "F1", "PF1",  and  so  on.)
+       If  the  window  is  in  keypad  mode,  these  produce  a  numeric code
+       corresponding to the KEY_ symbols listed in subsection "Predefined  Key
+       Codes"  below;  otherwise,  they transmit a sequence of codes typically
+       starting with the escape character, and which must  be  collected  with
+       multiple wgetch calls.
+
+       o   The  curses.h  header  file  declares many predefined function keys
+           whose names begin with KEY_; these object-like macros  have  values
+           outside the range of eight-bit character codes.
+
+       o   In   ncurses,   user-defined  function  keys  are  configured  with
+           define_key(3x); they have no names, but are also expected  to  have
+           values outside the range of eight-bit codes.
+
+       A  variable  intended  to hold a function key code must thus be of type
+       short or larger.
+
+       Most terminals one encounters follow the ECMA-48  standard  insofar  as
+       their  function  keys  produce  character  sequences  prefixed with the
+       escape character ESC.  This fact implies that curses cannot distinguish
+       a  user's  press  of  the  escape  key (assuming it sends ESC) from the
+       beginning of a function key's character sequence without waiting to see
+       if,  and  how  soon,  further input arrives.  When curses reads such an
+       ambiguous character, it sets a timer.  If the remainder of the sequence
+       does  not  arrive within the designated time, wgetch returns the prefix
+       character; otherwise, it returns the function key code corresponding to
+       the unique sequence defined by the terminal.  Consequently, a user of a
+       curses application may experience a  delay  after  the  escape  key  is
+       pressed  while curses disambiguates the input; see section "EXTENSIONS"
+       below.  If the window is in "no time-out"  mode,  the  timer  does  not
+       expire;  it  is  an infinite (or very large) value.  See notimeout(3x).
+       Because function key sequences usually begin with ESC, the terminal may
+       appear  to  hang  in no time-out mode after the user presses the escape
+       key.  Generally, further typing "awakens" curses.
+
+
+

      Ungetting Characters

      +       ungetch places c into the input queue to be returned by the  next  call
+       to wgetch.  A single input queue serves all windows associated with the
+       screen.
+
+
+

      Predefined Key Codes

      +       The header file curses.h defines the following function key codes.
+
+       o   Except for the special case of KEY_RESIZE, a window's  keypad  mode
+           must be enabled for wgetch to read these codes from it.
+
+       o   Not  all  of  these  are  necessarily  supported  on any particular
+           terminal.
+
+       o   The  naming  convention  may  seem  obscure,  with  some   apparent
+           misspellings  (such  as "RSUME" for "resume"); the names correspond
+           to  the  terminfo  capability  names  for  the   keys,   and   were
+           standardized  before  the  IBM  PC/AT  keyboard  layout  achieved a
+           dominant position in industry.
+
+              Symbol          Key name
+              -----------------------------------------------------------------
+              KEY_BREAK       Break key
+              KEY_DOWN
+              KEY_UP          Arrow keys
+              KEY_LEFT
+              KEY_RIGHT
+
+              KEY_HOME        Home key (upward+left arrow)
+              KEY_BACKSPACE   Backspace
+              KEY_F0          Function keys; space for 64 keys is reserved
+              KEY_F(n)        Function key n where 0 <= n <= 63
+              KEY_DL          Delete line
+              KEY_IL          Insert line
+              KEY_DC          Delete character
+              KEY_IC          Insert character/Enter insert mode
+              KEY_EIC         Exit insert character mode
+              KEY_CLEAR       Clear screen
+              KEY_EOS         Clear to end of screen
+              KEY_EOL         Clear to end of line
+              KEY_SF          Scroll one line forward
+              KEY_SR          Scroll one line backward (reverse)
+              KEY_NPAGE       Next page/Page up
+              KEY_PPAGE       Previous page/Page down
+              KEY_STAB        Set tab
+              KEY_CTAB        Clear tab
+              KEY_CATAB       Clear all tabs
+              KEY_ENTER       Enter/Send
+              KEY_SRESET      Soft (partial) reset
+              KEY_RESET       (Hard) reset
+              KEY_PRINT       Print/Copy
+              KEY_LL          Home down/Bottom (lower left)
+              KEY_A1          Upper left of keypad
+              KEY_A3          Upper right of keypad
+              KEY_B2          Center of keypad
+              KEY_C1          Lower left of keypad
+              KEY_C3          Lower right of keypad
+              KEY_BTAB        Back tab key
+              KEY_BEG         Beg(inning) key
+              KEY_CANCEL      Cancel key
+              KEY_CLOSE       Close key
+              KEY_COMMAND     Cmd (command) key
+              KEY_COPY        Copy key
+              KEY_CREATE      Create key
+              KEY_END         End key
+              KEY_EXIT        Exit key
+              KEY_FIND        Find key
+              KEY_HELP        Help key
+              KEY_MARK        Mark key
+              KEY_MESSAGE     Message key
+              KEY_MOUSE       Mouse event occurred
+              KEY_MOVE        Move key
+              KEY_NEXT        Next object key
+              KEY_OPEN        Open key
+              KEY_OPTIONS     Options key
+              KEY_PREVIOUS    Previous object key
+              KEY_REDO        Redo key
+              KEY_REFERENCE   Ref(erence) key
+              KEY_REFRESH     Refresh key
+              KEY_REPLACE     Replace key
+              KEY_RESIZE      Screen resized
+              KEY_RESTART     Restart key
+              KEY_RESUME      Resume key
+              KEY_SAVE        Save key
+              KEY_SELECT      Select key
+              KEY_SUSPEND     Suspend key
+              KEY_UNDO        Undo key
+              -----------------------------------------------------------------
+              KEY_SBEG        Shifted beginning key
+              KEY_SCANCEL     Shifted cancel key
+              KEY_SCOMMAND    Shifted command key
+              KEY_SCOPY       Shifted copy key
+              KEY_SCREATE     Shifted create key
+
+              KEY_SDC         Shifted delete character key
+              KEY_SDL         Shifted delete line key
+              KEY_SEND        Shifted end key
+              KEY_SEOL        Shifted clear line key
+              KEY_SEXIT       Shifted exit key
+              KEY_SFIND       Shifted find key
+              KEY_SHELP       Shifted help key
+              KEY_SHOME       Shifted home key
+              KEY_SIC         Shifted insert key
+              KEY_SLEFT       Shifted left arrow key
+              KEY_SMESSAGE    Shifted message key
+              KEY_SMOVE       Shifted move key
+              KEY_SNEXT       Shifted next object key
+              KEY_SOPTIONS    Shifted options key
+              KEY_SPREVIOUS   Shifted previous object key
+              KEY_SPRINT      Shifted print key
+              KEY_SREDO       Shifted redo key
+              KEY_SREPLACE    Shifted replace key
+              KEY_SRIGHT      Shifted right arrow key
+              KEY_SRSUME      Shifted resume key
+              KEY_SSAVE       Shifted save key
+              KEY_SSUSPEND    Shifted suspend key
+              KEY_SUNDO       Shifted undo key
+
+       Many keyboards feature a nine-key directional pad.
+
+                                   +-----+------+-------+
+                                   | A1  |  up  |  A3   |
+                                   +-----+------+-------+
+                                   |left |  B2  | right |
+                                   +-----+------+-------+
+                                   | C1  | down |  C3   |
+                                   +-----+------+-------+
+       Two of the symbols in the list above do not correspond  to  a  physical
+       key.
+
+       o   wgetch  returns  KEY_RESIZE,  even  if  the window's keypad mode is
+           disabled, if ncurses has handled a SIGWINCH signal since wgetch was
+           called; see initscr(3x) and resizeterm(3x).
+
+       o   wgetch  returns KEY_MOUSE to indicate that a mouse event is pending
+           collection; see curs_mouse(3x).  Receipt of this  code  requires  a
+           window's  keypad  mode  to  be  enabled, because to interpret mouse
+           input (as with xterm(1)'s mouse protocol),  ncurses  must  read  an
+           escape sequence, as with a function key.
+
+
+

      Testing Key Codes

      +       In  ncurses,  has_key  returns  a  Boolean value indicating whether the
+       terminal type recognizes its parameter as a key code value.   See  also
+       define_key(3x) and key_defined(3x).

      RETURN VALUE

      -       All  routines  return the integer ERR upon failure and an integer value
-       other than ERR (OK in the case of ungetch) upon successful completion.
+       wgetch returns a key code identifying the key event as described above,
+       which may include KEY_RESIZE or KEY_MOUSE indicating non-key events, or
+       ERR on failure.  wgetch fails if
+
+       o   its timeout expires without any data arriving, or
+
+       o   execution  was  interrupted by a signal, in which case errno is set
+           to EINTR.
 
-          ungetch
-               returns ERR if there is no more room in the FIFO.
+       ungetch returns OK on success and ERR on  failure.   ungetch  fails  if
+       there is no more room in the input queue.
 
-          wgetch
-               returns ERR if the window pointer is null, or  if  its  timeout
-               expires without having any data, or if the execution was inter-
-               rupted by a signal (errno will be set to EINTR).
+       has_key returns TRUE or FALSE.
 
-       Functions with a "mv" prefix first  perform  a  cursor  movement  using
-       wmove, and return an error if the position is outside the window, or if
-       the window pointer is null.
+       Functions  taking  a  WINDOW  pointer  argument  fail  if win is a null
+       pointer.
+
+       Functions prefixed with "mv" first perform cursor movement and fail  if
+       the position (y, x) is outside the window boundaries.

      NOTES

      -       Use of the escape key by a programmer for a single  character  function
-       is  discouraged, as it will cause a delay of up to one second while the
-       keypad code looks for a following function-key sequence.
+       getch, mvgetch, and mvwgetch may be implemented as macros.
+
+       curses  discourages assignment of the ESC key to a discrete function by
+       the programmer because the library requires a delay while it awaits the
+       potential remainder of a terminal escape sequence.
+
+       Some  key  strokes  are  indistinguishable from control characters; for
+       example, KEY_ENTER may be the same as ^M, and KEY_BACKSPACE may be  the
+       same  as ^H or ^?.  Consult the terminfo entry for the terminal type to
+       determine whether this  is  the  case;  see  infocmp(1).   Some  curses
+       implementations, including ncurses, honor the terminfo key definitions;
+       others treat such control characters specially.
 
-       Some keys may be the same as commonly used control keys, e.g.,  KEY_EN-
-       TER  versus control/M, KEY_BACKSPACE versus control/H.  Some curses im-
-       plementations may differ according to whether they treat these  control
-       keys  specially  (and ignore the terminfo), or use the terminfo defini-
-       tions.  Ncurses uses the terminfo definition.  If it says that  KEY_EN-
-       TER is control/M, getch will return KEY_ENTER when you press control/M.
+       curses distinguishes the Enter  keys  in  the  alphabetic  and  numeric
+       keypad  sections  of a keyboard because (most) terminals do.  KEY_ENTER
+       refers to the key on the numeric keypad and, like other function  keys,
+       is reliably recognized only if the window's keypad mode is enabled.
 
-       Generally,  KEY_ENTER denotes the character(s) sent by the Enter key on
-       the numeric keypad:
+       o   The  terminfo  key_enter  (kent) capability describes the character
+           (sequence) sent by the  Enter  key  of  a  terminal's  numeric  (or
+           similar) keypad.
 
-       o   the terminal description lists the most useful keys,
+       o   "Enter or send" is X/Open Curses's description of this key.
 
-       o   the Enter key on the regular keyboard is  already  handled  by  the
-           standard ASCII characters for carriage-return and line-feed,
+       curses  treats the Enter or Return key in the alphabetic section of the
+       keyboard differently.
 
-       o   depending on whether nl or nonl was called, pressing "Enter" on the
-           regular keyboard may return either a carriage-return or  line-feed,
-           and finally
+       o   It usually produces a control code for carriage return (^M) or line
+           feed (^J).
 
-       o   "Enter or send" is the standard description for this key.
+       o   Depending  on  the  terminal  mode (raw, cbreak, or canonical), and
+           whether nl(3x) or nonl(3x)  has  been  called,  wgetch  may  return
+           either  a  carriage return or line feed upon an Enter or Return key
+           stroke.
 
-       When   using   getch,  wgetch,  mvgetch,  or  mvwgetch,  nocbreak  mode
-       (nocbreak) and echo mode (echo) should not be used at  the  same  time.
-       Depending  on the state of the tty driver when each character is typed,
-       the program may produce undesirable results.
+       Use of wgetch with echo(3x) and neither cbreak(3x) nor raw(3x)  is  not
+       well-defined.
 
-       Note that getch, mvgetch, and mvwgetch may be macros.
+       Historically,  the  list of key code macros above was influenced by the
+       keyboard of the AT&T 7300 (also known variously as the  "3B1",  "Safari
+       4",  and  "UNIX  PC"),  a  1985 machine rich in function keys.  Today's
+       computer keyboards are based on that of the IBM PC/AT and tend to  have
+       fewer.  A curses application can expect such a keyboard to transmit key
+       codes  KEY_UP,  KEY_DOWN,  KEY_LEFT,  KEY_RIGHT,   KEY_HOME,   KEY_END,
+       KEY_PPAGE  (Page  Up),  KEY_NPAGE  (Page Down), KEY_IC (Insert), KEY_DC
+       (Delete), KEY_A1, KEY_A3, KEY_B2, KEY_C1, KEY_C3, and KEY_F(n) for 1 <=
+       n <= 12.
 
-       Historically, the set of keypad macros was largely defined by  the  ex-
-       tremely  function-key-rich  keyboard of the AT&T 7300, aka 3B1, aka Sa-
-       fari 4.  Modern personal computers usually have only a small subset  of
-       these.   IBM  PC-style  consoles  typically  support  little  more than
-       KEY_UP, KEY_DOWN, KEY_LEFT, KEY_RIGHT,  KEY_HOME,  KEY_END,  KEY_NPAGE,
-       KEY_PPAGE,  and  function  keys  1  through 12.  The Ins key is usually
-       mapped to KEY_IC.
+
+

      EXTENSIONS

      +       In ncurses, when a window's "no time-out" mode is not set, the ESCDELAY
+       variable configures the duration of the timer used  to  disambiguate  a
+       function  key character sequence from a series of key strokes beginning
+       with ESC typed by the user; see curs_variables(3x).
+
+       has_key is an ncurses extension, and  is  not  found  in  SVr4  curses,
+       4.4BSD curses, or any other previous curses implementation.

      PORTABILITY

      -       The *get* functions are described in the XSI Curses standard, Issue  4.
-       They  read  single-byte  characters  only.  The standard specifies that
-       they return ERR on failure, but specifies no error conditions.
+       Applications employing ncurses extensions should condition their use on
+       the visibility of the NCURSES_VERSION preprocessor macro.
+
+       Except as noted in section "EXTENSIONS" above,  X/Open  Curses  Issue 4
+       describes these functions.  It specifies no error conditions for them.
 
-       The echo behavior of these functions on  input  of  KEY_  or  backspace
-       characters  was not specified in the SVr4 documentation.  This descrip-
-       tion is adopted from the XSI Curses standard.
+       SVr4  describes  a  successful  return  value only as "an integer value
+       other than ERR".
 
-       The behavior of getch and friends in the presence of handled signals is
-       unspecified in the SVr4 and XSI Curses documentation.  Under historical
-       curses implementations, it varied depending on  whether  the  operating
-       system's  implementation of handled signal receipt interrupts a read(2)
-       call in progress or not, and also (in some  implementations)  depending
-       on whether an input timeout or non-blocking mode has been set.
+       wgetch reads only single-byte characters.
 
-       KEY_MOUSE is mentioned in XSI Curses, along with a few related terminfo
-       capabilities, but no higher-level functions use the feature.   The  im-
-       plementation in ncurses is an extension.
+       The echo behavior of these functions on  input  of  KEY_  or  backspace
+       characters is not documented in SVr4 curses.
 
-       KEY_RESIZE is an extension first implemented for ncurses.  NetBSD curs-
-       es later added this extension.
+       The  behavior  of  wgetch  in  the  presence  of signal handlers is not
+       documented in SVr4 curses and is  unspecified  by  X/Open  Curses.   In
+       historical  curses  implementations, it varied depending on whether the
+       operating system's dispatch of a signal  to  a  handler  interrupted  a
+       read(2) call in progress, and also (in some implementations) whether an
+       input timeout or non-blocking mode had been  set.   A  portable  curses
+       application  prepares  for  two  cases:  (a)  signal  receipt  does not
+       interrupt wgetch; or (b) signal receipt interrupts wgetch and causes it
+       to return ERR with errno set to EINTR.
 
-       Programmers concerned about portability should be prepared  for  either
-       of  two  cases: (a) signal receipt does not interrupt getch; (b) signal
-       receipt interrupts getch and causes it to return ERR with errno set  to
-       EINTR.
+       KEY_MOUSE is mentioned in X/Open Curses, along with a few related term-
+       info capabilities, but no higher-level functions use the feature.   The
+       implementation in ncurses is an extension.
 
-       The  has_key function is unique to ncurses.  We recommend that any code
-       using it be conditionalized on the NCURSES_VERSION feature macro.
+       KEY_RESIZE  and  has_key  are extensions first implemented for ncurses.
+       By  2022,  PDCurses  and  NetBSD  curses  had  added  them  along  with
+       KEY_MOUSE.

      SEE ALSO

      -       curses(3x), curs_inopts(3x), curs_mouse(3x),  curs_move(3x),  curs_out-
-       opts(3x), curs_refresh(3x), curs_variables(3x), resizeterm(3x).
+       ECMA-6  "7-bit  coded  Character  Set" <https://ecma-international.org/
+       publications-and-standards/standards/ecma-6/>
+
+       ECMA-48  "Control  Functions  for  Coded  Character   Sets"   <https://
+       ecma-international.org/publications-and-standards/standards/ecma-48/>
+
+       curs_get_wch(3x)  describes comparable functions of the ncurses library
+       in its wide-character configuration (ncursesw).
 
-       Comparable  functions  in the wide-character (ncursesw) library are de-
-       scribed in curs_get_wch(3x).
+       curses(3x),    curs_addch(3x),     curs_inopts(3x),     curs_mouse(3x),
+       curs_move(3x),  curs_outopts(3x), curs_refresh(3x), curs_variables(3x),
+       resizeterm(3x), ascii(7)
 
 
 
-                                                                curs_getch(3x)
+ncurses 6.5                       2025-02-15                    curs_getch(3x)
      diff --git a/doc/html/man/curs_getstr.3x.html b/doc/html/man/curs_getstr.3x.html index 97089e22..b484da0c 100644 --- a/doc/html/man/curs_getstr.3x.html +++ b/doc/html/man/curs_getstr.3x.html @@ -1,6 +1,6 @@ -curs_getstr 3x +curs_getstr 3x 2025-02-01 ncurses 6.5 Library calls -

      curs_getstr 3x

      +

      curs_getstr 3x 2025-02-01 ncurses 6.5 Library calls

      -curs_getstr(3x)                                                curs_getstr(3x)
+curs_getstr(3x)                  Library calls                 curs_getstr(3x)

      NAME

      -       getstr, getnstr, wgetstr, wgetnstr, mvgetstr, mvgetnstr, mvwgetstr,
-       mvwgetnstr - accept character strings from curses terminal keyboard
+       getstr,  getnstr,  wgetstr,  wgetnstr,  mvgetstr, mvgetnstr, mvwgetstr,
+       mvwgetnstr - read a character string from curses terminal keyboard

      SYNOPSIS

              #include <curses.h>
 
-       int getstr(char *str);
-       int getnstr(char *str, int n);
-       int wgetstr(WINDOW *win, char *str);
-       int wgetnstr(WINDOW *win, char *str, int n);
+       int getstr(char * str);
+       int wgetstr(WINDOW * win, char * str);
+       int mvgetstr(int y, int x, char * str);
+       int mvwgetstr(WINDOW * win, int y, int x, char * str);
 
-       int mvgetstr(int y, int x, char *str);
-       int mvwgetstr(WINDOW *win, int y, int x, char *str);
-       int mvgetnstr(int y, int x, char *str, int n);
-       int mvwgetnstr(WINDOW *win, int y, int x, char *str, int n);
+       int getnstr(char * str, int n);
+       int wgetnstr(WINDOW * win, char * str, int n);
+       int mvgetnstr(int y, int x, char * str, int n);
+       int mvwgetnstr(WINDOW * win, int y, int x, char * str,
+             int n);

      DESCRIPTION

      -       The function getstr is equivalent to a series of calls to getch,  until
-       a  newline or carriage return is received (the terminating character is
-       not included in the returned string).  The resulting value is placed in
-       the area pointed to by the character pointer str, followed by a NUL.
+       wgetstr populates a  user-supplied  string  buffer  str  by  repeatedly
+       calling  wgetch(3x) with the win argument until a line feed or carriage
+       return character is input.  The function
 
-       The  getnstr  function reads from the stdscr default window.  The other
-       functions, such as wgetnstr, read from the window given as a parameter.
+       o   does not copy the terminating character to str;
 
-       getnstr reads at most n characters, thus preventing a possible overflow
-       of  the input buffer.  Any attempt to enter more characters (other than
-       the terminating newline or carriage return) causes  a  beep.   Function
-       keys also cause a beep and are ignored.
+       o   always terminates str with a null character;
 
-       The user's erase and kill characters are interpreted:
+       o   interprets  the   screen's   erase   and   kill   characters   (see
+           erasechar(3x) and killchar(3x));
 
-       o   The  erase  character (e.g., ^H) erases the character at the end of
-           the buffer, moving the cursor to the left.
+       o   recognizes  function  keys  only  if  the screen's keypad option is
+           enabled (see keypad(3x));
 
-           If keypad mode is on for the window, KEY_LEFT and KEY_BACKSPACE are
-           both considered equivalent to the user's erase character.
+       o   treats the function keys KEY_LEFT and KEY_BACKSPACE the same as the
+           erase character; and
 
-       o   The kill character (e.g., ^U) erases the entire buffer, leaving the
-           cursor at the beginning of the buffer.
+       o   discards  function key inputs other than those treated as the erase
+           character, calling beep(3x).
 
-       Characters input are echoed only if echo  is  currently  on.   In  that
-       case,  backspace is echoed as deletion of the previous character (typi-
-       cally a left motion).
+       The erase character replaces the character at the  end  of  the  buffer
+       with  a  null character, while the kill character does the same for the
+       entire buffer.
+
+       If the screen's echo option is enabled (see echo(3x)), wgetstr  updates
+       win with waddch(3x).  Further,
+
+       o   the  erase  character and its function key synonyms move the cursor
+           to the left, and
+
+       o   the kill character returns the cursor to where it was located  when
+           wgetstr was called.
+
+       wgetnstr  is  similar,  but  reads  at  most  n  characters, aiding the
+       application to avoid overrunning the buffer to which  str  points.   An
+       attempt  to  input  more  than n characters (other than the terminating
+       line feed or carriage  return)  is  ignored  with  a  beep.   If  n  is
+       negative, wgetn_wstr reads up to LINE_MAX characters (see sysconf(3)).
+
+       ncurses(3x) describes the variants of these functions.

      RETURN VALUE

      -       All routines return the integer ERR upon failure and an OK (SVr4 speci-
-       fies  only  "an  integer value other than ERR") upon successful comple-
-       tion.
+       These functions return OK on success and ERR on failure.
+
+       In ncurses, they return ERR if
 
-       X/Open defines no error conditions.
+       o   win is NULL, or
 
-       In this implementation, these functions return an error if  the  window
-       pointer is null, or if its timeout expires without having any data.
+       o   if an internal wgetch(3x) call fails.
 
-       This  implementation  provides an extension as well.  If a SIGWINCH in-
-       terrupts the function, it will return KEY_RESIZE rather than OK or ERR.
+       Further,  in  ncurses,  these functions return KEY_RESIZE if a SIGWINCH
+       event interrupts the function.
 
-       Functions with a "mv" prefix first  perform  a  cursor  movement  using
-       wmove, and return an error if the position is outside the window, or if
-       the window pointer is null.
+       Functions prefixed with "mv" first perform cursor movement and fail  if
+       the position (y, x) is outside the window boundaries.

      NOTES

      -       Note that getstr, mvgetstr, and mvwgetstr may be macros.
+       All of these functions except wgetnstr may be implemented as macros.
+
+       Reading  input  that  overruns  the  buffer  pointed  to  by str causes
+       undefined  results.   Use  the  n-infixed   functions,   and   allocate
+       sufficient storage for str -- at least n+1 times sizeof(char).
+
+       While  these  functions  conceptually  implement  a  series of calls to
+       wgetch, they also temporarily change properties of the curses screen to
+       permit  simple  editing  of  the input buffer.  Each function saves the
+       screen's state, calls nl(3x), and,  if  the  screen  was  in  canonical
+       ("cooked")  mode,  cbreak(3x).  Before returning, it restores the saved
+       screen state.  Other implementations differ in detail, affecting  which
+       control   characters  they  can  accept  in  the  buffer;  see  section
+       "PORTABILITY" below.
+
+
+

      EXTENSIONS

      +       getnstr, wgetnstr, mvgetnstr, and mvwgetnstr's handing  of  negative  n
+       values is an ncurses extension.
+
+       The return value KEY_RESIZE is an ncurses extension.

      PORTABILITY

      -       These functions are described in the  XSI  Curses  standard,  Issue  4.
-       They  read  single-byte  characters only.  The standard does not define
-       any error conditions.  This implementation returns ERR  if  the  window
-       pointer is null, or if the lower-level wgetch(3x) call returns an ERR.
+       Applications employing ncurses extensions should condition their use on
+       the visibility of the NCURSES_VERSION preprocessor macro.
+
+       X/Open Curses Issue 4 describes these functions.  It specifies no error
+       conditions  for them, but indicates that wgetnstr and its variants read
+       "the entire multi-byte sequence associated with a character" and "fail"
+       if n and str together do not describe a buffer "large enough to contain
+       any complete characters".   In  ncurses,  however,  wgetch  reads  only
+       single-byte characters, so this scenario does not arise.
 
-       SVr3  and  early  SVr4  curses  implementations did not reject function
-       keys; the SVr4.0 documentation claimed that  "special  keys"  (such  as
-       function  keys, "home" key, "clear" key, etc.) are "interpreted", with-
-       out giving details.  It lied.  In fact, the "character" value  appended
-       to  the  string by those implementations was predictable but not useful
-       (being, in fact, the low-order eight bits of the key's KEY_ value).
+       SVr4  describes  a  successful  return  value only as "an integer value
+       other than ERR".
 
-       The functions getnstr, mvgetnstr, and mvwgetnstr were present  but  not
-       documented in SVr4.
+       SVr3 and early SVr4 curses  implementations  did  not  reject  function
+       keys; the SVr4 documentation asserted that, like the screen's erase and
+       kill characters, they were
 
-       X/Open Curses, Issue 5 (2007) stated that these functions "read at most
-       n bytes" but did not state whether the terminating NUL  is  counted  in
-       that  limit.   X/Open  Curses,  Issue 7 (2009) changed that to say they
-       "read at most n-1 bytes" to allow for the terminating NUL.  As of 2018,
-       some implementations do, some do not count it:
+              interpreted, as well as any special keys (such as function keys,
+              "home" key, "clear" key, etc.)
 
-       o   ncurses  6.1  and PDCurses do not count the NUL in the given limit,
-           while
+       without  further  detail.   It lied.  The "character" value appended to
+       the string by those implementations was predictable but not  useful  --
+       being,  in  fact,  the  low-order  eight  bits  of  the key code's KEY_
+       constant value.  (The same  language,  unchanged  except  for  styling,
+       survived  into  X/Open  Curses  Issue 4, Version 2 but disappeared from
+       Issue 7.)
 
-       o   Solaris SVr4 and NetBSD curses count the NUL as part of the limit.
+       A draft of X/Open Curses Issue 5 (which never saw final release) stated
+       that  these  functions "read at most n bytes" but did not state whether
+       the terminating null  character  counted  toward  that  limit.   X/Open
+       Curses  Issue 7  changed  that  to say they "read at most n-1 bytes" to
+       allow  for  the  terminating  null  character.   As   of   2018,   some
+       implementations count it, some do not.
 
-       o   Solaris xcurses provides both:  its  wide-character  wget_nstr  re-
-           serves a NUL, but its wgetnstr does not count the NUL consistently.
+       o   ncurses 6.1 and PDCurses do not count the null character toward the
+           limit, while Solaris and NetBSD curses do.
 
-       In SVr4 curses, a negative value of n tells wgetnstr to assume that the
-       caller's buffer is large enough to hold the result, i.e., to  act  like
-       wgetstr.   X/Open  Curses does not mention this (or anything related to
-       negative or zero values of n), however  most  implementations  use  the
-       feature, with different limits:
+       o   Solaris  xcurses  offers   both   behaviors:   its   wide-character
+           wgetn_wstr  reserves  room  for a wide null character, but its non-
+           wide wgetnstr does not consistently count a null  character  toward
+           the limit.
 
-       o   Solaris  SVr4  curses  and  PDCurses limit the result to 255 bytes.
-           Other Unix systems than Solaris are likely to use the same limit.
+       X/Open  Curses  does  not  specify  what  happens  if  the  length n is
+       negative.
 
-       o   Solaris xcurses limits the result to LINE_MAX bytes.
+       o   ncurses 6.2 uses LINE_MAX  or  a  larger  (system-dependent)  value
+           provided  by  sysconf(3).   If  neither  LINE_MAX  nor  sysconf  is
+           available, ncurses  uses  the  POSIX  minimum  value  for  LINE_MAX
+           (2048).   In  either  case,  it reserves a byte for the terminating
+           null character.
 
-       o   NetBSD 7 assumes no particular limit for the result  from  wgetstr.
-           However,  it  limits  the wgetnstr parameter n to ensure that it is
-           greater than zero.
+       o   In SVr4 curses, a negative n tells  wgetnstr  to  assume  that  the
+           caller's  buffer  is  large enough to hold the result; that is, the
+           function then acts like wgetstr.  X/Open Curses  does  not  mention
+           this  behavior  (or  anything  related  to  nonpositive  n values),
+           however most curses libraries implement it.   Most  implementations
+           nevertheless  enforce  an  upper  limit  on the count of bytes they
+           write to the destination buffer str.
 
-           A comment in NetBSD's source code states that this is specified  in
-           SUSv2.
+       o   BSD  curses  lacked  wgetnstr,  and  its  wgetstr  wrote   to   str
+           unboundedly, as did that in SVr2.
 
-       o   ncurses  (before  6.2)  assumes  no particular limit for the result
-           from wgetstr, and treats the n  parameter  of  wgetnstr  like  SVr4
-           curses.
+       o   PDCurses,  and  SVr3  and  later,  and  Solaris  curses  limit both
+           functions to writing 256  bytes.   Other  System V-based  platforms
+           likely use the same limit.
 
-       o   ncurses  6.2  uses  LINE_MAX,  or a larger (system-dependent) value
-           which the sysconf function may provide.   If  neither  LINE_MAX  or
-           sysconf  is available, ncurses uses the POSIX value for LINE_MAX (a
-           2048 byte limit).  In either case, it reserves a byte for the  ter-
-           minating NUL.
+       o   Solaris   xcurses   limits   the   write  to  LINE_MAX  bytes  (see
+           sysconf(3)).
 
-       Although  getnstr  is equivalent to a series of calls to getch, it also
-       makes changes to the curses modes to allow simple editing of the  input
-       buffer:
+       o   NetBSD 7 curses imposes no particular limit on the  length  of  the
+           write,  but does validate n to ensure that it is greater than zero.
+           A comment in NetBSD's source  code  asserts  that  SUSv2  specifies
+           this.
 
-       o   getnstr  saves  the  current  value of the nl, echo, raw and cbreak
-           modes, and sets nl, noecho, noraw, and cbreak.
+       Implementations vary in their handling of input control characters.
 
-           getnstr handles the echoing of characters, rather than  relying  on
-           the caller to set an appropriate mode.
+       o   While they may enable the screen's echo option, some do not take it
+           out of raw mode,  and  may  take  cbreak  mode  into  account  when
+           deciding whether to handle echoing within wgetnstr or to rely on it
+           as a side effect of calling wgetch.
 
-       o   It  also  obtains  the erase and kill characters from erasechar and
-           killchar, respectively.
+       o   Originally, ncurses, like its progenitor pcurses, had its  wgetnstr
+           call  noraw  and cbreak before accepting input.  That may have been
+           done to make function keys work; it is not  necessary  with  modern
+           ncurses.
 
-       o   On return, getnstr restores the modes to their previous values.
+           Since  1995,  ncurses has provided handlers for SIGINTR and SIGQUIT
+           events, which are typically generated at the keyboard with  ^C  and
+           ^\ respectively.  In cbreak mode, those handlers catch a signal and
+           stop  the  program,  whereas  other  implementations  write   those
+           characters into the buffer.
 
-       Other implementations differ in their treatment of special characters:
+       o   Starting  with  ncurses  6.3 (2021), wgetnstr preserves raw mode if
+           the screen was already in that state, allowing  one  to  enter  the
+           characters  the  terminal  interprets  as interrupt and quit events
+           into the buffer, for better compatibility with SVr4 curses.
 
-       o   While they may set the echo mode, other implementations do not mod-
-           ify  the  raw mode, They may take the cbreak mode set by the caller
-           into account when deciding whether to handle echoing within getnstr
-           or as a side-effect of the getch calls.
 
-       o   The original ncurses (as pcurses in 1986) set noraw and cbreak when
-           accepting input for getnstr.  That may have been done to make func-
-           tion- and cursor-keys work; it is not necessary with ncurses.
+

      HISTORY

      +       4BSD (1980) introduced wgetstr along with its variants.
 
-           Since  1995, ncurses has provided signal handlers for INTR and QUIT
-           (e.g., ^C or ^\).  With the noraw and cbreak  settings,  those  may
-           catch  a  signal  and stop the program, where other implementations
-           allow one to enter those characters in the buffer.
+       SVr3.1 (1987) added wgetnstr, but none of its variants.
 
-       o   Starting in 2021 (ncurses 6.3), getnstr sets raw, rather than noraw
-           and  cbreak for better compatibility with SVr4-curses, e.g., allow-
-           ing one to enter a ^C into the buffer.
+       X/Open  Curses  Issue 4  (1995)  specified  getnstr,   mvgetnstr,   and
+       mvwgetnstr.

      SEE ALSO

      -       curses(3x), curs_getch(3x), curs_termattrs(3x), curs_variables(3x).
+       curs_get_wstr(3x) describes comparable functions of the ncurses library
+       in its wide-character configuration (ncursesw).
+
+       curses(3x),    curs_addch(3x),     curs_getch(3x),     curs_inopts(3x),
+       curs_termattrs(3x),
 
 
 
-                                                               curs_getstr(3x)
+ncurses 6.5                       2025-02-01                   curs_getstr(3x)
      diff --git a/doc/html/man/curs_getyx.3x.html b/doc/html/man/curs_getyx.3x.html index 0f463c58..3558cb59 100644 --- a/doc/html/man/curs_getyx.3x.html +++ b/doc/html/man/curs_getyx.3x.html @@ -1,6 +1,6 @@ -curs_getyx 3x +curs_getyx 3x 2025-02-01 ncurses 6.5 Library calls -

      curs_getyx 3x

      +

      curs_getyx 3x 2025-02-01 ncurses 6.5 Library calls

      -curs_getyx(3x)                                                  curs_getyx(3x)
+curs_getyx(3x)                   Library calls                  curs_getyx(3x)

      NAME

      -       getyx,  getparyx,  getbegyx,  getmaxyx  -  get curses cursor and window
+       getyx,  getparyx,  getbegyx,  getmaxyx  -  get curses cursor and window
        coordinates
 
 
@@ -55,53 +55,60 @@ 
      curs_getyx 3x
      
        #include <curses.h>
 
        void getyx(WINDOW *win, int y, int x);
-       void getparyx(WINDOW *win, int y, int x);
        void getbegyx(WINDOW *win, int y, int x);
        void getmaxyx(WINDOW *win, int y, int x);
 
+       void getparyx(WINDOW *win, int y, int x);
+

      DESCRIPTION

      -       The getyx macro places the current cursor position of the given  window
-       in the two integer variables y and x.
-
-       If  win  is  a  subwindow,  the  getparyx  macro  places  the beginning
-       coordinates of the subwindow relative to the  parent  window  into  two
-       integer variables y and x.  Otherwise, -1 is placed into y and x.
+       These macros obtain the cursor position and  bounds  information  of  a
+       curses window win.  getyx stores win's cursor position in the variables
+       y and x.  getmaxyx stores win's maximum valid line and  column  numbers
+       in  y  and  x, respectively.  getbegyx similarly stores the position of
+       win's origin  relative  to  that  of  the  screen  (for  stdscr,  these
+       coordinates are always 0).
 
-       Like  getyx,  the  getbegyx  and  getmaxyx  macros  store  the  current
-       beginning coordinates and size of the specified window.
+       If  win  is a subwindow (see subwin(3x)), the getparyx macro places the
+       coordinates of its origin relative to its parent window into y  and  x,
+       and -1 into both if it is not.

      RETURN VALUE

      -       The return values of these macros are undefined (i.e., they should  not
-       be used as the right-hand side of assignment statements).
+       No return values are defined for macros.  Do not use them as the right-
+       hand side of assignment statements.

      NOTES

      -       All  of these interfaces are macros.  A "&" is not necessary before the
-       variables y and x.
+       All of these interfaces are implemented as macros.  An "&" operator  is
+       not necessary before the variables y and x.

      PORTABILITY

      -       The getyx, getparyx, getbegyx and getmaxyx macros are described in  the
-       XSI Curses standard, Issue 4.
+       These macros are described in X/Open Curses Issue 4.
 
-       This  implementation also provides functions getbegx, getbegy, getcurx,
-       getcury, getmaxx, getmaxy, getparx and getpary for  compatibility  with
-       older versions of curses.
+       ncurses  also  provides  functions  getbegy, getbegx, getcury, getcurx,
+       getmaxy, getmaxx, getpary, and getparx for compatibility with  System V
+       curses that were not standardized; see curs_legacy(3x).
 
-       Although  X/Open  Curses  does  not  address this, many implementations
-       provide members of the WINDOW structure containing values corresponding
-       to  these  macros.  For best portability, do not rely on using the data
-       in WINDOW, since some implementations make WINDOW opaque (do not  allow
-       direct use of its members).
+       Although X/Open Curses does not address the issue, many implementations
+       expose members of the WINDOW structure containing values  corresponding
+       to   these   macros.    Do   not   rely  on  their  availability;  some
+       implementations make WINDOW opaque (that is, they do not  allow  direct
+       access to its members).
 
        Besides the problem of opaque structures, the data stored in like-named
-       members may not have like-values  in  different  implementations.   For
-       example,  the  WINDOW._maxx and WINDOW._maxy values in ncurses have (at
-       least  since  release  1.8.1)  differed  by   one   from   some   other
-       implementations.   The  difference  is  hidden  by  means  of the macro
-       getmaxyx.
+       members may not have  values  of  the  same  meaning  across  different
+       implementations.    For   example,   the  values  of  WINDOW._maxx  and
+       WINDOW._maxy in ncurses have long  differed  by  one  from  some  other
+       implementations.  The getmaxyx macro hides this difference.
+
+
+

      HISTORY

      +       4BSD (1980) introduced getyx.
+
+       SVr3  (1987)  added  getbegyx  and  getmaxyx.   SVr3.1  later that year
+       supplied getparyx.

      SEE ALSO

      @@ -109,7 +116,7 @@ 
      curs_getyx 3x
      
 
 
 
-                                                                curs_getyx(3x)
+ncurses 6.5                       2025-02-01                    curs_getyx(3x)
      diff --git a/doc/html/man/curs_in_wch.3x.html b/doc/html/man/curs_in_wch.3x.html index f1ce0f49..2fdada43 100644 --- a/doc/html/man/curs_in_wch.3x.html +++ b/doc/html/man/curs_in_wch.3x.html @@ -1,6 +1,6 @@ -curs_in_wch 3x +curs_in_wch 3x 2025-02-01 ncurses 6.5 Library calls -

      curs_in_wch 3x

      +

      curs_in_wch 3x 2025-02-01 ncurses 6.5 Library calls

      -curs_in_wch(3x)                                                curs_in_wch(3x)
+curs_in_wch(3x)                  Library calls                 curs_in_wch(3x)

      NAME

      -       in_wch,  mvin_wch, mvwin_wch, win_wch - extract a complex character and
-       rendition from a window
+       in_wch,  win_wch,  mvin_wch, mvwin_wch - get a curses complex character
+       from a window

      SYNOPSIS

              #include <curses.h>
 
-       int in_wch(cchar_t *wcval);
-       int win_wch(WINDOW *win, cchar_t *wcval);
-
-       int mvin_wch(int y, int x, cchar_t *wcval);
-       int mvwin_wch(WINDOW *win, int y, int x, cchar_t *wcval);
+       int in_wch(cchar_t * wch);
+       int win_wch(WINDOW * win, cchar_t * wch);
+       int mvin_wch(int y, int x, cchar_t * wch);
+       int mvwin_wch(WINDOW * win, int y, int x, cchar_t * wch);

      DESCRIPTION

      -       These functions extract the complex character and  rendition  from  the
-       current position in the named window into the cchar_t object referenced
-       by wcval.
+       win_wch copies the curses complex character at the cursor  position  in
+       win  into  wch.   Use  getcchar(3x)  to  extract  its  character  code,
+       attributes, and  color  pair  identifier.   ncurses(3x)  describes  the
+       variants of this function.

      RETURN VALUE

      -       No errors are defined in the XSI Curses standard.  This  implementation
-       checks  for  null  pointers,  returns  ERR  in that case.  Also, the mv
-       routines check for error moving the cursor, returning ERR in that case.
-       Otherwise they return OK.
+       These functions return OK on success and ERR on failure.
+
+       In ncurses, they return ERR if win is NULL.
 
-       Functions  with  a  "mv"  prefix  first perform a cursor movement using
-       wmove, and return an error if the position is outside the window, or if
-       the window pointer is null.
+       Functions  prefixed with "mv" first perform cursor movement and fail if
+       the position (y, x) is outside the window boundaries.

      NOTES

      -       Note that all of these routines may be macros.
+       in_wch, mvin_wch, and mvwin_wch may be implemented as macros.
+
+       Unlike winch(3x), win_wch and its  variants  store  the  value  of  the
+       retrieved  character  in  an  additional  wch  parameter instead of the
+       return value.

      PORTABILITY

      -       These functions are described in the XSI Curses standard, Issue 4.
+       X/Open Curses Issue 4 describes these functions.  It specifies no error
+       conditions for them.
+
+
+

      HISTORY

      +       X/Open  Curses Issue 4 (1995) initially specified these functions.  The
+       System V Interface Definition Version 4 of the same  year  specified  a
+       function  named  winwch  (and  the  usual  variants).  This was a later
+       addition to SVr4.x,  not  appearing  in  the  first  SVr4  (1989).   It
+       differed  from  X/Open's  later  win_wch in that it returned a value of
+       type chtype instead of cchar_t.

      SEE ALSO

      -       curses(3x), curs_inch(3x).
+       curs_inch(3x) describes comparable functions of the ncurses library  in
+       its non-wide-character configuration.
+
+       curses(3x), curs_inwstr(3x)
 
 
 
-                                                               curs_in_wch(3x)
+ncurses 6.5                       2025-02-01                   curs_in_wch(3x)
      diff --git a/doc/html/man/curs_in_wchstr.3x.html b/doc/html/man/curs_in_wchstr.3x.html index 957bef23..d0a2296f 100644 --- a/doc/html/man/curs_in_wchstr.3x.html +++ b/doc/html/man/curs_in_wchstr.3x.html @@ -1,6 +1,6 @@ -curs_in_wchstr 3x +curs_in_wchstr 3x 2025-02-01 ncurses 6.5 Library calls -

      curs_in_wchstr 3x

      +

      curs_in_wchstr 3x 2025-02-01 ncurses 6.5 Library calls

      -curs_in_wchstr(3x)                                          curs_in_wchstr(3x)
+curs_in_wchstr(3x)               Library calls              curs_in_wchstr(3x)

      NAME

      -       in_wchstr, in_wchnstr, win_wchstr, win_wchnstr, mvin_wchstr,
-       mvin_wchnstr, mvwin_wchstr, mvwin_wchnstr - get an array of complex
-       characters and renditions from a curses window
+       in_wchstr,    in_wchnstr,    win_wchstr,    win_wchnstr,   mvin_wchstr,
+       mvin_wchnstr,  mvwin_wchstr,  mvwin_wchnstr  -  get  a  curses  complex
+       character string from a window

      SYNOPSIS

              #include <curses.h>
 
        int in_wchstr(cchar_t *wchstr);
-       int in_wchnstr(cchar_t *wchstr, int n);
        int win_wchstr(WINDOW *win, cchar_t *wchstr);
-       int win_wchnstr(WINDOW *win, cchar_t *wchstr, int n);
-
        int mvin_wchstr(int y, int x, cchar_t *wchstr);
-       int mvin_wchnstr(int y, int x, cchar_t *wchstr, int n);
        int mvwin_wchstr(WINDOW *win, int y, int x, cchar_t *wchstr);
-       int mvwin_wchnstr(WINDOW *win, int y, int x, cchar_t *wchstr, int n);
 
+       int in_wchnstr(cchar_t *wchstr, int n);
+       int win_wchnstr(WINDOW *win, cchar_t *wchstr, int n);
+       int mvin_wchnstr(int y, int x, cchar_t *wchstr, int n);
+       int mvwin_wchnstr(WINDOW *win, int y, int x, cchar_t *wchstr, int n);
 
-

      DESCRIPTION

      -       These functions return an array of complex characters in wchstr, start-
-       ing at the current cursor position in  the  named  window.   Attributes
-       (rendition) are stored with the characters.
-
-       The  in_wchnstr,  mvin_wchnstr,  mvwin_wchnstr and win_wchnstr fill the
-       array with at most n cchar_t elements.
 
+

      DESCRIPTION

      +       These  functions  return  an  array  of  complex  characters in wchstr,
+       starting  at  the  current  cursor  position  in  the   named   window.
+       Attributes (rendition) are stored with the characters.
 
-

      NOTES

      -       Note that all routines except win_wchnstr may be macros.
+       The  four  functions  with  n  as  the  last  argument return a leading
+       substring at most n characters long (exclusive of the  trailing  zeroed
+       cchar_t.   Transfer  stops  at  the  end of the current line, or when n
+       characters have been stored at the location referenced by wchstr.
 
-       Reading a line that overflows the  array  pointed  to  by  wchstr  with
-       in_wchstr, mvin_wchstr, mvwin_wchstr or win_wchstr causes undefined re-
-       sults.  Therefore, the use of in_wchnstr, mvin_wchnstr,  mvwin_wchnstr,
-       or win_wchnstr is recommended.
+       Constants defined in <curses.h> can be used with the & (logical  "and")
+       operator  to  extract  the  character  or  the attribute alone from any
+       position in the wchstr [see getcchar(3x)].

      RETURN VALUE

              Upon successful completion, these functions return OK.  Otherwise, they
        return ERR.
 
-       Functions with a "mv" prefix first  perform  a  cursor  movement  using
-       wmove, and return an error if the position is outside the window, or if
-       the window pointer is null.
+       ncurses returns ERR
+
+       o   if the win parameter is null or
+
+       o   if the wchstr parameter is null.
+
+       Functions  prefixed with "mv" first perform cursor movement and fail if
+       the position (y, x) is outside the window boundaries.
+
+
+

      NOTES

      +       All of these functions except win_wchnstr may be implemented as macros.
+
+       Reading a line that overflows the  array  pointed  to  by  wchstr  with
+       in_wchstr,  mvin_wchstr,  mvwin_wchstr  or  win_wchstr causes undefined
+       results.    Therefore,   the   use   of    in_wchnstr,    mvin_wchnstr,
+       mvwin_wchnstr, or win_wchnstr is recommended.

      PORTABILITY

      -       The XSI Curses defines no error conditions.  This implementation checks
-       for null pointers, returning ERR in that case.
+       X/Open Curses Issue 4 describes these functions.  It specifies no error
+       conditions for them.
+
+
+

      HISTORY

      +       X/Open Curses Issue 4 (1995) initially specified these functions.   The
+       System V  Interface  Definition  Version 4 of the same year specified a
+       function named winwchstr (and the usual variants).  This  was  a  later
+       addition  to  SVr4.x,  not  appearing  in  the  first  SVr4 (1989).  It
+       differed from X/Open's later win_wchstr in that it took an argument  of
+       type pointer-to-chtype instead of pointer-tocchar_t.

      SEE ALSO

      -       Functions: curses(3x), curs_in_wch(3x), curs_instr(3x), curs_inwstr(3x)
-       curs_inchstr(3x)
+       curs_inchstr(3x)  describes comparable functions of the ncurses library
+       in its non-wide-character configuration.
 
+       curses(3x), curs_inwstr(3x), curs_in_wch(3x)
 
 
-                                                            curs_in_wchstr(3x)
+
+ncurses 6.5                       2025-02-01                curs_in_wchstr(3x)
      diff --git a/doc/html/man/curs_inch.3x.html b/doc/html/man/curs_inch.3x.html index db7a8952..0d33144d 100644 --- a/doc/html/man/curs_inch.3x.html +++ b/doc/html/man/curs_inch.3x.html @@ -1,7 +1,7 @@ -curs_inch 3x +curs_inch 3x 2025-02-15 ncurses 6.5 Library calls -

      curs_inch 3x

      +

      curs_inch 3x 2025-02-15 ncurses 6.5 Library calls

      -curs_inch(3x)                                                    curs_inch(3x)
+curs_inch(3x)                    Library calls                   curs_inch(3x)

      NAME

      -       inch,  winch,  mvinch,  mvwinch - get a character and attributes from a
-       curses window
+       inch, winch, mvinch, mvwinch - get a curses character from a window

      SYNOPSIS

              #include <curses.h>
 
        chtype inch(void);
-       chtype winch(WINDOW *win);
-
+       chtype winch(WINDOW * win);
        chtype mvinch(int y, int x);
-       chtype mvwinch(WINDOW *win, int y, int x);
+       chtype mvwinch(WINDOW * win, int y, int x);

      DESCRIPTION

      -       These routines return the character, of type  chtype,  at  the  current
-       position  in  the  named  window.   If  any attributes are set for that
-       position, their values are OR'ed into the  value  returned.   Constants
-       defined  in <curses.h> can be used with the & (logical AND) operator to
-       extract the character or attributes alone.
-
-
-

      Attributes

      -       The following bit-masks may  be  AND-ed  with  characters  returned  by
-       winch.
-
-       A_CHARTEXT     Bit-mask to extract character
-       A_ATTRIBUTES   Bit-mask to extract attributes
-       A_COLOR        Bit-mask to extract color-pair field information
+       winch  returns the curses character, including its attributes and color
+       pair identifier, at the cursor position in the window win.   Subsection
+       "Video  Attributes"  of  attron(3x)  explains how to extract these data
+       from a chtype.  ncurses(3x) describes the variants of this function.

      RETURN VALUE

      -       Functions  with  a  "mv"  prefix  first perform a cursor movement using
-       wmove, and return an error if the position is outside the window, or if
-       the window pointer is null.
-
-       The  winch  function  does  not  return an error if the window contains
-       characters larger than 8-bits (255).  Only the low-order 8 bits of  the
-       character are used by winch.
+       These functions return OK on success and ERR on failure.
 
+       In ncurses, they return ERR if win is NULL.
 
-

      NOTES

      -       Note that all of these routines may be macros.
+       Functions prefixed with "mv" first perform cursor movement and fail  if
+       the position (y, x) is outside the window boundaries.
 
 
-

      PORTABILITY

      -       These functions are described in the XSI Curses standard, Issue 4.
+

      NOTES

      +       inch, mvinch, and mvwinch may be implemented as macros.
 
-       Very  old systems (before standardization) provide a different function
-       with the same name:
+       These  functions  do  not  fail  if the window contains cells of curses
+       complex characters; that is, if  they  contain  characters  with  codes
+       wider  than  eight  bits  (or  greater  than 255 as an unsigned decimal
+       integer).  They instead extract only the low-order eight  bits  of  the
+       character code from the cell.
 
-       o   The winch function was part of the  original  BSD  curses  library,
-           which   stored   a  7-bit  character  combined  with  the  standout
-           attribute.
 
-           In BSD curses, winch returned only the character  (as  an  integer)
-           with the standout attribute removed.
+

      PORTABILITY

      +       X/Open Curses Issue 4 describes these functions.  It specifies no error
+       conditions for them.
 
-       o   System  V  curses  added support for several video attributes which
-           could be combined with characters in the window.
 
-           Reflecting this improvement, the function was altered to return the
-           character combined with all video attributes in a chtype value.
+

      HISTORY

      +       The original curses in 4BSD (1980) defined winch as a  macro  accessing
+       the  WINDOW  structure member representing character cell data, at that
+       time a char, containing  only  a  7-bit  ASCII  character  code  and  a
+       "standout" attribute bit, the only one the library supported.
 
-       X/Open Curses does not specify the size and layout of attributes, color
-       and character values in chtype; it is  implementation-dependent.   This
-       implementation  uses 8 bits for character values.  An application using
-       more bits,  e.g.,  a  Unicode  value,  should  use  the  wide-character
-       equivalents to these functions.
+       SVr2  curses (1984) extended this approach, widening the character code
+       to eight bits and permitting several attributes to be combined with  it
+       by  storing  them  together  in  a  chtype, an alias of unsigned short.
+       Because a macro was used, its value was not type-checked as a  function
+       return  value  could have been.  Goodheart documented SVr3 (1987) winch
+       as returning an  int.   SVr3.1's  (1987)  chtype  became  an  alias  of
+       unsigned  long,  using  16 bits for the character code and widening the
+       type in practical terms to 32 bits, as 64-bit Unix systems were not yet
+       in wide use, and fixed-width integral types would not be standard until
+       ISO C99.  SVr3.2 (1988) added a 6-bit color pair  identifier  alongside
+       the attributes.

      SEE ALSO

      -       curses(3x)
-            gives an overview of the WINDOW and chtype data types.
+       curs_in_wch(3x)  describes  comparable functions of the ncurses library
+       in its wide-character configuration (ncursesw).
 
-       curs_attr(3x)
-            goes  into  more  detail,  pointing  out  portability problems and
-            constraints on the use of chtype for returning window information.
+       curses(3x), curs_instr(3x)
 
-       curs_in_wch(3x)
-            describes comparable functions for the  wide-character  (ncursesw)
-            library.
 
 
-
-                                                                 curs_inch(3x)
+ncurses 6.5                       2025-02-15                     curs_inch(3x)
      diff --git a/doc/html/man/curs_inchstr.3x.html b/doc/html/man/curs_inchstr.3x.html index 691a8093..16ee3507 100644 --- a/doc/html/man/curs_inchstr.3x.html +++ b/doc/html/man/curs_inchstr.3x.html @@ -1,6 +1,6 @@ -curs_inchstr 3x +curs_inchstr 3x 2025-02-15 ncurses 6.5 Library calls -

      curs_inchstr 3x

      +

      curs_inchstr 3x 2025-02-15 ncurses 6.5 Library calls

      -curs_inchstr(3x)                                              curs_inchstr(3x)
+curs_inchstr(3x)                 Library calls                curs_inchstr(3x)

      NAME

      -       inchstr, inchnstr, winchstr, winchnstr, mvinchstr, mvinchnstr,
-       mvwinchstr, mvwinchnstr - get a string of characters (and attributes)
-       from a curses window
+       inchstr,   inchnstr,   winchstr,   winchnstr,   mvinchstr,  mvinchnstr,
+       mvwinchstr, mvwinchnstr - get a curses character string from a window

      SYNOPSIS

      @@ -67,54 +66,66 @@ 
      curs_inchstr 3x

      DESCRIPTION

      -       These  routines  return  a  NULL-terminated array of chtype quantities,
-       starting at the current cursor position in the named window and  ending
-       at  the  right  margin of the window.  The four functions with n as the
-       last argument, return a leading substring at  most  n  characters  long
-       (exclusive of the trailing (chtype)0).  Constants defined in <curses.h>
-       can be used with the & (logical AND) operator to extract the  character
-       or   the   attribute   alone  from  any  position  in  the  chstr  [see
-       curs_inch(3x)].
+       These routines return a NULL-terminated  array  of  chtype  quantities,
+       starting  at the current cursor position in the named window and ending
+       at the right margin of the window.
+
+       The four functions with n  as  the  last  argument,  return  a  leading
+       substring  at  most  n  characters  long  (exclusive  of  the  trailing
+       (chtype)0).  Transfer stops at the end of the current line, or  when  n
+       characters have been stored at the location referenced by chstr.
+
+       Constants  defined in <curses.h> can be used with the & (logical "and")
+       operator to extract the character  or  the  attribute  alone  from  any
+       position in the chstr [see curs_inch(3x)].

      RETURN VALUE

      -       All routines return the integer ERR upon failure and an  integer  value
-       other than ERR upon successful completion (the number of characters re-
-       trieved, exclusive of the trailing 0).
+       All  routines  return the integer ERR upon failure and an integer value
+       other than ERR upon successful completion  (the  number  of  characters
+       retrieved, exclusive of the trailing 0).
 
-       X/Open Curses defines no error conditions.  In this implementation:
+       X/Open Curses defines no error conditions.  This implementation returns
+       ERR
 
-       o   If the win parameter is null, an error is returned,
+       o   if the win parameter is null or
 
-       o   If the chstr parameter is null, an error is returned,
+       o   if the chstr parameter is null.
 
-       Functions with a "mv" prefix first  perform  a  cursor  movement  using
-       wmove, and return an error if the position is outside the window, or if
-       the window pointer is null.
+       Functions prefixed with "mv" first perform cursor movement and fail  if
+       the position (y, x) is outside the window boundaries.

      NOTES

      -       Note that all routines except winchnstr may be macros.  SVr4  does  not
-       document whether the result string is zero-terminated; it does not doc-
-       ument whether a length limit argument includes any trailing 0;  and  it
-       does not document the meaning of the return value.
+       All of these functions except winchnstr may be implemented as macros.
+
+       Reading  a  line  that  overflows  the  array  pointed to by chstr with
+       inchstr, mvinchstr, mvwinchstr or winchstr  causes  undefined  results.
+       Therefore,  the  use of inchnstr, mvinchnstr, mvwinchnstr, or winchnstr
+       is recommended.

      PORTABILITY

      -       These  functions are described in the XSI Curses standard, Issue 4.  It
-       is no more specific than the SVr4 documentation on the trailing 0.   It
-       does specify that the successful return of the functions is OK.
+       X/Open Curses Issue 4 describes these functions.  It specifies no error
+       conditions  for  them.   It  characterizes  the strings stored by these
+       functions as containing "at most n elements" from a  window,  but  does
+       not  specify  whether  the  string  stored  by these functions is null-
+       terminated.
 
+       SVr4 does not document whether it null-terminates the string it  stores
+       in  chstr,  and  does  not  document  whether a trailing null character
+       counts toward the length limit n.
+
+       SVr4 describes a successful return value  only  as  "an  integer  value
+       other than ERR".
 
-

      SEE ALSO

      -       curses(3x), curs_inch(3x).
 
-       Comparable  functions  in the wide-character (ncursesw) library are de-
-       scribed in curs_in_wchstr(3x).
+

      SEE ALSO

      +       curses(3x), curs_inch(3x), curs_inwstr(3x), curs_in_wchstr(3x)
 
 
 
-                                                              curs_inchstr(3x)
+ncurses 6.5                       2025-02-15                  curs_inchstr(3x)
        diff --git a/doc/html/man/curs_initscr.3x.html b/doc/html/man/curs_initscr.3x.html index 08d21a61..8ba7185e 100644 --- a/doc/html/man/curs_initscr.3x.html +++ b/doc/html/man/curs_initscr.3x.html @@ -1,6 +1,6 @@ -curs_initscr 3x +curs_initscr 3x 2025-03-01 ncurses 6.5 Library calls -

        curs_initscr 3x

        +

        curs_initscr 3x 2025-03-01 ncurses 6.5 Library calls

        -curs_initscr(3x)                                              curs_initscr(3x)
+curs_initscr(3x)                 Library calls                curs_initscr(3x)

        NAME

        -       initscr, newterm, endwin, isendwin, set_term, delscreen - curses screen
-       initialization and manipulation routines
+       initscr,  newterm,  endwin, isendwin, set_term, delscreen - initialize,
+       manipulate, or tear down curses terminal interface

        SYNOPSIS

                #include <curses.h>
 
-       WINDOW *initscr(void);
+       WINDOW * initscr(void);
        int endwin(void);
 
        bool isendwin(void);
 
-       SCREEN *newterm(const char *type, FILE *outfd, FILE *infd);
-       SCREEN *set_term(SCREEN *new);
-       void delscreen(SCREEN* sp);
+       SCREEN * newterm(const char * type, FILE * outf, FILE * inf);
+       SCREEN * set_term(SCREEN * new);
+       void delscreen(SCREEN * sp);

        DESCRIPTION

        initscr

        -       initscr is normally the first curses routine to call when  initializing
-       a  program.   A few special routines sometimes need to be called before
-       it; these are slk_init(3x), filter, ripoffline, use_env.  For multiple-
-       terminal applications, newterm may be called before initscr.
+       initscr determines the terminal  type  and  initializes  the  library's
+       SCREEN,  WINDOW,  and  other data structures.  It is normally the first
+       curses function call a program performs.  However, an application  with
+       unusual needs might employ a few other curses functions beforehand:
 
-       The initscr code determines the terminal type and initializes all curs-
-       es data structures.  initscr also causes the first call to  refresh(3x)
-       to  clear  the  screen.  If errors occur, initscr writes an appropriate
-       error message to standard error and exits; otherwise, a pointer is  re-
-       turned to stdscr.
+       o   slk_init(3x) to set up soft-label keys;
+
+       o   filter(3x)  if  the  program  is  designed  to operate in a process
+           pipeline;
+
+       o   ripoffline(3x) to reserve up to five lines at the top and/or bottom
+           of  the  screen  from  management  by  stdscr,  the standard curses
+           window; and
+
+       o   use_env(3x) and/or use_tioctl(3x) to configure use of  the  process
+           environment  and  operating system's terminal driver, respectively,
+           when determining the dimensions of the terminal display.
+
+       Further, a curses program might call newterm prior  to  or  instead  of
+       initscr in two specialized cases described in its subsection below.
+
+       initscr  causes  the  first  refresh(3x)  call to clear the screen.  If
+       errors occur, initscr writes an appropriate diagnostic message  to  the
+       standard  error  stream  and  exits; otherwise, it returns a pointer to
+       stdscr.

        newterm

        -       A program that outputs to more than one terminal should use the newterm
-       routine for each terminal instead of initscr.  A program that needs  to
-       inspect capabilities, so it can continue to run in a line-oriented mode
-       if the terminal cannot support a screen-oriented  program,  would  also
-       use newterm.  The routine newterm should be called once for each termi-
-       nal.  It returns a variable of type SCREEN * which should be saved as a
-       reference to that terminal.  newterm's arguments are
+       An application that manages multiple terminals should call newterm once
+       for each such device instead of initscr.  newterm's arguments are
+
+       o   the  type  of  the  associated  terminal,  or  NULL to use the TERM
+           environment variable;
 
-       o   the type of the terminal to be used in place of $TERM,
+       o   an output stream outf connected to the terminal; and
 
-       o   a file pointer for output to the terminal, and
+       o   an input stream inf  connected  to  the  terminal.   It  returns  a
+           variable  of  structure  type  SCREEN  *, which should be saved for
+           later use with set_term and delscreen.
 
-       o   another file pointer for input from the terminal
+       newterm passes the file descriptor of the output stream to the terminfo
+       function setupterm(3x), which returns a pointer to a TERMINAL structure
+       that newterm stores in the SCREEN it returns to the application.
 
-       If the type parameter is NULL, $TERM will be used.
+       An application that needs to inspect a terminal type's capabilities, so
+       that  it  can  continue  to run in a line-oriented mode if the terminal
+       cannot support a screen-oriented program, would also use  newterm.   If
+       at most one terminal connection is needed, the programmer could perform
+       such a capability test, decide which mode in  which  to  operate,  then
+       call  delscreen  on  the  pointer returned by newterm, and proceed with
+       either initscr or a non-curses interface.

        endwin

        -       The  program  must also call endwin for each terminal being used before
-       exiting from curses.  If newterm is called more than once for the  same
+       The program must also call endwin for each terminal being  used  before
+       exiting  from curses.  If newterm is called more than once for the same
        terminal, the first terminal referred to must be the last one for which
        endwin is called.
 
-       A program should always call endwin before  exiting  or  escaping  from
-       curses mode temporarily.  This routine
+       A  program  should always call endwin before exiting the application or
+       temporarily suspending curses's management of the terminal.  endwin:
 
        o   resets colors to correspond with the default color pair 0,
 
        o   moves the cursor to the lower left-hand corner of the screen,
 
-       o   clears  the  remainder of the line so that it uses the default col-
-           ors,
+       o   clears the remainder of the  line  so  that  it  uses  the  default
+           colors,
 
        o   sets the cursor to normal visibility (see curs_set(3x)),
 
-       o   stops cursor-addressing mode using the exit_ca_mode terminal  capa-
-           bility,
+       o   if  applicable, stops cursor-addressing mode using the exit_ca_mode
+           (rmcup) terminal capability, and
 
-       o   restores tty modes (see reset_shell_mode(3x)).
+       o   restores terminal modes (see reset_shell_mode(3x)).
 
-       Calling refresh(3x) or doupdate(3x) after a temporary escape causes the
-       program to resume visual mode.
+       Calling refresh(3x) or doupdate(3x) after a temporary suspension causes
+       curses to resume managing the terminal.

        isendwin

        -       The isendwin routine returns TRUE if endwin has been called without any
-       subsequent calls to wrefresh, and FALSE otherwise.
+       isendwin  returns TRUE if endwin has been called without any subsequent
+       calls to wrefresh(3x), and FALSE otherwise.

        set_term

        -       The  set_term  routine  is  used to switch between different terminals.
-       The screen reference new becomes the new current terminal.  The  previ-
-       ous  terminal  is  returned  by  the routine.  This is the only routine
-       which manipulates SCREEN pointers; all other routines affect  only  the
-       current terminal.
+       set_term re-orients the curses library's operations to another terminal
+       when the application has arranged to manage more than one with newterm.
+       set_term expects a SCREEN pointer previously returned by newterm as  an
+       argument,  and  returns  the previous one.  set_term is the only curses
+       API function that manipulates SCREEN pointers; all others  affect  only
+       the current terminal.

        delscreen

        -       The  delscreen  routine  frees  storage associated with the SCREEN data
-       structure.  The endwin routine does not do this, so delscreen should be
-       called after endwin if a particular SCREEN is no longer needed.
+       delscreen  frees  the  storage  backing  the  supplied  SCREEN  pointer
+       argument.  endwin does not, so that an application can resume  managing
+       a  terminal  with  curses  after  a (possibly conditional or temporary)
+       suspension; see curs_kernel(3x).  Call delscreen after  endwin  when  a
+       particular SCREEN structure is no longer needed.

        RETURN VALUE

        -       endwin returns the integer ERR upon failure and OK upon successful com-
-       pletion.
+       endwin returns OK on success and ERR on failure.
+
+       In ncurses,
+
+       o   endwin returns ERR if
+
+           o   the terminal was not initialized,
+
+           o   endwin is called more than once without updating the screen, or
+
+           o   reset_shell_mode(3x) returns ERR.
 
-       Routines that return pointers always return NULL on error.
+       o   newterm  returns  ERR  if it cannot allocate storage for the SCREEN
+           data structure or the top-level windows  thereof:  curscr,  newscr,
+           and stdscr.
 
-       X/Open defines no error conditions.  In this implementation
+       Functions  that  return  pointers  return  NULL  on error.  In ncurses,
+       set_term does not fail, and initscr exits the application  if  it  does
+       not operate successfully.
 
-       o   endwin returns an error if the terminal was not initialized.
 
-       o   newterm returns an error if it cannot allocate the data  structures
-           for  the  screen,  or  for the top-level windows within the screen,
-           i.e., curscr, newscr, or stdscr.
+

        NOTES

        +       ncurses  establishes signal handlers when a function that initializes a
+       SCREEN, either initscr or newterm, is first called.  Applications  that
+       wish  to  handle  the  following signals themselves should set up their
+       corresponding handlers after initializing the screen.
 
-       o   set_term returns no error.
+       SIGINT ncurses's handler attempts to  clean  up  the  screen  on  exit.
+              Although it usually works as expected, there are limitations.
+
+              o   Walking the SCREEN list is unsafe, since all list management
+                  is done without any signal blocking.
+
+              o   When an application has been built with the _REENTRANT macro
+                  defined  (and  corresponding  system support), set_term uses
+                  functions that could deadlock or misbehave in other ways.
+
+              o   endwin calls other functions, many of which use stdio(3)  or
+                  other library functions that are clearly unsafe.
+
+       SIGTERM
+              ncurses  uses  the  same  handler  as  for SIGINT, with the same
+              limitations.  It is not mentioned in X/Open Curses, but is  more
+              suitable  for  this  purpose  than  SIGQUIT  (which  is  used in
+              debugging).
+
+       SIGTSTP
+              ncurses's handler manages the  terminal-generated  stop  signal,
+              used  in  job  control.   When  resuming  the  process,  ncurses
+              discards  pending  input  with  flushinp(3x)  and  repaints  the
+              screen,  assuming  that it has been completely altered.  It also
+              updates the saved terminal modes with def_shell_mode(3x).
+
+       SIGWINCH
+              ncurses  handles  changes  to  the  terminal's  window  size,  a
+              phenomenon  ignored  in  standardization  efforts.   It  sets  a
+              (signal-safe) variable that is later tested  by  wgetch(3x)  and
+              wget_wch(3x).
+
+              o   wgetch returns the key code KEY_RESIZE.
+
+              o   wget_wch  returns KEY_CODE_YES and sets its wch parameter to
+                  KEY_RESIZE.
+
+              At the same time, ncurses calls  resizeterm(3x)  to  adjust  the
+              standard  screen  stdscr,  and  update  global variables such as
+              LINES and COLS.

        PORTABILITY

        -       These functions were described in the XSI Curses standard, Issue 4.  As
-       of 2015, the current document is X/Open Curses, Issue 7.
+       X/Open Curses Issue 4 describes these functions.  It specifies no error
+       conditions for them.

        Differences

        -       X/Open  specifies that portable applications must not call initscr more
-       than once:
+       X/Open  Curses  specifies  that  portable  applications  must  not call
+       initscr more than once.
 
-       o   The portable way to use initscr is once only,  using  refresh  (see
-           curs_refresh(3x)) to restore the screen after endwin.
+       o   The portable way to use initscr is  once  only,  using  refresh  to
+           restore the screen after endwin.
 
-       o   This implementation allows using initscr after endwin.
+       o   ncurses permits use of initscr after endwin.
 
-       Old versions of curses, e.g., BSD 4.4, would return a null pointer from
-       initscr when an error is detected, rather than exiting.  It is safe but
-       redundant to check the return value of initscr in XSI Curses.
+       initscr  in  BSD,  from  its inception (1980) through the Net/2 release
+       (1991) returned ERR cast to a WINDOW pointer when detecting  an  error.
+       4.4BSD  (1995)  instead  returned  a  null pointer.  Neither exited the
+       application.  It is safe but redundant to check  the  return  value  of
+       initscr in X/Open Curses.
 
-       Calling  endwin  does not dispose of the memory allocated in initscr or
-       newterm.  Deleting a SCREEN provides a way to do this:
+       Calling  endwin  does not dispose of the memory allocated by initscr or
+       newterm.  Deleting a SCREEN provides a way to do this.
 
-       o   X/Open Curses does not say what happens to WINDOWs  when  delscreen
-           "frees  storage associated with the SCREEN" nor does the SVr4 docu-
-           mentation help, adding that it should be called after endwin  if  a
-           SCREEN is no longer needed.
+       o   X/Open Curses does not say what happens to WINDOWs  when  delscreen
+           "frees  storage  associated  with  the  SCREEN"  nor  does the SVr4
+           documentation help, adding that it should be called after endwin if
+           a SCREEN is no longer needed.
 
-       o   However,  WINDOWs are implicitly associated with a SCREEN.  so that
-           it is reasonable to expect delscreen to deal with these.
+       o   However,  WINDOWs are implicitly associated with a SCREEN, so it is
+           reasonable to expect delscreen to dispose of them.
 
-       o   SVr4 curses deletes  the  standard  WINDOW  structures  stdscr  and
-           curscr  as  well  as a work area newscr.  SVr4 curses ignores other
-           windows.
+       o   SVr4 deletes the standard WINDOW structures stdscr  and  curscr  as
+           well as a work area newscr.  It ignores other windows.
 
-       o   Since version 4.0 (1996), ncurses has maintained a list of all win-
-           dows  for  each screen, using that information to delete those win-
-           dows when delscreen is called.
+       o   Since  version  4.0  (1996),  ncurses  has maintained a list of all
+           windows for each screen, using that  information  to  delete  those
+           windows when delscreen is called.
 
-       o   NetBSD copied this feature of ncurses in  2001.   PDCurses  follows
-           the SVr4 model, deleting only the standard WINDOW structures.
+       o   NetBSD  copied  this  feature of ncurses in 2001.  PDCurses follows
+           the SVr4 model, deleting only the standard WINDOW structures.
 
 
-

        Unset TERM Variable

        -       If  the  TERM variable is missing or empty, initscr uses the value "un-
-       known", which normally corresponds to a terminal entry with the generic
-       (gn)  capability.   Generic  entries  are  detected  by  setupterm (see
-       curs_terminfo(3x)) and cannot be used for full-screen operation.  Other
-       implementations may handle a missing/empty TERM variable differently.
+

        High-level versus Low-level

        +       Different implementations may disagree  regarding  the  level  of  some
+       functions.   For  example,  SCREEN  (returned  by newterm) and TERMINAL
+       (returned by  setupterm(3x))  hold  file  descriptors  for  the  output
+       stream.  If an application switches screens using set_term, or switches
+       terminals using set_curterm(3x), applications which use the output file
+       descriptor  can  have  different  behavior depending on which structure
+       holds the corresponding descriptor.
 
+       o   NetBSD's  baudrate  function  uses  the  descriptor  in   TERMINAL.
+           ncurses and SVr4 use the descriptor in SCREEN.
 
-

        Signal Handlers

        -       Quoting from X/Open Curses, section 3.1.1:
+       o   NetBSD  and ncurses use the descriptor in TERMINAL for terminal I/O
+           modes, e.g., def_shell_mode(3x), def_prog_mode(3x).  SVr4 uses  the
+           descriptor in SCREEN.
 
-            Curses  implementations  may  provide  for special handling of the
-            SIGINT, SIGQUIT  and  SIGTSTP  signals  if  their  disposition  is
-            SIG_DFL at the time initscr is called ...
+   Unset TERM Environment Variable
+       If  the  TERM  variable  is  not set in the environment or has an empty
+       value, initscr uses the value "unknown", which normally corresponds  to
+       a terminal entry with the generic (gn) capability.  Generic entries are
+       detected by setupterm(3x) and cannot be used for full-screen operation.
+       Other  implementations  may  handle  a  missing  or empty TERM variable
+       differently.
 
-            Any  special  handling  for these signals may remain in effect for
-            the  life  of  the  process  or  until  the  process  changes  the
-            disposition of the signal.
 
-            None  of the Curses functions are required to be safe with respect
-            to signals ...
+

        Signal Handlers

        +       Quoting X/Open Curses Issue 7, section 3.1.1:
 
-       This implementation establishes signal handlers during  initialization,
-       e.g., initscr or newterm.  Applications which must handle these signals
-       should set up the corresponding handlers  after  initializing  the  li-
-       brary:
+            Curses implementations may provide for  special  handling  of  the
+            SIGINT,  SIGQUIT,  and  SIGTSTP  signals  if  their disposition is
+            SIG_DFL at the time initscr() is called...
 
-       SIGINT
-            The  handler  attempts to cleanup the screen on exit.  Although it
-            usually works as expected, there are limitations:
+            Any special handling for these signals may remain  in  effect  for
+            the  life  of  the  process  or  until  the  process  changes  the
+            disposition of the signal.
 
-            o   Walking the SCREEN list is unsafe, since all  list  management
-                is done without any signal blocking.
+            None of the Curses functions are required to be safe with  respect
+            to signals...
 
-            o   On systems which have REENTRANT turned on, set_term uses func-
-                tions which could deadlock or misbehave in other ways.
+       Section "NOTES" above discusses ncurses's signal handlers.
 
-            o   endwin calls other functions, many of which use stdio or other
-                library functions which are clearly unsafe.
 
-       SIGTERM
-            This  uses  the same handler as SIGINT, with the same limitations.
-            It is not mentioned in X/Open Curses, but  is  more  suitable  for
-            this purpose than SIGQUIT (which is used in debugging).
+

        HISTORY

        +       4BSD (1980) introduced initscr and endwin.
 
-       SIGTSTP
-            This  handles the stop signal, used in job control.  When resuming
-            the process,  this  implementation  discards  pending  input  with
-            flushinput  (see  curs_util(3x)), and repaints the screen assuming
-            that it has been completely altered.  It also  updates  the  saved
-            terminal modes with def_shell_mode (see curs_kernel(3x)).
+       SVr2 (1984) added newterm and set_term.
 
-       SIGWINCH
-            This  handles  the  window-size  changes which were ignored in the
-            standardization efforts.  The handler sets a  (signal-safe)  vari-
-            able  which  is  later  tested in wgetch (see curs_getch(3x)).  If
-            keypad has been enabled for the corresponding window,  wgetch  re-
-            turns  the  key symbol KEY_RESIZE.  At the same time, wgetch calls
-            resizeterm to adjust the standard screen stdscr, and update  other
-            data such as LINES and COLS.
+       SVr3.1 (1987) supplied delscreen and isendwin.

        SEE ALSO

        -       curses(3x),  curs_kernel(3x), curs_refresh(3x), curs_slk(3x), curs_ter-
-       minfo(3x), curs_util(3x), curs_variables(3x).
+       curses(3x),     curs_kernel(3x),     curs_refresh(3x),    curs_slk(3x),
+       curs_terminfo(3x), curs_util(3x), curs_variables(3x)
 
 
 
-                                                              curs_initscr(3x)
+ncurses 6.5                       2025-03-01                  curs_initscr(3x)
          @@ -286,13 +354,15 @@

          curs_initscr 3x

      • RETURN VALUE
        • +
      • NOTES
      • PORTABILITY
        • +
      • HISTORY
      • SEE ALSO
      diff --git a/doc/html/man/curs_inopts.3x.html b/doc/html/man/curs_inopts.3x.html index 4bee87ac..2957ce32 100644 --- a/doc/html/man/curs_inopts.3x.html +++ b/doc/html/man/curs_inopts.3x.html @@ -1,6 +1,7 @@ -curs_inopts 3x +curs_inopts 3x 2025-03-01 ncurses 6.5 Library calls -

      curs_inopts 3x

      +

      curs_inopts 3x 2025-03-01 ncurses 6.5 Library calls

      -curs_inopts(3x)                                                curs_inopts(3x)
+curs_inopts(3x)                  Library calls                 curs_inopts(3x)

      NAME

      -       cbreak, nocbreak, echo, noecho, halfdelay, intrflush, keypad, meta, nl,
-       nonl, nodelay, notimeout, raw, noraw, qiflush, noqiflush, timeout,
-       wtimeout, typeahead - curses input options
+       cbreak,  echo, halfdelay, intrflush, is_cbreak, is_echo, is_nl, is_raw,
+       keypad, meta, nl, nocbreak, nodelay, noecho,  nonl,  noqiflush,  noraw,
+       notimeout,  qiflush,  raw,  timeout,  wtimeout, typeahead - get and set
+       curses terminal input options

      SYNOPSIS

      @@ -61,248 +63,345 @@ 
      curs_inopts 3x
      
        int echo(void);
        int noecho(void);
 
-       int intrflush(WINDOW *win, bool bf);
-       int keypad(WINDOW *win, bool bf);
-       int meta(WINDOW *win, bool bf);
-       int nodelay(WINDOW *win, bool bf);
-       int notimeout(WINDOW *win, bool bf);
+       int intrflush(WINDOW * win /* ignored */, bool bf);
+       int keypad(WINDOW * win, bool bf);
+       int meta(WINDOW * win /* ignored */, bool bf);
+       int nodelay(WINDOW * win, bool bf);
+       int notimeout(WINDOW * win, bool bf);
 
        int nl(void);
        int nonl(void);
 
-       int raw(void);
-       int noraw(void);
-
        void qiflush(void);
        void noqiflush(void);
 
+       int raw(void);
+       int noraw(void);
+
        int halfdelay(int tenths);
        void timeout(int delay);
-       void wtimeout(WINDOW *win, int delay);
+       void wtimeout(WINDOW * win, int delay);
 
        int typeahead(int fd);
 
+       /* extensions */
+       int is_cbreak(void);
+       int is_echo(void);
+       int is_nl(void);
+       int is_raw(void);
+

      DESCRIPTION

      -       The ncurses library provides several functions which let an application
-       change the way input from the terminal is handled.   Some  are  global,
-       applying to all windows.  Others apply only to a specific window.  Win-
-       dow-specific settings are not automatically applied to new  or  derived
-       windows.   An  application must apply these to each window, if the same
-       behavior is needed.
-
-
-

      cbreak/nocbreak

      -       Normally, the tty driver buffers typed characters until  a  newline  or
-       carriage  return  is typed.  The cbreak routine disables line buffering
-       and erase/kill character-processing (interrupt and flow control charac-
-       ters  are  unaffected), making characters typed by the user immediately
-       available to the program.  The nocbreak routine returns the terminal to
-       normal (cooked) mode.
-
-       Initially the terminal may or may not be in cbreak mode, as the mode is
-       inherited; therefore, a program should call cbreak or nocbreak  explic-
-       itly.   Most  interactive  programs  using  curses set the cbreak mode.
-       Note that cbreak overrides raw.  [See curs_getch(3x) for  a  discussion
-       of how these routines interact with echo and noecho.]
-
-
-

      echo/noecho

      -       The  echo  and  noecho routines control whether characters typed by the
-       user are echoed by getch(3x) as they are typed.   Echoing  by  the  tty
-       driver  is  always  disabled,  but  initially getch is in echo mode, so
-       characters typed are echoed.  Authors of most interactive programs pre-
-       fer  to do their own echoing in a controlled area of the screen, or not
-       to echo at all, so  they  disable  echoing  by  calling  noecho.   [See
-       curs_getch(3x)  for  a  discussion  of how these routines interact with
-       cbreak and nocbreak.]
+       curses offers configurable  parameters  permitting  an  application  to
+       control  the  handling of input from the terminal.  Some, such as those
+       affecting the terminal's mode or line discipline, are global,  applying
+       to  all  windows;  others apply only to a specific window.  The library
+       does not automatically apply such parameters to new or derived windows;
+       an application must configure each window for the desired behavior.
+
+       Some  descriptions  below  make reference to an input character reading
+       function: this is wgetch(3x) in the non-wide character curses  API  and
+       wget_wch(3x)  in  the  wide  character API.  In addition to the variant
+       forms  of  these  described  in  ncurses(3x),  the   curses   functions
+       wgetstr(3x)   and   wget_wstr(3x)  and  their  own  variants  call  the
+       appropriate input character reading function.
+
+
+

      cbreak, nocbreak

      +       Normally, the terminal driver buffers typed characters, not  delivering
+       them  to  an application until a line feed or carriage return is typed.
+       This canonical ("cooked") line discipline also supports  software  flow
+       control,  simple  line editing functions (character and word erase, and
+       whole-line erasure or "kill"), and job control.  cbreak configures  the
+       terminal  in  cbreak  mode, which disables line buffering and erase and
+       kill character processing -- the interrupt,  quit,  suspend,  and  flow
+       control  characters are unaffected -- and makes characters typed by the
+       user immediately available to the program.  nocbreak restores canonical
+       ("cooked") mode.
+
+       The  state  of  the terminal is unknown to a curses application when it
+       starts; therefore, a program should call cbreak or nocbreak explicitly.
+       Most interactive programs using curses set cbreak mode.  Calling cbreak
+       overrides raw.  The man page for the input character  reading  function
+       discusses how cbreak and nocbreak interact with echo and noecho.
+
+
+

      echo, noecho

      +       echo  and  noecho  determine  whether  characters typed by the user are
+       written to the curses window by the input character reading function as
+       they  are  typed.   curses  always  disables  the terminal driver's own
+       echoing.  By default, a curses screen's echo option is set.  Authors of
+       most  interactive  programs  prefer  to  do  their  own  echoing  in  a
+       controlled area of the screen, or not to echo  at  all,  so  they  call
+       noecho.   The  man  page  for  the  input  character  reading  function
+       discusses how echo and noecho interact with cbreak and nocbreak.

      halfdelay

      -       The halfdelay routine is used for half-delay mode, which is similar  to
-       cbreak mode in that characters typed by the user are immediately avail-
-       able to the program.  However, after blocking for tenths tenths of sec-
-       onds,  ERR  is returned if nothing has been typed.  The value of tenths
-       must be a number between 1 and 255.  Use nocbreak to  leave  half-delay
-       mode.
+       halfdelay configures half-delay mode, which is similar to  cbreak  mode
+       in  that  characters typed by the user are immediately available to the
+       program.  However, after blocking for tenths  tenth-seconds,  an  input
+       character  reading  function  returns  ERR if no input is pending.  The
+       value of tenths must be between 1 and 255.  Use nocbreak to leave half-
+       delay mode.

      intrflush

      -       If  the  intrflush option is enabled (bf is TRUE), and an interrupt key
-       is pressed on the keyboard (interrupt, break, quit), all output in  the
-       tty  driver queue will be flushed, giving the effect of faster response
-       to the interrupt, but causing curses to have the wrong idea of what  is
-       on  the screen.  Disabling the option (bf is FALSE) prevents the flush.
-       The default for the option is inherited from the tty  driver  settings.
-       The window argument is ignored.
+       intrflush  calls qiflush (see below) if bf is TRUE, and noqiflush if bf
+       is FALSE.  It ignores its win argument.

      keypad

      -       The  keypad  option  enables the keypad of the user's terminal.  If en-
-       abled (bf is TRUE), the user can press a function key (such as an arrow
-       key)  and  wgetch(3x)  returns a single value representing the function
-       key, as in KEY_LEFT.  If disabled (bf is FALSE), curses does not  treat
-       function keys specially and the program has to interpret the escape se-
-       quences itself.  If the keypad in the terminal can be turned  on  (made
-       to  transmit)  and  off  (made to work locally), turning on this option
-       causes the terminal keypad to be turned on when wgetch(3x)  is  called.
-       The default value for keypad is FALSE.
+       keypad enables recognition of a terminal's function keys.   If  enabled
+       (bf  is  TRUE),  the  input  character reading function returns a value
+       representing the function key, such as KEY_LEFT.   (Wide-character  API
+       users:  wget_wch(3x)  returns KEY_CODE_YES to indicate the availability
+       of a function key code in its  wch  parameter.)   If  disabled  (bf  is
+       FALSE),  curses  does not treat function keys specially and the program
+       has to interpret escape sequences itself.  If the terminal's keypad can
+       be  turned on (made to transmit) and off (made to work locally), keypad
+       configures it consistently  with  the  bf  parameter.   By  default,  a
+       window's keypad mode is off.

      meta

      -       Initially,  whether the terminal returns 7 or 8 significant bits on in-
-       put depends on the control mode of the tty driver [see termios(3)].  To
-       force  8  bits  to be returned, invoke meta(win, TRUE); this is equiva-
-       lent, under POSIX, to setting the CS8 flag on the terminal.  To force 7
-       bits to be returned, invoke meta(win, FALSE); this is equivalent, under
-       POSIX, to setting the CS7 flag on the terminal.  The  window  argument,
-       win, is always ignored.  If the terminfo capabilities smm (meta_on) and
-       rmm (meta_off) are defined for the terminal, smm is sent to the  termi-
-       nal  when  meta(win,  TRUE)  is  called  and rmm is sent when meta(win,
-       FALSE) is called.
-
-
-

      nl/nonl

      -       The nl and nonl routines control whether the underlying display  device
-       translates the return key into newline on input.
+       Initially,  whether the terminal returns 7- or 8-bit character codes on
+       input depends on the configuration of the  terminal  driver;  on  POSIX
+       systems,  see  termios(3).   To  force  8  bits  to  be  returned, call
+       meta(..., TRUE); this is equivalent, on POSIX systems, to  setting  the
+       CS8  flag  on  the  terminal.   To  force  7  bits to be returned, call
+       meta(..., FALSE); this is equivalent, on POSIX systems, to setting  the
+       CS7  flag on the terminal.  curses ignores the window argument win.  If
+       the terminfo string capabilities meta_on (smm) and meta_off  (rmm)  are
+       defined  for  the  terminal  type,  enabling meta mode sends smm to the
+       terminal and disabling it sends rmm to the terminal.
+
+
+

      nl, nonl

      +       Initially, whether the terminal reports a  carriage  return  using  the
+       character  code  for  a line feed in cbreak or raw modes depends on the
+       configuration of the terminal driver; see  termios(3).   nl  configures
+       the terminal to perform this translation.  nonl disables it.  Under its
+       canonical  ("cooked")  line  discipline,  the  terminal  driver  always
+       translates carriage returns to line feeds.

      nodelay

      -       The nodelay option causes getch to be a non-blocking call.  If no input
-       is ready, getch returns ERR.  If disabled (bf is  FALSE),  getch  waits
-       until a key is pressed.
+       nodelay  configures  the  input  character  reading function to be non-
+       blocking for window win.  If no input is ready,  the  reading  function
+       returns  ERR.  If disabled (bf is FALSE), the reading function does not
+       return until it has input.

      notimeout

      -       When  interpreting  an  escape  sequence, wgetch(3x) sets a timer while
-       waiting for the next character.  If  notimeout(win,  TRUE)  is  called,
-       then  wgetch  does  not  set a timer.  The purpose of the timeout is to
-       differentiate between sequences received from a function key and  those
-       typed by a user.
-
-
-

      raw/noraw

      -       The  raw and noraw routines place the terminal into or out of raw mode.
-       Raw mode is similar to cbreak mode, in that characters typed are  imme-
-       diately  passed  through to the user program.  The differences are that
-       in raw mode, the interrupt, quit, suspend, and flow control  characters
-       are  all  passed through uninterpreted, instead of generating a signal.
-       The behavior of the BREAK key depends on other bits in the  tty  driver
-       that are not set by curses.
-
-
-

      qiflush/noqiflush

      -       When  the  noqiflush  routine is used, normal flush of input and output
-       queues associated with the INTR, QUIT and SUSP characters will  not  be
-       done  [see  termios(3)].   When  qiflush  is called, the queues will be
-       flushed when these control characters are read.  You may want  to  call
-       noqiflush  in a signal handler if you want output to continue as though
-       the interrupt had not occurred, after the handler exits.
-
-
-

      timeout/wtimeout

      -       The timeout and wtimeout routines set blocking or non-blocking read for
-       a  given  window.   If  delay is negative, blocking read is used (i.e.,
-       waits indefinitely for input).  If delay  is  zero,  then  non-blocking
-       read is used (i.e., read returns ERR if no input is waiting).  If delay
-       is positive, then read blocks for delay milliseconds, and  returns  ERR
-       if  there  is  still  no input.  Hence, these routines provide the same
-       functionality as nodelay, plus the additional capability of being  able
-       to block for only delay milliseconds (where delay is positive).
+       When the input character reading function reads an  ESC  character,  it
+       sets  a  timer  while  waiting  for the next character.  notimeout(win,
+       TRUE)  disables  this  timer.   The  purpose  of  the  timeout  is   to
+       distinguish  sequences produced by a function key from those typed by a
+       user.  To configure the timeout rather than disabling it, see  wtimeout
+       below.
+
+
+

      qiflush, noqiflush

      +       qiflush  and noqiflush configure the terminal driver's treatment of its
+       input and output queues when it handles the interrupt, suspend, or quit
+       characters under the canonical ("cooked") or cbreak line disciplines on
+       POSIX systems; see termios(3).  The default behavior is inherited  from
+       the  terminal driver settings.  Calling qiflush configures the terminal
+       to flush the queues (discarding  their  contents)  when  any  of  these
+       events  occurs, giving the impression of faster response to user input,
+       but making the  library's  model  of  the  screen  contents  incorrect.
+       Calling noqiflush prevents such flushing, but might frustrate impatient
+       users on slow connections if a  curses  update  of  the  screen  is  in
+       progress when the event occurs; see typeahead below for a mitigation of
+       this problem.  You may want to call noqiflush in a signal  handler  if,
+       after  the  handler  exits,  you  want output to continue as though the
+       signal had not occurred.
+
+
+

      raw, noraw

      +       raw configures the terminal to read input in raw mode, which is similar
+       to  cbreak  mode  (see  cbreak above) except that it furthermore passes
+       through the terminal's configured interrupt, quit,  suspend,  and  flow
+       control   characters  uninterpreted  to  the  application,  instead  of
+       generating a signal or  acting  on  I/O  flow.   The  behavior  of  the
+       terminal's   "Break"   key   (if   any)   depends  on  terminal  driver
+       configuration parameters that curses does not handle.   noraw  restores
+       the terminal's canonical ("cooked") line discipline.
+
+
+

      timeout, wtimeout

      +       wtimeout  configures  whether a curses input character reading function
+       called on window win uses blocking or non-blocking reads.  If delay  is
+       negative,  curses uses a blocking read, waiting indefinitely for input.
+       If delay is zero, the read is non-blocking; an input character  reading
+       function  returns ERR if no input is pending.  If delay is positive, an
+       input character reading function blocks  for  delay  milliseconds,  and
+       returns  ERR  if the delay elapses and there is still no input pending.
+       timeout calls wtimeout on stdscr.

      typeahead

      -       The curses library does "line-breakout optimization" by looking for ty-
-       peahead periodically while updating the screen.  If input is found, and
-       it  is  coming  from  a  tty, the current update is postponed until re-
-       fresh(3x) or doupdate is called again.  This allows faster response  to
-       commands  typed in advance.  Normally, the input FILE pointer passed to
-       newterm, or stdin in the case that initscr was used, will be used to do
-       this typeahead checking.  The typeahead routine specifies that the file
-       descriptor fd is to be used to check for typeahead instead.  If  fd  is
-       -1, then no typeahead checking is done.
+       Normally, a curses library checks the terminal's input file  descriptor
+       for  pending input with poll(2) or select(2) while updating the screen;
+       if it finds any, it postpones output until  the  next  wrefresh(3x)  or
+       doupdate(3x)  call,  allowing faster response to user key strokes.  The
+       library tests the file descriptor  corresponding  to  the  FILE  stream
+       pointer passed to newterm(3x) (or stdin if initscr(3x) was called), for
+       pending input.  typeahead instructs curses to test file  descriptor  fd
+       instead.  An fd of -1 disables the check.

      RETURN VALUE

      -       All  routines  that  return  an  integer return ERR upon failure and OK
-       (SVr4 specifies only "an integer value other than ERR") upon successful
-       completion,  unless  otherwise  noted in the preceding routine descrip-
-       tions.
+       timeout and wtimeout return no value.
 
-       X/Open does not define any error conditions.  In  this  implementation,
-       functions  with  a window parameter will return an error if it is null.
-       Any function will also return an error if the terminal was not initial-
-       ized.  Also,
+       cbreak,  nocbreak,  echo,  noecho,  halfdelay, intrflush, keypad, meta,
+       nodelay, notimeout, nl, nonl, raw, noraw, and typeahead  return  OK  on
+       success and ERR on failure.
 
-              halfdelay
-                   returns  an  error  if  its  parameter is outside the range
-                   1..255.
+       In ncurses, the functions in the previous paragraph return ERR if
 
+       o   the  library's  TERMINAL  structure  for  the  device  has not been
+           initialized with initscr(3x), newterm(3x), or setupterm(3x), or
 
-

      PORTABILITY

      -       These functions are described in the XSI Curses standard, Issue 4.
-
-       The ncurses library obeys the XPG4 standard and the historical practice
-       of  the  AT&T  curses  implementations, in that the echo bit is cleared
-       when curses initializes the terminal state.  BSD curses  differed  from
-       this  slightly;  it left the echo bit on at initialization, but the BSD
-       raw call turned it off as a side-effect.   For  best  portability,  set
-       echo  or noecho explicitly just after initialization, even if your pro-
-       gram remains in cooked mode.
-
-       The XSI Curses standard is ambiguous on the  question  of  whether  raw
-       should  disable  the  CRLF translations controlled by nl and nonl.  BSD
-       curses did turn off these translations; AT&T curses (at least  as  late
-       as  SVr1)  did not.  We chose to do so, on the theory that a programmer
-       requesting raw input wants a clean  (ideally  8-bit  clean)  connection
-       that the operating system will not alter.
-
-       When keypad is first enabled, ncurses loads the key-definitions for the
-       current terminal description.  If the terminal description includes ex-
-       tended string capabilities, e.g., from using the -x option of tic, then
-       ncurses also defines keys for the capabilities whose names  begin  with
-       "k".  The corresponding keycodes are generated and (depending on previ-
-       ous loads of terminal descriptions) may differ from one execution of  a
-       program to the next.  The generated keycodes are recognized by the key-
-       name function (which will then return a name beginning with "k"  denot-
-       ing  the terminfo capability name rather than "K", used for curses key-
-       names).  On the other hand, an application can use define_key to estab-
-       lish a specific keycode for a given string.  This makes it possible for
-       an application to check for  an  extended  capability's  presence  with
-       tigetstr, and reassign the keycode to match its own needs.
-
-       Low-level applications can use tigetstr to obtain the definition of any
-       particular string capability.  Higher-level applications which use  the
-       curses  wgetch  and  similar functions to return keycodes rely upon the
-       order in which the strings are loaded.  If more than one key definition
-       has  the  same  string  value, then wgetch can return only one keycode.
-       Most curses implementations (including ncurses) load key definitions in
-       the  order  defined  by the array of string capability names.  The last
-       key to be loaded determines the keycode which  will  be  returned.   In
-       ncurses,  you  may  also  have extended capabilities interpreted as key
-       definitions.  These are loaded after the predefined keys, and if a  ca-
-       pability's value is the same as a previously-loaded key definition, the
-       later definition is the one used.
+       o   win is a null pointer (except with intrflush and meta, which ignore
+           its value).
+
+       Further, halfdelay returns ERR if delay is outside the range 1..255.
+
+       See  section  "EXTENSIONS"  below  for  the return values of is_cbreak,
+       is_echo, is_nl, and is_raw.

      NOTES

      -       Note that echo, noecho, halfdelay, intrflush, meta, nl, nonl,  nodelay,
-       notimeout, noqiflush, qiflush, timeout, and wtimeout may be macros.
+       echo, noecho, halfdelay, intrflush, meta, nl, nonl, nodelay, notimeout,
+       noqiflush, qiflush, timeout, and wtimeout may be implemented as macros.
+
+       noraw  and  nocbreak follow historical practice in that they attempt to
+       restore the terminal's canonical ("cooked") line  discipline  from  raw
+       and  cbreak, respectively.  Mixing raw/noraw calls with cbreak/nocbreak
+       calls leads to terminal driver control states that are hard to  predict
+       or understand; doing so is not recommended.
 
-       The  noraw  and  nocbreak calls follow historical practice in that they
-       attempt to restore to normal ("cooked") mode from raw and cbreak  modes
-       respectively.   Mixing raw/noraw and cbreak/nocbreak calls leads to tty
-       driver control states that are hard to predict or understand; it is not
-       recommended.
+       curses  documentation  uses  the  terms "delay" and "timeout" freely to
+       describe two related but distinct aspects of  input  handling,  at  the
+       risk   of  confusing  the  user.   The  functions  halfdelay,  nodelay,
+       notimeout, timeout,  and  wtimeout  all  configure  whether  the  input
+       character   reading  function  (getch(3x)  or  get_wch(3x))  waits  for
+       keyboard input, and for how long.  Only keypad configures whether  that
+       function  waits  for  further  input if the first character it reads is
+       ESC.  X/Open Curses affords no means of configuring the length of  this
+       second  delay, but an AIX and ncurses extension, ESCDELAY, is available
+       both as an environment variable and  a  global  symbol  permitting  the
+       application to do so; see ncurses(3x) and curs_variables(3x).
+
+
+

      EXTENSIONS

      +       ncurses  provides  four  "is_" functions corresponding to cbreak, echo,
+       nl, and raw, permitting their states to be queried by the application.
+
+                            Query       Set      Reset
+                            ------------------------------
+                            is_cbreak   cbreak   nocbreak
+                            is_echo     echo     noecho
+                            is_nl       nl       nonl
+                            is_raw      raw      noraw
+
+       In each case, the function returns
+
+       1    if the option is set,
+
+       0    if the option is unset, or
+
+       -1   if the library's TERMINAL structure for the device  has  not  been
+            initialized.
+
+
+

      PORTABILITY

      +       Applications employing ncurses extensions should condition their use on
+       the visibility of the NCURSES_VERSION preprocessor macro.
+
+       Except as noted in section "EXTENSIONS" above,  X/Open  Curses  Issue 4
+       describes these functions.  It specifies no error conditions for them.
+
+       SVr4  describes  a  successful  return  value only as "an integer value
+       other than ERR".
+
+       ncurses follows X/Open Curses and the historical practice  of  System V
+       curses,  clearing  the  terminal driver's "echo" flag when initializing
+       the screen.  BSD curses did not, but its raw function turned it off  as
+       a  side  effect.   For best portability, call echo or noecho explicitly
+       just after initialization, even if your program retains the  terminal's
+       canonical ("cooked") line discipline.
+
+       X/Open  Curses  is  ambiguous  regarding whether raw should disable the
+       carriage return and line feed translation feature controlled by nl  and
+       nonl.   BSD  curses  turned off these translations; System V curses did
+       not.  ncurses does so, on the assumption that a  programmer  requesting
+       raw  input  wants  a  clean  (ideally, 8-bit clean) connection that the
+       operating system will not alter.
+
+       When keypad is first enabled, ncurses loads the key definitions for the
+       current  terminal  type  description.   If  that  description  includes
+       extended string capabilities, for example, by using the  -x  option  of
+       tic(1), then ncurses also defines keys for the capabilities whose names
+       begin with "k".  Corresponding key codes are generated  and  (depending
+       on  previous  loads  of  terminal  descriptions)  may  differ  from one
+       execution of a program to  the  next.   The  generated  key  codes  are
+       recognized by keyname(3x), which then returns a name beginning with "k"
+       denoting the terminfo capability name rather than "K", used for  curses
+       key names.  On the other hand, an application can use define_key(3x) to
+       bind a specific key to a  string  of  the  programmer's  choice.   This
+       feature   enables  an  application  to  check  for  its  presence  with
+       tigetstr(3x), and reassign the key code to match its own needs.
+
+       Low-level applications can use tigetstr(3x) to obtain the definition of
+       any  string  capability.   curses  applications use the input character
+       reading function to obtain key codes from input and rely upon the order
+       in  which  the string capabilities are loaded.  Multiple key capability
+       strings can have the  same  value,  but  the  input  character  reading
+       function  can  report  only  one key code.  Most curses implementations
+       (including ncurses) load key definitions in the order  they  appear  in
+       the strfnames array of string capability names; see term_variables(3x).
+       The last capability read using a particular definition  determines  the
+       key  code  to  be  reported.   In ncurses, extended capabilities can be
+       interpreted as key definitions.  These are loaded after the  predefined
+       keys,  and  if  a capability's value is the same as a previously loaded
+       key definition, the library uses the later definition.
+
+
+

      HISTORY

      +       4BSD (1980) introduced echo, noecho, nl, nonl, raw, and noraw.
+
+       SVr2 (1984) featured a new terminal driver, extending the curses API to
+       support it with cbreak, nocbreak, intrflush, keypad, meta, nodelay, and
+       typeahead.
+
+       SVr3 (1987) added halfdelay,  notimeout,  and  wtimeout.   qiflush  and
+       noqiflush  appeared in SVr3.1 (1987), at which point intrflush became a
+       wrapper for either of these functions, depending on the  value  of  its
+       Boolean argument.  SVr3.1 also added timeout.
+
+       ncurses 6.5 (2024) introduced is_cbreak, is_echo, is_nl, and is_raw.
+
+       Formerly,  ncurses  used  nl  and  nonl  to  control  the conversion of
+       newlines to carriage return/line feed  on  output  as  well  as  input.
+       X/Open  Curses  documents  the  use  of these functions only for input.
+       This difference arose from converting the pcurses source (1986),  which
+       used  ioctl(2)  calls  and  the sgttyb structure, to termios (the POSIX
+       terminal API).  In the former, both input and  output  were  controlled
+       via a single option "CRMOD", while the latter separates these features.
+       Because that conversion interferes with  output  optimization,  ncurses
+       6.2 (2020) amended nl and nonl to eliminate their effect on output.

      SEE ALSO

      -       curses(3x),   curs_getch(3x),   curs_initscr(3x),   curs_util(3x),  de-
-       fine_key(3x), termios(3)
+       curses(3x),     curs_getch(3x),     curs_initscr(3x),    curs_util(3x),
+       define_key(3x), termios(3), term_variables(3x)
 
 
 
-                                                               curs_inopts(3x)
+ncurses 6.5                       2025-03-01                   curs_inopts(3x)
      diff --git a/doc/html/man/curs_ins_wch.3x.html b/doc/html/man/curs_ins_wch.3x.html index 883121e8..d1844388 100644 --- a/doc/html/man/curs_ins_wch.3x.html +++ b/doc/html/man/curs_ins_wch.3x.html @@ -1,6 +1,6 @@ -curs_ins_wch 3x +curs_ins_wch 3x 2025-03-01 ncurses 6.5 Library calls -

      curs_ins_wch 3x

      +

      curs_ins_wch 3x 2025-03-01 ncurses 6.5 Library calls

      -curs_ins_wch(3x)                                              curs_ins_wch(3x)
+curs_ins_wch(3x)                 Library calls                curs_ins_wch(3x)

      NAME

      -       ins_wch,  mvins_wch,  mvwins_wch, wins_wch - insert a complex character
-       and rendition into a window
+       ins_wch,  wins_wch,  mvins_wch,  mvwins_wch  -  insert a curses complex
+       character in a window

      SYNOPSIS

      -       #include <curses.h>
+       #include <curses.h>
 
-       int ins_wch(const cchar_t *wch);
-       int wins_wch(WINDOW *win, const cchar_t *wch);
-
-       int mvins_wch(int y, int x, const cchar_t *wch);
-       int mvwins_wch(WINDOW *win, int y, int x, const cchar_t *wch);
+       int ins_wch(const cchar_t * wch);
+       int wins_wch(WINDOW * win, const cchar_t * wch);
+       int mvins_wch(int y, int x, const cchar_t * wch);
+       int mvwins_wch(WINDOW * win, int y, int x,
+             const cchar_t * wch);

      DESCRIPTION

      -       These routines, insert the complex character wch with rendition  before
-       the  character  under  the  cursor.  All characters to the right of the
-       cursor are moved one space to the right, with the  possibility  of  the
-       rightmost  character  on  the line being lost.  The insertion operation
-       does not change the cursor position.
+       wins_wch inserts  the  curses  complex  character  wch  at  the  cursor
+       position in the window win.  The character previously at the cursor and
+       any to its right move one cell to the  right;  the  formerly  rightmost
+       character  on the line is discarded.  Unlike add_wch(3x), wins_wch does
+       not advance the cursor.  ncurses(3x) describes  the  variants  of  this
+       function.

      RETURN VALUE

      -       If successful, these functions return OK.  If not, they return ERR.
+       These functions return OK on success and ERR on failure.
+
+       In ncurses, they return ERR if
+
+       o   the curses screen has not been initialized, and
+
+       o   (for  functions  taking  a  WINDOW  pointer argument) win is a null
+           pointer.
+
+       Functions prefixed with "mv" first perform cursor movement and fail  if
+       the position (y, x) is outside the window boundaries.
 
-       Functions with a "mv" prefix first  perform  a  cursor  movement  using
-       wmove, and return an error if the position is outside the window, or if
-       the window pointer is null.
 
+

      NOTES

      +       ins_wch, mvins_wch, and mvwins_wch may be implemented as macros.
 
-

      ERRORS

      -       No errors are defined.
+       curses  does  not  necessarily  employ  the terminal's insert_character
+       (ich1) capability to achieve insertion.
+
+
+

      PORTABILITY

      +       X/Open Curses Issue 4 describes these functions.  It specifies no error
+       conditions for them.
+
+
+

      HISTORY

      +       X/Open  Curses Issue 4 (1995) initially specified these functions.  The
+       System V Interface Definition Version 4 of the same  year  specified  a
+       function  named  winswch  (and  the  usual variants).  This was a later
+       addition to SVr4.x,  not  appearing  in  the  first  SVr4  (1989).   It
+       differed  from  X/Open's  later wins_wch in that it took an argument of
+       type chtype instead of cchar_t.

      SEE ALSO

      -       curses(3x), curs_insch(3x).
+       curs_insch(3x) describes comparable functions in the non-wide-character
+       curses configuration.
+
+       curses(3x), terminfo(5)
 
 
 
-                                                              curs_ins_wch(3x)
+ncurses 6.5                       2025-03-01                  curs_ins_wch(3x)
      diff --git a/doc/html/man/curs_ins_wstr.3x.html b/doc/html/man/curs_ins_wstr.3x.html index fa428938..b8a8ae46 100644 --- a/doc/html/man/curs_ins_wstr.3x.html +++ b/doc/html/man/curs_ins_wstr.3x.html @@ -1,6 +1,6 @@ -curs_ins_wstr 3x +curs_ins_wstr 3x 2025-03-01 ncurses 6.5 Library calls -

      curs_ins_wstr 3x

      +

      curs_ins_wstr 3x 2025-03-01 ncurses 6.5 Library calls

      -curs_ins_wstr(3x)                                            curs_ins_wstr(3x)
+curs_ins_wstr(3x)                Library calls               curs_ins_wstr(3x)

      NAME

      -       ins_wstr, ins_nwstr, wins_wstr, wins_nwstr, mvins_wstr, mvins_nwstr,
-       mvwins_wstr, mvwins_nwstr - insert a wide-character string into a
-       curses window
+       ins_wstr,  wins_wstr,  mvins_wstr,  mvwins_wstr, ins_nwstr, wins_nwstr,
+       mvins_nwstr, mvwins_nwstr - insert a wide-character string in a  curses
+       window

      SYNOPSIS

              #include <curses.h>
 
-       int ins_wstr(const wchar_t *wstr);
-       int ins_nwstr(const wchar_t *wstr, int n);
-       int wins_wstr(WINDOW *win, const wchar_t *wstr);
-       int wins_nwstr(WINDOW *win, const wchar_t *wstr, int n);
+       int ins_wstr(const wchar_t * wstr);
+       int wins_wstr(WINDOW * win, const wchar_t * wstr);
+       int mvins_wstr(int y, int x, const wchar_t * wstr);
+       int mvwins_wstr(WINDOW * win, int y, int x,
+             const wchar_t * wstr);
 
-       int mvins_wstr(int y, int x, const wchar_t *wstr);
-       int mvins_nwstr(int y, int x, const wchar_t *wstr, int n);
-       int mvwins_wstr(WINDOW *win, int y, int x, const wchar_t *wstr);
-       int mvwins_nwstr(WINDOW *win, int y, int x, const wchar_t *wstr, int n);
+       int ins_nwstr(const wchar_t * wstr, int n);
+       int wins_nwstr(WINDOW * win, const wchar_t * wstr, int n);
+       int mvins_nwstr(int y, int x, const wchar_t * wstr, int n);
+       int mvwins_nwstr(WINDOW * win, int y, int x,
+             const wchar_t * wstr, int n);

      DESCRIPTION

      -       These routines insert a wchar_t character string (as many characters as
-       will fit on the line) before the character under the cursor.  All char-
-       acters to the right of the cursor are shifted right, with the possibil-
-       ity of the rightmost characters on the line being lost.  No wrapping is
-       performed.   The cursor position does not change (after moving to y, x,
-       if specified).  The four routines with n as the last argument insert  a
-       leading  substring  of at most n wchar_t characters.  If n is less than
-       1, the entire string is inserted.
-
-       If a character in wstr is a tab, newline, carriage return or backspace,
-       the  cursor  is  moved appropriately within the window.  A newline also
-       does a clrtoeol before moving.  Tabs are  considered  to  be  at  every
-       eighth column.  If a character in wstr is another control character, it
-       is drawn in the ^X notation.  Calling win_wch after  adding  a  control
-       character  (and moving to it, if necessary) does not return the control
-       character, but instead returns a character in the  ^-representation  of
-       the control character.
+       wins_wstr  inserts a wide-character string wstr before the character at
+       the cursor in window win as if by calling wins_wch(3x) for each wchar_t
+       in  wstr.   No  line wrapping is performed.  Characters to the right of
+       the cursor are shifted right; those at the right edge of the window may
+       be  lost.   wins_wstr  stops  inserting if it would have to wrap to the
+       next line to write the next wchar_t in wstr.  The cursor position  does
+       not change (after moving to (y, x), if specified).  wins_nwstr does the
+       same, but inserts at most n wide characters, or as many as possible (up
+       to  the  end  of the line) if n is negative.  ncurses(3x) describes the
+       variants of these functions.
+
+
+

      RETURN VALUE

      +       These functions return OK on success and ERR on failure.
+
+       In ncurses, they return ERR if
+
+       o   win is NULL,
+
+       o   wstr is NULL,
+
+       o   the first wide character in wstr is a non-spacing character, or
+
+       o   an internal wins_wch(3x) call returns ERR.
+
+       Functions prefixed with "mv" first perform cursor movement and fail  if
+       the position (y, x) is outside the window boundaries.

      NOTES

      -       Note that all but wins_nwstr may be macros.
+       All of these functions except wins_nwstr may be implemented as macros.
 
-       If  the  first character in the string is a nonspacing character, these
-       functions will fail.  XSI does not define what will happen  if  a  non-
-       spacing character follows a control character.
 
+

      EXTENSIONS

      +       ins_nwstr,  wins_nwstr,  mvins_nwstr,  and mvwins_nwstr's acceptance of
+       negative n values is an ncurses extension.
 
-

      RETURN VALUE

      -       Upon successful completion, these functions return OK.  Otherwise, they
-       return ERR.
 
-       Functions with a "mv" prefix first  perform  a  cursor  movement  using
-       wmove, and return an error if the position is outside the window, or if
-       the window pointer is null.
+

      PORTABILITY

      +       Applications employing ncurses extensions should condition their use on
+       the visibility of the NCURSES_VERSION preprocessor macro.
+
+       X/Open Curses Issue 4 describes these functions.  It specifies no error
+       conditions for them.
+
+       X/Open Curses does not specify what happens if a non-spacing  character
+       follows a control character.
+
+       Issue 4  states that the entire string is inserted if n is less than 1.
+       This is probably an  error,  because  it  is  inconsistent  with  other
+       functions  such  as  waddwstr,  and  differs  from  the SVr4 curses and
+       Solaris xcurses implementations.   Nevertheless,  Issue 7  retains  the
+       language.
+
+
+

      HISTORY

      +       X/Open  Curses Issue 4 (1995) initially specified these functions.  The
+       System V Interface Definition  Version 4  (1995),  specified  functions
+       named  winswstr  and  winsnwstr  (and  the usual variants).  These were
+       later additions to SVr4.x, not appearing  in  the  first  SVr4  (1989).
+       They  differ from X/Open's later wins_wstr and wins_nwstr in that their
+       wstr parameters are not const-qualified.

      SEE ALSO

      -       curses(3x), curs_insstr(3x), curs_in_wch(3x), curs_ins_wch(3x).
+       curs_insstr(3x) describes comparable functions of the  ncurses  library
+       in its non-wide-character configuration.
+
+       curses(3x), curs_ins_wch(3x), curs_in_wch(3x)
 
 
 
-                                                             curs_ins_wstr(3x)
+ncurses 6.5                       2025-03-01                 curs_ins_wstr(3x)
      diff --git a/doc/html/man/curs_insch.3x.html b/doc/html/man/curs_insch.3x.html index 12edc6cd..52fe7064 100644 --- a/doc/html/man/curs_insch.3x.html +++ b/doc/html/man/curs_insch.3x.html @@ -1,6 +1,6 @@ -curs_insch 3x +curs_insch 3x 2025-03-01 ncurses 6.5 Library calls -

      curs_insch 3x

      +

      curs_insch 3x 2025-03-01 ncurses 6.5 Library calls

      -curs_insch(3x)                                                  curs_insch(3x)
+curs_insch(3x)                   Library calls                  curs_insch(3x)

      NAME

      -       insch,  winsch, mvinsch, mvwinsch - insert a character before cursor in
-       a curses window
+       insch,  winsch,  mvinsch,  mvwinsch  -  insert  a curses character in a
+       window

      SYNOPSIS

              #include <curses.h>
 
        int insch(chtype ch);
-       int winsch(WINDOW *win, chtype ch);
-
+       int winsch(WINDOW * win, chtype ch);
        int mvinsch(int y, int x, chtype ch);
-       int mvwinsch(WINDOW *win, int y, int x, chtype ch);
+       int mvwinsch(WINDOW * win, int y, int x, chtype ch);

      DESCRIPTION

      -       These routines insert the character ch before the character  under  the
-       cursor.   All characters to the right of the cursor are moved one space
-       to the right, with the possibility of the rightmost  character  on  the
-       line  being  lost.   The insertion operation does not change the cursor
-       position.
+       winsch inserts the curses character ch at the cursor  position  in  the
+       window  win.   The  character  previously  at the cursor and any to its
+       right move one cell to the right; the formerly rightmost  character  on
+       the  line  is discarded.  Unlike addch(3x), winsch does not advance the
+       cursor.  ncurses(3x) describes the variants of this function.

      RETURN VALUE

      -       All routines that return an integer return  ERR  upon  failure  and  OK
-       (SVr4 specifies only "an integer value other than ERR") upon successful
-       completion,  unless  otherwise   noted   in   the   preceding   routine
-       descriptions.
+       These functions return OK on success and ERR on failure.
+
+       In ncurses, they return ERR if
+
+       o   the curses screen has not been initialized, and
+
+       o   (for functions taking a WINDOW pointer  argument)  win  is  a  null
+           pointer.
 
-       Functions  with  a  "mv"  prefix  first perform a cursor movement using
-       wmove, and return an error if the position is outside the window, or if
-       the window pointer is null.
+       Functions  prefixed with "mv" first perform cursor movement and fail if
+       the position (y, x) is outside the window boundaries.

      NOTES

      -       These  routines  do  not  necessarily  imply  use  of a hardware insert
-       character feature.
+       insch, mvinsch, and mvwinsch may be implemented as macros.
 
-       Note that insch, mvinsch, and mvwinsch may be macros.
+       curses does not  necessarily  employ  the  terminal's  insert_character
+       (ich1) capability to achieve insertion.

      PORTABILITY

      -       These functions are described in the XSI Curses standard, Issue 4.
+       X/Open Curses Issue 4 describes these functions.  It specifies no error
+       conditions for them.
+
+       SVr4 describes a successful return value  only  as  "an  integer  value
+       other than ERR".
+
+
+

      HISTORY

      +       SVr2 (1984) introduced these functions.

      SEE ALSO

      -       curses(3x).
+       curs_ins_wch(3x)  describes  comparable functions in the wide-character
+       curses configuration.
 
-       Comparable functions  in  the  wide-character  (ncursesw)  library  are
-       described in curs_ins_wch(3x).
+       curses(3x), terminfo(5)
 
 
 
-                                                                curs_insch(3x)
+ncurses 6.5                       2025-03-01                    curs_insch(3x)
      diff --git a/doc/html/man/curs_insstr.3x.html b/doc/html/man/curs_insstr.3x.html index 2692a549..f307f5ff 100644 --- a/doc/html/man/curs_insstr.3x.html +++ b/doc/html/man/curs_insstr.3x.html @@ -1,6 +1,6 @@ -curs_insstr 3x +curs_insstr 3x 2025-02-01 ncurses 6.5 Library calls -

      curs_insstr 3x

      +

      curs_insstr 3x 2025-02-01 ncurses 6.5 Library calls

      -curs_insstr(3x)                                                curs_insstr(3x)
+curs_insstr(3x)                  Library calls                 curs_insstr(3x)

      NAME

      -       insstr,  insnstr,  winsstr,  winsnstr,  mvinsstr, mvinsnstr, mvwinsstr,
-       mvwinsnstr - insert string before cursor in a curses window
+       insstr,  winsstr,  mvinsstr,  mvinsnstr,  insnstr, winsnstr, mvwinsstr,
+       mvwinsnstr - insert a string in a curses window

      SYNOPSIS

              #include <curses.h>
-       int insstr(const char *str);
-       int insnstr(const char *str, int n);
-       int winsstr(WINDOW *win, const char *str);
-       int winsnstr(WINDOW *win, const char *str, int n);
 
-       int mvinsstr(int y, int x, const char *str);
-       int mvinsnstr(int y, int x, const char *str, int n);
-       int mvwinsstr(WINDOW *win, int y, int x, const char *str);
-       int mvwinsnstr(WINDOW *win, int y, int x, const char *str, int n);
+       int insstr(const char * str);
+       int winsstr(WINDOW * win, const char * str);
+       int mvinsstr(int y, int x, const char * str);
+       int mvwinsstr(WINDOW * win, int y, int x, const char * str);
 
+       int insnstr(const char * str, int n);
+       int winsnstr(WINDOW * win, const char * str, int n);
+       int mvinsnstr(int y, int x, const char * str, int n);
+       int mvwinsnstr(WINDOW * win, int y, int x, const char * str,
+             int n);
 
-

      DESCRIPTION

      -       These routines insert a character string (as many  characters  as  will
-       fit on the line) before the character under the cursor.  All characters
-       to the right of the cursor are shifted right with  the  possibility  of
-       the  rightmost  characters on the line being lost.  The cursor position
-       does not change (after moving to y, x, if  specified).   The  functions
-       with  n  as  the  last argument insert a leading substring of at most n
-       characters.  If n<=0, then the entire string is inserted.
 
-       Special characters are handled as in addch.
+

      DESCRIPTION

      +       winsstr inserts a string str before the  character  at  the  cursor  in
+       window  win  as if by calling winsch(3x) for each char in str.  No line
+       wrapping is performed.  Characters to  the  right  of  the  cursor  are
+       shifted  right;  those  at  the  right  edge of the window may be lost.
+       winsstr stops inserting if it would have to wrap to the  next  line  to
+       write the next char in str.  The cursor position does not change (after
+       moving to (y, x), if specified).  insnstr does the same, but inserts at
+       most  n  characters, or as many as possible (up to the end of the line)
+       if  n  is  negative.   ncurses(3x)  describes  the  variants  of  these
+       functions.

      RETURN VALUE

      -       All routines that return an integer return  ERR  upon  failure  and  OK
-       (SVr4 specifies only "an integer value other than ERR") upon successful
-       completion,  unless  otherwise   noted   in   the   preceding   routine
-       descriptions.
+       These functions return OK on success and ERR on failure.
+
+       In ncurses, they return ERR if
+
+       o   win is NULL,
 
-       X/Open  defines  no  error  conditions.  In this implementation, if the
-       window parameter is null or the str parameter  is  null,  an  error  is
-       returned.
+       o   str is NULL, or
 
-       Functions  with  a  "mv"  prefix  first perform a cursor movement using
-       wmove, and return an error if the position is outside the window, or if
-       the window pointer is null.
+       o   an internal winsch(3x) call returns ERR.
+
+       Functions  prefixed with "mv" first perform cursor movement and fail if
+       the position (y, x) is outside the window boundaries.

      NOTES

      -       Note that all but winsnstr may be macros.
+       All of these functions except winsnstr may be implemented as macros.
+
+
+

      EXTENSIONS

      +       insnstr, winsnstr, mvinsnstr, and mvwinsnstr's acceptance of negative n
+       values is an ncurses extension.

      PORTABILITY

      -       These  functions  are  described  in  the XSI Curses standard, Issue 4,
-       which adds const qualifiers to the arguments.
+       Applications employing ncurses extensions should condition their use on
+       the visibility of the NCURSES_VERSION preprocessor macro.
 
-       The Single Unix  Specification,  Version  2  states  that  insnstr  and
-       winsnstr  perform  wrapping.  This is probably an error, since it makes
-       this group of  functions  inconsistent.   Also,  no  implementation  of
-       curses documents this inconsistency.
+       X/Open Curses Issue 4 describes these functions.  It specifies no error
+       conditions for them.
+
+       SVr4  describes  a  successful  return  value only as "an integer value
+       other than ERR".
+
+       Issue 4 distinguished insnstr and winsnstr  from  the  other  functions
+       documented  above  by stating they "do not perform wrapping".  This was
+       probably an error, since it makes this group of functions inconsistent.
+       No  implementation  of curses manifests this inconsistency, and Issue 7
+       removed the claim.
+
+       Issue 4 states that the entire string is inserted if n is less than  1.
+       This  is  probably  an  error,  because  it  is inconsistent with other
+       functions such as waddstr, and differs from the SVr4 curses and Solaris
+       xcurses implementations.  Nevertheless, Issue 7 retains the language.
+
+
+

      HISTORY

      +       SVr3.1 (1987) introduced winsstr and winsnstr and their variants.

      SEE ALSO

      -       curses(3x), curs_util(3x), curs_clear(3x), curs_inch(3x).
+       curs_ins_wstr(3x) describes comparable functions of the ncurses library
+       in its wide-character configuration (ncursesw).
+
+       curses(3x), curs_inch(3x), curs_ins_wstr(3x), curs_util(3x)
 
 
 
-                                                               curs_insstr(3x)
+ncurses 6.5                       2025-02-01                   curs_insstr(3x)
      diff --git a/doc/html/man/curs_instr.3x.html b/doc/html/man/curs_instr.3x.html index 28be2ba9..42b8ee58 100644 --- a/doc/html/man/curs_instr.3x.html +++ b/doc/html/man/curs_instr.3x.html @@ -1,6 +1,6 @@ -curs_instr 3x +curs_instr 3x 2025-03-01 ncurses 6.5 Library calls -

      curs_instr 3x

      +

      curs_instr 3x 2025-03-01 ncurses 6.5 Library calls

      -curs_instr(3x)                                                  curs_instr(3x)
+curs_instr(3x)                   Library calls                  curs_instr(3x)

      NAME

      -       instr,  innstr, winstr, winnstr, mvinstr, mvinnstr, mvwinstr, mvwinnstr
-       - get a string of characters from a curses window
+       instr,  winstr, mvinstr, mvwinstr, innstr, winnstr, mvinnstr, mvwinnstr
+       - get a string from a curses window

      SYNOPSIS

              #include <curses.h>
 
-       int instr(char *str);
-       int innstr(char *str, int n);
-       int winstr(WINDOW *win, char *str);
-       int winnstr(WINDOW *win, char *str, int n);
+       int instr(char * str);
+       int winstr(WINDOW * win, char * str);
+       int mvinstr(int y, int x, char * str);
+       int mvwinstr(WINDOW * win, int y, int x, char * str);
 
-       int mvinstr(int y, int x, char *str);
-       int mvinnstr(int y, int x, char *str, int n);
-       int mvwinstr(WINDOW *win, int y, int x, char *str);
-       int mvwinnstr(WINDOW *win, int y, int x, char *str, int n);
+       int innstr(char * str, int n);
+       int winnstr(WINDOW * win, char * str, int n);
+       int mvinnstr(int y, int x, char * str, int n);
+       int mvwinnstr(WINDOW * win, int y, int x, char * str,
+             int n);

      DESCRIPTION

      -       These routines return a string of characters in str, extracted starting
-       at  the  current  cursor  position in the named window.  Attributes are
-       stripped from the characters.  The four functions with n  as  the  last
-       argument   return  a  leading  substring  at  most  n  characters  long
-       (exclusive of the trailing NUL).
+       winstr extracts a string from a curses  window  win,  starting  at  the
+       cursor  and  stopping  at  the  end  of the line, and stores it in str,
+       terminating it with a null character and omitting  any  attributes  and
+       color  pair  identifier  that  curses  associates  with each character.
+       winnstr does the same, but copies at most n  characters  from  win.   A
+       negative   n   implies  no  limit;  winnstr  then  works  like  winstr.
+       ncurses(3x) describes the variants of these functions.

      RETURN VALUE

      -       All of the  functions  return  ERR  upon  failure,  or  the  number  of
-       characters actually read into the string.
+       These functions return the count of characters copied from win to  str,
+       or ERR upon failure.
 
-       X/Open Curses defines no error conditions.  In this implementation:
+       In ncurses, these functions return ERR if
 
-       o   If the win parameter is null, an error is returned,
+       o   the curses screen has not been initialized,
 
-       o   If the chstr parameter is null, an error is returned,
+       o   (for  functions  taking  a  WINDOW  pointer argument) win is a null
+           pointer, or
 
-       Functions  with  a  "mv"  prefix  first perform a cursor movement using
-       wmove, and return an error if the position is outside the window, or if
-       the window pointer is null.
+       o   str is a null pointer.
+
+       Functions prefixed with "mv" first perform cursor movement and fail  if
+       the position (y, x) is outside the window boundaries.

      NOTES

      -       Note that all routines except winnstr may be macros.
+       All of these functions except winnstr may be implemented as macros.
+
+       Reading  a  line that overflows the array pointed to by str with instr,
+       winstr, mvinstr, or mvwinstr causes undefined results.  Use of  innstr,
+       winnstr, mvinnstr, and mvwinnstr is recommended instead.
+
+
+

      EXTENSIONS

      +       innstr,  winnstr,  mvinnstr,  and  mvwinnstr's acceptance of negative n
+       values is an ncurses extension.

      PORTABILITY

      -       SVr4  does not document whether a length limit includes or excludes the
-       trailing NUL.
+       Applications employing ncurses extensions should condition their use on
+       the visibility of the NCURSES_VERSION preprocessor macro.
+
+       X/Open Curses Issue 4 describes these functions.  It specifies no error
+       conditions for them.
+
+       X/Open Curses Issues 4 and 7 both state that  instr,  winstr,  mvinstr,
+       and  mvwinstr  return OK rather than a character count.  This is likely
+       an erratum.
 
-       The ncurses library extends the XSI description by allowing a  negative
-       value  for  n.  In this case, the functions return the string ending at
-       the right margin.
+       o   SVr3.1 and SVr4 implemented winstr as  a  wrapper  around  winnstr,
+           returning the latter's return value.  X/Open Curses's specification
+           thus may have been an editorial  solecism  copied  from  System V's
+           documentation  (see  below)  by  X/Open, rather than an intentional
+           change.
+
+       o   ncurses retains compatibility with System V curses behavior.
+
+       SVr4 describes a successful return value  only  as  "an  integer  value
+       other than ERR".
+
+       SVr4  does not document whether n counts the null terminator that these
+       functions write to str.
+
+
+

      HISTORY

      +       SVr3.1 (1987) introduced these functions.

      SEE ALSO

      -       curses(3x).
+       curs_inwstr(3x) describes comparable functions of the  ncurses  library
+       in its wide-character configuration (ncursesw).
+
+       curses(3x), curs_inch(3x), curs_inchstr(3x)
 
 
 
-                                                                curs_instr(3x)
+ncurses 6.5                       2025-03-01                    curs_instr(3x)
      diff --git a/doc/html/man/curs_inwstr.3x.html b/doc/html/man/curs_inwstr.3x.html index 0d8c3c1e..c83bc0c9 100644 --- a/doc/html/man/curs_inwstr.3x.html +++ b/doc/html/man/curs_inwstr.3x.html @@ -1,6 +1,6 @@ -curs_inwstr 3x +curs_inwstr 3x 2025-03-01 ncurses 6.5 Library calls -

      curs_inwstr 3x

      +

      curs_inwstr 3x 2025-03-01 ncurses 6.5 Library calls

      -curs_inwstr(3x)                                                curs_inwstr(3x)
+curs_inwstr(3x)                  Library calls                 curs_inwstr(3x)

      NAME

      -       inwstr,  innwstr,  winwstr,  winnwstr,  mvinwstr, mvinnwstr, mvwinwstr,
-       mvwinnwstr - get a string of wchar_t characters from a curses window
+       inwstr,  winwstr,  mvinwstr,  mvwinwstr,  innwstr, winnwstr, mvinnwstr,
+       mvwinnwstr - get a wide-character string from a curses window

      SYNOPSIS

              #include <curses.h>
 
-       int inwstr(wchar_t *wstr);
-       int innwstr(wchar_t *wstr, int n);
-       int winwstr(WINDOW *win, wchar_t *wstr);
-       int winnwstr(WINDOW *win, wchar_t *wstr, int n);
+       int inwstr(wchar_t * wstr);
+       int winwstr(WINDOW * win, wchar_t * wstr);
+       int mvinwstr(int y, int x, wchar_t * wstr);
+       int mvwinwstr(WINDOW * win, int y, int x, wchar_t * wstr);
 
-       int mvinwstr(int y, int x, wchar_t *wstr);
-       int mvinnwstr(int y, int x, wchar_t *wstr, int n);
-       int mvwinwstr(WINDOW *win, int y, int x, wchar_t *wstr);
-       int mvwinnwstr(WINDOW *win, int y, int x, wchar_t *wstr, int n);
+       int innwstr(wchar_t * wstr, int n);
+       int winnwstr(WINDOW * win, wchar_t * wstr, int n);
+       int mvinnwstr(int y, int x, wchar_t * wstr, int n);
+       int mvwinnwstr(WINDOW * win, int y, int x, wchar_t * wstr,
+             int n);

      DESCRIPTION

      -       These routines return a string of  wchar_t  wide  characters  in  wstr,
-       extracted starting at the current cursor position in the named window.
+       winwstr extracts a wide-character string  from  a  curses  window  win,
+       starting  at the cursor and stopping at the end of the line, and stores
+       it in wstr, terminating it with a wide null character and omitting  any
+       attributes  and  color pair identifier that curses associates with each
+       character.   winnwstr  does  the  same,  but  copies  at  most  n  wide
+       characters  from  win.   A  negative  n implies no limit; winnwstr then
+       works like  winwstr.   ncurses(3x)  describes  the  variants  of  these
+       functions.
 
-       The  four  functions  with  n  as  the  last  argument return a leading
-       substring at most n characters long (exclusive of  the  trailing  NUL).
-       Transfer  stops  at  the  end of the current line, or when n characters
-       have been stored at the location referenced by wstr.
 
-       If the size  n  is  not  large  enough  to  store  a  complete  complex
-       character, an error is generated.
+

      RETURN VALUE

      +       On  successful  operation,  these  functions  return  the count of wide
+       characters copied from win to wstr,  or  ERR  upon  failure.   innwstr,
+       winnwstr,  mvinnwstr,  and mvwinnwstr return ERR if n is insufficiently
+       large to store a complete wide character string.  (Recall that a curses
+       complex  character  can contain multiple wide characters, some of which
+       may be non-spacing.)
+
+       In ncurses, these functions return ERR if
+
+       o   the curses screen has not been initialized,
+
+       o   (for functions taking a WINDOW pointer  argument)  win  is  a  null
+           pointer, or
+
+       o   wstr is a null pointer.
+
+       Functions  prefixed with "mv" first perform cursor movement and fail if
+       the position (y, x) is outside the window boundaries.

      NOTES

      -       All routines except winnwstr may be macros.
+       All of these functions except winnwstr may be implemented as macros.
 
-       Each  cell  in  the  window  holds a complex character (i.e., base- and
-       combining-characters)  together  with  attributes  and  color.    These
-       functions  store  only  the  wide  characters,  ignoring attributes and
-       color.  Use in_wchstr to return the complex characters from a window.
+       Reading a line that overflows the array pointed to by wstr with inwstr,
+       winwstr,  mvinwstr,  or  mvwinwstr  causes  undefined  results.  Use of
+       innwstr, winnwstr, mvinnwstr, and mvwinnwstr is recommended instead.
 
 
-

      RETURN VALUE

      -       All routines return ERR upon failure.  Upon successful completion,  the
-       *inwstr routines return OK, and the *innwstr routines return the number
-       of characters read into the string.
+

      EXTENSIONS

      +       innwstr, winnwstr, mvinnwstr, and mvwinnwstr's acceptance of negative n
+       values is an ncurses extension.
+
 
-       Functions with a "mv" prefix first  perform  a  cursor  movement  using
-       wmove, and return an error if the position is outside the window, or if
-       the window pointer is null.
+

      PORTABILITY

      +       Applications employing ncurses extensions should condition their use on
+       the visibility of the NCURSES_VERSION preprocessor macro.
+
+       X/Open Curses Issue 4 describes these functions.  It specifies no error
+       conditions for them.
+
+       Notwithstanding  the foregoing, X/Open Curses Issues 4 and 7 both state
+       that innwstr, winnwstr, mvinnwstr, and mvwinnwstr "fail  ...  [i]f  the
+       array  is  not  large  enough  to  contain  any  complete  characters".
+       Strictly interpreted, this means  that  a  caller  of  these  functions
+       cannot use their return values to detect truncation of a wide-character
+       string copied from more  than  one  character  cell  in  win.   ncurses
+       reports any truncation with ERR.
+
+       X/Open  Curses  specifies  inwstr,  winwstr, mvinwstr, and mvwinwstr as
+       returning OK rather than a (wide) character count,  unlike  their  non-
+       wide  counterparts  instr,  winstr,  mvinstr,  and  mvwinstr.   ncurses
+       regards this inconsistency as an error in the standard.
+
+
+

      HISTORY

      +       The System V Interface Definition, Version 4 (1995), specified  winwstr
+       and  winnwstr  (and the usual variants).  These were later additions to
+       SVr4.x, not  appearing  in  the  first  SVr4  (1989).   Their  synopses
+       described  each  function as taking an argument of type pointer-to-char
+       instead of pointer-to-wchar_t, despite describing  them  as  "returning
+       the  string  of  wchar_t  in str".  Presumably this was an error in the
+       System V Interface Definition.

      SEE ALSO

      -       curses(3x), curs_instr(3x), curs_in_wchstr(3x)
+       curs_instr(3x) describes comparable functions of the ncurses library in
+       its non-wide-character configuration.
+
+       curses(3x), curs_in_wch(3x), curs_in_wchstr(3x)
 
 
 
-                                                               curs_inwstr(3x)
+ncurses 6.5                       2025-03-01                   curs_inwstr(3x)
      diff --git a/doc/html/man/curs_kernel.3x.html b/doc/html/man/curs_kernel.3x.html index da6792c6..2a56d7ff 100644 --- a/doc/html/man/curs_kernel.3x.html +++ b/doc/html/man/curs_kernel.3x.html @@ -1,6 +1,6 @@ -curs_kernel 3x +curs_kernel 3x 2025-03-01 ncurses 6.5 Library calls -

      curs_kernel 3x

      +

      curs_kernel 3x 2025-03-01 ncurses 6.5 Library calls

      -curs_kernel(3x)                                                curs_kernel(3x)
+curs_kernel(3x)                  Library calls                 curs_kernel(3x)

      NAME

      -       def_prog_mode, def_shell_mode, reset_prog_mode, reset_shell_mode,
-       resetty, savetty, getsyx, setsyx, ripoffline, curs_set, napms - low-
-       level curses routines
+       def_prog_mode,   def_shell_mode,   reset_prog_mode,   reset_shell_mode,
+       resetty, savetty, getsyx, setsyx, curs_set, mvcur, napms, ripoffline  -
+       low-level curses routines

      SYNOPSIS

      @@ -67,144 +67,207 @@ 
      curs_kernel 3x
      
        void getsyx(int y, int x);
        void setsyx(int y, int x);
 
-       int ripoffline(int line, int (*init)(WINDOW *, int));
        int curs_set(int visibility);
+       int mvcur(int oldrow, int oldcol, int newrow, int newcol);
        int napms(int ms);
+       int ripoffline(int line, int (*init)(WINDOW *, int));

      DESCRIPTION

      -       The following routines give low-level access to various curses capabil-
-       ities.  These routines typically are used inside library routines.
+       The   following  routines  give  low-level  access  to  various  curses
+       capabilities.   These  routines  typically  are  used  inside   library
+       routines.
 
 
-

      def_prog_mode, def_shell_mode

      +

      def_prog_mode, def_shell_mode

              The def_prog_mode and def_shell_mode routines save the current terminal
        modes as the "program" (in curses) or "shell" (not in curses) state for
        use by the reset_prog_mode and reset_shell_mode routines.  This is done
-       automatically  by initscr.  There is one such save area for each screen
+       automatically by initscr.  There is one such save area for each  screen
        context allocated by newterm.
 
 
-

      reset_prog_mode, reset_shell_mode

      -       The reset_prog_mode and reset_shell_mode routines restore the  terminal
-       to  "program"  (in curses) or "shell" (out of curses) state.  These are
-       done automatically by endwin(3x) and, after an endwin, by doupdate,  so
+

      reset_prog_mode, reset_shell_mode

      +       The  reset_prog_mode and reset_shell_mode routines restore the terminal
+       to "program" (in curses) or "shell" (out of curses) state.   These  are
+       done  automatically by endwin(3x) and, after an endwin, by doupdate, so
        they normally are not called.
 
 
-

      resetty, savetty

      -       The resetty and savetty routines save and restore the state of the ter-
-       minal modes.  savetty saves the current state in a buffer  and  resetty
-       restores the state to what it was at the last call to savetty.
+

      resetty, savetty

      +       The resetty and savetty routines save and  restore  the  state  of  the
+       terminal  modes.   savetty  saves  the  current  state  in a buffer and
+       resetty restores the state to what it was at the last call to savetty.

      getsyx

      -       The  getsyx  routine  returns  the  current  coordinates of the virtual
-       screen cursor in y and x.  If leaveok is currently TRUE, then -1,-1  is
-       returned.  If lines have been removed from the top of the screen, using
-       ripoffline, y and x include these lines; therefore, y and x  should  be
-       used only as arguments for setsyx.
+       getsyx stores the coordinates of virtual screen (newscr)  cursor  in  y
+       and x.  If newscr's leaveok(3x) output option is TRUE, getsyx stores -1
+       in both y and x.  If lines have been removed from the top of the screen
+       using  ripoffline, y includes these lines; therefore, y and x populated
+       by getsyx should be used only as arguments for setsyx.
 
-       Few applications will use this feature, most use getyx instead.
+       Few applications use this feature; most call getyx(3x) instead.

      setsyx

      -       The  setsyx routine sets the virtual screen cursor to y, x.  If y and x
-       are both -1, then leaveok is set.  The two routines getsyx  and  setsyx
-       are  designed to be used by a library routine, which manipulates curses
-       windows but does not want to change the current position  of  the  pro-
-       gram's cursor.  The library routine would call getsyx at the beginning,
-       do its manipulation of its own windows, do a wnoutrefresh on  its  win-
-       dows, call setsyx, and then call doupdate.
+       setsyx sets the virtual screen (newscr)  cursor  location  to  (y,  x).
+       setsyx(-1, -1) is equivalent to leaveok(newscr, TRUE).
 
-       Few applications will use this feature, most use wmove instead.
+       getsyx  and  setsyx  are  designed  to  be  used  by  a  function  that
+       manipulates curses windows but  seeks  to  avoid  changing  the  cursor
+       position.  Such a function would first call getsyx, modify its windows'
+       content,  call  wnoutrefresh(3x)  on  them,  call  setsyx,  then   call
+       doupdate(3x).
 
+       Few applications use this feature; most call wmove(3x) instead.
 
-

      ripoffline

      -       The  ripoffline  routine  provides  access  to  the  same facility that
-       slk_init [see curs_slk(3x)] uses to reduce  the  size  of  the  screen.
-       ripoffline  must be called before initscr or newterm is called, to pre-
-       pare these initial actions:
 
-       o   If line is positive, a line is removed from the top of stdscr.
+

      curs_set

      +       curs_set adjusts the cursor visibility to "invisible", "visible", "very
+       visible", as its argument is 0, 1, or 2, respectively.  It returns  the
+       previous  visibility  if  the  requested  one  is  supported,  and  ERR
+       otherwise.
 
-       o   if line is negative, a line is removed from the bottom.
 
-       When the resulting initialization is done inside initscr,  the  routine
-       init (supplied by the user) is called with two arguments:
+

      mvcur

      +       mvcur provides low-level cursor motion.  It takes  effect  immediately,
+       rather  than  at  the  next refresh.  Unlike the other low-level output
+       functions, which either write to the  standard  output  stream  or  are
+       passed  a  function  pointer  to  perform  output,  mvcur  uses  a file
+       descriptor derived from the output stream parameter of newterm(3x).
 
-       o   a window pointer to the one-line window that has been allocated and
+       One application of mvcur  accompanies  the  temporary  use  of  another
+       program  to  write  to  the  terminal  screen.  For example, first call
+       refresh(3x) to ensure that the screen and the library's model of it  is
+       up  to  date;  then call reset_shell_mode; write to the screen with the
+       external application; call reset_prog_mode; and finally call mvcur(...,
+       ...,  -1, -1) to move the terminal cursor to where curses thinks it is,
+       since the library has no knowledge  of  how  the  external  application
+       moved it.
 
-       o   an integer with the number of columns in the window.
 
-       Inside  this  initialization  routine,  the integer variables LINES and
-       COLS (defined in <curses.h>) are not guaranteed to be accurate and wre-
-       fresh or doupdate must not be called.  It is allowable to call wnoutre-
-       fresh during the initialization routine.
+

      napms

      +       napms  sleeps  for  ms  milliseconds.   If  ms  exceeds  30,000 (thirty
+       seconds), it is capped at that value.
+
 
-       ripoffline can be called up to five times  before  calling  initscr  or
-       newterm.
+

      ripoffline

      +       ripoffline provides access to the same facility that slk_init(3x)  uses
+       to reduce the size of the screen.  The application must call ripoffline
+       before initscr(3x) or newterm(3x)  so  that  the  functions  prepare  a
+       stdscr of the correct size.
 
+       o   If  line  is  positive,  ripoffline  removes a line from the top of
+           stdscr.
 
-

      curs_set

      -       The  curs_set  routine  sets  the cursor state to invisible, normal, or
-       very visible for visibility equal to 0, 1, or 2 respectively.   If  the
-       terminal  supports  the visibility requested, the previous cursor state
-       is returned; otherwise, ERR is returned.
+       o   If line is negative, ripoffline removes a line from the  bottom  of
+           stdscr.
 
+       When initscr initializes curses, it calls the init function supplied to
+       ripoffline by the application with two arguments:
 
-

      napms

      -       The napms routine is used to sleep for ms milliseconds.
+       o   a pointer to the one-line WINDOW that it allocates, and
+
+       o   an integer with the number of columns in the window.
+
+       Inside this init function, the values of the  integer  variables  LINES
+       and COLS (see curs_variables(3x)) are not guaranteed to be reliable; it
+       must not call wrefresh(3x) or doupdate(3x).  A wnoutrefresh(3x) call is
+       permissible.
+
+       ripoffline can be called up to five times before initscr or newterm.

      RETURN VALUE

      -       Except for curs_set, these routines always return OK.
+       Except  for  curs_set,  these functions return OK on success and ERR on
+       failure.
 
-       curs_set returns the previous cursor state, or  ERR  if  the  requested
-       visibility is not supported.
+       curs_set returns the previous cursor visibility, and returns ERR if the
+       terminal type does not support the requested visibility.
 
-       X/Open defines no error conditions.  In this implementation
+       napms always succeeds.
 
-       def_prog_mode, def_shell_mode, reset_prog_mode, reset_shell_mode
-            return an error if the terminal was not initialized, or if the I/O
-            call to obtain the terminal settings fails.
+       mvcur  fails  if  the  position  (newrow, newcol) is outside the screen
+       boundaries.
 
-       ripoffline
-            returns an error if the maximum number of ripped-off lines exceeds
-            the maximum (NRIPS = 5).
+       In ncurses,
+
+       o   def_prog_mode,      def_shell_mode,      reset_prog_mode,       and
+           reset_shell_mode return ERR if the terminal was not initialized, or
+           if the operating system's function for obtaining terminal  settings
+           fails.
+
+       o   ripoffline  returns  ERR  if the accumulated quantity of ripped-off
+           lines would exceed the maximum (5).

      NOTES

      -       Note that getsyx is a macro, so & is not necessary before the variables
-       y and x.
+       getsyx is a macro; use of  the  &  operator  before  its  arguments  is
+       unnecessary.
 
-       Older SVr4 man pages warn that the return value of  curs_set  "is  cur-
-       rently  incorrect".   This  implementation gets it right, but it may be
-       unwise to count on the correctness of the return value anywhere else.
+       The  endwin  function of both ncurses and SVr4 curses calls curs_set if
+       the latter has previously been called to set the cursor visibility to a
+       value  other  than  normal;  that is, either invisible or very visible.
+       There is no way for ncurses to determine the initial cursor  visibility
+       to restore it.
 
-       Both ncurses and SVr4 will call curs_set in endwin if curs_set has been
-       called  to make the cursor other than normal, i.e., either invisible or
-       very visible.  There is no way for ncurses  to  determine  the  initial
-       cursor state to restore that.
+
+

      EXTENSIONS

      +       In  ncurses, mvcur accepts -1 for either or both old coordinates.  This
+       value tells ncurses that the old location is unknown, and that it  must
+       use  only absolute motion, as with the cursor_address (cup) capability,
+       rather than the least  costly  combination  of  absolute  and  relative
+       motion.

      PORTABILITY

      -       The virtual screen functions setsyx and getsyx are not described in the
-       XSI Curses standard, Issue 4.  All other functions are as described  in
-       XSI Curses.
+       Applications employing ncurses extensions should condition their use on
+       the visibility of the NCURSES_VERSION preprocessor macro.
+
+       The virtual screen functions setsyx and getsyx  are  not  described  in
+       X/Open  Curses  Issue 4.   SVr4  documents each of them as returning an
+       int.  This is  misleading,  as  they  are  macros  with  no  documented
+       semantics for returning values.
+
+       All other functions are as described in X/Open Curses.  It specifies no
+       error conditions for them, except as described for curs_set in  section
+       "RETURN VALUE" above.
+
+       The  System V  Interface Definition, Version 4 (1995), specified all of
+       these functions except curs_set as returning OK.
+
+       Older SVr4 man pages  warn  that  the  return  value  of  curs_set  "is
+       currently  incorrect".  This implementation gets it right, but counting
+       on its correctness anywhere else may be unwise.
 
-       The  SVr4  documentation  describes  setsyx and getsyx as having return
-       type int.  This is misleading, as they are macros  with  no  documented
-       semantics for the return value.
+       X/Open Curses specifies ripoffline as returning OK with no  possibility
+       of  failure  ("[c]alls to ripoffline above this limit [five lines] have
+       no effect but report success").
+
+       X/Open Curses notes:
+
+              After use of mvcur(), the model Curses maintains of the state of
+              the  terminal  might not match the actual state of the terminal.
+              An application  should  touch  and  refresh  the  window  before
+              resuming conventional use of Curses.
+
+       Both  ncurses  and  SVr4 curses implement mvcur using the SCREEN object
+       allocated in either initscr(3x) or newterm(3x).  X/Open  Curses  states
+       that  the old location must be given for mvcur to accommodate terminals
+       that lack absolute cursor positioning.
+
+       If interrupted by a signal, ncurses  restarts  napms.   That,  and  the
+       limitation to 30 seconds, differ from other implementations.

      SEE ALSO

              curses(3x),   curs_initscr(3x),   curs_outopts(3x),   curs_refresh(3x),
-       curs_scr_dump(3x), curs_slk(3x), curs_variables(3x).
+       curs_scr_dump(3x), curs_slk(3x), curs_variables(3x)
 
 
 
-                                                               curs_kernel(3x)
+ncurses 6.5                       2025-03-01                   curs_kernel(3x)
      diff --git a/doc/html/man/curs_legacy.3x.html b/doc/html/man/curs_legacy.3x.html index 5947cded..7f726533 100644 --- a/doc/html/man/curs_legacy.3x.html +++ b/doc/html/man/curs_legacy.3x.html @@ -1,6 +1,6 @@ -curs_legacy 3x +curs_legacy 3x 2025-02-15 ncurses 6.5 Library calls -

      curs_legacy 3x

      +

      curs_legacy 3x 2025-02-15 ncurses 6.5 Library calls

      -curs_legacy(3x)                                                curs_legacy(3x)
+curs_legacy(3x)                  Library calls                 curs_legacy(3x)

      NAME

      -       curs_legacy - get curses cursor and window coordinates, attributes
+       getattrs,   getbegx,   getbegy,  getcurx,  getcury,  getmaxx,  getmaxy,
+       getparx,  getpary  -  get  curses  cursor  and  window  coordinates  or
+       attributes (legacy)

      SYNOPSIS

      @@ -69,7 +71,7 @@ 
      curs_legacy 3x

      DESCRIPTION

      -       These  legacy  functions  are  simpler  to  use  than the X/Open Curses
+       These  legacy  functions  are  simpler  to  use  than the X/Open curses
        functions:
 
        o   The getattrs function returns the same attribute data as wattr_get.
@@ -99,21 +101,12 @@ 
      curs_legacy 3x
      
        window parameter is null.
 
 
-

      NOTES

      -       All of these interfaces are provided  as  macros  and  functions.   The
-       macros   are   suppressed   (and  only  the  functions  provided)  when
-       NCURSES_OPAQUE is defined.  The standard forms such as  getyx  must  be
-       implemented  as  macros,  and  (in  this implementation) are defined in
-       terms of the functions described here, to avoid  reliance  on  internal
-       details of the WINDOW structure.
-
-

      PORTABILITY

      -       These   functions  were  supported  on  Version  7,  BSD  or  System  V
-       implementations.  None of  those  implementations  checked  the  window
+       These  functions  were  supported  on  Version  7,  BSD  or  System   V
+       implementations.   None  of  those  implementations  checked the window
        parameter.
 
-       The  getattrs  function  and  macro  are  defined  to return a (signed)
+       The getattrs function and  macro  are  defined  to  return  a  (signed)
        integer  for  compatibility  with  those  implementations  although  an
        unsigned type would have been more appropriate.
 
@@ -123,7 +116,7 @@ 
      curs_legacy 3x
      
 
 
 
-                                                               curs_legacy(3x)
+ncurses 6.5                       2025-02-15                   curs_legacy(3x)
      diff --git a/doc/html/man/curs_memleaks.3x.html b/doc/html/man/curs_memleaks.3x.html index 7ac7342b..085e3aba 100644 --- a/doc/html/man/curs_memleaks.3x.html +++ b/doc/html/man/curs_memleaks.3x.html @@ -1,6 +1,6 @@ -curs_memleaks 3x +curs_memleaks 3x 2024-03-16 ncurses 6.5 Library calls -

      curs_memleaks 3x

      +

      curs_memleaks 3x 2024-03-16 ncurses 6.5 Library calls

      -curs_memleaks(3x)                                            curs_memleaks(3x)
+curs_memleaks(3x)                Library calls               curs_memleaks(3x)

      NAME

      -       exit_curses, exit_terminfo - curses memory-leak checking
+       exit_curses, exit_terminfo - check for memory leaks in curses

      SYNOPSIS

      @@ -57,7 +57,7 @@ 
      curs_memleaks 3x
      
        #include <term.h>
        void exit_terminfo(int code);
 
-       /* deprecated (intentionally not declared in curses.h or term.h) */
+       /* deprecated (intentionally not declared in curses.h or term.h) */
        void _nc_freeall(void);
        void _nc_free_and_exit(int code);
        void _nc_free_tinfo(int code);
@@ -65,28 +65,28 @@ 
      curs_memleaks 3x

      DESCRIPTION

              These  functions  are  used to simplify analysis of memory leaks in the
-       ncurses library.
+       ncurses library.
 
        Any implementation of curses must not free the memory associated with a
        screen, since (even after calling endwin(3x)), it must be available for
        use in the next call to refresh(3x).  There are also chunks  of  memory
-       held for performance reasons.  That makes it hard to analyze curses ap-
-       plications for memory leaks.  When using the specially  configured  de-
-       bugging version of the ncurses library, applications can call functions
-       which free those chunks of memory, simplifying the process  of  memory-
-       leak checking.
+       held  for  performance  reasons.   That makes it hard to analyze curses
+       applications for memory leaks.  When  using  the  specially  configured
+       debugging  version  of  the  ncurses  library,  applications  can  call
+       functions which free those chunks of memory, simplifying the process of
+       memory-leak checking.
 
        Some  of  the functions are named with a "_nc_" prefix because they are
        not intended for use in the non-debugging library:
 
        _nc_freeall
-            This frees (almost) all of the memory allocated by ncurses.
+            This frees (almost) all of the memory allocated by ncurses.
 
        _nc_free_and_exit
-            This frees the memory allocated by ncurses (like _nc_freeall), and
+            This frees the memory allocated by ncurses (like _nc_freeall), and
             exits the program.  It is preferred over _nc_freeall since some of
-            that memory may be required to keep the application running.  Sim-
-            ply exiting (with the given exit-code) is safer.
+            that memory may be  required  to  keep  the  application  running.
+            Simply exiting (with the given exit-code) is safer.
 
        _nc_free_tinfo
             Use  this  function  if only the low-level terminfo functions (and
@@ -94,9 +94,9 @@ 
      curs_memleaks 3x
      
             the program after freeing memory.
 
        The  functions  prefixed "_nc" are normally not available; they must be
-       configured into the library at build time using the --disable-leaks op-
-       tion.   That compiles-in code that frees memory that normally would not
-       be freed.
+       configured into the library at build  time  using  the  --disable-leaks
+       option.   That  compiles-in  code that frees memory that normally would
+       not be freed.
 
        The exit_curses and exit_terminfo functions call _nc_free_and_exit  and
        _nc_free_tinfo  if  the  library  is  configured to support memory-leak
@@ -109,14 +109,14 @@ 
      curs_memleaks 3x

      PORTABILITY

      -       These functions are not part of X/Open Curses; nor do other implementa-
-       tions of curses provide a similar feature.
+       These   functions   are  not  part  of  X/Open  Curses;  nor  do  other
+       implementations of curses provide a similar feature.
 
        In any implementation of X/Open Curses, an application can free part of
        the memory allocated by curses:
 
        o   The  portable  part  of  exit_curses  can be freed using delscreen,
-           passing the SCREEN* pointer returned by newterm.
+           passing the SCREEN pointer returned by newterm.
 
            In some implementations, there is a global variable sp which  could
            be used, e.g., if the screen were only initialized using initscr.
@@ -128,11 +128,11 @@ 
      curs_memleaks 3x

      SEE ALSO

      -       curs_initscr(3x), curs_terminfo(3x).  curses(3x).
+       curses(3x), curs_initscr(3x), curs_terminfo(3x)
 
 
 
-                                                             curs_memleaks(3x)
+ncurses 6.5                       2024-03-16                 curs_memleaks(3x)
        diff --git a/doc/html/man/curs_mouse.3x.html b/doc/html/man/curs_mouse.3x.html index 2228690d..09d1bac5 100644 --- a/doc/html/man/curs_mouse.3x.html +++ b/doc/html/man/curs_mouse.3x.html @@ -1,7 +1,7 @@ -curs_mouse 3x +curs_mouse 3x 2025-03-01 ncurses 6.5 Library calls -

        curs_mouse 3x

        +

        curs_mouse 3x 2025-03-01 ncurses 6.5 Library calls

        -curs_mouse(3x)                                                  curs_mouse(3x)
+curs_mouse(3x)                   Library calls                  curs_mouse(3x)

        NAME

        -       has_mouse, getmouse, ungetmouse, mousemask, wenclose, mouse_trafo,
-       wmouse_trafo, mouseinterval - mouse interface through curses
+       has_mouse,  getmouse,  ungetmouse,  mousemask,  wenclose,  mouse_trafo,
+       wmouse_trafo, mouseinterval, mmask_t, MEVENT  -  get  mouse  events  in
+       ncurses

        SYNOPSIS

                #include <curses.h>
 
+       /* data types */
        typedef unsigned long mmask_t;
 
        typedef struct {
-           short id;         /* ID to distinguish multiple devices */
-           int x, y, z;      /* event coordinates */
-           mmask_t bstate;   /* button state bits */
+           short id;       /* ID to distinguish multiple devices */
+           int x, y, z;    /* event coordinates */
+           mmask_t bstate; /* button state bits */
        } MEVENT;
 
+       /* functions */
        bool has_mouse(void);
 
-       int getmouse(MEVENT *event);
-       int ungetmouse(MEVENT *event);
+       mmask_t mousemask(mmask_t new-mask, mmask_t * old-mask);
 
-       mmask_t mousemask(mmask_t newmask, mmask_t *oldmask);
+       int getmouse(MEVENT * event);
+       int ungetmouse(MEVENT * event);
 
-       bool wenclose(const WINDOW *win, int y, int x);
+       bool wenclose(const WINDOW * win, int y, int x);
 
-       bool mouse_trafo(int* pY, int* pX, bool to_screen);
-       bool wmouse_trafo(const WINDOW* win,
-                         int* pY, int* pX, bool to_screen);
+       bool mouse_trafo(int * pY, int * pX, bool to-screen);
+       bool wmouse_trafo(const WINDOW * win,
+             int * pY, int * pX, bool to-screen);
 
        int mouseinterval(int erval);

        DESCRIPTION

        -       These functions provide an interface to mouse events from  ncurses(3x).
-       Mouse  events  are  represented  by  KEY_MOUSE pseudo-key values in the
-       wgetch(3x) input stream.
+       ncurses  provides  an  interface to the mouse or other pointing device.
+       An application can register its interest in such  events;  the  library
+       then  exposes  the availability of a mouse event via an input character
+       reading function: this is wgetch(3x) in the non-wide  character  curses
+       API  and wget_wch(3x) in the wide character API.  A queue distinct from
+       that used for keyboard events accumulates the details of mouse  events.
+       The  input  character  reading  function reports the KEY_MOUSE key code
+       when a mouse event is available for collection.  A single  mouse  event
+       queue serves all windows associated with the screen.
+
+       The  MEVENT structure describes a mouse event.  Its y and x coordinates
+       are screen-, not window-, relative.  The bstate member has exactly  one
+       bit set indicating the event type.
+
+       ncurses  ignores  mouse  events  when  input is in canonical ("cooked")
+       mode, and produces an error beep when canonical mode is simulated in  a
+       window  by  a  function  such  as getstr(3x) that expects a linefeed to
+       terminate its input loop.
+
+
+

        has_mouse

        +       The terminal type  or  operating  system  interface  must  support  the
+       encoding  of  mouse  events.  has_mouse returns TRUE if ncurses's mouse
+       driver initialized successfully, and FALSE otherwise.

        mousemask

        -       To make mouse events visible, use the mousemask  function.   This  sets
-       the  mouse  events to be reported.  By default, no mouse events are re-
-       ported.
+       Use mousemask to select the varieties of mouse event  your  application
+       wishes to receive.  By default, ncurses reports no mouse events.
 
-       o   The function returns an updated copy of newmask to  indicate  which
+       o   The  function  returns an updated copy of new-mask indicating which
            of the specified mouse events can be reported.
 
-           If the screen has not been initialized, or if the terminal does not
-           support mouse-events, this function returns 0.
+           If the screen is not initialized, or the  terminal  interface  does
+           not report mouse events, mousemask returns 0.
 
-       o   If oldmask is non-NULL, this function fills the indicated  location
-           with the previous value of the current screen's mouse event mask.
+       o   If  old-mask  is  not a null pointer, mousemask stores the previous
+           value of the screen's mouse event mask there.
 
-       As  a  side  effect,  setting  a  zero mousemask may turn off the mouse
-       pointer; setting a nonzero mask may turn it on.  Whether  this  happens
-       is device-dependent.
+       As a side effect, setting a zero mouse mask  may  turn  off  the  mouse
+       cursor; setting a nonzero mask may turn it on.  Whether this happens is
+       device-dependent.
 
 
-

        Mouse events

        -       Here are the mouse event type masks which may be defined:
+

        Mouse Events

        +       Several mouse  event  types  may  be  selected;  construct  a  mask  by
+       logically "or"-ing their values.
 
        Name                     Description
-       ---------------------------------------------------------------------
-       BUTTON1_PRESSED          mouse button 1 down
-       BUTTON1_RELEASED         mouse button 1 up
-       BUTTON1_CLICKED          mouse button 1 clicked
-
-       BUTTON1_DOUBLE_CLICKED   mouse button 1 double clicked
-       BUTTON1_TRIPLE_CLICKED   mouse button 1 triple clicked
-       ---------------------------------------------------------------------
-       BUTTON2_PRESSED          mouse button 2 down
-       BUTTON2_RELEASED         mouse button 2 up
-       BUTTON2_CLICKED          mouse button 2 clicked
-       BUTTON2_DOUBLE_CLICKED   mouse button 2 double clicked
-       BUTTON2_TRIPLE_CLICKED   mouse button 2 triple clicked
-       ---------------------------------------------------------------------
-       BUTTON3_PRESSED          mouse button 3 down
-       BUTTON3_RELEASED         mouse button 3 up
-       BUTTON3_CLICKED          mouse button 3 clicked
-       BUTTON3_DOUBLE_CLICKED   mouse button 3 double clicked
-       BUTTON3_TRIPLE_CLICKED   mouse button 3 triple clicked
-       ---------------------------------------------------------------------
-       BUTTON4_PRESSED          mouse button 4 down
-       BUTTON4_RELEASED         mouse button 4 up
-       BUTTON4_CLICKED          mouse button 4 clicked
-       BUTTON4_DOUBLE_CLICKED   mouse button 4 double clicked
-       BUTTON4_TRIPLE_CLICKED   mouse button 4 triple clicked
-       ---------------------------------------------------------------------
-       BUTTON5_PRESSED          mouse button 5 down
-       BUTTON5_RELEASED         mouse button 5 up
-       BUTTON5_CLICKED          mouse button 5 clicked
-       BUTTON5_DOUBLE_CLICKED   mouse button 5 double clicked
-       BUTTON5_TRIPLE_CLICKED   mouse button 5 triple clicked
-       ---------------------------------------------------------------------
-       BUTTON_SHIFT             shift was down during button state change
-       BUTTON_CTRL              control was down during button state change
-       BUTTON_ALT               alt was down during button state change
-       ALL_MOUSE_EVENTS         report all button state changes
-       REPORT_MOUSE_POSITION    report mouse movement
-       ---------------------------------------------------------------------
+       ------------------------------------------------------------------------
+       BUTTON1_PRESSED          mouse button 1 down
+       BUTTON1_RELEASED         mouse button 1 up
+       BUTTON1_CLICKED          mouse button 1 clicked
+       BUTTON1_DOUBLE_CLICKED   mouse button 1 double clicked
+       BUTTON1_TRIPLE_CLICKED   mouse button 1 triple clicked
+       ------------------------------------------------------------------------
+       BUTTON2_PRESSED          mouse button 2 down
+       BUTTON2_RELEASED         mouse button 2 up
+       BUTTON2_CLICKED          mouse button 2 clicked
+       BUTTON2_DOUBLE_CLICKED   mouse button 2 double clicked
+       BUTTON2_TRIPLE_CLICKED   mouse button 2 triple clicked
+       ------------------------------------------------------------------------
+       BUTTON3_PRESSED          mouse button 3 down
+       BUTTON3_RELEASED         mouse button 3 up
+       BUTTON3_CLICKED          mouse button 3 clicked
+       BUTTON3_DOUBLE_CLICKED   mouse button 3 double clicked
+       BUTTON3_TRIPLE_CLICKED   mouse button 3 triple clicked
+       ------------------------------------------------------------------------
+       BUTTON4_PRESSED          mouse button 4 down
+       BUTTON4_RELEASED         mouse button 4 up
+       BUTTON4_CLICKED          mouse button 4 clicked
+       BUTTON4_DOUBLE_CLICKED   mouse button 4 double clicked
+       BUTTON4_TRIPLE_CLICKED   mouse button 4 triple clicked
+       ------------------------------------------------------------------------
+       BUTTON5_PRESSED          mouse button 5 down
+       BUTTON5_RELEASED         mouse button 5 up
+       BUTTON5_CLICKED          mouse button 5 clicked
+       BUTTON5_DOUBLE_CLICKED   mouse button 5 double clicked
+       BUTTON5_TRIPLE_CLICKED   mouse button 5 triple clicked
+       ------------------------------------------------------------------------
+       BUTTON_SHIFT             a  shift  key  was  down  during  button state
+                                change
+       BUTTON_CTRL              a control key was  down  during  button  state
+                                change
+       BUTTON_ALT               an alt key was down during button state change
+       ALL_MOUSE_EVENTS         report all button state changes
+       REPORT_MOUSE_POSITION    report mouse movement
+       ------------------------------------------------------------------------

        getmouse

                Once a class of mouse events has been made visible in a window, calling
-       the wgetch function on that window may return KEY_MOUSE as an indicator
-       that a mouse event has been queued.  To read the event data and pop the
-       event off the queue, call getmouse.  This function will return OK if  a
-       mouse  event  is  actually  visible in the given window, ERR otherwise.
-       When getmouse returns OK, the data deposited as y and x  in  the  event
-       structure  coordinates  will  be screen-relative character-cell coordi-
-       nates.  The returned state mask will have exactly one bit set to  indi-
-       cate the event type.  The corresponding data in the queue is marked in-
-       valid.  A subsequent call to getmouse will retrieve the next older item
-       from the queue.
+       the  input  character  reading  function  on  that  window  may  return
+       KEY_MOUSE  as an indicator that a mouse event is enqueued.  To read the
+       event data and pop the  event  off  the  queue,  call  getmouse,  which
+       returns  OK  if  a  mouse  event is visible in the given window and ERR
+       otherwise.  When getmouse returns OK, it deposits data  describing  the
+       mouse  event  in  the  event pointer you supply.  A subsequent getmouse
+       call retrieves the next older event from the queue.

        ungetmouse

        -       The  ungetmouse  function  behaves analogously to ungetch.  It pushes a
-       KEY_MOUSE event onto the input queue, and associates  with  that  event
-       the given state data and screen-relative character-cell coordinates.
+       ungetmouse behaves analogously to ungetch(3x).  It pushes  a  KEY_MOUSE
+       event  onto  the  screen's  input queue, and event onto the mouse event
+       queue.

        wenclose

        -       The  wenclose  function  tests  whether a given pair of screen-relative
-       character-cell coordinates is enclosed by  a  given  window,  returning
-       TRUE  if  it is and FALSE otherwise.  It is useful for determining what
-       subset of the screen windows enclose the location of a mouse event.
+       wenclose returns TRUE if the pair of screen-relative coordinates (y, x)
+       is  enclosed by the given window win, and FALSE otherwise.  If win is a
+       pad, wenclose uses its most recent screen coordinates as specified in a
+       prefresh(3x) or pnoutrefresh(3x) call.
 
+       wenclose  is useful for determining what subset of the screen's windows
+       encloses the location of a mouse event; it is otherwise independent  of
+       the ncurses mouse API.
 
-

        wmouse_trafo

        -       The wmouse_trafo function transforms a given pair of  coordinates  from
-       stdscr-relative coordinates to coordinates relative to the given window
-       or vice versa.  The resulting stdscr-relative coordinates are  not  al-
-       ways  identical  to window-relative coordinates due to the mechanism to
-       reserve lines on top or bottom of the screen for  other  purposes  (see
-       the ripoffline and slk_init(3x) calls, for example).
 
-       o   If the parameter to_screen is TRUE, the pointers pY, pX must refer-
-           ence the coordinates of a location inside the window win.  They are
-           converted  to  window-relative coordinates and returned through the
-           pointers.  If the conversion was successful, the  function  returns
-           TRUE.
-
-       o   If one of the parameters was NULL or the location is not inside the
-           window, FALSE is returned.
+

        wmouse_trafo

        +       wmouse_trafo  transforms the given pair of coordinate pointers (pY, pX)
+       from a win-relative basis to a screen-relative one or  vice  versa,  as
+       to-screen  is TRUE or FALSE, respectively.  stdscr-relative coordinates
+       are  not  always  identical  to  screen  coordinates:  curses  supports
+       reservation  of  screen  lines  at  the  top  and/or  bottom  for other
+       purposes; see ripoffline(3x) and slk_init(3x).
 
-       o   If to_screen is FALSE, the pointers pY, pX must  reference  window-
-           relative  coordinates.  They are converted to stdscr-relative coor-
-           dinates if the window win encloses this point.  In  this  case  the
-           function returns TRUE.
+       If to-screen is TRUE and the pointers (pY,  pX)  reference  coordinates
+       inside win, ncurses updates their values to stdscr-relative coordinates
+       and returns TRUE.  If either pY or pX is a null pointer, or (pY, pX) is
+       not inside win, wmouse_trafo returns FALSE.
 
-       o   If  one  of  the  parameters is NULL or the point is not inside the
-           window, FALSE is returned.  The referenced coordinates are only re-
-           placed  by the converted coordinates if the transformation was suc-
-           cessful.
+       If  to-screen  is FALSE and the pointers (pY, pX) reference coordinates
+       inside stdscr, ncurses updates their values to win-relative coordinates
+       and returns TRUE.  If either pY or pX is a null pointer, or (pY, pX) is
+       not inside stdscr, wmouse_trafo returns FALSE.

        mouse_trafo

        -       The mouse_trafo function performs the same translation as wmouse_trafo,
-       using stdscr for win.
+       mouse_trafo applies the wmouse_trafo  translation  to  stdscr.   If  no
+       screen  lines  are  reserved by ripoffline(3x) or slk_init(3x), this is
+       the identity transformation.

        mouseinterval

        -       The  mouseinterval  function  sets  the maximum time (in thousands of a
-       second) that can elapse between press and release events for them to be
-       recognized  as  a click.  Use mouseinterval(0) to disable click resolu-
-       tion.  This function returns the previous interval value.  Use mousein-
-       terval(-1)  to obtain the interval without altering it.  The default is
-       one sixth of a second.
+       mouseinterval sets the maximum time (in thousandths of a  second)  that
+       can  elapse between press and release events for them to be resolved as
+       a click.  An application  might  interpret  button  press  and  release
+       events separated by more than the mouse interval as a "long press", or,
+       with motion, as a "drag".
 
+       Calling  mouseinterval(0)  disables  click  resolution.   When  ncurses
+       detects  a  mouse  event,  it  awaits further input activity up to this
+       interval, and then checks for a subsequent mouse  event  which  can  be
+       combined  with  the  first event.  If the timeout expires without input
+       activity (which would happen with  a  zero  interval),  then  no  click
+       resolution occurs.
 
-

        has_mouse

        -       The has_mouse function returns TRUE if the mouse driver has  been  suc-
-       cessfully initialized.
+       This    function    returns   the   previous   interval   value.    Use
+       mouseinterval(-1) to obtain the interval without altering it.
 
-       Note  that  mouse  events will be ignored when input is in cooked mode,
-       and will cause an error beep when cooked mode is being simulated  in  a
-       window  by a function such as getstr that expects a linefeed for input-
-       loop termination.
+       The  mouse  interval  is  set  to  one  sixth  of  a  second  when  the
+       corresponding   screen   is   initialized,   e.g.,  in  initscr(3x)  or
+       setupterm(3x).

        RETURN VALUE

        -       getmouse and ungetmouse return the integer ERR upon failure or OK  upon
-       successful completion:
+       has_mouse, wenclose, mouse_trafo, and wmouse_trafo return TRUE or FALSE
+       as noted above.
 
-          getmouse
-               returns an error.
+       getmouse and ungetmouse return ERR upon failure and OK upon success.
 
-          o   If  no mouse driver was initialized, or if the mask parameter is
-              zero,
+       getmouse fails if:
 
-          o   It returns an error if a mouse event was detected which did  not
-              match the current mousemask.
+       o   no mouse driver was initialized,
 
-          o   It also returns an error if no more events remain in the queue.
+       o   the mask of reportable events is zero,
 
-          ungetmouse
-               returns an error if the FIFO is full.
+       o   a mouse event was detected that does not match the mask, or
+
+       o   no more events remain in the queue.
+
+       ungetmouse returns ERR if the event queue is full.
 
        mousemask returns the mask of reportable events.
 
@@ -251,131 +272,143 @@ 
        curs_mouse 3x
        
        was not initialized.  In that case, it  returns  the  maximum  interval
        value (166).
 
-       wenclose and wmouse_trafo are boolean functions returning TRUE or FALSE
-       depending on their test result.
 
+

        NOTES

        +       The   order   of  the  MEVENT  structure  members  is  not  guaranteed.
+       Additional fields may be added to the structure in the future.
 
-

        PORTABILITY

        -       These calls were designed for ncurses(3x), and are not  found  in  SVr4
-       curses, 4.4BSD curses, or any other previous version of curses.
+       Under ncurses, these calls are implemented using either xterm's  built-
+       in mouse-tracking API or platform-specific drivers including
 
-       SVr4  curses had support for the mouse in a variant of xterm(1).  It is
-       mentioned in a few places, but with no supporting documentation:
+          o   Alessandro Rubini's gpm server
 
-       o   the "libcurses" manual page lists functions for this feature  which
-           are prototyped in curses.h:
+          o   FreeBSD sysmouse
 
-               extern int mouse_set(long int);
-               extern int mouse_on(long int);
-               extern int mouse_off(long int);
-               extern int request_mouse_pos(void);
-               extern int map_button(unsigned long);
-               extern void wmouse_position(WINDOW *, int *, int *);
-               extern unsigned long getmouse(void), getbmap(void);
+          o   OS/2 EMX
 
-       o   the "terminfo" manual page lists capabilities for the feature
+       If  you  are  using  an unsupported configuration, mouse events are not
+       visible to ncurses (and the mousemask function always returns 0).
 
-               buttons           btns    BT       Number of buttons on the mouse
-               get_mouse         getm    Gm       Curses should get button events
-               key_mouse         kmous   Km       0631, Mouse event has occurred
-               mouse_info        minfo   Mi       Mouse status information
-               req_mouse_pos     reqmp   RQ       Request mouse position report
+       If the  terminal  type  possesses  the  (nonstandard)  terminfo  string
+       capability  XM,  ncurses's xterm mouse driver uses it when initializing
+       the terminal for mouse operation.  The default, if  XM  is  not  found,
+       corresponds to private mode 1000 of xterm.
 
-       o   the  interface  made assumptions (as does ncurses) about the escape
-           sequences sent to and received from the terminal.
+          \E[?1000%?%p1%{1}%=%th%el%;
+
+       ncurses also recognizes xterm's newer private mode 1006.
 
-           For instance the SVr4 curses library used the get_mouse  capability
-           to  tell  the  terminal  which  mouse button events it should send,
-           passing the mouse-button bit-mask to the terminal.  Also, it  could
-           ask  the terminal where the mouse was using the req_mouse_pos capa-
-           bility.
+          \E[?1006;1000%?%p1%{1}%=%th%el%;
 
-           Those features required a terminal which had been modified to  work
-           with curses.  They were not part of the X Consortium's xterm.
+       The  id  member  of the mouse event structure is not presently used; no
+       terminal type or operating system interface supports  reporting  events
+       from  distinguishable  pointing  devices.  If you synthesize an MEVENT,
+       use an id of 0.
 
-       When  developing the xterm mouse support for ncurses in September 1995,
-       Eric Raymond was uninterested in using the same interface  due  to  its
-       lack of documentation.  Later, in 1998, Mark Hesseling provided support
-       in PDCurses 2.3 using the SVr4 interface.  PDCurses, however, does  not
-       use  video  terminals, making it unnecessary to be concerned about com-
-       patibility with the escape sequences.
+       The z member of the mouse event structure is not presently used.  It is
+       intended  for  use with touch screens (which may be pressure-sensitive)
+       or with 3D-mice/trackballs/power gloves.
 
-       The feature macro NCURSES_MOUSE_VERSION is provided so the preprocessor
-       can  be used to test whether these features are present.  If the inter-
-       face is changed, the value of NCURSES_MOUSE_VERSION will be  increment-
-       ed.   These values for NCURSES_MOUSE_VERSION may be specified when con-
-       figuring ncurses:
+       The ALL_MOUSE_EVENTS  class  does  not  include  REPORT_MOUSE_POSITION.
+       They  are  distinct.   For example, in xterm, wheel/scrolling mice send
+       position reports as a sequence of presses of buttons  4  or  5  without
+       matching button-releases.
 
-          1  has definitions for reserved events.  The mask uses 28 bits.
 
-          2  adds definitions for button 5, removes the  definitions  for  re-
-             served events.  The mask uses 29 bits.
+

        EXTENSIONS

        +       These  functions  are  ncurses  extensions,  and  are not found in SVr4
+       curses, 4.4BSD curses, or any  other  previous  curses  implementation.
+       (SVr4  curses  did have a getmouse function, which took no argument and
+       returned an unsigned long.)
 
-       The order of the MEVENT structure members is not guaranteed.  Addition-
-       al fields may be added to the structure in the future.
 
-       Under ncurses(3x), these calls are  implemented  using  either  xterm's
-       built-in mouse-tracking API or platform-specific drivers including
+

        PORTABILITY

        +       Applications employing the ncurses mouse extension should condition its
+       use  on the visibility of the NCURSES_MOUSE_VERSION preprocessor macro.
+       When the interface changes, the  macro's  value  increments.   Multiple
+       versions   are  available  when  ncurses  is  configured;  see  section
+       "ALTERNATE CONFIGURATIONS" of ncurses(3x).  The following values may be
+       specified.
 
-          o   Alessandro Rubini's gpm server
+          1  has definitions for reserved events.  The mask uses 28 bits.
 
-          o   FreeBSD sysmouse
+          2  adds  definitions  for  button  5,  removes  the  definitions for
+             reserved events.  The mask uses 29 bits.
 
-          o   OS/2 EMX
 
-       If you are using an unsupported configuration, mouse events will not be
-       visible to ncurses(3x) (and the mousemask function will  always  return
-       0).
+

        HISTORY

        +       SVr4 (1989) added mouse support to its  variant  of  xterm(1).   It  is
+       mentioned in a few places, with little supporting documentation.
 
-       If  the  terminfo entry contains a XM string, this is used in the xterm
-       mouse driver to control the way the terminal is initialized  for  mouse
-       operation.   The  default,  if  XM is not found, corresponds to private
-       mode 1000 of xterm:
+       o   Its  "libcurses"  manual  page  lists  functions  for  this feature
+           prototyped in curses.h.
 
-          \E[?1000%?%p1%{1}%=%th%el%;
+               extern int mouse_set(long int);
+               extern int mouse_on(long int);
+               extern int mouse_off(long int);
+               extern int request_mouse_pos(void);
+               extern int map_button(unsigned long);
+               extern void wmouse_position(WINDOW *, int *, int *);
+               extern unsigned long getmouse(void), getbmap(void);
 
-       The mouse driver also recognizes a newer xterm private mode 1006, e.g.,
+       o   Its "terminfo" manual page lists capabilities for the feature.
 
-          \E[?1006;1000%?%p1%{1}%=%th%el%;
+               buttons         btns    BT   Number of buttons on the mouse
+               get_mouse       getm    Gm   Curses should get button events
+               key_mouse       kmous   Km   0631, Mouse event has occurred
+               mouse_info      minfo   Mi   Mouse status information
+               req_mouse_pos   reqmp   RQ   Request mouse position report
 
-       The z member in the event structure is not presently used.  It  is  in-
-       tended  for use with touch screens (which may be pressure-sensitive) or
-       with 3D-mice/trackballs/power gloves.
+       o   The interface made assumptions (as does ncurses) about  the  escape
+           sequences sent to and received from the terminal.
 
-       The ALL_MOUSE_EVENTS  class  does  not  include  REPORT_MOUSE_POSITION.
-       They  are  distinct.   For example, in xterm, wheel/scrolling mice send
-       position reports as a sequence of presses of buttons  4  or  5  without
-       matching button-releases.
+           For  instance,  the  SVr4  curses library used the get_mouse (getm)
+           capability to tell the terminal which mouse button events it should
+           send,  passing the mouse-button bit mask to the terminal.  Also, it
+           could ask the terminal where the mouse was using the  req_mouse_pos
+           (reqmp) capability.
+
+           Those  features  required a terminal program that had been modified
+           to work with SVr4 curses.  They were not part of the X Consortium's
+           xterm.
+
+       When  developing the xterm mouse support for ncurses in September 1995,
+       Eric Raymond was uninterested in using the same interface  due  to  its
+       lack of documentation.  Later, in 1998, Mark Hesseling provided support
+       in PDCurses 2.3 using the SVr4 interface.  PDCurses, however, does  not
+       use  video  terminals,  making  it  unnecessary  to  be concerned about
+       compatibility with the escape sequences.

        BUGS

        -       Mouse  events  under  xterm  will  not in fact be ignored during cooked
-       mode, if they have been enabled by mousemask.  Instead, the xterm mouse
-       report sequence will appear in the string read.
-
-       Mouse  events  under  xterm  will not be detected correctly in a window
-       with its keypad bit off, since they are interpreted  as  a  variety  of
-       function  key.   Your  terminfo  description  should  have kmous set to
-       "\E[M" (the beginning of the response from  xterm  for  mouse  clicks).
-       Other  values  for  kmous are permitted, but under the same assumption,
-       i.e., it is the beginning of the response.
-
-       Because there are no standard terminal responses that  would  serve  to
-       identify  terminals which support the xterm mouse protocol, ncurses as-
-       sumes that if kmous is defined in the terminal description, or  if  the
-       terminal  description's  primary  name  or  aliases  contain the string
-       "xterm", then the terminal may send mouse events.  The kmous capability
-       is  checked first, allowing the use of newer xterm mouse protocols such
-       as xterm's private mode 1006.
+       Mouse events from xterm are not ignored in canonical ("cooked") mode if
+       they  have  been enabled by mousemask.  Instead, the xterm mouse report
+       sequence appears in the string read.
+
+       An ncurses window must enable keypad(3x)  to  correctly  receive  mouse
+       event  reports  from  xterm  since they are encoded like function keys.
+       Set the terminal's terminfo capability key_mouse (kmous) to "\E[M" (the
+       beginning  of  the response from xterm for mouse clicks).  Other values
+       of key_mouse are permitted under the same  assumption  --  that  is,  a
+       mouse  report  begins  with  the  value of the key_mouse (kmous) string
+       capability.
+
+       Because there are no standard response sequences that serve to identify
+       terminals  supporting the xterm mouse protocol, ncurses assumes that if
+       key_mouse (kmous) is defined in the terminal  description,  or  if  the
+       terminal  type's  primary  name  or aliases contain the string "xterm",
+       then the terminal may send mouse events.  ncurses checks the kmous cap-
+       code  first,  allowing  use of newer xterm mouse protocols, such as its
+       private mode 1006.

        SEE ALSO

        -       curses(3x), curs_inopts(3x), curs_kernel(3x), curs_slk(3x),  curs_vari-
-       ables(3x).
+       curses(3x),     curs_inopts(3x),     curs_kernel(3x),     curs_pad(3x),
+       curs_slk(3x), curs_variables(3x)
 
 
 
-                                                                curs_mouse(3x)
+ncurses 6.5                       2025-03-01                    curs_mouse(3x)
        diff --git a/doc/html/man/curs_move.3x.html b/doc/html/man/curs_move.3x.html index 8d7d7e46..40cbe9b5 100644 --- a/doc/html/man/curs_move.3x.html +++ b/doc/html/man/curs_move.3x.html @@ -1,6 +1,6 @@ -curs_move 3x +curs_move 3x 2025-03-01 ncurses 6.5 Library calls -

        curs_move 3x

        +

        curs_move 3x 2025-03-01 ncurses 6.5 Library calls

        -curs_move(3x)                                                    curs_move(3x)
+curs_move(3x)                    Library calls                   curs_move(3x)

        NAME

        -       move, wmove - move curses window cursor
+       move, wmove - move cursor in a curses window

        SYNOPSIS

                #include <curses.h>
 
        int move(int y, int x);
-       int wmove(WINDOW *win, int y, int x);
+       int wmove(WINDOW * win, int y, int x);

        DESCRIPTION

        -       These routines move the cursor associated with the window to line y and
-       column x.  This routine does not move the physical cursor of the termi-
-       nal until refresh(3x) is called.  The position specified is relative to
-       the upper left-hand corner of the window, which is (0,0).
+       wmove  relocates  the  cursor  associated with the curses window win to
+       line y and column  x.   The  terminal's  cursor  does  not  move  until
+       refresh(3x)  is  called.   The position (y, x) is relative to the upper
+       left-hand corner of the window, which  has  coordinates  (0, 0).   move
+       similarly moves the cursor in the stdscr window.

        RETURN VALUE

        -       These routines return ERR upon failure and OK (SVr4 specifies only  "an
-       integer value other than ERR") upon successful completion.
+       These functions return OK on success and ERR on failure.
 
-       Specifically, they return an error if the window pointer is null, or if
-       the position is outside the window.
+       They fail if the position (y, x) is outside the window boundaries.
+
+       In ncurses, wmove fails if win is NULL.

        NOTES

        -       Note that move may be a macro.
+       move may be implemented as a macro.

        PORTABILITY

        -       These functions are described in the XSI Curses standard, Issue 4.
+       X/Open Curses Issue 4 describes these functions.  It specifies no error
+       conditions for them.
+
+       SVr4 describes a successful return value  only  as  "an  integer  value
+       other than ERR".
+
+
+

        HISTORY

        +       4BSD (1980) introduced move and wmove.

        SEE ALSO

        @@ -85,7 +94,7 @@ 
        curs_move 3x
        
 
 
 
-                                                                 curs_move(3x)
+ncurses 6.5                       2025-03-01                     curs_move(3x)
        diff --git a/doc/html/man/curs_opaque.3x.html b/doc/html/man/curs_opaque.3x.html index 6c1443ca..e5cc1d7a 100644 --- a/doc/html/man/curs_opaque.3x.html +++ b/doc/html/man/curs_opaque.3x.html @@ -1,6 +1,6 @@ -curs_opaque 3x +curs_opaque 3x 2025-02-15 ncurses 6.5 Library calls -

        curs_opaque 3x

        +

        curs_opaque 3x 2025-02-15 ncurses 6.5 Library calls

        -curs_opaque(3x)                                                curs_opaque(3x)
+curs_opaque(3x)                  Library calls                 curs_opaque(3x)

        NAME

        -       is_cleared, is_idlok, is_idcok, is_immedok, is_keypad, is_leaveok,
-       is_nodelay, is_notimeout, is_pad, is_scrollok, is_subwin, is_syncok,
-       wgetdelay, wgetparent, wgetscrreg - curses window properties
+       is_cleared,  is_idlok,  is_idcok,  is_immedok,  is_keypad,  is_leaveok,
+       is_nodelay, is_notimeout, is_pad,  is_scrollok,  is_subwin,  is_syncok,
+       wgetdelay, wgetparent, wgetscrreg - obtain curses window properties

        SYNOPSIS

        @@ -67,86 +67,100 @@ 
        curs_opaque 3x
        
        bool is_scrollok(const WINDOW *win);
        bool is_subwin(const WINDOW *win);
        bool is_syncok(const WINDOW *win);
+
        WINDOW * wgetparent(const WINDOW *win);
        int wgetdelay(const WINDOW *win);
        int wgetscrreg(const WINDOW *win, int *top, int *bottom);

        DESCRIPTION

        -       This  implementation  provides functions which return properties set in
-       the WINDOW structure, allowing it to be "opaque" if the  symbol  NCURS-
-       ES_OPAQUE is defined:
+       ncurses  provides functions returning properties of a WINDOW structure,
+       allowing  it  to  be  "opaque"   if   the   application   defines   the
+       NCURSES_OPAQUE  preprocessor  symbol.  Opacity in this sense means that
+       the members of struct data  types  are  not  directly  accessible  (for
+       instance,  through  "." or "->" operators), but instead must be queried
+       and/or set  via  library  functions.   Advantages  of  opacity  include
+       greater  abstraction  and improved management of concurrent accesses to
+       data structures, keeping object states coherent.
 
        is_cleared
-            returns the value set in clearok(3x)
+              returns the value set by clearok(3x).
 
        is_idcok
-            returns the value set in idcok(3x)
+              returns the value set by idcok(3x).
 
        is_idlok
-            returns the value set in idlok(3x)
+              returns the value set by idlok(3x).
 
        is_immedok
-            returns the value set in immedok(3x)
+              returns the value set by immedok(3x).
 
        is_keypad
-            returns the value set in keypad(3x)
+              returns the value set by keypad(3x).
 
        is_leaveok
-            returns the value set in leaveok(3x)
+              returns the value set by leaveok(3x).
 
        is_nodelay
-            returns the value set in nodelay(3x)
+              returns the value set by nodelay(3x).
 
        is_notimeout
-            returns the value set in notimeout(3x)
+              returns the value set by notimeout(3x).
 
-       is_pad
-            returns TRUE if the window is a pad i.e., created by newpad(3x)
+       is_pad returns TRUE if the window is a pad; that is, it was created  by
+              newpad(3x).
 
        is_scrollok
-            returns the value set in scrollok(3x)
+              returns the value set by scrollok(3x).
 
        is_subwin
-            returns  TRUE  if the window is a subwindow, i.e., created by sub-
-            win(3x) or derwin(3x)
+              returns  TRUE  if  the  window  is  a subwindow, that is, it was
+              created by subwin(3x) or derwin(3x).
 
        is_syncok
-            returns the value set in syncok(3x)
+              returns the value set by syncok(3x).
 
        wgetdelay
-            returns the delay timeout as set in wtimeout(3x).
+              returns the delay timeout set by wtimeout(3x).
 
        wgetparent
-            returns the parent WINDOW pointer for subwindows, or NULL for win-
-            dows having no parent.
+              returns the parent WINDOW pointer for subwindows,  or  NULL  for
+              windows having no parent.
 
        wgetscrreg
-            returns the top and bottom rows for the scrolling margin as set in
-            wsetscrreg.
+              stores  the  top and bottom rows for the scrolling margin set by
+              wsetscrreg(3x) in the  corresponding  arguments,  returning  ERR
+              upon failure and OK upon successful completion.

        RETURN VALUE

        -       These functions all return TRUE or FALSE, except as noted.
+       These functions return TRUE or FALSE except as noted.

        NOTES

        -       Both a macro and a function are provided for each name.
+       ncurses  provides  both  a C function and a preprocessor macro for each
+       function documented in this page.
+
+
+

        EXTENSIONS

        +       These functions originated with ncurses.

        PORTABILITY

        -       These routines are specific to ncurses.  They  were  not  supported  on
-       Version 7, BSD or System V implementations.  It is recommended that any
-       code depending on ncurses extensions be conditioned using  NCURSES_VER-
-       SION.
+       Applications employing ncurses extensions should condition their use on
+       the visibility of the NCURSES_VERSION preprocessor macro.
+
+       NetBSD   curses  since  10.1  (2024)  supports  wgetscr_reg.   It  also
+       implements getscr_reg, operating on stdscr.

        SEE ALSO

        -       curses(3x), curs_inopts(3x), curs_outopts(3x), curs_window(3x)
+       curses(3x),   curs_inopts(3x),   curs_outopts(3x),    curs_threads(3x),
+       curs_window(3x)
 
 
 
-                                                               curs_opaque(3x)
+ncurses 6.5                       2025-02-15                   curs_opaque(3x)
        diff --git a/doc/html/man/curs_outopts.3x.html b/doc/html/man/curs_outopts.3x.html index 5e86a9f4..2024e988 100644 --- a/doc/html/man/curs_outopts.3x.html +++ b/doc/html/man/curs_outopts.3x.html @@ -1,6 +1,6 @@ -curs_outopts 3x +curs_outopts 3x 2025-03-01 ncurses 6.5 Library calls -

        curs_outopts 3x

        +

        curs_outopts 3x 2025-03-01 ncurses 6.5 Library calls

        -curs_outopts(3x)                                              curs_outopts(3x)
+curs_outopts(3x)                 Library calls                curs_outopts(3x)

        NAME

        -       clearok, idlok, idcok, immedok, leaveok, setscrreg, wsetscrreg,
-       scrollok - curses output options
+       clearok,   idcok,   idlok,   immedok,   leaveok,  scrollok,  setscrreg,
+       wsetscrreg - set curses output options

        SYNOPSIS

                #include <curses.h>
 
-       int clearok(WINDOW *win, bool bf);
-       int idlok(WINDOW *win, bool bf);
-       void idcok(WINDOW *win, bool bf);
-       void immedok(WINDOW *win, bool bf);
-       int leaveok(WINDOW *win, bool bf);
-       int scrollok(WINDOW *win, bool bf);
+       int clearok(WINDOW * win, bool bf);
+       void idcok(WINDOW * win, bool bf);
+       int idlok(WINDOW * win, bool bf);
+       void immedok(WINDOW * win, bool bf);
+       int leaveok(WINDOW * win, bool bf);
+       int scrollok(WINDOW * win, bool bf);
 
        int setscrreg(int top, int bot);
-       int wsetscrreg(WINDOW *win, int top, int bot);
+       int wsetscrreg(WINDOW * win, int top, int bot);

        DESCRIPTION

        -       These routines set options that change the style of output within curs-
-       es.   All  options are initially FALSE, unless otherwise stated.  It is
-       not necessary to turn these options off before calling endwin(3x).
+       These functions configure properties  of  curses  windows  that  affect
+       their  manner of output.  Boolean-valued properties are initially FALSE
+       except where noted.  endwin(3x) resets any terminal modes corresponding
+       to  these  properties;  an  application  need not restore their initial
+       values.

        clearok

        -       If clearok is called with TRUE as argument, the next call  to  wrefresh
-       with this window will clear the screen completely and redraw the entire
-       screen from scratch.  This is useful when the contents  of  the  screen
-       are  uncertain, or in some cases for a more pleasing visual effect.  If
-       the win argument to clearok is the global  variable  curscr,  the  next
-       call  to  wrefresh  with any window causes the screen to be cleared and
-       repainted from scratch.
+       Setting win's clearok property to TRUE causes the next wrefresh call on
+       it  to clear the terminal screen and redraw it entirely.  This property
+       is useful to restore  the  contents  of  the  screen  (perhaps  because
+       another  process  has  written  to  the  terminal), or in some cases to
+       achieve  a  more  pleasing  visual  effect.   If  win  is  curscr  (see
+       curs_variables(3x)),  the  next  wrefresh call on any window causes the
+       terminal screen to clear and redraw as  above.   wrefresh  resets  this
+       property to FALSE.
 
 
-

        idlok

        -       If idlok is called with TRUE as second argument, curses considers using
-       the  hardware  insert/delete  line  feature  of  terminals so equipped.
-       Calling idlok with FALSE as second argument disables use of line inser-
-       tion  and deletion.  This option should be enabled only if the applica-
-       tion needs insert/delete line, for example, for a screen editor.  It is
-       disabled by default because insert/delete line tends to be visually an-
-       noying when used in applications where it is not really needed.  If in-
-       sert/delete line cannot be used, curses redraws the changed portions of
-       all lines.
+

        idcok

        +       (This  property  defaults TRUE.)  Setting win's idcok property to FALSE
+       prevents curses from using the insert/delete character capabilities  of
+       terminal types possessing them according to the terminfo database.
 
 
-

        idcok

        -       If idcok is called with FALSE as second argument, curses no longer con-
-       siders  using the hardware insert/delete character feature of terminals
-       so equipped.  Use of character insert/delete  is  enabled  by  default.
-       Calling  idcok with TRUE as second argument re-enables use of character
-       insertion and deletion.
+

        idlok

        +       Setting  win's  idlok  property to TRUE causes curses to consider using
+       the insert/delete line capabilities of terminal types  possessing  them
+       according  to  the  terminfo  database.   Enable  this  option  if  the
+       application explicitly requires these operations, as a full-screen text
+       editor  might;  otherwise  the  results may be visually annoying to the
+       user.

        immedok

        -       If immedok is called with TRUE as argument, any change  in  the  window
-       image, such as the ones caused by waddch, wclrtobot, wscrl, etc., auto-
-       matically cause a call to wrefresh.  However, it  may  degrade  perfor-
-       mance  considerably, due to repeated calls to wrefresh.  It is disabled
-       by default.
+       If immedok is called with TRUE as second argument, any  change  in  the
+       window  image,  such  as  the  ones caused by waddch, wclrtobot, wscrl,
+       etc., automatically causes a call to wrefresh.  However, it may degrade
+       performance  considerably,  due to repeated calls to wrefresh.  Calling
+       immedok with FALSE as second argument restores  the  default  behavior,
+       i.e., deferring screen updates until a refresh is needed.

        leaveok

        -       Normally, the hardware cursor is left at the  location  of  the  window
-       cursor  being  refreshed.   The  leaveok option allows the cursor to be
-       left wherever the update happens to leave it.  It is useful for  appli-
-       cations  where  the  cursor  is not used, since it reduces the need for
-       cursor motions.
+       Normally,  the  hardware  cursor  is left at the location of the window
+       cursor being refreshed.  The leaveok option allows  the  cursor  to  be
+       left  wherever  the  update  happens  to  leave  it.   It is useful for
+       applications where the cursor is not used, since it  reduces  the  need
+       for cursor motions.

        scrollok

        -       The scrollok option controls what happens when the cursor of  a  window
-       is  moved  off  the edge of the window or scrolling region, either as a
-       result of a newline action on the bottom line, or typing the last char-
-       acter of the last line.  If disabled, (bf is FALSE), the cursor is left
-       on the bottom line.  If enabled, (bf is TRUE), the window  is  scrolled
-       up one line (Note that to get the physical scrolling effect on the ter-
-       minal, it is also necessary to call idlok).
-
-
-

        setscrreg/wsetscrreg

        -       The setscrreg and wsetscrreg routines allow the application  programmer
-       to set a software scrolling region in a window.  The top and bot param-
-       eters are the line  numbers  of  the  top  and  bottom  margin  of  the
-       scrolling region.  (Line 0 is the top line of the window.)  If this op-
-       tion and scrollok are enabled, an attempt to move off the bottom margin
-       line causes all lines in the scrolling region to scroll one line in the
-       direction of the first line.  Only the text of the window is  scrolled.
-       (Note  that this has nothing to do with the use of a physical scrolling
-       region capability in the terminal, like that in the VT100.  If idlok is
-       enabled and the terminal has either a scrolling region or insert/delete
-       line capability, they will probably be used by the output routines.)
+       The  scrollok  option controls what happens when the cursor of a window
+       is moved off the edge of the window or scrolling region,  either  as  a
+       result  of  a  newline  action  on  the bottom line, or typing the last
+       character of the last line.  If disabled, (bf is FALSE), the cursor  is
+       left  on  the  bottom  line.   If  enabled, (bf is TRUE), the window is
+       scrolled up one line (Note that to get the physical scrolling effect on
+       the terminal, it is also necessary to call idlok).
+
+
+

        setscrreg, wsetscrreg

        +       The  setscrreg and wsetscrreg routines allow the application programmer
+       to set a software scrolling region  in  a  window.   The  top  and  bot
+       parameters  are  the  line  numbers of the top and bottom margin of the
+       scrolling region.  (Line 0 is the top line of  the  window.)   If  this
+       option  and  scrollok  are  enabled,  an attempt to move off the bottom
+       margin line causes all lines in the scrolling region to scroll one line
+       in  the  direction  of  the first line.  Only the text of the window is
+       scrolled.  (Note that this has nothing to do with the use of a physical
+       scrolling  region  capability  in the terminal, like that in the VT100.
+       If idlok is enabled and the terminal has either a scrolling  region  or
+       insert/delete line capability, they will probably be used by the output
+       routines.)

        RETURN VALUE

        @@ -146,64 +146,59 @@ 
        curs_outopts 3x
        
        upon  failure.  All other routines that return an integer always return
        OK.
 
-       X/Open Curses does not define any error conditions.
-
        In this implementation,
 
-       o   those functions that have a window pointer will return an error  if
-           the window pointer is null
+       o   those functions that have a window pointer will return ERR  if  the
+           window pointer is null
 
-       o   wsetscrreg  returns  an error if the scrolling region limits extend
-           outside the window.
+       o   wsetscrreg  returns  ERR  if  the  scrolling  region  limits extend
+           outside the window boundaries.
 
-       X/Open does not define any error conditions.  This  implementation  re-
-       turns an error if the window pointer is null.
+
+

        NOTES

        +       clearok, leaveok, scrollok, idcok, and setscrreg may be implemented  as
+       macros.
+
+       The  immedok  routine  is  useful for windows that are used as terminal
+       emulators.

        PORTABILITY

        -       These functions are described in the XSI Curses standard, Issue 4.
-
-       From the outset, ncurses used nl/nonl to control the conversion of new-
-       lines to carriage return/line-feed on output as  well  as  input.   XSI
-       Curses  documents only the use of these functions for input.  This dif-
-       ference arose from converting the  pcurses  source  (which  used  ioctl
-       calls  with  the sgttyb structure) to termios (i.e., the POSIX terminal
-       interface).  In the former, both input and output were controlled via a
-       single  option  CRMOD,  while the latter separates these features.  Be-
-       cause that conversion interferes with output optimization, nl/nonl were
-       amended after ncurses 6.2 to eliminate their effect on output.
-
-       Some  historic  curses implementations had, as an undocumented feature,
-       the ability to do the equivalent of clearok(..., 1)  by  saying  touch-
-       win(stdscr) or clear(stdscr).  This will not work under ncurses.
-
-       Earlier  System  V  curses implementations specified that with scrollok
+       X/Open Curses Issue 4 describes these functions.  It specifies no error
+       conditions for them.
+
+       Some  historic  curses implementations, as an undocumented feature, did
+       the  equivalent  of  "clearok(...,   1)"   when   touchwin(stdstr)   or
+       clear(stdstr) were used.  This trick does not work with ncurses.
+
+       Early  System V  curses  implementations  specified  that with scrollok
        enabled, any window modification triggering  a  scroll  also  forced  a
-       physical refresh.  XSI Curses does not require this, and ncurses avoids
-       doing it to perform better  vertical-motion  optimization  at  wrefresh
-       time.
+       physical  refresh.   X/Open  Curses  does not require this, and ncurses
+       avoids doing so to better optimize vertical motions upon a wrefresh.
 
-       The XSI Curses standard does not mention that the cursor should be made
-       invisible as a side-effect of leaveok.  SVr4 curses documentation  does
-       this,  but  the code does not.  Use curs_set to make the cursor invisi-
-       ble.
+       X/Open Curses does not mention that the cursor should be made invisible
+       as a side-effect of leaveok.  SVr4 curses documentation notes this, but
+       the code neglects it.  Use curs_set(3x) to make the cursor invisible.
 
 
-

        NOTES

        -       Note that clearok, leaveok,  scrollok,  idcok,  and  setscrreg  may  be
-       macros.
+

        HISTORY

        +       4BSD (1980) introduced clearok, leaveok, and scrollok.
+
+       SVr2 (1984) supplied idlok, setscrreg, and wsetscrreg.
+
+       SVr3.1 (1987) implemented idcok and immedok.
 
-       The immedok routine is useful for windows that are used as terminal em-
-       ulators.
+       ncurses formerly treated nl and nonl as both input and output  options,
+       but no longer; see curs_inopts(3x).

        SEE ALSO

        -       curses(3x), curs_addch(3x), curs_clear(3x), curs_initscr(3x),
-       curs_scroll(3x), curs_refresh(3x), curs_variables(3x).
+       curses(3x),     curs_addch(3x),    curs_clear(3x),    curs_initscr(3x),
+       curs_refresh(3x), curs_scroll(3x), curs_variables(3x)
 
 
 
-                                                              curs_outopts(3x)
+ncurses 6.5                       2025-03-01                  curs_outopts(3x)
        diff --git a/doc/html/man/curs_overlay.3x.html b/doc/html/man/curs_overlay.3x.html index f87fc884..1d50bfe3 100644 --- a/doc/html/man/curs_overlay.3x.html +++ b/doc/html/man/curs_overlay.3x.html @@ -1,6 +1,6 @@ -curs_overlay 3x +curs_overlay 3x 2025-01-18 ncurses 6.5 Library calls -

        curs_overlay 3x

        +

        curs_overlay 3x 2025-01-18 ncurses 6.5 Library calls

        -curs_overlay(3x)                                              curs_overlay(3x)
+curs_overlay(3x)                 Library calls                curs_overlay(3x)

        NAME

        -       overlay, overwrite, copywin - overlay and manipulate overlapped curses
-       windows
+       overlay,  overwrite,  copywin  -  overlay curses windows and manipulate
+       them

        SYNOPSIS

        @@ -63,42 +63,45 @@ 
        curs_overlay 3x

        DESCRIPTION

         
-

        overlay, overwrite

        +

        overlay, overwrite

                The overlay and overwrite routines overlay srcwin  on  top  of  dstwin.
        scrwin and dstwin are not required to be the same size; only text where
        the two windows overlap is copied.  The difference is that  overlay  is
-       non-destructive  (blanks  are not copied) whereas overwrite is destruc-
-       tive.
+       non-destructive   (blanks   are   not   copied)  whereas  overwrite  is
+       destructive.

        copywin

                The copywin routine provides a finer granularity of  control  over  the
-       overlay  and overwrite routines.  As in the prefresh routine, a rectan-
-       gle is specified in the  destination  window,  (dminrow,  dmincol)  and
-       (dmaxrow, dmaxcol), and the upper-left-corner coordinates of the source
-       window, (sminrow, smincol).  If the  argument  overlay  is  true,  then
-       copying is non-destructive, as in overlay.
+       overlay  and  overwrite  routines.   As  in  the  prefresh  routine,  a
+       rectangle is specified in the destination  window,  (dminrow,  dmincol)
+       and  (dmaxrow,  dmaxcol),  and the upper-left-corner coordinates of the
+       source window, (sminrow, smincol).  If the argument  overlay  is  true,
+       then copying is non-destructive, as in overlay.

        RETURN VALUE

        -       Routines  that  return an integer return ERR upon failure, and OK (SVr4
-       only specifies "an integer value other than ERR") upon successful  com-
-       pletion.
+       These functions return OK on success and ERR on failure.
 
-       X/Open  defines  no error conditions.  In this implementation, copywin,
-       overlay and overwrite return an error if either of the window  pointers
-       are null, or if some part of the window would be placed off-screen.
+       In ncurses, they return ERR if
+
+       o   either of the window pointers are null, or
+
+       o   any part of the window would be placed off-screen.

        NOTES

        -       Note that overlay and overwrite may be macros.
+       overlay and overwrite may be implemented as macros.

        PORTABILITY

        -       The  XSI Curses standard, Issue 4 describes these functions (adding the
-       const qualifiers).  It further specifies their behavior in the presence
-       of  characters with multibyte renditions (not yet supported in this im-
-       plementation).
+       X/Open Curses Issue 4 describes these functions.  It specifies no error
+       conditions for them.  It adds const qualifiers to  the  arguments.   It
+       further  specifies  their  behavior  in the presence of characters with
+       multibyte renditions (not yet supported in this implementation).
+
+       SVr4 describes a successful return value  only  as  "an  integer  value
+       other than ERR".

        SEE ALSO

        @@ -106,7 +109,7 @@ 
        curs_overlay 3x
        
 
 
 
-                                                              curs_overlay(3x)
+ncurses 6.5                       2025-01-18                  curs_overlay(3x)
          @@ -114,7 +117,7 @@

          curs_overlay 3x

        • SYNOPSIS
        • DESCRIPTION
          • diff --git a/doc/html/man/curs_pad.3x.html b/doc/html/man/curs_pad.3x.html index 4758d36b..02345bdb 100644 --- a/doc/html/man/curs_pad.3x.html +++ b/doc/html/man/curs_pad.3x.html @@ -1,6 +1,6 @@ -curs_pad 3x +curs_pad 3x 2025-01-18 ncurses 6.5 Library calls -

          curs_pad 3x

          +

          curs_pad 3x 2025-01-18 ncurses 6.5 Library calls

          -curs_pad(3x)                                                      curs_pad(3x)
+curs_pad(3x)                     Library calls                    curs_pad(3x)

          NAME

                  newpad, subpad, prefresh, pnoutrefresh, pechochar, pecho_wchar - create
-       and display curses pads
+       and display curses pads

          SYNOPSIS

                  #include <curses.h>
 
        WINDOW *newpad(int nlines, int ncols);
-       WINDOW *subpad(WINDOW *orig, int nlines, int ncols,
+       WINDOW *subpad(WINDOW *parent, int nlines, int ncols,
              int begin_y, int begin_x);
+
        int prefresh(WINDOW *pad, int pminrow, int pmincol,
              int sminrow, int smincol, int smaxrow, int smaxcol);
        int pnoutrefresh(WINDOW *pad, int pminrow, int pmincol,
              int sminrow, int smincol, int smaxrow, int smaxcol);
+
        int pechochar(WINDOW *pad, chtype ch);
        int pecho_wchar(WINDOW *pad, const cchar_t *wch);

          DESCRIPTION

          +       A curses pad is like a window, except that it is not restricted by  the
+       screen  size,  and is not necessarily associated with a particular part
+       of the screen.  Pads can be used when a large window  is  needed,  only
+       part  of  which  is  to  be  visible  on  the  screen.   Pads  are  not
+       automatically refreshed by scrolling or input-echoing operations.
+
+       Pads  cannot  be  refreshed  with   wrefresh(3x);   use   prefresh   or
+       pnoutrefresh instead.
+

          newpad

          -       The newpad routine creates and returns a pointer  to  a  new  pad  data
-       structure  with  the given number of lines, nlines, and columns, ncols.
-       A pad is like a window, except that it is not restricted by the  screen
-       size,  and  is not necessarily associated with a particular part of the
-       screen.  Pads can be used when a large window is  needed,  and  only  a
-       part  of  the  window will be on the screen at one time.  Automatic re-
-       freshes of pads (e.g., from scrolling or echoing of input) do  not  oc-
-       cur.
-
-       It  is  not  legal to call wrefresh with a pad as an argument; the rou-
-       tines prefresh or pnoutrefresh should be  called  instead.   Note  that
-       these routines require additional parameters to specify the part of the
-       pad to be displayed and the location on the screen to be used  for  the
-       display.
+       newpad  creates  and returns a pointer to a new pad data structure with
+       the given number of lines, nlines, and columns, ncols.

          subpad

          -       The  subpad routine creates and returns a pointer to a subwindow within
-       a pad with the given number of lines, nlines, and columns, ncols.   Un-
-       like  subwin,  which uses screen coordinates, the window is at position
-       (begin_x, begin_y) on the pad.  The window is made in the middle of the
-       window  orig,  so  that changes made to one window affect both windows.
-       During the use of this routine, it will  often  be  necessary  to  call
-       touchwin or touchline on orig before calling prefresh.
+       subpad creates and returns a pointer to a subwindow within a  pad  with
+       the  given  number  of  lines,  nlines,  and  columns,  ncols.   Unlike
+       subwin(3x), which uses screen coordinates, the new  pad  is  placed  at
+       position (begin_y, begin_x) relative to its parent.  Thus, changes made
+       to one pad can affect both.  When operating on a subpad,  it  is  often
+       necessary  to  call  touchwin(3x)  or  touchline(3x)  on  parent before
+       calling prefresh.
 
 
-

          prefresh, pnoutrefresh

          -       The  prefresh  and  pnoutrefresh routines are analogous to wrefresh and
-       wnoutrefresh except that they relate to pads instead of  windows.   The
-       additional  parameters  are needed to indicate what part of the pad and
-       screen are involved.
+

          prefresh, pnoutrefresh

          +       prefresh  and  pnoutrefresh   are   analogous   to   wrefresh(3x)   and
+       wnoutrefresh(3x)  except that they operate on pads rather than windows.
+       They require additional parameters are needed to indicate what portions
+       of the pad and screen are involved.
 
-       o   The pminrow and pmincol parameters specify the upper left-hand cor-
-           ner of the rectangle to be displayed in the pad.
+       o   pminrow  and  pmincol  specify  the  upper  left-hand  corner  of a
+           rectangular view of the pad.
 
-       o   The  sminrow,  smincol, smaxrow, and smaxcol parameters specify the
-           edges of the rectangle to be displayed on the screen.
+       o   sminrow, smincol, smaxrow, and smaxcol specify the vertices of  the
+           rectangle to be displayed on the screen.
 
        The lower right-hand corner of the rectangle to be displayed in the pad
        is calculated from the screen coordinates, since the rectangles must be
        the same size.  Both rectangles must be entirely contained within their
-       respective  structures.   Negative values of pminrow, pmincol, sminrow,
-       or smincol are treated as if they were zero.
+       respective structures.  curses treats negative values of any  of  these
+       parameters as zero.

          pechochar

          -       The pechochar routine is functionally equivalent to  a  call  to  addch
-       followed  by a call to refresh(3x), a call to waddch followed by a call
-       to wrefresh, or a call to waddch followed by a call to  prefresh.   The
-       knowledge  that  only  a single character is being output is taken into
-       consideration and, for non-control characters, a  considerable  perfor-
-       mance  gain  might  be  seen  by  using these routines instead of their
-       equivalents.  In the case of pechochar, the last location of the pad on
-       the screen is reused for the arguments to prefresh.
+       pechochar  is functionally equivalent to calling waddch(3x) followed by
+       prefresh.  It suggests to the  curses  optimizer  that  only  a  single
+       character  is  being  output; a considerable performance benefit may be
+       thus enjoyed.  The location of the character ch written to the  pad  is
+       used to populate the arguments to prefresh.

          pecho_wchar

          -       The  pecho_wchar  function  is the analogous wide-character form of pe-
-       chochar.  It outputs one character to a pad and  immediately  refreshes
-       the pad.  It does this by a call to wadd_wch followed by a call to pre-
-       fresh.
+       pecho_wchar is functionally equivalent to calling wadd_wch(3x) followed
+       by prefresh.  It suggests to the curses optimizer that  only  a  single
+       wide  character is being output; a considerable performance benefit may
+       be thus enjoyed.  The location of the character wch written to the  pad
+       is used to populate the arguments to prefresh.

          RETURN VALUE

          -       Routines that return an integer return ERR upon failure  and  OK  (SVr4
-       only  specifies "an integer value other than ERR") upon successful com-
-       pletion.
+       Functions  that  return  an integer return ERR upon failure and OK upon
+       successful completion.
 
-       Routines that return pointers return NULL on error, and  set  errno  to
+       Functions that return pointers return NULL on error, and set  errno  to
        ENOMEM.
 
-       X/Open does not define any error conditions.  In this implementation
+       In this implementation
 
           prefresh and pnoutrefresh
-               return an error if the window pointer is null, or if the window
-               is not really a pad or if the  area  to  refresh  extends  off-
-               screen or if the minimum coordinates are greater than the maxi-
-               mum.
+               return  ERR  if the window pointer is null, or if the window is
+               not really a pad or if the area to refresh  extends  off-screen
+               or if the minimum coordinates are greater than the maximum.
 
           pechochar
-               returns an error if the window is not really a pad, and the as-
-               sociated call to wechochar returns an error.
+               returns  ERR  if  the  window  is  not  really  a  pad, and the
+               associated call to wechochar returns ERR.
 
           pecho_wchar
-               returns an error if the window is not really a pad, and the as-
-               sociated call to wecho_wchar returns an error.
+               returns ERR if  the  window  is  not  really  a  pad,  and  the
+               associated call to wecho_wchar returns ERR.

          NOTES

          -       Note that pechochar may be a macro.
+       pechochar may be implemented as a macro.
 
+       curses  documentation  is  traditionally  averse to motivating the term
+       "pad".  The Apollo Aegis  workstation  operating  system  (circa  1981)
+       supported a graphical pad feature.
 
-

          PORTABILITY

          -       BSD curses has no pad feature.
+       o   These  graphical  pads  could  be  much  larger than the computer's
+           display.
 
-       SVr2 curses (1986) provided the newpad and related functions, document-
-       ing  them  in  a single line each.  SVr3 (1987) provided more extensive
-       documentation.
+       o   The read-only output from a  command  could  be  scrolled  back  to
+           inspect and select text from the pad.
 
-       The documentation does not explain the term pad.  However,  the  Apollo
-       Aegis workstation operating system supported a graphical pad feature:
+       The two uses may be related.
 
-       o   These  graphical pads could be much larger than the computer's dis-
-           play.
 
-       o   The read-only output from a command could be scrolled back  to  in-
-           spect, and select text from the pad.
+

          PORTABILITY

          +       X/Open Curses Issue 4 describes these functions.  It specifies no error
+       conditions for them.
 
-       The two uses may be related.
+       SVr4 describes a successful return value  only  as  "an  integer  value
+       other than ERR".
 
-       The  XSI  Curses  standard,  Issue 4 describes these functions, without
-       significant change from the SVr3 documentation.  It describes no  error
-       conditions.   The  behavior of subpad if the parent window is not a pad
-       is undocumented, and is not checked by the vendor Unix implementations:
+       The  behavior  of  subpad  if  the  parent  window  is  not  a  pad  is
+       undocumented, and is not checked by the vendor Unix implementations.
 
-       o   SVr4 curses sets a flag in the WINDOW  structure  in  newpad  which
-           tells if the window is a pad.
+       o   SVr4 curses's newpad sets a flag in the WINDOW structure indicating
+           that the window is a pad.
 
-           However,  it  uses this information only in waddch (to decide if it
-           should call wrefresh) and wscrl (to avoid  scrolling  a  pad),  and
-           does  not  check  in  wrefresh  to ensure that the pad is refreshed
-           properly.
+           However,  it  uses this information only in waddch (to decide if it
+           should call wrefresh) and wscrl (to avoid  scrolling  a  pad);  its
+           wrefresh  does  not  check  it  to  ensure  that  a pad is properly
+           updated.
 
-       o   Solaris X/Open Curses checks if a window is a pad in  wnoutrefresh,
-           returning ERR in that case.
+       o   Solaris  xcurses  checks  whether  a  window  is  a  pad   in   its
+           wnoutrefresh, returning ERR in that case.
 
-           However,  it only sets the flag for subwindows if the parent window
-           is a pad.  Its newpad function does not set this information.  Con-
-           sequently, the check will never fail.
+           However,  it  sets the flag on subwindows only if the parent window
+           is a pad.  Its newpad does not set this information.  Consequently,
+           the check never fails.
 
-           It  makes no comparable check in pnoutrefresh, though interestingly
-           enough, a comment in the source code states  that  the  lack  of  a
-           check was an MKS extension.
+           It   makes   no   comparable   check   in  pnoutrefresh  --  though
+           interestingly enough, a comment in the source code states that  the
+           lack of a check was an MKS extension.
 
-       o   NetBSD  7 curses sets a flag in the WINDOW structure for newpad and
-           subpad, using this to help with the  distinction  between  wnoutre-
-           fresh and pnoutrefresh.
+       o   NetBSD 7  curses sets a flag in the WINDOW structure for newpad and
+           subpad, aiding  itself  to  distinguish  between  wnoutrefresh  and
+           pnoutrefresh.
 
            It  does  not  check for the case where a subwindow is created in a
-           pad using subwin or derwin.
+           pad using subwin or derwin.
 
-           The dupwin function returns a regular  window  when  duplicating  a
-           pad.   Likewise,  getwin always returns a window, even if the saved
+           Its dupwin  returns  a  regular  window  when  duplicating  a  pad.
+           Likewise,  its  getwin  always  returns a window, even if the saved
            data was from a pad.
 
-       This implementation
+       ncurses:
 
-       o   sets a flag in the WINDOW structure for newpad and subpad,
+       o   sets a flag in the WINDOW structure for newpad and subpad,
 
-       o   allows a subwin or derwin call to succeed having a  pad  parent  by
+       o   allows a subwin or derwin call to succeed having a  pad  parent  by
            forcing the subwindow to be a pad,
 
-       o   checks  in  both  wnoutrefresh and pnoutrefresh to ensure that pads
+       o   checks  in  both  wnoutrefresh and pnoutrefresh to ensure that pads
            and windows are handled distinctly, and
 
-       o   ensures that dupwin and getwin treat pads  versus  windows  consis-
-           tently.
+       o   ensures  that  dupwin  and  getwin  treat   pads   versus   windows
+           consistently.
+
+
+

          HISTORY

          +       SVr2  (1984) introduced newpad, prefresh, and pnoutrefresh, documenting
+       them in a single line each.
+
+       SVr3 (1987) added subpad and pechochar,  and  provided  more  extensive
+       documentation.
+
+       The  System V  Interface  Definition,  Version  4  (1995),  specified a
+       function named pechowchar.  This was a later addition  to  SVr4.x,  not
+       appearing  in  the  first  SVr4 (1989).  It differs from X/Open's later
+       pecho_wchar in that its wstr  parameter  was  a  chtype  instead  of  a
+       wchar_t, and was not const-qualified.

          SEE ALSO

          -       curses(3x), curs_refresh(3x), curs_touch(3x), curs_addch(3x).
+       curses(3x), curs_addch(3x), curs_refresh(3x), curs_touch(3x)
 
 
 
-                                                                  curs_pad(3x)
+ncurses 6.5                       2025-01-18                      curs_pad(3x)
          diff --git a/doc/html/man/curs_print.3x.html b/doc/html/man/curs_print.3x.html index 24c62d2e..a36e636b 100644 --- a/doc/html/man/curs_print.3x.html +++ b/doc/html/man/curs_print.3x.html @@ -1,6 +1,6 @@ -curs_print 3x +curs_print 3x 2025-02-15 ncurses 6.5 Library calls -

          curs_print 3x

          +

          curs_print 3x 2025-02-15 ncurses 6.5 Library calls

          -curs_print(3x)                                                  curs_print(3x)
+curs_print(3x)                   Library calls                  curs_print(3x)

          NAME

          -       mcprint - ship binary data to printer
+       mcprint - write binary data to printer using terminfo capabilities

          SYNOPSIS

                  #include <curses.h>
 
-       int mcprint(char *data, int len);
+       int mcprint(char * data, int len);

          DESCRIPTION

          -       This  function  uses  the mc5p or mc4 and mc5 capabilities, if they are
-       present, to ship given data to a printer attached to the terminal.
+       mcprint,   an  ncurses  extension  to  the  curses  library,  uses  the
+       terminal's prtr_non (mc5p) or prtr_on (mc5) and  prtr_off  (mc4)  media
+       copy  capabilities,  if  defined, to send len bytes of the given string
+       data to a printer attached to the terminal.
 
-       Note that the mcprint code has no way  to  do  flow  control  with  the
-       printer  or  to  know  how  much buffering it has.  Your application is
-       responsible for keeping the rate of writes to  the  printer  below  its
-       continuous  throughput  rate  (typically  about half of its nominal cps
-       rating).   Dot-matrix  printers  and   6-page-per-minute   lasers   can
-       typically  handle  80cps,  so  a  good conservative rule of thumb is to
-       sleep for a second after shipping each 80-character line.
+       mcprint has no means of flow control to the printer nor of knowing  how
+       much buffering it has.  Your application is responsible for keeping the
+       rate of writes to the printer below  its  continuous  throughput  rate,
+       typically about half of its nominal characters-per-second (cps) rating.
+       Dot-matrix printers and 6-page-per-minute laser printers can  typically
+       handle  80  cps,  so  a  conservative rule of thumb is to sleep for one
+       second after sending an 80-character line.

          RETURN VALUE

          -       The mcprint function returns ERR if the  write  operation  aborted  for
-       some  reason.   In  this  case,  errno  will  contain  either  an error
-       associated with write(2) or one of the following:
+       On success, mcprint returns  the  number  of  characters  sent  to  the
+       printer.
 
-       ENODEV
-            Capabilities for printer redirection do not exist.
+       mcprint  returns  ERR  if the write operation fails for any reason.  In
+       that event, errno contains either a value set by write(2),  or  one  of
+       the following.
 
-       ENOMEM
-            Couldn't allocate sufficient memory to buffer the printer write.
+       ENODEV
+            The terminal lacks relevant media copy capabilities.
 
-       When mcprint succeeds, it returns the  number  of  characters  actually
-       sent to the printer.
+       ENOMEM
+            ncurses  could  not allocate sufficient memory to buffer the write
+            operation.
+
+
+

          EXTENSIONS

          +       mcprint is an ncurses(3x) extension, and is not found in  SVr4  curses,
+       4.4BSD curses, or any other previous curses implementation.

          PORTABILITY

          -       The mcprint call was designed for ncurses(3x), and is not found in SVr4
-       curses, 4.4BSD curses, or any other previous version of curses.
+       Applications  employing this ncurses extension should condition its use
+       on the visibility of the NCURSES_VERSION preprocessor macro.
+
+
+

          HISTORY

          +       ncurses introduced mcprint prior to version 1.9.9g (1996).

          BUGS

          -       Padding in the mc5p, mc4 and mc5 capabilities will not be interpreted.
+       Padding in the prtr_non  (mc5p),  prtr_on  (mc5),  and  prtr_off  (mc4)
+       capabilities is not interpreted.

          SEE ALSO

          @@ -98,7 +111,7 @@ 
          curs_print 3x
          
 
 
 
-                                                                curs_print(3x)
+ncurses 6.5                       2025-02-15                    curs_print(3x)
          diff --git a/doc/html/man/curs_printw.3x.html b/doc/html/man/curs_printw.3x.html index 90a016cf..358507be 100644 --- a/doc/html/man/curs_printw.3x.html +++ b/doc/html/man/curs_printw.3x.html @@ -1,6 +1,6 @@ -curs_printw 3x +curs_printw 3x 2025-01-18 ncurses 6.5 Library calls -

          curs_printw 3x

          +

          curs_printw 3x 2025-01-18 ncurses 6.5 Library calls

          -curs_printw(3x)                                                curs_printw(3x)
+curs_printw(3x)                  Library calls                 curs_printw(3x)

          NAME

          -       printw, wprintw, mvprintw, mvwprintw, vwprintw, vw_printw - print
-       formatted output in curses windows
+       printw,  wprintw,  mvprintw,  mvwprintw,  vwprintw,  vw_printw  - write
+       formatted output to a curses window

          SYNOPSIS

          @@ -58,91 +58,96 @@ 
          curs_printw 3x
          
        int wprintw(WINDOW *win, const char *fmt, ...);
        int mvprintw(int y, int x, const char *fmt, ...);
        int mvwprintw(WINDOW *win, int y, int x, const char *fmt, ...);
+
        int vw_printw(WINDOW *win, const char *fmt, va_list varglist);
 
-       /* obsolete */
+       /* obsolete */
        int vwprintw(WINDOW *win, const char *fmt, va_list varglist);

          DESCRIPTION

          -       The printw, wprintw, mvprintw and mvwprintw routines are  analogous  to
-       printf  [see printf(3)].  In effect, the string that would be output by
-       printf is output instead as though waddstr were used on the given  win-
-       dow.
+       printw, wprintw, mvprintw, and mvwprintw are  analogous  to  printf(3).
+       In  effect,  the  string  that  would be output by printf(3) is instead
+       output as though waddstr(3x) were used with  win  (or  stdscr)  as  its
+       first argument.
 
-       The  vwprintw  and  vw_printw  routines  are  analogous to vprintf [see
-       printf(3)] and perform a wprintw using a variable argument  list.   The
-       third  argument  is a va_list, a pointer to a list of arguments, as de-
-       fined in <stdarg.h>.
+       vwprintw  and  vw_printw  are  analogous  to  vprintf(3), and perform a
+       wprintw using a variable  argument  list.   The  third  argument  is  a
+       va_list, a pointer to a list of arguments, as defined in stdarg.h.

          RETURN VALUE

          -       Routines that return an integer return ERR upon failure  and  OK  (SVr4
-       only  specifies "an integer value other than ERR") upon successful com-
-       pletion.
-
-       X/Open defines no error conditions.  In this implementation,  an  error
-       may be returned if it cannot allocate enough memory for the buffer used
-       to format the results.  It will return an error if the  window  pointer
-       is null.
+       These functions return ERR upon failure and OK upon success.
 
-       Functions  with  a  "mv"  prefix  first perform a cursor movement using
-       wmove, and return an error if the position is outside the window, or if
-       the window pointer is null.
+       In ncurses, failure occurs if the library cannot allocate enough memory
+       for the buffer into which the output is formatted,  or  if  the  window
+       pointer win is null.
 
+       Functions  prefixed with "mv" first perform cursor movement and fail if
+       the position (y, x) is outside the window boundaries.
 
-

          HISTORY

          -       While printw was implemented in 4BSD, it was unused until 4.2BSD (which
-       used it in games).  That early version of curses was before the ANSI  C
-       standard.   It  did not use <varargs.h>, though that was available.  In
-       1991 (a couple of years after SVr4 was generally available,  and  after
-       the  C  standard  was published), other developers updated the library,
-       using <stdarg.h> internally in 4.4BSD curses.  Even with this  improve-
-       ment, BSD curses did not use function prototypes (or even declare func-
-       tions) in the <curses.h> header until 1992.
 
-       SVr2 documented printw, wprintw  tersely  as  "printf  on  stdscr"  and
-       tersely as "printf on win", respectively.
+

          NOTES

          +       No wide character counterpart  functions  are  defined  by  the  "wide"
+       ncurses configuration nor by any standard.  To format and write a wide-
+       character string to a curses window,  consider  using  swprintf(3)  and
+       waddwstr(3x) or similar.
 
-       SVr3  added  mvprintw,  and mvwprintw, with a three-line summary saying
-       that they were analogous to printf(3), explaining that the string which
-       would be output from printf(3) would instead be output using waddstr on
-       the given window.  SVr3 also added vwprintw, saying that the third  pa-
-       rameter  is a va_list, defined in <varargs.h>, and referring the reader
-       to the manual pages for varargs and vprintf for detailed descriptions.
 
-       SVr4 added  no  new  variations  of  printw,  but  provided  for  using
-       <varargs.h> or <stdarg.h> to define the va_list type.
+

          PORTABILITY

          +       X/Open Curses Issue 4 describes these functions.  It specifies no error
+       conditions for them.
 
-       X/Open  Curses  added  vw_printw  to replace vwprintw, stating that its
-       va_list definition requires <stdarg.h>.
+       ncurses defines vw_printw and vwprintw identically  to  support  legacy
+       applications.  However, the latter is obsolete.
 
+       o   X/Open   Curses   Issue 4  Version 2  (1996),  marked  vwprintw  as
+           requiring varargs.h and "TO BE WITHDRAWN", and specified  vw_printw
+           using the stdarg.h interface.
 
-

          PORTABILITY

          -       In this implementation, vw_printw and vwprintw are equivalent, to  sup-
-       port legacy applications.  However, the latter (vwprintw) is obsolete:
+       o   X/Open  Curses  Issue 5,  Draft  2  (December 2007) marked vwprintw
+           (along with vwscanw and the termcap interface) as withdrawn.  After
+           incorporating  review  comments,  this became X/Open Curses Issue 7
+           (2009).
 
-       o   The  XSI  Curses  standard, Issue 4 described these functions.  The
-           function vwprintw is marked TO BE WITHDRAWN, and is to be  replaced
-           by a function vw_printw using the <stdarg.h> interface.
+       o   ncurses provides vwprintw, but marks it as deprecated.
 
-       o   The  Single Unix Specification, Version 2 states that vw_printw  is
-           preferred  to  vwprintw  since  the   latter   requires   including
-           <varargs.h>,  which  cannot be used in the same file as <stdarg.h>.
-           This implementation uses <stdarg.h> for both, because  that  header
-           is included in <curses.h>.
 
-       o   X/Open  Curses, Issue 5 (December 2007) marked vwprintw (along with
-           vwscanw and the termcap interface) as withdrawn.
+

          HISTORY

          +       While printw was implemented in 4BSD (November  1980),  it  was  unused
+       until  4.2BSD  (August  1983), which employed it for games.  That early
+       version of curses preceded the ANSI C standard of 1989.  It did not use
+       varargs.h,  though  that  had been available since Seventh Edition Unix
+       (1979).  In 1991 (a couple of years after SVr4 was generally available,
+       and  after  the C standard was published), other developers updated the
+       library, using stdarg.h internally in 4.4BSD curses.   Even  with  this
+       improvement,  BSD  curses  did  not  use  function prototypes (nor even
+       declare functions) in curses.h until 1992.
+
+       SVr2 (1984) documented printw and wprintw tersely as "printf on stdscr"
+       and "printf on win", respectively.
+
+       SVr3  (1987)  added  mvprintw  and mvwprintw, with a three-line summary
+       asserting that they were analogous to printf(3),  explaining  that  the
+       string  that  printf(3) would write to the standard output stream would
+       instead be output  using  waddstr  to  the  given  window.   SVr3  also
+       implemented  vwprintw,  describing  its  third  parameter as a va_list,
+       defined in varargs.h, and referred the reader to the manual  pages  for
+       varargs and vprintf for detailed descriptions.
+
+       SVr4  (1989)  introduced  no new variations of printw, but provided for
+       using either varargs.h or stdarg.h to define the va_list type.
+
+       X/Open Curses Issue 4 (1995), defined vw_printw  to  replace  vwprintw,
+       stating that its va_list type is defined in stdarg.h.

          SEE ALSO

          -       curses(3x), curs_addstr(3x), curs_scanw(3x), curs_termcap(3x),
-       printf(3), vprintf(3).
+       curses(3x), curs_addstr(3x), curs_scanw(3x), printf(3), vprintf(3)
 
 
 
-                                                               curs_printw(3x)
+ncurses 6.5                       2025-01-18                   curs_printw(3x)
          diff --git a/doc/html/man/curs_refresh.3x.html b/doc/html/man/curs_refresh.3x.html index 9a431956..fd3ce09c 100644 --- a/doc/html/man/curs_refresh.3x.html +++ b/doc/html/man/curs_refresh.3x.html @@ -1,6 +1,6 @@ -curs_refresh 3x +curs_refresh 3x 2025-01-18 ncurses 6.5 Library calls -

          curs_refresh 3x

          +

          curs_refresh 3x 2025-01-18 ncurses 6.5 Library calls

          -curs_refresh(3x)                                              curs_refresh(3x)
+curs_refresh(3x)                 Library calls                curs_refresh(3x)

          NAME

          -       doupdate, redrawwin, refresh, wnoutrefresh, wredrawln, wrefresh -
-       refresh curses windows and lines
+       doupdate,  redrawwin,  refresh,  wnoutrefresh,  wredrawln,  wrefresh  -
+       refresh curses windows or lines thereupon

          SYNOPSIS

          @@ -65,21 +65,21 @@ 
          curs_refresh 3x

          DESCRIPTION

           
-

          refresh/wrefresh

          +

          refresh, wrefresh

                  The refresh and wrefresh routines (or wnoutrefresh and  doupdate)  must
-       be called to get actual output to the terminal, as other routines mere-
-       ly manipulate data structures.  The routine wrefresh copies  the  named
-       window  to  the  physical  screen,  taking into account what is already
-       there to do optimizations.  The refresh routine is the same, using std-
-       scr  as  the  default window.  Unless leaveok(3x) has been enabled, the
-       physical cursor of the terminal is left at the location of  the  cursor
-       for that window.
+       be  called  to  get  actual  output  to the terminal, as other routines
+       merely manipulate data structures.  The  routine  wrefresh  copies  the
+       named  window  to  the  physical  screen,  taking  into account what is
+       already there to do optimizations.  The refresh routine  is  the  same,
+       using  stdscr  as  the  default  window.   Unless  leaveok(3x) has been
+       enabled, the physical cursor of the terminal is left at the location of
+       the cursor for that window.
 
 
-

          wnoutrefresh/doupdate

          +

          wnoutrefresh, doupdate

                  The wnoutrefresh and doupdate routines allow multiple updates with more
-       efficiency than wrefresh alone.  In addition to all the  window  struc-
-       tures,  curses  keeps  two  data  structures  representing the terminal
+       efficiency  than  wrefresh  alone.   In  addition  to  all  the  window
+       structures,  curses keeps two data structures representing the terminal
        screen:
 
        o   a physical screen, describing what is actually on the screen, and
@@ -98,68 +98,69 @@ 
          curs_refresh 3x
          
        If the programmer wishes to output several windows at once, a series of
        calls to wrefresh results in  alternating  calls  to  wnoutrefresh  and
        doupdate,  causing  several  bursts  of output to the screen.  By first
-       calling wnoutrefresh for each window, it is then possible to call doup-
-       date  once,  resulting  in  only  one burst of output, with fewer total
+       calling wnoutrefresh for each window,  it  is  then  possible  to  call
+       doupdate  once, resulting in only one burst of output, with fewer total
        characters transmitted and less CPU time used.
 
-       If the win argument to wrefresh is the physical screen (i.e., the glob-
-       al  variable  curscr),  the screen is immediately cleared and repainted
-       from scratch.
+       If the win argument to wrefresh  is  the  physical  screen  (i.e.,  the
+       global   variable  curscr),  the  screen  is  immediately  cleared  and
+       repainted from scratch.
 
-       The phrase "copies the named window to the virtual screen" above is am-
-       biguous.   What actually happens is that all touched (changed) lines in
-       the window are copied to the virtual  screen.   This  affects  programs
+       The phrase "copies the named window to the  virtual  screen"  above  is
+       ambiguous.   What  actually happens is that all touched (changed) lines
+       in the window are copied to the virtual screen.  This affects  programs
        that use overlapping windows; it means that if two windows overlap, you
-       can refresh them in either order and the overlap region will  be  modi-
-       fied  only  when  it  is  explicitly  changed.  (But see the section on
+       can refresh them in  either  order  and  the  overlap  region  will  be
+       modified  only  when it is explicitly changed.  (But see the section on
        PORTABILITY below for a warning about exploiting this behavior.)
 
 
-

          wredrawln/redrawwin

          +

          wredrawln, redrawwin

                  The wredrawln routine indicates to curses that some  screen  lines  are
        corrupted  and  should  be  thrown away before anything is written over
-       them.  It touches the indicated lines (marking them changed).  The rou-
-       tine redrawwin touches the entire window.
+       them.  It touches the indicated  lines  (marking  them  changed).   The
+       routine redrawwin touches the entire window.

          RETURN VALUE

          -       Routines  that  return an integer return ERR upon failure, and OK (SVr4
-       only specifies "an integer value other than ERR") upon successful  com-
-       pletion.
+       These routines return the integer ERR upon failure and OK
 
-       X/Open does not define any error conditions.  In this implementation
+       In this implementation
 
           wnoutrefresh
-               returns  an error if the window pointer is null, or if the win-
-               dow is really a pad.
+               returns  ERR if the window pointer is null, or if the window is
+               really a pad.
 
           wredrawln
-               returns an error if the associated call to touchln  returns  an
-               error.
+               return ERR if the associated call to touchln returns ERR.

          NOTES

          -       Note that refresh and redrawwin may be macros.
+       refresh and redrawwin may be implemented as macros.

          PORTABILITY

          -       The XSI Curses standard, Issue 4 describes these functions.
+       X/Open Curses Issue 4 describes these functions.  It specifies no error
+       conditions for them.
 
-       Whether  wnoutrefresh  copies to the virtual screen the entire contents
+       SVr4  describes  a  successful  return  value only as "an integer value
+       other than ERR".
+
+       Whether wnoutrefresh copies to the virtual screen the  entire  contents
        of a window or just its changed portions has never been well-documented
-       in  historic  curses  versions (including SVr4).  It might be unwise to
-       rely on either behavior in programs that might have to be  linked  with
+       in historic curses versions (including SVr4).  It might  be  unwise  to
+       rely  on  either behavior in programs that might have to be linked with
        other curses implementations.  Instead, you can do an explicit touchwin
-       before the wnoutrefresh call to guarantee an entire-contents copy  any-
-       where.
+       before  the  wnoutrefresh  call  to  guarantee  an entire-contents copy
+       anywhere.

          SEE ALSO

          -       curses(3x), curs_outopts(3x) curs_variables(3x).
+       curses(3x), curs_outopts(3x), curs_variables(3x)
 
 
 
-                                                              curs_refresh(3x)
+ncurses 6.5                       2025-01-18                  curs_refresh(3x)
            @@ -167,9 +168,9 @@

            curs_refresh 3x

          • SYNOPSIS
          • DESCRIPTION
          • RETURN VALUE
            • diff --git a/doc/html/man/curs_scanw.3x.html b/doc/html/man/curs_scanw.3x.html index 19a8e655..0f6ce9d5 100644 --- a/doc/html/man/curs_scanw.3x.html +++ b/doc/html/man/curs_scanw.3x.html @@ -1,6 +1,6 @@ -curs_scanw 3x +curs_scanw 3x 2025-01-18 ncurses 6.5 Library calls -

            curs_scanw 3x

            +

            curs_scanw 3x 2025-01-18 ncurses 6.5 Library calls

            -curs_scanw(3x)                                                  curs_scanw(3x)
+curs_scanw(3x)                   Library calls                  curs_scanw(3x)

            NAME

            -       scanw, wscanw, mvscanw, mvwscanw, vwscanw, vw_scanw - convert formatted
-       input from a curses window
+       scanw,  wscanw,  mvscanw,  mvwscanw, vwscanw, vw_scanw - read formatted
+       input from a curses window

            SYNOPSIS

            @@ -61,109 +61,125 @@ 
            curs_scanw 3x
            
 
        int vw_scanw(WINDOW *win, const char *fmt, va_list varglist);
 
-       /* obsolete */
+       /* obsolete */
        int vwscanw(WINDOW *win, const char *fmt, va_list varglist);

            DESCRIPTION

            -       The scanw, wscanw and mvscanw routines  are  analogous  to  scanf  [see
-       scanf(3)].   The  effect  of  these  routines is as though wgetstr were
-       called on the  window,  and  the  resulting  line  used  as  input  for
-       sscanf(3).   Fields which do not map to a variable in the fmt field are
-       lost.
+       scanw, wscanw, mvscanw, and mvwscanw are  analogous  to  scanf(3).   In
+       effect,  they  call  wgetstr(3x)  with  win  (or  stdscr)  as its first
+       argument,  then  attempt  conversion  of  the  resulting  string   with
+       vsscanf(3).   Fields in the string that do not map to a variable in the
+       fmt parameter are discarded.
 
-       The vwscanw and vw_scanw routines are  analogous  to  vscanf(3).   They
-       perform a wscanw using a variable argument list.  The third argument is
-       a va_list, a pointer to a list of arguments, as defined in <stdarg.h>.
+       vwscanw and vw_scanw are analogous to vscanf(3), and perform  a  wscanw
+       using  a  variable  argument  list.  The third argument is a va_list, a
+       pointer to a list of arguments, as defined in stdarg.h.

            RETURN VALUE

            -       vwscanw returns ERR on failure and an integer equal to  the  number  of
-       fields scanned on success.
+       These functions return ERR  upon  failure  and  otherwise  a  count  of
+       successful conversions; this quantity may be zero.
 
-       Applications  may  use the return value from the scanw, wscanw, mvscanw
-       and mvwscanw routines to determine the  number  of  fields  which  were
-       mapped in the call.
+       In  ncurses, failure occurs if vsscanf(3) returns EOF, or if the window
+       pointer win is null.
 
-       Functions  with  a  "mv"  prefix  first perform a cursor movement using
-       wmove, and return an error if the position is outside the window, or if
-       the window pointer is null.
+       Functions prefixed with "mv" first perform cursor movement and fail  if
+       the position (y, x) is outside the window boundaries.
 
 
-

            HISTORY

            -       While  scanw  was implemented in 4BSD, none of the BSD releases used it
-       until 4.4BSD (in a game).  That early version of curses was before  the
-       ANSI  C  standard.   It  did  not  use  <varargs.h>,  though  that  was
-       available.  In 1991  (a  couple  of  years  after  SVr4  was  generally
-       available,  and  after  the C standard was published), other developers
-       updated the library, using  <stdarg.h>  internally  in  4.4BSD  curses.
-       Even  with this improvement, BSD curses did not use function prototypes
-       (or even declare functions) in the <curses.h> header until 1992.
-
-       SVr2 documented scanw, wscanw tersely as  "scanf  through  stdscr"  and
-       tersely as "scanf through win", respectively.
-
-       SVr3 added mvscanw, and mvwscanw, with a three-line summary saying that
-       they were analogous to scanf(3), explaining that the string which would
-       be  output  from  scanf(3) would instead be output using waddstr on the
-       given window.  SVr3 also added vwscanw, saying that the third parameter
-       is  a  va_list, defined in <varargs.h>, and referring the reader to the
-       manual  pages  for  varargs  and  vprintf  for  detailed  descriptions.
-       (Because the SVr3 documentation does not mention vscanf, that reference
-       to vprintf may not be an error).
-
-       SVr4  added  no  new  variations  of  scanw,  but  provided  for  using
-       <varargs.h> or <stdarg.h> to define the va_list type.
-
-       X/Open  Curses  added  vw_scanw  to  replace  vwscanw, stating that its
-       va_list definition requires <stdarg.h>.
+

            NOTES

            +       No  wide  character  counterpart  functions  are  defined by the "wide"
+       ncurses configuration nor by any standard.  They  are  unnecessary:  to
+       retrieve  and  convert  a  wide-character string from a curses terminal
+       keyboard, use these functions with the scanf(3) conversions  "%lc"  and
+       "%ls" for wide characters and strings, respectively.
+
+       ncurses  implements vsscanf(3) internally if it is unavailable when the
+       library is configured.

            PORTABILITY

            -       In this implementation, vw_scanw and vwscanw are equivalent, to support
-       legacy applications.  However, the latter (vwscanw) is obsolete:
+       X/Open Curses Issue 4 describes these functions.  It specifies no error
+       conditions for them.
+
+       ncurses  defines  vw_scanw  and  vwscanw  identically to support legacy
+       applications.  However, the latter is obsolete.
+
+       o   X/Open Curses Issue 4 Version 2 (1996), marked vwscanw as requiring
+           varargs.h  and  "TO BE WITHDRAWN", and specified vw_scanw using the
+           stdarg.h interface.
+
+       o   X/Open Curses Issue 5,  Draft  2  (December  2007)  marked  vwscanw
+           (along with vwscanw and the termcap interface) as withdrawn.  After
+           incorporating review comments, this became  X/Open  Curses  Issue 7
+           (2009).
+
+       o   ncurses provides vwscanw, but marks it as deprecated.
+
+       X/Open Curses Issues 4 and 7 both state that these functions return ERR
+       or OK.  This is likely an erratum.
 
-       o   The  XSI Curses standard, Issue 4 described these functions, noting
-           that the function vwscanw is marked TO BE WITHDRAWN, and is  to  be
-           replaced by a function vw_scanw using the <stdarg.h> interface.
+       o   Since the underlying scanf(3)  returns  the  number  of  successful
+           conversions,  and  SVr4  curses was documented to use this feature,
+           this may have been an  editorial  solecism  introduced  by  X/Open,
+           rather than an intentional change.
 
-       o   The  Single  Unix Specification, Version 2 states that vw_scanw  is
-           preferred  to  vwscanw  since   the   latter   requires   including
-           <varargs.h>,  which  cannot be used in the same file as <stdarg.h>.
-           This implementation uses <stdarg.h> for both, because  that  header
-           is included in <curses.h>.
+       o   This  implementation retains compatibility with SVr4 curses.  As of
+           2018,  NetBSD  curses  also  returns  the  number   of   successful
+           conversions.   Both  ncurses  and  NetBSD curses call vsscanf(3) to
+           scan the string, which returns EOF on error.
 
-       o   X/Open  Curses,  Issue 5 (December 2007) marked vwscanw (along with
-           vwprintw and the termcap interface) as withdrawn.
+       o   Portable applications should test only if the return value is  ERR,
+           and  not  compare  it  to  OK,  since  that  value  (zero) might be
+           misleading.
 
-       Both XSI and The Single Unix Specification, Version 2 state that  these
-       functions return ERR or OK.
+           One portable way to get useful results  would  be  to  use  a  "%n"
+           conversion  at the end of the format string, and check the value of
+           the  corresponding  variable  to  determine  how  many  conversions
+           succeeded.
 
-       o   Since  the  underlying  scanf(3)  can  return  the  number of items
-           scanned, and the SVr4 code was documented to use this feature, this
-           is  probably  an  editing error which was introduced in XSI, rather
-           than being done intentionally.
 
-       o   This implementation  returns  the  number  of  items  scanned,  for
-           compatibility  with  SVr4  curses.   As of 2018, NetBSD curses also
-           returns the number of  items  scanned.   Both  ncurses  and  NetBSD
-           curses call vsscanf to scan the string, which returns EOF on error.
+

            HISTORY

            +       scanw  was  implemented  in 4BSD (November 1980); that early version of
+       curses preceded the ANSI C standard of 1989.  The function  was  unused
+       in  Berkeley  distributions  for  over  ten  years, until 4.4BSD, which
+       employed it in a game.  The 4BSD scanw did not  use  varargs.h,  though
+       that  had been available since Seventh Edition Unix (1979).  In 1991 (a
+       couple of years after SVr4 was generally available,  and  after  the  C
+       standard  was  published),  other developers updated the library, using
+       stdarg.h internally in 4.4BSD curses.  Even with this improvement,  BSD
+       curses  did not use function prototypes (nor even declare functions) in
+       curses.h until 1992.
+
+       SVr2 (1984) documented scanw  and  wscanw  tersely  as  "scanf  through
+       stdscr" and "scanf through win", respectively.
+
+       SVr3 (1987) added mvscanw, and mvwscanw, stating
+
+              "[t]hese routines correspond to scanf(3S), as do their arguments
+              and return values.  wgetstr() is called on the window,  and  the
+              resulting line is used as input for the scan."
 
-       o   Portable  applications should only test if the return value is ERR,
-           since the OK value (zero) is likely to be misleading.
+       SVr3  also  implemented  vwscanw,  describing  its third parameter as a
+       va_list, defined in varargs.h, and referred the reader  to  the  manual
+       pages  for varargs and vprintf for detailed descriptions.  (Because the
+       SVr3 documentation does not mention vscanf, the  reference  to  vprintf
+       might not be an error).
 
-           One possible way to get useful results  would  be  to  use  a  "%n"
-           conversion at the end of the format string to ensure that something
-           was processed.
+       SVr4  (1989)  introduced  no  new variations of scanw, but provided for
+       using either varargs.h or stdarg.h to define the va_list type.
+
+       X/Open Curses Issue 4 (1995),  defined  vw_scanw  to  replace  vwscanw,
+       stating that its va_list type is defined in stdarg.h.

            SEE ALSO

            -       curses(3x), curs_getstr(3x), curs_printw(3x), curs_termcap(3x),
-       scanf(3).
+       curses(3x), curs_getstr(3x), curs_printw(3x), scanf(3), vscanf(3)
 
 
 
-                                                                curs_scanw(3x)
+ncurses 6.5                       2025-01-18                    curs_scanw(3x)
            diff --git a/doc/html/man/curs_scr_dump.3x.html b/doc/html/man/curs_scr_dump.3x.html index 7f964c92..c2cfa183 100644 --- a/doc/html/man/curs_scr_dump.3x.html +++ b/doc/html/man/curs_scr_dump.3x.html @@ -1,6 +1,6 @@ -curs_scr_dump 3x +curs_scr_dump 3x 2025-01-18 ncurses 6.5 Library calls -

            curs_scr_dump 3x

            +

            curs_scr_dump 3x 2025-01-18 ncurses 6.5 Library calls

            -curs_scr_dump(3x)                                            curs_scr_dump(3x)
+curs_scr_dump(3x)                Library calls               curs_scr_dump(3x)

            NAME

            -       scr_dump, scr_restore, scr_init, scr_set - read (write) a curses screen
-       from (to) a file
+       scr_dump,  scr_restore,  scr_init, scr_set - read/write a curses screen
+       from/to a file

            SYNOPSIS

                    #include <curses.h>
 
-       int scr_dump(const char *filename);
-       int scr_restore(const char *filename);
-       int scr_init(const char *filename);
-       int scr_set(const char *filename);
+       int scr_dump(const char * filename);
+       int scr_restore(const char * filename);
+       int scr_init(const char * filename);
+       int scr_set(const char * filename);

            DESCRIPTION

            +       curses provides applications the ability to write the contents  of  the
+       screen  to  a  file and read them back.  To read/write a window (rather
+       than the whole screen) from/to a file, use getwin(3x)  and  putwin(3x),
+       respectively.
+

            scr_dump

            -       The scr_dump routine dumps the current contents of the  virtual  screen
-       to the file filename.
+       scr_dump  writes  to  filename  the contents of the virtual screen; see
+       curscr(3x).

            scr_restore

            -       The  scr_restore  routine  sets  the  virtual screen to the contents of
-       filename, which must have been written using scr_dump.  The  next  call
-       to  doupdate  restores  the physical screen to the way it looked in the
-       dump file.
+       scr_restore updates  the  virtual  screen  to  match  the  contents  of
+       filename (if validly written with scr_dump).  curses does not perform a
+       refresh;  after  making  any  desired  changes,  call  doupdate(3x)  or
+       similar.

            scr_init

            -       The scr_init routine reads in the contents of filename and uses them to
-       initialize the curses data structures about what the terminal currently
-       has on its screen.  If the data is determined to be valid, curses bases
-       its  next update of the screen on this information rather than clearing
-       the  screen  and  starting  from  scratch.   scr_init  is  used   after
-       initscr(3x)  or  a  system(3)  call  to  share  the screen with another
-       process which has done a scr_dump after its endwin(3x) call.  The  data
-       is declared invalid
+       scr_init  reads filename, using it to initialize curses data structures
+       describing the state of  the  terminal  screen.   curses  then,  if  it
+       decides  the  terminal  state  is  valid,  bases its next update of the
+       screen on this information rather than clearing it  and  starting  from
+       scratch.
 
-       o   if the terminfo capabilities rmcup and nrrmc exist, also
+       curses  regards  the terminal as in an invalid state for computation of
+       updates based on the contents of filename if
 
-       o   if  the  terminal  has been written to since the preceding scr_dump
-           call.
+       o   curses knows that the  terminal  has  been  written  to  since  the
+           preceding scr_dump call, or
 
+       o   the  terminal  type supports the terminfo capabilities exit_ca_mode
+           (rmcup) or non_rev_rmcup (nrrmc).
 
-

            scr_set

            -       The scr_set routine is a combination of scr_restore and  scr_init.   It
-       tells the program that the information in filename is what is currently
-       on the screen, and also what the program wants on the screen.  This can
-       be thought of as a screen inheritance function.
+       Either of the foregoing conditions means that curses cannot assume that
+       the  terminal's  contents  match their representation in filename.  The
+       former is due to  terminal  features  (such  as  xterm(1)'s  "alternate
+       screen")  that  couple  cursor-positioning  mode  with a local cache of
+       screen contents.  curses cannot know whether the terminal is displaying
+       from that local cache at the time the application calls scr_init, so it
+       makes a pessimistic assumption that a  full  redraw  is  required;  see
+       subsection "Cursor Motions" of terminfo(5).
+
+       scr_init  could  be  used  after  initscr(3x) or system(3) to share the
+       screen with another process that has done a scr_dump after  endwin(3x).
+       An   application  that  supports  suspending  its  state  on  exit  and
+       subsequent resumption upon  later  execution  might  use  scr_dump  and
+       scr_init thus.
 
-       To  read  (write)  a window from (to) a file, use the getwin and putwin
-       routines [see curs_util(3x)].
+
+

            scr_set

            +       scr_set  combines  scr_restore and scr_init, synchronizing the contents
+       of filename with the virtual screen.  It can be regarded  as  a  screen
+       inheritance function; consider a real-time screen-sharing application.

            RETURN VALUE

            -       All routines return the integer ERR upon failure and OK upon success.
+       These functions return OK on success and ERR on failure.
 
-       X/Open defines no error conditions.  In this implementation, each  will
-       return an error if the file cannot be opened.
+       In  ncurses,  each  function  returns  ERR  if it cannot open filename.
+       scr_init, scr_restore, and  scr_set  return  ERR  if  the  contents  of
+       filename are invalid.

            NOTES

            -       Note that scr_init, scr_set, and scr_restore may be macros.
+       scr_init, scr_restore, and scr_set may be implemented as macros.

            PORTABILITY

            -       The XSI Curses standard, Issue 4, describes these functions (adding the
-       const qualifiers).
+       X/Open Curses Issue 4 describes these functions.  It specifies no error
+       conditions for them.
+
+       SVr4 omitted the const qualifiers.
+
+       SVr4 documentation describes scr_init such that the dump data  is  also
+       considered  invalid  "if the time-stamp of the tty is old" but does not
+       define "old".
+
+       As of 2024, PDCurses provides these functions.  NetBSD curses does not.
+
+       Other implementations of curses store the window in binary form,  which
+       makes  the  dump  dependent  upon  the  curses  library's internal data
+       structures.  ncurses avoids  this  drawback  by  storing  the  dump  in
+       textual  form,  allowing  more flexible use of the data.  For instance,
+       the scr_restore of SVr4 curses requires that the dumped window have the
+       same  dimensions  as the restored window.  ncurses uses its wresize(3x)
+       extension to adjust the restored window size.
+
 
-       The SVr4 docs merely say under scr_init that the dump data is also con-
-       sidered invalid "if the time-stamp of the tty is old" but do not define
-       "old".
+

            HISTORY

            +       SVr3 (1987) introduced scr_dump,  scr_init,  and  scr_restore.   SVr3.1
+       added scr_set.

            SEE ALSO

            -       curses(3x),    curs_initscr(3x),    curs_refresh(3x),    curs_util(3x),
-       scr_dump(5), system(3)
+       curses(3x), curs_initscr(3x), curs_refresh(3x), curs_util(3x),
+       system(3), scr_dump(5), terminfo(5), wresize(3x)
 
 
 
-                                                             curs_scr_dump(3x)
+ncurses 6.5                       2025-01-18                 curs_scr_dump(3x)
            diff --git a/doc/html/man/curs_scroll.3x.html b/doc/html/man/curs_scroll.3x.html index 3079d60d..a2d0527c 100644 --- a/doc/html/man/curs_scroll.3x.html +++ b/doc/html/man/curs_scroll.3x.html @@ -1,6 +1,6 @@ -curs_scroll 3x +curs_scroll 3x 2025-02-01 ncurses 6.5 Library calls -

            curs_scroll 3x

            +

            curs_scroll 3x 2025-02-01 ncurses 6.5 Library calls

            -curs_scroll(3x)                                                curs_scroll(3x)
+curs_scroll(3x)                  Library calls                 curs_scroll(3x)

            NAME

            -       scroll, scrl, wscrl - scroll a curses window
+       scroll, scrl, wscrl - scroll a curses window

            SYNOPSIS

                    #include <curses.h>
 
-       int scroll(WINDOW *win);
+       int scroll(WINDOW * win);
 
        int scrl(int n);
-       int wscrl(WINDOW *win, int n);
+       int wscrl(WINDOW * win, int n);

            DESCRIPTION

            -       The  scroll routine scrolls the window up one line.  This involves mov-
-       ing the lines in the window data structure.  As an optimization, if the
-       scrolling  region  of  the  window  is  the entire screen, the physical
-       screen may be scrolled at the same time.
+       scroll  scrolls  the  given window up one line.  That is, every visible
+       line we might number i becomes line i-1.  wscrl  and  scrl  scroll  the
+       specified window or stdscr, respectively, up or down per the sign of n.
 
-       For positive n, the scrl and wscrl routines  scroll  the  window  up  n
-       lines  (line  i+n becomes i); otherwise scroll the window down n lines.
-       This involves moving the lines in the window character image structure.
-       The current cursor position is not changed.
+       o   For positive n, line i+n becomes i (scrolling up);
 
-       For  these  functions  to  work,  scrolling  must be enabled via scrol-
-       lok(3x).
+       o   for negative n, line i-n becomes i (scrolling down).
+
+       A  line  that  scrolls  beyond the window boundaries disappears; curses
+       populates a  new  one  emerging  at  the  opposite  boundary  with  the
+       background   character;   see   bkgd(3x)   (wide-character  API  users:
+       bkgrnd(3x)).  As an optimization, if the scrolling region of the window
+       is  the  entire screen, the physical screen may be scrolled at the same
+       time; see curscr(3x).
+
+       The cursor does not move.  These functions perform no operation  unless
+       scrolling is enabled for the window via scrollok(3x).

            RETURN VALUE

            -       These routines return ERR upon failure, and OK (SVr4 only specifies "an
-       integer value other than ERR") upon successful completion.
+       These functions return ERR upon failure and OK upon success.
 
-       X/Open defines no error conditions.
+       In ncurses, they return ERR if
 
-       This  implementation returns an error if the window pointer is null, or
-       if scrolling is not enabled in the window, e.g., with scrollok(3x).
+       o   the curses screen has not been initialized,
 
+       o   win is a null pointer, or
 
-

            NOTES

            -       Note that scrl and scroll may be macros.
+       o   scrolling is not enabled in the window (as by scrollok(3x)).
 
-       The  SVr4  documentation  says  that  the  optimization  of  physically
-       scrolling  immediately  if  the scroll region is the entire screen "is"
-       performed, not "may be" performed.   This  implementation  deliberately
-       does  not guarantee that this will occur, to leave open the possibility
-       of smarter optimization of multiple scroll actions on the next update.
 
-       Neither the SVr4 nor the XSI documentation specify whether the  current
-       attribute or current color-pair of blanks generated by the scroll func-
-       tion is zeroed.  Under this implementation it is.
+

            NOTES

            +       scroll and scrl may be implemented as macros.
+
+       Unusually,  there  is  no wscroll function; scroll behaves as one would
+       expect wscroll to, accepting a WINDOW pointer argument.

            PORTABILITY

            -       The XSI Curses standard, Issue 4 describes these functions.
+       X/Open Curses Issue 4 describes these functions.  It specifies no error
+       conditions for them.
+
+       SVr4  describes  a  successful  return  value only as "an integer value
+       other than ERR".
+
+       SVr4  indicates  that  the   optimization   of   physically   scrolling
+       immediately  if  the scroll region is the entire screen "is" performed,
+       not "may be" performed.  ncurses deliberately does not  guarantee  that
+       this  occurs,  to  leave open the possibility of better optimization of
+       multiple scroll actions on the next update.
+
+       Neither SVr4 curses nor X/Open Curses specify whether  these  functions
+       zero  the  attributes  or  color  pair  identifier  of  the  background
+       character.  In ncurses, they do not.
+
+
+

            HISTORY

            +       4BSD (1980) introduced scroll, defining it as a function.
+
+       SVr3.1 (1987) added scrl  and  wscrl,  redefining  scroll  as  a  macro
+       wrapping the latter.

            SEE ALSO

            @@ -107,7 +128,7 @@ 
            curs_scroll 3x
            
 
 
 
-                                                               curs_scroll(3x)
+ncurses 6.5                       2025-02-01                   curs_scroll(3x)
            diff --git a/doc/html/man/curs_slk.3x.html b/doc/html/man/curs_slk.3x.html index 84b202d0..6609fa3b 100644 --- a/doc/html/man/curs_slk.3x.html +++ b/doc/html/man/curs_slk.3x.html @@ -1,6 +1,6 @@ -curs_slk 3x +curs_slk 3x 2025-01-18 ncurses 6.5 Library calls -

            curs_slk 3x

            +

            curs_slk 3x 2025-01-18 ncurses 6.5 Library calls

            -curs_slk(3x)                                                      curs_slk(3x)
+curs_slk(3x)                     Library calls                    curs_slk(3x)

            NAME

            -       slk_init, slk_set, slk_wset, slk_refresh, slk_noutrefresh, slk_label,
-       slk_clear, slk_restore, slk_touch, slk_attron, slk_attrset,
-       slk_attroff, slk_attr_on, slk_attr_set, slk_attr_off, slk_attr,
-       slk_color, extended_slk_color - curses soft label routines
+       slk_init,  slk_set,  slk_wset, slk_refresh, slk_noutrefresh, slk_label,
+       slk_clear,    slk_restore,    slk_touch,    slk_attron,    slk_attrset,
+       slk_attroff,   slk_attr_on,   slk_attr_set,   slk_attr_off,   slk_attr,
+       slk_color, extended_slk_color - curses soft label key routines

            SYNOPSIS

            @@ -58,8 +58,8 @@ 
            curs_slk 3x
            
 
        int slk_init(int fmt);
 
-       int slk_set(int labnum, const char *label, int fmt);
-       int slk_wset(int labnum, const wchar_t *label, int fmt);
+       int slk_set(int labnum, const char *label, int align);
+       int slk_wset(int labnum, const wchar_t *label, int align);
 
        char *slk_label(int labnum);
 
@@ -72,69 +72,69 @@ 
            curs_slk 3x
            
        int slk_attron(const chtype attrs);
        int slk_attroff(const chtype attrs);
        int slk_attrset(const chtype attrs);
-       int slk_attr_on(attr_t attrs, void* opts);
-       int slk_attr_off(const attr_t attrs, void * opts);
-       int slk_attr_set(const attr_t attrs, short pair, void* opts);
-       /* extension */
+       int slk_attr_on(attr_t attrs, void *opts);
+       int slk_attr_off(const attr_t attrs, void *opts);
+       int slk_attr_set(const attr_t attrs, short pair, void*opts);
+       /* extension */
        attr_t slk_attr(void);
 
        int slk_color(short pair);
-       /* extension */
+       /* extension */
        int extended_slk_color(int pair);

            DESCRIPTION

            -       The slk* functions manipulate the set of soft function-key labels  that
-       exist on many terminals.  For those terminals that do not have soft la-
-       bels, curses takes over the bottom line of stdscr, reducing the size of
-       stdscr  and the variable LINES.  curses standardizes on eight labels of
-       up to eight characters each.  In addition to this, the  ncurses  imple-
-       mentation  supports  a  mode where it simulates 12 labels of up to five
-       characters each.  This is useful for PC-like enduser devices.   ncurses
-       simulates this mode by taking over up to two lines at the bottom of the
-       screen; it does not try to use any hardware support for this mode.
+       These functions manipulate the  soft  function  key  labels  that  some
+       hardware  terminals support.  For those terminals that do not have soft
+       labels, curses takes over the  bottom  line  of  stdscr,  reducing  its
+       vertical  size  and the value of LINES by one.  By default, curses uses
+       eight labels of up to eight characters each.
+
+       ncurses furthermore supports a mode comprising twelve labels of  up  to
+       five  characters  each,  following a convention associated with the IBM
+       PC/AT keyboard.  ncurses simulates this mode by taking over up  to  two
+       lines  at the bottom of the screen; it does not try to use any hardware
+       support for this mode.

            Initialization

            -       The slk_init routine must  be  called  before  initscr  or  newterm  is
-       called.   If  initscr eventually uses a line from stdscr to emulate the
-       soft labels, then fmt determines how the labels  are  arranged  on  the
-       screen:
+       slk_init  must  be  called  before  initscr  or  newterm.   If  initscr
+       eventually uses a line from stdscr to emulate the soft labels, then fmt
+       determines how the labels are arranged on the screen.
 
-          0  indicates a 3-2-3 arrangement of the labels.
+       0  indicates a 3-2-3 arrangement of the labels.
 
-          1  indicates a 4-4 arrangement
+       1  indicates a 4-4 arrangement
 
-          2  indicates the PC-like 4-4-4 mode.
+       2  indicates the PC-like 4-4-4 mode.
 
-          3  is again the PC-like 4-4-4 mode, but in addition an index line is
-             generated, helping the user to identify the key numbers easily.
+       3  is again the PC-like 4-4-4 mode, but in addition an  index  line  is
+          generated,  helping  the  user  to  associate  each  label  with its
+          numbered function key.  LINES and the vertical size  of  stdscr  are
+          further reduced.

            Labels

            -       The slk_set routine (and the slk_wset routine  for  the  wide-character
-       library) has three parameters:
+       Populate  the  labels  with  normal strings (slk_set) or wide-character
+       strings (slk_wset).  Each function takes three parameters.
 
-          labnum
-               is the label number, from 1 to 8 (12 if fmt in slk_init is 2 or
+       labnum  is the label number, from 1 to 8 (12 if fmt in slk_init is 2 or
                3);
 
-          label
-               is be the string to put on the label, up to eight (five if  fmt
-               in  slk_init is 2 or 3) characters in length.  A null string or
+       label   is  be the string to put on the label, up to eight (five if fmt
+               in slk_init is 2 or 3) characters in length.  A empty string or
                a null pointer sets up a blank label.
 
-          fmt  is either 0, 1, or 2, indicating whether the  label  is  to  be
-               left-justified,  centered,  or  right-justified,  respectively,
-               within the label.
+       align   is  0,  1,  or 2, aligning label to the left, center, or right,
+               respectively, within the 8 (5) character cells housing it.
 
-       The slk_label routine returns the current label for label  number  lab-
-       num, with leading and trailing blanks stripped.
+       slk_label obtains the string assigned to label number labnum, with  any
+       leading and trailing blanks stripped.
 
 
-

            Screen updates

            -       The slk_refresh and slk_noutrefresh routines correspond to the wrefresh
-       and wnoutrefresh routines.
+

            Screen Updates

            +       slk_refresh  and  slk_noutrefresh  affect  the  soft key label lines as
+       wrefresh and wnoutrefresh do the curses window.
 
        The slk_clear routine clears the soft labels from the screen.
 
@@ -145,124 +145,102 @@ 
            curs_slk 3x
            
        time a slk_noutrefresh is performed.
 
 
-

            Video attributes

            -       The slk_attron, slk_attrset, slk_attroff and slk_attr  routines  corre-
-       spond  to  attron,  attrset,  attroff and attr_get, respectively.  They
-       have an effect only if soft labels are simulated on the bottom line  of
-       the  screen.   The default highlight for soft keys is A_STANDOUT (as in
-       System V curses, which does not document this fact).
+

            Video Attributes

            +       The  slk_attron,  slk_attrset,  slk_attroff,  and   slk_attr   routines
+       correspond  to  attron,  attrset,  attroff, and attr_get, respectively.
+       They have an effect only if soft labels are  simulated  on  the  bottom
+       line  of  the  screen.   The  default  highlight for soft key labels is
+       A_STANDOUT (as in System V curses, which does not document this fact).

            Colors

                    The slk_color routine corresponds to color_set.  It has an effect  only
        if soft labels are simulated on the bottom line of the screen.
 
-       Because  slk_color  accepts  only short (signed 16-bit integer) values,
-       this implementation provides extended_slk_color which accepts an  inte-
-       ger value, e.g., 32-bits.
+       Because  slk_color  accepts  only short (signed 16-bit integer) values,
+       this implementation provides extended_slk_color, which accepts  an  int
+       value of at least 32 bits.

            RETURN VALUE

            -       These  routines return ERR upon failure and OK (SVr4 specifies only "an
-       integer value other than ERR") upon successful completion.
+       Functions  that  return  integers  return  ERR upon failure and OK upon
+       success.
 
-       X/Open defines no error conditions.  In this implementation
+       In ncurses,
 
           slk_attr
                returns the attribute used for the soft keys.
 
-          slk_attroff, slk_attron, slk_clear, slk_noutrefresh, slk_refresh,
+          slk_attroff, slk_attron,  slk_clear,  slk_noutrefresh,  slk_refresh,
           slk_touch
-               return  an  error if the terminal or the softkeys were not ini-
-               tialized.
+               return   ERR   if   the  terminal  or  the  softkeys  were  not
+               initialized.
 
           slk_attrset
-               returns an error if the terminal or the softkeys were not  ini-
-               tialized.
+               returns  ERR  if  the  terminal  or  the  softkeys   were   not
+               initialized.
 
           slk_attr_set
-               returns  an error if the terminal or the softkeys were not ini-
-               tialized, or the  color  pair  is  outside  the  range  0..COL-
-               OR_PAIRS-1.
+               returns   ERR   if  the  terminal  or  the  softkeys  were  not
+               initialized,  or  the  color  pair   is   outside   the   range
+               0..COLOR_PAIRS-1.
 
           slk_color
-               returns  an error if the terminal or the softkeys were not ini-
-               tialized, or the  color  pair  is  outside  the  range  0..COL-
-               OR_PAIRS-1.
+               returns   ERR   if  the  terminal  or  the  softkeys  were  not
+               initialized,  or  the  color  pair   is   outside   the   range
+               0..COLOR_PAIRS-1.
 
           slk_init
-               returns  an  error if the format parameter is outside the range
-               0..3.
+               returns ERR if the format parameter is outside the range 0..3.
 
           slk_label
-               returns NULL on error.
+               returns NULL on error.
 
           slk_set
-               returns an error if the terminal or the softkeys were not  ini-
-               tialized, or the labnum parameter is outside the range of label
-               counts, or if the format parameter is outside the  range  0..2,
-               or if memory for the labels cannot be allocated.
-
-
-

            HISTORY

            -       SVr3 introduced these functions:
-         slk_clear
-         slk_init
-         slk_label
-         slk_noutrefresh
-         slk_refresh
-         slk_restore
-         slk_set
-         slk_touch
+               returns   ERR   if  the  terminal  or  the  softkeys  were  not
+               initialized, or the labnum parameter is outside  the  range  of
+               label  counts,  or if the format parameter is outside the range
+               0..2, or if memory for the labels cannot be allocated.
 
-       SVr4 added these functions:
-         slk_attroff
-         slk_attron
-         slk_attrset
-         slk_start
 
-       X/Open Curses added these:
-         slk_attr_off
-         slk_attr_on
-         slk_attr_set
-         slk_color
-         slk_wset
+

            NOTES

            +       Most applications would  use  slk_noutrefresh  because  a  wrefresh  is
+       likely to follow soon.

            EXTENSIONS

                    X/Open  Curses  documents the opts argument as reserved for future use,
-       saying that it must be null.  This implementation uses  that  parameter
-       in ABI 6 for the functions which have a color-pair parameter to support
-       extended color pairs.
-
-       For  functions  which modify the color, e.g., slk_attr_set, if opts  is
-       set  it  is  treated  as a pointer to int, and used to  set  the  color
-       pair instead of the short pair parameter.
+       saying that it must be a null pointer.  The ncurses 6 ABI uses  it  for
+       the  functions  that  accept a color pair parameter to support extended
+       color pairs.
 
-
-

            NOTES

            -       Most applications would use slk_noutrefresh because a wrefresh is like-
-       ly to follow soon.
+       For functions which modify the color, e.g., slk_attr_set,  if  opts  is
+       set  it  is treated as a pointer to int, and used to set the color pair
+       instead of the short pair parameter.

            PORTABILITY

            -       The  XSI  Curses  standard,  Issue 4, described the soft-key functions,
-       with some differences from SVr4 curses:
+       X/Open Curses Issue 4 describes these functions.  It specifies no error
+       conditions for them.
+
+       SVr4  describes  a  successful  return  value only as "an integer value
+       other than ERR".
 
-       o   It added functions like the SVr4  attribute-manipulation  functions
-           slk_attron,  slk_attroff, slk_attrset, but which use attr_t parame-
-           ters (rather than chtype), along with a reserved opts parameter.
+       o   X/Open  added  functions  like  the   SVr4   attribute-manipulation
+           functions  slk_attron,  slk_attroff, and slk_attrset, but which use
+           attr_t parameters (rather than chtype), along with a reserved  opts
+           parameter.
 
-           Two of these new functions (unlike the SVr4 functions) have no pro-
-           vision for color: slk_attr_on and slk_attr_off.
+           Two  of  these  new  functions  (unlike the SVr4 functions) have no
+           provision for color: slk_attr_on and slk_attr_off.
 
-           The third function (slk_attr_set) has a color-pair parameter.
+           The third function (slk_attr_set) has a color pair parameter.
 
-       o   It added const qualifiers to parameters (unnecessarily), and
+       o   It added const qualifiers to parameters (unnecessarily), and
 
        o   It added slk_color.
 
-       Although  slk_start  is  declared in the curses header file, it was not
+       Although slk_start is declared in the curses header file,  it  was  not
        documented by SVr4 other than its presence in a list of libtermlib.so.1
        symbols.  Reading the source code (i.e., Illumos):
 
@@ -274,42 +252,67 @@ 
            curs_slk 3x
            
 
        o   Soft-key groups are an array of ng integers.
 
-       o   In  SVr4, slk_init calls slk_start passing a null for gp.  For this
-           case, slk_start uses the number of groups ng (3 for the 3-2-3  lay-
-           out, 2 for the 4-4 layout) which slk_init provided.
+       o   In SVr4, slk_init calls slk_start passing a null for gp.  For  this
+           case,  slk_start  uses  the  number  of  groups ng (3 for the 3-2-3
+           layout, 2 for the 4-4 layout) which slk_init provided.
 
-           If  ng  is  neither  2 or 3, slk_start checks the terminfo fln (la-
-           bel_format) capability, interpreting that as a comma-separated list
-           of numbers, e.g., "3,2,3" for the 3-2-3 layout.
+           If ng is  neither  2  or  3,  slk_start  checks  the  terminfo  fln
+           (label_format)  capability,  interpreting that as a comma-separated
+           list of numbers, e.g., "3,2,3" for the 3-2-3 layout.
 
-           Finally, if there is no fln capability, slk_start returns ERR.
+           Finally, if there is no fln capability, slk_start returns ERR.
 
-       o   If  slk_start  is given a non-null gp, it copies the ng elements of
+       o   If slk_start is given a non-null gp, it copies the ng  elements  of
            the group of soft-keys, up to 16.
 
-           If there are more than 16 elements, slk_start returns an error.
+           If there are more than 16 elements, slk_start returns ERR.
 
-       o   The format codes 2 and 3 for slk_init  were  added  by  ncurses  in
-           1996.  PDCurses 2.4 added this feature in 2001.
+       o   The  format  codes  2  and  3 for slk_init were added by ncurses in
+           1996.  PDCurses 2.4 added this feature in 2001.
 
-       The function slk_attr was added by ncurses in 1996.
+       The function slk_attr was added by ncurses in 1996.
 
-       X/Open  Curses  does  not  specify a limit for the number of colors and
-       color pairs which a terminal can support.  However, in its use of short
-       for  the  parameters,  it carries over SVr4's implementation detail for
+       X/Open Curses does not specify a limit for the  number  of  colors  and
+       color pairs which a terminal can support.  However, in its use of short
+       for the parameters, it carries over SVr4's  implementation  detail  for
        the compiled terminfo database, which uses signed 16-bit numbers.  This
-       implementation  provides extended versions of those functions which use
-       int parameters, allowing applications to use larger  color-  and  pair-
+       implementation provides extended versions of those functions which  use
+       int  parameters,  allowing  applications to use larger color- and pair-
        numbers.
 
 
+

            HISTORY

            +       SVr3 introduced these functions:
+         slk_clear
+         slk_init
+         slk_label
+         slk_noutrefresh
+         slk_refresh
+         slk_restore
+         slk_set
+         slk_touch
+
+       SVr4 added these functions:
+         slk_attroff
+         slk_attron
+         slk_attrset
+         slk_start
+
+       X/Open Curses added these:
+         slk_attr_off
+         slk_attr_on
+         slk_attr_set
+         slk_color
+         slk_wset
+
+

            SEE ALSO

                    curses(3x),    curs_attr(3x),    curs_initscr(3x),    curs_refresh(3x),
-       curs_variables(3x).
+       curs_variables(3x)
 
 
 
-                                                                  curs_slk(3x)
+ncurses 6.5                       2025-01-18                      curs_slk(3x)
            diff --git a/doc/html/man/curs_sp_funcs.3x.html b/doc/html/man/curs_sp_funcs.3x.html index c726d0ba..2902cc6d 100644 --- a/doc/html/man/curs_sp_funcs.3x.html +++ b/doc/html/man/curs_sp_funcs.3x.html @@ -1,6 +1,6 @@ -curs_sp_funcs 3x +curs_sp_funcs 3x 2025-02-01 ncurses 6.5 Library calls -

            curs_sp_funcs 3x

            +

            curs_sp_funcs 3x 2025-02-01 ncurses 6.5 Library calls

            -curs_sp_funcs(3x)                                            curs_sp_funcs(3x)
+curs_sp_funcs(3x)                Library calls               curs_sp_funcs(3x)

            NAME

            -       curs_sp_funcs - curses screen-pointer extension
+       curs_sp_funcs - curses screen-pointer extension

            SYNOPSIS

                    #include <curses.h>
 
-       int alloc_pair_sp(SCREEN* sp, int fg, int bg);
-       int assume_default_colors_sp(SCREEN* sp, int fg, int bg);
-       int baudrate_sp(SCREEN* sp);
-       int beep_sp(SCREEN* sp);
-       bool can_change_color_sp(SCREEN* sp);
-       int cbreak_sp(SCREEN* sp);
-       int color_content_sp(SCREEN* sp, short color, short* r, short* g, short* b);
-       int curs_set_sp(SCREEN* sp, int visibility);
-       int def_prog_mode_sp(SCREEN* sp);
-       int def_shell_mode_sp(SCREEN* sp);
-
-       int define_key_sp(SCREEN* sp, const char * definition, int keycode);
-       int delay_output_sp(SCREEN* sp, int ms);
-       int doupdate_sp(SCREEN* sp);
-       int echo_sp(SCREEN* sp);
-       int endwin_sp(SCREEN* sp);
-       char erasechar_sp(SCREEN* sp);
-       int erasewchar_sp(SCREEN* sp, wchar_t *ch);
+       int alloc_pair_sp(SCREEN * sp, int fg, int bg);
+       int assume_default_colors_sp(SCREEN * sp, int fg, int bg);
+       int baudrate_sp(SCREEN * sp);
+       int beep_sp(SCREEN * sp);
+       bool can_change_color_sp(SCREEN * sp);
+       int cbreak_sp(SCREEN * sp);
+       int color_content_sp(SCREEN * sp, short color, short * r, short * g, short * b);
+       int curs_set_sp(SCREEN * sp, int visibility);
+       int def_prog_mode_sp(SCREEN * sp);
+       int def_shell_mode_sp(SCREEN * sp);
+
+       int define_key_sp(SCREEN * sp, const char * definition, int keycode);
+       int delay_output_sp(SCREEN * sp, int ms);
+       int doupdate_sp(SCREEN * sp);
+       int echo_sp(SCREEN * sp);
+       int endwin_sp(SCREEN * sp);
+       char erasechar_sp(SCREEN * sp);
+       int erasewchar_sp(SCREEN * sp, wchar_t *wc);
        int extended_color_content_sp(SCREEN * sp, int color, int * r, int * g, int * b);
-       int extended_pair_content_sp(SCREEN* sp, int pair, int * fg, int * bg);
-       int extended_slk_color_sp(SCREEN* sp, int pair);
-
-       void filter_sp(SCREEN* sp);
-       int find_pair_sp(SCREEN* sp, int fg, int bg);
-       int flash_sp(SCREEN* sp);
-       int flushinp_sp(SCREEN* sp);
-       int free_pair_sp(SCREEN* sp, int pair);
-       int get_escdelay_sp(SCREEN* sp);
-       int getmouse_sp(SCREEN* sp, MEVENT* event);
-       WINDOW* getwin_sp(SCREEN* sp, FILE* filep);
-       int halfdelay_sp(SCREEN* sp, int tenths);
-       bool has_colors_sp(SCREEN* sp);
-
-       bool has_ic_sp(SCREEN* sp);
-       bool has_il_sp(SCREEN* sp);
-       int has_key_sp(SCREEN* sp, int ch);
-       bool has_mouse_sp(SCREEN* sp);
-       int init_color_sp(SCREEN* sp, short color, short r, short g, short b);
-       int init_extended_color_sp(SCREEN* sp, int color, int r, int g, int b);
-       int init_extended_pair_sp(SCREEN* sp, int pair, int fg, int bg);
-       int init_pair_sp(SCREEN* sp, short pair, short fg, short bg);
-       int intrflush_sp(SCREEN* sp, WINDOW* win, bool bf);
-       bool is_term_resized_sp(SCREEN* sp, int lines, int columns);
-
-       bool isendwin_sp(SCREEN* sp);
-       int key_defined_sp(SCREEN* sp, const char *definition);
-       char* keybound_sp(SCREEN* sp, int keycode, int count);
-       NCURSES_CONST char * keyname_sp(SCREEN* sp, int c);
-       int keyok_sp(SCREEN* sp, int keycode, bool enable);
-       char killchar_sp(SCREEN* sp);
-       int killwchar_sp(SCREEN* sp, wchar_t *ch);
-       char* longname_sp(SCREEN* sp);
-       int mcprint_sp(SCREEN* sp, char *data, int len);
-       int mouseinterval_sp(SCREEN* sp, int erval);
-
-       mmask_t mousemask_sp(SCREEN* sp, mmask_t newmask, mmask_t *oldmask);
-       int mvcur_sp(SCREEN* sp, int oldrow, int oldcol, int newrow, int newcol);
-       int napms_sp(SCREEN* sp, int ms);
-       WINDOW* newpad_sp(SCREEN* sp, int nrows, int ncols);
-       SCREEN* new_prescr(void);
-       SCREEN* newterm_sp(SCREEN* sp, const char *type, FILE *outfd, FILE *infd);
-       WINDOW* newwin_sp(SCREEN* sp, int nlines, int ncols, int begin_y, int begin_x);
-       int nl_sp(SCREEN* sp);
-       int nocbreak_sp(SCREEN* sp);
-       int noecho_sp(SCREEN* sp);
-
-       void nofilter_sp(SCREEN* sp);
-       int nonl_sp(SCREEN* sp);
-       void noqiflush_sp(SCREEN* sp);
-       int noraw_sp(SCREEN* sp);
-       int pair_content_sp(SCREEN* sp, short pair, short* fg, short* bg);
-       void qiflush_sp(SCREEN* sp);
-       int raw_sp(SCREEN* sp);
-       int reset_prog_mode_sp(SCREEN* sp);
-       void reset_color_pairs_sp(SCREEN* sp);
-       int reset_shell_mode_sp(SCREEN* sp);
-
-       int resetty_sp(SCREEN* sp);
-       int resize_term_sp(SCREEN* sp, int lines, int columns);
-       int resizeterm_sp(SCREEN* sp, int lines, int columns);
-       int ripoffline_sp(SCREEN* sp, int line, int (*init)(WINDOW* win, int fmt));
-       int savetty_sp(SCREEN* sp);
-       int scr_init_sp(SCREEN* sp, const char *filename);
-       int scr_restore_sp(SCREEN* sp, const char *filename);
-       int scr_set_sp(SCREEN* sp, const char *filename);
-       int set_escdelay_sp(SCREEN* sp, int ms);
-       int set_tabsize_sp(SCREEN* sp, int cols);
-
-       int slk_attr_set_sp(SCREEN* sp, const attr_t attrs, short pair, void*opts);
-       int slk_attrset_sp(SCREEN* sp, const chtype a);
-       int slk_attroff_sp(SCREEN* sp, const chtype a);
-       int slk_attron_sp(SCREEN* sp, const chtype a);
-       attr_t slk_attr_sp(SCREEN* sp);
-       int slk_clear_sp(SCREEN* sp);
-       int slk_color_sp(SCREEN* sp, short pair);
-       int slk_init_sp(SCREEN* sp, int fmt);
-       char* slk_label_sp(SCREEN* sp, int labnum);
-       int slk_noutrefresh_sp(SCREEN* sp);
-
-       int slk_refresh_sp(SCREEN* sp);
-       int slk_restore_sp(SCREEN* sp);
-       int slk_set_sp(SCREEN* sp, int labnum, const char * label, int fmt);
-       int slk_touch_sp(SCREEN* sp);
-       int start_color_sp(SCREEN* sp);
-       attr_t term_attrs_sp(SCREEN* sp);
-       chtype termattrs_sp(SCREEN* sp);
-       char* termname_sp(SCREEN* sp);
-       int typeahead_sp(SCREEN* sp, int fd);
-       int unget_wch_sp(SCREEN* sp, const wchar_t wch);
-
-       int ungetch_sp(SCREEN* sp, int ch);
-       int ungetmouse_sp(SCREEN* sp,MEVENT * event);
-       int use_default_colors_sp(SCREEN* sp);
-       void use_env_sp(SCREEN* sp, bool bf);
-       int use_legacy_coding_sp(SCREEN* sp, int level);
+       int extended_pair_content_sp(SCREEN * sp, int pair, int * fg, int * bg);
+       int extended_slk_color_sp(SCREEN * sp, int pair);
+
+       void filter_sp(SCREEN * sp);
+       int find_pair_sp(SCREEN * sp, int fg, int bg);
+       int flash_sp(SCREEN * sp);
+       int flushinp_sp(SCREEN * sp);
+       int free_pair_sp(SCREEN * sp, int pair);
+       int get_escdelay_sp(SCREEN * sp);
+       int getmouse_sp(SCREEN * sp, MEVENT * event);
+       WINDOW * getwin_sp(SCREEN * sp, FILE * filep);
+       int halfdelay_sp(SCREEN * sp, int tenths);
+       bool has_colors_sp(SCREEN * sp);
+
+       bool has_ic_sp(SCREEN * sp);
+       bool has_il_sp(SCREEN * sp);
+       int has_key_sp(SCREEN * sp, int c);
+       bool has_mouse_sp(SCREEN * sp);
+       int init_color_sp(SCREEN * sp, short color, short r, short g, short b);
+       int init_extended_color_sp(SCREEN * sp, int color, int r, int g, int b);
+       int init_extended_pair_sp(SCREEN * sp, int pair, int fg, int bg);
+       int init_pair_sp(SCREEN * sp, short pair, short fg, short bg);
+       int intrflush_sp(SCREEN * sp, WINDOW * win, bool bf);
+       int is_cbreak_sp(SCREEN * sp);
+
+       int is_echo_sp(SCREEN * sp);
+       int is_nl_sp(SCREEN * sp);
+       int is_raw_sp(SCREEN * sp);
+       bool is_term_resized_sp(SCREEN * sp, int lines, int columns);
+       bool isendwin_sp(SCREEN * sp);
+       int key_defined_sp(SCREEN * sp, const char *definition);
+       char * keybound_sp(SCREEN * sp, int keycode, int count);
+       NCURSES_CONST char * keyname_sp(SCREEN * sp, int c);
+       int keyok_sp(SCREEN * sp, int keycode, bool enable);
+       char killchar_sp(SCREEN * sp);
+
+       int killwchar_sp(SCREEN * sp, wchar_t *wc);
+       char * longname_sp(SCREEN * sp);
+       int mcprint_sp(SCREEN * sp, char *data, int len);
+       int mouseinterval_sp(SCREEN * sp, int erval);
+       mmask_t mousemask_sp(SCREEN * sp, mmask_t newmask, mmask_t *oldmask);
+       int mvcur_sp(SCREEN * sp, int oldrow, int oldcol, int newrow, int newcol);
+       int napms_sp(SCREEN * sp, int ms);
+       WINDOW * newpad_sp(SCREEN * sp, int nrows, int ncols);
+       SCREEN * new_prescr(void);
+       SCREEN * newterm_sp(SCREEN * sp, const char *type, FILE *outf, FILE *inf);
+
+       WINDOW * newwin_sp(SCREEN * sp, int nlines, int ncols, int begin_y, int begin_x);
+       int nl_sp(SCREEN * sp);
+       int nocbreak_sp(SCREEN * sp);
+       int noecho_sp(SCREEN * sp);
+       void nofilter_sp(SCREEN * sp);
+       int nonl_sp(SCREEN * sp);
+       void noqiflush_sp(SCREEN * sp);
+       int noraw_sp(SCREEN * sp);
+       int pair_content_sp(SCREEN * sp, short pair, short * fg, short * bg);
+       void qiflush_sp(SCREEN * sp);
+
+       int raw_sp(SCREEN * sp);
+       void reset_color_pairs_sp(SCREEN * sp);
+       int reset_prog_mode_sp(SCREEN * sp);
+       int reset_shell_mode_sp(SCREEN * sp);
+       int resetty_sp(SCREEN * sp);
+       int resize_term_sp(SCREEN * sp, int lines, int columns);
+       int resizeterm_sp(SCREEN * sp, int lines, int columns);
+       int ripoffline_sp(SCREEN * sp, int line, int (*init)(WINDOW * win, int fmt));
+       int savetty_sp(SCREEN * sp);
+       int scr_init_sp(SCREEN * sp, const char *filename);
+
+       int scr_restore_sp(SCREEN * sp, const char *filename);
+       int scr_set_sp(SCREEN * sp, const char *filename);
+       int set_escdelay_sp(SCREEN * sp, int ms);
+       int set_tabsize_sp(SCREEN * sp, int cols);
+       int slk_attrset_sp(SCREEN * sp, const chtype a);
+       int slk_attr_set_sp(SCREEN * sp, const attr_t attrs, short pair, void *opts);
+       int slk_attroff_sp(SCREEN * sp, const chtype a);
+       int slk_attron_sp(SCREEN * sp, const chtype a);
+       attr_t slk_attr_sp(SCREEN * sp);
+       int slk_clear_sp(SCREEN * sp);
+
+       int slk_color_sp(SCREEN * sp, short pair);
+       int slk_init_sp(SCREEN * sp, int fmt);
+       char * slk_label_sp(SCREEN * sp, int labnum);
+       int slk_noutrefresh_sp(SCREEN * sp);
+       int slk_refresh_sp(SCREEN * sp);
+       int slk_restore_sp(SCREEN * sp);
+       int slk_set_sp(SCREEN * sp, int labnum, const char * label, int fmt);
+       int slk_touch_sp(SCREEN * sp);
+       int start_color_sp(SCREEN * sp);
+       attr_t term_attrs_sp(SCREEN * sp);
+
+       chtype termattrs_sp(SCREEN * sp);
+       char * termname_sp(SCREEN * sp);
+       int typeahead_sp(SCREEN * sp, int fd);
+       int unget_wch_sp(SCREEN * sp, const wchar_t wc);
+       int ungetch_sp(SCREEN * sp, int c);
+       int ungetmouse_sp(SCREEN * sp, MEVENT * event);
+       int use_default_colors_sp(SCREEN * sp);
+       void use_env_sp(SCREEN * sp, bool bf);
+       int use_legacy_coding_sp(SCREEN * sp, int level);
        void use_tioctl_sp(SCREEN *sp, bool bf);
-       int vid_attr_sp(SCREEN* sp, attr_t attrs, short pair, void * opts);
-       int vid_puts_sp(SCREEN* sp, attr_t attrs, short pair, void * opts, NCURSES_SP_OUTC putc);
-       int vidattr_sp(SCREEN* sp, chtype attrs);
-       int vidputs_sp(SCREEN* sp, chtype attrs, NCURSES_SP_OUTC putc);
-       wchar_t* wunctrl_sp(SCREEN* sp, cchar_t *ch);
+
+       int vid_attr_sp(SCREEN * sp, attr_t attrs, short pair, void * opts);
+       int vid_puts_sp(SCREEN * sp, attr_t attrs, short pair, void * opts, NCURSES_SP_OUTC putc);
+       int vidattr_sp(SCREEN * sp, chtype attrs);
+       int vidputs_sp(SCREEN * sp, chtype attrs, NCURSES_SP_OUTC putc);
+       wchar_t * wunctrl_sp(SCREEN * sp, cchar_t *wch);
 
        #include <form.h>
 
-       FORM* new_form_sp(SCREEN* sp, FIELD **fields);
+       FORM * new_form_sp(SCREEN * sp, FIELD **fields);
 
        #include <menu.h>
 
-       MENU* new_menu_sp(SCREEN* sp, ITEM **items);
+       MENU * new_menu_sp(SCREEN * sp, ITEM **items);
 
        #include <panel.h>
 
-       PANEL* ceiling_panel(SCREEN* sp);
-       PANEL* ground_panel(SCREEN* sp);
-       void update_panels_sp(SCREEN* sp);
+       PANEL * ceiling_panel(SCREEN * sp);
+       PANEL * ground_panel(SCREEN * sp);
+       void update_panels_sp(SCREEN * sp);
 
        #include <term.h>
 
-       int del_curterm_sp(SCREEN* sp, TERMINAL *oterm);
-       int putp_sp(SCREEN* sp, const char *str);
-       int restartterm_sp(SCREEN* sp, NCURSES_CONST char*term, int filedes, int *errret);
-       TERMINAL* set_curterm_sp(SCREEN* sp, TERMINAL*nterm);
-       int tgetent_sp(SCREEN* sp, char *bp, const char *name);
-       int tgetflag_sp(SCREEN* sp, const char *capname);
-       int tgetnum_sp(SCREEN* sp, const char *capname);
-       char* tgetstr_sp(SCREEN* sp, const char *capname, char **area);
-       char* tgoto_sp(SCREEN* sp, const char *capname, int col, int row);
-       int tigetflag_sp(SCREEN* sp, const char *capname);
-       int tigetnum_sp(SCREEN* sp, const char *capname);
-       char* tigetstr_sp(SCREEN* sp, const char *capname);
-       /* may instead use 9 long parameters */
-       char* tparm_sp(SCREEN* sp, const char *str, ...);
-       int tputs_sp(SCREEN* sp, const char *str, int affcnt, NCURSES_SP_OUTC putc);
+       int del_curterm_sp(SCREEN * sp, TERMINAL *oterm);
+       int putp_sp(SCREEN * sp, const char *str);
+       int restartterm_sp(SCREEN * sp, NCURSES_CONST char *term, int filedes, int *errret);
+       TERMINAL * set_curterm_sp(SCREEN * sp, TERMINAL *nterm);
+       int tgetent_sp(SCREEN * sp, char *bp, const char *name);
+       int tgetflag_sp(SCREEN * sp, const char *capname);
+       int tgetnum_sp(SCREEN * sp, const char *capname);
+       char * tgetstr_sp(SCREEN * sp, const char *capname, char **area);
+       char * tgoto_sp(SCREEN * sp, const char *capname, int col, int row);
+       int tigetflag_sp(SCREEN * sp, const char *capname);
+
+       int tigetnum_sp(SCREEN * sp, const char *capname);
+       char * tigetstr_sp(SCREEN * sp, const char *capname);
+       /* tparm_sp may use 9 long parameters rather than being variadic */
+       char * tparm_sp(SCREEN * sp, const char *str, ...);
+       int tputs_sp(SCREEN * sp, const char *str, int affcnt, NCURSES_SP_OUTC putc);
 
        #include <unctrl.h>
 
-       NCURSES_CONST char* unctrl_sp(SCREEN* sp, chtype c);
+       NCURSES_CONST char * unctrl_sp(SCREEN * sp, chtype ch);

            DESCRIPTION

                    This  implementation  can  be  configured to provide a set of functions
        which improve the ability to manage multiple screens.  This feature can
-       be added to any of the configurations supported by ncurses; it adds new
-       entrypoints without changing the meaning of any of the existing ones.
+       be added to any of the configurations supported by ncurses; it adds new
+       symbols without changing the meaning of any of the existing ones.
 
 
-

            IMPROVED FUNCTIONS

            -       Most of the functions are new versions of existing functions.  A param-
-       eter  is  added  at  the  front  of the parameter list.  It is a SCREEN
+

            Improved Functions

            +       Most of the functions  are  new  versions  of  existing  functions.   A
+       parameter  is added at the front of the parameter list.  It is a SCREEN
        pointer.
 
        The existing functions all use the current screen, which  is  a  static
-       variable.  The extended functions use the specified screen, thereby re-
-       ducing the number of variables which must be modified to update  multi-
-       ple screens.
+       variable.   The  extended  functions  use the specified screen, thereby
+       reducing the number of variables  which  must  be  modified  to  update
+       multiple screens.
 
 
-

            NEW FUNCTIONS

            +

            New Functions

                    Here are the new functions:
 
        ceiling_panel
@@ -248,8 +251,8 @@ 
            curs_sp_funcs 3x
            
             With  the  screen-pointer extension, there are situations where it
             must create a current screen before the unextended  library  does.
             The  new_prescr function is used internally to handle these cases.
-            It is also provided as an entrypoint to allow applications to cus-
-            tomize the library initialization.
+            It is also provided to allow  applications  to  customize  library
+            initialization.

            NOTES

            @@ -262,35 +265,36 @@ 
            curs_sp_funcs 3x
            
 
        NCURSES_SP_NAME
             The new functions are named using the macro NCURSES_SP_NAME, which
-            hides the actual implementation.  Currently this adds a "_sp" suf-
-            fix  to the name of the unextended function.  This manual page in-
-            dexes the extensions showing the full name.   However  the  proper
-            usage of these functions uses the macro, to provide for the possi-
-            bility of changing the naming convention for specific library con-
-            figurations.
+            hides the actual implementation.   Currently  this  adds  a  "_sp"
+            suffix  to  the name of the unextended function.  This manual page
+            indexes the extensions showing the full name.  However the  proper
+            usage  of  these  functions  uses  the  macro,  to provide for the
+            possibility of changing the naming convention for specific library
+            configurations.
 
        NCURSES_SP_OUTC
             This  is  a new function-pointer type to use in the screen-pointer
             functions where an NCURSES_OUTC is used in the unextended library.
 
        NCURSES_OUTC
-            This is a function-pointer type used for the cases where  a  func-
-            tion passes characters to the output stream, e.g., vidputs(3x).
+            This is a  function-pointer  type  used  for  the  cases  where  a
+            function   passes   characters   to   the   output  stream,  e.g.,
+            vidputs(3x).

            PORTABILITY

            -       These  routines  are  specific  to ncurses.  They were not supported on
+       These routines are specific to ncurses.  They  were  not  supported  on
        Version 7, BSD or System V implementations.  It is recommended that any
-       code  depending  on  ncurses  extensions  be  conditioned  using NCURS-
-       ES_SP_FUNCS.
+       code   depending   on   ncurses   extensions   be   conditioned   using
+       NCURSES_SP_FUNCS.

            SEE ALSO

            -       curses(3x), curs_opaque(3x), curs_threads(3x).
+       curses(3x), curs_opaque(3x), curs_threads(3x)
 
 
 
-                                                             curs_sp_funcs(3x)
+ncurses 6.5                       2025-02-01                 curs_sp_funcs(3x)
              @@ -298,8 +302,8 @@

              curs_sp_funcs 3x

            • SYNOPSIS
            • DESCRIPTION
            • NOTES
              • diff --git a/doc/html/man/curs_termattrs.3x.html b/doc/html/man/curs_termattrs.3x.html index 324373c3..f6401770 100644 --- a/doc/html/man/curs_termattrs.3x.html +++ b/doc/html/man/curs_termattrs.3x.html @@ -1,6 +1,6 @@ -curs_termattrs 3x +curs_termattrs 3x 2025-02-01 ncurses 6.5 Library calls -

              curs_termattrs 3x

              +

              curs_termattrs 3x 2025-02-01 ncurses 6.5 Library calls

              -curs_termattrs(3x)                                          curs_termattrs(3x)
+curs_termattrs(3x)               Library calls              curs_termattrs(3x)

              NAME

                      baudrate,  erasechar,  erasewchar, has_ic, has_il, killchar, killwchar,
-       longname, term_attrs, termattrs, termname -  curses  environment  query
-       routines
+       longname, term_attrs,  termattrs,  termname  -  get  and  set  terminal
+       attributes with curses

              SYNOPSIS

              @@ -57,91 +57,107 @@ 
              curs_termattrs 3x
              
 
        int baudrate(void);
        char erasechar(void);
-       int erasewchar(wchar_t *ch);
+       int erasewchar(wchar_t * wc);
        bool has_ic(void);
        bool has_il(void);
        char killchar(void);
-       int killwchar(wchar_t *ch);
-       char *longname(void);
+       int killwchar(wchar_t * wc);
+       char * longname(void);
        attr_t term_attrs(void);
        chtype termattrs(void);
-       char *termname(void);
+       char * termname(void);

              DESCRIPTION

              baudrate

              -       The  baudrate  routine  returns  the output speed of the terminal.  The
-       number returned is in bits per second, for  example  9600,  and  is  an
-       integer.
+       baudrate  returns  the  line  speed  of  the terminal, an integer value
+       measured in bits per second, for example 9600.
 
 
-

              erasechar, erasewchar

              -       The erasechar routine returns the user's current erase character.
+

              erasechar, erasewchar

              +       erasechar returns the terminal's erase character.
 
-       The  erasewchar  routine  stores  the  current  erase  character in the
-       location referenced by ch.  If no erase character has been defined, the
-       routine fails and the location referenced by ch is not changed.
+       erasewchar stores the erase character in the location referenced by wc.
+       If  no  erase  character  has  been  defined, it fails and the location
+       referenced by wc is not changed.
 
 
-

              has_is, has_il

              -       The  has_ic  routine  is  true  if the terminal has insert- and delete-
-       character capabilities.
+

              has_ic, has_il

              +       has_ic returns TRUE if the terminal has  insert-  and  delete-character
+       capabilities.
 
-       The has_il routine is true if the terminal has insert- and  delete-line
-       capabilities, or can simulate them using scrolling regions.  This might
-       be used to determine if it would be appropriate  to  turn  on  physical
-       scrolling using scrollok(3x).
+       has_il  returns  TRUE  if  the  terminal  has  insert-  and delete-line
+       capabilities, or can simulate them using scrolling regions.   It  might
+       be   used   to  determine  whether  it  would  be  appropriate  to  use
+       scrollok(3x) to turn on scrolling.
 
 
-

              killchar, killwchar

              -       The killchar routine returns the user's current line kill character.
+

              killchar, killwchar

              +       killchar returns the terminal's line kill character.
 
-       The  killwchar  routine  stores  the current line-kill character in the
-       location referenced by ch.  If no line-kill character has been defined,
-       the routine fails and the location referenced by ch is not changed.
+       killwchar stores the line-kill character in the location referenced  by
+       wc.   If  no  line-kill  character  has  been defined, it fails and the
+       location referenced by wc is not changed.

              longname

              -       The  longname  routine  returns a pointer to a static area containing a
-       verbose description of the current terminal.  The maximum length  of  a
-       verbose  description  is  128 characters.  It is defined only after the
-       call to initscr or newterm.  The area is overwritten by  each  call  to
-       newterm  and  is not restored by set_term, so the value should be saved
-       between calls to newterm if longname is going to be used with  multiple
-       terminals.
+       longname returns a pointer  to  static  storage  containing  a  verbose
+       description  of  the  terminal  being  managed  by curses.  The maximum
+       length of a verbose description is  128  characters.   The  storage  is
+       populated  only  after  initscr(3x)  or  newterm(3x)  is  called.  This
+       storage is overwritten by each call to  newterm  and  not  restored  by
+       set_term(3x),  so its contents should be saved between calls to initscr
+       or newterm if longname is to be used with multiple terminals.
 
 
-

              termattrs, term_attrs

              -       If  a  given  terminal  does  not  support  a  video  attribute that an
-       application program is trying to use, curses may substitute a different
-       video  attribute for it.  The termattrs and term_attrs functions return
-       a logical OR of all video attributes supported by the terminal using A_
-       and  WA_  constants  respectively.   This  information is useful when a
-       curses program needs  complete  control  over  the  appearance  of  the
-       screen.
+

              termattrs, term_attrs

              +       If a given  terminal  does  not  support  a  video  attribute  that  an
+       application program is trying to use, curses may substitute a different
+       video attribute for it.  termattrs and term_attrs return a logical "or"
+       of  all  video  attributes  supported  by the terminal using A_ and WA_
+       constants respectively.  This  information  is  useful  when  a  curses
+       program needs complete control over the appearance of the screen.

              termname

              -       The termname routine returns the terminal name used by setupterm.
+       termname returns the terminal name used by setupterm(3x).

              RETURN VALUE

              -       longname and termname return NULL on error.
+       longname and termname return NULL on error.
 
-       Routines  that  return  an integer return ERR upon failure and OK (SVr4
-       only specifies "an integer  value  other  than  ERR")  upon  successful
-       completion.
+       Functions  that  return  an integer return ERR upon failure and OK upon
+       success.

              NOTES

              -       Note that termattrs may be a macro.
+       erasewchar, killwchar, and  term_attrs  are  part  of  ncurses's  wide-
+       character API, and are not available in its non-wide configuration.
+
+       termattrs may be implemented as a macro.

              PORTABILITY

              -       The XSI Curses standard, Issue 4 describes these functions.  It changes
-       the return type of termattrs to the new type attr_t.  Most versions  of
-       curses truncate the result returned by termname to 14 characters.
+       X/Open Curses Issue 4 describes these functions.
+
+       SVr4  describes  a  successful  return  value only as "an integer value
+       other than ERR".
+
+       Most versions of curses truncate the string returned by termname to  14
+       characters.
+
+
+

              HISTORY

              +       4BSD (1980) introduced longname.
+
+       SVr2 (1984) added baudrate, erasechar, killchar, has_ic, and has_il.
+
+       SVr3  (1987)  supplied  termname.   Later  that  year,  SVr3.1  brought
+       termattrs.
+
+       X/Open Curses  Issue 4  (1995)  specified  erasewchar,  killwchar,  and
+       term_attrs.

              SEE ALSO

              @@ -149,7 +165,7 @@ 
              curs_termattrs 3x
              
 
 
 
-                                                            curs_termattrs(3x)
+ncurses 6.5                       2025-02-01                curs_termattrs(3x)
              diff --git a/doc/html/man/curs_termcap.3x.html b/doc/html/man/curs_termcap.3x.html index 9cd555ec..08336855 100644 --- a/doc/html/man/curs_termcap.3x.html +++ b/doc/html/man/curs_termcap.3x.html @@ -1,6 +1,6 @@ -curs_termcap 3x +curs_termcap 3x 2025-02-01 ncurses 6.5 Library calls -

              curs_termcap 3x

              +

              curs_termcap 3x 2025-02-01 ncurses 6.5 Library calls

              -curs_termcap(3x)                                              curs_termcap(3x)
+curs_termcap(3x)                 Library calls                curs_termcap(3x)

              NAME

                      PC, UP, BC, ospeed, tgetent, tgetflag, tgetnum, tgetstr, tgoto, tputs -
-       curses emulation of termcap
+       curses emulation of termcap

              SYNOPSIS

                      #include <curses.h>
        #include <term.h>
 
-       extern char PC;
-       extern char * UP;
-       extern char * BC;
-       extern short ospeed;
+       char PC;
+       char * UP;
+       char * BC;
+       short ospeed;
 
-       int tgetent(char *bp, const char *name);
-       int tgetflag(const char *id);
-       int tgetnum(const char *id);
-       char *tgetstr(const char *id, char **area);
-       char *tgoto(const char *cap, int col, int row);
-       int tputs(const char *str, int affcnt, int (*putc)(int));
+       int tgetent(char * bp, const char * name);
+       int tgetflag(const char * id);
+       int tgetnum(const char * id);
+       char * tgetstr(const char * id, char ** sbuf);
+       char * tgoto(const char * cap, int col, int row);
+       int tputs(const char * str, int affcnt, int (* putc)(int));

              DESCRIPTION

              -       These routines are included as a conversion aid for programs  that  use
-       the  termcap  library.  Their parameters are the same, but the routines
-       are emulated using the terminfo database.  Thus, they can only be  used
-       to  query  the  capabilities  of entries for which a terminfo entry has
-       been compiled.
+       ncurses  provides  the  foregoing  variables   and   functions   as   a
+       compatibility layer for programs that use the termcap library.  The API
+       is the same, but behavior is  emulated  using  the  terminfo  database.
+       Thus,  it  can  be  used  only  to  query  the capabilities of terminal
+       database entries for which a terminfo entry has been compiled.

              Initialization

              -       The tgetent routine loads the entry for name.  It returns:
+       tgetent loads the terminal database entry for name; see term(7).   This
+       must be done before calling any of the other functions.  It returns
 
-          1  on success,
+          1    on success,
 
-          0  if there is no such entry (or that it is a generic  type,  having
-             too little information for curses applications to run), and
+          0    if there is no such entry (or if the matching entry describes a
+               generic terminal, having  too  little  information  for  curses
+               applications to run), and
 
-          -1 if the terminfo database could not be found.
+          -1   if the terminfo database could not be found.
 
-       This differs from the termcap library in two ways:
+       This implementation differs from those of historical termcap libraries.
 
-          o   The  emulation  ignores  the buffer pointer bp.  The termcap li-
-              brary would store a copy of the terminal description in the area
-              referenced  by this pointer.  However, ncurses stores its termi-
-              nal descriptions in compiled binary form, which is not the  same
-              thing.
+       o   ncurses  ignores  the  buffer  pointer  bp,  as  do  other  termcap
+           implementations  conforming  to  portions  of  X/Open  Curses   now
+           withdrawn.   The  BSD  termcap  library  would  store a copy of the
+           terminal type description in the buffer referenced by this pointer.
+           terminfo  stores terminal type descriptions in compiled form, which
+           is not the same thing.
 
-          o   There is a difference in return codes.  The termcap library does
-              not check if the terminal description is marked with the generic
-              capability,  or  if the terminal description has cursor-address-
-              ing.
+       o   The meanings of the return values differ.  The BSD termcap  library
+           does  not  check whether the terminal type description includes the
+           generic (gn) capability, nor whether the terminal type  description
+           supports an addressable cursor, a property essential for any curses
+           implementation to operate.
 
 
-

              Capability Values

              -       The tgetflag routine gets the boolean entry for id, or zero  if  it  is
-       not available.
-
-       The  tgetnum  routine gets the numeric entry for id, or -1 if it is not
+

              Retrieving Capability Values

              +       tgetflag reports the Boolean entry  for  id,  or  zero  if  it  is  not
        available.
 
-       The tgetstr routine returns the string entry for id, or zero if  it  is
-       not  available.  Use tputs to output the returned string.  The area pa-
-       rameter is used as follows:
+       tgetnum obtains the numeric entry for id, or -1 if it is not available.
+
+       tgetstr  returns  the  string  entry  for  id,  or  NULL  if  it is not
+       available.   Use  tputs  to  output  the  string  returned.   The  sbuf
+       parameter is used as follows.
 
-          o   It is assumed to be the address of a pointer to a buffer managed
-              by the calling application.
+       o   It is assumed to be the address of a pointer to a buffer managed by
+           the calling application.
 
-          o   However, ncurses checks to ensure that area is not NULL, and al-
-              so that the resulting buffer pointer is  not  NULL.   If  either
-              check fails, the area parameter is ignored.
+       o   However, ncurses checks to ensure that sbuf is not NULL,  and  that
+           the  pointer  obtained  by dereferencing sbuf is also not NULL.  If
+           either check fails, ncurses ignores sbuf.
 
-          o   If  the  checks succeed, ncurses also copies the return value to
-              the buffer pointed to by area, and the area value will be updat-
-              ed to point past the null ending this value.
+       o   If the checks succeed, ncurses also copies the return value to  the
+           buffer  pointed  to  by sbuf, and the library updates sbuf to point
+           past the null character terminating this value.
 
-          o   The  return  value itself is an address in the terminal descrip-
-              tion which is loaded into memory.
+       o   The return  value  itself  is  an  address  in  the  terminal  type
+           description loaded into memory.
 
-       Only the first two characters of the id parameter of tgetflag,  tgetnum
-       and tgetstr are compared in lookups.
 
+

              Applying String Capabilities

              +       String capabilities can be parameterized; see subsection "Parameterized
+       Strings" in  terminfo(5).  tgoto applies its second and third arguments
+       to  the  parametric  placeholders in the capability stored in the first
+       argument.
 
-

              Formatting Capabilities

              -       The tgoto routine expands the given capability using the parameters.
+       o   The capability may contain padding specifications;  see  subsection
+           "Delays  and  Padding"  of terminfo(5).  The output of tgoto should
+           thus be passed to tputs rather than some other output function such
+           as printf(3).
 
-       o   Because  the  capability may have padding characters, the output of
-           tgoto should be passed to tputs rather than some other output func-
-           tion such as printf(3).
+       o   While  tgoto  is  assumed  to  be used for the two-parameter cursor
+           positioning  capability,  termcap  applications  also  use  it  for
+           single-parameter capabilities.
 
-       o   While  tgoto is assumed to be used for the two-parameter cursor po-
-           sitioning capability, termcap applications also use it for  single-
-           parameter capabilities.
+           Doing  so  reveals  a  quirk  in tgoto: most hardware terminals use
+           cursor addressing with row first, but the  original  developers  of
+           the  termcap  interface  chose  to  put  the col (column) parameter
+           first.  The tgoto function swaps the order of its  parameters.   It
+           does  this  even  for  calls requiring only a single parameter.  In
+           that case, the first parameter is merely a placeholder.
 
-           Doing this shows a quirk in tgoto: most hardware terminals use cur-
-           sor addressing with row first, but the original developers  of  the
-           termcap  interface  chose  to  put the column parameter first.  The
-           tgoto function swaps the order of parameters.  It  does  this  also
-           for  calls  requiring  only  a single parameter.  In that case, the
-           first parameter is merely a placeholder.
+       o   Normally the ncurses  library  is  compiled  without  full  termcap
+           support.  In that case, tgoto uses an internal version of tparm(3x)
+           (a more capable function).
 
-       o   Normally the ncurses library is compiled with terminfo support.  In
-           that case, tgoto uses tparm(3x) (a more capable formatter).
+           Because it uses tparm internally, tgoto is able to use  some  term-
+           info  features, but not all.  In particular, it allows only numeric
+           parameters; tparm supports string parameters.
 
-           However,  tparm  is not a termcap feature, and portable termcap ap-
-           plications should not rely upon its availability.
+           However, tparm is not  a  termcap  feature,  and  portable  termcap
+           applications should not rely upon its availability.
 
-       The tputs routine is described on the  curs_terminfo(3x)  manual  page.
-       It can retrieve capabilities by either termcap or terminfo name.
+       tputs  is described in curs_terminfo(3x).  It can retrieve capabilities
+       by either termcap or terminfo code.

              Global Variables

              -       The  variables PC, UP and BC are set by tgetent to the terminfo entry's
-       data for pad_char, cursor_up and backspace_if_not_bs, respectively.  UP
-       is  not used by ncurses.  PC is used in the tdelay_output function.  BC
-       is used in the tgoto emulation.  The variable ospeed is set by  ncurses
-       in a system-specific coding to reflect the terminal speed.
+       tgetent sets the variables PC, UP, and BC to the terminfo entry's  data
+       for  pad_char  (pad), cursor_up (cuu1), and backspace_if_not_bs (OTbs),
+       respectively.    ncurses   does    not    employ    cuu1    internally.
+       delay_output(3x)  uses  pad,  while  tgoto  emulation uses the obsolete
+       termcap capability bs,  represented  in  ncurses  terminfo  as  "OTbs".
+       ncurses  assigns  the variable ospeed a system-specific value to encode
+       the terminal's data rate.

              Releasing Memory

              -       The  termcap  functions  provide  no  means for freeing memory, because
-       legacy termcap implementations used only the buffer areas  provided  by
-       the  caller  via tgetent and tgetstr.  Those buffers are unused in ter-
-       minfo.
-
-       On the other hand, terminfo allocates memory.  It uses setupterm to re-
-       trieve the data used by tgetent and the functions which return capabil-
-       ity values such as tgetstr.  One could use
-
-            del_curterm(cur_term);
-
-
+       The termcap functions provide  no  means  of  freeing  memory,  because
+       legacy  termcap  implementations  used only the storage provided by the
+       caller via tgetent and tgetstr.  Those buffers are unused in terminfo.
+
+       By contrast, terminfo  allocates  memory.   It  uses  setupterm(3x)  to
+       obtain  the  data  used  by  tgetent  and  the  functions that retrieve
+       capability values.  One could use
+              del_curterm(cur_term);
        to free this memory, but  there  is  an  additional  complication  with
-       ncurses.   It uses a fixed-size pool of storage locations, one per set-
-       ting of the TERM variable when tgetent is called.  The  screen(1)  pro-
-       gram relies upon this arrangement, to improve its performance.
+       ncurses.  It uses a fixed-size pool of storage locations, one per value
+       of the terminal name parameter given to tgetent.  The screen(1) program
+       relies upon this arrangement to improve its performance.
 
-       An  application  which  uses only the low-level termcap functions could
-       free the memory using del_curterm, because the pool is freed using oth-
-       er functions (see curs_memleaks(3x)).
+       An  application  that  uses only the termcap functions, not the higher-
+       level curses API,  could  release  the  memory  using  del_curterm(3x),
+       because the pool is freed using other functions; see curs_memleaks(3x).

              RETURN VALUE

              -       Except  where  explicitly noted, routines that return an integer return
-       ERR upon failure and OK (SVr4 only specifies "an  integer  value  other
-       than ERR") upon successful completion.
+       The  return  values  of  tgetent,  tgetflag,  tgetname, and tgetstr are
+       documented above.
 
-       Routines that return pointers return NULL on error.
+       tgoto returns NULL on error.  Error conditions include:
 
+       o   uninitialized state (tgetent was not called successfully),
 
-

              BUGS

              -       If  you  call tgetstr to fetch ca or any other parameterized string, be
-       aware that it will be returned in terminfo notation, not the older  and
-       not-quite-compatible termcap notation.  This will not cause problems if
-       all you do with it is call tgoto or tparm, which both expand  terminfo-
-       style  strings as terminfo.  (The tgoto function, if configured to sup-
-       port termcap, will check if the  string  is  indeed  terminfo-style  by
-       looking  for  "%p"  parameters or "$<..>" delays, and invoke a termcap-
-       style parser if the string does not appear to be terminfo).
+       o   cap being a null pointer,
 
-       Because terminfo conventions for representing padding in  string  capa-
-       bilities differ from termcap's, users can be surprised:
+       o   cap referring to a canceled capability,
 
-       o   tputs("50") in a terminfo system will put out a literal "50" rather
-           than busy-waiting for 50 milliseconds.
+       o   cap being a  capability  with  string-valued  parameters  (a  term-
+           info-only feature), and
 
-       o   However, if ncurses is configured to support termcap, it  may  also
-           have been configured to support the BSD-style padding.
+       o   cap being a capability with more than two parameters.
 
-           In that case, tputs inspects strings passed to it, looking for dig-
-           its at the beginning of the string.
+       See curs_terminfo(3x) regarding tputs.
 
-           tputs("50") in a termcap system may wait for 50 milliseconds rather
-           than put out a literal "50"
 
-       Note  that termcap has nothing analogous to terminfo's sgr string.  One
-       consequence of this is that termcap applications  assume  me  (terminfo
-       sgr0)  does not reset the alternate character set.  This implementation
-       checks for, and modifies the data shown to the termcap interface to ac-
-       commodate termcap's limitation in this respect.
+

              NOTES

              +       ncurses  compares  only the first two characters of the id parameter of
+       tgetflag, tgetnum, and tgetstr to the capability names in the database.

              PORTABILITY

              +       These functions are no longer standardized  (and  the  variables  never
+       were);  see  section "HISTORY" below.  ncurses provides them to support
+       legacy applications; they should not be used in new programs.
+
+       SVr4 describes a successful return value  only  as  "an  integer  value
+       other than ERR".
+
+       Neither  X/Open  Curses  nor  the  SVr4 man pages documented the return
+       values of tgetent correctly, though all three shown here were  in  fact
+       returned  ever  since  SVr1.   In particular, an omission in the X/Open
+       Curses specification has  been  misinterpreted  to  mean  that  tgetent
+       returns  OK  or  ERR.   Because  the  purpose  of these functions is to
+       provide compatibility with the termcap library, that  is  a  defect  in
+       X/Open Curses Issue 4 Version 2 rather than in ncurses.
+
+   Compatibility with BSD termcap
+       ncurses  provides  externally  visible  variables  to  support  certain
+       termcap  applications.   However,  their  correct   usage   is   poorly
+       documented; for example, it is unclear when reading and writing them is
+       meaningful.  In particular, some applications are reported  to  declare
+       and/or modify ospeed.
+
+       The  constraint  that only the first two characters of the id parameter
+       are looked  up  in  the  terminal  database  escapes  many  application
+       developers.   The  BSD  termcap library did not require a trailing null
+       character after the capability identifier passed to  tgetstr,  tgetnum,
+       and tgetflag.  Some applications thus assume that the termcap interface
+       does not  require  the  trailing  null  character  for  the  capability
+       identifier.
+
+       ncurses  disallows  matches  by  the termcap interface against extended
+       capability names that are longer than two characters; see user_caps(5).
+
+       The BSD termcap function tgetent returns the text of a termcap entry in
+       the  buffer  passed  as an argument.  This library, like other terminfo
+       implementations, does not store terminal type descriptions as text.  It
+       sets the buffer contents to a null-terminated string.
+
+
+

              Header File

              +       This  library  includes  a termcap.h header file for compatibility with
+       other  implementations,  but  it  is  rarely  used  because  the  other
+       implementations are not mutually compatible; see below.
+
+
+

              HISTORY

              +       Bill  Joy  originated  a  forerunner  of termcap called "ttycap", dated
+       September 1977, and released in 1BSD (March 1978).  It used many of the
+       same  function  names  as the later termcap, such as tgetent, tgetflag,
+       tgetnum, and tgetstr.
+
+       A clear descendant, the termlib library, followed in 2BSD  (May  1979),
+       adding tgoto and tputs.  The former applied at that time only to cursor
+       positioning  capabilities,  thus  the  overly  specific  name.   Little
+       changed  in 3BSD (late 1979) except the addition of test programs and a
+       termlib man page, which documented the API shown in section  "SYNOPSIS"
+       above.
+
+       4BSD  (November 1980) renamed termlib to termcap and added another test
+       program.  The library remained  much  the  same  through  4.3BSD  (June
+       1986).    4.4BSD-Lite  (June  1994)  refactored  it,  leaving  the  API
+       unchanged.
+
+       Function prototypes were a feature of ANSI C (1989).  The library  long
+       antedated the standard and thus provided no header file declaring them.
+       Nevertheless, the BSD sources included two different  termcap.h  header
+       files over time.
+
+       o   One was used internally by jove(1) from 4.3BSD onward.  It declared
+           global symbols for the termcap variables that it used.
+
+       o   The other appeared in 4.4BSD-Lite Release 2 (June 1995) as part  of
+           libedit  (also known as the editline library).  CSRG source history
+           shows that this was added in mid-1992.  The libedit header file was
+           used  internally  as  a  convenience  for  compiling  the  editline
+           library.  It declared function prototypes, but no global variables.
+           NetBSD's termcap library added this header file in mid-1994.
+
+       Meanwhile,  GNU  termcap  began development in 1990.  Its first release
+       (1.0) in 1991 included a  termcap.h  header  file.   Its  second  (1.1)
+       release  in  September  1992  modified  the  file  to use const for the
+       function prototypes in the header where one would expect parameters  to
+       be  read-only.   BSD  termcap  did  not.   The prototype for tputs also
+       differed, but in that instance, it was libedit that differed  from  BSD
+       termcap.
+
+       GNU  bash(1)  has bundled GNU termcap 1.3 since mid-1993 to support its
+       readline(3) library, and continues to use it if configured to do so.
+
+       ncurses 1.8.1 (November 1993) provided a termcap.h file.  It  reflected
+       influence   from  GNU  termcap  and  emacs(1)  (rather  than  jove(1)),
+       providing the following interface:
+
+       o   global symbols used by emacs,
+
+       o   const-qualified function prototypes, and
+
+       o   a prototype for tparam, a GNU termcap feature.
+
+       Later (in mid-1996) the tparam function was removed from ncurses.   Any
+       two  of  the four implementations thus differ, and programs that intend
+       to work with all termcap library interfaces must account for that fact.
+
+       X/Open Curses Issue 4, Version 2  (1996),  describes  these  functions,
+       marking them as "TO BE WITHDRAWN".
+
+       X/Open Curses Issue 7 (2009) withdrew the termcap interface (along with
+       the vwprintw and vwscanw functions).
 
-

              Standards

              -       These  functions  are  provided for supporting legacy applications, and
-       should not be used in new programs:
-
-       o   The XSI Curses standard, Issue 4 describes these functions.  Howev-
-           er,  they  are  marked TO BE WITHDRAWN and may be removed in future
-           versions.
-
-       o   X/Open Curses, Issue 5 (December 2007) marked the termcap interface
-           (along with vwprintw and vwscanw) as withdrawn.
-
-       Neither  the  XSI Curses standard nor the SVr4 man pages documented the
-       return values of tgetent correctly, though all three were in  fact  re-
-       turned  ever  since SVr1.  In particular, an omission in the XSI Curses
-       documentation has been misinterpreted to mean that tgetent  returns  OK
-       or  ERR.  Because the purpose of these functions is to provide compati-
-       bility with the termcap library, that is a defect in XCurses, Issue  4,
-       Version 2 rather than in ncurses.
-
-
-

              Compatibility with BSD Termcap

              -       External variables are provided for support of certain termcap applica-
-       tions.  However, termcap applications' use of those variables is poorly
-       documented, e.g., not distinguishing between input and output.  In par-
-       ticular, some applications are reported to declare  and/or  modify  os-
-       peed.
-
-       The  comment that only the first two characters of the id parameter are
-       used escapes many application developers.  The original BSD 4.2 termcap
-       library (and historical relics thereof) did not require a trailing null
-       NUL on the parameter name passed  to  tgetstr,  tgetnum  and  tgetflag.
-       Some  applications  assume  that the termcap interface does not require
-       the trailing NUL for the parameter name.  Taking into account these is-
-       sues:
 
-       o   As  a  special  case,  tgetflag  matched against a single-character
-           identifier provided that was at the end of  the  terminal  descrip-
-           tion.  You should not rely upon this behavior in portable programs.
-           This implementation disallows matches against single-character  ca-
-           pability names.
-
-       o   This  implementation  disallows  matches  by  the termcap interface
-           against extended capability names which are longer than two charac-
-           ters.
-
-       The BSD termcap function tgetent returns the text of a termcap entry in
-       the buffer passed as an argument.  This library  (like  other  terminfo
-       implementations) does not store terminal descriptions as text.  It sets
-       the buffer contents to a null-terminated string.
-
-
-

              Other Compatibility

              -       This library includes a termcap.h header, for compatibility with  other
-       implementations.   But  the header is rarely used because the other im-
-       plementations are not strictly compatible.
-
-       The original BSD termcap (through 4.3BSD) had no header file which gave
-       function prototypes, because that was a feature of ANSI C.  BSD termcap
-       was written several years before C was  standardized.   However,  there
-       were two different termcap.h header files in the BSD sources:
-
-       o   One  was used internally by the jove editor in 2BSD through 4.4BSD.
-           It defined global symbols for the termcap variables which it used.
-
-       o   The other appeared in 4.4BSD Lite Release 2 (mid-1993) as  part  of
-           libedit (also known as the editline library).  The CSRG source his-
-           tory shows that this was added in  mid-1992.   The  libedit  header
-           file  was used internally, as a convenience for compiling the edit-
-           line library.  It declared function prototypes, but no global vari-
-           ables.
-
-       The  header  file from libedit was added to NetBSD's termcap library in
-       mid-1994.
-
-       Meanwhile, GNU termcap was under development, starting  in  1990.   The
-       first  release  (termcap 1.0) in 1991 included a termcap.h header.  The
-       second release (termcap 1.1) in September 1992 modified the  header  to
-       use const for the function prototypes in the header where one would ex-
-       pect the parameters to be read-only.  This was a difference versus  the
-       original  BSD  termcap.   The prototype for tputs also differed, but in
-       that instance, it was libedit which differed from BSD termcap.
+

              BUGS

              +       If  you  call  tgetstr  to  fetch  column_address  (ch)  or  any  other
+       parameterized  string capability, be aware that it is returned in term-
+       info notation, not the older and not-quite-compatible termcap notation.
+       This  does  not  cause  problems if all you do with it is call tgoto or
+       tparm,  which  both   parametrically   expand   terminfo-style   string
+       capabilities  as  terminfo  does.  (If ncurses is configured to support
+       termcap, tgoto checks whether the string is terminfo-style  by  looking
+       for  "%p"  parameters  or  "<...>"  delays, and invokes a termcap-style
+       parser if the string appears not to use terminfo syntax.)
 
-       A copy of GNU termcap 1.3 was bundled with bash in mid-1993, to support
-       the readline(3) library.
+       Because terminfo's syntax for padding in  string  capabilities  differs
+       from termcap's, users can be surprised.
 
-       A  termcap.h  file was provided in ncurses 1.8.1 (November 1993).  That
-       reflected influence by emacs(1) (rather than jove(1)) and GNU termcap:
+       o   tputs("50")  in  a terminfo system transmits "50" rather than busy-
+           waiting for 50 milliseconds.
 
-       o   it provided declarations for a few global symbols used by emacs
+       o   However, if ncurses is configured to support termcap, it  may  also
+           have been configured to support BSD-style padding.
 
-       o   it provided function prototypes (using const).
+           In  that  case,  tputs  inspects  strings passed to it, looking for
+           digits at the beginning of the string.
 
-       o   a prototype for tparam (a GNU termcap feature) was provided.
+           tputs("50") in a termcap system may busy-wait for  50  milliseconds
+           rather than transmitting "50".
 
-       Later (in mid-1996) the tparam function was removed from ncurses.  As a
-       result,  there are differences between any of the four implementations,
-       which must be taken into account by programs which can  work  with  all
-       termcap library interfaces.
+       termcap  has  nothing  analogous  to  terminfo's  set_attributes  (sgr)
+       capability.  One consequence is that termcap applications  assume  that
+       "me"  (equivalent  to terminfo's exit_attribute_mode (sgr0) capability)
+       does not reset the alternate character set.  ncurses  checks  for,  and
+       modifies the data shared with, the termcap interface to accommodate the
+       latter's limitation in this respect.

              SEE ALSO

              -       curses(3x), putc(3), term_variables(3x), terminfo(5).
+       TCTEST -- A Termcap Test Utility <https://invisible-island.net/ncurses/
+       tctest.html>
 
-       https://invisible-island.net/ncurses/tctest.html
+       curses(3x), curs_terminfo(3x), putc(3), term_variables(3x), terminfo(5)
 
 
 
-                                                              curs_termcap(3x)
+ncurses 6.5                       2025-02-01                  curs_termcap(3x)
              diff --git a/doc/html/man/curs_terminfo.3x.html b/doc/html/man/curs_terminfo.3x.html index c50d7db3..80c44a03 100644 --- a/doc/html/man/curs_terminfo.3x.html +++ b/doc/html/man/curs_terminfo.3x.html @@ -1,6 +1,7 @@ -curs_terminfo 3x +curs_terminfo 3x 2025-02-15 ncurses 6.5 Library calls -

              curs_terminfo 3x

              +

              curs_terminfo 3x 2025-02-15 ncurses 6.5 Library calls

              -curs_terminfo(3x)                                            curs_terminfo(3x)
+curs_terminfo(3x)                Library calls               curs_terminfo(3x)

              NAME

              -       del_curterm, mvcur, putp, restartterm, set_curterm, setupterm,
-       tigetflag, tigetnum, tigetstr, tiparm, tparm, tputs, vid_attr,
-       vid_puts, vidattr, vidputs - curses interfaces to terminfo database
+       del_curterm,  putp,  restartterm,  set_curterm,  setupterm,  tigetflag,
+       tigetnum, tigetstr, tiparm, tiparm_s, tiscan_s, tparm, tputs, vid_attr,
+       vid_puts, vidattr, vidputs - curses interfaces to terminfo database

              SYNOPSIS

                      #include <curses.h>
        #include <term.h>
 
-       TERMINAL *cur_term;
+       TERMINAL * cur_term;
 
        const char * const boolnames[];
        const char * const boolcodes[];
@@ -77,171 +69,176 @@ 
              curs_terminfo 3x
              
        const char * const strcodes[];
        const char * const strfnames[];
 
-       int setupterm(const char *term, int filedes, int *errret);
-       TERMINAL *set_curterm(TERMINAL *nterm);
-       int del_curterm(TERMINAL *oterm);
-       int restartterm(const char *term, int filedes, int *errret);
+       int setupterm(const char * term, int filedes, int * errret);
+       TERMINAL * set_curterm(TERMINAL * nterm);
+       int del_curterm(TERMINAL * oterm);
+       int restartterm(const char * term, int filedes,
+             int * errret);
 
-       char *tparm(const char *str, ...);
-       int tputs(const char *str, int affcnt, int (*putc)(int));
-       int putp(const char *str);
+       char * tparm(const char * str, ...);
+            /* or */
+       char * tparm(const char * str, long p1 ... long p9);
 
-       int vidputs(chtype attrs, int (*putc)(int));
+       int tputs(const char * str, int affcnt, int (* putc)(int));
+       int putp(const char * str);
+
+       int vidputs(chtype attrs, int (* putc)(int));
        int vidattr(chtype attrs);
-       int vid_puts(attr_t attrs, short pair, void *opts, int (*putc)(int));
-       int vid_attr(attr_t attrs, short pair, void *opts);
+       int vid_puts(attr_t attrs, short pair, void * opts,
+             int (* putc)(int));
+       int vid_attr(attr_t attrs, short pair, void * opts);
+
+       int tigetflag(const char * cap-code);
+       int tigetnum(const char * cap-code);
+       char * tigetstr(const char * cap-code);
 
-       int mvcur(int oldrow, int oldcol, int newrow, int newcol);
+       char * tiparm(const char * str, ...);
 
-       int tigetflag(const char *capname);
-       int tigetnum(const char *capname);
-       char *tigetstr(const char *capname);
+       /* extensions */
+       char * tiparm_s(int expected, int mask,
+             const char * str, ...);
+       int tiscan_s(int * expected, int * mask, const char * str);
 
-       char *tiparm(const char *str, ...);
+       /* deprecated */
+       int setterm(const char * term);

              DESCRIPTION

              -       These  low-level  routines must be called by programs that have to deal
-       directly with the terminfo database to handle certain terminal capabil-
-       ities, such as programming function keys.  For all other functionality,
-       curses routines are more suitable and their use is recommended.
+       These  lower-level  functions  of the curses standard must be called by
+       programs that deal  directly  with  the  terminfo  database  to  handle
+       certain  terminal capabilities, such as programming function keys.  For
+       all other functionality, curses functions are more suitable  and  their
+       use is recommended.
 
-       None of these functions use  (or  are  aware  of)  multibyte  character
-       strings such as UTF-8:
+       None  of  these  functions  use  (or  are aware of) multibyte character
+       strings such as UTF-8.
 
-       o   capability names use the POSIX portable character set
+       o   Capability names and codes use the POSIX portable character set.
 
-       o   capability  string  values  have  no  associated encoding; they are
+       o   Capability string values have  no  associated  encoding;  they  are
            strings of 8-bit characters.

              Initialization

              -       Initially, setupterm should be called.  The high-level curses functions
-       initscr  and  newterm call setupterm to initialize the low-level set of
-       terminal-dependent variables [listed in terminfo(5)].
-
-       Applications can use the terminal  capabilities  either  directly  (via
-       header  definitions),  or by special functions.  The header files curs-
-       es.h and term.h should be included (in this order) to get  the  defini-
-       tions for these strings, numbers, and flags.
-
-       The  terminfo  variables lines and columns are initialized by setupterm
-       as follows:
+       Call  setupterm  from  your  application  to  have  terminfo manage the
+       terminal  device;  this  action  initializes   the   terminal-dependent
+       variables  listed in term_variables(3x).  (A curses application calling
+       initscr(3x) or newterm(3x) achieves the same result.)  Applications can
+       use  the  terminal  capabilities either directly, by object definitions
+       corresponding to capability names and codes (see term_variables(3x)) or
+       by  calling  the  functions documented here.  setupterm initializes the
+       terminfo variables lines and columns as described in use_env(3x).
 
-       o   If use_env(FALSE) has been called, values  for  lines  and  columns
-           specified in terminfo are used.
+       Pass  parameterized  string  capability   values   through   tparm   to
+       instantiate them.  All terminfo strings (including the output of tparm)
+       should be sent to  the  terminal  device  with  tputs  or  putp.   Call
+       reset_shell_mode(3x)  to restore the terminal modes before exiting.  (A
+       curses application calling endwin(3x) achieves the same result.)
 
-       o   Otherwise,  if  the  environment variables LINES and COLUMNS exist,
-           their values are used.  If these environment variables do not exist
-           and  the program is running in a window, the current window size is
-           used.  Otherwise, if the environment variables do  not  exist,  the
-           values for lines and columns specified in the terminfo database are
-           used.
+       Programs that use cursor addressing should emit certain capabilities at
+       specific times.  Specifically, output
 
-       Parameterized strings should be passed  through  tparm  to  instantiate
-       them.   All  terminfo strings (including the output of tparm) should be
-       printed with tputs or putp.  Call reset_shell_mode to restore  the  tty
-       modes before exiting [see curs_kernel(3x)].
+       o   enter_ca_mode upon startup, and
 
-       Programs which use cursor addressing should
+       o   exit_ca_mode before exiting.
 
-       o   output enter_ca_mode upon startup and
+       Programs that execute shell subprocesses should
 
-       o   output exit_ca_mode before exiting.
+       o   call  reset_shell_mode(3x) and output exit_ca_mode before the shell
+           is called, and
 
-       Programs which execute shell subprocesses should
+       o   output enter_ca_mode and call reset_prog_mode(3x)  after  returning
+           from the shell.
 
-       o   call  reset_shell_mode  and output exit_ca_mode before the shell is
-           called and
-
-       o   output enter_ca_mode and call reset_prog_mode after returning  from
-           the shell.
-
-       The  setupterm routine reads in the terminfo database, initializing the
-       terminfo structures, but does not  set  up  the  output  virtualization
-       structures used by curses.  These are its parameters:
+       setupterm  reads  in  the  terminfo database, initializing the terminfo
+       structures, but does not set up the  output  virtualization  structures
+       used by curses.  Its parameters follow.
 
           term is the terminal type, a character string.  If term is null, the
-               environment variable TERM is used.
+               environment variable TERM is read.
 
           filedes
-               is the file descriptor used for all output.
+               is the file descriptor used for getting  and  setting  terminal
+               I/O modes.
 
-          errret
-               points to an optional location where an error status can be re-
-               turned  to  the  caller.  If errret is not null, then setupterm
-               returns OK or ERR and stores a  status  value  in  the  integer
-               pointed  to by errret.  A return value of OK combined with sta-
-               tus of 1 in errret is normal.
+               Higher-level  applications  use  newterm(3x)  to initialize the
+               terminal, passing an output stream rather  than  a  descriptor.
+               In   curses,  the  two  are  the  same  because  newterm  calls
+               setupterm, passing the file descriptor derived from its  output
+               stream parameter.
 
-               If ERR is returned, examine errret:
+          errret
+               points  to  an  optional  location where an error status can be
+               returned to the caller.  If errret is not null, then  setupterm
+               returns  OK  or  ERR  and  stores a status value in the integer
+               pointed to by errret.  A  return  value  of  OK  combined  with
+               status of 1 in errret is normal.
 
-               1    means that the terminal is hardcopy, cannot  be  used  for
-                    curses applications.
+               If ERR is returned, examine errret.
 
-                    setupterm  determines  if  the entry is a hardcopy type by
-                    checking the hc (hardcopy) capability.
+               1    means  that  the  terminal  is  a  hard-copy  type  (lacks
+                    destructive backspace), and  cannot  be  used  for  curses
+                    applications.    The   library  determines  this  fact  by
+                    checking the terminal type's hardcopy (hc) capability.
 
                0    means that the terminal could not be found, or that it  is
-                    a  generic  type, having too little information for curses
+                    a  generic  type, having too little information for curses
                     applications to run.
 
                     setupterm determines if the entry is  a  generic  type  by
-                    checking the gn (generic) capability.
+                    checking the generic_type (gn) capability.
 
-               -1   means that the terminfo database could not be found.
+               -1   means that the terminfo database could not be found.
 
-               If errret is null, setupterm prints an error message upon find-
-               ing an error and exits.  Thus, the simplest call is:
+               If  errret  is  null,  setupterm  reports an error message upon
+               finding an error and exits.  Thus, the simplest call is:
 
-                     setupterm((char *)0, 1, (int *)0);,
+                      setupterm((char *) NULL, 1, (int *) NULL);
 
-               which uses all the defaults and sends the output to stdout.
+               which uses all the defaults and sends the output to stdout.

              The Terminal State

              -       The setupterm routine stores its information about the  terminal  in  a
-       TERMINAL  structure  pointed to by the global variable cur_term.  If it
-       detects an error, or decides that the terminal is unsuitable  (hardcopy
-       or  generic),  it discards this information, making it not available to
+       setupterm stores its information  about  the  terminal  in  a  TERMINAL
+       structure pointed to by the global variable cur_term.  If it detects an
+       error,  or  decides  that  the  terminal  is  unsuitable  (hardcopy  or
+       generic),  it  discards  this  information,  making  it  unavailable to
        applications.
 
-       If setupterm is called repeatedly for the same terminal type,  it  will
-       reuse  the  information.   It maintains only one copy of a given termi-
-       nal's capabilities in memory.  If it is called for  different  terminal
-       types,  setupterm  allocates new storage for each set of terminal capa-
-       bilities.
+       If setupterm is called repeatedly for the same terminal type, it reuses
+       the  information.   It  maintains  only  one  copy  of  a  given type's
+       capabilities in memory.   If  called  for  different  types,  setupterm
+       allocates new storage for each set of terminal capabilities.
 
-       The set_curterm routine sets cur_term to nterm, and makes  all  of  the
-       terminfo  boolean,  numeric,  and  string variables use the values from
-       nterm.  It returns the old value of cur_term.
+       set_curterm sets cur_term to nterm, making all of the terminfo Boolean,
+       numeric, and string capabilities use the values from nterm.  It returns
+       the old value of cur_term.
 
-       The del_curterm routine frees the space pointed to by oterm  and  makes
-       it available for further use.  If oterm is the same as cur_term, refer-
-       ences to any of the terminfo boolean,  numeric,  and  string  variables
-       thereafter  may  refer  to  invalid  memory locations until another se-
-       tupterm has been called.
+       del_curterm  frees  the memory pointed to by oterm, making it available
+       for further use.  If oterm is the same as cur_term, references  to  any
+       of  the  terminfo  Boolean, numeric, and string capabilities thereafter
+       may refer to invalid memory locations until setupterm is called again.
 
-       The restartterm routine is similar to  setupterm  and  initscr,  except
-       that it is called after restoring memory to a previous state (for exam-
-       ple, when reloading a game saved as a core  image  dump).   restartterm
-       assumes  that the windows and the input and output options are the same
-       as when memory was saved, but the terminal type and baud  rate  may  be
-       different.   Accordingly,  restartterm  saves  various  tty state bits,
-       calls setupterm, and then restores the bits.
+       restartterm is similar to setupterm, but  is  intended  for  use  after
+       restoring  program  memory  to  a  previous  state  (for  example, when
+       reloading an application that has  been  suspended  from  one  terminal
+       session and restored in another).  restartterm assumes that the display
+       dimensions and the input and output options are the same as when memory
+       was   saved,   but  the  terminal  type  and  line  speed  may  differ.
+       Accordingly,  restartterm  saves   relevant   terminal   state,   calls
+       setupterm, then restores that state.

              Formatting Output

              -       The tparm routine instantiates the string str with  parameters  pi.   A
-       pointer  is  returned to the result of str with the parameters applied.
-       Application developers should keep in mind these quirks of  the  inter-
-       face:
+       tparm  instantiates  the  string  str with parameters pi.  A pointer is
+       returned to the result of str with the parameters applied.  Application
+       developers should keep in mind these quirks of the interface:
 
        o   Although  tparm's actual parameters may be integers or strings, the
-           prototype expects long (integer) values.
+           prototype expects long (integer) values.
 
-       o   Aside from the set_attributes (sgr) capability, most terminal capa-
-           bilities require no more than one or two parameters.
+       o   Aside from  the  set_attributes  (sgr)  capability,  most  terminal
+           capabilities require no more than one or two parameters.
 
        o   Padding  information  is  ignored  by  tparm;  it is interpreted by
            tputs.
@@ -249,101 +246,114 @@ 
              curs_terminfo 3x
              
        o   The capability string is  null-terminated.   Use  "\200"  where  an
            ASCII NUL is needed in the output.
 
-       tiparm  is  a  newer  form of tparm which uses <stdarg.h> rather than a
-       fixed-parameter list.  Its numeric parameters are integers (int) rather
-       than longs.
+       tiparm  is  a  newer  form  of  tparm which uses stdarg.h rather than a
+       fixed-parameter list.  Its numeric  parameters  are  ints  rather  than
+       longs.
+
+       Both  tparm  and  tiparm  assume that the application passes parameters
+       consistent with the terminal description.  Two extensions are  provided
+       as alternatives to deal with untrusted data.
+
+       o   tiparm_s  is an extension which is a safer formatting function than
+           tparm or tiparm, because it allows the developer to tell the curses
+           library  how  many  parameters to expect in the parameter list, and
+           which may be string parameters.
+
+           The mask parameter has one bit set for each of the  parameters  (up
+           to 9) passed as char pointers rather than numbers.
+
+       o   The   extension  tiscan_s  allows  the  application  to  inspect  a
+           formatting capability to see what the curses library would assume.

              Output Functions

              -       The  tputs  routine  applies padding information (i.e., by interpreting
-       marker embedded in the terminfo capability such as  "$<5>"  as  5  mil-
-       liseconds) to the string str and outputs it:
+       String capabilities can contain padding, a  time  delay  (accommodating
+       performance limitations of hardware terminals) expressed as $<n>, where
+       n is a nonnegative integral count of milliseconds.  If n exceeds 30,000
+       (thirty seconds), it is capped at that value.
 
-       o   The  str parameter must be a terminfo string variable or the return
-           value from tparm, tiparm, tgetstr, or tgoto.
+       tputs  interprets  time-delay information in the string str and outputs
+       it, executing the delays:
 
-           The tgetstr and tgoto functions are part of the termcap  interface,
-           which  happens to share this function name with the terminfo inter-
-           face.
+       o   The str parameter must be a terminfo string variable or the  return
+           value of tparm or tiparm.
 
-       o   affcnt is the number of lines affected, or 1 if not applicable.
+       o   affcnt is the number of lines affected, or 1 if not applicable.
 
-       o   putc is a putchar-like routine to which the characters are  passed,
+       o   putc is a putchar-like function to which the characters are passed,
            one at a time.
 
-       The  putp routine calls tputs(str, 1, putchar).  The output of putp al-
-       ways goes to stdout, rather than the filedes specified in setupterm.
+           If tputs processes  a  time-delay,  it  uses  the  delay_output(3x)
+           function,  routing  any  resulting  padding characters through this
+           function.
 
-       The vidputs routine displays the string on the terminal  in  the  video
-       attribute mode attrs, which is any combination of the attributes listed
-       in curses(3x).  The characters are passed to the  putchar-like  routine
-       putc.
+       putp calls "tputs(str, 1, putchar)".  The output of putp always goes to
+       stdout, rather than the filedes specified in setupterm.
 
-       The vidattr routine is like the vidputs routine, except that it outputs
-       through putchar.
+       vidputs displays the string on the terminal in the video attribute mode
+       attrs, which is any combination of the attributes listed in curses(3x).
+       The characters are passed to the putchar-like function putc.
 
-       The vid_attr and vid_puts routines correspond to vidattr  and  vidputs,
-       respectively.   They  use a set of arguments for representing the video
-       attributes plus color, i.e.,
+       vidattr is like vidputs, except that it outputs through putchar(3).
 
-       o   attrs of type attr_t for the attributes and
+       vid_attr  and vid_puts correspond to vidattr and vidputs, respectively.
+       They use multiple parameters to represent the character attributes  and
+       color; namely,
 
-       o   pair of type short for the color-pair number.
+       o   attrs, of type attr_t, for the attributes and
 
-       The vid_attr and vid_puts routines are designed to  use  the  attribute
-       constants with the WA_ prefix.
+       o   pair, of type short, for the color pair number.
 
-       X/Open  Curses  reserves  the opts argument for future use, saying that
-       applications must provide a null pointer for that argument.  As an  ex-
-       tension,  this  implementation  allows  opts to be used as a pointer to
-       int, which overrides the pair (short) argument.
+       Use  the  attribute  constants  prefixed  with  "WA_" with vid_attr and
+       vid_puts.
 
-       The mvcur routine provides low-level cursor motion.   It  takes  effect
-       immediately (rather than at the next refresh).
+       X/Open Curses reserves the opts argument for future  use,  saying  that
+       applications  must  provide  a  null pointer for that argument; but see
+       section "EXTENSIONS" below.
 
-       While putp and mvcur are low-level functions which do not use the high-
-       level curses state, they are declared in <curses.h> because SystemV did
-       this (see HISTORY).
+       While putp is a lower-level function that  does  not  use  higher-level
+       curses  state,  ncurses declares it in curses.h because System V did so
+       (see section "HISTORY" below).

              Terminal Capability Functions

              -       The  tigetflag,  tigetnum and tigetstr routines return the value of the
-       capability corresponding to the terminfo capname passed to  them,  such
-       as  xenl.  The capname for each capability is given in the table column
-       entitled capname code in the capabilities section of terminfo(5).
+       tigetflag, tigetnum, and tigetstr return the value  of  the  capability
+       corresponding  to  the terminfo cap-code, such as xenl, passed to them.
+       The cap-code for each capability is given in the table column  of  that
+       name in the "Predefined Capabilities" section of terminfo(5).
 
-       These routines return special values to denote errors.
+       These functions return special values to denote errors.
 
-       The tigetflag routine returns
+       tigetflag returns
 
-       -1     if capname is not a boolean capability, or
+       -1     if cap-code is not a Boolean capability, or
 
        0      if it is canceled or absent from the terminal description.
 
-       The tigetnum routine returns
+       tigetnum returns
 
-       -2     if capname is not a numeric capability, or
+       -2     if cap-code is not a numeric capability, or
 
        -1     if it is canceled or absent from the terminal description.
 
-       The tigetstr routine returns
+       tigetstr returns
 
        (char *)-1
-              if capname is not a string capability, or
+              if cap-code is not a string capability, or
 
-       0      if it is canceled or absent from the terminal description.
+       NULL   if it is canceled or absent from the terminal description.

              Terminal Capability Names

                      These null-terminated arrays contain
 
-       o   the short terminfo names ("codes"),
+       o   the short terminfo names ("codes"),
 
-       o   the termcap names ("names"), and
+       o   the termcap names ("names"), and
 
-       o   the long terminfo names ("fnames")
+       o   the long terminfo names ("fnames")
 
-       for each of the predefined terminfo variables:
+       for each of the predefined terminfo variables:
 
               const char *boolnames[], *boolcodes[], *boolfnames[]
               const char *numnames[], *numcodes[], *numfnames[]
@@ -352,266 +362,306 @@ 
              curs_terminfo 3x

              Releasing Memory

                      Each successful call to setupterm allocates memory to hold the terminal
-       description.  As a side-effect, it sets cur_term to point to this memo-
-       ry.  If an application calls
-
-            del_curterm(cur_term);
-
+       description.  As a side effect, it  sets  cur_term  to  point  to  this
+       memory.  If an application calls
+              del_curterm(cur_term);
        the memory will be freed.
 
-       The formatting functions tparm and tiparm extend the storage  allocated
-       by setupterm:
+       The  formatting functions tparm and tiparm extend the storage allocated
+       by setupterm as follows.
 
-       o   the  "static"  terminfo variables [a-z].  Before ncurses 6.3, those
-           were shared by all screens.  With ncurses 6.3, those are  allocated
-           per screen.  See terminfo(5) for details.
+       o   They add the "static" terminfo  variables  [a-z].   Before  ncurses
+           6.3, those were shared by all screens.  With ncurses 6.3, those are
+           allocated per screen.  See terminfo(5).
 
-       o   to  improve performance, ncurses 6.3 caches the result of analyzing
-           terminfo strings for their parameter types.  That is  stored  as  a
-           binary tree referenced from the TERMINAL structure.
+       o   To improve performance, ncurses 6.3 caches the result of  analyzing
+           terminfo  strings  for  their parameter types.  That is stored as a
+           binary tree referenced from the TERMINAL structure.
 
        The higher-level initscr and newterm functions use setupterm.  Normally
-       they do not free this memory, but it is possible to do that  using  the
+       they  do  not free this memory, but it is possible to do that using the
        delscreen(3x) function.

              RETURN VALUE

              -       Routines  that  return  an integer return ERR upon failure and OK (SVr4
-       only specifies "an integer value other than ERR") upon successful  com-
-       pletion, unless otherwise noted in the preceding routine descriptions.
+       Functions that return integers return ERR  upon  failure  and  OK  upon
+       success.
 
-       Routines that return pointers always return NULL on error.
+       In ncurses,
 
-       X/Open defines no error conditions.  In this implementation
+       del_curtem
+            fails if its terminal parameter is null.
 
-          del_curterm
-               returns an error if its terminal parameter is null.
+       putp calls tputs, returning the same error codes.
 
-          putp calls tputs, returning the same error-codes.
+       restartterm
+            fails if the associated call to setupterm returns ERR.
 
-          restartterm
-               returns an error if the associated call to setupterm returns an
-               error.
+       setupterm
+            fails  if  it cannot allocate enough memory, or create the initial
+            windows (stdscr, curscr, and newscr).  Other error conditions  are
+            documented above.
 
-          setupterm
-               returns an error if it cannot allocate enough memory, or create
-               the initial windows (stdscr, curscr, newscr).  Other error con-
-               ditions are documented above.
+       tparm
+            returns  a null pointer if the capability would require unexpected
+            parameters; that  is,  too  many,  too  few,  or  incorrect  types
+            (strings where integers are expected, or vice versa).
 
-          tputs
-               returns an error if the string parameter is null.  It does  not
-               detect  I/O errors: X/Open states that tputs ignores the return
-               value of the output function putc.
+       tputs
+            fails  if  the  string  parameter is null.  It does not detect I/O
+            errors: X/Open Curses states that tputs ignores the  return  value
+            of the output function putc.
 
 
-

              Compatibility macros

              -       This implementation provides a few macros for compatibility  with  sys-
-       tems  before  SVr4  (see  HISTORY).   Those  include  crmode,  fixterm,
-       gettmode, nocrmode, resetterm, saveterm, and setterm.
+

              NOTES

              +       The  vid_attr function in ncurses is a special case.  It was originally
+       implemented based on a draft of X/Open Curses, as a macro, before other
+       parts  of the ncurses wide-character API were developed, and unlike the
+       other wide-character functions,  is  also  provided  in  the  non-wide-
+       character configuration.
 
-       In SVr4, those are found in <curses.h>, but  except  for  setterm,  are
-       likewise macros.  The one function, setterm, is mentioned in the manual
-       page.  The manual page notes that the setterm routine was  replaced  by
-       setupterm, stating that the call:
 
-             setupterm(term, 1, (int *)0)
+

              EXTENSIONS

              +       The  functions  marked as extensions originated in ncurses, and are not
+       found in SVr4 curses, 4.4BSD  curses,  or  any  other  previous  curses
+       implementation.
 
-       provides the same functionality as setterm(term), and is not recommend-
-       ed for new programs.  This implementation provides each of  those  sym-
-       bols as macros for BSD compatibility,
+       ncurses  allows  opts  to be a pointer to int, which overrides the pair
+       (short) argument.
 
 
-

              HISTORY

              -       SVr2 introduced the terminfo feature.  Its programming manual mentioned
-       these low-level functions:
+

              PORTABILITY

              +       Except for setterm, X/Open Curses Issue 4  describes  these  functions.
+       It specifies no error conditions for them.
 
-       Function    Description
-       ------------------------------------------------------------
-       fixterm     restore tty to "in curses" state
-       gettmode    establish current tty modes
-       mvcur       low level cursor motion
-       putp        utility function that uses tputs to send  char-
-                   acters via putchar.
-       resetterm   set tty modes to "out of curses" state
-       resetty     reset tty flags to stored value
-       saveterm    save current modes as "in curses" state
-       savetty     store current tty flags
-       setterm     establish terminal with given type
-       setupterm   establish terminal with given type
-       tparm       instantiate a string expression with parameters
-       tputs       apply padding information to a string
-       vidattr     like vidputs, but outputs through putchar
-       vidputs     output  a string to put terminal in a specified
-                   video attribute mode
-
-       The programming manual also mentioned functions  provided  for  termcap
-       compatibility (commenting that they "may go away at a later date"):
+       SVr4 describes a successful return value except where "otherwise noted"
+       as "an integer value other than ERR".
 
-       Function   Description
-       ------------------------------------------------
-       tgetent    look up termcap entry for given name
-       tgetflag   get boolean entry for given id
-       tgetnum    get numeric entry for given id
-       tgetstr    get string entry for given id
-       tgoto      apply parameters to given capability
-       tputs      apply padding to capability, calling
-                  a function to put characters
 
-       Early terminfo programs obtained capability values  from  the  TERMINAL
-       structure initialized by setupterm.
+

              Header Files

              +       On legacy curses systems, include curses.h and term.h in that order  to
+       make   visible  the  definitions  of  the  string  arrays  storing  the
+       capability names and codes.
 
-       SVr3  extended terminfo by adding functions to retrieve capability val-
-       ues (like the termcap interface), and reusing tgoto and tputs:
 
-       Function    Description
-       -------------------------------------------
-       tigetflag   get boolean entry for given id
+

              Compatibility Macros

              +       ncurses implements a few macros for early System V curses compatibility
+       (see section "HISTORY" below).  They include crmode, fixterm, gettmode,
+       nocrmode, resetterm, saveterm, and setterm.
 
-       tigetnum    get numeric entry for given id
-       tigetstr    get string entry for given id
+       In SVr4, these are found in  curses.h,  but  except  for  setterm,  are
+       likewise macros.  The one function, setterm, is mentioned in the manual
+       page.  It further notes that setterm was replaced by setupterm, stating
+       that the call
+              setupterm(term, 1, (int *)0)
 
-       SVr3 also replaced several of the SVr2 terminfo functions which had  no
-       counterpart in the termcap interface, documenting them as obsolete:
+       provides the same functionality as
+              setterm(term)
+       and discouraging the latter for new programs.
 
-       Function    Replaced by
-       -----------------------------
-       crmode      cbreak
-       fixterm     reset_prog_mode
-       gettmode    N/A
-       nocrmode    nocbreak
-       resetterm   reset_shell_mode
-       saveterm    def_prog_mode
-       setterm     setupterm
-
-       SVr3  kept  the  mvcur, vidattr and vidputs functions, along with putp,
-       tparm and tputs.  The latter were needed to support padding,  and  han-
-       dling  functions  such as vidattr (which used more than the two parame-
-       ters supported by tgoto).
-
-       SVr3 introduced the functions for switching between  terminal  descrip-
-       tions, e.g., set_curterm.  Some of that was incremental improvements to
-       the SVr2 library:
-
-       o   The TERMINAL type definition was introduced  in  SVr3.01,  for  the
-           term structure provided in SVr2.
-
-       o   The  various  global  variables such as boolnames were mentioned in
-           the programming manual at this point,  though  the  variables  were
-           provided in SVr2.
-
-       SVr4 added the vid_attr and vid_puts functions.
 
-       There are other low-level functions declared in the curses header files
-       on Unix systems, but none were documented.  The functions marked "obso-
-       lete" remained in use by the Unix vi(1) editor.
+

              Legacy Data

              +       setupterm copies the terminal name to the array ttytype.  This behavior
+       is not specified by X/Open Curses, but is assumed by some applications.
 
+       Other implementations may not declare the capability name arrays.  Some
+       provide  them  without  declaring them.  X/Open Curses does not specify
+       them.
 
-

              PORTABILITY

              +       Extended terminal capability names, as defined by  "tic  -x",  are  not
+       stored in the arrays described here.
 
-

              Legacy functions

              -       X/Open notes that vidattr and vidputs may be macros.
 
-       The  function setterm is not described by X/Open and must be considered
-       non-portable.  All other functions are as described by X/Open.
+

              Output Buffering

              +       Older  versions  of  ncurses assumed that the file descriptor passed to
+       setupterm from initscr or newterm used buffered I/O, and wrote  to  the
+       corresponding  stdio  stream.   In  addition to the limitation that the
+       terminal was  left  in  block-buffered  mode  on  exit  (like  System V
+       curses),  it  was  problematic because ncurses did not allow a reliable
+       way to clean up on receiving SIGTSTP.
 
+       ncurses 6.x uses output  buffers  managed  directly  by  ncurses.   The
+       lower-level  functions described here that write to the terminal device
+       do so via the standard output stream; they thus  are  not  signal-safe.
+       The  higher-level  functions  in  ncurses  employ alternate versions of
+       these functions using a more reliable buffering scheme.
 
-

              Legacy data

              -       setupterm copies the terminal name to the array ttytype.  This  is  not
-       part of X/Open Curses, but is assumed by some applications.
 
-       Other  implementions  may not declare the capability name arrays.  Some
-       provide them without declaring them.  X/Open does not specify them.
+

              Function Prototypes

              +       The X/Open Curses prototypes  are  based  on  the  SVr4  curses  header
+       declarations,  which  were  defined at the same time the C language was
+       first standardized in the late 1980s.
 
-       Extended terminal capability names, e.g., as defined by tic -x, are not
-       stored in the arrays described here.
+       o   X/Open Curses uses const  less  effectively  than  a  later  design
+           might,  sometimes applying it needlessly to values that are already
+           constant, and in most cases overlooking  parameters  that  normally
+           would  benefit  from  const.  Passing const-qualified parameters to
+           functions that do not declare them const may  prevent  the  program
+           from  compiling.   On  the  other  hand,  "writable strings" are an
+           obsolescent C language feature.
 
+           As an extension, ncurses can be configured to change  the  function
+           prototypes  to  use  the  const keyword.  The ncurses ABI 6 enables
+           this feature by default.
 
-

              Output buffering

              -       Older  versions  of  ncurses assumed that the file descriptor passed to
-       setupterm from initscr or newterm uses buffered I/O, and would write to
-       the  corresponding stream.  In addition to the limitation that the ter-
-       minal was left in block-buffered mode on exit (like System  V  curses),
-       it  was  problematic  because  ncurses  did not allow a reliable way to
-       cleanup on receiving SIGTSTP.
+       o   X/Open Curses prototypes tparm with a fixed number  of  parameters,
+           rather than a variable argument list.
 
-       The current version (ncurses6) uses output buffers managed directly  by
-       ncurses.  Some of the low-level functions described in this manual page
-       write to the standard output.  They are not signal-safe.  The high-lev-
-       el functions in ncurses use alternate versions of these functions using
-       the more reliable buffering scheme.
+           ncurses uses a variable argument list, but can be configured to use
+           the fixed-parameter list.   Portable  applications  should  provide
+           nine parameters after the format; zeroes are fine for this purpose.
 
+           In  response  to review comments by Thomas E. Dickey, X/Open Curses
+           Issue 7 proposed the tiparm function in mid-2009.
 
-

              Function prototypes

              -       The X/Open Curses prototypes are based on the SVr4 curses header decla-
-       rations,  which  were defined at the same time the C language was first
-       standardized in the late 1980s.
+           While tiparm is always provided  in  ncurses,  the  older  form  is
+           available  only  as  a  build-time  configuration  option.   If not
+           specially configured, tparm is the same as tiparm.
 
-       o   X/Open Curses uses const  less  effectively  than  a  later  design
-           might,  in  some cases applying it needlessly to values are already
-           constant, and in most cases overlooking parameters  which  normally
-           would  use const.  Using constant parameters for functions which do
-           not use const may prevent the program from compiling.  On the other
-           hand, writable strings are an obsolescent feature.
+       Both forms of tparm have drawbacks.
 
-           As  an  extension,  this implementation can be configured to change
-           the function prototypes to use the const keyword.  The ncurses  ABI
-           6 enables this feature by default.
+       o   Most calls to tparm require only one or  two  parameters.   Passing
+           nine on each call is awkward.
 
-       o   X/Open  Curses  prototypes tparm with a fixed number of parameters,
-           rather than a variable argument list.
+           Using  long  for the numeric parameter type is a workaround to make
+           the parameter use the same amount of stack  memory  as  a  pointer.
+           That  approach  dates  to the mid-1980s, before C was standardized.
+           Since ANSI C (1989), C language standards do not require a  pointer
+           to fit in a long).
 
-           This implementation uses a variable argument list, but can be  con-
-           figured  to  use  the  fixed-parameter list.  Portable applications
-           should provide 9 parameters after the format; zeroes are  fine  for
-           this purpose.
+       o   Providing  the  right  number of parameters for a variadic function
+           such  as  tiparm  can  be  a  problem,  in  particular  for  string
+           parameters.   However,  only a few terminfo capabilities use string
+           parameters (for instance, the ones used for  programmable  function
+           keys).
 
-           In  response  to review comments by Thomas E. Dickey, X/Open Curses
-           Issue 7 proposed the tiparm function in mid-2009.
+           The ncurses library checks usage of these capabilities, and returns
+           ERR if the capability mishandles string parameters.  But it  cannot
+           check if a calling program provides strings in the right places for
+           the tparm calls.
 
+           ncurses's tput(1) checks its  use  of  these  capabilities  with  a
+           table, so that it calls tparm correctly.
 
-

              Special TERM treatment

              -       If configured to use the terminal-driver, e.g., for the MinGW port,
+   Special TERM treatment
+       If  ncurses is configured to use the terminal driver, as with the MinGW
+       port,
 
-       o   setupterm interprets a missing/empty TERM variable as  the  special
+       o   setupterm interprets a missing/empty TERM variable as  the  special
            value "unknown".
 
-       o   setupterm  allows explicit use of the the windows console driver by
-           checking if $TERM is set to "#win32con" or an abbreviation of  that
-           string.
+           SVr4 curses uses the special value "dumb".
+
+           The  difference  between  the  two  is  that  the  former  uses the
+           generic_type (gn) terminfo capability, while the latter  does  not.
+           A generic terminal is unsuitable for full-screen applications.
+
+       o   setupterm  allows  explicit  use  of  the Microsoft Windows console
+           driver by checking whether the TERM environment  variable  has  the
+           value "#win32con" or an abbreviation of that string.
+
+
+

              Other Portability Issues

              +       In  SVr4,  set_curterm  returns  an  int, OK or ERR.  We have chosen to
+       implement the X/Open Curses semantics.
+
+       In SVr4, the third argument of tputs has the type "int (*)(char)".
+
+       At least one implementation of X/Open Curses (Solaris xcurses)  returns
+       a value other than OK or ERR from tputs.  It instead returns the length
+       of the string, and does no error checking.
+
+
+

              HISTORY

              +       SVr2 (1984) introduced the terminfo feature.   Its  programming  manual
+       mentioned the following low-level functions.
+
+       Function    Description
+       ------------------------------------------------------------------------
+       fixterm     restore terminal to "in curses" state
+       gettmode    establish current terminal modes
+       mvcur       low level cursor motion
+       putp        use tputs to send characters via putchar
+       resetterm   set terminal modes to "out of curses" state
+       resetty     reset terminal flags to stored value
+       saveterm    save current modes as "in curses" state
+       savetty     store current terminal flags
+       setterm     establish terminal with given type
+       setupterm   establish terminal with given type
+       tparm       interpolate parameters into string capability
+       tputs       apply padding information to a string
+       vidattr     like vidputs, but output through putchar
+       vidputs     write string to terminal, applying specified attributes
+
+       The  programming  manual  also mentioned functions provided for termcap
+       compatibility (commenting that they "may go away at a later date").
 
+       Function   Description
+       ------------------------------------------------------------------------
+       tgetent    look up termcap entry for given name
+       tgetflag   get Boolean entry for given id
+       tgetnum    get numeric entry for given id
+       tgetstr    get string entry for given id
+       tgoto      apply parameters to given capability
+       tputs      write characters via a function parameter, applying padding
 
-

              Other portability issues

              -       In  System  V Release 4, set_curterm has an int return type and returns
-       OK or ERR.  We have chosen to implement the X/Open Curses semantics.
+       Early terminfo programs obtained capability values  from  the  TERMINAL
+       structure initialized by setupterm.
 
-       In System V Release 4, the third argument of tputs  has  the  type  int
-       (*putc)(char).
+       SVr3   (1987)   extended  terminfo  by  adding  functions  to  retrieve
+       capability values (like the termcap interface), and reusing  tgoto  and
+       tputs.
 
-       At  least one implementation of X/Open Curses (Solaris) returns a value
-       other than OK/ERR from tputs.  That returns the length of  the  string,
-       and does no error-checking.
+       Function    Description
+       ------------------------------------------------------------------------
+       tigetflag   get Boolean entry for given id
+       tigetnum    get numeric entry for given id
+       tigetstr    get string entry for given id
 
-       X/Open  notes  that after calling mvcur, the curses state may not match
-       the actual terminal state, and that an application should touch and re-
-       fresh the window before resuming normal curses calls.  Both ncurses and
-       System V Release 4 curses implement mvcur using the SCREEN  data  allo-
-       cated  in  either  initscr or newterm.  So though it is documented as a
-       terminfo function, mvcur is really a curses function which is not  well
-       specified.
+       SVr3  also  replaced several of the SVr2 terminfo functions that had no
+       counterpart in the termcap interface, documenting them as obsolete.
+
+       Function    Replaced by
+       ------------------------------------------------------------------------
+       crmode      cbreak
+       fixterm     reset_prog_mode
+       gettmode    n/a
+       nocrmode    nocbreak
+       resetterm   reset_shell_mode
+       saveterm    def_prog_mode
+       setterm     setupterm
+
+       SVr3 kept the mvcur, vidattr, and vidputs functions, along  with  putp,
+       tparm,  and  tputs.   The latter were needed to support padding, and to
+       handle capabilities accessed by functions such as vidattr  (which  used
+       more than the two parameters supported by tgoto).
+
+       SVr3   introduced   the   functions   for  switching  between  terminal
+       descriptions;  for  example,  set_curterm.   Some   changes   reflected
+       incremental improvements to the SVr2 library.
+
+       o   The  TERMINAL  type  definition  was introduced in SVr3.01, for the
+           term structure provided in SVr2.
+
+       o   Various global variables such as boolnames were  mentioned  in  the
+           programming  manual  at  this  point, though the variables had been
+           provided in SVr2.
 
-       X/Open  states that the old location must be given for mvcur.  This im-
-       plementation allows the caller to use -1's for the old  ordinates.   In
-       that case, the old location is unknown.
+       SVr4 (1989) added the vid_attr and vid_puts functions.
+
+       Other low-level functions are declared in the curses  header  files  of
+       Unix  systems,  but  none are documented.  Those noted as "obsolete" by
+       SVr3 remained in use by System V's vi(1) editor.

              SEE ALSO

                      curses(3x),   curs_initscr(3x),   curs_kernel(3x),   curs_memleaks(3x),
-       curs_termcap(3x), curs_variables(3x), term_variables(3x), putc(3), ter-
-       minfo(5)
+       curs_termcap(3x),   curs_variables(3x),   putc(3),  term_variables(3x),
+       terminfo(5)
 
 
 
-                                                             curs_terminfo(3x)
+ncurses 6.5                       2025-02-15                 curs_terminfo(3x)
              -
            • RETURN VALUE - -
              • -
            • HISTORY
              • +
            • RETURN VALUE
              • +
            • NOTES
              • +
            • EXTENSIONS
            • PORTABILITY
              • +
            • HISTORY
            • SEE ALSO
            diff --git a/doc/html/man/curs_threads.3x.html b/doc/html/man/curs_threads.3x.html index 001c86f0..9122d111 100644 --- a/doc/html/man/curs_threads.3x.html +++ b/doc/html/man/curs_threads.3x.html @@ -1,6 +1,7 @@ -curs_threads 3x +curs_threads 3x 2025-02-15 ncurses 6.5 Library calls -

            curs_threads 3x

            +

            curs_threads 3x 2025-02-15 ncurses 6.5 Library calls

            -curs_threads(3x)                                              curs_threads(3x)
+curs_threads(3x)                 Library calls                curs_threads(3x)

            NAME

            -       curs_threads - curses thread support
+       NCURSES_WINDOW_CB,   NCURSES_SCREEN_CB,   get_escdelay,   set_escdelay,
+       set_tabsize, use_screen, use_window - curses support for multi-threaded
+       applications

            SYNOPSIS

                    #include <curses.h>
 
+       /* data types */
        typedef int (*NCURSES_WINDOW_CB)(WINDOW *, void *);
        typedef int (*NCURSES_SCREEN_CB)(SCREEN *, void *);
 
@@ -67,548 +69,555 @@ 
            curs_threads 3x

            DESCRIPTION

            -       This  implementation  can  be configured to provide rudimentary support
-       for multi-threaded applications.  This makes a  different  set  of  li-
-       braries, e.g., libncursest since the binary interfaces are different.
-
-       Rather  than  modify  the interfaces to pass a thread specifier to each
-       function, it adds a few functions which can be used in  any  configura-
-       tion  which  hide  the  mutex's needed to prevent concurrent use of the
-       global variables when configured for threading.
-
-       In addition to forcing access to members of the WINDOW structure to  be
-       via  functions  (see curs_opaque(3x)), it makes functions of the common
-       global variables, e.g., COLORS,  COLOR_PAIRS,  COLS,  ESCDELAY,  LINES,
-       TABSIZE  curscr, newscr and ttytype.  Those variables are maintained as
-       read-only values, stored in the SCREEN structure.
-
-       Even this is not enough to make a thread-safe application using curses.
-       A multi-threaded application would be expected to have threads updating
-       separate windows (within the same  device),  or  updating  on  separate
-       screens  (on  different  devices).  Also, a few of the global variables
-       are considered writable by some applications.  The functions  described
-       here address these special situations.
-
-       The ESCDELAY and TABSIZE global variables are modified by some applica-
-       tions.  To modify them in any configuration, use  the  set_escdelay  or
-       set_tabsize functions.  Other global variables are not modifiable.
-
-       The get_escdelay function returns the value for ESCDELAY.
-
-       The  use_window and use_screen functions provide coarse granularity mu-
-       texes for their respective WINDOW and SCREEN parameters, and call a us-
-       er-supplied  function,  passing  it a data parameter, and returning the
-       value from the user-supplied function to the application.
-
-
-

            USAGE

            -       All of the ncurses library functions assume that the locale is not  al-
-       tered during operation.  In addition, they use data which is maintained
-       within a hierarchy of scopes.
-
-          o   global data, e.g., used in the low-level terminfo or termcap in-
-              terfaces.
-
-          o   terminal data, e.g., associated with a call to set_curterm.  The
-              terminal data are initialized when screens are created.
-
-          o   screen data, e.g., associated with a call to newterm or initscr.
-
-          o   window data, e.g., associated with a call to newwin  or  subwin.
-              Windows  are  associated with screens.  Pads are not necessarily
-              associated with a particular screen.
-
-              Most curses applications operate on one or more windows within a
-              single screen.
-
-          o   reentrant, i.e., it uses only the data passed as parameters.
-
-       This  table lists the scope of data used for each symbol in the ncurses
-       library when it is configured to support threading:
-
-            Symbol                  Scope
-            -------------------------------------------------------------
-            BC                      global
-            COLORS                  screen (readonly)
-            COLOR_PAIR              reentrant
-            COLOR_PAIRS             screen (readonly)
-            COLS                    screen (readonly)
-            ESCDELAY                screen (readonly, see set_escdelay)
-            LINES                   screen (readonly)
-            PAIR_NUMBER             reentrant
-            PC                      global
-            SP                      global
-            TABSIZE                 screen (readonly)
-            UP                      global
-            acs_map                 screen (readonly)
-            add_wch                 window (stdscr)
-            add_wchnstr             window (stdscr)
-            add_wchstr              window (stdscr)
-            addch                   window (stdscr)
-            addchnstr               window (stdscr)
-            addchstr                window (stdscr)
-            addnstr                 window (stdscr)
-            addnwstr                window (stdscr)
-            addstr                  window (stdscr)
-            addwstr                 window (stdscr)
-            assume_default_colors   screen
-            attr_get                window (stdscr)
-            attr_off                window (stdscr)
-            attr_on                 window (stdscr)
-            attr_set                window (stdscr)
-            attroff                 window (stdscr)
-            attron                  window (stdscr)
-            attrset                 window (stdscr)
-            baudrate                screen
-            beep                    screen
-            bkgd                    window (stdscr)
-            bkgdset                 window (stdscr)
-            bkgrnd                  window (stdscr)
-            bkgrndset               window (stdscr)
-            boolcodes               global (readonly)
-            boolfnames              global (readonly)
-            boolnames               global (readonly)
-            border                  window (stdscr)
-            border_set              window (stdscr)
-            box                     window (stdscr)
-            box_set                 window (stdscr)
-            can_change_color        terminal
-            cbreak                  screen
-            chgat                   window (stdscr)
-            clear                   window (stdscr)
-            clearok                 window
-            clrtobot                window (stdscr)
-            clrtoeol                window (stdscr)
-            color_content           screen
-
-            color_set               window (stdscr)
-            copywin                 window locks(source, target)
-            cur_term                terminal
-            curs_set                screen
-            curscr                  screen (readonly)
-            curses_version          global (readonly)
-            def_prog_mode           terminal
-            def_shell_mode          terminal
-            define_key              screen
-            del_curterm             screen
-            delay_output            screen
-            delch                   window (stdscr)
-            deleteln                window (stdscr)
-            delscreen               global locks(screenlist, screen)
-            delwin                  global locks(windowlist)
-            derwin                  screen
-            doupdate                screen
-            dupwin                  screen locks(window)
-            echo                    screen
-            echo_wchar              window (stdscr)
-            echochar                window (stdscr)
-            endwin                  screen
-            erase                   window (stdscr)
-            erasechar               window (stdscr)
-            erasewchar              window (stdscr)
-            filter                  global
-            flash                   terminal
-            flushinp                screen
-            get_wch                 screen (input-operation)
-            get_wstr                screen (input-operation)
-            getattrs                window
-            getbegx                 window
-            getbegy                 window
-            getbkgd                 window
-            getbkgrnd               window
-            getcchar                reentrant
-            getch                   screen (input-operation)
-            getcurx                 window
-            getcury                 window
-            getmaxx                 window
-            getmaxy                 window
-            getmouse                screen (input-operation)
-            getn_wstr               screen (input-operation)
-            getnstr                 screen (input-operation)
-            getparx                 window
-            getpary                 window
-            getstr                  screen (input-operation)
-            getwin                  screen (input-operation)
-            halfdelay               screen
-            has_colors              terminal
-            has_ic                  terminal
-            has_il                  terminal
-            has_key                 screen
-            hline                   window (stdscr)
-            hline_set               window (stdscr)
-            idcok                   window
-            idlok                   window
-            immedok                 window
-            in_wch                  window (stdscr)
-            in_wchnstr              window (stdscr)
-            in_wchstr               window (stdscr)
-            inch                    window (stdscr)
-            inchnstr                window (stdscr)
-            inchstr                 window (stdscr)
-            init_color              screen
-            init_pair               screen
-
-            initscr                 global locks(screenlist)
-            innstr                  window (stdscr)
-            innwstr                 window (stdscr)
-            ins_nwstr               window (stdscr)
-            ins_wch                 window (stdscr)
-            ins_wstr                window (stdscr)
-            insch                   window (stdscr)
-            insdelln                window (stdscr)
-            insertln                window (stdscr)
-            insnstr                 window (stdscr)
-            insstr                  window (stdscr)
-            instr                   window (stdscr)
-            intrflush               terminal
-            inwstr                  window (stdscr)
-            is_cleared              window
-            is_idcok                window
-            is_idlok                window
-            is_immedok              window
-            is_keypad               window
-            is_leaveok              window
-            is_linetouched          window
-            is_nodelay              window
-            is_notimeout            window
-            is_scrollok             window
-            is_syncok               window
-            is_term_resized         terminal
-            is_wintouched           window
-            isendwin                screen
-            key_defined             screen
-            key_name                global (static data)
-            keybound                screen
-            keyname                 global (static data)
-            keyok                   screen
-            keypad                  window
-            killchar                terminal
-            killwchar               terminal
-            leaveok                 window
-            longname                screen
-            mcprint                 terminal
-            meta                    screen
-            mouse_trafo             window (stdscr)
-            mouseinterval           screen
-            mousemask               screen
-            move                    window (stdscr)
-            mvadd_wch               window (stdscr)
-            mvadd_wchnstr           window (stdscr)
-            mvadd_wchstr            window (stdscr)
-            mvaddch                 window (stdscr)
-            mvaddchnstr             window (stdscr)
-            mvaddchstr              window (stdscr)
-            mvaddnstr               window (stdscr)
-            mvaddnwstr              window (stdscr)
-            mvaddstr                window (stdscr)
-            mvaddwstr               window (stdscr)
-            mvchgat                 window (stdscr)
-            mvcur                   screen
-            mvdelch                 window (stdscr)
-            mvderwin                window (stdscr)
-            mvget_wch               screen (input-operation)
-            mvget_wstr              screen (input-operation)
-            mvgetch                 screen (input-operation)
-            mvgetn_wstr             screen (input-operation)
-            mvgetnstr               screen (input-operation)
-            mvgetstr                screen (input-operation)
-            mvhline                 window (stdscr)
-            mvhline_set             window (stdscr)
-
-            mvin_wch                window (stdscr)
-            mvin_wchnstr            window (stdscr)
-            mvin_wchstr             window (stdscr)
-            mvinch                  window (stdscr)
-            mvinchnstr              window (stdscr)
-            mvinchstr               window (stdscr)
-            mvinnstr                window (stdscr)
-            mvinnwstr               window (stdscr)
-            mvins_nwstr             window (stdscr)
-            mvins_wch               window (stdscr)
-            mvins_wstr              window (stdscr)
-            mvinsch                 window (stdscr)
-            mvinsnstr               window (stdscr)
-            mvinsstr                window (stdscr)
-            mvinstr                 window (stdscr)
-            mvinwstr                window (stdscr)
-            mvprintw                window (stdscr)
-            mvscanw                 screen
-            mvvline                 window (stdscr)
-            mvvline_set             window (stdscr)
-            mvwadd_wch              window
-            mvwadd_wchnstr          window
-            mvwadd_wchstr           window
-            mvwaddch                window
-            mvwaddchnstr            window
-            mvwaddchstr             window
-            mvwaddnstr              window
-            mvwaddnwstr             window
-            mvwaddstr               window
-            mvwaddwstr              window
-            mvwchgat                window
-            mvwdelch                window
-            mvwget_wch              screen (input-operation)
-            mvwget_wstr             screen (input-operation)
-            mvwgetch                screen (input-operation)
-            mvwgetn_wstr            screen (input-operation)
-            mvwgetnstr              screen (input-operation)
-            mvwgetstr               screen (input-operation)
-            mvwhline                window
-            mvwhline_set            window
-            mvwin                   window
-            mvwin_wch               window
-            mvwin_wchnstr           window
-            mvwin_wchstr            window
-            mvwinch                 window
-            mvwinchnstr             window
-            mvwinchstr              window
-            mvwinnstr               window
-            mvwinnwstr              window
-            mvwins_nwstr            window
-            mvwins_wch              window
-            mvwins_wstr             window
-            mvwinsch                window
-            mvwinsnstr              window
-            mvwinsstr               window
-            mvwinstr                window
-            mvwinwstr               window
-            mvwprintw               window
-            mvwscanw                screen
-            mvwvline                window
-            mvwvline_set            window
-            napms                   reentrant
-            newpad                  global locks(windowlist)
-            newscr                  screen (readonly)
-            newterm                 global locks(screenlist)
-            newwin                  global locks(windowlist)
-
-            nl                      screen
-            nocbreak                screen
-            nodelay                 window
-            noecho                  screen
-            nofilter                global
-            nonl                    screen
-            noqiflush               terminal
-            noraw                   screen
-            notimeout               window
-            numcodes                global (readonly)
-            numfnames               global (readonly)
-            numnames                global (readonly)
-            ospeed                  global
-            overlay                 window locks(source, target)
-            overwrite               window locks(source, target)
-            pair_content            screen
-            pecho_wchar             screen
-            pechochar               screen
-            pnoutrefresh            screen
-            prefresh                screen
-            printw                  window
-            putp                    global
-            putwin                  window
-            qiflush                 terminal
-            raw                     screen
-            redrawwin               window
-            refresh                 screen
-            reset_prog_mode         screen
-            reset_shell_mode        screen
-            resetty                 terminal
-            resize_term             screen locks(windowlist)
-            resizeterm              screen
-            restartterm             screen
-            ripoffline              global (static data)
-            savetty                 terminal
-            scanw                   screen
-            scr_dump                screen
-            scr_init                screen
-            scr_restore             screen
-            scr_set                 screen
-            scrl                    window (stdscr)
-            scroll                  window
-            scrollok                window
-            set_curterm             screen
-            set_escdelay            screen
-            set_tabsize             screen
-            set_term                global locks(screenlist, screen)
-            setcchar                reentrant
-            setscrreg               window (stdscr)
-            setupterm               global
-            slk_attr                screen
-            slk_attr_off            screen
-            slk_attr_on             screen
-            slk_attr_set            screen
-            slk_attroff             screen
-            slk_attron              screen
-            slk_attrset             screen
-            slk_clear               screen
-            slk_color               screen
-            slk_init                screen
-            slk_label               screen
-            slk_noutrefresh         screen
-            slk_refresh             screen
-            slk_restore             screen
-            slk_set                 screen
-            slk_touch               screen
-
-            slk_wset                screen
-            standend                window
-            standout                window
-            start_color             screen
-            stdscr                  screen (readonly)
-            strcodes                global (readonly)
-            strfnames               global (readonly)
-            strnames                global (readonly)
-            subpad                  window
-            subwin                  window
-            syncok                  window
-            term_attrs              screen
-            termattrs               screen
-            termname                terminal
-            tgetent                 global
-            tgetflag                global
-            tgetnum                 global
-            tgetstr                 global
-            tgoto                   global
-            tigetflag               terminal
-            tigetnum                terminal
-            tigetstr                terminal
-            timeout                 window (stdscr)
-            touchline               window
-            touchwin                window
-            tparm                   global (static data)
-            tputs                   screen
-            trace                   global (static data)
-            ttytype                 screen (readonly)
-            typeahead               screen
-            unctrl                  screen
-            unget_wch               screen (input-operation)
-            ungetch                 screen (input-operation)
-            ungetmouse              screen (input-operation)
-            untouchwin              window
-            use_default_colors      screen
-            use_env                 global (static data)
-            use_extended_names      global (static data)
-            use_legacy_coding       screen
-            use_screen              global locks(screenlist, screen)
-            use_window              global locks(windowlist, window)
-            vid_attr                screen
-            vid_puts                screen
-            vidattr                 screen
-            vidputs                 screen
-            vline                   window (stdscr)
-            vline_set               window (stdscr)
-            vw_printw               window
-            vw_scanw                screen
-            vwprintw                window
-            vwscanw                 screen
-            wadd_wch                window
-            wadd_wchnstr            window
-            wadd_wchstr             window
-            waddch                  window
-            waddchnstr              window
-            waddchstr               window
-            waddnstr                window
-            waddnwstr               window
-            waddstr                 window
-            waddwstr                window
-            wattr_get               window
-            wattr_off               window
-            wattr_on                window
-            wattr_set               window
-            wattroff                window
-
-            wattron                 window
-            wattrset                window
-            wbkgd                   window
-            wbkgdset                window
-            wbkgrnd                 window
-            wbkgrndset              window
-            wborder                 window
-            wborder_set             window
-            wchgat                  window
-            wclear                  window
-            wclrtobot               window
-            wclrtoeol               window
-            wcolor_set              window
-            wcursyncup              screen (affects window plus parents)
-            wdelch                  window
-            wdeleteln               window
-            wecho_wchar             window
-            wechochar               window
-            wenclose                window
-            werase                  window
-            wget_wch                screen (input-operation)
-            wget_wstr               screen (input-operation)
-            wgetbkgrnd              window
-            wgetch                  screen (input-operation)
-            wgetdelay               window
-            wgetn_wstr              screen (input-operation)
-            wgetnstr                screen (input-operation)
-            wgetparent              window
-            wgetscrreg              window
-            wgetstr                 screen (input-operation)
-            whline                  window
-            whline_set              window
-            win_wch                 window
-            win_wchnstr             window
-            win_wchstr              window
-            winch                   window
-            winchnstr               window
-            winchstr                window
-            winnstr                 window
-            winnwstr                window
-            wins_nwstr              window
-            wins_wch                window
-            wins_wstr               window
-            winsch                  window
-            winsdelln               window
-            winsertln               window
-            winsnstr                window
-            winsstr                 window
-            winstr                  window
-            winwstr                 window
-            wmouse_trafo            window
-            wmove                   window
-            wnoutrefresh            screen
-            wprintw                 window
-            wredrawln               window
-            wrefresh                screen
-            wresize                 window locks(windowlist)
-            wscanw                  screen
-            wscrl                   window
-            wsetscrreg              window
-            wstandend               window
-            wstandout               window
-            wsyncdown               screen (affects window plus parents)
-            wsyncup                 screen (affects window plus parents)
-            wtimeout                window
-            wtouchln                window
-
-            wunctrl                 global (static data)
-            wvline                  window
-            wvline_set              window
+       The  ncurses  library  can  be  configured  to  support  multi-threaded
+       applications in a  rudimentary  way.   Such  configuration  produces  a
+       different set of libraries, named libncursest, for example, since doing
+       so alters ncurses's application binary interface (ABI).
+
+       Instead of modifying the programming interface (API)  to  make  ncurses
+       functions  expect  an  additional  argument  specifying  a  thread, the
+       library adds functions, usable in  any  configuration,  that  hide  the
+       mutexes (mutual exclusion locks) needed to prevent concurrent access to
+       variables shared by multiple threads of execution.
+
+       ncurses threading support requires  the  use  of  functions  to  access
+       members  of  the  WINDOW  structure  (see curs_opaque(3x)).  It further
+       makes functions of the common  global  variables  COLORS,  COLOR_PAIRS,
+       COLS,   ESCDELAY,   LINES,   TABSIZE,   curscr,  newscr,  and  ttytype,
+       maintaining them as read-only values in the SCREEN structure.
+
+       Even this is not enough to make an  application  using  curses  thread-
+       safe.   We  would  expect  a multi-threaded application to have threads
+       updating separate windows (on the same device),  and  separate  screens
+       (on  different  devices).   Further,  applications  expect a few of the
+       global variables to be writable.  The functions described here  address
+       these special situations.
+
+       The  ESCDELAY  and  TABSIZE  global  variables  are  modified  by  some
+       applications.   To  modify  them  in   any   configuration,   use   the
+       set_escdelay  or set_tabsize functions.  Other global variables are not
+       modifiable.  get_escdelay retrieves ESCDELAY's value.
+
+       The use_window and use_screen functions provide coarse-grained  mutexes
+       for  their  respective  WINDOW and SCREEN parameters; they call a user-
+       supplied function, pass it a data parameter, and return the value  from
+       the user-supplied function to the application.
+
+
+

            Usage

            +       All  ncurses  library  functions  assume that the locale is not altered
+       during operation.  In addition, they use data that is maintained within
+       a hierarchy of scopes.
+
+       o   global data used in the low-level terminfo or termcap interfaces
+
+       o   terminal data associated with a call to set_curterm(3x)
+
+           Terminal data are initialized when screens are created.
+
+       o   screen data associated with a call to newterm(3x) or initscr(3x)
+
+       o   window data associated with a call to newwin(3x) or subwin(3x)
+
+           Windows  are  associated  with  screens.   Pads are not necessarily
+           associated with any particular screen.
+
+           Most curses applications operate on one or more  windows  within  a
+           single screen.
+
+       o   reentrant  data  associated  with  "pure"  functions  that alter no
+           shared variables
+
+       The following table lists the scope  of  each  symbol  in  the  ncurses
+       library when configured to support multi-threaded applications.
+
+       Symbol                 Scope
+       ------------------------------------------------------------------------
+       BC                     global
+       COLORS                 screen (read-only)
+       COLOR_PAIR             reentrant
+       COLOR_PAIRS            screen (read-only)
+       COLS                   screen (read-only)
+       ESCDELAY               screen (read-only; see set_escdelay)
+       LINES                  screen (read-only)
+       PAIR_NUMBER            reentrant
+       PC                     global
+       SP                     global
+       TABSIZE                screen (read-only; see set_tabsize)
+       UP                     global
+       acs_map                screen (read-only)
+       add_wch                window (stdscr)
+       add_wchnstr            window (stdscr)
+       add_wchstr             window (stdscr)
+       addch                  window (stdscr)
+       addchnstr              window (stdscr)
+       addchstr               window (stdscr)
+       addnstr                window (stdscr)
+       addnwstr               window (stdscr)
+       addstr                 window (stdscr)
+       addwstr                window (stdscr)
+       assume_default_colors  screen
+       attr_get               window (stdscr)
+       attr_off               window (stdscr)
+       attr_on                window (stdscr)
+       attr_set               window (stdscr)
+       attroff                window (stdscr)
+       attron                 window (stdscr)
+       attrset                window (stdscr)
+       baudrate               screen
+       beep                   screen
+       bkgd                   window (stdscr)
+       bkgdset                window (stdscr)
+       bkgrnd                 window (stdscr)
+       bkgrndset              window (stdscr)
+       boolcodes              global (read-only)
+       boolfnames             global (read-only)
+       boolnames              global (read-only)
+       border                 window (stdscr)
+       border_set             window (stdscr)
+       box                    window (stdscr)
+       box_set                window (stdscr)
+       can_change_color       terminal
+       cbreak                 screen
+
+       chgat                  window (stdscr)
+       clear                  window (stdscr)
+       clearok                window
+       clrtobot               window (stdscr)
+       clrtoeol               window (stdscr)
+       color_content          screen
+       color_set              window (stdscr)
+       copywin                window (locks source, target)
+       cur_term               terminal
+       curs_set               screen
+       curscr                 screen (read-only)
+       curses_version         global (read-only)
+       def_prog_mode          terminal
+       def_shell_mode         terminal
+       define_key             screen
+       del_curterm            screen
+       delay_output           screen
+       delch                  window (stdscr)
+       deleteln               window (stdscr)
+       delscreen              global (locks screen list, screen)
+       delwin                 global (locks window list)
+       derwin                 screen
+       doupdate               screen
+       dupwin                 screen (locks window)
+       echo                   screen
+       echo_wchar             window (stdscr)
+       echochar               window (stdscr)
+       endwin                 screen
+       erase                  window (stdscr)
+       erasechar              window (stdscr)
+       erasewchar             window (stdscr)
+       filter                 global
+       flash                  terminal
+       flushinp               screen
+       get_wch                screen (input operation)
+       get_wstr               screen (input operation)
+       getattrs               window
+       getbegx                window
+       getbegy                window
+       getbkgd                window
+       getbkgrnd              window
+       getcchar               reentrant
+       getch                  screen (input operation)
+       getcurx                window
+       getcury                window
+       getmaxx                window
+       getmaxy                window
+       getmouse               screen (input operation)
+       getn_wstr              screen (input operation)
+       getnstr                screen (input operation)
+       getparx                window
+       getpary                window
+       getstr                 screen (input operation)
+       getwin                 screen (input operation)
+       halfdelay              screen
+       has_colors             terminal
+       has_ic                 terminal
+       has_il                 terminal
+       has_key                screen
+       hline                  window (stdscr)
+       hline_set              window (stdscr)
+       idcok                  window
+       idlok                  window
+       immedok                window
+       in_wch                 window (stdscr)
+       in_wchnstr             window (stdscr)
+
+       in_wchstr              window (stdscr)
+       inch                   window (stdscr)
+       inchnstr               window (stdscr)
+       inchstr                window (stdscr)
+       init_color             screen
+       init_pair              screen
+       initscr                global (locks screen list)
+       innstr                 window (stdscr)
+       innwstr                window (stdscr)
+       ins_nwstr              window (stdscr)
+       ins_wch                window (stdscr)
+       ins_wstr               window (stdscr)
+       insch                  window (stdscr)
+       insdelln               window (stdscr)
+       insertln               window (stdscr)
+       insnstr                window (stdscr)
+       insstr                 window (stdscr)
+       instr                  window (stdscr)
+       intrflush              terminal
+       inwstr                 window (stdscr)
+       is_cleared             window
+       is_idcok               window
+       is_idlok               window
+       is_immedok             window
+       is_keypad              window
+       is_leaveok             window
+       is_linetouched         window
+       is_nodelay             window
+       is_notimeout           window
+       is_scrollok            window
+       is_syncok              window
+       is_term_resized        terminal
+       is_wintouched          window
+       isendwin               screen
+       key_defined            screen
+       key_name               global (static data)
+       keybound               screen
+       keyname                global (static data)
+       keyok                  screen
+       keypad                 window
+       killchar               terminal
+       killwchar              terminal
+       leaveok                window
+       longname               screen
+       mcprint                terminal
+       meta                   screen
+       mouse_trafo            window (stdscr)
+       mouseinterval          screen
+       mousemask              screen
+       move                   window (stdscr)
+       mvadd_wch              window (stdscr)
+       mvadd_wchnstr          window (stdscr)
+       mvadd_wchstr           window (stdscr)
+       mvaddch                window (stdscr)
+       mvaddchnstr            window (stdscr)
+       mvaddchstr             window (stdscr)
+       mvaddnstr              window (stdscr)
+       mvaddnwstr             window (stdscr)
+       mvaddstr               window (stdscr)
+       mvaddwstr              window (stdscr)
+       mvchgat                window (stdscr)
+       mvcur                  screen
+       mvdelch                window (stdscr)
+       mvderwin               window (stdscr)
+       mvget_wch              screen (input operation)
+       mvget_wstr             screen (input operation)
+
+       mvgetch                screen (input operation)
+       mvgetn_wstr            screen (input operation)
+       mvgetnstr              screen (input operation)
+       mvgetstr               screen (input operation)
+       mvhline                window (stdscr)
+       mvhline_set            window (stdscr)
+       mvin_wch               window (stdscr)
+       mvin_wchnstr           window (stdscr)
+       mvin_wchstr            window (stdscr)
+       mvinch                 window (stdscr)
+       mvinchnstr             window (stdscr)
+       mvinchstr              window (stdscr)
+       mvinnstr               window (stdscr)
+       mvinnwstr              window (stdscr)
+       mvins_nwstr            window (stdscr)
+       mvins_wch              window (stdscr)
+       mvins_wstr             window (stdscr)
+       mvinsch                window (stdscr)
+       mvinsnstr              window (stdscr)
+       mvinsstr               window (stdscr)
+       mvinstr                window (stdscr)
+       mvinwstr               window (stdscr)
+       mvprintw               window (stdscr)
+       mvscanw                screen
+       mvvline                window (stdscr)
+       mvvline_set            window (stdscr)
+       mvwadd_wch             window
+       mvwadd_wchnstr         window
+       mvwadd_wchstr          window
+       mvwaddch               window
+       mvwaddchnstr           window
+       mvwaddchstr            window
+       mvwaddnstr             window
+       mvwaddnwstr            window
+       mvwaddstr              window
+       mvwaddwstr             window
+       mvwchgat               window
+       mvwdelch               window
+       mvwget_wch             screen (input operation)
+       mvwget_wstr            screen (input operation)
+       mvwgetch               screen (input operation)
+       mvwgetn_wstr           screen (input operation)
+       mvwgetnstr             screen (input operation)
+       mvwgetstr              screen (input operation)
+       mvwhline               window
+       mvwhline_set           window
+       mvwin                  window
+       mvwin_wch              window
+       mvwin_wchnstr          window
+       mvwin_wchstr           window
+       mvwinch                window
+       mvwinchnstr            window
+       mvwinchstr             window
+       mvwinnstr              window
+       mvwinnwstr             window
+       mvwins_nwstr           window
+       mvwins_wch             window
+       mvwins_wstr            window
+       mvwinsch               window
+       mvwinsnstr             window
+       mvwinsstr              window
+       mvwinstr               window
+       mvwinwstr              window
+       mvwprintw              window
+       mvwscanw               screen
+       mvwvline               window
+
+       mvwvline_set           window
+       napms                  reentrant
+       newpad                 global (locks window list)
+       newscr                 screen (read-only)
+       newterm                global (locks screen list)
+       newwin                 global (locks window list)
+       nl                     screen
+       nocbreak               screen
+       nodelay                window
+       noecho                 screen
+       nofilter               global
+       nonl                   screen
+       noqiflush              terminal
+       noraw                  screen
+       notimeout              window
+       numcodes               global (read-only)
+       numfnames              global (read-only)
+       numnames               global (read-only)
+       ospeed                 global
+       overlay                window (locks source, target)
+       overwrite              window (locks source, target)
+       pair_content           screen
+       pecho_wchar            screen
+       pechochar              screen
+       pnoutrefresh           screen
+       prefresh               screen
+       printw                 window
+       putp                   global
+       putwin                 window
+       qiflush                terminal
+       raw                    screen
+       redrawwin              window
+       refresh                screen
+       reset_prog_mode        screen
+       reset_shell_mode       screen
+       resetty                terminal
+       resize_term            screen (locks window list)
+       resizeterm             screen
+       restartterm            screen
+       ripoffline             global (static data)
+       savetty                terminal
+       scanw                  screen
+       scr_dump               screen
+       scr_init               screen
+       scr_restore            screen
+       scr_set                screen
+       scrl                   window (stdscr)
+       scroll                 window
+       scrollok               window
+       set_curterm            screen
+       set_escdelay           screen
+       set_tabsize            screen
+       set_term               global (locks screen list, screen)
+       setcchar               reentrant
+       setscrreg              window (stdscr)
+       setupterm              global
+       slk_attr               screen
+       slk_attr_off           screen
+       slk_attr_on            screen
+       slk_attr_set           screen
+       slk_attroff            screen
+       slk_attron             screen
+       slk_attrset            screen
+       slk_clear              screen
+       slk_color              screen
+       slk_init               screen
+
+       slk_label              screen
+       slk_noutrefresh        screen
+       slk_refresh            screen
+       slk_restore            screen
+       slk_set                screen
+       slk_touch              screen
+       slk_wset               screen
+       standend               window
+       standout               window
+       start_color            screen
+       stdscr                 screen (read-only)
+       strcodes               global (read-only)
+       strfnames              global (read-only)
+       strnames               global (read-only)
+       subpad                 window
+       subwin                 window
+       syncok                 window
+       term_attrs             screen
+       termattrs              screen
+       termname               terminal
+       tgetent                global
+       tgetflag               global
+       tgetnum                global
+       tgetstr                global
+       tgoto                  global
+       tigetflag              terminal
+       tigetnum               terminal
+       tigetstr               terminal
+       timeout                window (stdscr)
+       touchline              window
+       touchwin               window
+       tparm                  global (static data)
+       tputs                  screen
+       trace                  global (static data)
+       ttytype                screen (read-only)
+       typeahead              screen
+       unctrl                 screen
+       unget_wch              screen (input operation)
+       ungetch                screen (input operation)
+       ungetmouse             screen (input operation)
+       untouchwin             window
+       use_default_colors     screen
+       use_env                global (static data)
+       use_extended_names     global (static data)
+       use_legacy_coding      screen
+       use_screen             global (locks screen list, screen)
+       use_window             global (locks window list, window)
+       vid_attr               screen
+       vid_puts               screen
+       vidattr                screen
+       vidputs                screen
+       vline                  window (stdscr)
+       vline_set              window (stdscr)
+       vw_printw              window
+       vw_scanw               screen
+       vwprintw               window
+       vwscanw                screen
+       wadd_wch               window
+       wadd_wchnstr           window
+       wadd_wchstr            window
+       waddch                 window
+       waddchnstr             window
+       waddchstr              window
+       waddnstr               window
+       waddnwstr              window
+       waddstr                window
+
+       waddwstr               window
+       wattr_get              window
+       wattr_off              window
+       wattr_on               window
+       wattr_set              window
+       wattroff               window
+       wattron                window
+       wattrset               window
+       wbkgd                  window
+       wbkgdset               window
+       wbkgrnd                window
+       wbkgrndset             window
+       wborder                window
+       wborder_set            window
+       wchgat                 window
+       wclear                 window
+       wclrtobot              window
+       wclrtoeol              window
+       wcolor_set             window
+       wcursyncup             screen (affects window plus parents)
+       wdelch                 window
+       wdeleteln              window
+       wecho_wchar            window
+       wechochar              window
+       wenclose               window
+       werase                 window
+       wget_wch               screen (input operation)
+       wget_wstr              screen (input operation)
+       wgetbkgrnd             window
+       wgetch                 screen (input operation)
+       wgetdelay              window
+       wgetn_wstr             screen (input operation)
+       wgetnstr               screen (input operation)
+       wgetparent             window
+       wgetscrreg             window
+       wgetstr                screen (input operation)
+       whline                 window
+       whline_set             window
+       win_wch                window
+       win_wchnstr            window
+       win_wchstr             window
+       winch                  window
+       winchnstr              window
+       winchstr               window
+       winnstr                window
+       winnwstr               window
+       wins_nwstr             window
+       wins_wch               window
+       wins_wstr              window
+       winsch                 window
+       winsdelln              window
+       winsertln              window
+       winsnstr               window
+       winsstr                window
+       winstr                 window
+       winwstr                window
+       wmouse_trafo           window
+       wmove                  window
+       wnoutrefresh           screen
+       wprintw                window
+       wredrawln              window
+       wrefresh               screen
+       wresize                window (locks window list)
+       wscanw                 screen
+       wscrl                  window
+       wsetscrreg             window
+
+       wstandend              window
+       wstandout              window
+       wsyncdown              screen (affects window plus parents)
+       wsyncup                screen (affects window plus parents)
+       wtimeout               window
+       wtouchln               window
+       wunctrl                global (static data)
+       wvline                 window
+       wvline_set             window

            RETURN VALUE

            -       These functions all return TRUE or FALSE, except as noted.
+       get_escdelay   returns   the   value  of  ESCDELAY.   set_escdelay  and
+       set_tabsize return ERR upon failure and OK upon successful  completion.
+       use_screen  and use_window return the int returned by the user-supplied
+       function they are called with.

            NOTES

            -       Both a macro and a function are provided for each name.
+       ncurses provides both a C function and a preprocessor  macro  for  each
+       function documented in this page.

            PORTABILITY

            -       These routines are specific to ncurses.  They  were  not  supported  on
+       These  routines  are  specific  to ncurses.  They were not supported on
        Version 7, BSD or System V implementations.  It is recommended that any
-       code depending on ncurses extensions be conditioned using  NCURSES_VER-
-       SION.
+       code   depending   on   ncurses   extensions   be   conditioned   using
+       NCURSES_VERSION.

            SEE ALSO

            -       curses(3x), curs_opaque(3x), curs_variables(3x).
+       curses(3x), curs_opaque(3x), curs_variables(3x)
 
 
 
-                                                              curs_threads(3x)
+ncurses 6.5                       2025-02-15                  curs_threads(3x)
              @@ -616,7 +625,7 @@

              curs_threads 3x

            • SYNOPSIS
            • DESCRIPTION
            • RETURN VALUE
              • diff --git a/doc/html/man/curs_touch.3x.html b/doc/html/man/curs_touch.3x.html index 4c63cb98..1a0fc4c9 100644 --- a/doc/html/man/curs_touch.3x.html +++ b/doc/html/man/curs_touch.3x.html @@ -1,6 +1,6 @@ -curs_touch 3x +curs_touch 3x 2025-01-18 ncurses 6.5 Library calls -

              curs_touch 3x

              +

              curs_touch 3x 2025-01-18 ncurses 6.5 Library calls

              -curs_touch(3x)                                                  curs_touch(3x)
+curs_touch(3x)                   Library calls                  curs_touch(3x)

              NAME

              -       touchwin, touchline, untouchwin, wtouchln, is_linetouched,
-       is_wintouched - curses refresh control routines
+       touchwin,     touchline,    untouchwin,    wtouchln,    is_linetouched,
+       is_wintouched - control terminal output refresh in a curses window

              SYNOPSIS

              @@ -66,37 +66,37 @@ 
              curs_touch 3x

              DESCRIPTION

              -       The touchwin and touchline routines throw away all optimization  infor-
-       mation about which parts of the window have been touched, by pretending
-       that the entire window has been drawn on.  This is sometimes  necessary
-       when  using  overlapping  windows, since a change to one window affects
-       the other window, but the records of which lines have been  changed  in
-       the other window do not reflect the change.  The routine touchline only
-       pretends that count lines have been changed, beginning with line start.
+       The  touchwin  and  touchline  routines  throw  away  all  optimization
+       information  about  which  parts  of  the  window have been touched, by
+       pretending that the entire window has been drawn on.  This is sometimes
+       necessary  when using overlapping windows, since a change to one window
+       affects the other window, but the records  of  which  lines  have  been
+       changed  in  the  other  window do not reflect the change.  The routine
+       touchline only pretends that count lines have been  changed,  beginning
+       with line start.
 
        The untouchwin routine marks all lines in the window as unchanged since
        the last call to wrefresh.
 
-       The  wtouchln  routine makes n lines in the window, starting at line y,
-       look as if they have (changed=1) or have not (changed=0)  been  changed
+       The wtouchln routine makes n lines in the window, starting at  line  y,
+       look  as  if they have (changed=1) or have not (changed=0) been changed
        since the last call to wrefresh.
 
-       The is_linetouched and is_wintouched routines return TRUE if the speci-
-       fied line/window was modified since the last call to  wrefresh;  other-
-       wise  they  return  FALSE.   In addition, is_linetouched returns ERR if
-       line is not valid for the given window.
+       The is_linetouched  and  is_wintouched  routines  return  TRUE  if  the
+       specified  line/window  was  modified  since the last call to wrefresh;
+       otherwise they return FALSE.  In addition, is_linetouched  returns  ERR
+       if line is not valid for the given window.

              RETURN VALUE

              -       All routines return the integer ERR upon failure and an  integer  value
-       other  than  ERR  upon successful completion, unless otherwise noted in
-       the preceding routine descriptions.
+       Functions  returning  integers  return  ERR  upon  failure  and OK upon
+       success.
 
-       X/Open does not define any error conditions.  In this implementation
+       In ncurses,
 
           is_linetouched
-               returns an error if the window pointer is null, or if the  line
-               number is outside the window.
+               returns ERR if the window pointer  is  null,  or  if  the  line
+               number is outside the window boundaries.
 
                The constant ERR is distinct from TRUE and FALSE, which are the
                normal return values of this function.   Because  the  function
@@ -108,31 +108,37 @@ 
              curs_touch 3x
              
                The actual function returns FALSE when it detects an error.
 
           wtouchln
-               returns an error if the window pointer is null, or if the  line
-               number is outside the window.
+               returns ERR if the window pointer  is  null,  or  if  the  line
+               number is outside the window boundaries.
+
+
+

              NOTES

              +       All of these functions except wtouchln may be implemented as macros.

              PORTABILITY

              -       These  functions  were  introduced  by SVr4.  The Solaris curses header
-       file, for instance, defines both an actual function and macro for each.
-       The  macros  give the same result as the actual functions.  SVr4 curses
-       does not check the window parameter win to ensure that it is not  NULL;
-       otherwise this implementation behaves the same as SVr4.
+       X/Open Curses Issue 4 describes these functions.  It specifies no error
+       conditions for them.
 
-       The XSI Curses standard, Issue 4 describes these functions, but defines
-       no error conditions.
+       SVr4 describes a successful return value except where "otherwise noted"
+       as "an integer value other than ERR".
 
+       SVr4 does not check win to ensure that it is not a null pointer.
 
-

              NOTES

              -       All of these routines except wtouchln may be macros.
+
+

              HISTORY

              +       SVr2 (1984) introduced touchwin,
+
+       SVr3   (1987)   added  touchline.   SVr3.1  later  that  year  supplied
+       is_linetouched, is_wintouched, untouchwin, and wtouchln.

              SEE ALSO

              -       curses(3x), curs_refresh(3x), curs_variables(3x).
+       curses(3x), curs_refresh(3x), curs_variables(3x)
 
 
 
-                                                                curs_touch(3x)
+ncurses 6.5                       2025-01-18                    curs_touch(3x)
              diff --git a/doc/html/man/curs_trace.3x.html b/doc/html/man/curs_trace.3x.html index f670c86c..77bc6aa0 100644 --- a/doc/html/man/curs_trace.3x.html +++ b/doc/html/man/curs_trace.3x.html @@ -1,6 +1,6 @@ -curs_trace 3x +curs_trace 3x 2025-01-18 ncurses 6.5 Library calls -

              curs_trace 3x

              +

              curs_trace 3x 2025-01-18 ncurses 6.5 Library calls

              -curs_trace(3x)                                                  curs_trace(3x)
+curs_trace(3x)                   Library calls                  curs_trace(3x)

              NAME

              -       curses_trace, trace, _tracef, _traceattr, _traceattr2, _tracecchar_t,
+       curses_trace,  trace,  _tracef, _traceattr, _traceattr2, _tracecchar_t,
        _tracecchar_t2, _tracechar, _tracechtype, _tracechtype2, _nc_tracebits,
-       _tracedump, _tracemouse - curses debugging routines
+       _tracedump, _tracemouse - curses debugging routines

              SYNOPSIS

                      #include <curses.h>
 
-       unsigned curses_trace(const unsigned param);
+       unsigned curses_trace(const unsigned trace-mask);
 
        void _tracef(const char *format, ...);
 
@@ -63,7 +63,7 @@ 
              curs_trace 3x
              
        char *_traceattr2(int buffer, chtype ch);
        char *_tracecchar_t(const cchar_t *string);
        char *_tracecchar_t2(int buffer, const cchar_t *string);
-       char *_tracechar(int ch);
+       char *_tracechar(int c);
        char *_tracechtype(chtype ch);
        char *_tracechtype2(int buffer, chtype ch);
 
@@ -71,14 +71,14 @@ 
              curs_trace 3x
              
        char *_nc_tracebits(void);
        char *_tracemouse(const MEVENT *event);
 
-       /* deprecated */
-       void trace(const unsigned int param);
+       /* deprecated */
+       void trace(const unsigned int trace-mask);

              DESCRIPTION

              -       The curses trace routines are used for debugging the ncurses libraries,
-       as well as applications which use the ncurses libraries.  Some  limita-
-       tions apply:
+       The curses trace routines are used for debugging the ncurses libraries,
+       as  well  as  applications  which  use  the  ncurses  libraries.   Some
+       limitations apply:
 
        o   Aside from curses_trace, the other functions are normally available
            only with the debugging library e.g., libncurses_g.a.
@@ -98,9 +98,9 @@ 
              curs_trace 3x
              
 
        o   _tracef, which writes formatted data to the trace file.
 
-           The other functions either return a pointer to a string-area (allo-
-           cated by the corresponding function), or return no value  (such  as
-           _tracedump,  which  implements  the  screen dump for TRACE_UPDATE).
+           The  other  functions  either  return  a  pointer  to a string-area
+           (allocated by the corresponding function), or return no value (such
+           as  _tracedump, which implements the screen dump for TRACE_UPDATE).
            The caller should not free these strings, since the  allocation  is
            reused on successive calls.  To work around the problem of a single
            string-area per  function,  some  use  a  buffer-number  parameter,
@@ -109,26 +109,27 @@ 
              curs_trace 3x
              
        The curses_trace function is always available, whether or not the other
        trace functions are available:
 
-       o   If tracing is available, calling curses_trace with a nonzero param-
-           eter updates the trace mask, and returns the previous trace mask.
+       o   If tracing  is  available,  calling  curses_trace  with  a  nonzero
+           parameter  updates  the  trace mask, and returns the previous trace
+           mask.
 
-           When the trace mask is nonzero, ncurses creates the file "trace" in
-           the current directory for output.  If the file already  exists,  no
+           When the trace mask is nonzero, ncurses creates the file "trace" in
+           the  current  directory for output.  If the file already exists, no
            tracing is done.
 
        o   If tracing is not available, curses_trace returns zero (0).

              Trace Parameter

              -       The  trace  parameter  is  formed  by  OR'ing  values  from the list of
-       TRACE_xxx definitions in <curses.h>.  These include:
+       The trace parameter is formed by logically  "or"-ing  values  from  the
+       list of TRACE_xxx definitions in <curses.h>.  These include:
 
        TRACE_DISABLE
             turn off tracing by passing a zero parameter.
 
-            The library flushes the output file, but retains an open  file-de-
-            scriptor  to the trace file so that it can resume tracing later if
-            a nonzero parameter is passed to the curses_trace function.
+            The  library  flushes  the  output file, but retains an open file-
+            descriptor to the trace file so that it can resume  tracing  later
+            if a nonzero parameter is passed to the curses_trace function.
 
        TRACE_TIMES
             trace user and system times of updates.
@@ -146,11 +147,11 @@ 
              curs_trace 3x
              
             trace all character outputs.
 
        TRACE_ORDINARY
-            trace all update actions.  The old and  new  screen  contents  are
+            trace  all  update  actions.   The old and new screen contents are
             written to the trace file for each refresh.
 
        TRACE_CALLS
-            trace  all curses calls.  The parameters for each call are traced,
+            trace all curses calls.  The parameters for each call are  traced,
             as well as return values.
 
        TRACE_VIRTPUT
@@ -177,36 +178,27 @@ 
              curs_trace 3x
              
        TRACE_MAXIMUM
             maximum trace level, enables all of the separate trace features.
 
-       Some tracing features are enabled whenever the  curses_trace  parameter
-       is  nonzero.   Some features overlap.  The specific names are used as a
+       Some  tracing  features are enabled whenever the curses_trace parameter
+       is nonzero.  Some features overlap.  The specific names are used  as  a
        guideline.
 
 
-

              Initialization

              -       These functions check the NCURSES_TRACE environment  variable,  to  set
-       the tracing feature as if curses_trace was called:
-
-           filter, initscr, new_prescr, newterm, nofilter, restartterm,
-           ripoffline, setupterm, slk_init, tgetent, use_env,
-           use_extended_names, use_tioctl
-
-

              Command-line Utilities

                      The  command-line  utilities  such  as  tic(1) provide a verbose option
-       which extends the set of messages written using the curses_trace  func-
-       tion.   Both  of  these  (-v  and  curses_trace)  use the same variable
+       which extends the  set  of  messages  written  using  the  curses_trace
+       function.   Both  of  these (-v and curses_trace) use the same variable
        (_nc_tracing), which determines the messages which are written.
 
        Because the command-line utilities may  call  initialization  functions
-       such  as setupterm, tgetent or use_extended_names, some of their debug-
-       ging output may be directed to the trace file if the NCURSES_TRACE  en-
-       vironment variable is set:
+       such  as  setupterm,  tgetent  or  use_extended_names,  some  of  their
+       debugging output may be directed to the trace file if the NCURSES_TRACE
+       environment variable is set:
 
        o   messages produced in the utility are written to the standard error.
 
        o   messages produced by the underlying library are written to trace.
 
-       If  ncurses  is built without tracing, none of the latter are produced,
+       If  ncurses  is built without tracing, none of the latter are produced,
        and fewer diagnostics are provided by the command-line utilities.
 
 
@@ -215,35 +207,47 @@ 
              curs_trace 3x
              
        the _tracef routine.
 
 
+

              ENVIRONMENT

              +
+

              NCURSES_TRACE

              +       A  positive integral value stored in this variable causes the following
+       functions to enable the tracing feature as if curses_trace were called.
+
+           filter, initscr, new_prescr, newterm, nofilter, restartterm,
+           ripoffline, setupterm, slk_init, tgetent, use_env,
+           use_extended_names, use_tioctl
+
+

              PORTABILITY

              -       These  functions  are not part of the XSI interface.  Some other curses
-       implementations are known to have similar features, but  they  are  not
-       compatible with ncurses:
+       These functions are not part of  the  X/Open  Curses  interface.   Some
+       other  curses  implementations  are known to have similar features, but
+       they are not compatible with ncurses:
 
-       o   SVr4  provided  traceon  and traceoff, to control whether debugging
-           information was written to the "trace" file.  While  the  functions
-           were  always  available, this feature was only enabled if DEBUG was
+       o   SVr4 provided traceon and traceoff, to  control  whether  debugging
+           information  was  written to the "trace" file.  While the functions
+           were always available, this feature was only enabled if  DEBUG  was
            defined when building the library.
 
            The SVr4 tracing feature is undocumented.
 
-       o   PDCurses provides traceon and traceoff, which (like SVr4)  are  al-
-           ways  available, and enable tracing to the "trace" file only when a
-           debug-library is built.
+       o   PDCurses  provides  traceon  and  traceoff,  which  (like SVr4) are
+           always available, and enable tracing to the "trace" file only  when
+           a debug-library is built.
 
-           PDCurses has a short description of these functions,  with  a  note
-           that  they are not present in X/Open Curses, ncurses or NetBSD.  It
-           does not mention SVr4, but the functions'  inclusion  in  a  header
+           PDCurses  has  a  short description of these functions, with a note
+           that they are not present in X/Open Curses, ncurses or NetBSD.   It
+           does  not  mention  SVr4,  but the functions' inclusion in a header
            file section labeled "Quasi-standard" hints at the origin.
 
-       o   NetBSD  does  not  provide functions for enabling/disabling traces.
-           It  uses  environment   variables   CURSES_TRACE_MASK   and   CURS-
-           ES_TRACE_FILE  to  determine  what is traced, and where the results
-           are written.  This is available only when a debug-library is built.
+       o   NetBSD does not provide functions  for  enabling/disabling  traces.
+           It     uses    environment    variables    CURSES_TRACE_MASK    and
+           CURSES_TRACE_FILE to  determine  what  is  traced,  and  where  the
+           results  are  written.  This is available only when a debug-library
+           is built.
 
            The NetBSD tracing feature is undocumented.
 
-       A few ncurses functions are not  provided  when  symbol  versioning  is
+       A few ncurses functions are not  provided  when  symbol  versioning  is
        used:
 
            _nc_tracebits, _tracedump, _tracemouse
@@ -253,11 +257,11 @@ 
              curs_trace 3x

              SEE ALSO

              -       curses(3x).
+       curses(3x)
 
 
 
-                                                                curs_trace(3x)
+ncurses 6.5                       2025-01-18                    curs_trace(3x)
              diff --git a/doc/html/man/curs_util.3x.html b/doc/html/man/curs_util.3x.html index e258d143..033697e1 100644 --- a/doc/html/man/curs_util.3x.html +++ b/doc/html/man/curs_util.3x.html @@ -1,7 +1,7 @@ -curs_util 3x +curs_util 3x 2025-02-15 ncurses 6.5 Library calls -

              curs_util 3x

              +

              curs_util 3x 2025-02-15 ncurses 6.5 Library calls

              -curs_util(3x)                                                    curs_util(3x)
+curs_util(3x)                    Library calls                   curs_util(3x)

              NAME

              -       delay_output, filter, flushinp, getwin, key_name, keyname, nofilter,
-       putwin, unctrl, use_env, use_tioctl, wunctrl - miscellaneous curses
+       delay_output,  filter,  flushinp,  getwin, key_name, keyname, nofilter,
+       putwin, unctrl, use_env, use_tioctl,  wunctrl  -  miscellaneous  curses
        utility routines

              SYNOPSIS

                      #include <curses.h>
 
-       const char *unctrl(chtype c);
-       wchar_t *wunctrl(cchar_t *c);
+       const char * unctrl(chtype ch);
+       wchar_t * wunctrl(cchar_t * wch);
 
-       const char *keyname(int c);
-       const char *key_name(wchar_t w);
+       const char * keyname(int c);
+       const char * key_name(wchar_t wc);
 
        void filter(void);
+       /* extension */
        void nofilter(void);
 
-       void use_env(bool f);
-       void use_tioctl(bool f);
+       void use_env(bool bf);
+       /* extension */
+       void use_tioctl(bool bf);
 
-       int putwin(WINDOW *win, FILE *filep);
-       WINDOW *getwin(FILE *filep);
+       int putwin(WINDOW * win, FILE * filep);
+       WINDOW * getwin(FILE * filep);
 
        int delay_output(int ms);
+
        int flushinp(void);

              DESCRIPTION

               
-

              unctrl

              -       The unctrl routine returns a character string which is a printable rep-
-       resentation of the character c, ignoring attributes.   Control  charac-
-       ters  are  displayed  in the ^X notation.  Printing characters are dis-
-       played as is.
+

              unctrl, wunctrl

              +       unctrl   returns   a   null-terminated   character   string   printably
+       representing the curses character ch,  often  one  that  originated  in
+       keyboard input; see getch(3x).
 
-       The corresponding wunctrl returns a printable representation of a  wide
-       character.
+       o   Printable   characters  represent  themselves  as  a  one-character
+           string.
 
+       o   Control characters are expressed in ^X notation,  where  X  is  the
+           printable  symbol  of  the  control  code's  value  plus  32 in the
+           ISO 646/"ASCII" character set.
 
-

              keyname/key_name

              -       The keyname routine returns a character string corresponding to the key
-       c:
+       o   DEL (character code 127) is represented as ^?.
+
+       o   A character code greater than 127 is  represented  in  one  of  two
+           ways.
+
+           If  the  screen  has  not  been initialized or is in meta mode (see
+           meta(3x)), it  is  expressed  in  M-X  notation,  where  X  is  the
+           representation of the code's value minus 128, as described above.
+
+           If the screen is not in meta mode, the character code is assumed to
+           represent itself.  It nevertheless may not be  printable;  this  is
+           the case for character codes 128-159 in ISO 8859 encodings.
+
+           ncurses's   use_legacy_coding(3x)   function   configures  unctrl's
+           handling of these character codes.
+
+       wunctrl  returns  a  null-terminated  wide-character  string  printably
+       representing the curses complex character wch.
+
+       Both  functions ignore the attributes and color pair selection of their
+       argument.
 
-       o   Printable characters are displayed as themselves, e.g., a one-char-
-           acter string containing the key.
 
-       o   Control characters are displayed in the ^X notation.
+

              keyname, key_name

              +       The keyname routine returns a character string corresponding to the key
+       c.  Key codes are different from character codes.
+
+       o   Key  codes  below  256  are  characters.   They are displayed using
+           unctrl.
 
-       o   DEL (character 127) is displayed as ^?.
+       o   Values above 256 may be the codes for function keys.  The  function
+           key name is displayed.
 
-       o   Values  above 128 are either meta characters (if the screen has not
-           been initialized, or if meta(3x) has been called with a TRUE param-
-           eter),  shown  in the M-X notation, or are displayed as themselves.
-           In the latter case, the values may not be printable;  this  follows
-           the X/Open specification.
+       o   Otherwise  (if  there is no corresponding name and the key is not a
+           character) the function returns null, to denote an  error.   X/Open
+           also   lists   an   "UNKNOWN   KEY"   return   value,   which  some
+           implementations return rather than null.
 
-       o   Values above 256 may be the names of the names of function keys.
+       The  corresponding  key_name  returns  a  multibyte  character   string
+       corresponding  to  the  wide-character  value  wc.   The  two functions
+       (keyname and key_name) do not return the same set of strings:
 
-       o   Otherwise  (if there is no corresponding name) the function returns
-           null, to denote an error.  X/Open also lists an "UNKNOWN  KEY"  re-
-           turn value, which some implementations return rather than null.
+       o   keyname returns null where key_name would display a meta character.
 
-       The  corresponding key_name returns a character string corresponding to
-       the wide-character value w.  The two functions do not return  the  same
-       set  of strings; the latter returns null where the former would display
-       a meta character.
+       o   key_name does not return the name of a function key.
 
 
-

              filter/nofilter

              +

              filter, nofilter

                      The filter routine, if used, must be called before initscr  or  newterm
        are called.  Calling filter causes these changes in initialization:
 
        o   LINES is set to 1;
 
-       o   the  capabilities  clear,  cud1,  cud, cup, cuu1, cuu, vpa are dis-
-           abled;
+       o   the  capabilities  clear,  cud1,  cud,  cup,  cuu1,  cuu,  vpa  are
+           disabled;
 
        o   the capability ed is disabled if bce is set;
 
@@ -137,93 +160,95 @@ 
              curs_util 3x

              use_env

                      The  use_env  routine,  if  used,  should  be  called before initscr or
-       newterm are called (because those compute the screen size).   It  modi-
-       fies  the way ncurses treats environment variables when determining the
-       screen size.
+       newterm are  called  (because  those  compute  the  screen  size).   It
+       modifies  the way ncurses treats environment variables when determining
+       the screen size.
 
-       o   Normally ncurses looks first  at  the  terminal  database  for  the
+       o   Normally ncurses looks first  at  the  terminal  database  for  the
            screen size.
 
-           If  use_env  was called with FALSE for parameter, it stops here un-
-           less use_tioctl was also called with TRUE for parameter.
+           If  use_env  was  called  with  FALSE  for parameter, it stops here
+           unless use_tioctl was also called with TRUE for parameter.
 
        o   Then it asks for the screen size via operating  system  calls.   If
            successful, it overrides the values from the terminal database.
 
-       o   Finally  (unless  use_env was called with FALSE parameter), ncurses
-           examines the LINES or COLUMNS environment variables, using a  value
-           in  those to override the results from the operating system or ter-
-           minal database.
+       o   Finally  (unless  use_env was called with FALSE parameter), ncurses
+           examines the LINES or COLUMNS environment variables, using a  value
+           in  those  to  override  the  results  from the operating system or
+           terminal database.
 
-           Ncurses also updates the screen size in response to  SIGWINCH,  un-
-           less overridden by the LINES or COLUMNS environment variables,
+           curses also updates the screen size in response to SIGWINCH, unless
+           overridden by the LINES or COLUMNS environment variables,

              use_tioctl

                      The  use_tioctl  routine,  if  used, should be called before initscr or
        newterm are called (because those  compute  the  screen  size).   After
-       use_tioctl  is  called  with  TRUE as an argument, ncurses modifies the
+       use_tioctl  is  called  with  TRUE as an argument, ncurses modifies the
        last step in its computation of screen size as follows:
 
-       o   checks if the LINES and COLUMNS environment variables are set to  a
-           number greater than zero.
+       o   checks whether the LINES and COLUMNS environment variables are  set
+           to a number greater than zero.
 
-       o   for  each,  ncurses  updates the corresponding environment variable
+       o   for  each,  ncurses  updates the corresponding environment variable
            with the value that it has obtained via operating  system  call  or
            from the terminal database.
 
-       o   ncurses  re-fetches  the value of the environment variables so that
-           it is still the environment variables which set the screen size.
-
-       The use_env and use_tioctl routines combine as summarized here:
-
-           use_env   use_tioctl   Summary
-           ----------------------------------------------------------------
+       o   ncurses  re-fetches  the value of the environment variables so that
+           it is still the environment variables that set the screen size.
 
+       The use_env and use_tioctl routines combine as follows.
 
+              use_env   use_tioctl   Summary
+              -----------------------------------------------------------------
+              TRUE      FALSE        ncurses  uses  operating   system   calls
+                                     unless  overridden  by  LINES  or COLUMNS
+                                     environment variables; default.
+              TRUE      TRUE         ncurses updates LINES and  COLUMNS  based
+                                     on operating system calls.
+              FALSE     TRUE         ncurses  ignores LINES and COLUMNS, using
+                                     operating system calls to obtain size.
 
-           TRUE      FALSE        This is the default  behavior.   ncurses
-                                  uses operating system calls unless over-
-                                  ridden by $LINES or $COLUMNS environment
-                                  variables.
-           TRUE      TRUE         ncurses   updates  $LINES  and  $COLUMNS
-                                  based on operating system calls.
-           FALSE     TRUE         ncurses ignores $LINES and $COLUMNS, us-
-                                  es  operating  system  calls  to  obtain
-                                  size.
-           FALSE     FALSE        ncurses relies on the terminal  database
-                                  to determine size.
 
+

              putwin, getwin

              +       The putwin routine writes all data associated with window (or pad)  win
+       into  the  file  to  which filep points.  This information can be later
+       retrieved using the getwin function.
 
-

              putwin/getwin

              -       The  putwin routine writes all data associated with window (or pad) win
-       into the file to which filep points.  This information can be later re-
-       trieved using the getwin function.
-
-       The  getwin  routine  reads  window  related data stored in the file by
-       putwin.  The routine then creates and initializes a  new  window  using
-       that  data.   It  returns a pointer to the new window.  There are a few
+       The getwin routine reads window related data  stored  in  the  file  by
+       putwin.   The  routine  then creates and initializes a new window using
+       that data.  It returns a pointer to the new window.  There  are  a  few
        caveats:
 
-       o   the data written is a copy of the WINDOW structure, and its associ-
-           ated  character cells.  The format differs between the wide-charac-
-           ter (ncursesw) and non-wide (ncurses) libraries.  You can  transfer
-           data between the two, however.
+       o   the  data  written  is  a  copy  of  the  WINDOW structure, and its
+           associated character cells.  The format differs between  the  wide-
+           character  (ncursesw)  and  non-wide  (ncurses) libraries.  You can
+           transfer data between the two, however.
 
-       o   the  retrieved  window  is always created as a top-level window (or
+       o   the retrieved window is always created as a  top-level  window  (or
            pad), rather than a subwindow.
 
-       o   the window's character cells contain the color pair value, but  not
-           the  actual  color  numbers.   If cells in the retrieved window use
-           color pairs which have not been created in  the  application  using
+       o   the  window's character cells contain the color pair value, but not
+           the actual color numbers.  If cells in  the  retrieved  window  use
+           color  pairs  that  have  not been created in the application using
            init_pair, they will not be colored when the window is refreshed.

              delay_output

              -       The  delay_output  routine  inserts  an ms millisecond pause in output.
-       This routine should not be used extensively because padding  characters
-       are  used  rather  than a CPU pause.  If no padding character is speci-
-       fied, this uses napms to perform the delay.
+       The delay_output routine inserts an ms  millisecond  pause  in  output.
+       Employ  this  function  judiciously  when terminal output uses padding,
+       because ncurses  transmits  null  characters  (consuming  CPU  and  I/O
+       resources)  instead  of  sleeping  and  requesting  resumption from the
+       operating system.  Padding is used unless:
+
+       o   the terminal description has npc (no_pad_char) capability, or
+
+       o   the environment variable NCURSES_NO_PADDING is set.
+
+       If padding is not in use, ncurses uses napms to perform the delay.   If
+       the  value  of ms exceeds 30,000 (thirty seconds), it is capped at that
+       value.

              flushinp

              @@ -232,55 +257,75 @@ 
              curs_util 3x

              RETURN VALUE

              -       Except  for  flushinp,  routines that return an integer return ERR upon
-       failure and OK (SVr4 specifies only "an integer value other than  ERR")
-       upon successful completion.
+       Except  for  flushinp,  functions  that return integers return ERR upon
+       failure and OK upon success.
 
-       Routines that return pointers return NULL on error.
+       Functions that return pointers return NULL on error.
 
-       X/Open does not define any error conditions.  In this implementation
+       In ncurses,
 
-          flushinp
-               returns an error if the terminal was not initialized.
+       o   flushinp returns ERR if the terminal was not initialized, and
 
-          putwin
-               returns  an  error if the associated fwrite calls return an er-
-               ror.
+       o   putwin returns ERR if its associated write(2) calls return ERR.
+
+
+

              NOTES

              +       wunctrl is part of ncurses's wide-character API, and is  not  available
+       in its non-wide configuration.

              PORTABILITY

              +       X/Open Curses Issue 4 describes these functions.  It specifies no error
+       conditions for them.
+
+       SVr4 describes a successful return value  only  as  "an  integer  value
+       other than ERR".
+

              filter

              -       The SVr4 documentation describes the  action  of  filter  only  in  the
-       vaguest  terms.   The  description  here is adapted from the XSI Curses
-       standard (which erroneously fails to describe the disabling of cuu).
+       The  SVr4  documentation  describes  the  action  of filter only in the
+       vaguest terms.  The description here  is  adapted  from  X/Open  Curses
+       (which erroneously fails to describe the disabling of cuu).
+
+
+

              delay_output padding

              +       The  limitation  to  30  seconds and the use of napms differ from other
+       implementations.
+
+       o   SVr4 curses does not delay if no padding character is available.
+
+       o   NetBSD curses uses napms when no padding  character  is  available,
+           but  does  not  take  timing  into  account  when using the padding
+           character.
+
+       Neither limits the delay.

              keyname

              -       The keyname function may return the names of user-defined string  capa-
-       bilities  which  are defined in the terminfo entry via the -x option of
-       tic.  This implementation automatically assigns at run-time keycodes to
-       user-defined  strings  which  begin  with  "k".   The keycodes start at
-       KEY_MAX, but are not guaranteed to be the same value for different runs
-       because  user-defined  codes  are merged from all terminal descriptions
-       which have been loaded.  The use_extended_names(3x)  function  controls
-       whether  this  data  is loaded when the terminal description is read by
-       the library.
-
-
-

              nofilter/use_tioctl

              -       The nofilter and use_tioctl routines are  specific  to  ncurses.   They
+       The keyname function  may  return  the  names  of  user-defined  string
+       capabilities  that  are defined in the terminfo entry via the -x option
+       of tic.  This implementation  automatically  assigns  at  run-time  key
+       codes to user-defined strings that begin with "k".  The key codes start
+       at KEY_MAX, but are not guaranteed to be the same value  for  different
+       runs   because   user-defined   codes  are  merged  from  all  terminal
+       descriptions  that  have  been  loaded.    The   use_extended_names(3x)
+       function  controls  whether  this  data  is  loaded  when  the terminal
+       description is read by the library.
+
+
+

              nofilter, use_tioctl

              +       The nofilter and use_tioctl routines are  specific  to  ncurses.   They
        were  not  supported on Version 7, BSD or System V implementations.  It
-       is recommended that any code depending on ncurses extensions be  condi-
-       tioned using NCURSES_VERSION.
+       is recommended  that  any  code  depending  on  ncurses  extensions  be
+       conditioned using NCURSES_VERSION.

              putwin/getwin file-format

                      The putwin and getwin functions have several issues with portability:
 
-       o   The  files  written  and read by these functions use an implementa-
-           tion-specific format.  Although the format is an obvious target for
-           standardization, it has been overlooked.
+       o   The   files   written   and   read   by   these  functions  use  an
+           implementation-specific format.  Although the format is an  obvious
+           target for standardization, it has been overlooked.
 
            Interestingly  enough,  according to the copyright dates in Solaris
            source, the functions (along with scr_init, etc.)  originated  with
@@ -288,34 +333,35 @@ 
              curs_util 3x
              
            1988) incorporated into SVr4.  Oddly, there are no  such  functions
            in the 4.3BSD curses sources.
 
-       o   Most implementations simply dump the binary WINDOW structure to the
-           file.  These include SVr4 curses, NetBSD and PDCurses, as  well  as
-           older ncurses versions.  This implementation (as well as the X/Open
-           variant of Solaris curses, dated 1995) uses textual dumps.
+       o   Most implementations simply dump the binary WINDOW structure to the
+           file.  These include SVr4 curses, NetBSD curses, and  PDCurses,  as
+           well  as  older  ncurses versions.  This implementation (as well as
+           the X/Open variant of Solaris  curses,  dated  1995)  uses  textual
+           dumps.
 
-           The implementations which  use  binary  dumps  use  block-I/O  (the
-           fwrite  and  fread  functions).   Those  that use textual dumps use
-           buffered-I/O.  A few applications may happen to write extra data in
-           the  file  using these functions.  Doing that can run into problems
-           mixing block- and buffered-I/O.  This  implementation  reduces  the
-           problem  on writes by flushing the output.  However, reading from a
-           file written using mixed schemes may not be successful.
+           The  implementations  that use binary dumps use block-I/O (write(2)
+           and read(2) functions).  Those that use textual dumps use buffered-
+           I/O.  A few applications may happen to write extra data in the file
+           using these functions.  Doing that can  run  into  problems  mixing
+           block-  and  buffered-I/O.  This implementation reduces the problem
+           on writes by flushing the output.  However,  reading  from  a  file
+           written using mixed schemes may not be successful.
 
 
-

              unctrl/wunctrl

              -       The XSI Curses standard, Issue 4 describes these functions.  It  states
-       that unctrl and wunctrl will return a null pointer if unsuccessful, but
-       does not define any error conditions.  This implementation  checks  for
-       three cases:
+

              unctrl, wunctrl

              +       X/Open Curses Issue 4 describes these functions.  It specifies no error
+       conditions for them.  It states that unctrl and wunctrl will  return  a
+       null  pointer  if  unsuccessful.   This implementation checks for three
+       cases:
 
-       o   the  parameter  is  a  7-bit  US-ASCII code.  This is the case that
+       o   the parameter is a 7-bit US-ASCII code.   This  is  the  case  that
            X/Open Curses documented.
 
        o   the parameter is in the range 128-159, i.e., a C1 control code.  If
-           use_legacy_coding(3x)  has  been  called with a 2 parameter, unctrl
-           returns the parameter, i.e., a one-character string with the param-
-           eter  as  the  first  character.  Otherwise, it returns "~@", "~A",
-           etc., analogous to "^@", "^A", C0 controls.
+           use_legacy_coding(3x) has been called with a  2  parameter,  unctrl
+           returns  the  parameter,  i.e.,  a  one-character  string  with the
+           parameter as the first  character.   Otherwise,  it  returns  "~@",
+           "~A", etc., analogous to "^@", "^A", C0 controls.
 
            X/Open Curses does not document whether unctrl can be called before
            initializing curses.  This implementation permits that, and returns
@@ -325,43 +371,60 @@ 
              curs_util 3x
              
            pointer.
 
        The strings returned by unctrl in this implementation are determined at
-       compile time, showing C1 controls from the upper-128 codes with  a  "~"
-       prefix  rather  than "^".  Other implementations have different conven-
-       tions.  For example, they may show both sets of control characters with
-       "^", and strip the parameter to 7 bits.  Or they may ignore C1 controls
-       and treat all of the upper-128 codes as printable.  This implementation
-       uses  8  bits  but  does  not modify the string to reflect locale.  The
-       use_legacy_coding(3x) function allows the caller to change  the  output
-       of unctrl.
-
-       Likewise,  the meta(3x) function allows the caller to change the output
-       of keyname, i.e., it determines whether to  use  the  "M-"  prefix  for
-       "meta"  keys  (codes  in  the  range 128 to 255).  Both use_legacy_cod-
-       ing(3x) and meta(3x) succeed only after curses is initialized.   X/Open
-       Curses  does  not  document  the  treatment  of codes 128 to 159.  When
-       treating them as "meta" keys (or if keyname is called before initializ-
-       ing curses), this implementation returns strings "M-^@", "M-^A", etc.
-
-       X/Open Curses documents unctrl as declared in <unctrl.h>, which ncurses
-       does.  However, ncurses' <curses.h> includes <unctrl.h>,  matching  the
+       compile  time,  showing C1 controls from the upper-128 codes with a "~"
+       prefix  rather  than  "^".   Other   implementations   have   different
+       conventions.    For  example,  they  may  show  both  sets  of  control
+       characters with "^", and strip the parameter to 7 bits.   Or  they  may
+       ignore  C1  controls and treat all of the upper-128 codes as printable.
+       This implementation uses 8 bits but  does  not  modify  the  string  to
+       reflect  locale.   The use_legacy_coding(3x) function allows the caller
+       to change the output of unctrl.
+
+       Likewise, the meta(3x) function allows the caller to change the  output
+       of  keyname,  i.e.,  it  determines  whether to use the "M-" prefix for
+       "meta"   keys   (codes   in   the   range   128    to    255).     Both
+       use_legacy_coding(3x)   and  meta(3x)  succeed  only  after  curses  is
+       initialized.  X/Open Curses does not document the  treatment  of  codes
+       128 to 159.  When treating them as "meta" keys (or if keyname is called
+       before  initializing  curses),  this  implementation  returns   strings
+       "M-^@", "M-^A", etc.
+
+       X/Open Curses documents unctrl as declared in <unctrl.h>, which ncurses
+       does.  However, ncurses' <curses.h> includes <unctrl.h>,  matching  the
        behavior of SVr4 curses.  Other implementations may not do that.
 
 
-

              use_env/use_tioctl

              -       If  ncurses  is  configured  to provide the sp-functions extension, the
+

              use_env, use_tioctl

              +       If  ncurses  is  configured  to provide the sp-functions extension, the
        state of use_env and use_tioctl may be  updated  before  creating  each
        screen  rather  than  once  only  (curs_sp_funcs(3x)).  This feature of
-       use_env is not provided by other implementation of curses.
+       use_env is not provided by other implementations of curses.
+
+
+

              HISTORY

              +       4BSD (1980) introduced unctrl, defining it as a macro in unctrl.h.
+
+       SVr2 (1984) added delay_output, flushinp, and keyname.
+
+       SVr3 (1987) supplied filter.  Later that year,  SVr3.1  brought  getwin
+       and  putwin,  reading  and  writing  window  dumps  with  fread(3)  and
+       fwrite(3), respectively.
+
+       SVr4 (1989) supplied use_env.
+
+       X/Open Curses Issue 4 (1995) specified key_name and wunctrl.
+
+       ncurses 5.6 (2006) added nofilter, and 6.0 (2015) use_tioctl.

              SEE ALSO

              -       curses(3x),   curs_initscr(3x),    curs_inopts(3x),    curs_kernel(3x),
-       curs_scr_dump(3x),  curs_sp_funcs(3x),  curs_variables(3x), legacy_cod-
-       ing(3x).
+       curses(3x), curs_initscr(3x), curs_inopts(3x), curs_kernel(3x),
+       curs_scr_dump(3x), curs_sp_funcs(3x), curs_variables(3x),
+       legacy_coding(3x)
 
 
 
-                                                                 curs_util(3x)
+ncurses 6.5                       2025-02-15                     curs_util(3x)
              diff --git a/doc/html/man/curs_variables.3x.html b/doc/html/man/curs_variables.3x.html index 1dd822f8..4a7f8f4d 100644 --- a/doc/html/man/curs_variables.3x.html +++ b/doc/html/man/curs_variables.3x.html @@ -1,6 +1,6 @@ -curs_variables 3x +curs_variables 3x 2025-01-18 ncurses 6.5 Library calls -

              curs_variables 3x

              +

              curs_variables 3x 2025-01-18 ncurses 6.5 Library calls

              -curs_variables(3x)                                          curs_variables(3x)
+curs_variables(3x)               Library calls              curs_variables(3x)

              NAME

              -       COLORS, COLOR_PAIRS, COLS, ESCDELAY, LINES, TABSIZE, curscr, newscr,
-       stdscr - curses global variables
+       bool,  chtype,  cchar_t,  attr_t, SCREEN, WINDOW, TRUE, FALSE, ERR, OK,
+       CCHARW_MAX, curscr, newscr, stdscr, COLORS, COLOR_PAIRS,  COLS,  LINES,
+       ESCDELAY, TABSIZE - curses data types, constants, and global variables

              SYNOPSIS

                      #include <curses.h>
 
-       int COLOR_PAIRS;
+       /* data types */
+       typedef /* ... */ bool;
+       typedef /* ... */ chtype;
+       typedef /* ... */ cchar_t;
+       typedef /* ... */ attr_t;
+       typedef /* ... */ SCREEN;
+       typedef /* ... */ WINDOW;
+
+       /* constants */
+       const bool TRUE;
+       const bool FALSE;
+
+       const /* ... */ ERR;
+       const /* ... */ OK;
+
+       /* extension */
+       const /* ... */ CCHARW_MAX;
+
+       /* variables */
        int COLORS;
+       int COLOR_PAIRS;
        int COLS;
-       int ESCDELAY;
        int LINES;
-       int TABSIZE;
        WINDOW * curscr;
-       WINDOW * newscr;
        WINDOW * stdscr;
 
+       /* extensions */
+       int ESCDELAY;
+       int TABSIZE;
+       WINDOW * newscr;
+

              DESCRIPTION

              -       This page summarizes variables provided by the curses library.  A  more
-       complete description is given in the curses(3x) manual page.
+       This  page  summarizes data types, constants, and variables provided by
+       the curses library.  Locate further discussion in curses(3x).
 
-       Depending  on  the  configuration,  these  may  be actual variables, or
-       macros (see curs_threads(3x) and curs_opaque(3x)) which  provide  read-
-       only  access  to  curses's  state.  In either case, applications should
-       treat them as read-only to avoid confusing the library.
+       Depending on ncurses's  build-time  configuration,  the  variables  may
+       instead  be  macros  (see  curs_threads(3x)  and  curs_opaque(3x)) that
+       provide read-only access to  the  library's  state.   In  either  case,
+       applications  should  treat  them  as  read-only to avoid confusing the
+       library.
 
 
-

              COLOR_PAIRS

              -       After initializing curses, this variable contains the number  of  color
-       pairs  which  the  terminal  can  support.  Usually the number of color
-       pairs will be the product COLORS*COLORS, however  this  is  not  always
-       true:
+

              CONSTANTS

               
-       o   a few terminals use HLS colors, which do not follow this rule
+

              TRUE, FALSE

              +       The curses library defines TRUE and FALSE to represent  the  values  of
+       the Boolean data type.
 
-       o   terminals  supporting  a  large number of colors are limited by the
-           number of color pairs that can be represented  in  a  signed  short
-           value.
 
+

              ERR, OK

              +       curses  and terminfo routines frequently return these constant integral
+       values indicating failure and success, respectively.
 
-

              COLORS

              -       After  initializing curses, this variable contains the number of colors
-       which the terminal can support.
 
+

              CCHARW_MAX

              +       This integral value, an ncurses extension, contains the maximum  number
+       of  wchar_t  wide  characters  that  can  be stored in a curses complex
+       character cchar_t.
 
-

              COLS

              -       After initializing curses, this variable  contains  the  width  of  the
-       screen, i.e., the number of columns.
 
+

              PREDEFINED TYPES

               
-

              ESCDELAY

              -       This variable holds the number of milliseconds to wait after reading an
-       escape character, to distinguish between an individual escape character
-       entered on the keyboard from escape sequences sent by cursor- and func-
-       tion-keys (see curses(3x)).
+

              bool

              +       X/Open Issue 4 curses  (1996)  preceded  the  ISO  C99  and  ISO  C++98
+       standards,  each of which also defined a Boolean data type.  The curses
+       library requires an integral type bool.
 
+       ncurses' configure script attempts to discover the data  type  used  by
+       the system's C and C++ compilers, to reuse for the curses bool.
 
-

              LINES

              -       After initializing curses, this variable contains  the  height  of  the
-       screen, i.e., the number of lines.
 
+

              chtype

              +       The  chtype  integral  type combines a ("narrow", 8-bit) character with
+       attributes encoding the character's rendition, such as the  styling  of
+       its  typeface  and/or  foreground  and  background  colors.   See,  for
+       example, addch(3x), attron(3x), and inch(3x).
 
-

              TABSIZE

              -       This  variable  holds  the number of columns used by the curses library
-       when converting a tab character to spaces as it adds the tab to a  win-
-       dow (see curs_addch(3x).
 
+

              cchar_t, attr_t

              +       chtype is too small for the standard C library's  wide-character  type,
+       wchar_t.   cchar_t  is a type that can accommodate an attr_t and enough
+       wide characters to store what  Unicode  terms  a  grapheme  cluster  (a
+       "user-perceived  character"  [UAX  #29], which may nevertheless require
+       several character encoding units to represent).  attr_t is an  integral
+       type  storing  "wide"  attributes  that  apply  to  cchar_ts.  See, for
+       example, add_wch(3x), attr_on(3x), and in_wch(3x).
+
+
+

              SCREEN

              +       curses  manages  a  terminal  device  with  this  structure  type;  see
+       initscr(3x).
+
+
+

              WINDOW

              +       curses  represents rectangular portions of the terminal screen with the
+       WINDOW structure type; see subsection "Overview" of ncurses(3x).
+
+
+

              VARIABLES

              +
+

              curscr, newscr, stdscr

              +       When a curses application calls initscr(3x) or newterm(3x), the library
+       creates  a  window  named  stdscr that is the same size as the terminal
+       screen and is the implicit window used by functions that interact  with
+       a  window  but  do  not  take  a parameter identifying one; many curses
+       functions use it.  An application need not use stdscr; it might  prefer
+       to tile the display into multiple windows instead.
+
+       The  library  records  updates to the terminal screen in a window named
+       curscr.  This object  is  referred  to  as  the  "physical  screen"  in
+       curs_refresh(3x) and curs_outopts(3x).
 
-

              The Current Screen

              -       This  implementation  of  curses uses a special window curscr to record
-       its updates to the terminal screen.
+       ncurses  collects  pending  updates  to the terminal screen in a window
+       named newscr.  This object is referred to as the  "virtual  screen"  in
+       the  curs_kernel(3x), curs_refresh(3x), and curs_outopts(3x).  When the
+       screen is refreshed, curses determines a minimal set of  updates  using
+       the terminal's capabilities to make curscr look like newscr.
 
-       This is referred to as the "physical screen"  in  the  curs_refresh(3x)
-       and curs_outopts(3x) manual pages.
+
+

              COLORS

              +       Once  curses  is  initialized,  COLORS  contains  the  number of colors
+       supported by the terminal; see curs_color(3x).
 
 
-

              The New Screen

              -       This  implementation of curses uses a special window newscr to hold up-
-       dates to the terminal screen before applying them to curscr.
+

              COLOR_PAIRS

              +       Once curses is initialized, COLOR_PAIRS contains the  number  of  color
+       pairs supported by the terminal; see curs_color(3x).
 
-       This is referred to as the "virtual  screen"  in  the  curs_kernel(3x),
-       curs_refresh(3x) and curs_outopts(3x) manual pages.
 
+

              COLS, LINES

              +       Once  curses  is initialized, COLS and LINES contain the screen's width
+       and height in character cells, respectively; that  is,  the  number  of
+       columns and lines.
 
-

              The Standard Screen

              -       Upon  initializing curses, a default window called stdscr, which is the
-       size of the terminal screen, is created.   Many  curses  functions  use
-       this window.
+
+

              ESCDELAY

              +       For  curses  to  distinguish  the ESC character resulting from a user's
+       press of the "Escape" key on the input device  from  one  beginning  an
+       escape sequence (as commonly produced by function keys), it waits after
+       the escape character to see if further characters are available on  the
+       input stream within a short interval.  ESCDELAY stores this interval in
+       milliseconds.
+
+       If keypad(3x) is disabled for the  curses  window  receiving  input,  a
+       program must disambiguate escape sequences itself.
+
+
+

              TABSIZE

              +       The curses library converts a tab character to this number of spaces as
+       it adds a tab to a window; see curs_addch(3x).

              NOTES

              -       The   curses  library  is  initialized  using  either  initscr(3x),  or
-       newterm(3x).
+       Either initscr(3x) or newterm(3x) initializes curses.
+
+       If  ncurses  is  configured  to  provide  separate  curses  and   tinfo
+       libraries,  most  of these symbols reside in the former.  The bool data
+       type is used by both.
 
-       If curses is configured to use separate curses/terminfo libraries, most
-       of these variables reside in the curses library.
+
+

              EXTENSIONS

              +       The CCHARW_MAX constant, and ESCDELAY, TABSIZE, and  newscr  variables,
+       are extensions, the first of these originating in ncurses.

              PORTABILITY

              -       TABSIZE  is  a feature of SVr4 curses which is not documented by X/Open
-       curses.
+       Applications employing ncurses extensions should condition their use on
+       the visibility of the NCURSES_VERSION preprocessor macro.
+
+       The X/Open Curses standard documents all of  the  foregoing  types  and
+       symbols except for CCHARW_MAX, newscr, TABSIZE, and ESCDELAY.
+
+       X/Open  Curses  describes  curscr only as "an internal data structure";
+       SVr4  gave  more  details,  noting  its  use  "for  certain   low-level
+       operations  like  clearing  and redrawing a screen containing garbage".
+       Neither specified its interaction with the rest of the interface beyond
+       use as an argument to clearok(3x) and wrefresh(3x).
 
-       o   In SVr4 curses, TABSIZE is initially set from the terminal descrip-
-           tion's  init_tabs capability.  After that, it can be altered by the
-           applications using SVr4 curses.
+       newscr  is a feature of SVr4 curses.  When refreshing the screen, it is
+       used as a working area for combining the standard  window  stdscr  with
+       any  others the application may have created with newwin(3x).  When the
+       update of newscr is complete, curses modifies curscr to match newscr.
 
-           SVr4 curses uses the current value of TABSIZE to compute the  posi-
-           tion  of  tabstops  for  updating both the virtual screen with add-
-           ch(3x) as well as the physical screen with mvcur(3x).
+       TABSIZE is a feature of SVr4 curses.
 
-       o   This implementation uses the current value of TABSIZE only for  up-
-           dating  the  virtual screen.  It uses the terminal description's it
-           (init_tabs) capability for computing hardware tabs (i.e., tab stops
-           on the physical screen).
+       o   SVr4  initially  sets  TABSIZE  from  the  terminal   description's
+           init_tabs   capability.    After   that,   it  can  be  altered  by
+           applications using SVr4 curses.
 
-       o   Other  implementations  differ.  For instance, NetBSD curses allows
-           TABSIZE to be set through an environment variable.  This  implemen-
-           tation does not.
+       o   SVr4 curses uses the value of TABSIZE to compute  the  position  of
+           tab  stops when updating both the virtual screen with addch(3x) and
+           the physical screen with mvcur(3x).
 
-           NetBSD curses does not support hardware tabs; it uses the init_tabs
+       o   ncurses uses the value  of  TABSIZE  only  to  update  the  virtual
+           screen.   It  uses  the  terminal  description's  "it"  (init_tabs)
+           capability for computing hardware tabs (that is, tab stops  on  the
+           physical screen).
+
+       o   Other  implementations  differ.  For instance, NetBSD curses allows
+           TABSIZE to be set through an environment  variable.   ncurses  does
+           not.
+
+           NetBSD curses does not support hardware tabs; it uses the init_tabs
            capability and the TABSIZE variable only for updating  the  virtual
            screen.
 
-       ESCDELAY is an extension in AIX curses:
+       ESCDELAY is a feature of AIX curses.
 
-       o   In AIX, the units for ESCDELAY are fifths of a millisecond.
+       o   In AIX, the units for ESCDELAY are fifths of milliseconds.
 
-       o   The default value for AIX's ESCDELAY is 0.1 seconds.
+       o   The default value for AIX's ESCDELAY equals 0.1 seconds.
 
-       o   AIX  also enforces a limit of 10,000 seconds for ESCDELAY; this im-
-           plementation currently has no upper limit.
+       o   AIX  also  enforces a limit of 10,000 seconds for ESCDELAY; ncurses
+           does not enforce any upper limit.
 
-       This implementation has long used ESCDELAY with units of  milliseconds,
-       making  it  impossible to be completely compatible with AIX.  Likewise,
-       most users have either decided to override the value, or rely upon  its
-       default value.
+       ncurses has long used ESCDELAY with units of  milliseconds,  making  it
+       impossible  to  be  completely compatible with AIX.  Consequently, most
+       users have decided either to override the value, or to  rely  upon  its
+       default.

              SEE ALSO

              -       curses(3x),   curs_opaque(3x),   curs_terminfo(3x),   curs_threads(3x),
-       term_variables(3x), terminfo(5).
+       [UAX  #29]  "Unicode  Standard  Annex  #29:  Unicode Text Segmentation"
+       <https://unicode.org/reports/tr29/>
+
+       getcchar(3x) further discusses CCHARW_MAX.
 
+       curses(3x),   curs_color(3x),    curs_opaque(3x),    curs_terminfo(3x),
+       curs_threads(3x), term_variables(3x), terminfo(5)
 
 
-                                                            curs_variables(3x)
+
+ncurses 6.5                       2025-01-18                curs_variables(3x)
              diff --git a/doc/html/man/curs_window.3x.html b/doc/html/man/curs_window.3x.html index 660ed566..bb039d46 100644 --- a/doc/html/man/curs_window.3x.html +++ b/doc/html/man/curs_window.3x.html @@ -1,6 +1,6 @@ -curs_window 3x +curs_window 3x 2025-02-01 ncurses 6.5 Library calls -

              curs_window 3x

              +

              curs_window 3x 2025-02-01 ncurses 6.5 Library calls

              -curs_window(3x)                                                curs_window(3x)
+curs_window(3x)                  Library calls                 curs_window(3x)

              NAME

              -       newwin, delwin, mvwin, subwin, derwin, mvderwin, dupwin, wsyncup,
-       syncok, wcursyncup, wsyncdown - create curses windows
+       newwin,  delwin,  mvwin,  subwin,  derwin,  mvderwin,  dupwin, wsyncup,
+       syncok, wcursyncup, wsyncdown - create and manipulate curses windows

              SYNOPSIS

                      #include <curses.h>
 
-       WINDOW *newwin(
-             int nlines, int ncols,
-             int begin_y, int begin_x);
-       int delwin(WINDOW *win);
-       int mvwin(WINDOW *win, int y, int x);
-       WINDOW *subwin(WINDOW *orig,
-             int nlines, int ncols,
-             int begin_y, int begin_x);
-       WINDOW *derwin(WINDOW *orig,
-             int nlines, int ncols,
-             int begin_y, int begin_x);
-       int mvderwin(WINDOW *win, int par_y, int par_x);
-       WINDOW *dupwin(WINDOW *win);
-       void wsyncup(WINDOW *win);
-       int syncok(WINDOW *win, bool bf);
-       void wcursyncup(WINDOW *win);
-       void wsyncdown(WINDOW *win);
+       WINDOW * newwin(
+            int nlines, int ncols,
+            int begin_y, int begin_x);
+       int delwin(WINDOW * win);
+       int mvwin(WINDOW * win, int y, int x);
+       WINDOW * subwin(WINDOW * orig,
+            int nlines, int ncols,
+            int begin_y, int begin_x);
+       WINDOW * derwin(WINDOW * orig,
+            int nlines, int ncols,
+            int begin_y, int begin_x);
+       int mvderwin(WINDOW * win, int par_y, int par_x);
+       WINDOW * dupwin(WINDOW * win);
+       void wsyncup(WINDOW * win);
+       int syncok(WINDOW * win, bool bf);
+       void wcursyncup(WINDOW * win);
+       void wsyncdown(WINDOW * win);

              DESCRIPTION

              @@ -93,14 +93,14 @@ 
              curs_window 3x
              
        all of the window modes are initialized to the default  values.   These
        functions set window modes after a window is created:
 
-              idcok, idlok, immedok, keypad, leaveok, nodelay, scrollok,
-              setscrreg, syncok, wbkgdset, wbkgrndset, and wtimeout
+              idcok  idlok  immedok  keypad leaveok nodelay scrollok setscrreg
+              syncok wbkgdset wbkgrndset and wtimeout.

              delwin

                      Calling delwin deletes the named window, freeing all memory  associated
-       with  it  (it does not actually erase the window's screen image).  Sub-
-       windows must be deleted before the main window can be deleted.
+       with  it  (it  does  not  actually  erase  the  window's screen image).
+       Subwindows must be deleted before the main window can be deleted.

              mvwin

              @@ -114,19 +114,22 @@ 
              curs_window 3x
              
        Calling  subwin  creates and returns a pointer to a new window with the
        given number of lines, nlines, and columns, ncols.  The  window  is  at
        position (begin_y, begin_x) on the screen.  The subwindow shares memory
-       with the window orig, so that changes made to one  window  will  affect
-       both  windows.  When using this routine, it is necessary to call touch-
-       win or touchline on orig before calling wrefresh on the subwindow.
+       with the window orig, its ancestor, so that changes made to one  window
+       will  affect both windows.  When using this routine, it is necessary to
+       call touchwin or touchline on  orig  before  calling  wrefresh  on  the
+       subwindow.

              derwin

              -       Calling derwin is the same as calling subwin, except that  begin_y  and
-       begin_x  are  relative to the origin of the window orig rather than the
-       screen.  There is no difference between the subwindows and the  derived
+       Calling  derwin  is the same as calling subwin, except that begin_y and
+       begin_x are relative to the origin of the window orig rather  than  the
+       screen.   There is no difference between the subwindows and the derived
        windows.
 
-       Calling  mvderwin moves a derived window (or subwindow) inside its par-
-       ent window.  The screen-relative  parameters  of  the  window  are  not
+
+

              mvderwin

              +       Calling mvderwin moves a  derived  window  (or  subwindow)  inside  its
+       parent  window.   The  screen-relative parameters of the window are not
        changed.  This routine is used to display different parts of the parent
        window at the same physical position on the screen.
 
@@ -136,125 +139,110 @@ 
              curs_window 3x

              wsyncup

              -       Calling wsyncup touches all locations in  ancestors  of  win  that  are
-       changed  in  win.   If  syncok is called with second argument TRUE then
-       wsyncup is called automatically whenever there is a change in the  win-
-       dow.
+       Calling  wsyncup  touches  all  locations  in ancestors of win that are
+       changed in win.  If syncok is called with  second  argument  TRUE  then
+       wsyncup  is  called  automatically  whenever  there  is a change in the
+       window.

              wsyncdown

              -       The  wsyncdown  routine  touches  each  location  in  win that has been
-       touched in any of its ancestor windows.  This routine is called by wre-
-       fresh, so it should almost never be necessary to call it manually.
+       The wsyncdown routine touches  each  location  in  win  that  has  been
+       touched  in  any  of  its  ancestor windows.  This routine is called by
+       wrefresh, so it should almost never be necessary to call it manually.

              wcursyncup

              -       The  routine  wcursyncup updates the current cursor position of all the
-       ancestors of the window to reflect the current cursor position  of  the
+       The routine wcursyncup updates the current cursor position of  all  the
+       ancestors  of  the window to reflect the current cursor position of the
        window.

              RETURN VALUE

              -       Routines that return an integer return the integer ERR upon failure and
-       OK (SVr4 only specifies "an integer value other than  ERR")  upon  suc-
-       cessful completion.
-
-       Routines that return pointers return NULL on error.
+       Functions that return integers return ERR  upon  failure  and  OK  upon
+       success.
 
-       X/Open defines no error conditions.  In this implementation
+       Functions that return pointers return NULL on error.
 
-       delwin
-            returns  an  error if the window pointer is null, or if the window
-            is the parent of another window.
+       ncurses defines several error conditions.
 
-       derwin
-            returns an error if the parent window pointer is null, or  if  any
-            of  its  ordinates  or dimensions is negative, or if the resulting
-            window does not fit inside the parent window.
+       o   delwin returns ERR if win is a null pointer, or if it is the parent
+           of another window.
 
-       dupwin
-            returns an error if the window pointer is null.
+           ncurses maintains a list of windows, and checks  that  the  pointer
+           passed  to  delwin  is one that it created, returning ERR if it was
+           not.
 
-            This implementation also maintains a list of windows,  and  checks
-            that  the pointer passed to delwin is one that it created, return-
-            ing an error if it was not..
+       o   derwin returns ERR if orig is a null pointer,  or  if  any  of  the
+           ordinate  or  dimension  arguments is negative, or if the resulting
+           window does not fit inside the parent window.
 
-       mvderwin
-            returns an error if the window pointer is null, or if some part of
-            the window would be placed off-screen.
+       o   dupwin returns ERR if win is a null pointer.
 
-       mvwin
-            returns  an  error if the window pointer is null, or if the window
-            is really a pad, or if some part of the  window  would  be  placed
-            off-screen.
+       o   mvderwin returns ERR if win is a null pointer, or if  any  part  of
+           the window would be placed off-screen.
 
-       newwin
-            will  fail if either of its beginning ordinates is negative, or if
-            either the number of lines or columns is negative.
+       o   mvwin  returns ERR if win is a null pointer, if win is a pad, or if
+           any part of the window would be placed off-screen.
 
-       syncok
-            returns an error if the window pointer is null.
+       o   newwin returns ERR if any of its arguments is negative.
 
-       subwin
-            returns an error if the parent window pointer is null, or  if  any
-            of  its  ordinates  or dimensions is negative, or if the resulting
-            window does not fit inside the parent window.
+       o   subwin returns ERR if orig is a null pointer,  or  if  any  of  the
+           ordinate  or  dimension  arguments is negative, or if the resulting
+           window does not fit inside the parent window.
 
-       The functions which return a window pointer may also fail if  there  is
-       insufficient  memory  for  its data structures.  Any of these functions
-       will fail if the screen has not been initialized, i.e., with initscr or
-       newterm.
+       o   syncok returns ERR if win is a null pointer.
 
+       Functions that return a window pointer fail if  memory  allocation  for
+       their data structures fails.
 
-

              NOTES

              -       If  many small changes are made to the window, the wsyncup option could
-       degrade performance.
+       All of these functions fail if the screen has not been initialized; see
+       initscr(3x) or newterm(3x).
 
-       Note that syncok may be a macro.
 
+

              NOTES

              +       syncok may be implemented as a macro.
 
-

              BUGS

              -       The subwindow functions (subwin, derwin, mvderwin, wsyncup,  wsyncdown,
-       wcursyncup,  syncok)  are flaky, incompletely implemented, and not well
-       tested.
-
-       The System V curses documentation is very unclear  about  what  wsyncup
-       and  wsyncdown  actually do.  It seems to imply that they are only sup-
-       posed to touch exactly  those  lines  that  are  affected  by  ancestor
-       changes.  The language here, and the behavior of the curses implementa-
-       tion, is patterned on the XPG4 curses standard.  The weaker  XPG4  spec
-       may result in slower updates.
+       Calling syncup on a window and making many small changes  to  it  could
+       degrade performance.

              PORTABILITY

              -       The XSI Curses standard, Issue 4 describes these functions.
+       X/Open Curses Issue 4 describes these functions.  It specifies no error
+       conditions for delwin, derwin, dupwin, newwin, mvderwin, or syncok.
+
+       For functions returning integers  (except  delwin),  SVr4  describes  a
+       successful return value only as "an integer value other than ERR".
 
-       X/Open Curses states regarding delwin:
+       Regarding delwin, X/Open Curses states that
 
-       o   It must delete subwindows before deleting their parent.
+              [t]he  application  must  delete  subwindows before deleting the
+              main window.
 
-       o   If  delwin  is asked to delete a parent window, it can only succeed
-           if the curses library keeps a list of the subwindows.  SVr4  curses
-           kept  a  count  of the number of subwindows rather than a list.  It
-           simply returned ERR when asked  to  delete  a  subwindow.   Solaris
-           X/Open curses does not even make that check, and will delete a par-
-           ent window which still has subwindows.
+       If delwin is asked to delete a parent window, it can  succeed  only  if
+       the  curses library keeps a list of its subwindows.  SVr4 curses kept a
+       count of the number of  subwindows  rather  than  a  list.   It  simply
+       returned  ERR  when asked to delete a subwindow.  Solaris X/Open curses
+       (xcurses) does not make even that  check,  and  will  delete  a  parent
+       window that still has subwindows.  PDCurses also behaves this way.
 
-       o   Since release 4.0 (1996), ncurses maintains a list of  windows  for
-           each  screen,  to ensure that a window has no subwindows before al-
-           lowing deletion.
+       ncurses  4.0  (1996)  and  later  maintains  a list of windows for each
+       screen to ensure that a window has no subwindows  before  allowing  its
+       deletion.  NetBSD curses has followed suit since 2003.
 
-       o   NetBSD copied this feature of ncurses in 2003.
-           PDCurses follows the scheme used in Solaris X/Open curses.
+       SVr4  curses  documentation is unclear about what wsyncup and wsyncdown
+       actually do.  It seems to imply that they are supposed  to  touch  only
+       those  lines that are affected by changes to a window's ancestors.  The
+       description and behavior of these functions in ncurses is patterned  on
+       the X/Open Curses standard; this approach may result in slower updates.

              SEE ALSO

              -       curses(3x),   curs_initscr(3x),    curs_refresh(3x),    curs_touch(3x),
+       curses(3x),    curs_initscr(3x),    curs_refresh(3x),   curs_touch(3x),
        curs_variables(3x)
 
 
 
-                                                               curs_window(3x)
+ncurses 6.5                       2025-02-01                   curs_window(3x)
              diff --git a/doc/html/man/default_colors.3x.html b/doc/html/man/default_colors.3x.html index 9614eecf..14a0f8e3 100644 --- a/doc/html/man/default_colors.3x.html +++ b/doc/html/man/default_colors.3x.html @@ -1,6 +1,6 @@ -default_colors 3x +default_colors 3x 2024-04-13 ncurses 6.5 Library calls -

              default_colors 3x

              +

              default_colors 3x 2024-04-13 ncurses 6.5 Library calls

              -default_colors(3x)                                          default_colors(3x)
+default_colors(3x)               Library calls              default_colors(3x)

              NAME

                      use_default_colors,  assume_default_colors  -  use  terminal's  default
-       colors
+       colors in curses

              SYNOPSIS

              @@ -90,15 +90,15 @@ 
              default_colors 3x
              
               use_default_colors();
               assume_default_colors(-1,-1);
 
-       These are ncurses extensions.  For other curses implementations,  color
-       number  -1  does  not  mean  anything,  just  as  for  ncurses before a
+       These are ncurses extensions.  For other curses implementations,  color
+       number  -1  does  not  mean  anything,  just  as  for  ncurses before a
        successful call of use_default_colors or assume_default_colors.
 
        Other curses implementations do not  allow  an  application  to  modify
        color  pair  0.  They assume that the background is COLOR_BLACK, but do
        not ensure that the color pair 0 is painted to  match  the  assumption.
        If   your   application  does  not  use  either  use_default_colors  or
-       assume_default_colors ncurses will paint a white foreground (text) with
+       assume_default_colors ncurses will paint a white foreground (text) with
        black background for color pair 0.
 
 
@@ -134,22 +134,22 @@ 
              default_colors 3x

              PORTABILITY

              -       These routines are specific to ncurses.  They  were  not  supported  on
+       These routines are specific to ncurses.  They  were  not  supported  on
        Version 7, BSD or System V implementations.  It is recommended that any
        code depending on them be conditioned using NCURSES_VERSION.
 
 
-

              SEE ALSO

              -       ded(1), curs_color(3x).
-
-
-

              AUTHOR

              +

              AUTHORS

                      Thomas Dickey (from an analysis of the requirements for color xterm for
        XFree86 3.1.2C, February 1996).
 
 
+

              SEE ALSO

              +       ded(1), curs_color(3x)
+
+
 
-                                                            default_colors(3x)
+ncurses 6.5                       2024-04-13                default_colors(3x)
              diff --git a/doc/html/man/define_key.3x.html b/doc/html/man/define_key.3x.html index 4ab7c78d..84caa9b4 100644 --- a/doc/html/man/define_key.3x.html +++ b/doc/html/man/define_key.3x.html @@ -1,6 +1,6 @@ -define_key 3x +define_key 3x 2024-12-28 ncurses 6.5 Library calls -

              define_key 3x

              +

              define_key 3x 2024-12-28 ncurses 6.5 Library calls

              -define_key(3x)                                                  define_key(3x)
+define_key(3x)                   Library calls                  define_key(3x)

              NAME

              -       define_key - define a keycode
+       define_key - define a curses function key code

              SYNOPSIS

                      #include <curses.h>
 
-       int define_key(const char *definition, int keycode);
+       int define_key(const char * definition, int key-code);

              DESCRIPTION

              -       This  is an extension to the curses library.  It permits an application
-       to define keycodes with their corresponding control  strings,  so  that
-       the ncurses library will interpret them just as it would the predefined
-       codes in the terminfo database.
+       The define_key ncurses extension permits a curses application to bind a
+       string definition to the function key key-code returned  by  wgetch(3x)
+       (wide-character  API users: wget_wch(3x)) when keypad(3x) is enabled in
+       a window and a function key is  pressed.   ncurses  interprets  such  a
+       binding  as  it  does  those  in  the  terminfo  database entry for the
+       terminal type.
 
-       If the given string is null, any existing definition for the keycode is
-       removed.   Similarly,  if  the  given  keycode is negative or zero, any
-       existing string for the given definition is removed.
+       A definition of  NULL  removes  any  existing  binding  from  key-code.
+       Similarly,  a  non-positive  key-code  removes  an existing binding for
+       definition, if any.

              RETURN VALUE

              -       The keycode must  be  greater  than  zero,  and  the  string  non-null,
-       otherwise  ERR  is  returned.   ERR  may  also  be returned if there is
-       insufficient memory to allocate the data to store the  definition.   If
-       no error is detected, OK is returned.
+       define_key returns ERR if
+
+       o   definition is NULL and key-code is nonpositive, or
+
+       o   insufficient memory is available to bind definition to key-code.
+
+       Otherwise, define_key returns OK.
+
+
+

              EXTENSIONS

              +       define_key is an ncurses extension.

              PORTABILITY

              -       These  routines  are  specific  to ncurses.  They were not supported on
-       Version 7, BSD or System V implementations.  It is recommended that any
-       code depending on them be conditioned using NCURSES_VERSION.
+       Applications employing ncurses extensions should condition their use on
+       the visibility of the NCURSES_VERSION preprocessor macro.
 
+       NetBSD curses since 2.0 (2004) supports define_key.
 
-

              SEE ALSO

              -       keyok(3x), key_defined(3x).
 
+

              AUTHORS

              +       Thomas Dickey
 
-

              AUTHOR

              -       Thomas Dickey.
+
+

              SEE ALSO

              +       curses(3x), keybound(3x), keyok(3x), key_defined(3x), terminfo(5)
 
 
 
-                                                                define_key(3x)
+ncurses 6.5                       2024-12-28                    define_key(3x)
              diff --git a/doc/html/man/form.3x.html b/doc/html/man/form.3x.html index baaadbd2..e6ee9cca 100644 --- a/doc/html/man/form.3x.html +++ b/doc/html/man/form.3x.html @@ -1,7 +1,7 @@ -form 3x +form 3x 2024-12-28 ncurses 6.5 Library calls -

              form 3x

              +

              form 3x 2024-12-28 ncurses 6.5 Library calls

              -form(3x)                                                              form(3x)
+form(3x)                         Library calls                        form(3x)

              NAME

              -       form - curses extension for programming forms
+       form - present user-fillable forms in curses windows

              SYNOPSIS

              @@ -78,15 +78,15 @@ 
              form 3x

              Current Default Values for Field Attributes

                      The  form  library maintains a default value for field attributes.  You
        can get or  set  this  default  by  calling  the  appropriate  set_  or
-       retrieval  routine  with  a  NULL field pointer.  Changing this default
+       retrieval  routine  with  a  NULL field pointer.  Changing this default
        with a set_ function affects  future  field  creations,  but  does  not
        change the rendering of fields already created.

              Routine Name Index

                      The  following table lists each form routine and the name of the manual
-       page on which it is described.  Routines flagged with "*" are  ncurses-
-       specific, not present in SVr4.
+       page  on  which  it  is  described.   Routines  flagged  with  "*"  are
+       ncurses-specific, not present in SVr4.
 
        curses Routine Name     Manual Page Name
        --------------------------------------------------
@@ -169,7 +169,7 @@ 
              form 3x

              RETURN VALUE

              -       Routines  that  return  pointers return NULL on error, and set errno to
+       Routines  that  return  pointers return NULL on error, and set errno to
        the  corresponding  error-code  returned  by  functions  returning   an
        integer.   Routines  that return an integer return one of the following
        error codes:
@@ -211,48 +211,41 @@ 
              form 3x

              NOTES

              -       The header  file  <form.h>  automatically  includes  the  header  files
-       <curses.h> and <eti.h>.
-
-       In your library list, libform.a should be before libncurses.a; that is,
-       you want to say "-lform -lncurses", not the  other  way  around  (which
-       would give you a link error when using static libraries).
+       The header file form.h itself includes curses.h.

              PORTABILITY

              -       These  routines  emulate  the  System  V  forms library.  They were not
+       These routines emulate the System  V  forms  library.   They  were  not
        supported on Version 7 or BSD versions.
 
-       The menu facility was documented in SVr4.2 in Character User  Interface
-       Programming (UNIX SVR4.2).
+       A  form  facility  was  documented in SVr4.2's Character User Interface
+       Programming document.
 
        It is not part of X/Open Curses.
 
-       Aside from ncurses, there are few implementations:
+       Aside from ncurses, there are few implementations:
 
        o   systems based on SVr4 source code, e.g., Solaris.
 
        o   NetBSD curses.
 
-       A  few  functions  in  this  implementation  are  extensions  added for
-       ncurses,   but   not   provided   by   other   implementations,   e.g.,
+       A few  functions  in  this  implementation  are  extensions  added  for
+       ncurses,   but   not   provided   by   other   implementations,   e.g.,
        form_driver_w, unfocus_current_field.

              AUTHORS

              -       Juergen  Pfeifer.   Manual  pages and adaptation for ncurses by Eric S.
+       Juergen Pfeifer.  Manual pages and adaptation for ncurses  by  Eric  S.
        Raymond.

              SEE ALSO

              -       curses(3x) and related pages whose names  begin  "form_"  for  detailed
+       curses(3x)  and  related  pages  whose names begin "form_" for detailed
        descriptions of the entry points.
 
-       This describes ncurses version 6.4 (patch 20230311).
-
 
 
-                                                                      form(3x)
+ncurses 6.5                       2024-12-28                          form(3x)
                diff --git a/doc/html/man/form_cursor.3x.html b/doc/html/man/form_cursor.3x.html index 5aecefc5..5844dd58 100644 --- a/doc/html/man/form_cursor.3x.html +++ b/doc/html/man/form_cursor.3x.html @@ -1,7 +1,7 @@ -form_cursor 3x +form_cursor 3x 2024-03-16 ncurses 6.5 Library calls -

                form_cursor 3x

                +

                form_cursor 3x 2024-03-16 ncurses 6.5 Library calls

                -form_cursor(3x)                                                form_cursor(3x)
+form_cursor(3x)                  Library calls                 form_cursor(3x)
 
 
 
@@ -79,17 +79,8 @@ 
                form_cursor 3x
                
             System error occurred (see errno(3)).
 
 
-

                SEE ALSO

                -       curses(3x), form(3x).
-
-
-

                NOTES

                -       The  header  file  <form.h>  automatically  includes  the  header  file
-       <curses.h>.
-
-

                PORTABILITY

                -       These  routines  emulate  the  System  V  forms library.  They were not
+       These routines emulate the System  V  forms  library.   They  were  not
        supported on Version 7 or BSD versions.
 
 
@@ -98,8 +89,12 @@ 
                form_cursor 3x
                
        Raymond.
 
 
+

                SEE ALSO

                +       curses(3x), form(3x)
+
+
 
-                                                               form_cursor(3x)
+ncurses 6.5                       2024-03-16                   form_cursor(3x)
                diff --git a/doc/html/man/form_data.3x.html b/doc/html/man/form_data.3x.html index 3c42b468..2f1dc3b9 100644 --- a/doc/html/man/form_data.3x.html +++ b/doc/html/man/form_data.3x.html @@ -1,7 +1,7 @@ -form_data 3x +form_data 3x 2024-03-16 ncurses 6.5 Library calls -

                form_data 3x

                +

                form_data 3x 2024-03-16 ncurses 6.5 Library calls

                -form_data(3x)                                                    form_data(3x)
+form_data(3x)                    Library calls                   form_data(3x)
 
 
 
@@ -66,17 +66,8 @@ 
                form_data 3x
                
        in the given form.  It returns TRUE (1) or FALSE (0).
 
 
-

                SEE ALSO

                -       curses(3x), form(3x).
-
-
-

                NOTES

                -       The  header  file  <form.h>  automatically  includes  the  header  file
-       <curses.h>.
-
-

                PORTABILITY

                -       These routines emulate the System  V  forms  library.   They  were  not
+       These  routines  emulate  the  System  V  forms library.  They were not
        supported on Version 7 or BSD versions.
 
 
@@ -85,18 +76,21 @@ 
                form_data 3x
                
        Raymond.
 
 
+

                SEE ALSO

                +       curses(3x), form(3x)
+
+
 
-                                                                 form_data(3x)
+ncurses 6.5                       2024-03-16                     form_data(3x)
                diff --git a/doc/html/man/form_driver.3x.html b/doc/html/man/form_driver.3x.html index b6420bc3..859c291a 100644 --- a/doc/html/man/form_driver.3x.html +++ b/doc/html/man/form_driver.3x.html @@ -1,6 +1,7 @@ -form_driver 3x +form_driver 3x 2024-04-20 ncurses 6.5 Library calls -

                form_driver 3x

                +

                form_driver 3x 2024-04-20 ncurses 6.5 Library calls

                -form_driver(3x)                                                form_driver(3x)
+form_driver(3x)                  Library calls                 form_driver(3x)
 
 
 
@@ -54,7 +55,7 @@ 
                form_driver 3x
                
        #include <form.h>
 
        int form_driver(FORM *form, int c);
-       int form_driver_w(FORM *form, int c, wchar_t wch);
+       int form_driver_w(FORM *form, int c, wchar_t wc);

                DESCRIPTION

                @@ -83,77 +84,77 @@ 
                form_driver 3x
                
        character or a request.
 
 
-

                Form-driver requests

                +

                Form Driver Requests

                        The form driver requests are as follows:
 
        Name               Description
-       ---------------------------------------------------------------------
-       REQ_BEG_FIELD      Move to the beginning of the field.
-       REQ_BEG_LINE       Move to the beginning of the line.
-       REQ_CLR_EOF        Clear to end of field from cursor.
-       REQ_CLR_EOL        Clear to end of line from cursor.
-       REQ_CLR_FIELD      Clear the entire field.
-       REQ_DEL_CHAR       Delete character at the cursor.
-       REQ_DEL_LINE       Delete line at the cursor.
-       REQ_DEL_PREV       Delete character before the cursor.
-       REQ_DEL_WORD       Delete blank-delimited word at the cursor.
-       REQ_DOWN_CHAR      Move down in the field.
-       REQ_DOWN_FIELD     Move down to a field.
-       REQ_END_FIELD      Move to the end of the field.
-       REQ_END_LINE       Move to the end of the line.
-       REQ_FIRST_FIELD    Move to the first field.
-       REQ_FIRST_PAGE     Move to the first page.
-       REQ_INS_CHAR       Insert a blank at the cursor.
-       REQ_INS_LINE       Insert a blank line at the cursor.
-       REQ_INS_MODE       Enter insert mode.
-       REQ_LAST_FIELD     Move to the last field.
-       REQ_LAST_PAGE      Move to the last field.
-       REQ_LEFT_CHAR      Move left in the field.
-       REQ_LEFT_FIELD     Move left to a field.
-       REQ_NEW_LINE       Insert or overlay a new line.
-       REQ_NEXT_CHAR      Move to the next char.
-
-       REQ_NEXT_CHOICE    Display next field choice.
-       REQ_NEXT_FIELD     Move to the next field.
-       REQ_NEXT_LINE      Move to the next line.
-       REQ_NEXT_PAGE      Move to the next page.
-       REQ_NEXT_PAGE      Move to the next page.
-       REQ_NEXT_WORD      Move to the next word.
-       REQ_OVL_MODE       Enter overlay mode.
-       REQ_PREV_CHAR      Move to the previous char.
-       REQ_PREV_CHOICE    Display previous field choice.
-       REQ_PREV_FIELD     Move to the previous field.
-       REQ_PREV_LINE      Move to the previous line.
-       REQ_PREV_PAGE      Move to the previous page.
-       REQ_PREV_WORD      Move to the previous word.
-       REQ_RIGHT_CHAR     Move right in the field.
-       REQ_RIGHT_FIELD    Move right to a field.
-       REQ_SCR_BCHAR      Scroll the field backward a character.
-       REQ_SCR_BHPAGE     Scroll the field backward half a page.
-       REQ_SCR_BLINE      Scroll the field backward a line.
-       REQ_SCR_BPAGE      Scroll the field backward a page.
-       REQ_SCR_FCHAR      Scroll the field forward a character.
-       REQ_SCR_FHPAGE     Scroll the field forward half a page.
-       REQ_SCR_FLINE      Scroll the field forward a line.
-       REQ_SCR_FPAGE      Scroll the field forward a page.
-       REQ_SCR_HBHALF     Horizontal scroll the field backward half a line.
-       REQ_SCR_HBLINE     Horizontal scroll the field backward a line.
-       REQ_SCR_HFHALF     Horizontal scroll the field forward half a line.
-       REQ_SCR_HFLINE     Horizontal scroll the field forward a line.
-       REQ_SFIRST_FIELD   Move to the sorted first field.
-       REQ_SLAST_FIELD    Move to the sorted last field.
-       REQ_SNEXT_FIELD    Move to the sorted next field.
-       REQ_SPREV_FIELD    Move to the sorted previous field.
-       REQ_UP_CHAR        Move up in the field.
-       REQ_UP_FIELD       Move up to a field.
-       REQ_VALIDATION     Validate field.
+       ------------------------------------------------------------------------
+       REQ_BEG_FIELD      Move to beginning of field.
+       REQ_BEG_LINE       Move to beginning of the line.
+       REQ_CLR_EOF        Clear to end of field from cursor.
+       REQ_CLR_EOL        Clear to end of line from cursor.
+       REQ_CLR_FIELD      Clear the entire field.
+       REQ_DEL_CHAR       Delete character at the cursor.
+       REQ_DEL_LINE       Delete line at the cursor.
+       REQ_DEL_PREV       Delete character before the cursor.
+       REQ_DEL_WORD       Delete blank-delimited word at cursor.
+       REQ_DOWN_CHAR      Move down in field.
+       REQ_DOWN_FIELD     Move down to a field.
+       REQ_END_FIELD      Move to the end of field.
+       REQ_END_LINE       Move to the end of the line.
+       REQ_FIRST_FIELD    Move to the first field.
+       REQ_FIRST_PAGE     Move to the first page.
+       REQ_INS_CHAR       Insert a blank at the cursor.
+       REQ_INS_LINE       Insert a blank line at the cursor.
+       REQ_INS_MODE       Enter insert mode.
+       REQ_LAST_FIELD     Move to the last field.
+       REQ_LAST_PAGE      Move to the last field.
+       REQ_LEFT_CHAR      Move left in field.
+       REQ_LEFT_FIELD     Move left to a field.
+       REQ_NEW_LINE       Insert or overlay a new line.
+       REQ_NEXT_CHAR      Move to the next char.
+
+       REQ_NEXT_CHOICE    Display next field choice.
+       REQ_NEXT_FIELD     Move to the next field.
+       REQ_NEXT_LINE      Move to the next line.
+       REQ_NEXT_PAGE      Move to the next page.
+       REQ_NEXT_PAGE      Move to the next page.
+       REQ_NEXT_WORD      Move to the next word.
+       REQ_OVL_MODE       Enter overlay mode.
+       REQ_PREV_CHAR      Move to the previous char.
+       REQ_PREV_CHOICE    Display previous field choice.
+       REQ_PREV_FIELD     Move to the previous field.
+       REQ_PREV_LINE      Move to the previous line.
+       REQ_PREV_PAGE      Move to the previous page.
+       REQ_PREV_WORD      Move to the previous word.
+       REQ_RIGHT_CHAR     Move right in field.
+       REQ_RIGHT_FIELD    Move right to a field.
+       REQ_SCR_BCHAR      Scroll field backward 1 character.
+       REQ_SCR_BHPAGE     Scroll field backward 1/2 page.
+       REQ_SCR_BLINE      Scroll field backward 1 line.
+       REQ_SCR_BPAGE      Scroll field backward 1 page.
+       REQ_SCR_FCHAR      Scroll field forward 1 character.
+       REQ_SCR_FHPAGE     Scroll field forward 1/2 page.
+       REQ_SCR_FLINE      Scroll field forward 1 line.
+       REQ_SCR_FPAGE      Scroll field forward 1 page.
+       REQ_SCR_HBHALF     Horizontal scroll field backward 1/2 line.
+       REQ_SCR_HBLINE     Horizontal scroll field backward 1 line.
+       REQ_SCR_HFHALF     Horizontal scroll field forward 1/2 line.
+       REQ_SCR_HFLINE     Horizontal scroll field forward 1 line.
+       REQ_SFIRST_FIELD   Move to the sorted first field.
+       REQ_SLAST_FIELD    Move to the sorted last field.
+       REQ_SNEXT_FIELD    Move to the sorted next field.
+       REQ_SPREV_FIELD    Move to the sorted previous field.
+       REQ_UP_CHAR        Move up in field.
+       REQ_UP_FIELD       Move up to a field.
+       REQ_VALIDATION     Validate field.
 
        If  the  second argument is a printable character, the driver places it
        in the current position in the current field.  If  it  is  one  of  the
        forms requests listed above, that request is executed.
 
 
-

                Field validation

                +

                Field Validation

                        The  form  library  makes  updates  to  the window associated with form
        fields rather than directly to the field buffers.
 
@@ -180,7 +181,7 @@ 
                form_driver 3x
                
        data from the window associated with the field to the field buffer.
 
 
-

                Mouse handling

                +

                Mouse Handling

                        If the second argument is the KEY_MOUSE  special  key,  the  associated
        mouse  event  is translated into one of the above pre-defined requests.
        Currently only clicks in the user window (e.g., inside the form display
@@ -220,7 +221,7 @@ 
                form_driver 3x
                
        translated into a form request an E_REQUEST_DENIED is returned.
 
 
-

                Application-defined commands

                +

                Application-defined Commands

                        If the second argument is neither printable nor one of the  above  pre-
        defined form requests, the driver assumes it is an application-specific
        command and returns  E_UNKNOWN_COMMAND.   Application-defined  commands
@@ -258,16 +259,6 @@ 
                form_driver 3x
                
             The form driver code saw an unknown request code.
 
 
-

                SEE ALSO

                -       curses(3x),   form(3x),   form_fieldtype(3x),    form_field_buffer(3x),
-       form_field_validation(3x), form_variables(3x), getch(3x).
-
-
-

                NOTES

                -       The  header  file  <form.h>  automatically  includes  the  header files
-       <curses.h>.
-
-

                PORTABILITY

                        These routines emulate the System  V  forms  library.   They  were  not
        supported on Version 7 or BSD versions.
@@ -278,8 +269,13 @@ 
                form_driver 3x
                
        Raymond.
 
 
+

                SEE ALSO

                +       curses(3x),   form(3x),   form_fieldtype(3x),    form_field_buffer(3x),
+       form_field_validation(3x), form_variables(3x), getch(3x)
+
 
-                                                               form_driver(3x)
+
+ncurses 6.5                       2024-04-20                   form_driver(3x)
                diff --git a/doc/html/man/form_field.3x.html b/doc/html/man/form_field.3x.html index 0f51ef5a..1d821966 100644 --- a/doc/html/man/form_field.3x.html +++ b/doc/html/man/form_field.3x.html @@ -1,7 +1,7 @@ -form_field 3x +form_field 3x 2024-12-28 ncurses 6.5 Library calls -

                form_field 3x

                +

                form_field 3x 2024-12-28 ncurses 6.5 Library calls

                -form_field(3x)                                                  form_field(3x)
+form_field(3x)                   Library calls                  form_field(3x)
 
 
 
@@ -62,7 +62,7 @@ 
                form_field 3x

                DESCRIPTION

                        The  function  set_form_fields  changes  the field pointer array of the
-       given form.  The array must be terminated by a NULL.
+       given form.  The array must be terminated by a NULL.
 
        The function form_fields returns the field array of the given form.
 
@@ -73,10 +73,10 @@ 
                form_field 3x

                RETURN VALUE

                -       The  function  form_fields  returns  a pointer (which may be NULL).  It
+       The  function  form_fields  returns  a pointer (which may be NULL).  It
        does not set errno.
 
-       The function field_count returns ERR if the form parameter is NULL.
+       The function field_count returns ERR if the form parameter is NULL.
 
        The  functions  set_form_fields  and  move_field  return  one  of   the
        following codes on error:
@@ -96,20 +96,11 @@ 
                form_field 3x
                
             System error occurred (see errno(3)).
 
 
-

                SEE ALSO

                -       curses(3x), form(3x).
-
-
-

                NOTES

                -       The  header  file  <form.h>  automatically  includes  the  header  file
-       <curses.h>.
-
-

                PORTABILITY

                -       These routines emulate the System  V  forms  library.   They  were  not
+       These  routines  emulate  the  System  V  forms library.  They were not
        supported on Version 7 or BSD versions.
 
-       The  SVr4  forms  library documentation specifies the field_count error
+       The SVr4 forms library documentation specifies  the  field_count  error
        value as -1 (which is the value of ERR).
 
 
@@ -118,8 +109,12 @@ 
                form_field 3x
                
        Raymond.
 
 
+

                SEE ALSO

                +       curses(3x), form(3x)
+
+
 
-                                                                form_field(3x)
+ncurses 6.5                       2024-12-28                    form_field(3x)
                diff --git a/doc/html/man/form_field_attributes.3x.html b/doc/html/man/form_field_attributes.3x.html index 7996122b..22afdc67 100644 --- a/doc/html/man/form_field_attributes.3x.html +++ b/doc/html/man/form_field_attributes.3x.html @@ -1,7 +1,7 @@ -form_field_attributes 3x +form_field_attributes 3x 2024-03-16 ncurses 6.5 Library calls -

                form_field_attributes 3x

                +

                form_field_attributes 3x 2024-03-16 ncurses 6.5 Library calls

                -form_field_attributes(3x)                            form_field_attributes(3x)
+form_field_attributes(3x)        Library calls       form_field_attributes(3x)
 
 
 
@@ -92,16 +92,6 @@ 
                form_field_attributes 3x
                
             System error occurred (see errno(3)).
 
 
-

                SEE ALSO

                -       curses(3x)  and  related  pages  whose names begin "form_" for detailed
-       descriptions of the entry points.
-
-
-

                NOTES

                -       The  header  file  <form.h>  automatically  includes  the  header  file
-       <curses.h>.
-
-

                PORTABILITY

                        These  routines  emulate  the  System  V  forms library.  They were not
        supported on Version 7 or BSD versions.
@@ -112,8 +102,13 @@ 
                form_field_attributes 3x
                
        Raymond.
 
 
+

                SEE ALSO

                +       curses(3x)  and  related  pages  whose names begin "form_" for detailed
+       descriptions of the entry points.
+
 
-                                                     form_field_attributes(3x)
+
+ncurses 6.5                       2024-03-16         form_field_attributes(3x)
                diff --git a/doc/html/man/form_field_buffer.3x.html b/doc/html/man/form_field_buffer.3x.html index 1bc00e30..88063f35 100644 --- a/doc/html/man/form_field_buffer.3x.html +++ b/doc/html/man/form_field_buffer.3x.html @@ -1,7 +1,6 @@ -form_field_buffer 3x +form_field_buffer 3x 2024-12-28 ncurses 6.5 Library calls -

                form_field_buffer 3x

                +

                form_field_buffer 3x 2024-12-28 ncurses 6.5 Library calls

                -form_field_buffer(3x)                                    form_field_buffer(3x)
+form_field_buffer(3x)            Library calls           form_field_buffer(3x)
 
 
 
@@ -105,7 +104,7 @@ 
                form_field_buffer 3x

                RETURN VALUE

                -       The field_buffer  function  returns  NULL  on  error.   It  sets  errno
+       The field_buffer  function  returns  NULL  on  error.   It  sets  errno
        according to their success:
 
        E_OK The routine succeeded.
@@ -126,26 +125,19 @@ 
                form_field_buffer 3x
                
             Routine detected an incorrect or out-of-range argument.
 
 
-

                SEE ALSO

                -       curses(3x)  and  related  pages  whose names begin "form_" for detailed
-       descriptions of the entry points.
-
-

                NOTES

                -       The header file <form.h> automatically includes the header file
-
-       When configured for wide characters, field_buffer returns a pointer  to
-       temporary   storage   (allocated   and  freed  by  the  library).   The
+       When  configured for wide characters, field_buffer returns a pointer to
+       temporary  storage  (allocated  and  freed  by   the   library).    The
        application should not attempt to modify the data.  It will be freed on
-       the next call to field_buffer to return the same buffer.  <curses.h>.
+       the next call to field_buffer to return the same buffer.

                PORTABILITY

                -       These  routines  emulate  the  System  V  forms library.  They were not
+       These routines emulate the System  V  forms  library.   They  were  not
        supported on Version 7 or BSD versions.
 
-       The  set_max_field   function   checks   for   an   ncurses   extension
-       O_INPUT_FIELD  which  allows a dynamic field to shrink if the new limit
+       The   set_max_field   function   checks   for   an   ncurses  extension
+       O_INPUT_FIELD which allows a dynamic field to shrink if the  new  limit
        is smaller than the current field size.
 
 
@@ -154,8 +146,13 @@ 
                form_field_buffer 3x
                
        Raymond.
 
 
+

                SEE ALSO

                +       curses(3x) and related pages whose names  begin  "form_"  for  detailed
+       descriptions of the entry points.
+
+
 
-                                                         form_field_buffer(3x)
+ncurses 6.5                       2024-12-28             form_field_buffer(3x)
                diff --git a/doc/html/man/form_field_info.3x.html b/doc/html/man/form_field_info.3x.html index a4852126..2090ab66 100644 --- a/doc/html/man/form_field_info.3x.html +++ b/doc/html/man/form_field_info.3x.html @@ -1,7 +1,6 @@ -form_field_info 3x +form_field_info 3x 2024-03-16 ncurses 6.5 Library calls -

                form_field_info 3x

                +

                form_field_info 3x 2024-03-16 ncurses 6.5 Library calls

                -form_field_info(3x)                                        form_field_info(3x)
+form_field_info(3x)              Library calls             form_field_info(3x)
 
 
 
@@ -87,16 +86,6 @@ 
                form_field_info 3x
                
             Routine detected an incorrect or out-of-range argument.
 
 
-

                SEE ALSO

                -       curses(3x)  and  related  pages  whose names begin "form_" for detailed
-       descriptions of the entry points.
-
-
-

                NOTES

                -       The  header  file  <form.h>  automatically  includes  the  header  file
-       <curses.h>.
-
-

                PORTABILITY

                        These  routines  emulate  the  System  V  forms library.  They were not
        supported on Version 7 or BSD versions.
@@ -111,8 +100,13 @@ 
                form_field_info 3x
                
        Raymond.
 
 
+

                SEE ALSO

                +       curses(3x)  and  related  pages  whose names begin "form_" for detailed
+       descriptions of the entry points.
+
 
-                                                           form_field_info(3x)
+
+ncurses 6.5                       2024-03-16               form_field_info(3x)
                diff --git a/doc/html/man/form_field_just.3x.html b/doc/html/man/form_field_just.3x.html index c40c6b2a..f0bc457f 100644 --- a/doc/html/man/form_field_just.3x.html +++ b/doc/html/man/form_field_just.3x.html @@ -1,7 +1,6 @@ -form_field_just 3x +form_field_just 3x 2024-03-16 ncurses 6.5 Library calls -

                form_field_just 3x

                +

                form_field_just 3x 2024-03-16 ncurses 6.5 Library calls

                -form_field_just(3x)                                        form_field_just(3x)
+form_field_just(3x)              Library calls             form_field_just(3x)
 
 
 
@@ -80,16 +79,6 @@ 
                form_field_just 3x
                
             Routine detected an incorrect or out-of-range argument.
 
 
-

                SEE ALSO

                -       curses(3x)  and  related  pages  whose names begin "form_" for detailed
-       descriptions of the entry points.
-
-
-

                NOTES

                -       The  header  file  <form.h>  automatically  includes  the  header  file
-       <curses.h>.
-
-

                PORTABILITY

                        These  routines  emulate  the  System  V  forms library.  They were not
        supported on Version 7 or BSD versions.
@@ -100,8 +89,13 @@ 
                form_field_just 3x
                
        Raymond.
 
 
+

                SEE ALSO

                +       curses(3x)  and  related  pages  whose names begin "form_" for detailed
+       descriptions of the entry points.
+
 
-                                                           form_field_just(3x)
+
+ncurses 6.5                       2024-03-16               form_field_just(3x)
                diff --git a/doc/html/man/form_field_new.3x.html b/doc/html/man/form_field_new.3x.html index d52ee9ed..870dc77c 100644 --- a/doc/html/man/form_field_new.3x.html +++ b/doc/html/man/form_field_new.3x.html @@ -1,7 +1,6 @@ -form_field_new 3x +form_field_new 3x 2024-12-28 ncurses 6.5 Library calls -

                form_field_new 3x

                +

                form_field_new 3x 2024-12-28 ncurses 6.5 Library calls

                -form_field_new(3x)                                          form_field_new(3x)
+form_field_new(3x)               Library calls              form_field_new(3x)
 
 
 
@@ -82,7 +81,7 @@ 
                form_field_new 3x

                RETURN VALUE

                -       The functions new_field, dup_field, link_field return  NULL  on  error.
+       The functions new_field, dup_field, link_field return  NULL  on  error.
        They set errno according to their success:
 
        E_OK The routine succeeded.
@@ -104,21 +103,12 @@ 
                form_field_new 3x
                
             field is connected.
 
 
-

                SEE ALSO

                -       curses(3x), form(3x).
-
-
-

                NOTES

                -       The  header  file  <form.h>  automatically  includes  the  header  file
-       <curses.h>.
-
-

                PORTABILITY

                -       These routines emulate the System  V  forms  library.   They  were  not
+       These  routines  emulate  the  System  V  forms library.  They were not
        supported on Version 7 or BSD versions.
 
-       It  may be unwise to count on the set of attributes copied by dup_field
-       being portable; the System V  forms  library  documents  are  not  very
+       It may be unwise to count on the set of attributes copied by  dup_field
+       being  portable;  the  System  V  forms  library documents are not very
        explicit about what gets copied and what does not.
 
 
@@ -127,8 +117,12 @@ 
                form_field_new 3x
                
        Raymond.
 
 
+

                SEE ALSO

                +       curses(3x), form(3x)
+
+
 
-                                                            form_field_new(3x)
+ncurses 6.5                       2024-12-28                form_field_new(3x)
                diff --git a/doc/html/man/form_field_opts.3x.html b/doc/html/man/form_field_opts.3x.html index 71bc188b..e5123ace 100644 --- a/doc/html/man/form_field_opts.3x.html +++ b/doc/html/man/form_field_opts.3x.html @@ -1,7 +1,6 @@ -form_field_opts 3x +form_field_opts 3x 2025-01-18 ncurses 6.5 Library calls -

                form_field_opts 3x

                +

                form_field_opts 3x 2025-01-18 ncurses 6.5 Library calls

                -form_field_opts(3x)                                        form_field_opts(3x)
+form_field_opts(3x)              Library calls             form_field_opts(3x)
 
 
 
@@ -64,7 +63,7 @@ 
                form_field_opts 3x

                DESCRIPTION

                        The function set_field_opts sets all  the  given  field's  option  bits
-       (field option bits may be logically-OR'ed together).
+       (field option bits may be logically "or"-ed together).
 
        The  function  field_opts_on turns on the given option bits, and leaves
        others alone.
@@ -150,17 +149,8 @@ 
                form_field_opts 3x
                
             System error occurred (see errno(3)).
 
 
-

                SEE ALSO

                -       curses(3x), form(3x).  form_field_just(3x).
-
-
-

                NOTES

                -       The  header  file  <form.h>  automatically  includes  the  header  file
-       <curses.h>.
-
-

                PORTABILITY

                -       These routines emulate the System  V  forms  library.   They  were  not
+       These  routines  emulate  the  System  V  forms library.  They were not
        supported on Version 7 or BSD versions.
 
 
@@ -169,8 +159,12 @@ 
                form_field_opts 3x
                
        Raymond.
 
 
+

                SEE ALSO

                +       curses(3x), form(3x), form_field_just(3x)
+
+
 
-                                                           form_field_opts(3x)
+ncurses 6.5                       2025-01-18               form_field_opts(3x)
                diff --git a/doc/html/man/form_field_userptr.3x.html b/doc/html/man/form_field_userptr.3x.html index bdf4b9f5..afe3b646 100644 --- a/doc/html/man/form_field_userptr.3x.html +++ b/doc/html/man/form_field_userptr.3x.html @@ -1,7 +1,6 @@ -form_field_userptr 3x +form_field_userptr 3x 2024-12-28 ncurses 6.5 Library calls -

                form_field_userptr 3x

                +

                form_field_userptr 3x 2024-12-28 ncurses 6.5 Library calls

                -form_field_userptr(3x)                                  form_field_userptr(3x)
+form_field_userptr(3x)           Library calls          form_field_userptr(3x)
 
 
 
@@ -66,23 +65,14 @@ 
                form_field_userptr 3x

                RETURN VALUE

                -       The function field_userptr returns a pointer (which may be  NULL).   It
+       The function field_userptr returns a pointer (which may be  NULL).   It
        does not set errno.
 
        The function set_field_userptr returns E_OK (success).
 
 
-

                SEE ALSO

                -       curses(3x), form(3x).
-
-
-

                NOTES

                -       The  header  file  <form.h>  automatically  includes  the  header  file
-       <curses.h>.
-
-

                PORTABILITY

                -       These routines emulate the System  V  forms  library.   They  were  not
+       These  routines  emulate  the  System  V  forms library.  They were not
        supported on Version 7 or BSD versions.
 
        The user pointer is a void pointer.  We chose not to leave it as a char
@@ -94,8 +84,12 @@ 
                form_field_userptr 3x
                
        Raymond.
 
 
+

                SEE ALSO

                +       curses(3x), form(3x)
+
+
 
-                                                        form_field_userptr(3x)
+ncurses 6.5                       2024-12-28            form_field_userptr(3x)
                diff --git a/doc/html/man/form_field_validation.3x.html b/doc/html/man/form_field_validation.3x.html index c0a0f9e3..d37e50d8 100644 --- a/doc/html/man/form_field_validation.3x.html +++ b/doc/html/man/form_field_validation.3x.html @@ -1,6 +1,6 @@ -form_field_validation 3x +form_field_validation 3x 2025-02-15 ncurses 6.5 Library calls -

                form_field_validation 3x

                +

                form_field_validation 3x 2025-02-15 ncurses 6.5 Library calls

                -form_field_validation(3x)                            form_field_validation(3x)
+form_field_validation(3x)        Library calls       form_field_validation(3x)
 
 
 
@@ -57,7 +57,7 @@ 
                form_field_validation 3x
                
        FIELDTYPE *field_type(const FIELD *field);
        int set_field_type(FIELD *field, FIELDTYPE *type, ...);
 
-       /* predefined field types */
+       /* predefined field types */
        FIELDTYPE *TYPE_ALNUM;
        FIELDTYPE *TYPE_ALPHA;
        FIELDTYPE *TYPE_ENUM;
@@ -69,7 +69,7 @@ 
                form_field_validation 3x

                DESCRIPTION

                        By  default, no validation is done on form fields.  You can associate a
-       form with with a field type, making the form library validate input.
+       form with a field type, making the form library validate input.

                field_arg

                @@ -92,7 +92,7 @@ 
                form_field_validation 3x
                
        Several field types are predefined by the form library.
 
 
-

                Predefined types

                +

                PREDEFINED TYPES

                        It is possible to set up new  programmer-defined  field  types.   Field
        types  are implemented via the FIELDTYPE data structure, which contains
        several pointers to functions.
@@ -102,100 +102,102 @@ 
                form_field_validation 3x
                
 
        The predefined types are as follows:
 
-       TYPE_ALNUM
-            Alphanumeric data.  Required parameter:
 
-            o   a third int argument, a minimum field width.
+

                TYPE_ALNUM

                +       Alphanumeric data.  Required parameter:
 
-       TYPE_ALPHA
-            Character data.  Required parameter:
+       o   a third int argument, a minimum field width.
 
-            o   a third int argument, a minimum field width.
 
-       TYPE_ENUM
-            Accept one of a specified set of strings.  Required parameters:
+

                TYPE_ALPHA

                +       Character data.  Required parameter:
 
-            o   a third (char **) argument pointing to a string list;
+       o   a third int argument, a minimum field width.
 
-            o   a fourth int flag argument to enable case-sensitivity;
 
-            o   a  fifth  int flag argument specifying whether a partial match
-                must be a unique one.  If this flag is off, a  prefix  matches
-                the  first of any set of more than one list elements with that
-                prefix.
+

                TYPE_ENUM

                +       Accept one of a specified set of strings.  Required parameters:
 
-            The library copies the string list, so you may  use  a  list  that
-            lives in automatic variables on the stack.
+       o   a third (char **) argument pointing to a string list;
 
-       TYPE_INTEGER
-            Integer  data,  parsable  to  an  integer  by  atoi(3).   Required
-            parameters:
+       o   a fourth int flag argument to enable case-sensitivity;
 
-            o   a third int argument controlling the precision,
+       o   a  fifth  int flag argument specifying whether a partial match must
+           be a unique one.  If this flag is off, a prefix matches  the  first
+           of any set of more than one list elements with that prefix.
 
-            o   a fourth long argument constraining minimum value,
+       The library copies the string list, so you may use a list that lives in
+       automatic variables on the stack.
 
-            o   a fifth long constraining maximum value.  If the maximum value
-                is  less  than  or  equal  to  the minimum value, the range is
-                simply ignored.
 
-            On return, the field buffer is formatted according to  the  printf
-            format  specification  ".*ld",  where  the  "*" is replaced by the
-            precision argument.
+

                TYPE_INTEGER

                +       Integer data, parsable to an integer by atoi(3).  Required parameters:
 
-            For details of the precision handling see printf(3).
+       o   a third int argument controlling the precision,
 
-       TYPE_NUMERIC
-            Numeric  data  (may  have   a   decimal-point   part).    Required
-            parameters:
+       o   a fourth long argument constraining minimum value,
 
-            o   a third int argument controlling the precision,
+       o   a fifth long constraining maximum value.  If the maximum  value  is
+           less  than  or  equal  to  the  minimum  value, the range is simply
+           ignored.
 
-            o   a fourth double argument constraining minimum value,
+       On return, the field buffer is formatted according to the printf format
+       specification  ".*ld",  where  the  "*"  is  replaced  by the precision
+       argument.
 
-            o   and a fifth double constraining maximum value.  If your system
-                supports locales, the decimal point character must be the  one
-                specified  by  your locale.  If the maximum value is less than
-                or equal to the minimum value, the range is simply ignored.
+       For details of the precision handling see printf(3).
 
-            On return, the field buffer is formatted according to  the  printf
-            format  specification  ".*f",  where  the  "*"  is replaced by the
-            precision argument.
 
-            For details of the precision handling see printf(3).
+

                TYPE_NUMERIC

                +       Numeric data (may have a decimal-point part).  Required parameters:
 
-       TYPE_REGEXP
-            Regular expression data.  Required parameter:
+       o   a third int argument controlling the precision,
 
-            o   a third argument, a regular expression (char *)  string.   The
-                data is valid if the regular expression matches it.
+       o   a fourth double argument constraining minimum value,
 
-            Regular expressions are in the format of regcomp and regexec.
+       o   and a fifth double constraining  maximum  value.   If  your  system
+           supports  locales,  the  decimal  point  character  must be the one
+           specified by your locale.  If the maximum value  is  less  than  or
+           equal to the minimum value, the range is simply ignored.
 
-            The  regular  expression  must match the whole field.  If you have
-            for example, an eight character wide field, a  regular  expression
-            "^[0-9]*$"  always means that you have to fill all eight positions
-            with digits.  If you want to allow fewer digits, you may  use  for
-            example  "^[0-9]*  *$" which is good for trailing spaces (up to an
-            empty field), or "^ *[0-9]* *$" which  is  good  for  leading  and
-            trailing spaces around the digits.
+       On return, the field buffer is formatted according to the printf format
+       specification ".*f",  where  the  "*"  is  replaced  by  the  precision
+       argument.
 
-       TYPE_IPV4
-            An Internet Protocol Version 4 address.  Required parameter:
+       For details of the precision handling see printf(3).
 
-            o   none
 
-            The  form  library  checks  whether or not the buffer has the form
-            a.b.c.d, where a, b, c, and d are numbers in the range 0  to  255.
-            Trailing  blanks in the buffer are ignored.  The address itself is
-            not validated.
+

                TYPE_REGEXP

                +       Regular expression data.  Required parameter:
 
-            This is an ncurses extension; this field type may not be available
-            in other curses implementations.
+       o   a  third  argument, a regular expression (char *) string.  The data
+           is valid if the regular expression matches it.
+
+       Regular expressions are in the format of regcomp and regexec.
+
+       The regular expression must match the whole field.   If  you  have  for
+       example, an eight character wide field, a regular expression "^[0-9]*$"
+       always means that you have to fill all eight positions with digits.  If
+       you  want  to  allow fewer digits, you may use for example "^[0-9]* *$"
+       which is good for trailing spaces (up to an empty field), or "^ *[0-9]*
+       *$" which is good for leading and trailing spaces around the digits.
+
+
+

                TYPE_IPV4

                +       An Internet Protocol Version 4 address.  Required parameter:
+
+       o   none
+
+       The form library checks whether or not the buffer has the form a.b.c.d,
+       where a, b, c, and d are numbers in  the  range  0  to  255.   Trailing
+       blanks in the buffer are ignored.  The address itself is not validated.
+
+       This  is  an ncurses extension; this field type may not be available in
+       other curses implementations.

                RETURN VALUE

                -       The  functions  field_type  and  field_arg  return  NULL on error.  The
+       The functions field_type and  field_arg  return  NULL  on  error.   The
        function set_field_type returns one of the following:
 
        E_OK The routine succeeded.
@@ -204,15 +206,6 @@ 
                form_field_validation 3x
                
             System error occurred (see errno(3)).
 
 
-

                SEE ALSO

                -       curses(3x), form(3x), form_fieldtype(3x), form_variables(3x).
-
-
-

                NOTES

                -       The  header  file  <form.h>  automatically  includes  the  header  file
-       <curses.h>.
-
-

                PORTABILITY

                        These  routines  emulate  the  System  V  forms library.  They were not
        supported on Version 7 or BSD versions.
@@ -223,8 +216,12 @@ 
                form_field_validation 3x
                
        Raymond.
 
 
+

                SEE ALSO

                +       curses(3x), form(3x), form_fieldtype(3x), form_variables(3x)
+
+
 
-                                                     form_field_validation(3x)
+ncurses 6.5                       2025-02-15         form_field_validation(3x)
                + +
              • PREDEFINED TYPES +
              • RETURN VALUE
                • -
              • SEE ALSO
                • -
              • NOTES
              • PORTABILITY
              • AUTHORS
                • +
              • SEE ALSO
              diff --git a/doc/html/man/form_fieldtype.3x.html b/doc/html/man/form_fieldtype.3x.html index 5e675535..e590f1d7 100644 --- a/doc/html/man/form_fieldtype.3x.html +++ b/doc/html/man/form_fieldtype.3x.html @@ -1,7 +1,6 @@ -form_fieldtype 3x +form_fieldtype 3x 2025-01-18 ncurses 6.5 Library calls -

              form_fieldtype 3x

              +

              form_fieldtype 3x 2025-01-18 ncurses 6.5 Library calls

              -form_fieldtype(3x)                                          form_fieldtype(3x)
+form_fieldtype(3x)               Library calls              form_fieldtype(3x)
 
 
 
@@ -119,7 +118,7 @@ 
              form_fieldtype 3x
              
             Frees an argument-block structure.
 
        You must supply the make_arg function.  The other two are optional: you
-       may  supply NULL for them.  In this case, the form library assumes that
+       may  supply NULL for them.  In this case, the form library assumes that
        make_arg does not allocate memory but simply loads the argument into  a
        single scalar value.
 
@@ -137,7 +136,7 @@ 
              form_fieldtype 3x

              link_fieldtype

                      The function link_fieldtype creates a new field type from the two given
-       types.  They are connected by an logical 'OR'.
+       types.  They are connected by a logical "or".

              RETURN VALUE

              @@ -169,17 +168,8 @@ 
              form_fieldtype 3x
              
             System error occurred (see errno(3)).
 
 
-

              SEE ALSO

              -       curses(3x), form(3x), form_field_validation(3x).
-
-
-

              NOTES

              -       The  header  file  <form.h>  automatically  includes  the  header  file
-       <curses.h>.
-
-

              PORTABILITY

              -       These  routines  emulate  the  System  V  forms library.  They were not
+       These routines emulate the System  V  forms  library.   They  were  not
        supported on Version 7 or BSD versions.
 
 
@@ -188,8 +178,12 @@ 
              form_fieldtype 3x
              
        Raymond.
 
 
+

              SEE ALSO

              +       curses(3x), form(3x), form_field_validation(3x)
+
+
 
-                                                            form_fieldtype(3x)
+ncurses 6.5                       2025-01-18                form_fieldtype(3x)
                @@ -205,10 +199,9 @@

                form_fieldtype 3x

            • RETURN VALUE
              • -
            • SEE ALSO
              • -
            • NOTES
            • PORTABILITY
            • AUTHORS
              • +
            • SEE ALSO
            diff --git a/doc/html/man/form_hook.3x.html b/doc/html/man/form_hook.3x.html index decd850e..67ae929f 100644 --- a/doc/html/man/form_hook.3x.html +++ b/doc/html/man/form_hook.3x.html @@ -1,7 +1,6 @@ -form_hook 3x +form_hook 3x 2024-12-28 ncurses 6.5 Library calls -

            form_hook 3x

            +

            form_hook 3x 2024-12-28 ncurses 6.5 Library calls

            -form_hook(3x)                                                    form_hook(3x)
+form_hook(3x)                    Library calls                   form_hook(3x)
 
 
 
@@ -72,27 +71,49 @@ 
            form_hook 3x
            
        various points in the automatic processing  of  input  event  codes  by
        form_driver.
 
-       The  function set_field_init sets a hook to be called at form-post time
-       and  each  time  the  selected  field  changes  (after   the   change).
-       field_init  returns  the current field init hook, if any (NULL if there
-       is no such hook).
 
-       The function set_field_term sets a hook to  be  called  at  form-unpost
-       time  and  each  time  the  selected field changes (before the change).
-       field_term returns the current field term hook, if any (NULL  if  there
-       is no such hook).
+

            set_field_init

            +       sets  a  hook to be called at form-post time and each time the selected
+       field changes (after the change).
 
-       The  function  set_form_init sets a hook to be called at form-post time
-       and just after a page change once it is posted.  form_init returns  the
-       current form init hook, if any (NULL if there is no such hook).
 
-       The function set_form_term sets a hook to be called at form-unpost time
-       and just before a page change once it is posted.  form_init returns the
-       current form term hook, if any (NULL if there is no such hook).
+

            field_init

            +       returns the current field init hook, if any (NULL if there is  no  such
+       hook).
+
+
+

            set_field_term

            +       sets a hook to be called at form-unpost time and each time the selected
+       field changes (before the change).
+
+
+

            field_term

            +       returns the current field term hook, if any (NULL if there is  no  such
+       hook).
+
+
+

            set_form_init

            +       sets a hook to be called at form-post time and just after a page change
+       once it is posted.
+
+
+

            form_init

            +       returns the current form init hook, if any (NULL if there  is  no  such
+       hook).
+
+
+

            set_form_term

            +       sets  a  hook  to  be called at form-unpost time and just before a page
+       change once it is posted.
+
+
+

            form_term

            +       returns the current form term hook, if any (NULL if there  is  no  such
+       hook).

            RETURN VALUE

            -       Routines  that  return  pointers  return NULL on error.  Other routines
+       Routines  that  return  pointers  return NULL on error.  Other routines
        return one of the following:
 
        E_OK The routine succeeded.
@@ -101,17 +122,8 @@ 
            form_hook 3x
            
             System error occurred (see errno(3)).
 
 
-

            SEE ALSO

            -       curses(3x), form(3x).
-
-
-

            NOTES

            -       The  header  file  <form.h>  automatically  includes  the  header  file
-       <curses.h>.
-
-

            PORTABILITY

            -       These  routines  emulate  the  System  V  forms library.  They were not
+       These routines emulate the System  V  forms  library.   They  were  not
        supported on Version 7 or BSD versions.
 
 
@@ -120,19 +132,33 @@ 
            form_hook 3x
            
        Raymond.
 
 
+

            SEE ALSO

            +       curses(3x), form(3x)
+
+
 
-                                                                 form_hook(3x)
+ncurses 6.5                       2024-12-28                     form_hook(3x)
            diff --git a/doc/html/man/form_new.3x.html b/doc/html/man/form_new.3x.html index 1246c427..28adfa6a 100644 --- a/doc/html/man/form_new.3x.html +++ b/doc/html/man/form_new.3x.html @@ -1,7 +1,6 @@ -form_new 3x +form_new 3x 2024-12-28 ncurses 6.5 Library calls -

            form_new 3x

            +

            form_new 3x 2024-12-28 ncurses 6.5 Library calls

            -form_new(3x)                                                      form_new(3x)
+form_new(3x)                     Library calls                    form_new(3x)
 
 
 
@@ -60,14 +59,14 @@ 
            form_new 3x

            DESCRIPTION

                    The function new_form creates a new form connected to a specified field
-       pointer array (which must be NULL-terminated).
+       pointer array (which must be NULL-terminated).
 
        The function free_form disconnects form from its field array and  frees
        the storage allocated for the form.

            RETURN VALUE

            -       The  function  new_form returns NULL on error.  It sets errno according
+       The  function  new_form returns NULL on error.  It sets errno according
        to the function's success:
 
        E_OK The routine succeeded.
@@ -92,17 +91,8 @@ 
            form_new 3x
            
             The form has already been posted.
 
 
-

            SEE ALSO

            -       curses(3x), form(3x).
-
-
-

            NOTES

            -       The  header  file  <form.h>  automatically  includes  the  header  file
-       <curses.h>.
-
-

            PORTABILITY

            -       These  routines  emulate  the  System  V  forms library.  They were not
+       These routines emulate the System  V  forms  library.   They  were  not
        supported on Version 7 or BSD versions.
 
 
@@ -111,8 +101,12 @@ 
            form_new 3x
            
        Raymond.
 
 
+

            SEE ALSO

            +       curses(3x), form(3x)
+
+
 
-                                                                  form_new(3x)
+ncurses 6.5                       2024-12-28                      form_new(3x)
            diff --git a/doc/html/man/form_new_page.3x.html b/doc/html/man/form_new_page.3x.html index 0db3ac7e..e8a18df4 100644 --- a/doc/html/man/form_new_page.3x.html +++ b/doc/html/man/form_new_page.3x.html @@ -1,7 +1,6 @@ -form_new_page 3x +form_new_page 3x 2024-03-16 ncurses 6.5 Library calls -

            form_new_page 3x

            +

            form_new_page 3x 2024-03-16 ncurses 6.5 Library calls

            -form_new_page(3x)                                            form_new_page(3x)
+form_new_page(3x)                Library calls               form_new_page(3x)
 
 
 
@@ -77,16 +76,6 @@ 
            form_new_page 3x
            
             The given field is already connected to a form.
 
 
-

            SEE ALSO

            -       curses(3x)  and  related  pages  whose names begin "form_" for detailed
-       descriptions of the entry points.
-
-
-

            NOTES

            -       The  header  file  <form.h>  automatically  includes  the  header  file
-       <curses.h>.
-
-

            PORTABILITY

                    These  routines  emulate  the  System  V  forms library.  They were not
        supported on Version 7 or BSD versions.
@@ -97,8 +86,13 @@ 
            form_new_page 3x
            
        Raymond.
 
 
+

            SEE ALSO

            +       curses(3x)  and  related  pages  whose names begin "form_" for detailed
+       descriptions of the entry points.
+
 
-                                                             form_new_page(3x)
+
+ncurses 6.5                       2024-03-16                 form_new_page(3x)
            diff --git a/doc/html/man/form_opts.3x.html b/doc/html/man/form_opts.3x.html index 9fda7453..8cc6524a 100644 --- a/doc/html/man/form_opts.3x.html +++ b/doc/html/man/form_opts.3x.html @@ -1,7 +1,6 @@ -form_opts 3x +form_opts 3x 2025-01-18 ncurses 6.5 Library calls -

            form_opts 3x

            +

            form_opts 3x 2025-01-18 ncurses 6.5 Library calls

            -form_opts(3x)                                                    form_opts(3x)
+form_opts(3x)                    Library calls                   form_opts(3x)
 
 
 
@@ -64,7 +63,7 @@ 
            form_opts 3x

            DESCRIPTION

                    The function set_form_opts sets all the given form's option bits  (form
-       option bits may be logically-OR'ed together).
+       option bits may be logically "or"-ed together).
 
        The  function  form_opts_on  turns on the given option bits, and leaves
        others alone.
@@ -94,17 +93,8 @@ 
            form_opts 3x
            
             System error occurred (see errno(3)).
 
 
-

            SEE ALSO

            -       curses(3x), form(3x).
-
-
-

            NOTES

            -       The  header  file  <form.h>  automatically  includes  the  header  file
-       <curses.h>.
-
-

            PORTABILITY

            -       These routines emulate the System  V  forms  library.   They  were  not
+       These  routines  emulate  the  System  V  forms library.  They were not
        supported on Version 7 or BSD versions.
 
 
@@ -113,8 +103,12 @@ 
            form_opts 3x
            
        Raymond.
 
 
+

            SEE ALSO

            +       curses(3x), form(3x)
+
+
 
-                                                                 form_opts(3x)
+ncurses 6.5                       2025-01-18                     form_opts(3x)
            diff --git a/doc/html/man/form_page.3x.html b/doc/html/man/form_page.3x.html index b0ab37d8..c7e56158 100644 --- a/doc/html/man/form_page.3x.html +++ b/doc/html/man/form_page.3x.html @@ -1,7 +1,6 @@ -form_page 3x +form_page 3x 2024-12-28 ncurses 6.5 Library calls -

            form_page 3x

            +

            form_page 3x 2024-12-28 ncurses 6.5 Library calls

            -form_page(3x)                                                    form_page(3x)
+form_page(3x)                    Library calls                   form_page(3x)
 
 
 
@@ -71,7 +70,7 @@ 
            form_page 3x
            
 
        The function unfocus_current_field removes the focus from  the  current
        field  of  the  form.  In such state, inquiries via current_field shall
-       return a NULL pointer.
+       return a NULL pointer.
 
        The function set_form_page sets the form's page number (goes to page  n
        of the form).
@@ -104,20 +103,11 @@ 
            form_page 3x
            
             System error occurred (see errno(3)).
 
 
-

            SEE ALSO

            -       curses(3x), form(3x).
-
-
-

            NOTES

            -       The  header  file  <form.h>  automatically  includes  the  header  file
-       <curses.h>.
-
-

            PORTABILITY

            -       These routines emulate the System  V  forms  library.   They  were  not
+       These  routines  emulate  the  System  V  forms library.  They were not
        supported on Version 7 or BSD versions.
 
-       The unfocus_current_field function is an ncurses extension.
+       The unfocus_current_field function is an ncurses extension.

            AUTHORS

            @@ -125,8 +115,12 @@ 
            form_page 3x
            
        Raymond.
 
 
+

            SEE ALSO

            +       curses(3x), form(3x)
+
+
 
-                                                                 form_page(3x)
+ncurses 6.5                       2024-12-28                     form_page(3x)
            diff --git a/doc/html/man/form_post.3x.html b/doc/html/man/form_post.3x.html index ebb2f01f..9f97d3e5 100644 --- a/doc/html/man/form_post.3x.html +++ b/doc/html/man/form_post.3x.html @@ -1,7 +1,6 @@ -form_post 3x +form_post 3x 2024-03-16 ncurses 6.5 Library calls -

            form_post 3x

            +

            form_post 3x 2024-03-16 ncurses 6.5 Library calls

            -form_post(3x)                                                    form_post(3x)
+form_post(3x)                    Library calls                   form_post(3x)
 
 
 
@@ -95,17 +94,8 @@ 
            form_post 3x
            
             System error occurred (see errno(3)).
 
 
-

            SEE ALSO

            -       curses(3x), form(3x).
-
-
-

            NOTES

            -       The  header  file  <form.h>  automatically  includes  the  header  file
-       <curses.h>.
-
-

            PORTABILITY

            -       These routines emulate the System  V  forms  library.   They  were  not
+       These  routines  emulate  the  System  V  forms library.  They were not
        supported on Version 7 or BSD versions.
 
 
@@ -114,8 +104,12 @@ 
            form_post 3x
            
        Raymond.
 
 
+

            SEE ALSO

            +       curses(3x), form(3x)
+
+
 
-                                                                 form_post(3x)
+ncurses 6.5                       2024-03-16                     form_post(3x)
            diff --git a/doc/html/man/form_requestname.3x.html b/doc/html/man/form_requestname.3x.html index 37122c6d..2bb507aa 100644 --- a/doc/html/man/form_requestname.3x.html +++ b/doc/html/man/form_requestname.3x.html @@ -1,7 +1,6 @@ -form_requestname 3x +form_requestname 3x 2024-12-28 ncurses 6.5 Library calls -

            form_requestname 3x

            +

            form_requestname 3x 2024-12-28 ncurses 6.5 Library calls

            -form_requestname(3x)                                      form_requestname(3x)
+form_requestname(3x)             Library calls            form_requestname(3x)
 
 
 
@@ -60,37 +59,22 @@ 
            form_requestname 3x

            DESCRIPTION

            -
-

            form_request_name

                    The function form_request_name returns the printable  name  of  a  form
-       request code.
-
-
-

            form_request_name_by_name

            -       The  function  form_request_by_name  searches  in  the name-table for a
-       request with the given name and returns its  request  code.   Otherwise
-       E_NO_MATCH is returned.
+       request  code.  The function form_request_by_name searches in the name-
+       table for a request with the given name and returns its  request  code.
+       Otherwise E_NO_MATCH is returned.

            RETURN VALUE

            -       form_request_name   returns   NULL   on   error   and   sets  errno  to
+       form_request_name   returns   NULL   on   error   and   sets  errno  to
        E_BAD_ARGUMENT.
 
        form_request_by_name returns E_NO_MATCH on  error.   It  does  not  set
        errno.
 
 
-

            SEE ALSO

            -       curses(3x), form(3x).
-
-
-

            NOTES

            -       The  header  file  <form.h>  automatically  includes  the  header  file
-       <curses.h>.
-
-

            PORTABILITY

            -       These routines are specific to ncurses.  They  were  not  supported  on
+       These  routines  are  specific  to ncurses.  They were not supported on
        Version 7, BSD or System V implementations.  It is recommended that any
        code depending on them be conditioned using NCURSES_VERSION.
 
@@ -100,24 +84,22 @@ 
            form_requestname 3x
            
        Raymond.
 
 
+

            SEE ALSO

            +       curses(3x), form(3x)
+
 
-                                                          form_requestname(3x)
+
+ncurses 6.5                       2024-12-28              form_requestname(3x)
            diff --git a/doc/html/man/form_userptr.3x.html b/doc/html/man/form_userptr.3x.html index a5033f79..996912a3 100644 --- a/doc/html/man/form_userptr.3x.html +++ b/doc/html/man/form_userptr.3x.html @@ -1,7 +1,6 @@ -form_userptr 3x +form_userptr 3x 2024-12-28 ncurses 6.5 Library calls -

            form_userptr 3x

            +

            form_userptr 3x 2024-12-28 ncurses 6.5 Library calls

            -form_userptr(3x)                                              form_userptr(3x)
+form_userptr(3x)                 Library calls                form_userptr(3x)
 
 
 
@@ -66,23 +65,14 @@ 
            form_userptr 3x

            RETURN VALUE

            -       The function form_userptr returns a pointer (which may  be  NULL).   It
+       The function form_userptr returns a pointer (which may  be  NULL).   It
        does not set errno.
 
        The function set_form_userptr returns E_OK (success).
 
 
-

            SEE ALSO

            -       curses(3x), form(3x).
-
-
-

            NOTES

            -       The  header  file  <form.h>  automatically  includes  the  header  file
-       <curses.h>.
-
-

            PORTABILITY

            -       These routines emulate the System  V  forms  library.   They  were  not
+       These  routines  emulate  the  System  V  forms library.  They were not
        supported on Version 7 or BSD versions.
 
        The user pointer is a void pointer.  We chose not to leave it as a char
@@ -94,8 +84,12 @@ 
            form_userptr 3x
            
        Raymond.
 
 
+

            SEE ALSO

            +       curses(3x), form(3x)
+
+
 
-                                                              form_userptr(3x)
+ncurses 6.5                       2024-12-28                  form_userptr(3x)
            diff --git a/doc/html/man/form_variables.3x.html b/doc/html/man/form_variables.3x.html index 93d0a062..68c8e563 100644 --- a/doc/html/man/form_variables.3x.html +++ b/doc/html/man/form_variables.3x.html @@ -1,6 +1,6 @@ -form_variables 3x +form_variables 3x 2024-03-16 ncurses 6.5 Library calls -

            form_variables 3x

            +

            form_variables 3x 2024-03-16 ncurses 6.5 Library calls

            -form_variables(3x)                                          form_variables(3x)
+form_variables(3x)               Library calls              form_variables(3x)

            NAME

            -       TYPE_ALNUM, TYPE_ALPHA, TYPE_ENUM, TYPE_INTEGER, TYPE_IPV4,
+       TYPE_ALNUM,    TYPE_ALPHA,    TYPE_ENUM,    TYPE_INTEGER,    TYPE_IPV4,
        TYPE_NUMERIC, TYPE_REGEXP - form system global variables
 
 
@@ -99,16 +99,16 @@ 
            form_variables 3x

            PORTABILITY

            -       The  TYPE_IPV4 variable is an extension not provided by older implemen-
-       tations of the form library.
+       The   TYPE_IPV4   variable  is  an  extension  not  provided  by  older
+       implementations of the form library.

            SEE ALSO

            -       form(3x).
+       form(3x)
 
 
 
-                                                            form_variables(3x)
+ncurses 6.5                       2024-03-16                form_variables(3x)
              diff --git a/doc/html/man/form_win.3x.html b/doc/html/man/form_win.3x.html index 1baf0126..68dac08a 100644 --- a/doc/html/man/form_win.3x.html +++ b/doc/html/man/form_win.3x.html @@ -1,7 +1,6 @@ -form_win 3x +form_win 3x 2024-12-28 ncurses 6.5 Library calls -

              form_win 3x

              +

              form_win 3x 2024-12-28 ncurses 6.5 Library calls

              -form_win(3x)                                                      form_win(3x)
+form_win(3x)                     Library calls                    form_win(3x)
 
 
 
@@ -73,8 +72,8 @@ 
              form_win 3x
              
        necessary to set either window; by default, the driver code uses stdscr
        for both.
 
-       In the set_ functions, window argument of NULL is treated as though  it
-       were stsdcr.  A form argument of NULL is treated as a request to change
+       In the set_ functions, window argument of NULL is treated as though  it
+       were stsdcr.  A form argument of NULL is treated as a request to change
        the system default form window or subwindow.
 
        The function scale_form returns  the  minimum  size  required  for  the
@@ -82,7 +81,7 @@ 
              form_win 3x

              RETURN VALUE

              -       Routines  that  return  pointers  return  NULL on error.  Routines that
+       Routines  that  return  pointers  return  NULL on error.  Routines that
        return an integer return one of the following error codes:
 
        E_OK The routine succeeded.
@@ -100,17 +99,8 @@ 
              form_win 3x
              
             No items are connected to the form.
 
 
-

              SEE ALSO

              -       curses(3x), curs_variables(3x), form(3x).
-
-
-

              NOTES

              -       The  header  file  <form.h>  automatically  includes  the  header  file
-       <curses.h>.
-
-

              PORTABILITY

              -       These  routines  emulate  the  System  V  forms library.  They were not
+       These routines emulate the System  V  forms  library.   They  were  not
        supported on Version 7 or BSD versions.
 
 
@@ -119,8 +109,12 @@ 
              form_win 3x
              
        Raymond.
 
 
+

              SEE ALSO

              +       curses(3x), curs_variables(3x), form(3x)
+
+
 
-                                                                  form_win(3x)
+ncurses 6.5                       2024-12-28                      form_win(3x)
              diff --git a/doc/html/man/index.html b/doc/html/man/index.html index 07d986b6..e50cd2f9 100644 --- a/doc/html/man/index.html +++ b/doc/html/man/index.html @@ -1,7 +1,7 @@ - - + "HTML Tidy for HTML5 for Linux version 5.6.0"> NCURSES – Manual Pages -
              • Programs: -
              • Scripts: -
                • adacurses*-config – - helper script for AdaCurses libraries
                  • + configuration helper for AdaCurses libraries
                • ncurses*-config - – helper script for ncurses libraries
                  • + – configuration helper for ncurses libraries
              • Libraries: -
              • File formats: - +
                • + +
              • Other information: + diff --git a/doc/html/man/infocmp.1m.html b/doc/html/man/infocmp.1m.html index f43fda34..580a372e 100644 --- a/doc/html/man/infocmp.1m.html +++ b/doc/html/man/infocmp.1m.html @@ -1,7 +1,7 @@ -infocmp 1m +infocmp 1m 2025-02-17 ncurses 6.5 User commands -

                infocmp 1m

                +

                infocmp 1m 2025-02-17 ncurses 6.5 User commands

                -infocmp(1m)                                                        infocmp(1m)
+infocmp(1m)                      User commands                     infocmp(1m)
 
 
 
@@ -52,81 +52,42 @@ 
                infocmp 1m

                SYNOPSIS

                -       infocmp [-1CDEFGIKLTUVWcdegilnpqrtux]
-             [-v n] [-s d| i| l| c] [-Q n] [-R subset]
-             [-w width] [-A directory] [-B directory]
-             [termname...]
+       infocmp   [-1cCdDeEFgGiIKlLnpqrtTuUVWx]  [-A directory]  [-B directory]
+              [-Q encoding]   [-R subset]   [-s key]   [-v level]   [-w width]
+              [terminal-type ... ]

                DESCRIPTION

                -       infocmp  can  be  used  to  compare  a binary terminfo entry with other
-       terminfo entries, rewrite a terminfo description to take  advantage  of
-       the  use=  terminfo field, or print out a terminfo description from the
-       binary file (term) in a variety of formats.  In all cases, the  boolean
-       fields  will be printed first, followed by the numeric fields, followed
-       by the string fields.
-
-
-

                Default Options

                -       If no options are specified and zero or one  termnames  are  specified,
-       the -I option will be assumed.  If more than one termname is specified,
-       the -d option will be assumed.
-
-
-

                Comparison Options [-d] [-c] [-n]

                -       infocmp  compares  the  terminfo  description  of  the  first  terminal
-       termname  with  each  of  the descriptions given by the entries for the
-       other terminal's termnames.  If a capability is defined for only one of
-       the   terminals,  the  value  returned  depends  on  the  type  of  the
-       capability:
-
-       o   F for missing boolean variables
-
-       o   NULL for missing integer or string variables
-
-       Use the -q option to show the distinction between absent and  cancelled
+       infocmp  reports  a  human-readable  terminal  type  description from a
+       compiled entry in the terminfo database  in  a  variety  of  selectable
+       formats,  compares such entries to each other, and rewrites an entry to
+       replace  "use"  expressions  with  the  content  of  other  entries  by
+       reference.   A  terminfo entry comprises a list of one or more terminal
+       type identifiers, a human-readable description of  the  terminal  type,
+       and  a  list of terminal capabilities that characterize its programming
+       interface.   In  all  cases,   the   program   reports   Boolean-valued
+       capabilities  first,  followed  by numeric ones, and then string-valued
        capabilities.
 
-       These  options  produce a list which you can use to compare two or more
-       terminal descriptions:
-
-       -d   produces a list of each capability that is different  between  two
-            entries.   Each  item  in  the list shows ":" after the capability
-            name, followed by the capability values, separated by a comma.
-
-       -c   produces a list of each capability that is common between  two  or
-            more entries.  Missing capabilities are ignored.  Each item in the
-            list  shows  "="  after  the  capability  name,  followed  by  the
-            capability value.
-
-            The  -u  option  provides  a  related  output,  showing  the first
-            terminal description rewritten to use the  second  as  a  building
-            block via the "use=" clause.
 
-       -n   produces  a  list  of each capability that is in none of the given
-            entries.  Each item in the list shows "!"  before  the  capability
-            name.
-
-            Normally only the conventional capabilities are shown.  Use the -x
-            option to add the BSD-compatibility capabilities  (names  prefixed
-            with "OT").
-
-            If  no  termnames are given, infocmp uses the environment variable
-            TERM for each of the termnames.
+

                Default Options

                +       If  no  options  are  specified  and  zero  or  one  terminal-types  is
+       specified,  infocmp  assumes  the  -I  option.   If  more  than  one is
+       specified, the program assumes the -d option.
 
 
-

                Source Listing Options [-I] [-L] [-C] [-r]

                +

                Source Listing Options [-I] [-L] [-C] [-r]

                        The -I, -L, and -C options will  produce  a  source  listing  for  each
        terminal named.
 
-            -I   use the terminfo names
-            -L   use the long C variable name listed in <term.h>
-            -C   use the termcap names
-            -r   when using -C, put out all capabilities in termcap form
-            -K   modifies the -C option, improving BSD-compatibility.
+                   -I   use terminfo capability codes
+                   -L   use "long" capability names
+                   -C   use termcap capability codes
+                   -r   with -C, include nonstandard capabilities
+                   -K   with -C, improve BSD compatibility
 
-       If  no  termnames are given, the environment variable TERM will be used
-       for the terminal name.
+       If  no  terminal-types are given, the environment variable TERM will be
+       used for the terminal name.
 
        The source produced by the -C option may be used directly as a  termcap
        entry,  but not all parameterized strings can be changed to the termcap
@@ -168,41 +129,83 @@ 
                infocmp 1m
                
        Some  common  terminfo  parameter sequences, their termcap equivalents,
        and some terminal types which commonly have such sequences, are:
 
-           terminfo                    termcap   Representative Terminals
-           ---------------------------------------------------------------
-           %p1%c                       %.        adm
-           %p1%d                       %d        hp, ANSI standard, vt100
-           %p1%'x'%+%c                 %+x       concept
-           %i                          %iq       ANSI standard, vt100
-           %p1%?%'x'%>%t%p1%'y'%+%;    %>xy      concept
-           %p2 is printed before %p1   %r        hp
+                 terminfo                   termcap   Terminal Types
+                 ----------------------------------------------------
+                 %p1%c                      %.        ansi-m
+                 %p1%d                      %d        ansi, vt100
+                 %p1%' '%+%c                %+x       vt52
+                 %i                         %iq       ansi, vt100
+                 %p1%?%'x'%>%t%p1%'y'%+%;   %>xy      annarbor4080
+                 %p2...%p1                  %r        hpgeneric
 
 
-

                Use= Option [-u]

                +

                Entry Comparison Options [-d] [-c] [-n]

                +       Given -c, -d, or -n, infocmp compares the terminfo description  of  the
+       first  specified  terminal-type  with  those  of each of the subsequent
+       operands.  If fewer terminal-types than required are specified, infocmp
+       uses the environment variable TERM in their place.
+
+       If  a  capability  is  defined  for  only  one terminal type, the value
+       reported depends on the capability's type:
+
+       o   F for missing Boolean variables
+
+       o   NULL for missing integer or string variables
+
+       The -c and -d options  report  string  capability  values  between  "'"
+       characters.   Use  the  -q  option  to  distinguish absent and canceled
+       capabilities; see terminfo(5).
+
+       The comparison option selects the form of report.
+
+       -d   lists each capability that  differs  between  two  entries.   Each
+            capability  name is followed by ":" and comma-separated capability
+            values, then a period.
+
+       -c   lists each capability that two entries have  in  common.   infocmp
+            ignores  capabilities  missing from either entry.  Each capability
+            name is followed by "=", a space, and the capability value, then a
+            period.
+
+            If  the  -u  option  is  further  specified,  infocmp rewrites the
+            description of the first type employing "use=" syntax to  use  the
+            second as a building block.
+
+       -n   lists  capabilities  that  are in none of the given entries.  Each
+            capability name is preceded by "!"  and followed by a period.
+
+            Normally only conventional capabilities are  shown.   Use  the  -x
+            option  to add BSD-compatibility capabilities (names prefixed with
+            "OT").
+
+
+

                Use= Option [-u]

                        The -u option produces a  terminfo  source  description  of  the  first
-       terminal  termname  which  is  relative  to the sum of the descriptions
-       given by the entries for the other terminals termnames.  It  does  this
-       by  analyzing  the differences between the first termname and the other
-       termnames and producing a description with use= fields  for  the  other
-       terminals.  In this manner, it is possible to retrofit generic terminfo
-       entries into a terminal's description.  Or, if  two  similar  terminals
-       exist, but were coded at different times or by different people so that
-       each description is a full description, using infocmp  will  show  what
-       can be done to change one description to be relative to the other.
+       terminal terminal-type which is relative to the sum of the descriptions
+       given by the entries for the other terminal-types.   It  does  this  by
+       analyzing  the  differences  between  the  first terminal-types and the
+       other terminal-types and producing a description with use=  fields  for
+       the  other  terminals.   In  this  manner,  it  is possible to retrofit
+       generic terminfo entries into a terminal's  description.   Or,  if  two
+       similar  terminals  exist,  but  were  coded  at  different times or by
+       different people so that each description is a full description,  using
+       infocmp  will  show  what  can  be done to change one description to be
+       relative to the other.
 
        A capability will be printed with an at-sign (@) if it no longer exists
-       in the first termname, but one of the other termname entries contains a
-       value for it.  A capability's value will be printed if the value in the
-       first termname is not found in any of the other termname entries, or if
-       the  first of the other termname entries that has this capability gives
-       a different value for the capability than that in the first termname.
-
-       The order of the other termname  entries  is  significant.   Since  the
+       in  the first terminal-type, but one of the other terminal-type entries
+       contains a value for it.  A capability's value will be printed  if  the
+       value  in  the  first  terminal-type  is  not found in any of the other
+       terminal-type entries, or if  the  first  of  the  other  terminal-type
+       entries  that  has  this  capability  gives  a  different value for the
+       capability than that in the first terminal-type.
+
+       The order of the other terminal-type entries is significant.  Since the
        terminfo  compiler  tic  does a left-to-right scan of the capabilities,
        specifying two use= entries that contain differing entries for the same
        capabilities will produce different results depending on the order that
        the entries are given in.  infocmp will flag any  such  inconsistencies
-       between the other termname entries as they are found.
+       between the other terminal-type entries as they are found.
 
        Alternatively, specifying a capability after a use= entry that contains
        that capability will cause the  second  specification  to  be  ignored.
@@ -212,25 +215,26 @@ 
                infocmp 1m
                
 
        Another  error  that  does not cause incorrect compiled files, but will
        slow down the compilation time, is specifying extra  use=  fields  that
-       are superfluous.  infocmp will flag any other termname use= fields that
-       were not needed.
+       are superfluous.  infocmp will flag any other terminal-type use= fields
+       that were not needed.
 
-   Changing Databases [-A directory] [-B directory]
-       Like  other  ncurses  utilities,  infocmp  looks   for   the   terminal
-       descriptions   in  several  places.   You  can  use  the  TERMINFO  and
-       TERMINFO_DIRS environment variables to override the compiled-in default
-       list of places to search (see curses(3x) for details).
+   Changing Databases [-A directory] [-B directory]
+       Like  other  ncurses  utilities,  infocmp  looks   for   the   terminal
+       descriptions   in  several  places.   You  can  use  the  TERMINFO  and
+       TERMINFO_DIRS environment variables to override the compiled-in default
+       list  of  places  to  search.   See curses(3x), as well as the Fetching
+       Compiled Descriptions section in terminfo(5).
 
-       You  can  also use the options -A and -B to override the list of places
+       You can also use the options -A and -B to override the list  of  places
        to search when comparing terminal descriptions:
 
-       o   The -A option sets the location for the first termname
+       o   The -A option sets the location for the first terminal-type
 
-       o   The -B option sets the location for the other termnames.
+       o   The -B option sets the location for the other terminal-types.
 
-       Using these options, it is  possible  to  compare  descriptions  for  a
-       terminal  with  the  same name located in two different databases.  For
-       instance, you can use this feature for comparing descriptions  for  the
+       Using  these  options,  it  is  possible  to compare descriptions for a
+       terminal with the same name located in two  different  databases.   For
+       instance,  you  can use this feature for comparing descriptions for the
        same terminal created by different people.
 
 
@@ -238,118 +242,117 @@ 
                infocmp 1m
                
        -0   causes the fields to be printed on one line, without wrapping.
 
        -1   causes the fields to be printed out one to a line.  Otherwise, the
-            fields will be printed several to a line to a maximum width of  60
+            fields  will be printed several to a line to a maximum width of 60
             characters.
 
-       -a   tells  infocmp  to  retain  commented-out capabilities rather than
-            discarding them.  Capabilities are  commented  by  prefixing  them
+       -a   tells infocmp to retain  commented-out  capabilities  rather  than
+            discarding  them.   Capabilities  are  commented by prefixing them
             with a period.
 
        -D   tells infocmp to print the database locations that it knows about,
             and exit.
 
-       -E   Dump the capabilities of the given terminal as tables,  needed  in
-            the   C   initializer  for  a  TERMTYPE  structure  (the  terminal
-            capability structure in the <term.h>).  This option is useful  for
-            preparing  versions  of  the  curses library hardwired for a given
-            terminal type.  The tables are all declared static, and are  named
-            according  to  the type and the name of the corresponding terminal
+       -E   Dump  the  capabilities of the given terminal as tables, needed in
+            the  C  initializer  for  a  TERMTYPE  structure   (the   terminal
+            capability  structure in the <term.h>).  This option is useful for
+            preparing versions of the curses library  hardwired  for  a  given
+            terminal  type.  The tables are all declared static, and are named
+            according to the type and the name of the  corresponding  terminal
             entry.
 
-            Before ncurses 5.0, the split between the -e and  -E  options  was
-            not  needed;  but  support  for extended names required making the
-            arrays  of  terminal  capabilities  separate  from  the   TERMTYPE
+            Before  ncurses  5.0,  the split between the -e and -E options was
+            not needed; but support for extended  names  required  making  the
+            arrays   of  terminal  capabilities  separate  from  the  TERMTYPE
             structure.
 
        -e   Dump the capabilities of the given terminal as a C initializer for
-            a TERMTYPE structure (the terminal  capability  structure  in  the
-            <term.h>).   This  option  is useful for preparing versions of the
+            a  TERMTYPE  structure  (the  terminal capability structure in the
+            <term.h>).  This option is useful for preparing  versions  of  the
             curses library hardwired for a given terminal type.
 
        -F   compare terminfo files.  This assumes that two following arguments
-            are  filenames.   The  files  are  searched  for  pairwise matches
-            between entries, with two entries considered to match  if  any  of
-            their  names  do.   The  report  printed  to standard output lists
-            entries with no matches in the other file, and entries  with  more
-            than  one match.  For entries with exactly one match it includes a
-            difference report.  Normally, to reduce the volume of the  report,
-            use  references  are  not resolved before looking for differences,
+            are filenames.   The  files  are  searched  for  pairwise  matches
+            between  entries,  with  two entries considered to match if any of
+            their names do.  The  report  printed  to  standard  output  lists
+            entries  with  no matches in the other file, and entries with more
+            than one match.  For entries with exactly one match it includes  a
+            difference  report.  Normally, to reduce the volume of the report,
+            use references are not resolved before  looking  for  differences,
             but resolution can be forced by also specifying -r.
 
-       -f   Display complex terminfo strings which contain  if/then/else/endif
+       -f   Display  complex terminfo strings which contain if/then/else/endif
             expressions indented for readability.
 
-       -G   Display  constant  literals  in  decimal  form  rather  than their
+       -G   Display constant  literals  in  decimal  form  rather  than  their
             character equivalents.
 
-       -g   Display constant character literals in  quoted  form  rather  than
+       -g   Display  constant  character  literals  in quoted form rather than
             their decimal equivalents.
 
-       -i   Analyze  the  initialization (is1, is2, is3), and reset (rs1, rs2,
-            rs3),  strings  in  the  entry,  as  well  as   those   used   for
-            starting/stopping  cursor-positioning  mode (smcup, rmcup) as well
+       -i   Analyze the initialization (is1, is2, is3), and reset  (rs1,  rs2,
+            rs3),   strings   in   the  entry,  as  well  as  those  used  for
+            starting/stopping cursor-positioning mode (smcup, rmcup)  as  well
             as starting/stopping keymap mode (smkx, rmkx).
 
-            For each string, the code tries to  analyze  it  into  actions  in
-            terms  of  the  other capabilities in the entry, certain X3.64/ISO
+            For  each  string,  the  code  tries to analyze it into actions in
+            terms of the other capabilities in the  entry,  certain  X3.64/ISO
             6429/ECMA-48 capabilities, and certain DEC VT-series private modes
-            (the  set  of  recognized  special sequences has been selected for
-            completeness over the existing terminfo  database).   Each  report
-            line  consists  of  the  capability  name, followed by a colon and
-            space, followed by a printable expansion of the capability  string
-            with   sections   matching   recognized  actions  translated  into
+            (the set of recognized special sequences  has  been  selected  for
+            completeness  over  the  existing terminfo database).  Each report
+            line consists of the capability name,  followed  by  a  colon  and
+            space,  followed by a printable expansion of the capability string
+            with  sections  matching  recognized   actions   translated   into
             {}-bracketed descriptions.
 
             Here is a list of the DEC/ANSI special sequences recognized:
 
-                         Action        Meaning
-                         -----------------------------------------
-                         RIS           full reset
-                         SC            save cursor
-                         RC            restore cursor
-                         LL            home-down
-                         RSR           reset scroll region
-                         -----------------------------------------
-                         DECSTR        soft reset (VT320)
-                         S7C1T         7-bit controls (VT220)
-                         -----------------------------------------
-
-                         ISO DEC G0    enable DEC graphics for G0
-                         ISO UK G0     enable UK chars for G0
-                         ISO US G0     enable US chars for G0
-                         ISO DEC G1    enable DEC graphics for G1
-                         ISO UK G1     enable UK chars for G1
-                         ISO US G1     enable US chars for G1
-                         -----------------------------------------
-                         DECPAM        application keypad mode
-                         DECPNM        normal keypad mode
-                         DECANSI       enter ANSI mode
-                         -----------------------------------------
-                         ECMA[+-]AM    keyboard action mode
-                         ECMA[+-]IRM   insert replace mode
-                         ECMA[+-]SRM   send receive mode
-                         ECMA[+-]LNM   linefeed mode
-                         -----------------------------------------
-                         DEC[+-]CKM    application cursor keys
-                         DEC[+-]ANM    set VT52 mode
-                         DEC[+-]COLM   132-column mode
-                         DEC[+-]SCLM   smooth scroll
-                         DEC[+-]SCNM   reverse video mode
-                         DEC[+-]OM     origin mode
-                         DEC[+-]AWM    wraparound mode
-                         DEC[+-]ARM    auto-repeat mode
-
-            It  also  recognizes  a  SGR  action  corresponding  to   ANSI/ISO
-            6429/ECMA  Set  Graphics  Rendition, with the values NORMAL, BOLD,
-            UNDERLINE, BLINK, and REVERSE.  All but  NORMAL  may  be  prefixed
-            with
-
-            o   "+" (turn on) or
-
-            o   "-" (turn off).
-
-            An  SGR0  designates  an  empty  highlight sequence (equivalent to
-            {SGR:NORMAL}).
+                      Action        Meaning
+                      -----------------------------------------
+                      RIS           full reset
+                      SC            save cursor
+                      RC            restore cursor
+                      LL            home-down
+                      RSR           reset scroll region
+                      -----------------------------------------
+                      DECSTR        soft reset (VT320)
+                      S7C1T         7-bit controls (VT220)
+                      -----------------------------------------
+                      ISO DEC G0    enable DEC graphics for G0
+
+                      ISO UK G0     enable UK chars for G0
+                      ISO US G0     enable US chars for G0
+                      ISO DEC G1    enable DEC graphics for G1
+                      ISO UK G1     enable UK chars for G1
+                      ISO US G1     enable US chars for G1
+                      -----------------------------------------
+                      DECPAM        application keypad mode
+                      DECPNM        normal keypad mode
+                      DECANSI       enter ANSI mode
+                      -----------------------------------------
+                      ECMA[+-]AM    keyboard action mode
+                      ECMA[+-]IRM   insert replace mode
+                      ECMA[+-]SRM   send receive mode
+                      ECMA[+-]LNM   linefeed mode
+                      -----------------------------------------
+                      DEC[+-]CKM    application cursor keys
+                      DEC[+-]ANM    set VT52 mode
+                      DEC[+-]COLM   132-column mode
+                      DEC[+-]SCLM   smooth scroll
+                      DEC[+-]SCNM   reverse video mode
+                      DEC[+-]OM     origin mode
+                      DEC[+-]AWM    wraparound mode
+                      DEC[+-]ARM    auto-repeat mode
+
+       It also recognizes a SGR action corresponding to ANSI/ISO 6429/ECMA Set
+       Graphics Rendition, with the values NORMAL, BOLD, UNDERLINE, BLINK, and
+       REVERSE.  All but NORMAL may be prefixed with
+
+              o   "+" (turn on) or
+
+              o   "-" (turn off).
+
+              An  SGR0  designates  an empty highlight sequence (equivalent to
+              {SGR:NORMAL}).
 
        -l   Set output format to terminfo.
 
@@ -366,7 +369,7 @@ 
                infocmp 1m
                
                3  hexadecimal and base64
 
             For example, this prints the compiled terminfo value as  a  string
-            which could be assigned to the TERMINFO environment variable:
+            which could be assigned to the TERMINFO environment variable:
 
                 infocmp -0 -q -Q2
 
@@ -376,7 +379,7 @@ 
                infocmp 1m
                
                 and using "-" for absent capabilities, "@" for canceled rather
                 than "NULL".
 
-            o   However,   show   differences  between  absent  and  cancelled
+            o   However,   show   differences   between  absent  and  canceled
                 capabilities.
 
             o   Omit the "Reconstructed from" comment for source listings.
@@ -439,14 +442,14 @@ 
                infocmp 1m
                
             contents  of  two  source  files, since it excludes the inferences
             that infocmp makes to fill in missing data.
 
-       -V   reports the version of ncurses which was used in this program, and
+       -V   reports the version of ncurses which was used in this program, and
             exits.
 
        -v n prints  out  tracing  information on standard error as the program
             runs.
 
             The optional parameter n is a number  from  1  to  10,  inclusive,
-            indicating the desired level of detail of information.  If ncurses
+            indicating the desired level of detail of information.  If ncurses
             is built  without  tracing  support,  the  optional  parameter  is
             ignored.
 
@@ -456,81 +459,79 @@ 
                infocmp 1m
                
        -w width
             changes the output to width characters.
 
-       -x   print information for user-defined capabilities (see user_caps(5).
+       -x   print information for user-defined capabilities (see user_caps(5).
             These  are  extensions  to  the  terminfo  repertoire which can be
             loaded using the -x option of tic.

                FILES

                -       /usr/share/terminfo Compiled terminal description database.
+       /usr/share/terminfo
+              compiled terminal description database
+
+
+

                EXTENSIONS

                +       The -0, -1, -a, -e, -E, -f, -F, -g, -G, -i, -l, -p, -q, -Q, -R, -t, -T,
+       and -V options are ncurses extensions.
+
+
+

                PORTABILITY

                +       X/Open  Curses  Issue 7  (2009) specifies infocmp.  It does not mention
+       options for producing descriptions in termcap format.
+
+       SVr4  infocmp  does  not  distinguish  between  absent   and   canceled
+       capabilities.   It  furthermore reports missing integer capabilities as
+       -1 (its internal representation).  ncurses shows these  as  "NULL"  for
+       consistency with missing string capabilities.
+
+       The  -r  option  of  ncurses  infocmp  uses  SVr4's notion of "termcap"
+       capabilities.  BSD curses had a more restricted set.  To see only those
+       present in 4.4BSD, use "-r -RBSD".

                HISTORY

                -       Although System V Release 2 provided a  terminfo  library,  it  had  no
+       Although  System  V  Release  2  provided a terminfo library, it had no
        documented tool for decompiling the terminal descriptions.  Tony Hansen
        (AT&T) wrote the first infocmp in early 1984, for System V Release 3.
 
-       Eric Raymond  used  the  AT&T  documentation  in  1995  to  provide  an
-       equivalent  infocmp  for  ncurses.   In  addition,  he  added a few new
+       Eric  Raymond  used  the  AT&T  documentation  in  1995  to  provide an
+       equivalent infocmp for ncurses.   In  addition,  he  added  a  few  new
        features such as:
 
-       o   the  -e  option,  to  support   fallback   (compiled-in)   terminal
+       o   the   -e   option,   to  support  fallback  (compiled-in)  terminal
            descriptions
 
        o   the -i option, to help with analysis
 
-       Later,  Thomas  Dickey added the -x (user-defined capabilities) option,
-       and the  -E  option  to  support  fallback  entries  with  user-defined
+       Later, Thomas Dickey added the -x (user-defined  capabilities)  option,
+       and  the  -E  option  to  support  fallback  entries  with user-defined
        capabilities.
 
        For a complete list, see the EXTENSIONS section.
 
-       In  2010,  Roy  Marples  provided an infocmp program for NetBSD.  It is
-       less capable than the SVr4 or ncurses  versions  (e.g.,  it  lacks  the
-       sorting  options  documented in X/Open), but does include the -x option
-       adapted from ncurses.
-
-
-

                PORTABILITY

                -       X/Open Curses, Issue 7 (2009) provides a description  of  infocmp.   It
-       does not mention the options used for converting to termcap format.
-
-
-

                EXTENSIONS

                -       The  -0, -1, -E, -F, -G, -Q, -R, -T, -V, -a, -e, -f, -g, -i, -l, -p, -q
-       and -t options are not supported in SVr4 curses.
-
-       SVr4  infocmp  does  not  distinguish  between  absent  and   cancelled
-       capabilities.   Also,  it shows missing integer capabilities as -1 (the
-       internal   value   used   to   represent   missing   integers).    This
-       implementation  shows  those  as  "NULL",  for consistency with missing
-       strings.
-
-       The -r option's notion of "termcap" capabilities is  System  V  Release
-       4's.   Actual  BSD curses versions will have a more restricted set.  To
-       see only the 4.4BSD set, use -r -RBSD.
+       In 2010, Roy Marples provided an infocmp program  for  NetBSD.   It  is
+       less  capable  than  the  SVr4  or ncurses versions (e.g., it lacks the
+       sorting options documented in X/Open), but does include the  -x  option
+       adapted from ncurses.

                BUGS

                        The -F option of infocmp(1m) should be a toe(1m) mode.
 
 
+

                AUTHORS

                +       Eric S. Raymond <esr@snark.thyrsus.com> and
+       Thomas E. Dickey <dickey@invisible-island.net>
+
+

                SEE ALSO

                        captoinfo(1m),    infotocap(1m),    tic(1m),    toe(1m),    curses(3x),
-       terminfo(5).  user_caps(5).
+       terminfo(5), user_caps(5)
 
        https://invisible-island.net/ncurses/tctest.html
 
-       This describes ncurses version 6.4 (patch 20230311).
-
-
-

                AUTHOR

                -       Eric S. Raymond <esr@snark.thyrsus.com> and
-       Thomas E. Dickey <dickey@invisible-island.net>
 
 
-
-                                                                   infocmp(1m)
+ncurses 6.5                       2025-02-17                       infocmp(1m)
                diff --git a/doc/html/man/infotocap.1m.html b/doc/html/man/infotocap.1m.html index 37a5797a..6ddc58e2 100644 --- a/doc/html/man/infotocap.1m.html +++ b/doc/html/man/infotocap.1m.html @@ -1,7 +1,6 @@ -infotocap 1m +infotocap 1m 2025-01-18 ncurses 6.5 User commands -

                infotocap 1m

                +

                infotocap 1m 2025-01-18 ncurses 6.5 User commands

                -infotocap(1m)                                                    infotocap(1m)
+infotocap(1m)                    User commands                   infotocap(1m)
 
 
 
@@ -52,55 +51,46 @@ 
                infotocap 1m

                SYNOPSIS

                -       infotocap [-vn width]  [-V] [-1] [-w width] file ...
+       infotocap [tic-option] file ...
 
+       infotocap -V
 
-

                DESCRIPTION

                -       infotocap looks in each given text file for terminfo descriptions.  For
-       each terminfo description found, an equivalent termcap  description  is
-       written  to  standard output.  Terminfo use capabilities are translated
-       directly to termcap tc capabilities.
-
-       -v   print out tracing information on standard  error  as  the  program
-            runs.
 
-       -V   print  out the version of the program in use on standard error and
-            exit.
-
-       -1   cause the fields to print out  one  to  a  line.   Otherwise,  the
-            fields  will be printed several to a line to a maximum width of 60
-            characters.
+

                DESCRIPTION

                +       infotocap  translates  terminal  descriptions.   It looks in each given
+       text file for terminfo entries and, for each one found,  it  writes  an
+       analogous  termcap description to the standard output stream.  terminfo
+       "use" capabilities  translate  to  termcap  tc  capabilities.   Because
+       termcap  is  a  less expressive format than terminfo, some capabilities
+       cannot be translated.
 
-       -w   change the output to width characters.
+       This utility is implemented as a link to tic(1m), with the latter's  -C
+       option  implied.  You can use other tic options such as -1, -f, -v, -w,
+       and -x.  The -V option reports the version of ncurses  associated  with
+       this program and exits with a successful status.

                FILES

                -       /usr/share/terminfo Compiled terminal description database.
-
-
-

                NOTES

                -       This utility is actually a link to tic, running in -C  mode.   You  can
-       use other tic options such as -f and  -x.
+       /usr/share/terminfo
+              compiled terminal description database

                PORTABILITY

                -       None  of  X/Open  Curses,  Issue 7 (2009), SVr4 or NetBSD document this
+       None  of  X/Open  Curses  Issue 7 (2009), SVr4, or NetBSD document this
        application.
 
 
-

                SEE ALSO

                -       infocmp(1m), tic(1m), curses(3x), terminfo(5)
-
-       This describes ncurses version 6.4 (patch 20230311).
-
-
-

                AUTHOR

                +

                AUTHORS

                        Eric S. Raymond <esr@snark.thyrsus.com> and
        Thomas E. Dickey <dickey@invisible-island.net>
 
 
+

                SEE ALSO

                +       infocmp(1m), tic(1m), curses(3x), terminfo(5)
+
+
 
-                                                                 infotocap(1m)
+ncurses 6.5                       2025-01-18                     infotocap(1m)
                diff --git a/doc/html/man/key_defined.3x.html b/doc/html/man/key_defined.3x.html index f39d3264..5b0c30fe 100644 --- a/doc/html/man/key_defined.3x.html +++ b/doc/html/man/key_defined.3x.html @@ -1,6 +1,6 @@ -key_defined 3x +key_defined 3x 2024-06-08 ncurses 6.5 Library calls -

                key_defined 3x

                +

                key_defined 3x 2024-06-08 ncurses 6.5 Library calls

                -key_defined(3x)                                                key_defined(3x)
+key_defined(3x)                  Library calls                 key_defined(3x)

                NAME

                -       key_defined - check if a keycode is defined
+       key_defined - test whether a curses function key code is defined

                SYNOPSIS

                        #include <curses.h>
 
-       int key_defined(const char *definition);
+       int key_defined(const char * definition);

                DESCRIPTION

                -       This  is an extension to the curses library.  It permits an application
-       to determine if a string is currently bound to any keycode.
+       The  key_defined  ncurses  extension  permits  a  curses application to
+       determine the function key code, if any, to which the string definition
+       is bound.

                RETURN VALUE

                -       If the string is bound to a keycode, its value (greater than  zero)  is
-       returned.   If  no  keycode  is bound, zero is returned.  If the string
-       conflicts with longer strings which are bound to keys, -1 is returned.
+       key_defined  returns the first key code to which definition is bound if
+       any exists.  If none does, it returns 0.  If definition is a prefix  of
+       another binding, key_defined returns -1.
+
+
+

                EXTENSIONS

                +       define_key is an ncurses extension.

                PORTABILITY

                -       These routines are specific to ncurses.  They  were  not  supported  on
-       Version 7, BSD or System V implementations.  It is recommended that any
-       code depending on them be conditioned using NCURSES_VERSION.
+       Applications employing ncurses extensions should condition their use on
+       the visibility of the NCURSES_VERSION preprocessor macro.
 
 
-

                SEE ALSO

                -       define_key(3x).
+

                AUTHORS

                +       Thomas Dickey
 
 
-

                AUTHOR

                -       Thomas Dickey.
+

                SEE ALSO

                +       curses(3x), define_key(3x), keybound(3x), keyok(3x)
 
 
 
-                                                               key_defined(3x)
+ncurses 6.5                       2024-06-08                   key_defined(3x)
                diff --git a/doc/html/man/keybound.3x.html b/doc/html/man/keybound.3x.html index f605c1b1..3ac1a95a 100644 --- a/doc/html/man/keybound.3x.html +++ b/doc/html/man/keybound.3x.html @@ -1,6 +1,6 @@ -keybound 3x +keybound 3x 2024-12-28 ncurses 6.5 Library calls -

                keybound 3x

                +

                keybound 3x 2024-12-28 ncurses 6.5 Library calls

                -keybound(3x)                                                      keybound(3x)
+keybound(3x)                     Library calls                    keybound(3x)

                NAME

                -       keybound - return definition of keycode
+       keybound - get definition of a curses function key code

                SYNOPSIS

                        #include <curses.h>
 
-       char * keybound(int keycode, int count);
+       char * keybound(int key-code, int count);

                DESCRIPTION

                -       This  is an extension to the curses library.  It permits an application
-       to determine the string which is defined in the terminfo  for  specific
-       keycodes.
+       The  keybound  ncurses extension permits a curses application to obtain
+       the value of the  string  bound  to  the  function  key  key-code;  see
+       wgetch(3x)  (wide-character API users: wget_wch(3x)).  By default, such
+       bindings are string  capabilities  from  the  terminfo  database  entry
+       corresponding   to   the  terminal  type.   The  application  can  non-
+       destructively   and   repeatedly   override   such   definitions   with
+       define_key(3x),  as  if  by  pushing new definitions onto a stack.  The
+       count parameter accesses the  nth  most  recently  defined  binding;  0
+       selects the binding that is used on input.

                RETURN VALUE

                -       The keycode parameter must be greater than zero, else NULL is returned.
-       If it does not correspond to a defined key, then NULL is returned.  The
-       count  parameter  is  used  to allow the application to iterate through
-       multiple  definitions,  counting  from  zero.   When  successful,   the
-       function returns a string which must be freed by the caller.
+       If key-code corresponds to a function key defined by the application or
+       the terminal type in use, keybound allocates and returns a string  that
+       must be freed by the application.  keybound returns NULL if key-code is
+       not positive or if it does not correspond to a key code definition.
+
+
+

                EXTENSIONS

                +       keybound is an ncurses extension.

                PORTABILITY

                -       These  routines  are  specific  to ncurses.  They were not supported on
-       Version 7, BSD or System V implementations.  It is recommended that any
-       code depending on them be conditioned using NCURSES_VERSION.
+       Applications employing ncurses extensions should condition their use on
+       the visibility of the NCURSES_VERSION preprocessor macro.
 
 
-

                SEE ALSO

                -       define_key(3x), keyok(3x).
+

                AUTHORS

                +       Thomas Dickey
 
 
-

                AUTHOR

                -       Thomas Dickey.
+

                SEE ALSO

                +       curses(3x), define_key(3x), keyok(3x), key_defined(3x), terminfo(5)
 
 
 
-                                                                  keybound(3x)
+ncurses 6.5                       2024-12-28                      keybound(3x)
                diff --git a/doc/html/man/keyok.3x.html b/doc/html/man/keyok.3x.html index dbb3f0c1..42f0187d 100644 --- a/doc/html/man/keyok.3x.html +++ b/doc/html/man/keyok.3x.html @@ -1,6 +1,6 @@ -keyok 3x +keyok 3x 2024-07-27 ncurses 6.5 Library calls -

                keyok 3x

                +

                keyok 3x 2024-07-27 ncurses 6.5 Library calls

                -keyok(3x)                                                            keyok(3x)
+keyok(3x)                        Library calls                       keyok(3x)

                NAME

                -       keyok - enable or disable a keycode
+       keyok - enable or disable a curses function key code

                SYNOPSIS

                        #include <curses.h>
 
-       int keyok(int keycode, bool enable);
+       int keyok(int key-code, bool bf);

                DESCRIPTION

                -       This  is an extension to the curses library.  It permits an application
-       to disable specific keycodes, rather than use the  keypad  function  to
-       disable all keycodes.  Keys that have been disabled can be re-enabled.
+       The  keyok  ncurses extension permits a curses application to disable a
+       function key key-code returned by wgetch(3x) (wide-character API users:
+       wget_wch(3x)).   Key  codes  that have been disabled can be re-enabled.
+       bf selects the desired enablement status.  This operation is more fine-
+       grained than calling keypad(3x), which affects all function keys.

                RETURN VALUE

                -       The  keycode  must  be  greater than zero, else ERR is returned.  If it
-       does not correspond to a defined key, then ERR  is  returned.   If  the
-       enable  parameter  is  true,  then the key must have been disabled, and
-       vice versa.  Otherwise, the function returns OK.
+       keyok returns ERR if
+
+       o   key-code is nonpositive,
+
+       o   key-code is not a recognized value, or
+
+       o   enablement of key-code is already in the desired state.
+
+       Otherwise, keyok returns OK.
+
+
+

                EXTENSIONS

                +       keyok is an ncurses extension.

                PORTABILITY

                -       These routines are specific to ncurses.  They  were  not  supported  on
-       Version 7, BSD or System V implementations.  It is recommended that any
-       code depending on them be conditioned using NCURSES_VERSION.
+       Applications employing ncurses extensions should condition their use on
+       the visibility of the NCURSES_VERSION preprocessor macro.
 
+       NetBSD curses since 2.0 (2004) supports keyok.
 
-

                SEE ALSO

                -       define_key(3x).
 
+

                AUTHORS

                +       Thomas Dickey
 
-

                AUTHOR

                -       Thomas Dickey.
+
+

                SEE ALSO

                +       curses(3x), define_key(3x), keybound(3x), keyok(3x), key_defined(3x)
 
 
 
-                                                                     keyok(3x)
+ncurses 6.5                       2024-07-27                         keyok(3x)
                diff --git a/doc/html/man/legacy_coding.3x.html b/doc/html/man/legacy_coding.3x.html index c4aa0965..bb72afed 100644 --- a/doc/html/man/legacy_coding.3x.html +++ b/doc/html/man/legacy_coding.3x.html @@ -1,6 +1,6 @@ -legacy_coding 3x +legacy_coding 3x 2024-09-14 ncurses 6.5 Library calls -

                legacy_coding 3x

                +

                legacy_coding 3x 2024-09-14 ncurses 6.5 Library calls

                -legacy_coding(3x)                                            legacy_coding(3x)
+legacy_coding(3x)                Library calls               legacy_coding(3x)

                NAME

                -       use_legacy_coding - override locale-encoding checks
+       use_legacy_coding - override curses locale encoding checks

                SYNOPSIS

                @@ -58,47 +58,54 @@ 
                legacy_coding 3x

                DESCRIPTION

                -       The  use_legacy_coding  function is an extension to the curses library.
-       It allows the caller to change  the  result  of  unctrl,  and  suppress
-       related checks within the library that would normally cause nonprinting
-       characters to be rendered in visible form.   This  affects  only  8-bit
-       characters.
+       use_legacy_coding,  an ncurses extension to the curses library, permits
+       customiztion  of  unctrl(3x)  behavior,  suppressing   isprint(3)-based
+       checks  within  the  library  that  would  normally  cause  nonprinting
+       characters to be rendered in visible form.  The alteration affects only
+       byte-wide characters with the most significant bit set.
 
-       The level parameter controls the result:
+       The level parameter controls the result.
 
-              0    the   library  functions  normally,  rendering  nonprinting
-                   characters as described in unctrl.
+              0    The   library  functions  normally,  rendering  nonprinting
+                   characters as described in unctrl(3x),
 
-              1    the  library  ignores  isprintf  for  codes  in  the  range
-                   160-255.
+              1    the library ignores isprint for codes in the range 160-255.
 
-              2    the  library  ignores  isprintf  for  codes  in  the  range
-                   128-255.  It also modifies the output  of  unctrl,  showing
-                   codes in the range 128-159 as is.
+              2    the library ignores isprint for codes in the range 128-255.
+                   It also modifies the output of unctrl(3x), showing codes in
+                   the range 128-159 as is.

                RETURN VALUE

                -       If  the  screen has not been initialized, or the level parameter is out
-       of range, the function returns ERR.  Otherwise, it returns the previous
-       level: 0, 1 or 2.
+       If the curses screen has not been initialized, or the  level  parameter
+       is  out of range, use_legacy_coding returns ERR.  Otherwise, it returns
+       the previous level.
+
+
+

                EXTENSIONS

                +       use_legacy_coding is an ncurses extension.

                PORTABILITY

                -       This  routine  is specific to ncurses.  It was not supported on Version
-       7, BSD or System V implementations.  It is recommended  that  any  code
-       depending on ncurses extensions be conditioned using NCURSES_VERSION.
+       Applications employing ncurses extensions should condition their use on
+       the visibility of the NCURSES_VERSION preprocessor macro.
 
 
-

                SEE ALSO

                -       unctrl(3x).
+

                HISTORY

                +       ncurses  5.6  (2006)  introduced use_legacy_coding to support lynx(1)'s
+       font-switching feature.
 
 
-

                AUTHOR

                -       Thomas Dickey (to support lynx's font-switching feature).
+

                AUTHORS

                +       Thomas Dickey
+
+
+

                SEE ALSO

                +       unctrl(3x)
 
 
 
-                                                             legacy_coding(3x)
+ncurses 6.5                       2024-09-14                 legacy_coding(3x)
                diff --git a/doc/html/man/menu.3x.html b/doc/html/man/menu.3x.html index 8ffaa3db..b61a1e90 100644 --- a/doc/html/man/menu.3x.html +++ b/doc/html/man/menu.3x.html @@ -1,7 +1,7 @@ -menu 3x +menu 3x 2024-12-28 ncurses 6.5 Library calls -

                menu 3x

                +

                menu 3x 2024-12-28 ncurses 6.5 Library calls

                -menu(3x)                                                              menu(3x)
+menu(3x)                         Library calls                        menu(3x)

                NAME

                -       menu - curses extension for programming menus
+       menu - present menus in curses windows

                SYNOPSIS

                @@ -71,7 +71,7 @@ 
                menu 3x

                Current Default Values for Item Attributes

                        The menu library maintains a default value for  item  attributes.   You
        can  get  or  set  this default by calling the appropriate get_ or set_
-       routine with a NULL item pointer.  Changing this default  with  a  set_
+       routine with a NULL item pointer.  Changing this default  with  a  set_
        function  affects  future  item  creations,  but  does  not  change the
        rendering of items already created.
 
@@ -150,7 +150,7 @@ 
                menu 3x

                RETURN VALUE

                -       Routines  that  return  pointers  return  NULL on error.  Routines that
+       Routines  that  return  pointers  return  NULL on error.  Routines that
        return an integer return one of the following error codes:
 
        E_OK The routine succeeded.
@@ -190,24 +190,19 @@ 
                menu 3x

                NOTES

                -       The header  file  <menu.h>  automatically  includes  the  header  files
-       <curses.h> and <eti.h>.
-
-       In your library list, libmenu.a should be before libncurses.a; that is,
-       you should say "-lmenu -lncurses", not  the  other  way  around  (which
-       would give a link-error when using static libraries).
+       The header file menu.h itself includes the header file curses.h.

                PORTABILITY

                -       These  routines  emulate  the  System  V  menu  library.  They were not
+       These routines emulate the  System  V  menu  library.   They  were  not
        supported on Version 7 or BSD versions.
 
-       The menu facility was documented in SVr4.2 in Character User  Interface
-       Programming (UNIX SVR4.2).
+       A  menu  facility  was  documented in SVr4.2's Character User Interface
+       Programming document.
 
        It is not part of X/Open Curses.
 
-       Aside from ncurses, there are few implementations:
+       Aside from ncurses, there are few implementations:
 
        o   systems based on SVr4 source code, e.g., Solaris.
 
@@ -215,19 +210,17 @@ 
                menu 3x

                AUTHORS

                -       Juergen  Pfeifer.   Manual  pages and adaptation for ncurses by Eric S.
+       Juergen Pfeifer.  Manual pages and adaptation for ncurses  by  Eric  S.
        Raymond.

                SEE ALSO

                -       curses(3x) and related pages whose names  begin  "menu_"  for  detailed
+       curses(3x)  and  related  pages  whose names begin "menu_" for detailed
        descriptions of the entry points.
 
-       This describes ncurses version 6.4 (patch 20230311).
-
 
 
-                                                                      menu(3x)
+ncurses 6.5                       2024-12-28                          menu(3x)
                  diff --git a/doc/html/man/menu_attributes.3x.html b/doc/html/man/menu_attributes.3x.html index 62252e0a..3b3f6ea5 100644 --- a/doc/html/man/menu_attributes.3x.html +++ b/doc/html/man/menu_attributes.3x.html @@ -1,7 +1,6 @@ -menu_attributes 3x +menu_attributes 3x 2024-03-16 ncurses 6.5 Library calls -

                  menu_attributes 3x

                  +

                  menu_attributes 3x 2024-03-16 ncurses 6.5 Library calls

                  -menu_attributes(3x)                                        menu_attributes(3x)
+menu_attributes(3x)              Library calls             menu_attributes(3x)
 
 
 
@@ -101,16 +100,6 @@ 
                  menu_attributes 3x
                  
             Routine detected an incorrect or out-of-range argument.
 
 
-

                  SEE ALSO

                  -       curses(3x)  and  related  pages  whose names begin "menu_" for detailed
-       descriptions of the entry points.
-
-
-

                  NOTES

                  -       The  header  file  <menu.h>  automatically  includes  the  header  file
-       <curses.h>.
-
-

                  PORTABILITY

                          These  routines  emulate  the  System  V  menu  library.  They were not
        supported on Version 7 or BSD versions.
@@ -121,8 +110,13 @@ 
                  menu_attributes 3x
                  
        Raymond.
 
 
+

                  SEE ALSO

                  +       curses(3x)  and  related  pages  whose names begin "menu_" for detailed
+       descriptions of the entry points.
+
 
-                                                           menu_attributes(3x)
+
+ncurses 6.5                       2024-03-16               menu_attributes(3x)
                  diff --git a/doc/html/man/menu_cursor.3x.html b/doc/html/man/menu_cursor.3x.html index 8f28ca1a..0003bcdb 100644 --- a/doc/html/man/menu_cursor.3x.html +++ b/doc/html/man/menu_cursor.3x.html @@ -1,7 +1,6 @@ -menu_cursor 3x +menu_cursor 3x 2024-03-16 ncurses 6.5 Library calls -

                  menu_cursor 3x

                  +

                  menu_cursor 3x 2024-03-16 ncurses 6.5 Library calls

                  -menu_cursor(3x)                                                menu_cursor(3x)
+menu_cursor(3x)                  Library calls                 menu_cursor(3x)
 
 
 
@@ -79,17 +78,8 @@ 
                  menu_cursor 3x
                  
             The menu has not been posted.
 
 
-

                  SEE ALSO

                  -       curses(3x), menu(3x).
-
-
-

                  NOTES

                  -       The  header  file  <menu.h>  automatically  includes  the  header  file
-       <curses.h>.
-
-

                  PORTABILITY

                  -       These  routines  emulate  the  System  V  menu  library.  They were not
+       These routines emulate the  System  V  menu  library.   They  were  not
        supported on Version 7 or BSD versions.
 
 
@@ -98,8 +88,12 @@ 
                  menu_cursor 3x
                  
        Raymond.
 
 
+

                  SEE ALSO

                  +       curses(3x), menu(3x)
+
+
 
-                                                               menu_cursor(3x)
+ncurses 6.5                       2024-03-16                   menu_cursor(3x)
                  diff --git a/doc/html/man/menu_driver.3x.html b/doc/html/man/menu_driver.3x.html index df2fbe81..d82a7f5c 100644 --- a/doc/html/man/menu_driver.3x.html +++ b/doc/html/man/menu_driver.3x.html @@ -1,6 +1,6 @@ -menu_driver 3x +menu_driver 3x 2024-03-16 ncurses 6.5 Library calls -

                  menu_driver 3x

                  +

                  menu_driver 3x 2024-03-16 ncurses 6.5 Library calls

                  -menu_driver(3x)                                                menu_driver(3x)
+menu_driver(3x)                  Library calls                 menu_driver(3x)
 
 
 
@@ -133,7 +133,7 @@ 
                  menu_driver 3x
                  
        corresponding action is performed.
 
 
-

                  MOUSE HANDLING

                  +

                  Mouse Handling

                          If  the  second  argument  is the KEY_MOUSE special key, the associated
        mouse event is translated into one of the above  pre-defined  requests.
        Currently only clicks in the user window (e.g., inside the menu display
@@ -172,7 +172,7 @@ 
                  menu_driver 3x
                  
        translated into a menu request an E_REQUEST_DENIED is returned.
 
 
-

                  APPLICATION-DEFINED COMMANDS

                  +

                  Application-defined Commands

                          If the second argument is neither printable nor one of the  above  pre-
        defined  menu  requests  or  KEY_MOUSE,  the  drive  assumes  it  is an
        application-specific    command    and    returns    E_UNKNOWN_COMMAND.
@@ -207,19 +207,10 @@ 
                  menu_driver 3x
                  
             The menu driver could not process the request.
 
 
-

                  SEE ALSO

                  -       curses(3x), getch(3x), menu(3x).
-
-
-

                  NOTES

                  -       The header  file  <menu.h>  automatically  includes  the  header  files
-       <curses.h>.
-
-

                  PORTABILITY

                  -       These  routines  emulate  the  System  V  menu  library.  They were not
-       supported on Version 7 or BSD versions.  The support for  mouse  events
-       is ncurses specific.
+       These routines emulate the  System  V  menu  library.   They  were  not
+       supported  on  Version 7 or BSD versions.  The support for mouse events
+       is ncurses specific.

                  AUTHORS

                  @@ -227,8 +218,12 @@ 
                  menu_driver 3x
                  
        Raymond.
 
 
+

                  SEE ALSO

                  +       curses(3x), getch(3x), menu(3x)
+
+
 
-                                                               menu_driver(3x)
+ncurses 6.5                       2024-03-16                   menu_driver(3x)
                  diff --git a/doc/html/man/menu_format.3x.html b/doc/html/man/menu_format.3x.html index 8b70d013..ddd934cf 100644 --- a/doc/html/man/menu_format.3x.html +++ b/doc/html/man/menu_format.3x.html @@ -1,7 +1,6 @@ -menu_format 3x +menu_format 3x 2024-03-16 ncurses 6.5 Library calls -

                  menu_format 3x

                  +

                  menu_format 3x 2024-03-16 ncurses 6.5 Library calls

                  -menu_format(3x)                                                menu_format(3x)
+menu_format(3x)                  Library calls                 menu_format(3x)
 
 
 
@@ -92,17 +91,8 @@ 
                  menu_format 3x
                  
             No items are connected to the menu.
 
 
-

                  SEE ALSO

                  -       curses(3x), menu(3x).
-
-
-

                  NOTES

                  -       The  header  file  <menu.h>  automatically  includes  the  header  file
-       <curses.h>.
-
-

                  PORTABILITY

                  -       These routines emulate the  System  V  menu  library.   They  were  not
+       These  routines  emulate  the  System  V  menu  library.  They were not
        supported on Version 7 or BSD versions.
 
 
@@ -111,8 +101,12 @@ 
                  menu_format 3x
                  
        Raymond.
 
 
+

                  SEE ALSO

                  +       curses(3x), menu(3x)
+
+
 
-                                                               menu_format(3x)
+ncurses 6.5                       2024-03-16                   menu_format(3x)
                  diff --git a/doc/html/man/menu_hook.3x.html b/doc/html/man/menu_hook.3x.html index 88bb67d4..b6def77d 100644 --- a/doc/html/man/menu_hook.3x.html +++ b/doc/html/man/menu_hook.3x.html @@ -1,7 +1,6 @@ -menu_hook 3x +menu_hook 3x 2024-12-28 ncurses 6.5 Library calls -

                  menu_hook 3x

                  +

                  menu_hook 3x 2024-12-28 ncurses 6.5 Library calls

                  -menu_hook(3x)                                                    menu_hook(3x)
+menu_hook(3x)                    Library calls                   menu_hook(3x)
 
 
 
@@ -54,17 +53,17 @@ 
                  menu_hook 3x

                  SYNOPSIS

                          #include <menu.h>
 
-       int set_item_init(MENU *menu, Menu_Hook func);
-       Menu_Hook item_init(const MENU *menu);
+       int set_item_init(MENU *menu, Menu_Hook func);
+       Menu_Hook item_init(const MENU *menu);
 
-       int set_item_term(MENU *menu, Menu_Hook func);
-       Menu_Hook item_term(const MENU *menu);
+       int set_item_term(MENU *menu, Menu_Hook func);
+       Menu_Hook item_term(const MENU *menu);
 
-       int set_menu_init(MENU *menu, Menu_Hook func);
-       Menu_Hook menu_init(const MENU *menu);
+       int set_menu_init(MENU *menu, Menu_Hook func);
+       Menu_Hook menu_init(const MENU *menu);
 
-       int set_menu_term(MENU *menu, Menu_Hook func);
-       Menu_Hook menu_term(const MENU *menu);
+       int set_menu_term(MENU *menu, Menu_Hook func);
+       Menu_Hook menu_term(const MENU *menu);

                  DESCRIPTION

                  @@ -74,27 +73,27 @@ 
                  menu_hook 3x
                  
 
        The  function  set_item_init sets a hook to be called at menu-post time
        and each time the selected item changes (after the change).   item_init
-       returns  the  current  item init hook, if any (NULL if there is no such
+       returns  the  current  item init hook, if any (NULL if there is no such
        hook).
 
        The function set_item_term sets a hook to be called at menu-unpost time
        and each time the selected item changes (before the change).  item_term
-       returns the current item term hook, if any (NULL if there  is  no  such
+       returns the current item term hook, if any (NULL if there  is  no  such
        hook).
 
        The  function  set_menu_init sets a hook to be called at menu-post time
        and just after the top row on the  menu  changes  once  it  is  posted.
-       menu_init  returns the current menu init hook, if any (NULL if there is
+       menu_init  returns the current menu init hook, if any (NULL if there is
        no such hook).
 
        The function set_menu_term sets a hook to be called at menu-unpost time
        and  just  before  the  top  row on the menu changes once it is posted.
-       menu_term returns the current menu term hook, if any (NULL if there  is
+       menu_term returns the current menu term hook, if any (NULL if there  is
        no such hook).

                  RETURN VALUE

                  -       Routines  that  return  pointers  return NULL on error.  Other routines
+       Routines  that  return  pointers  return NULL on error.  Other routines
        return one of the following:
 
        E_OK The routine succeeded.
@@ -103,17 +102,8 @@ 
                  menu_hook 3x
                  
             System error occurred (see errno(3)).
 
 
-

                  SEE ALSO

                  -       curses(3x), menu(3x).
-
-
-

                  NOTES

                  -       The  header  file  <menu.h>  automatically  includes  the  header  file
-       <curses.h>.
-
-

                  PORTABILITY

                  -       These  routines  emulate  the  System  V  menu  library.  They were not
+       These routines emulate the  System  V  menu  library.   They  were  not
        supported on Version 7 or BSD versions.
 
 
@@ -122,8 +112,12 @@ 
                  menu_hook 3x
                  
        Raymond.
 
 
+

                  SEE ALSO

                  +       curses(3x), menu(3x)
+
+
 
-                                                                 menu_hook(3x)
+ncurses 6.5                       2024-12-28                     menu_hook(3x)
                  diff --git a/doc/html/man/menu_items.3x.html b/doc/html/man/menu_items.3x.html index 3e9791a1..49369e83 100644 --- a/doc/html/man/menu_items.3x.html +++ b/doc/html/man/menu_items.3x.html @@ -1,7 +1,6 @@ -menu_items 3x +menu_items 3x 2024-12-28 ncurses 6.5 Library calls -

                  menu_items 3x

                  +

                  menu_items 3x 2024-12-28 ncurses 6.5 Library calls

                  -menu_items(3x)                                                  menu_items(3x)
+menu_items(3x)                   Library calls                  menu_items(3x)
 
 
 
@@ -62,7 +61,7 @@ 
                  menu_items 3x

                  DESCRIPTION

                          The function set_menu_items changes the item pointer array of the given
-       menu.  The array must be terminated by a NULL.
+       menu.  The array must be terminated by a NULL.
 
        The function menu_items returns the item array of the given menu.
 
@@ -70,11 +69,11 @@ 
                  menu_items 3x

                  RETURN VALUE

                  -       The function menu_items returns a pointer (which may be NULL).  It does
+       The function menu_items returns a pointer (which may be NULL).  It does
        not set errno.
 
        The function item_count returns ERR (the general  curses  error  return
-       value) if its menu parameter is NULL.
+       value) if its menu parameter is NULL .
 
        The  function  set_menu_items  returns  one  of  the following codes on
        error:
@@ -94,20 +93,11 @@ 
                  menu_items 3x
                  
             System error occurred (see errno(3)).
 
 
-

                  SEE ALSO

                  -       curses(3x), menu(3x).
-
-
-

                  NOTES

                  -       The  header  file  <menu.h>  automatically  includes  the  header  file
-       <curses.h>.
-
-

                  PORTABILITY

                  -       These  routines  emulate  the  System  V  menu  library.  They were not
+       These routines emulate the  System  V  menu  library.   They  were  not
        supported on Version 7 or BSD versions.
 
-       The SVr4 menu library  documentation  specifies  the  item_count  error
+       The  SVr4  menu  library  documentation  specifies the item_count error
        value as -1 (which is the value of ERR).
 
 
@@ -116,8 +106,12 @@ 
                  menu_items 3x
                  
        Raymond.
 
 
+

                  SEE ALSO

                  +       curses(3x), menu(3x)
+
+
 
-                                                                menu_items(3x)
+ncurses 6.5                       2024-12-28                    menu_items(3x)
                  diff --git a/doc/html/man/menu_mark.3x.html b/doc/html/man/menu_mark.3x.html index 996069ad..bbbb74d5 100644 --- a/doc/html/man/menu_mark.3x.html +++ b/doc/html/man/menu_mark.3x.html @@ -1,7 +1,6 @@ -menu_mark 3x +menu_mark 3x 2024-12-28 ncurses 6.5 Library calls -

                  menu_mark 3x

                  +

                  menu_mark 3x 2024-12-28 ncurses 6.5 Library calls

                  -menu_mark(3x)                                                    menu_mark(3x)
+menu_mark(3x)                    Library calls                   menu_mark(3x)
 
 
 
@@ -68,15 +67,15 @@ 
                  menu_mark 3x
                  
        string.   Note  that  changing the length of the mark string for a menu
        while the menu is posted is likely to produce unhelpful behavior.
 
-       The default string is "-" (a dash).  Calling set_menu_mark with a  non-
-       NULL menu argument will change this default.
+       The default string is "-" (a dash).  Calling set_menu_mark with a  non-
+       NULL menu argument will change this default.
 
-       The function menu_mark returns the menu's mark string (or NULL if there
+       The function menu_mark returns the menu's mark string (or NULL if there
        is none).

                  RETURN VALUE

                  -       The function menu_mark returns a pointer (which may be NULL).  It  does
+       The function menu_mark returns a pointer (which may be NULL).  It  does
        not set errno.
 
        The function set_menu_mark may return the following error codes:
@@ -90,17 +89,8 @@ 
                  menu_mark 3x
                  
             System error occurred (see errno(3)).
 
 
-

                  SEE ALSO

                  -       curses(3x), menu(3x).
-
-
-

                  NOTES

                  -       The  header  file  <menu.h>  automatically  includes  the  header  file
-       <curses.h>.
-
-

                  PORTABILITY

                  -       These routines emulate the  System  V  menu  library.   They  were  not
+       These  routines  emulate  the  System  V  menu  library.  They were not
        supported on Version 7 or BSD versions.
 
 
@@ -109,8 +99,12 @@ 
                  menu_mark 3x
                  
        Raymond.
 
 
+

                  SEE ALSO

                  +       curses(3x), menu(3x)
+
+
 
-                                                                 menu_mark(3x)
+ncurses 6.5                       2024-12-28                     menu_mark(3x)
                  diff --git a/doc/html/man/menu_new.3x.html b/doc/html/man/menu_new.3x.html index ad6a2b97..042a8922 100644 --- a/doc/html/man/menu_new.3x.html +++ b/doc/html/man/menu_new.3x.html @@ -1,7 +1,6 @@ -menu_new 3x +menu_new 3x 2024-12-28 ncurses 6.5 Library calls -

                  menu_new 3x

                  +

                  menu_new 3x 2024-12-28 ncurses 6.5 Library calls

                  -menu_new(3x)                                                      menu_new(3x)
+menu_new(3x)                     Library calls                    menu_new(3x)
 
 
 
@@ -60,14 +59,14 @@ 
                  menu_new 3x

                  DESCRIPTION

                          The  function new_menu creates a new menu connected to a specified item
-       pointer array (which must be NULL-terminated).
+       pointer array (which must be NULL-terminated).
 
        The function free_menu disconnects menu from its item array  and  frees
        the storage allocated for the menu.

                  RETURN VALUE

                  -       The  function  new_menu returns NULL on error.  It sets errno according
+       The  function  new_menu returns NULL on error.  It sets errno according
        to the function's failure:
 
        E_NOT_CONNECTED
@@ -90,17 +89,8 @@ 
                  menu_new 3x
                  
             The menu has already been posted.
 
 
-

                  SEE ALSO

                  -       curses(3x), menu(3x).
-
-
-

                  NOTES

                  -       The  header  file  <menu.h>  automatically  includes  the  header  file
-       <curses.h>.
-
-

                  PORTABILITY

                  -       These  routines  emulate  the  System  V  menu  library.  They were not
+       These routines emulate the  System  V  menu  library.   They  were  not
        supported on Version 7 or BSD versions.
 
 
@@ -109,8 +99,12 @@ 
                  menu_new 3x
                  
        Raymond.
 
 
+

                  SEE ALSO

                  +       curses(3x), menu(3x)
+
+
 
-                                                                  menu_new(3x)
+ncurses 6.5                       2024-12-28                      menu_new(3x)
                  diff --git a/doc/html/man/menu_opts.3x.html b/doc/html/man/menu_opts.3x.html index 208bd636..ffe3a8bf 100644 --- a/doc/html/man/menu_opts.3x.html +++ b/doc/html/man/menu_opts.3x.html @@ -1,7 +1,6 @@ -menu_opts 3x +menu_opts 3x 2025-01-18 ncurses 6.5 Library calls -

                  menu_opts 3x

                  +

                  menu_opts 3x 2025-01-18 ncurses 6.5 Library calls

                  -menu_opts(3x)                                                    menu_opts(3x)
+menu_opts(3x)                    Library calls                   menu_opts(3x)
 
 
 
@@ -64,7 +63,7 @@ 
                  menu_opts 3x

                  DESCRIPTION

                          The function set_menu_opts sets all the given menu's option bits  (menu
-       option bits may be logically-OR'ed together).
+       option bits may be logically "or"-ed together).
 
        The  function  menu_opts_on  turns on the given option bits, and leaves
        others alone.
@@ -114,17 +113,8 @@ 
                  menu_opts 3x
                  
             The menu is already posted.
 
 
-

                  SEE ALSO

                  -       curses(3x), menu(3x).
-
-
-

                  NOTES

                  -       The  header  file  <menu.h>  automatically  includes  the  header  file
-       <curses.h>.
-
-

                  PORTABILITY

                  -       These routines emulate the  System  V  menu  library.   They  were  not
+       These  routines  emulate  the  System  V  menu  library.  They were not
        supported on Version 7 or BSD versions.
 
 
@@ -133,8 +123,12 @@ 
                  menu_opts 3x
                  
        Raymond.
 
 
+

                  SEE ALSO

                  +       curses(3x), menu(3x)
+
+
 
-                                                                 menu_opts(3x)
+ncurses 6.5                       2025-01-18                     menu_opts(3x)
                  diff --git a/doc/html/man/menu_pattern.3x.html b/doc/html/man/menu_pattern.3x.html index cf2f296b..927fcc9a 100644 --- a/doc/html/man/menu_pattern.3x.html +++ b/doc/html/man/menu_pattern.3x.html @@ -1,6 +1,6 @@ -menu_pattern 3x +menu_pattern 3x 2024-12-28 ncurses 6.5 Library calls -

                  menu_pattern 3x

                  +

                  menu_pattern 3x 2024-12-28 ncurses 6.5 Library calls

                  -menu_pattern(3x)                                              menu_pattern(3x)
+menu_pattern(3x)                 Library calls                menu_pattern(3x)
 
 
 
@@ -70,8 +70,8 @@ 
                  menu_pattern 3x

                  RETURN VALUE

                  -       The  function menu_pattern returns a pointer, which is NULL if the menu
-       parameter is NULL.  Otherwise, it is a pointer to  a  string  which  is
+       The  function menu_pattern returns a pointer, which is NULL if the menu
+       parameter is NULL.  Otherwise, it is a pointer to  a  string  which  is
        empty if no pattern has been set.  It does not set errno.
 
        The function set_menu_pattern may return the following error codes:
@@ -94,17 +94,8 @@ 
                  menu_pattern 3x
                  
             System error occurred (see errno(3)).
 
 
-

                  SEE ALSO

                  -       curses(3x), menu(3x).
-
-
-

                  NOTES

                  -       The  header  file  <menu.h>  automatically  includes  the  header  file
-       <curses.h>.
-
-

                  PORTABILITY

                  -       These routines emulate the  System  V  menu  library.   They  were  not
+       These  routines  emulate  the  System  V  menu  library.  They were not
        supported on Version 7 or BSD versions.
 
 
@@ -113,8 +104,12 @@ 
                  menu_pattern 3x
                  
        Raymond.
 
 
+

                  SEE ALSO

                  +       curses(3x), menu(3x)
+
+
 
-                                                              menu_pattern(3x)
+ncurses 6.5                       2024-12-28                  menu_pattern(3x)
                  diff --git a/doc/html/man/menu_post.3x.html b/doc/html/man/menu_post.3x.html index cc2274bd..6d48f77b 100644 --- a/doc/html/man/menu_post.3x.html +++ b/doc/html/man/menu_post.3x.html @@ -1,7 +1,6 @@ -menu_post 3x +menu_post 3x 2024-03-16 ncurses 6.5 Library calls -

                  menu_post 3x

                  +

                  menu_post 3x 2024-03-16 ncurses 6.5 Library calls

                  -menu_post(3x)                                                    menu_post(3x)
+menu_post(3x)                    Library calls                   menu_post(3x)
 
 
 
@@ -97,17 +96,8 @@ 
                  menu_post 3x
                  
             No items are connected to the menu.
 
 
-

                  SEE ALSO

                  -       curses(3x), menu(3x).
-
-
-

                  NOTES

                  -       The  header  file  <menu.h>  automatically  includes  the  header  file
-       <curses.h>.
-
-

                  PORTABILITY

                  -       These routines emulate the  System  V  menu  library.   They  were  not
+       These  routines  emulate  the  System  V  menu  library.  They were not
        supported on Version 7 or BSD versions.
 
 
@@ -116,8 +106,12 @@ 
                  menu_post 3x
                  
        Raymond.
 
 
+

                  SEE ALSO

                  +       curses(3x), menu(3x)
+
+
 
-                                                                 menu_post(3x)
+ncurses 6.5                       2024-03-16                     menu_post(3x)
                  diff --git a/doc/html/man/menu_requestname.3x.html b/doc/html/man/menu_requestname.3x.html index ab12977c..1a9dba0c 100644 --- a/doc/html/man/menu_requestname.3x.html +++ b/doc/html/man/menu_requestname.3x.html @@ -1,7 +1,6 @@ -menu_requestname 3x +menu_requestname 3x 2024-12-28 ncurses 6.5 Library calls -

                  menu_requestname 3x

                  +

                  menu_requestname 3x 2024-12-28 ncurses 6.5 Library calls

                  -menu_requestname(3x)                                      menu_requestname(3x)
+menu_requestname(3x)             Library calls            menu_requestname(3x)
 
 
 
@@ -68,23 +67,14 @@ 
                  menu_requestname 3x

                  RETURN VALUE

                  -       menu_request_name   returns   NULL   on   error   and   sets  errno  to
+       menu_request_name   returns   NULL   on   error   and   sets  errno  to
        E_BAD_ARGUMENT.
        menu_request_by_name returns E_NO_MATCH on  error.   It  does  not  set
        errno.
 
 
-

                  SEE ALSO

                  -       curses(3x), menu(3x).
-
-
-

                  NOTES

                  -       The  header  file  <menu.h>  automatically  includes  the  header  file
-       <curses.h>.
-
-

                  PORTABILITY

                  -       These routines are specific to ncurses.  They  were  not  supported  on
+       These  routines  are  specific  to ncurses.  They were not supported on
        Version 7, BSD or System V implementations.  It is recommended that any
        code depending on them be conditioned using NCURSES_VERSION.
 
@@ -94,8 +84,12 @@ 
                  menu_requestname 3x
                  
        Raymond.
 
 
+

                  SEE ALSO

                  +       curses(3x), menu(3x)
+
+
 
-                                                          menu_requestname(3x)
+ncurses 6.5                       2024-12-28              menu_requestname(3x)
                  diff --git a/doc/html/man/menu_spacing.3x.html b/doc/html/man/menu_spacing.3x.html index 45bbabd4..4c95e4e3 100644 --- a/doc/html/man/menu_spacing.3x.html +++ b/doc/html/man/menu_spacing.3x.html @@ -1,7 +1,6 @@ -menu_spacing 3x +menu_spacing 3x 2024-12-28 ncurses 6.5 Library calls -

                  menu_spacing 3x

                  +

                  menu_spacing 3x 2024-12-28 ncurses 6.5 Library calls

                  -menu_spacing(3x)                                              menu_spacing(3x)
+menu_spacing(3x)                 Library calls                menu_spacing(3x)
 
 
 
@@ -67,38 +66,39 @@ 
                  menu_spacing 3x

                  DESCRIPTION

                          The function set_menu_spacing sets  the  spacing  information  for  the
-       menu.   Its  parameter  spc_description  controls  the number of spaces
-       between an item name and an item description.  It must  not  be  larger
-       than  TABSIZE.  The menu system puts in the middle of this spacing area
-       the pad character.  The remaining parts are filled  with  spaces.   The
-       spc_rows  parameter  controls  the  number of rows that are used for an
-       item.  It must not be larger than 3.  The menu system inserts the blank
-       lines  between item rows, these lines will contain the pad character in
-       the appropriate positions.   The  spc_columns  parameter  controls  the
-       number  of blanks between columns of items.  It must not be larger than
-       TABSIZE.  A value of 0 for all the spacing values resets  them  to  the
-       default, which is 1 for all of them.
-       The  function  menu_spacing  passes back the spacing info for the menu.
-       If a pointer is NULL, this specific info is simply not returned.
+       menu.  Its parameters provide the description and the size (in rows and
+       columns).
 
+       spc_description
+              controls the number of spaces between an item name and  an  item
+              description.   It  must  not  be  larger than TABSIZE.  The menu
+              system  puts  in  the  middle  of  this  spacing  area  the  pad
+              character.  The remaining parts are filled with spaces.
 
-

                  RETURN VALUE

                  -       Both routines return E_OK  on  success.   set_menu_spacing  may  return
-       E_POSTED if the menu is posted, or E_BAD_ARGUMENT if one of the spacing
-       values is out of range.
+       spc_rows
+              controls  the number of rows that are used for an item.  It must
+              not be larger than 3.  The menu system inserts the  blank  lines
+              between item rows, these lines will contain the pad character in
+              the appropriate positions.
 
+       spc_columns
+              controls the number of blanks between columns of items.  It must
+              not  be  larger  than TABSIZE.  A value of 0 for all the spacing
+              values resets them to the default, which is 1 for all of them.
 
-

                  SEE ALSO

                  -       curses(3x), curs_variables(3x), menu(3x).
+       The function menu_spacing returns the spacing information for the menu.
+       If  a  pointer  is  NULL,  the  corresponding information is simply not
+       returned.
 
 
-

                  NOTES

                  -       The  header  file  <menu.h>  automatically  includes  the  header  file
-       <curses.h>.
+

                  RETURN VALUE

                  +       Both routines return E_OK  on  success.   set_menu_spacing  may  return
+       E_POSTED if the menu is posted, or E_BAD_ARGUMENT if one of the spacing
+       values is out of range.

                  PORTABILITY

                  -       These  routines  are  specific  to ncurses.  They were not supported on
+       These routines are specific to ncurses.  They  were  not  supported  on
        Version 7, BSD or System V implementations.  It is recommended that any
        code depending on them be conditioned using NCURSES_VERSION.
 
@@ -108,8 +108,12 @@ 
                  menu_spacing 3x
                  
        Raymond.
 
 
+

                  SEE ALSO

                  +       curses(3x), curs_variables(3x), menu(3x)
+
 
-                                                              menu_spacing(3x)
+
+ncurses 6.5                       2024-12-28                  menu_spacing(3x)
                  diff --git a/doc/html/man/menu_userptr.3x.html b/doc/html/man/menu_userptr.3x.html index cc6873c2..48764878 100644 --- a/doc/html/man/menu_userptr.3x.html +++ b/doc/html/man/menu_userptr.3x.html @@ -1,7 +1,6 @@ -menu_userptr 3x +menu_userptr 3x 2024-12-28 ncurses 6.5 Library calls -

                  menu_userptr 3x

                  +

                  menu_userptr 3x 2024-12-28 ncurses 6.5 Library calls

                  -menu_userptr(3x)                                              menu_userptr(3x)
+menu_userptr(3x)                 Library calls                menu_userptr(3x)
 
 
 
@@ -66,23 +65,14 @@ 
                  menu_userptr 3x

                  RETURN VALUE

                  -       menu_userptr returns a pointer (which may be NULL).  It  does  not  set
+       menu_userptr returns a pointer (which may be NULL).  It  does  not  set
        errno.
 
        set_menu_userptr returns E_OK (success).
 
 
-

                  SEE ALSO

                  -       curses(3x), menu(3x).
-
-
-

                  NOTES

                  -       The  header  file  <menu.h>  automatically  includes  the  header  file
-       <curses.h>.
-
-

                  PORTABILITY

                  -       These routines emulate the  System  V  menu  library.   They  were  not
+       These  routines  emulate  the  System  V  menu  library.  They were not
        supported on Version 7 or BSD versions.
 
        The user pointer is a void pointer.  We chose not to leave it as a char
@@ -94,8 +84,12 @@ 
                  menu_userptr 3x
                  
        Raymond.
 
 
+

                  SEE ALSO

                  +       curses(3x), menu(3x)
+
+
 
-                                                              menu_userptr(3x)
+ncurses 6.5                       2024-12-28                  menu_userptr(3x)
                  diff --git a/doc/html/man/menu_win.3x.html b/doc/html/man/menu_win.3x.html index 12849d70..41c0753f 100644 --- a/doc/html/man/menu_win.3x.html +++ b/doc/html/man/menu_win.3x.html @@ -1,7 +1,6 @@ -menu_win 3x +menu_win 3x 2024-12-28 ncurses 6.5 Library calls -

                  menu_win 3x

                  +

                  menu_win 3x 2024-12-28 ncurses 6.5 Library calls

                  -menu_win(3x)                                                      menu_win(3x)
+menu_win(3x)                     Library calls                    menu_win(3x)
 
 
 
@@ -60,7 +59,7 @@ 
                  menu_win 3x
                  
        int set_menu_sub(MENU *menu, WINDOW *sub);
        WINDOW *menu_sub(const MENU *menu);
 
-       int scale_menu(const MENU *menu, int *rows, int *columns);
+       int scale_menu(const MENU *menu, int *rows, int *columns);

                  DESCRIPTION

                  @@ -73,8 +72,8 @@ 
                  menu_win 3x
                  
        necessary to set either window; by default, the driver code uses stdscr
        for both.
 
-       In the set_ functions, window argument of NULL is treated as though  it
-       were stsdcr.  A menu argument of NULL is treated as a request to change
+       In the set_ functions, window argument of NULL is treated as though  it
+       were stsdcr.  A menu argument of NULL is treated as a request to change
        the system default menu window or subwindow.
 
        The function scale_menu returns  the  minimum  size  required  for  the
@@ -82,7 +81,7 @@ 
                  menu_win 3x

                  RETURN VALUE

                  -       Routines  that  return  pointers  return  NULL on error.  Routines that
+       Routines  that  return  pointers  return  NULL on error.  Routines that
        return an integer return one of the following error codes:
 
        E_OK The routine succeeded.
@@ -100,17 +99,8 @@ 
                  menu_win 3x
                  
             No items are connected to the menu.
 
 
-

                  SEE ALSO

                  -       curses(3x), curs_variables(3x), menu(3x).
-
-
-

                  NOTES

                  -       The  header  file  <menu.h>  automatically  includes  the  header  file
-       <curses.h>.
-
-

                  PORTABILITY

                  -       These  routines  emulate  the  System  V  menu  library.  They were not
+       These routines emulate the  System  V  menu  library.   They  were  not
        supported on Version 7 or BSD versions.
 
 
@@ -119,8 +109,12 @@ 
                  menu_win 3x
                  
        Raymond.
 
 
+

                  SEE ALSO

                  +       curses(3x), curs_variables(3x), menu(3x)
+
+
 
-                                                                  menu_win(3x)
+ncurses 6.5                       2024-12-28                      menu_win(3x)
                  diff --git a/doc/html/man/mitem_current.3x.html b/doc/html/man/mitem_current.3x.html index 1e438427..a0dd4860 100644 --- a/doc/html/man/mitem_current.3x.html +++ b/doc/html/man/mitem_current.3x.html @@ -1,7 +1,6 @@ -mitem_current 3x +mitem_current 3x 2024-12-28 ncurses 6.5 Library calls -

                  mitem_current 3x

                  +

                  mitem_current 3x 2024-12-28 ncurses 6.5 Library calls

                  -mitem_current(3x)                                            mitem_current(3x)
+mitem_current(3x)                Library calls               mitem_current(3x)
 
 
 
@@ -79,11 +78,11 @@ 
                  mitem_current 3x

                  RETURN VALUE

                  -       current_item returns a pointer (which may be NULL).  It  does  not  set
+       current_item returns a pointer (which may be NULL).  It  does  not  set
        errno.
 
        top_row  and  item_index return ERR (the general curses error value) if
-       their menu parameter is NULL.
+       their menu parameter is NULL.
 
        set_current_item and set_top_row return one of the following:
 
@@ -102,20 +101,11 @@ 
                  mitem_current 3x
                  
             System error occurred (see errno(3)).
 
 
-

                  SEE ALSO

                  -       curses(3x), menu(3x).
-
-
-

                  NOTES

                  -       The  header  file  <menu.h>  automatically  includes  the  header  file
-       <curses.h>.
-
-

                  PORTABILITY

                  -       These  routines  emulate  the  System  V  menu  library.  They were not
+       These routines emulate the  System  V  menu  library.   They  were  not
        supported on Version 7 or BSD versions.
 
-       The  SVr4  menu  library  documentation  specifies  the   top_row   and
+       The   SVr4   menu  library  documentation  specifies  the  top_row  and
        index_item error value as -1 (which is the value of ERR).
 
 
@@ -124,8 +114,12 @@ 
                  mitem_current 3x
                  
        Raymond.
 
 
+

                  SEE ALSO

                  +       curses(3x), menu(3x)
+
+
 
-                                                             mitem_current(3x)
+ncurses 6.5                       2024-12-28                 mitem_current(3x)
                  diff --git a/doc/html/man/mitem_name.3x.html b/doc/html/man/mitem_name.3x.html index af84f551..7498870a 100644 --- a/doc/html/man/mitem_name.3x.html +++ b/doc/html/man/mitem_name.3x.html @@ -1,7 +1,6 @@ -mitem_name 3x +mitem_name 3x 2024-12-28 ncurses 6.5 Library calls -

                  mitem_name 3x

                  +

                  mitem_name 3x 2024-12-28 ncurses 6.5 Library calls

                  -mitem_name(3x)                                                  mitem_name(3x)
+mitem_name(3x)                   Library calls                  mitem_name(3x)
 
 
 
@@ -65,21 +64,12 @@ 
                  mitem_name 3x

                  RETURN VALUE

                  -       These routines return a pointer (which may be NULL).  They do  not  set
+       These routines return a pointer (which may be NULL).  They do  not  set
        errno.
 
 
-

                  SEE ALSO

                  -       curses(3x), menu(3x).
-
-
-

                  NOTES

                  -       The  header  file  <menu.h>  automatically  includes  the  header  file
-       <curses.h>.
-
-

                  PORTABILITY

                  -       These routines emulate the  System  V  menu  library.   They  were  not
+       These  routines  emulate  the  System  V  menu  library.  They were not
        supported on Version 7 or BSD versions.
 
 
@@ -88,8 +78,12 @@ 
                  mitem_name 3x
                  
        Raymond.
 
 
+

                  SEE ALSO

                  +       curses(3x), menu(3x)
+
+
 
-                                                                mitem_name(3x)
+ncurses 6.5                       2024-12-28                    mitem_name(3x)
                  diff --git a/doc/html/man/mitem_new.3x.html b/doc/html/man/mitem_new.3x.html index 2e1dcde6..03f34f4c 100644 --- a/doc/html/man/mitem_new.3x.html +++ b/doc/html/man/mitem_new.3x.html @@ -1,7 +1,6 @@ -mitem_new 3x +mitem_new 3x 2024-12-28 ncurses 6.5 Library calls -

                  mitem_new 3x

                  +

                  mitem_new 3x 2024-12-28 ncurses 6.5 Library calls

                  -mitem_new(3x)                                                    mitem_new(3x)
+mitem_new(3x)                    Library calls                   mitem_new(3x)
 
 
 
@@ -70,7 +69,7 @@ 
                  mitem_new 3x

                  RETURN VALUE

                  -       The  function  new_item returns NULL on error.  It sets errno according
+       The  function  new_item returns NULL on error.  It sets errno according
        to the function's failure:
 
        E_BAD_ARGUMENT
@@ -93,17 +92,8 @@ 
                  mitem_new 3x
                  
             System error occurred (see errno(3)).
 
 
-

                  SEE ALSO

                  -       curses(3x), menu(3x).
-
-
-

                  NOTES

                  -       The  header  file  <menu.h>  automatically  includes  the  header  file
-       <curses.h>.
-
-

                  PORTABILITY

                  -       These  routines  emulate  the  System  V  menu  library.  They were not
+       These routines emulate the  System  V  menu  library.   They  were  not
        supported on Version 7 or BSD versions.
 
 
@@ -112,8 +102,12 @@ 
                  mitem_new 3x
                  
        Raymond.
 
 
+

                  SEE ALSO

                  +       curses(3x), menu(3x)
+
+
 
-                                                                 mitem_new(3x)
+ncurses 6.5                       2024-12-28                     mitem_new(3x)
                  diff --git a/doc/html/man/mitem_opts.3x.html b/doc/html/man/mitem_opts.3x.html index 0cd0ec6a..69dfd54a 100644 --- a/doc/html/man/mitem_opts.3x.html +++ b/doc/html/man/mitem_opts.3x.html @@ -1,7 +1,6 @@ -mitem_opts 3x +mitem_opts 3x 2025-01-18 ncurses 6.5 Library calls -

                  mitem_opts 3x

                  +

                  mitem_opts 3x 2025-01-18 ncurses 6.5 Library calls

                  -mitem_opts(3x)                                                  mitem_opts(3x)
+mitem_opts(3x)                   Library calls                  mitem_opts(3x)
 
 
 
@@ -64,7 +63,7 @@ 
                  mitem_opts 3x

                  DESCRIPTION

                          The function set_item_opts sets all the given item's option bits  (menu
-       option bits may be logically-OR'ed together).
+       option bits may be logically "or"-ed together).
 
        The  function  item_opts_on  turns on the given option bits, and leaves
        others alone.
@@ -88,17 +87,8 @@ 
                  mitem_opts 3x
                  
             System error occurred (see errno(3)).
 
 
-

                  SEE ALSO

                  -       curses(3x), menu(3x).
-
-
-

                  NOTES

                  -       The  header  file  <menu.h>  automatically  includes  the  header  file
-       <curses.h>.
-
-

                  PORTABILITY

                  -       These routines emulate the  System  V  menu  library.   They  were  not
+       These  routines  emulate  the  System  V  menu  library.  They were not
        supported on Version 7 or BSD versions.
 
 
@@ -107,8 +97,12 @@ 
                  mitem_opts 3x
                  
        Raymond.
 
 
+

                  SEE ALSO

                  +       curses(3x), menu(3x)
+
+
 
-                                                                mitem_opts(3x)
+ncurses 6.5                       2025-01-18                    mitem_opts(3x)
                  diff --git a/doc/html/man/mitem_userptr.3x.html b/doc/html/man/mitem_userptr.3x.html index ee8a3b8f..d2b0fa85 100644 --- a/doc/html/man/mitem_userptr.3x.html +++ b/doc/html/man/mitem_userptr.3x.html @@ -1,7 +1,6 @@ -mitem_userptr 3x +mitem_userptr 3x 2024-12-28 ncurses 6.5 Library calls -

                  mitem_userptr 3x

                  +

                  mitem_userptr 3x 2024-12-28 ncurses 6.5 Library calls

                  -mitem_userptr(3x)                                            mitem_userptr(3x)
+mitem_userptr(3x)                Library calls               mitem_userptr(3x)
 
 
 
@@ -66,23 +65,14 @@ 
                  mitem_userptr 3x

                  RETURN VALUE

                  -       The function item_userptr returns a pointer (possibly NULL).   It  does
+       The function item_userptr returns a pointer (possibly NULL).   It  does
        not set errno.
 
        The set_item_userptr always returns E_OK (success).
 
 
-

                  SEE ALSO

                  -       curses(3x), menu(3x).
-
-
-

                  NOTES

                  -       The  header  file  <menu.h>  automatically  includes  the  header  file
-       <curses.h>.
-
-

                  PORTABILITY

                  -       These routines emulate the  System  V  menu  library.   They  were  not
+       These  routines  emulate  the  System  V  menu  library.  They were not
        supported on Version 7 or BSD versions.
 
        The user pointer is a void pointer.  We chose not to leave it as a char
@@ -94,8 +84,12 @@ 
                  mitem_userptr 3x
                  
        Raymond.
 
 
+

                  SEE ALSO

                  +       curses(3x), menu(3x)
+
+
 
-                                                             mitem_userptr(3x)
+ncurses 6.5                       2024-12-28                 mitem_userptr(3x)
                  diff --git a/doc/html/man/mitem_value.3x.html b/doc/html/man/mitem_value.3x.html index 6e1e6ab7..01ce5d50 100644 --- a/doc/html/man/mitem_value.3x.html +++ b/doc/html/man/mitem_value.3x.html @@ -1,6 +1,6 @@ -mitem_value 3x +mitem_value 3x 2024-03-16 ncurses 6.5 Library calls -

                  mitem_value 3x

                  +

                  mitem_value 3x 2024-03-16 ncurses 6.5 Library calls

                  -mitem_value(3x)                                                mitem_value(3x)
+mitem_value(3x)                  Library calls                 mitem_value(3x)
 
 
 
@@ -79,17 +79,8 @@ 
                  mitem_value 3x
                  
             The menu driver could not process the request.
 
 
-

                  SEE ALSO

                  -       curses(3x), menu(3x).
-
-
-

                  NOTES

                  -       The  header  file  <menu.h>  automatically  includes  the  header  file
-       <curses.h>.
-
-

                  PORTABILITY

                  -       These routines emulate the  System  V  menu  library.   They  were  not
+       These  routines  emulate  the  System  V  menu  library.  They were not
        supported on Version 7 or BSD versions.
 
 
@@ -98,8 +89,12 @@ 
                  mitem_value 3x
                  
        Raymond.
 
 
+

                  SEE ALSO

                  +       curses(3x), menu(3x)
+
+
 
-                                                               mitem_value(3x)
+ncurses 6.5                       2024-03-16                   mitem_value(3x)
                  diff --git a/doc/html/man/mitem_visible.3x.html b/doc/html/man/mitem_visible.3x.html index 9c8efbe6..8224323f 100644 --- a/doc/html/man/mitem_visible.3x.html +++ b/doc/html/man/mitem_visible.3x.html @@ -1,7 +1,6 @@ -mitem_visible 3x +mitem_visible 3x 2024-03-16 ncurses 6.5 Library calls -

                  mitem_visible 3x

                  +

                  mitem_visible 3x 2024-03-16 ncurses 6.5 Library calls

                  -mitem_visible(3x)                                            mitem_visible(3x)
+mitem_visible(3x)                Library calls               mitem_visible(3x)

                  NAME

                  -       mitem_visible - check visibility of a menu item
+       item_visible - check visibility of a menu item

                  SYNOPSIS

                  @@ -63,17 +62,8 @@ 
                  mitem_visible 3x
                  
        this portion will be smaller than the whole menu).
 
 
-

                  SEE ALSO

                  -       curses(3x), menu(3x).
-
-
-

                  NOTES

                  -       The  header  file  <menu.h>  automatically  includes  the  header  file
-       <curses.h>.
-
-

                  PORTABILITY

                  -       These routines emulate the  System  V  menu  library.   They  were  not
+       These  routines  emulate  the  System  V  menu  library.  They were not
        supported on Version 7 or BSD versions.
 
 
@@ -82,18 +72,21 @@ 
                  mitem_visible 3x
                  
        Raymond.
 
 
+

                  SEE ALSO

                  +       curses(3x), menu(3x)
+
+
 
-                                                             mitem_visible(3x)
+ncurses 6.5                       2024-03-16                 mitem_visible(3x)
                  diff --git a/doc/html/man/ncurses.3x.html b/doc/html/man/ncurses.3x.html index 8cfe515b..7092be3c 100644 --- a/doc/html/man/ncurses.3x.html +++ b/doc/html/man/ncurses.3x.html @@ -1,7 +1,7 @@ -ncurses 3x +ncurses 3x 2025-03-01 ncurses 6.5 Library calls -

                  ncurses 3x

                  +

                  ncurses 3x 2025-03-01 ncurses 6.5 Library calls

                  -ncurses(3x)                                                        ncurses(3x)
+ncurses(3x)                      Library calls                     ncurses(3x)

                  NAME

                  -       ncurses - CRT screen handling and optimization package
+       ncurses - character-cell terminal interface with optimized output

                  SYNOPSIS

                  @@ -56,237 +56,291 @@ 
                  ncurses 3x

                  DESCRIPTION

                  -       The  ncurses  library  routines  give  the  user a terminal-independent
-       method of updating  character  screens  with  reasonable  optimization.
-       This  implementation  is  "new  curses"  (ncurses)  and is the approved
-       replacement for 4.4BSD classic curses,  which  has  been  discontinued.
-       This describes ncurses version 6.4 (patch 20230311).
-
-       The  ncurses  library emulates the curses library of System V Release 4
-       UNIX, and XPG4 (X/Open Portability Guide) curses  (also  known  as  XSI
-       curses).   XSI  stands  for  X/Open  System  Interfaces Extension.  The
-       ncurses library is freely redistributable in source form.   Differences
-       from   the   SVr4  curses  are  summarized  under  the  EXTENSIONS  and
-       PORTABILITY sections below and described in detail  in  the  respective
-       EXTENSIONS, PORTABILITY and BUGS sections of individual man pages.
-
-       The  ncurses  library  also  provides  many  useful  extensions,  i.e.,
-       features which cannot be implemented by a  simple  add-on  library  but
-       which require access to the internals of the library.
-
-       A  program  using  these  routines  must  be  linked with the -lncurses
-       option, or (if it  has  been  generated)  with  the  debugging  library
-       -lncurses_g.   (Your  system  integrator  may also have installed these
-       libraries under the names  -lcurses  and  -lcurses_g.)   The  ncurses_g
-       library  generates  trace logs (in a file called "trace" in the current
-       directory) that describe curses  actions.   See  also  the  section  on
-       ALTERNATE CONFIGURATIONS.
-
-       The   ncurses   package   supports:  overall  screen,  window  and  pad
-       manipulation; output to  windows  and  pads;  reading  terminal  input;
-       control  over terminal and curses input and output options; environment
-       query routines; color manipulation; use of soft  label  keys;  terminfo
-       capabilities; and access to low-level terminal-manipulation routines.
+       The  "new  curses" library offers the programmer a terminal-independent
+       means of reading keyboard and mouse input and writing to character-cell
+       displays  with  output  optimized  to minimize screen updates.  ncurses
+       replaces the curses libraries from System V Release 4 Unix ("SVr4") and
+       4.4BSD  Unix,  the  development  of  which  ceased  in the 1990s.  This
+       document describes ncurses version 6.5 (patch 20250301).
+
+       ncurses permits control of the terminal screen's contents;  abstraction
+       and  subdivision thereof with windows and pads; acquisition of keyboard
+       and mouse events; selection of color and rendering attributes (such  as
+       bold  or  underline); the definition and use of soft label keys; access
+       to the terminfo terminal capability database; a  termcap  compatibility
+       interface;  and an abstraction of the system's API for manipulating the
+       terminal (such as termios(3)).
+
+       ncurses implements the interface described by  X/Open  Curses  Issue 7.
+       In many behavioral details not standardized by X/Open, ncurses emulates
+       the curses library of SVr4 and provides numerous useful extensions.
+
+       ncurses man pages employ several sections to clarify matters  of  usage
+       and interoperability with other curses implementations.
+
+       o   "NOTES"  describes  issues  and  caveats  of  which any user of the
+           ncurses API should be aware, such as limitations on the size of  an
+           underlying  integral  type  or  the  availability of a preprocessor
+           macro exclusive  of  a  function  definition  (which  prevents  its
+           address   from   being   taken).    This   section  also  describes
+           implementation details of significance to the programmer but  which
+           are not standardized.
+
+       o   "EXTENSIONS"  presents ncurses innovations beyond the X/Open Curses
+           standard and/or the SVr4 curses implementation.   They  are  termed
+           extensions  to  indicate  that they cannot be implemented solely by
+           using the library API, but require access to the library's internal
+           state.
+
+       o   "PORTABILITY" discusses matters (beyond the exercise of extensions)
+           that should be considered when writing to a curses standard, or for
+           multiple implementations.
+
+       o   "HISTORY"  examines  points  of  detail in ncurses and other curses
+           implementations over the decades of their development, particularly
+           where precedent or inertia have frustrated better design (and, in a
+           few cases, where such inertia has been overcome).
+
+       A curses application must be linked with the library; use the -lncurses
+       option  to your compiler or linker.  A debugging version of the library
+       may be available; if so, link with it using -lncurses_g.  (Your  system
+       integrator may have installed these libraries such that you can use the
+       options -lcurses and -lcurses_g, respectively.)  The ncurses_g  library
+       logs  events  describing  ncurses actions to a file called trace in the
+       current directory.  See section "ALTERNATE CONFIGURATIONS" below.
+
+
+

                  Application Structure

                  +       A  curses  application  uses  information  from  the   system   locale;
+       setlocale(3) prepares it for curses library calls.
+
+           setlocale(LC_ALL, "");
+
+       If  the  locale  is  not  thus  initialized,  the  library assumes that
+       characters are printable as in ISO 8859-1, to work with certain  legacy
+       programs.   You  should initialize the locale; do not expect consistent
+       behavior from the library when the locale has not been set up.
+
+       initscr(3x) or newterm(3x) must be called to initialize  curses  before
+       use of any functions that access or manipulate windows or screens.
+
+       To  get  character-at-a-time  input  without echoing--most interactive,
+       screen-oriented programs want this--use the following sequence.
+
+           initscr(); cbreak(); noecho();
+
+       Most applications would perform further setup as follows.
+
+           noqiflush();
+           keypad(stdscr, TRUE);
+
+       A curses program then often enters an event loop of  some  sort.   Call
+       endwin(3x) before exiting.
+
+
+

                  Overview

                  +       A  curses  library abstracts the terminal with a SCREEN data structure,
+       and represents all or part  of  its  display  with  WINDOW  structures.
+       Distinct  properties apply to each; for example, the line discipline of
+       a typical Unix terminal driver is in one of three modes:  raw,  cbreak,
+       or  canonical ("cooked").  In curses, the line discipline is a property
+       of the screen, applying identically to all windows associated with it.
+
+       A window is a rectangular grid of character cells,  addressed  by  line
+       and column coordinates (y, x), with the upper left corner as (0, 0).  A
+       window called stdscr, the same size as the terminal screen,  is  always
+       available.  Create others with newwin(3x).
+
+       A  curses  library does not manage overlapping windows (but see below).
+       You can either use stdscr to manage one screen-filling window, or  tile
+       the  screen  into  non-overlapping  windows  and not use stdscr at all.
+       Mixing the two approaches will result in  unpredictable  and  undesired
+       effects.
+
+       Functions  permit  manipulation  of a window and the cursor identifying
+       the cell within it at which  the  next  operation  will  occur.   Among
+       those,  the  most  basic  are  move(3x)  and addch(3x): these place the
+       cursor within and write a character to stdscr, respectively.
+
+       Frequent changes to the terminal screen can cause unpleasant flicker or
+       inefficient  use  of  the  communication channel to the device, so as a
+       rule the library does not update it  automatically.   Therefore,  after
+       using curses functions to accumulate a set of desired updates that make
+       sense to present together, call refresh(3x) to tell the library to make
+       the  user's  screen look like stdscr.  The library optimizes its output
+       by computing a minimal volume of operations to mutate the  screen  from
+       its   state  at  the  previous  refresh  to  the  new  one.   Effective
+       optimization demands accurate information about  the  terminal  device:
+       the  management of such information is the province of the terminfo(3x)
+       API, a feature of every standard curses implementation.
+
+       Special windows called pads may also be  manipulated.   These  are  not
+       constrained  to the size of the terminal screen and their contents need
+       not be completely displayed.  See curs_pad(3x).
+
+       Many terminals support configuration of character cell  foreground  and
+       background  colors  as  well  as  attributes, which cause characters to
+       render in such modes as boldfaced, underlined,  or  in  reverse  video.
+       See curs_color(3x) and curs_attr(3x).
+
+       curses  predefines  constants for a small set of forms-drawing graphics
+       corresponding to the DEC Alternate Character Set (ACS),  a  feature  of
+       VT100 and other terminals.  See addch(3x).
+
+       curses is implemented using the operating system's terminal driver; key
+       events are received not as scan  codes  but  as  byte  sequences.   The
+       driver  reports  graphical  keycaps (alphanumeric and punctuation keys,
+       and  the  space)  as-is.    Everything   else,   including   the   tab,
+       enter/return,  keypad, arrow, and function keys, appears to curses as a
+       control character or a multibyte escape sequence.  curses can translate
+       the latter into unique key codes.  See keypad(3x) and getch(3x).
+
+       ncurses provides reimplementations of the SVr4 panel(3x), form(3x), and
+       menu(3x)  libraries;  they  permit   overlapping   windows   and   ease
+       construction of user interfaces with curses.

                  Initialization

                  -       The  library uses the locale which the calling program has initialized.
-       That is normally done with setlocale(3):
-
-           setlocale(LC_ALL, "");
-
-       If the locale is not initialized, the library assumes  that  characters
-       are  printable  as in ISO-8859-1, to work with certain legacy programs.
-       You should initialize the locale and not rely on  specific  details  of
-       the library when the locale has not been setup.
-
-       The  function  initscr  or  newterm  must  be  called to initialize the
-       library before any of the other routines that  deal  with  windows  and
-       screens  are  used.   The  routine  endwin(3x)  must  be  called before
-       exiting.
-
-       To get character-at-a-time input  without  echoing  (most  interactive,
-       screen  oriented  programs want this), the following sequence should be
-       used:
-
-           initscr(); cbreak(); noecho();
-
-       Most programs would additionally use the sequence:
-
-           intrflush(stdscr, FALSE);
-           keypad(stdscr, TRUE);
-
-       Before a curses program is run, the tab stops of the terminal should be
-       set  and  its initialization strings, if defined, must be output.  This
-       can be done  by  executing  the  tput  init  command  after  the  shell
-       environment  variable  TERM  has  been  exported.   tset(1)  is usually
-       responsible for doing this.  [See terminfo(5) for further details.]
-
-
-

                  Datatypes

                  -       The ncurses library permits manipulation  of  data  structures,  called
-       windows,   which  can  be  thought  of  as  two-dimensional  arrays  of
-       characters representing all or part of a CRT screen.  A default  window
-       called  stdscr,  which is the size of the terminal screen, is supplied.
-       Others may be created with newwin.
-
-       Note that curses does not handle overlapping windows,  that's  done  by
-       the  panel(3x)  library.   This means that you can either use stdscr or
-       divide the screen into tiled windows  and  not  using  stdscr  at  all.
-       Mixing the two will result in unpredictable, and undesired, effects.
-
-       Windows  are referred to by variables declared as WINDOW *.  These data
-       structures are manipulated with routines described here  and  elsewhere
-       in  the ncurses manual pages.  Among those, the most basic routines are
-       move and addch.  More general versions of these routines  are  included
-       with  names  beginning  with  w, allowing the user to specify a window.
-       The routines not beginning with w affect stdscr.
-
-       After using routines to manipulate a  window,  refresh(3x)  is  called,
-       telling  curses  to  make  the user's CRT screen look like stdscr.  The
-       characters in a window are actually  of  type  chtype,  (character  and
-       attribute  data) so that other information about the character may also
-       be stored with each character.
-
-       Special windows called pads may also be manipulated.  These are windows
-       which  are not constrained to the size of the screen and whose contents
-       need  not  be  completely  displayed.   See   curs_pad(3x)   for   more
-       information.
-
-       In  addition  to drawing characters on the screen, video attributes and
-       colors may be supported, causing the characters  to  show  up  in  such
-       modes  as  underlined,  in reverse video, or in color on terminals that
-       support such display enhancements.   Line  drawing  characters  may  be
-       specified  to  be  output.   On input, curses is also able to translate
-       arrow and function keys that  transmit  escape  sequences  into  single
-       values.   The  video  attributes,  line  drawing  characters, and input
-       values use names, defined in <curses.h>, such as A_REVERSE,  ACS_HLINE,
-       and KEY_LEFT.
-
-
-

                  Environment variables

                  -       If  the  environment  variables  LINES  and  COLUMNS are set, or if the
-       program  is  executing  in  a  window  environment,  line  and   column
-       information  in  the  environment  will  override  information  read by
-       terminfo.  This would affect a program running in an  AT&T  630  layer,
-       for   example,   where   the  size  of  a  screen  is  changeable  (see
-       ENVIRONMENT).
-
-       If the environment variable TERMINFO  is  defined,  any  program  using
-       curses  checks  for  a local terminal definition before checking in the
-       standard place.  For example, if TERM  is  set  to  att4424,  then  the
-       compiled terminal definition is found in
-
-           /usr/share/terminfo/a/att4424.
-
-       (The  a is copied from the first letter of att4424 to avoid creation of
-       huge directories.)  However,  if  TERMINFO  is  set  to  $HOME/myterms,
-       curses first checks
-
-           $HOME/myterms/a/att4424,
-
-       and if that fails, it then checks
-
-           /usr/share/terminfo/a/att4424.
-
-       This  is  useful  for developing experimental definitions or when write
-       permission in /usr/share/terminfo is not available.
-
-       The integer variables LINES and COLS are defined in <curses.h> and will
-       be  filled  in  by  initscr with the size of the screen.  The constants
-       TRUE and FALSE have the values 1 and 0, respectively.
-
-       The curses routines also define the WINDOW * variable curscr  which  is
-       used  for  certain  low-level  operations like clearing and redrawing a
-       screen containing garbage.  The curscr  can  be  used  in  only  a  few
-       routines.
-
-
-

                  Routine and Argument Names

                  -       Many  curses routines have two or more versions.  The routines prefixed
-       with w require a window argument.  The routines prefixed with p require
-       a pad argument.  Those without a prefix generally use stdscr.
-
-       The  routines  prefixed with mv require a y and x coordinate to move to
-       before performing the appropriate action.  The mv routines imply a call
-       to  move before the call to the other routine.  The coordinate y always
-       refers to the row (of the window), and x always refers to  the  column.
-       The upper left-hand corner is always (0,0), not (1,1).
-
-       The  routines prefixed with mvw take both a window argument and x and y
-       coordinates.  The  window  argument  is  always  specified  before  the
-       coordinates.
-
-       In  each case, win is the window affected, and pad is the pad affected;
-       win and pad are always pointers to type WINDOW.
-
-       Option setting routines require a Boolean flag bf with the  value  TRUE
-       or  FALSE;  bf  is always of type bool.  Most of the data types used in
-       the library routines, such as WINDOW,  SCREEN,  bool,  and  chtype  are
-       defined  in  <curses.h>.   Types used for the terminfo routines such as
-       TERMINAL are defined in <term.h>.
-
-       This  manual  page  describes  functions  which  may  appear   in   any
-       configuration  of  the library.  There are two common configurations of
-       the library:
-
-          ncurses
-               the "normal" library,  which  handles  8-bit  characters.   The
-               normal   (8-bit)   library   stores  characters  combined  with
-               attributes in chtype data.
-
-               Attributes alone (no corresponding character) may be stored  in
-               chtype or the equivalent attr_t data.  In either case, the data
-               is stored in something like an integer.
-
-               Each cell (row and column) in a WINDOW is stored as a chtype.
-
-          ncursesw
-               the  so-called  "wide"   library,   which   handles   multibyte
-               characters  (see the section on ALTERNATE CONFIGURATIONS).  The
-               "wide" library includes all of  the  calls  from  the  "normal"
-               library.   It  adds about one third more calls using data types
-               which store multibyte characters:
-
-               cchar_t
-                    corresponds to chtype.  However it is a structure, because
-                    more  data  is  stored  than can fit into an integer.  The
-                    characters are large enough  to  require  a  full  integer
-                    value - and there may be more than one character per cell.
-                    The video attributes and  color  are  stored  in  separate
-                    fields of the structure.
-
-                    Each  cell  (row  and  column)  in a WINDOW is stored as a
-                    cchar_t.
-
-                    The setcchar(3x)  and  getcchar(3x)  functions  store  and
-                    retrieve the data from a cchar_t structure.
-
-               wchar_t
-                    stores  a  "wide"  character.  Like chtype, this may be an
-                    integer.
-
-               wint_t
-                    stores a wchar_t or WEOF - not the same, though  both  may
-                    have the same size.
-
-               The  "wide"  library provides new functions which are analogous
-               to functions in  the  "normal"  library.   There  is  a  naming
-               convention  which  relates  many of the normal/wide variants: a
-               "_w" is inserted into the name.  For  example,  waddch  becomes
-               wadd_wch.
-
-
-

                  Routine Name Index

                  -       The  following table lists the curses routines provided in the "normal"
-       and "wide" libraries and the names of the manual pages  on  which  they
-       are  described.   Routines  flagged  with "*" are ncurses-specific, not
-       described by XPG4 or present in SVr4.
-
-                    curses Routine Name      Manual Page Name
+       The   selection  of  an  appropriate  value  of  TERM  in  the  process
+       environment  is  essential  to  correct  curses  and  terminfo  library
+       operation.   A  well-configured  system  selects  a  correct TERM value
+       automatically;  tset(1)  may   assist   with   troubleshooting   exotic
+       situations.
+
+       If you change the terminal type, export the shell's TERM variable, then
+       run tset(1) or the "tput  init"  command.   See  subsection  "Tabs  and
+       Initialization" of terminfo(5).
+
+       If  the  environment  variables  LINES  and  COLUMNS are set, or if the
+       curses program is executing in a graphical windowing  environment,  the
+       information  obtained  thence  overrides that obtained by terminfo.  An
+       ncurses   extension   supports   resizable   terminal   displays;   see
+       wresize(3x).
+
+       If  the  environment  variable  TERMINFO  is  defined, a curses program
+       checks first for  a  terminal  type  description  in  the  location  it
+       identifies.   TERMINFO  is  useful  for developing type descriptions or
+       when write permission to /usr/share/terminfo is not available.
+
+       See section "ENVIRONMENT" below.
+
+
+

                  Naming Conventions

                  +       curses offers many functions in variant forms using a  regular  set  of
+       alternatives  to the name of an elemental one.  Those prefixed with "w"
+       require a WINDOW pointer argument;  those  with  a  "mv"  prefix  first
+       perform cursor movement using wmove(3x); a "mvw" prefix indicates both.
+       The "w" function is typically the elemental one; the  removal  of  this
+       prefix usually indicates operation on stdscr.
+
+       Four functions prefixed with "p" require a pad argument; see below.
+
+       In  function  synopses,  ncurses man pages apply the following names to
+       parameters.  We introduce the character types in the next subsection.
+
+                bf     a bool (TRUE or FALSE)
+                c      a char or int
+                ch     a chtype
+                wc     a wchar_t or wint_t
+                wch    a cchar_t
+                win    pointer to a WINDOW
+                pad    pointer to a WINDOW that is a pad
+                pair   a foreground/background color pair identifier
+
+
+

                  Wide and Non-wide Character Configurations

                  +       This  man  page  primarily  surveys  functions  that  appear   in   any
+       configuration of the library.  There are two common configurations; see
+       section "ALTERNATE CONFIGURATIONS" below.
+
+       ncurses   is the library in its "non-wide" configuration, handling only
+                 eight-bit  characters.   It  stores a character combined with
+                 attributes and a color pair identifier  in  a  chtype  datum,
+                 which  is  often  an  alias  of  int.   A  string  of  curses
+                 characters is similar to a C char  string;  a  chtype  string
+                 ends with an integral 0, the null curses character.
+
+                 Attributes and a color pair identifier (with no corresponding
+                 character) can be stored in variables  of  chtype  or  attr_t
+                 type.   In either case, they are accessed via an integral bit
+                 mask.
+
+                 Each cell of a WINDOW is stored as a chtype.   X/Open  Curses
+                 does  not  specify  the  sizes of the character code or color
+                 pair identifier, nor  the  quantity  of  attribute  bits,  in
+                 chtype;  these  are  implementation-dependent.   ncurses uses
+                 eight bits for the character code.  An application  requiring
+                 a  wider  character  type, for instance to represent Unicode,
+                 should use the wide-character API.
+
+       ncursesw  is the library in its  "wide"  configuration,  which  handles
+                 character encodings requiring a larger data type than char (a
+                 byte-sized  type)  can  represent.   It  provides  additional
+                 functions that complement those in the non-wide library where
+                 the size of the underlying character type is significant.   A
+                 somewhat  regular  naming convention relates many of the wide
+                 variants to their non-wide  counterparts;  where  a  non-wide
+                 function  name contains "ch" or "str", prefix it with "_w" to
+                 obtain the wide counterpart.   For  example,  waddch  becomes
+                 wadd_wch.  Another exception is ins_nwstr (and its variants),
+                 spelled thus instead of "insn_wstr".   (Exceptions  that  add
+                 only "w" comprise addwstr, inwstr, and their variants.)
+
+                 This  convention  is  inapplicable  to some non-wide function
+                 names,  so  other  transformations  are  used  for  the  wide
+                 configuration:  the  window  background  management  function
+                 "bkgd"  becomes  "bkgrnd";  the  window  border-drawing   and
+                 -clearing  functions  are suffixed with "_set"; and character
+                 attribute  manipulation  functions   like   "attron"   become
+                 "attr_on".
+
+                 cchar_t  is a curses complex character and corresponds to the
+                          non-wide configuration's chtype.  It is a  structure
+                          type   because  it  requires  more  storage  than  a
+                          standard scalar type offers.  A character  code  may
+                          not  be  representable  as a char, and moreover more
+                          than one character may occupy a cell (as with accent
+                          marks  and  other diacritics).  Each character is of
+                          type  wchar_t;  a  complex  character  contains  one
+                          spacing  character  and  zero  or  more  non-spacing
+                          characters  (see  below).   A  string   of   complex
+                          characters  ends with a cchar_t whose wchar_t member
+                          is the null wide character.  Attributes and a  color
+                          pair identifier are stored in separate fields of the
+                          structure,  not  combined  into  an  integer  as  in
+                          chtype.
+
+                 Each  cell  of a WINDOW is stored as a cchar_t.  setcchar(3x)
+                 and getcchar(3x) store and retrieve cchar_t data.
+
+                 The wide library API of ncurses depends  on  two  data  types
+                 standardized by ISO C95.
+
+                 wchar_t  stores  a wide character.  Like chtype, it may be an
+                          alias of int.  Depending on the character  encoding,
+                          a  wide  character  may  be spacing, meaning that it
+                          occupies a character cell by  itself  and  typically
+                          accompanies   cursor  advancement,  or  non-spacing,
+                          meaning that it occupies the same cell as a  spacing
+                          character,  is often regarded as a "modifier" of the
+                          base glyph with which  it  combines,  and  typically
+                          does not advance the cursor.
+
+                 wint_t   can   store   a   wchar_t   or  the  constant  WEOF,
+                          analogously to the int-sized character  manipulation
+                          functions of ISO C and its constant EOF.
+
+
+

                  Function Name Index

                  +       The following table lists the curses functions provided in the non-wide
+       and wide APIs and the  corresponding  man  pages  that  describe  them.
+       Those  flagged  with  "*"  are  ncurses-specific,  neither described by
+       X/Open Curses nor present in SVr4.
+
+                    curses Function Name     Man Page
                     ---------------------------------------------
                     COLOR_PAIR               curs_color(3x)
-                    PAIR_NUMBER              curs_attr(3x)
+                    PAIR_NUMBER              curs_color(3x)
                     add_wch                  curs_add_wch(3x)
                     add_wchnstr              curs_add_wchstr(3x)
                     add_wchstr               curs_add_wchstr(3x)
@@ -313,7 +367,6 @@ 
                  ncurses 3x
                  
                     bkgrnd                   curs_bkgrnd(3x)
                     bkgrndset                curs_bkgrnd(3x)
                     border                   curs_border(3x)
-
                     border_set               curs_border_set(3x)
                     box                      curs_border(3x)
                     box_set                  curs_border_set(3x)
@@ -332,6 +385,7 @@ 
                  ncurses 3x
                  
                     curses_version           curs_extend(3x)*
                     def_prog_mode            curs_kernel(3x)
                     def_shell_mode           curs_kernel(3x)
+
                     define_key               define_key(3x)*
                     del_curterm              curs_terminfo(3x)
                     delay_output             curs_util(3x)
@@ -359,6 +413,7 @@ 
                  ncurses 3x
                  
                     flash                    curs_beep(3x)
                     flushinp                 curs_util(3x)
                     free_pair                new_pair(3x)*
+                    get_escdelay             curs_threads(3x)*
                     get_wch                  curs_get_wch(3x)
                     get_wstr                 curs_get_wstr(3x)
                     getattrs                 curs_attr(3x)
@@ -379,7 +434,6 @@ 
                  ncurses 3x
                  
                     getnstr                  curs_getstr(3x)
                     getparx                  curs_legacy(3x)*
                     getpary                  curs_legacy(3x)*
-
                     getparyx                 curs_getyx(3x)
                     getstr                   curs_getstr(3x)
                     getsyx                   curs_kernel(3x)
@@ -398,6 +452,7 @@ 
                  ncurses 3x
                  
                     immedok                  curs_outopts(3x)
                     in_wch                   curs_in_wch(3x)
                     in_wchnstr               curs_in_wchstr(3x)
+
                     in_wchstr                curs_in_wchstr(3x)
                     inch                     curs_inch(3x)
                     inchnstr                 curs_inchstr(3x)
@@ -420,16 +475,20 @@ 
                  ncurses 3x
                  
                     instr                    curs_instr(3x)
                     intrflush                curs_inopts(3x)
                     inwstr                   curs_inwstr(3x)
+                    is_cbreak                curs_inopts(3x)*
                     is_cleared               curs_opaque(3x)*
+                    is_echo                  curs_inopts(3x)*
                     is_idcok                 curs_opaque(3x)*
                     is_idlok                 curs_opaque(3x)*
                     is_immedok               curs_opaque(3x)*
                     is_keypad                curs_opaque(3x)*
                     is_leaveok               curs_opaque(3x)*
                     is_linetouched           curs_touch(3x)
+                    is_nl                    curs_inopts(3x)*
                     is_nodelay               curs_opaque(3x)*
                     is_notimeout             curs_opaque(3x)*
                     is_pad                   curs_opaque(3x)*
+                    is_raw                   curs_inopts(3x)*
                     is_scrollok              curs_opaque(3x)*
                     is_subwin                curs_opaque(3x)*
                     is_syncok                curs_opaque(3x)*
@@ -445,7 +504,6 @@ 
                  ncurses 3x
                  
                     killchar                 curs_termattrs(3x)
                     killwchar                curs_termattrs(3x)
                     leaveok                  curs_outopts(3x)
-
                     longname                 curs_termattrs(3x)
                     mcprint                  curs_print(3x)*
                     meta                     curs_inopts(3x)
@@ -461,10 +519,11 @@ 
                  ncurses 3x
                  
                     mvaddchstr               curs_addchstr(3x)
                     mvaddnstr                curs_addstr(3x)
                     mvaddnwstr               curs_addwstr(3x)
+
                     mvaddstr                 curs_addstr(3x)
                     mvaddwstr                curs_addwstr(3x)
                     mvchgat                  curs_attr(3x)
-                    mvcur                    curs_terminfo(3x)
+                    mvcur                    curs_kernel(3x)
                     mvdelch                  curs_delch(3x)
                     mvderwin                 curs_window(3x)
                     mvget_wch                curs_get_wch(3x)
@@ -511,7 +570,6 @@ 
                  ncurses 3x
                  
                     mvwget_wstr              curs_get_wstr(3x)
                     mvwgetch                 curs_getch(3x)
                     mvwgetn_wstr             curs_get_wstr(3x)
-
                     mvwgetnstr               curs_getstr(3x)
                     mvwgetstr                curs_getstr(3x)
                     mvwhline                 curs_border(3x)
@@ -528,6 +586,7 @@ 
                  ncurses 3x
                  
                     mvwins_nwstr             curs_ins_wstr(3x)
                     mvwins_wch               curs_ins_wch(3x)
                     mvwins_wstr              curs_ins_wstr(3x)
+
                     mvwinsch                 curs_insch(3x)
                     mvwinsnstr               curs_insstr(3x)
                     mvwinsstr                curs_insstr(3x)
@@ -553,7 +612,7 @@ 
                  ncurses 3x
                  
                     overlay                  curs_overlay(3x)
                     overwrite                curs_overlay(3x)
                     pair_content             curs_color(3x)
-                    pecho_wchar              curs_pad(3x)*
+                    pecho_wchar              curs_pad(3x)
                     pechochar                curs_pad(3x)
                     pnoutrefresh             curs_pad(3x)
                     prefresh                 curs_pad(3x)
@@ -577,12 +636,13 @@ 
                  ncurses 3x
                  
                     scr_dump                 curs_scr_dump(3x)
                     scr_init                 curs_scr_dump(3x)
                     scr_restore              curs_scr_dump(3x)
-
                     scr_set                  curs_scr_dump(3x)
                     scrl                     curs_scroll(3x)
                     scroll                   curs_scroll(3x)
                     scrollok                 curs_outopts(3x)
                     set_curterm              curs_terminfo(3x)
+                    set_escdelay             curs_threads(3x)*
+                    set_tabsize              curs_threads(3x)*
                     set_term                 curs_initscr(3x)
                     setcchar                 curs_getcchar(3x)
                     setscrreg                curs_outopts(3x)
@@ -593,6 +653,7 @@ 
                  ncurses 3x
                  
                     slk_attr_on              curs_slk(3x)
                     slk_attr_set             curs_slk(3x)
                     slk_attroff              curs_slk(3x)
+
                     slk_attron               curs_slk(3x)
                     slk_attrset              curs_slk(3x)
                     slk_clear                curs_slk(3x)
@@ -604,7 +665,7 @@ 
                  ncurses 3x
                  
                     slk_restore              curs_slk(3x)
                     slk_set                  curs_slk(3x)
                     slk_touch                curs_slk(3x)
-                    slk_wset                 curs_slk(3x)*
+                    slk_wset                 curs_slk(3x)
                     standend                 curs_attr(3x)
                     standout                 curs_attr(3x)
                     start_color              curs_color(3x)
@@ -623,7 +684,9 @@ 
                  ncurses 3x
                  
                     tigetnum                 curs_terminfo(3x)
                     tigetstr                 curs_terminfo(3x)
                     timeout                  curs_inopts(3x)
-                    tiparm                   curs_terminfo(3x)*
+                    tiparm                   curs_terminfo(3x)
+                    tiparm_s                 curs_terminfo(3x)*
+                    tiscan_s                 curs_terminfo(3x)*
                     touchline                curs_touch(3x)
                     touchwin                 curs_touch(3x)
                     tparm                    curs_terminfo(3x)
@@ -640,10 +703,11 @@ 
                  ncurses 3x
                  
                     use_env                  curs_util(3x)
                     use_extended_names       curs_extend(3x)*
                     use_legacy_coding        legacy_coding(3x)*
+                    use_screen               curs_threads(3x)*
                     use_tioctl               curs_util(3x)*
+                    use_window               curs_threads(3x)*
                     vid_attr                 curs_terminfo(3x)
                     vid_puts                 curs_terminfo(3x)
-
                     vidattr                  curs_terminfo(3x)
                     vidputs                  curs_terminfo(3x)
                     vline                    curs_border(3x)
@@ -656,6 +720,7 @@ 
                  ncurses 3x
                  
                     wadd_wchnstr             curs_add_wchstr(3x)
                     wadd_wchstr              curs_add_wchstr(3x)
                     waddch                   curs_addch(3x)
+
                     waddchnstr               curs_addchstr(3x)
                     waddchstr                curs_addchstr(3x)
                     waddnstr                 curs_addstr(3x)
@@ -709,7 +774,6 @@ 
                  ncurses 3x
                  
                     winnwstr                 curs_inwstr(3x)
                     wins_nwstr               curs_ins_wstr(3x)
                     wins_wch                 curs_ins_wch(3x)
-
                     wins_wstr                curs_ins_wstr(3x)
                     winsch                   curs_insch(3x)
                     winsdelln                curs_deleteln(3x)
@@ -723,6 +787,7 @@ 
                  ncurses 3x
                  
                     wnoutrefresh             curs_refresh(3x)
                     wprintw                  curs_printw(3x)
                     wredrawln                curs_refresh(3x)
+
                     wrefresh                 curs_refresh(3x)
                     wresize                  wresize(3x)*
                     wscanw                   curs_scanw(3x)
@@ -738,259 +803,241 @@ 
                  ncurses 3x
                  
                     wvline                   curs_border(3x)
                     wvline_set               curs_border_set(3x)
 
-       Depending on the configuration, additional sets  of  functions  may  be
-       available:
-
-          curs_memleaks(3x) - curses memory-leak checking
-
-          curs_sp_funcs(3x) - curses screen-pointer extension
-
-          curs_threads(3x) - curses thread support
+       ncurses's   screen-pointer   extension   adds   additional    functions
+       corresponding  to  many  of  the  above, each with an "_sp" suffix; see
+       curs_sp_funcs(3x).
 
-          curs_trace(3x) - curses debugging routines
+       The availability of some extensions is  configurable  when  ncurses  is
+       compiled;  see  sections  "ALTERNATE  CONFIGURATIONS"  and "EXTENSIONS"
+       below.

                  RETURN VALUE

                  -       Routines  that return an integer return ERR upon failure and an integer
-       value other than ERR upon successful completion, unless otherwise noted
-       in the routine descriptions.
-
-       As  a  general  rule,  routines  check  for  null  pointers  passed  as
-       parameters, and handle this as an error.
-
-       All macros return  the  value  of  the  w  version,  except  setscrreg,
-       wsetscrreg,  getyx,  getbegyx,  and  getmaxyx.   The  return  values of
-       setscrreg, wsetscrreg, getyx,  getbegyx,  and  getmaxyx  are  undefined
-       (i.e.,  these  should  not be used as the right-hand side of assignment
-       statements).
-
-       Functions with a "mv" prefix first  perform  a  cursor  movement  using
-       wmove, and return an error if the position is outside the window, or if
-       the window pointer  is  null.   Most  "mv"-prefixed  functions  (except
-       variadic  functions  such  as mvprintw) are provided both as macros and
-       functions.
-
-       Routines that return pointers return NULL on error.
+       Unless otherwise noted,  functions  that  return  integers  return  the
+       constants  OK  on  success  and ERR on failure; see curs_variables(3x).
+       Functions that return pointers  return  NULL  on  failure.   Typically,
+       ncurses  treats  a  null  pointer  passed  as a function parameter as a
+       failure.  Functions prefixed with "mv" first  perform  cursor  movement
+       and fail if the position (y, x) is outside the window boundaries.

                  ENVIRONMENT

                  -       The following  environment  symbols  are  useful  for  customizing  the
-       runtime  behavior of the ncurses library.  The most important ones have
-       been already discussed in detail.
-
-
-

                  CC command-character

                  -       When set, change occurrences of the command_character (i.e., the  cmdch
-       capability)  of  the  loaded  terminfo  entries  to  the  value of this
-       variable.  Very few terminfo entries provide this feature.
-
-       Because this name is also used in development environments to represent
-       the C compiler's name, ncurses ignores it if it does not happen to be a
-       single character.
-
-
-

                  BAUDRATE

                  -       The  debugging  library  checks  this  environment  variable  when  the
-       application  has  redirected  output to a file.  The variable's numeric
-       value is used for the baudrate.  If no value  is  found,  ncurses  uses
-       9600.  This allows testers to construct repeatable test-cases that take
-       into account costs that depend on baudrate.
-
-
-

                  COLUMNS

                  -       Specify the width of the screen in characters.  Applications running in
-       a  windowing  environment  usually  are able to obtain the width of the
-       window in which they are executing.  If neither the COLUMNS  value  nor
-       the  terminal's  screen  size is available, ncurses uses the size which
-       may be specified in the terminfo database (i.e., the cols capability).
-
-       It is important that your  application  use  a  correct  size  for  the
-       screen.   This  is  not always possible because your application may be
-       running on a host which does not honor NAWS (Negotiations About  Window
-       Size),  or  because  you  are  temporarily  running  as  another  user.
-       However, setting COLUMNS and/or LINES overrides the  library's  use  of
-       the screen size obtained from the operating system.
-
-       Either  COLUMNS  or LINES symbols may be specified independently.  This
-       is  mainly  useful  to  circumvent  legacy  misfeatures   of   terminal
-       descriptions,  e.g.,  xterm  which commonly specifies a 65 line screen.
-       For best results, lines and cols should not be specified in a  terminal
-       description for terminals which are run as emulations.
-
-       Use  the  use_env  function  to disable all use of external environment
-       (but not including system calls) to determine the screen size.  Use the
-       use_tioctl function to update COLUMNS or LINES to match the screen size
-       obtained from system calls or the terminal database.
-
-
-

                  ESCDELAY

                  -       Specifies the total time, in milliseconds, for which ncurses will await
-       a  character  sequence,  e.g., a function key.  The default value, 1000
-       milliseconds, is enough for most uses.  However, it is made a  variable
-       to accommodate unusual applications.
+       The  following  symbols  from  the  process  environment  customize the
+       runtime  behavior  of  ncurses  applications.   The  library   may   be
+       configured   to   disregard   the  variables  TERMINFO,  TERMINFO_DIRS,
+       TERMPATH, and HOME, if  the  user  is  the  superuser  (root),  or  the
+       application uses setuid(2) or setgid(2).
+
+
+

                  BAUDRATE

                  +       The  debugging  library  checks  this variable when the application has
+       redirected output to a file.  ncurses interprets its integral value  as
+       the  terminal's line speed in bits per second.  If that value is absent
+       or invalid, ncurses uses  9600.   This  feature  allows  developers  to
+       construct  repeatable  test  cases  that take into account optimization
+       decisions that depend on the terminal's line speed.
+
+
+

                  CC (command character)

                  +       When set, the command_character  (cmdch)  capability  value  of  loaded
+       terminfo entries changes to the value of this variable.  Very few term-
+       info entries provide this feature.
+
+       Because this name is also used in development environments to store the
+       C compiler's name, ncurses ignores its value if it is not one character
+       in length.
+
+
+

                  COLUMNS

                  +       This  variable  specifies  the  width  of  the  screen  in  characters.
+       Applications  running  in  a  windowing environment usually are able to
+       obtain the width of the window in which they  are  executing.   ncurses
+       enforces  an  upper limit of 512 when reading the value.  If COLUMNS is
+       not defined and the terminal's screen size is not  available  from  the
+       terminal  driver, ncurses uses the size specified by the columns (cols)
+       capability of the terminal type's entry in the  terminfo  database,  if
+       any.
+
+       It  is  important  that  your  application use the correct screen size.
+       Automatic  detection  thereof  is  not  always  possible   because   an
+       application  may  be  running  on  a  host  that  does  not  honor NAWS
+       (Negotiations About Window Size) or as a different  user  ID  than  the
+       owner  of  the  terminal  device  file.   Setting  COLUMNS and/or LINES
+       overrides the library's use  of  the  screen  size  obtained  from  the
+       operating system.
+
+       The  COLUMNS  and LINES variables may be specified independently.  This
+       property is useful to circumvent misfeatures of  legacy  terminal  type
+       descriptions;  xterm(1)  descriptions  specifying  65  lines  were once
+       notorious.   For  best  results,  avoid  specifying  cols   and   lines
+       capability codes in terminfo descriptions of terminal emulators.
+
+       use_env(3x)  can  disable use of the process environment in determining
+       the screen size.  use_tioctl(3x) can update COLUMNS and LINES to  match
+       the screen size obtained from system calls or the terminal database.
+
+
+

                  ESCDELAY

                  +       For  curses  to  distinguish  the ESC character resulting from a user's
+       press of the "Escape" key on the input device  from  one  beginning  an
+       escape sequence (as commonly produced by function keys), it waits after
+       receiving the  escape  character  to  see  if  further  characters  are
+       available  on  the  input  stream  within  a  short interval.  A global
+       variable ESCDELAY stores this interval in  milliseconds.   The  default
+       value of 1000 (one second) is adequate for most uses.  This environment
+       variable overrides it; ncurses enforces an upper limit  of  30,000  (30
+       seconds) when reading the value.
 
        The  most common instance where you may wish to change this value is to
-       work with slow hosts, e.g., running on a network.  If the  host  cannot
-       read  characters rapidly enough, it will have the same effect as if the
-       terminal did not send characters  rapidly  enough.   The  library  will
-       still see a timeout.
-
-       Note  that  xterm  mouse  events  are built up from character sequences
-       received from the xterm.   If  your  application  makes  heavy  use  of
-       multiple-clicking,  you may wish to lengthen this default value because
-       the timeout applies to the composed multi-click event as  well  as  the
-       individual clicks.
-
-       In addition to the environment variable, this implementation provides a
-       global variable with the same name.  Portable applications  should  not
-       rely  upon  the  presence  of  ESCDELAY in either form, but setting the
-       environment variable rather than the global variable  does  not  create
-       problems when compiling an application.
-
-
-

                  HOME

                  -       Tells  ncurses where your home directory is.  That is where it may read
-       and write auxiliary terminal descriptions:
-
-           $HOME/.termcap
-           $HOME/.terminfo
-
-
-

                  LINES

                  -       Like COLUMNS, specify the height of  the  screen  in  characters.   See
-       COLUMNS for a detailed description.
-
-
-

                  MOUSE_BUTTONS_123

                  -       This  applies  only  to  the  OS/2 EMX port.  It specifies the order of
-       buttons on the mouse.  OS/2 numbers  a  3-button  mouse  inconsistently
-       from other platforms:
-
-           1 = left
-           2 = right
-           3 = middle.
-
-       This variable lets you customize the mouse.  The variable must be three
-       numeric digits 1-3 in any order, e.g.,  123  or  321.   If  it  is  not
-       specified, ncurses uses 132.
-
-
-

                  NCURSES_ASSUMED_COLORS

                  -       Override  the compiled-in assumption that the terminal's default colors
-       are  white-on-black  (see  default_colors(3x)).   You   may   set   the
-       foreground  and  background color values with this environment variable
-       by proving a 2-element list: foreground,background.   For  example,  to
-       tell  ncurses  to  not  assume  anything  about the colors, set this to
-       "-1,-1".  To make it green-on-black, set it  to  "2,0".   Any  positive
-       value from zero to the terminfo max_colors value is allowed.
-
-
-

                  NCURSES_CONSOLE2

                  -       This applies only to the MinGW port of ncurses.
-
-       The  Console2  program's  handling  of  the  Microsoft Console API call
-       CreateConsoleScreenBuffer is defective.  Applications  which  use  this
-       will hang.  However, it is possible to simulate the action of this call
-       by mapping coordinates, explicitly saving and  restoring  the  original
-       screen  contents.   Setting the environment variable NCGDB has the same
-       effect.
-
-
-

                  NCURSES_GPM_TERMS

                  -       This applies only to ncurses configured to use the GPM interface.
-
-       If present, the environment variable is a list of one or more  terminal
-       names  against which the TERM environment variable is matched.  Setting
-       it to an empty value disables the GPM  interface;  using  the  built-in
-       support for xterm, etc.
-
-       If the environment variable is absent, ncurses will attempt to open GPM
-       if TERM contains "linux".
-
-
-

                  NCURSES_NO_HARD_TABS

                  -       Ncurses may use tabs as part of the cursor movement  optimization.   In
-       some  cases,  your  terminal driver may not handle these properly.  Set
-       this environment variable to disable the feature.  You can also  adjust
-       your stty(1) settings to avoid the problem.
-
-
-

                  NCURSES_NO_MAGIC_COOKIE

                  -       Some  terminals  use  a  magic-cookie  feature  which  requires special
-       handling to  make  highlighting  and  other  video  attributes  display
-       properly.   You  can  suppress  the  highlighting  entirely  for  these
-       terminals by setting this environment variable.
-
-
-

                  NCURSES_NO_PADDING

                  -       Most of the terminal descriptions in the terminfo database are  written
-       for  real  "hardware"  terminals.   Many  people use terminal emulators
-       which run in a windowing environment and use curses-based applications.
-       Terminal  emulators  can  duplicate  all  of the important aspects of a
-       hardware terminal, but they do not  have  the  same  limitations.   The
-       chief  limitation  of  a  hardware terminal from the standpoint of your
-       application is the management of  dataflow,  i.e.,  timing.   Unless  a
-       hardware  terminal  is  interfaced  into a terminal concentrator (which
-       does flow control), it (or  your  application)  must  manage  dataflow,
-       preventing  overruns.   The cheapest solution (no hardware cost) is for
-       your program to do this by pausing after operations that  the  terminal
-       does slowly, such as clearing the display.
-
-       As  a  result,  many  terminal  descriptions (including the vt100) have
-       delay times embedded.  You may wish to use these descriptions, but  not
-       want to pay the performance penalty.
-
-       Set  the  NCURSES_NO_PADDING  environment  variable  to disable all but
-       mandatory padding.  Mandatory padding is used  as  a  part  of  special
-       control sequences such as flash.
-
-
-

                  NCURSES_NO_SETBUF

                  -       This setting is obsolete.  Before changes
-
-          o   started with 5.9 patch 20120825 and
-
-          o   continued though 5.9 patch 20130126
-
-       ncurses  enabled  buffered output during terminal initialization.  This
-       was done (as in SVr4 curses)  for  performance  reasons.   For  testing
-       purposes,  both  of  ncurses and certain applications, this feature was
-       made optional.  Setting the NCURSES_NO_SETBUF variable disabled  output
-       buffering,  leaving  the output in the original (usually line buffered)
-       mode.
-
-       In the current implementation, ncurses performs its own  buffering  and
-       does  not require this workaround.  It does not modify the buffering of
-       the standard output.
-
-       The reason for the change was to make the behavior for  interrupts  and
-       other   signals   more   robust.    One   drawback   is   that  certain
-       nonconventional programs would mix ordinary stdio  calls  with  ncurses
-       calls  and (usually) work.  This is no longer possible since ncurses is
-       not using the buffered standard output but its own output (to the  same
-       file  descriptor).  As a special case, the low-level calls such as putp
-       still use the standard output.  But high-level curses calls do not.
-
-
-

                  NCURSES_NO_UTF8_ACS

                  -       During initialization, the ncurses library  checks  for  special  cases
-       where VT100 line-drawing (and the corresponding alternate character set
-       capabilities) described in  the  terminfo  are  known  to  be  missing.
-       Specifically,  when  running  in  a  UTF-8  locale,  the  Linux console
-       emulator and the GNU screen program ignore these.  Ncurses  checks  the
-       TERM  environment  variable  for  these.   For other special cases, you
-       should set this environment variable.  Doing this tells ncurses to  use
-       Unicode values which correspond to the VT100 line-drawing glyphs.  That
-       works for the special cases cited, and is likely to work  for  terminal
-       emulators.
-
-       When  setting  this  variable,  you  should  set it to a nonzero value.
-       Setting it to zero (or to a nonnumber) disables the special  check  for
-       "linux" and "screen".
-
-       As  an  alternative  to the environment variable, ncurses checks for an
-       extended terminfo capability U8.  This is a  numeric  capability  which
-       can be compiled using tic -x.  For example
+       work with a remote host over a slow communication channel.  If the host
+       running  a  curses  application  does  not receive the characters of an
+       escape sequence in a timely manner, the library can interpret  them  as
+       multiple key stroke events.
+
+       xterm(1) mouse events are a form of escape sequence; therefore, if your
+       application makes heavy use  of  multiple-clicking,  you  may  wish  to
+       lengthen  the  default value because the delay applies to the composite
+       multi-click event as well as the individual clicks.
+
+       Portable applications should not rely upon the presence of ESCDELAY  in
+       either  form,  but  setting  the  environment  variable rather than the
+       global variable does not create problems when compiling an application.
+
+       If keypad(3x) is disabled for the  curses  window  receiving  input,  a
+       program must disambiguate escape sequences itself.
+
+
+

                  HOME

                  +       ncurses  may read and write auxiliary terminal descriptions in .termcap
+       and .terminfo files in the user's home directory.
+
+
+

                  LINES

                  +       This counterpart to COLUMNS specifies  the  height  of  the  screen  in
+       characters.   The  corresponding terminfo capability and code is lines.
+       See the description of the COLUMNS variable above.
+
+
+

                  MOUSE_BUTTONS_123

                  +       (OS/2 EMX port only) OS/2 numbers a three-button  mouse  inconsistently
+       with  other platforms, such that 1 is the left button, 2 the right, and
+       3 the middle.  This variable customizes  the  mouse  button  numbering.
+       Its  value  must be three digits 1-3 in any order.  By default, ncurses
+       assumes a numbering of "132".
+
+
+

                  NCURSES_ASSUMED_COLORS

                  +       If set, this  variable  overrides  the  ncurses  library's  compiled-in
+       assumption  that  the terminal's default colors are white on black; see
+       default_colors(3x).  Set the foreground  and  background  color  values
+       with  this  environment  variable  by  assigning  it two integer values
+       separated  by  a  comma,  indicating  foregound  and  background  color
+       numbers, respectively.
+
+       For  example,  to tell ncurses not to assume anything about the colors,
+       use a value of "-1,-1".  To make the  default  color  scheme  green  on
+       black,  use  "2,0".   ncurses accepts integral values from -1 up to the
+       value of the terminfo max_colors (colors) capability.
+
+
+

                  NCURSES_CONSOLE2

                  +       (MinGW  port  only)  The  Console2  program  defectively  handles   the
+       Microsoft  Console  API  call  CreateConsoleScreenBuffer.  Applications
+       that use it will hang.  However, it is possible to simulate the  action
+       of  this  call  by mapping coordinates, explicitly saving and restoring
+       the original screen contents.  Setting the environment  variable  NCGDB
+       has the same effect.
+
+
+

                  NCURSES_GPM_TERMS

                  +       (Linux  only) When ncurses is configured to use the GPM interface, this
+       variable may list  one  or  more  terminal  type  names,  delimited  by
+       vertical  bars  (|) or colons (:), against which the TERM variable (see
+       below) is matched.  An empty value disables the  GPM  interface,  using
+       ncurses's  built-in  support  for xterm(1) mouse protocols instead.  If
+       the variable is absent, ncurses attempts to open GPM if  TERM  contains
+       "linux".
+
+
+

                  NCURSES_NO_HARD_TABS

                  +       ncurses  may  use  tab  characters in cursor movement optimization.  In
+       some cases, your terminal driver may not  handle  them  properly.   Set
+       this environment variable to any value to disable the feature.  You can
+       also adjust your stty(1) settings to avoid the problem.
+
+
+

                  NCURSES_NO_MAGIC_COOKIE

                  +       Many terminals store video attributes as  a  property  of  a  character
+       cell,  as  curses  does.   Historically, some recorded changes in video
+       attributes as data that  logically  occupies  character  cells  on  the
+       display,  switching attributes on or off, similarly to tags in a markup
+       language; these are termed "magic cookies", and  must  be  subsequently
+       overprinted.   If  the  terminfo  entry for your terminal type does not
+       adequately describe its handling of magic cookies, set this variable to
+       any value to instruct ncurses to disable attributes entirely.
+
+
+

                  NCURSES_NO_PADDING

                  +       Most  terminal  type  descriptions  in  the  terminfo  database  detail
+       hardware  devices.   Many  people  use  curses-based  applications   in
+       terminal  emulator programs that run in a windowing environment.  These
+       programs can duplicate all of the  important  features  of  a  hardware
+       terminal,  but  often lack their limitations.  Chief among these absent
+       drawbacks is the problem of data flow management; that is, limiting the
+       speed  of  communication  to  what the hardware could handle.  Unless a
+       hardware terminal is interfaced into  a  terminal  concentrator  (which
+       does  flow  control), an application must manage flow itself to prevent
+       overruns and data loss.
+
+       A solution that comes at no hardware cost  is  for  an  application  to
+       pause  after  directing  a  terminal  to  execute  an operation that it
+       performs slowly, such as clearing  the  display.   Many  terminal  type
+       descriptions,  including that for the VT100, embed delay specifications
+       in capabilities.  You may  wish  to  use  these  terminal  descriptions
+       without  paying the performance penalty.  Set NCURSES_NO_PADDING to any
+       value to disable all but mandatory padding.  Mandatory padding is  used
+       by such terminal capabilities as flash_screen (flash).
+
+
+

                  NCURSES_NO_SETBUF

                  +       (Obsolete)  Prior to internal changes developed in ncurses 5.9 (patches
+       20120825 through 20130126), the library used setbuf(3) to enable  fully
+       buffered  output  when initializing the terminal.  This was done, as in
+       SVr4 curses, to increase performance.  For testing  purposes,  both  of
+       ncurses  and  of  certain applications, this feature was made optional.
+       Setting this variable disabled output  buffering,  leaving  the  output
+       stream in the original (usually line-buffered) mode.
+
+       Nowadays,  ncurses performs its own buffering and does not require this
+       workaround; it does not modify the buffering  of  the  standard  output
+       stream.   This  approach makes signal handling, as for interrupts, more
+       robust.  A drawback  is  that  certain  unconventional  programs  mixed
+       stdio(3)  calls  with ncurses calls and (usually) got the behavior they
+       expected.  This is no longer the case; ncurses does not  write  to  the
+       standard output file descriptor through a stdio-buffered stream.
+
+       As  a  special case, low-level API calls such as putp(3x) still use the
+       standard output stream.  High-level curses calls such as printw(3x)  do
+       not.
+
+
+

                  NCURSES_NO_UTF8_ACS

                  +       At  initialization,  ncurses inspects the TERM environment variable for
+       special  cases  where   VT100   forms-drawing   characters   (and   the
+       corresponding  alternate character set terminfo capabilities) are known
+       to  be  unsupported  by  terminal  types  that  otherwise  claim  VT100
+       compatibility.  Specifically, when running in a UTF-8 locale, the Linux
+       virtual console device and the GNU screen(1) program ignore them.   Set
+       this  variable  to  a  nonzero  value  to  instruct  ncurses  that  the
+       terminal's ACS support is broken; the library then outputs Unicode code
+       points that correspond to the forms-drawing characters.  Set it to zero
+       (or a non-integer) to disable the special check for terminal type names
+       matching  "linux" or "screen", directing ncurses to assume that the ACS
+       feature works if the terminal type description advertises it.
+
+       As an alternative to use  of  this  variable,  ncurses  checks  for  an
+       extended terminfo numeric capability U8 that can be compiled using "tic
+       -x".  Examples follow.
 
           # linux console, if patched to provide working
           # VT100 shift-in/shift-out, with corresponding font.
@@ -1001,170 +1048,140 @@ 
                  ncurses 3x
                  
           xterm-utf8|xterm relying on UTF-8 line-graphics,
                   U8#1, use=xterm,
 
-       The  name  "U8" is chosen to be two characters, to permit it to be used
-       by applications that use ncurses' termcap interface.
-
-
-

                  NCURSES_TRACE

                  -       During  initialization,  the  ncurses  debugging  library  checks   the
-       NCURSES_TRACE  environment  variable.   If  it is defined, to a numeric
-       value, ncurses calls the  trace  function,  using  that  value  as  the
-       argument.
-
-       The  argument  values,  which  are defined in curses.h, provide several
-       types  of  information.   When  running  with  traces   enabled,   your
-       application will write the file trace to the current directory.
-
-       See curs_trace(3x) for more information.
-
-
-

                  TERM

                  -       Denotes  your  terminal  type.   Each terminal type is distinct, though
-       many are similar.
-
-       TERM is commonly set by terminal emulators to help applications find  a
-       workable   terminal  description.   Some  of  those  choose  a  popular
-       approximation, e.g., "ansi", "vt100", "xterm" rather than an exact fit.
-       Not  infrequently,  your  application  will  have  problems  with  that
-       approach, e.g., incorrect function-key definitions.
-
-       If you set TERM in your environment, it has no effect on the  operation
-       of  the  terminal  emulator.  It only affects the way applications work
-       within the terminal.  Likewise, as a general  rule  (xterm(1)  being  a
-       rare  exception), terminal emulators which allow you to specify TERM as
-       a parameter or configuration value do  not  change  their  behavior  to
-       match that setting.
-
-
-

                  TERMCAP

                  -       If  the  ncurses  library  has  been  configured  with termcap support,
-       ncurses will check for a terminal's description in termcap form  if  it
-       is not available in the terminfo database.
-
-       The TERMCAP environment variable contains either a terminal description
-       (with newlines  stripped  out),  or  a  file  name  telling  where  the
-       information denoted by the TERM environment variable exists.  In either
-       case, setting it directs ncurses to ignore the  usual  place  for  this
-       information, e.g., /etc/termcap.
-
-
-

                  TERMINFO

                  -       ncurses  can  be  configured  to read from multiple terminal databases.
-       The TERMINFO variable overrides the location for the  default  terminal
-       database.   Terminal  descriptions  (in  terminal format) are stored in
-       terminal databases:
-
-       o   Normally these are stored in a directory tree, using subdirectories
-           named by the first letter of the terminal names therein.
+       The two-character name "U8" was chosen to permit its use via  ncurses's
+       termcap interface.
 
-           This is the scheme used in System V, which legacy Unix systems use,
-           and the TERMINFO variable is used by curses applications  on  those
-           systems to override the default location of the terminal database.
 
-       o   If  ncurses  is  built  to use hashed databases, then each entry in
-           this list may be the path of a hashed database file, e.g.,
+

                  NCURSES_TRACE

                  +       At  initialization, ncurses (in its debugging configuration) checks for
+       this variable's presence.  If  defined  with  an  integral  value,  the
+       library calls curses_trace(3x) with that value as the argument.
 
-               /usr/share/terminfo.db
 
-           rather than
+

                  TERM

                  +       The  TERM variable denotes the terminal type.  Each is distinct, though
+       many are similar.  It is commonly set by  terminal  emulators  to  help
+       applications  find  a  workable  terminal  description.   Some choose a
+       popular approximation such as "ansi", "vt100", or "xterm"  rather  than
+       an  exact  fit to their capabilities.  Not infrequently, an application
+       will have problems with that approach; for example, a  key  stroke  may
+       not  operate  correctly,  or  produce  no  effect  but  seeming garbage
+       characters on the screen.
 
-               /usr/share/terminfo/
+       Setting TERM has no effect on hardware operation; it  affects  the  way
+       applications  communicate  with  the  terminal.  Likewise, as a general
+       rule (xterm(1) being a rare exception), terminal emulators  that  allow
+       you to specify TERM as a parameter or configuration value do not change
+       their behavior to match that setting.
 
-           The hashed database uses less disk-space and  is  a  little  faster
-           than  the  directory  tree.   However, some applications assume the
-           existence of the directory tree, reading it  directly  rather  than
-           using the terminfo library calls.
 
-       o   If  ncurses  is  built  with  a  support  for reading termcap files
-           directly, then an entry in this list may be the path of  a  termcap
-           file.
+

                  TERMCAP

                  +       If ncurses is configured with termcap support, it checks for a terminal
+       type  description  in  termcap  format if one in terminfo format is not
+       available.  Setting this variable directs ncurses to ignore  the  usual
+       termcap  database  location, /etc/termcap; see TERMPATH below.  TERMCAP
+       should contain either a terminal description  (with  newlines  stripped
+       out),  or  a file name indicating where the information required by the
+       TERM environment variable is stored.
 
-       o   If the TERMINFO variable begins with "hex:" or "b64:", ncurses uses
-           the remainder of that variable as a compiled terminal  description.
-           You might produce the base64 format using infocmp(1m):
 
-               TERMINFO="$(infocmp -0 -Q2 -q)"
-               export TERMINFO
+

                  TERMINFO

                  +       ncurses can be configured to read terminal type  description  databases
+       in  various locations using different formats.  This variable overrides
+       the default location.
 
-           The  compiled description is used if it corresponds to the terminal
-           identified by the TERM variable.
+       o   Descriptions in terminfo format are normally stored in a  directory
+           tree using subdirectories named for the common first letters of the
+           terminal types named therein.  This is the scheme used in System V.
 
-       Setting TERMINFO is the simplest, but not the only way to set  location
-       of  the  default  terminal  database.   The  complete  list of database
-       locations in order follows:
+       o   If ncurses is configured to use hashed databases, then TERMINFO may
+           name  its  location,  such  as  /usr/share/terminfo.db, rather than
+           /usr/share/terminfo/.
 
-          o   the last terminal database to which ncurses wrote,  if  any,  is
-              searched first
+       The hashed database uses less disk space and is a  little  faster  than
+       the directory tree.  However, some applications assume the existence of
+       the directory tree, and read it directly rather than using the terminfo
+       API.
 
-          o   the location specified by the TERMINFO environment variable
+       o   If  ncurses  is  configured with termcap support, this variable may
+           contain the location of a termcap file.
 
-          o   $HOME/.terminfo
+       o   If the value of TERMINFO begins with "hex:" or "b64:", ncurses uses
+           the remainder of the value as a compiled terminfo description.  You
+           might produce the base64 format using infocmp(1m).
 
-          o   locations listed in the TERMINFO_DIRS environment variable
+                  TERMINFO=$(infocmp -0 -Q2 -q)
+                  export TERMINFO
 
-          o   one  or  more  locations whose names are configured and compiled
-              into the ncurses library, i.e.,
+           The compiled description is used only  if  it  corresponds  to  the
+           terminal type identified by TERM.
 
-             o   no  default  value  (corresponding   to   the   TERMINFO_DIRS
-                 variable)
+       Setting  TERMINFO  is  the  simplest,  but  not the only, way to direct
+       ncurses to a terminal database.  The search path is as follows.
 
-             o   /usr/share/terminfo (corresponding to the TERMINFO variable)
+       o   the last terminal database to which the running ncurses application
+           wrote, if any
 
+       o   the location specified by the TERMINFO environment variable
 
-

                  TERMINFO_DIRS

                  -       Specifies  a  list  of  locations  to search for terminal descriptions.
-       Each location in the list is a terminal database as  described  in  the
-       section  on  the  TERMINFO  variable.   The list is separated by colons
-       (i.e., ":") on Unix, semicolons on OS/2 EMX.
+       o   $HOME/.terminfo
 
-       There is no corresponding feature  in  System  V  terminfo;  it  is  an
-       extension developed for ncurses.
+       o   locations listed in the TERMINFO_DIRS environment variable
 
+       o   location(s) configured and compiled into ncurses
 
-

                  TERMPATH

                  -       If  TERMCAP  does not hold a file name then ncurses checks the TERMPATH
-       environment variable.  This is a list of filenames separated by  spaces
-       or colons (i.e., ":") on Unix, semicolons on OS/2 EMX.
+           o   /usr/share/terminfo
 
-       If  the  TERMPATH environment variable is not set, ncurses looks in the
-       files
 
-           /etc/termcap, /usr/share/misc/termcap and $HOME/.termcap,
+

                  TERMINFO_DIRS

                  +       This  variable  specifies  a  list of locations, akin to PATH, in which
+       ncurses searches  for  the  terminal  type  descriptions  described  by
+       TERMINFO  above.   The  list  items are separated by colons on Unix and
+       semicolons on  OS/2  EMX.   System V  terminfo  lacks  a  corresponding
+       feature; TERMINFO_DIRS is an ncurses extension.
 
-       in that order.
 
-       The library may be configured to disregard the following variables when
-       the  current  user  is the superuser (root), or if the application uses
-       setuid or setgid permissions:
+

                  TERMPATH

                  +       If TERMCAP does not hold a terminal type description or file name, then
+       ncurses checks the contents of TERMPATH, a list of locations,  akin  to
+       PATH, in which it searches for termcap terminal type descriptions.  The
+       list items are separated by colons on Unix and semicolons on OS/2 EMX.
 
-           $TERMINFO, $TERMINFO_DIRS, $TERMPATH, as well as $HOME.
+       If both TERMCAP and TERMPATH are unset or invalid, ncurses searches for
+       the files /etc/termcap, /usr/share/misc/termcap, and $HOME/.termcap, in
+       that order.

                  ALTERNATE CONFIGURATIONS

                  -       Several  different  configurations  are  possible,  depending  on   the
-       configure  script  options used when building ncurses.  There are a few
-       main options whose effects are visible to  the  applications  developer
-       using ncurses:
+       Many different ncurses configurations are possible, determined  by  the
+       options  given  to the configure script when building the library.  Run
+       the script with the --help option to peruse them all.   A  few  are  of
+       particular significance to the application developer employing ncurses.
 
-       --disable-overwrite
-            The standard include for ncurses is as noted in SYNOPSIS:
+       --disable-overwrite
+            The standard C preprocessor inclusion for the curses library is as
+            follows.
 
                 #include <curses.h>
 
-            This  option  is  used to avoid filename conflicts when ncurses is
-            not the main implementation of curses of the computer.  If ncurses
-            is  installed  disabling  overwrite,  it  puts  its  headers  in a
-            subdirectory, e.g.,
+            This option is used to avoid file name conflicts  between  ncurses
+            and  an existing curses installation on the system.  If ncurses is
+            installed disabling overwrite, it  puts  its  header  files  in  a
+            subdirectory.  Here is an example.
 
                 #include <ncurses/curses.h>
 
-            It also omits a  symbolic  link  which  would  allow  you  to  use
-            -lcurses to build executables.
+            Installation  also  omits  a  symbolic  link  that would cause the
+            compiler's -lcurses option  to  link  object  files  with  ncurses
+            instead of the system curses library.
 
-       --enable-widec
-            The   configure   script   renames   the   library   and  (if  the
-            --disable-overwrite option is used) puts the  header  files  in  a
-            different  subdirectory.   All  of  the  library  names have a "w"
+            The  directory  used  by this configuration of ncurses is shown in
+            section "SYNOPSIS" above.
+
+       --enable-widec
+            The  configure  script   renames   the   library   and   (if   the
+            --disable-overwrite  option  is  used)  puts the header files in a
+            different subdirectory.  All of  the  library  names  have  a  "w"
             appended to them, i.e., instead of
 
                 -lncurses
@@ -1173,301 +1190,304 @@ 
                  ncurses 3x
                  
 
                 -lncursesw
 
-            You must also enable the wide-character  features  in  the  header
-            file  when  compiling  for  the  wide-character library to use the
-            extended (wide-character) functions.   The  symbol  which  enables
-            these features has changed since XSI Curses, Issue 4:
+            You  must  also  enable  the wide-character features in the header
+            file when compiling for the  wide-character  library  to  use  the
+            extended  (wide-character)  functions.   The  symbol which enables
+            these features has changed since X/Open Curses Issue 4:
 
-            o   Originally,  the  wide-character  feature  required the symbol
+            o   Originally, the wide-character  feature  required  the  symbol
                 _XOPEN_SOURCE_EXTENDED  but  that  was  only  valid  for  XPG4
                 (1996).
 
-            o   Later,  that was deemed conflicting with _XOPEN_SOURCE defined
+            o   Later, that was deemed conflicting with _XOPEN_SOURCE  defined
                 to 500.
 
-            o   As of mid-2018, none of the features  in  this  implementation
-                require  a  _XOPEN_SOURCE  feature greater than 600.  However,
-                X/Open Curses, Issue 7 (2009) recommends defining it to 700.
+            o   As  of  mid-2018,  none of the features in this implementation
+                require a _XOPEN_SOURCE feature greater  than  600.   However,
+                X/Open Curses Issue 7 (2009) recommends defining it to 700.
 
-            o   Alternatively,  you  can  enable  the  feature   by   defining
-                NCURSES_WIDECHAR  with  the caveat that some other header file
-                than curses.h may require a specific value  for  _XOPEN_SOURCE
+            o   Alternatively,   you   can  enable  the  feature  by  defining
+                NCURSES_WIDECHAR with the caveat that some other  header  file
+                than  curses.h  may require a specific value for _XOPEN_SOURCE
                 (or a system-specific symbol).
 
-            The  curses.h  file  which  is  installed  for  the wide-character
-            library is designed to be compatible  with  the  normal  library's
-            header.   Only  the size of the WINDOW structure differs, and very
-            few applications require more than a pointer to WINDOWs.
+            The curses.h header file installed for the wide-character  library
+            is  designed  to be compatible with the non-wide library's header.
+            Only the size of the WINDOW structure  differs;  few  applications
+            require more than pointers to WINDOWs.
 
             If  the  headers  are  installed  allowing  overwrite,  the  wide-
-            character  library's  headers  should  be installed last, to allow
+            character library's headers should be  installed  last,  to  allow
             applications to be built using either library from the same set of
             headers.
 
-       --with-pthread
-            The  configure  script  renames  the  library.  All of the library
-            names have a "t"  appended  to  them  (before  any  "w"  added  by
+       --with-pthread
+            The configure script renames the  library.   All  of  the  library
+            names  have  a  "t"  appended  to  them  (before  any "w" added by
             --enable-widec).
 
             The global variables such as LINES are replaced by macros to allow
             read-only access.  At the same time, setter-functions are provided
-            to  set  these  values.   Some applications (very few) may require
+            to set these values.  Some applications  (very  few)  may  require
             changes to work with this convention.
 
-       --with-shared
-
-       --with-normal
-
-       --with-debug
-
-       --with-profile
-            The shared and normal  (static)  library  names  differ  by  their
-            suffixes,  e.g.,  libncurses.so  and  libncurses.a.  The debug and
-            profiling libraries add a "_g"  and  a  "_p"  to  the  root  names
+       --with-shared
+       --with-normal
+       --with-debug
+       --with-profile
+            The  shared  and  normal  (static)  library  names differ by their
+            suffixes, e.g., libncurses.so and  libncurses.a.   The  debug  and
+            profiling  libraries  add  a  "_g"  and  a  "_p" to the root names
             respectively, e.g., libncurses_g.a and libncurses_p.a.
 
-       --with-termlib
-            Low-level  functions  which do not depend upon whether the library
+       --with-termlib
+            Low-level functions which do not depend upon whether  the  library
             supports wide-characters, are provided in the tinfo library.
 
-            By doing this, it is possible to share the tinfo  library  between
-            wide/normal  configurations  as  well  as  reduce  the size of the
+            By  doing  this, it is possible to share the tinfo library between
+            wide/normal configurations as well  as  reduce  the  size  of  the
             library when only low-level functions are needed.
 
             Those functions are described in these pages:
 
-            o   curs_extend(3x) - miscellaneous curses extensions
+            o   curs_extend(3x) - miscellaneous curses extensions
 
-            o   curs_inopts(3x) - curses input options
+            o   curs_inopts(3x) - curses input options
 
-            o   curs_kernel(3x) - low-level curses routines
+            o   curs_kernel(3x) - low-level curses routines
 
-            o   curs_termattrs(3x) - curses environment query routines
+            o   curs_termattrs(3x) - curses environment query routines
 
-            o   curs_termcap(3x) - curses emulation of termcap
+            o   curs_termcap(3x) - curses emulation of termcap
 
-            o   curs_terminfo(3x) - curses interfaces to terminfo database
+            o   curs_terminfo(3x) - curses interface to terminfo database
 
-            o   curs_util(3x) - miscellaneous curses utility routines
+            o   curs_util(3x) - miscellaneous curses utility routines
 
-       --with-trace
-            The trace function normally resides in the debug library,  but  it
-            is  sometimes  useful  to  configure  this  in the shared library.
+       --with-trace
+            The  trace  function normally resides in the debug library, but it
+            is sometimes useful to  configure  this  in  the  shared  library.
             Configure scripts should check for the function's existence rather
             than assuming it is always in the debug library.

                  FILES

                  -       /usr/share/tabset
-            directory   containing   initialization  files  for  the  terminal
-            capability  database   /usr/share/terminfo   terminal   capability
-            database
+       /usr/share/tabset
+              tab stop initialization database
 
+       /usr/share/terminfo
+              compiled terminal capability database
 
-

                  SEE ALSO

                  -       terminfo(5)  and  related  pages whose names begin "curs_" for detailed
-       routine descriptions.
-       curs_variables(3x)
-       user_caps(5) for user-defined capabilities
+
+

                  NOTES

                  +       X/Open Curses permits most functions it specifies to be made  available
+       as macros as well.  ncurses does so
+
+       o   for functions that return values via their parameters,
+
+       o   to support obsolete features,
+
+       o   to  reuse functions (for example, those that move the cursor before
+           another operation), and
+
+       o   in a few special cases.
+
+       If the standard  output  file  descriptor  of  an  ncurses  program  is
+       redirected  to  something  that  is  not a terminal device, the library
+       writes screen updates to the standard error file descriptor.  This  was
+       an undocumented feature of SVr3 curses.
+
+       See  subsection  "Header  Files"  below  regarding  symbols  exposed by
+       inclusion of curses.h.

                  EXTENSIONS

                  -       The ncurses library can be compiled with an option (-DUSE_GETCAP)  that
-       falls  back  to  the  old-style /etc/termcap file if the terminal setup
-       code cannot find a terminfo entry corresponding to TERM.  Use  of  this
-       feature  is  not  recommended,  as  it  essentially  includes an entire
-       termcap compiler in the ncurses startup code, at  significant  cost  in
-       core and startup cycles.
-
-       The  ncurses  library includes facilities for capturing mouse events on
-       certain terminals (including xterm).   See  the  curs_mouse(3x)  manual
-       page for details.
-
-       The  ncurses  library  includes  facilities  for  responding  to window
-       resizing  events,  e.g.,  when  running   in   an   xterm.    See   the
-       resizeterm(3x)  and wresize(3x) manual pages for details.  In addition,
-       the library may be configured with a SIGWINCH handler.
-
-       The ncurses library extends the fixed set of function key  capabilities
-       of  terminals by allowing the application designer to define additional
-       key sequences at runtime.  See the define_key(3x) key_defined(3x),  and
-       keyok(3x) manual pages for details.
-
-       The  ncurses  library  can  exploit the capabilities of terminals which
-       implement the ISO-6429 SGR 39 and  SGR  49  controls,  which  allow  an
-       application  to  reset  the  terminal  to  its  original foreground and
-       background colors.  From the users'  perspective,  the  application  is
-       able  to  draw  colored  text  on  a  background  whose  color  is  set
-       independently, providing better control over color contrasts.  See  the
-       default_colors(3x) manual page for details.
+       ncurses enables an application  to  capture  mouse  events  on  certain
+       terminals, including xterm(1); see curs_mouse(3x).
 
-       The  ncurses  library  includes  a  function  for directing application
-       output  to  a  printer  attached  to  the  terminal  device.   See  the
-       curs_print(3x) manual page for details.
+       ncurses  provides  a  means of responding to window resizing events, as
+       when running in a GUI terminal emulator application such as xterm;  see
+       resizeterm(3x) and wresize(3x).
 
+       ncurses allows an application to query the terminal for the presence of
+       a wide variety of special keys; see has_key(3x).
 
-

                  PORTABILITY

                  -       The  ncurses  library  is intended to be BASE-level conformant with XSI
-       Curses.   The  EXTENDED  XSI  Curses  functionality  (including   color
-       support) is supported.
+       ncurses extends the fixed set of function key capabilities specified by
+       X/Open   Curses  by  allowing  the  application  programmer  to  define
+       additional key events at runtime; see define_key(3x),  key_defined(3x),
+       keybound(3x), and keyok(3x).
 
-       A  small  number  of local differences (that is, individual differences
-       between the XSI Curses and ncurses calls) are described in  PORTABILITY
-       sections of the library man pages.
+       ncurses   can   exploit  the  capabilities  of  terminals  implementing
+       ISO 6429/ECMA-48  SGR 39  and  SGR 49   sequences,   which   allow   an
+       application  to  reset  the  terminal  to  its  original foreground and
+       background colors.  From a user's perspective, the application is  able
+       to  draw colored text on a background whose color is set independently,
+       providing better control over color contrasts.  See default_colors(3x).
 
+       An ncurses application  can  eschew  knowledge  of  SCREEN  and  WINDOW
+       structure   internals,   instead   using  accessor  functions  such  as
+       is_cbreak(3x) and is_scrollok(3x).
 
-

                  Error checking

                  -       In  many cases, X/Open Curses is vague about error conditions, omitting
-       some of the SVr4 documentation.
+       ncurses enables an application  to  direct  its  output  to  a  printer
+       attached to the terminal device; see curs_print(3x).
+
+       ncurses  offers slk_attr(3x) as a counterpart of attr_get(3x) for soft-
+       label key lines, and extended_slk_color(3x) as a form of  slk_color(3x)
+       that  can  gather  color  information  from  them  when many colors are
+       supported.
 
-       Unlike other  implementations,  this  one  checks  parameters  such  as
-       pointers  to  WINDOW  structures to ensure they are not null.  The main
-       reason for providing this  behavior  is  to  guard  against  programmer
-       error.   The  standard interface does not provide a way for the library
-       to tell an application which of several possible errors were  detected.
-       Relying  on  this  (or  some other) extension will adversely affect the
-       portability of curses applications.
+       ncurses   permits   modification   of   unctrl(3x)'s   behavior;    see
+       use_legacy_coding(3x).
 
+       Rudimentary  support  for multi-threaded applications may be available;
+       see curs_threads(3x).
 
-

                  Extensions versus portability

                  -       Most of the extensions provided by ncurses have not been  standardized.
-       Some  have  been  incorporated  into  other  implementations,  such  as
-       PDCurses or NetBSD curses.  Here are a few to consider:
+       Functions that ease the management of multiple screens can be  exposed;
+       see curs_sp_funcs(3x).
 
-       o   The routine has_key is not part of XPG4, nor is it present in SVr4.
-           See the curs_getch(3x) manual page for details.
+       To  aid  applications  to  debug their memory usage, ncurses optionally
+       offers functions  to  more  aggressively  free  memory  it  dynamically
+       allocates itself; see curs_memleaks(3x).
 
-       o   The  routine  slk_attr  is  not  part of XPG4, nor is it present in
-           SVr4.  See the curs_slk(3x) manual page for details.
+       The  library  facilitates auditing and troubleshooting of its behavior;
+       see curs_trace(3x).
 
-       o   The routines getmouse, mousemask,  ungetmouse,  mouseinterval,  and
-           wenclose  relating  to  mouse interfacing are not part of XPG4, nor
-           are they present in SVr4.  See the curs_mouse(3x) manual  page  for
-           details.
+       Compiling ncurses with the option -DUSE_GETCAP causes it to  fall  back
+       to  reading /etc/termcap if the terminal setup code cannot find a term-
+       info  entry  corresponding  to  TERM.   Use  of  this  feature  is  not
+       recommended,  as  it essentially includes an entire termcap compiler in
+       the ncurses startup code, at a cost in  memory  usage  and  application
+       launch latency.
 
-       o   The  routine  mcprint  was  not  present  in  any  previous  curses
-           implementation.  See the curs_print(3x) manual page for details.
+       PDCurses   and  NetBSD  curses  incorporate  some  ncurses  extensions.
+       Individual man pages indicate where this is the case.
 
-       o   The routine wresize is not part of XPG4, nor is it present in SVr4.
-           See the wresize(3x) manual page for details.
 
-       o   The   WINDOW  structure's  internal  details  can  be  hidden  from
-           application programs.  See curs_opaque(3x) for  the  discussion  of
-           is_scrollok, etc.
+

                  PORTABILITY

                  +       X/Open Curses defines two levels of conformance, "base" and "enhanced".
+       The latter includes several additional features, such as wide-character
+       and color support.  ncurses intends base-level conformance with  X/Open
+       Curses,  and  supports  all  features  of its enhanced level except the
+       untic utility.
 
-       o   This  implementation  can  be  configured  to  provide  rudimentary
-           support for multi-threaded applications.  See curs_threads(3x)  for
-           details.
+       Differences between X/Open Curses and ncurses  are  documented  in  the
+       "PORTABILITY" sections of applicable man pages.
 
-       o   This  implementation  can  also  be  configured to provide a set of
-           functions which improve the ability  to  manage  multiple  screens.
-           See curs_sp_funcs(3x) for details.
 
+

                  Error Checking

                  +       In  many cases, X/Open Curses is vague about error conditions, omitting
+       some of the SVr4 documentation.
 
-

                  Padding differences

                  -       In  historic  curses  versions, delays embedded in the capabilities cr,
-       ind, cub1, ff and tab activated corresponding delay bits  in  the  UNIX
-       tty driver.  In this implementation, all padding is done by sending NUL
-       bytes.  This  method  is  slightly  more  expensive,  but  narrows  the
-       interface  to the UNIX kernel significantly and increases the package's
-       portability correspondingly.
+       Unlike other implementations, ncurses checks pointer  parameters,  such
+       as  those to WINDOW structures, to ensure that they are not null.  This
+       is done primarily to guard  against  programmer  error.   The  standard
+       interface does not provide a way for the library to tell an application
+       which of several possible errors occurred.  An application that  relies
+       on  ncurses  to  check  its function parameters for validity limits its
+       portability and robustness.
 
 
-

                  Header files

                  -       The header file <curses.h>  automatically  includes  the  header  files
-       <stdio.h> and <unctrl.h>.
+

                  Padding Differences

                  +       In historical curses implementations, delays embedded in  the  terminfo
+       capabilities  carriage_return  (cr),  scroll_forward (ind), cursor_left
+       (cub1), form_feed (ff), and tab (ht) activated corresponding delay bits
+       in  the  Unix terminal driver.  ncurses performs all padding by sending
+       NUL bytes to the device.  This method is slightly more  expensive,  but
+       narrows   the   interface   to   the   Unix  kernel  significantly  and
+       correspondingly increases the package's portability.
 
-       X/Open Curses has more to say, but does not finish the story:
 
-           The  inclusion  of <curses.h> may make visible all symbols from the
-           headers <stdio.h>, <term.h>, <termios.h>, and <wchar.h>.
+

                  Header Files

                  +       The header file curses.h itself includes the header files  stdio.h  and
+       unctrl.h.
 
-       Here is a more complete story:
+       X/Open Curses has more to say,
 
-       o   Starting  with  BSD  curses,  all  implementations  have   included
-           <stdio.h>.
+           The  inclusion  of  curses.h  may make visible all symbols from the
+           headers stdio.h, term.h, termios.h, and wchar.h.
 
-           BSD  curses  included  <curses.h>  and  <unctrl.h> from an internal
-           header "curses.ext" ("ext" was a short name for externs).
+       but does not finish the story.  A more complete account follows.
 
-           BSD curses used <stdio.h> internally (for printw  and  scanw),  but
-           nothing in <curses.h> itself relied upon <stdio.h>.
+       o   The first curses, in 4BSD, provided a curses.h file.
 
-       o   SVr2  curses  added newterm(3x), which relies upon <stdio.h>.  That
-           is, the function prototype uses FILE.
+           BSD curses code included curses.h and  unctrl.h  from  an  internal
+           header file curses.ext, where "ext" abbreviated "externs".
 
-           SVr4 curses added putwin and getwin, which also use <stdio.h>.
+           The  implementations of printw and scanw used undocumented internal
+           functions of the standard I/O library (_doprnt  and  _doscan),  but
+           nothing in curses.h itself relied upon stdio.h.
 
-           X/Open Curses documents all three of these functions.
+       o   SVr2  curses  added  newterm, which relies upon stdio.h because its
+           function prototype employs the FILE type.
 
-           SVr4 curses and X/Open Curses  do  not  require  the  developer  to
-           include  <stdio.h>  before  including  <curses.h>.   Both  document
-           curses showing <curses.h> as the only required header.
+           SVr4 curses added putwin and getwin, which also use stdio.h.
 
-           As a result, standard <curses.h> will always include <stdio.h>.
+           X/Open Curses specifies all three of these functions.
 
-       o   X/Open Curses  is  inconsistent  with  respect  to  SVr4  regarding
-           <unctrl.h>.
+           SVr4 curses and X/Open Curses  do  not  require  the  developer  to
+           include  stdio.h  before  curses.h.  Both document use of curses as
+           requiring only curses.h.
 
-           As   noted  in  curs_util(3x),  ncurses  includes  <unctrl.h>  from
-           <curses.h> (like SVr4).
+           As a result, standard curses.h always includes stdio.h.
 
-       o   X/Open's comments about <term.h> and <termios.h> may refer to HP-UX
-           and AIX:
+       o   X/Open Curses and SVr4 curses  are  inconsistent  with  respect  to
+           unctrl.h.
 
-           HP-UX curses includes <term.h> from <curses.h> to declare setupterm
-           in curses.h, but ncurses (and Solaris curses) do not.
+           As  noted in curs_util(3x), ncurses includes unctrl.h from curses.h
+           (as SVr4 does).
 
-           AIX curses includes <term.h> and <termios.h>.  Again, ncurses  (and
-           Solaris curses) do not.
+       o   X/Open Curses's comments about term.h and termios.h  may  refer  to
+           HP-UX and AIX.
 
-       o   X/Open  says  that <curses.h> may include <term.h>, but there is no
-           requirement that it do that.
+           HP-UX  curses includes term.h from curses.h to declare setupterm in
+           curses.h, but ncurses and Solaris curses do not.
 
-           Some  programs  use  functions  declared  in  both  <curses.h>  and
-           <term.h>,  and  must include both headers in the same module.  Very
-           old versions of AIX curses  required  including  <curses.h>  before
-           including <term.h>.
+           AIX curses includes  term.h  and  termios.h.   Again,  ncurses  and
+           Solaris curses do not.
 
-           Because  ncurses  header files include the headers needed to define
-           datatypes used in the headers, ncurses header files can be included
-           in  any  order.  But for portability, you should include <curses.h>
-           before <term.h>.
+       o   X/Open  Curses  says that curses.h may include term.h, but does not
+           require it to do so.
 
-       o   X/Open Curses says "may make visible" because  including  a  header
-           file does not necessarily make all symbols in it visible (there are
-           ifdef's to consider).
+           Some programs use functions declared in both curses.h  and  term.h,
+           and  must  include  both header files in the same module.  Very old
+           versions of  AIX  curses  required  inclusion  of  curses.h  before
+           term.h.
 
-           For instance, in ncurses <wchar.h> may be included  if  the  proper
-           symbol  is defined, and if ncurses is configured for wide-character
-           support.  If the header  is  included,  its  symbols  may  be  made
-           visible.   That depends on the value used for _XOPEN_SOURCE feature
-           test macro.
+           The  header  files supplied by ncurses include the standard library
+           headers required for its  declarations,  so  ncurses's  own  header
+           files  can  be  included in any order.  For portability even to old
+           AIX systems, include curses.h before term.h.
 
-       o   X/Open Curses documents one required header,  in  a  special  case:
-           <stdarg.h>   before  <curses.h>  to  prototype  the  vw_printw  and
-           vw_scanw functions (as  well  as  the  obsolete  the  vwprintw  and
-           vwscanw functions).  Each of those uses a va_list parameter.
+       o   X/Open Curses says "may make visible" because  including  a  header
+           file  does  not  necessarily  make visible all of the symbols in it
+           (consider #ifdef and similar).
 
-           The  two  obsolete  functions  were  introduced in SVr3.  The other
-           functions were introduced  in  X/Open  Curses.   In  between,  SVr4
-           curses  provided  for  the  possibility  that  an application might
-           include either <varargs.h> or <stdarg.h>.  Initially, that was done
-           by  using  void*  for the va_list parameter.  Later, a special type
-           (defined in <stdio.h>) was introduced, to allow for compiler  type-
-           checking.  That special type is always available, because <stdio.h>
-           is always included by <curses.h>.
+           For instance, ncurses's curses.h may include wchar.h if the  proper
+           symbol  is defined, and if ncurses is configured for wide-character
+           support.  If wchar.h is included, its symbols may be  made  visible
+           depending on the value of the _XOPEN_SOURCE feature test macro.
 
-           None of the X/Open Curses implementations require an application to
-           include  <stdarg.h>  before  <curses.h>  because  they  either have
-           allowed for a special type, or (like  ncurses)  include  <stdarg.h>
-           directly to provide a portable interface.
+       o   X/Open Curses mandates an application's inclusion of one standard C
+           library header in a  special  case:  stdarg.h  before  curses.h  to
+           prototype  the  functions  vw_printw  and  vw_scanw (as well as the
+           obsolete vwprintw and vwscanw).  Each of  these  takes  a  variadic
+           argument list, a va_list parameter, like that of printf(3).
 
+           SVr3  curses  introduced  the  two  obsolete  functions, and X/Open
+           Curses the others.   In  between,  SVr4  curses  provided  for  the
+           possibility  that  an application might include either varargs.h or
+           stdarg.h.  These represented  contrasting  approaches  to  handling
+           variadic  argument  lists.   The older interface, varargs.h, used a
+           pointer to char for variadic functions' va_list parameter.   Later,
+           the  list  acquired its own standard data type, va_list, defined in
+           stdarg.h, empowering the compiler to check the types of a  function
+           call's  actual  parameters  against the formal ones declared in its
+           prototype.
 
-

                  NOTES

                  -       If  standard  output from a ncurses program is re-directed to something
-       which is not a tty, screen updates will be directed to standard  error.
-       This was an undocumented feature of AT&T System V Release 3 curses.
+           No  conforming  implementations  of  X/Open   Curses   require   an
+           application to include stdarg.h before curses.h because they either
+           have allowed for a special type, or,  like  ncurses,  they  include
+           stdarg.h themselves to provide a portable interface.

                  AUTHORS

                  @@ -1475,8 +1495,12 @@ 
                  ncurses 3x
                  
        by Pavel Curtis.
 
 
+

                  SEE ALSO

                  +       curs_variables(3x), terminfo(5), user_caps(5)
+
 
-                                                                   ncurses(3x)
+
+ncurses 6.5                       2025-03-01                       ncurses(3x)
                  diff --git a/doc/html/man/ncurses6-config.1.html b/doc/html/man/ncurses6-config.1.html index 27bfb037..98e76561 100644 --- a/doc/html/man/ncurses6-config.1.html +++ b/doc/html/man/ncurses6-config.1.html @@ -1,6 +1,6 @@ -ncurses6-config 1 +ncurses6-config 1 2023-10-01 ncurses 6.4 User commands -

                  ncurses6-config 1

                  +

                  ncurses6-config 1 2023-10-01 ncurses 6.4 User commands

                  -ncurses6-config(1)          General Commands Manual         ncurses6-config(1)
+ncurses6-config(1)               User commands              ncurses6-config(1)

                  NAME

                  -       ncurses6-config - helper script for ncurses libraries
+       ncurses6-config - configuration helper for ncurses libraries

                  SYNOPSIS

                  -       ncurses6-config [options]
+       ncurses6-config option ...
+
+       ncurses6-config --version
+
+       ncurses6-config --help

                  DESCRIPTION

                  -       This  is  a  shell  script  which  simplifies  configuring applications
-       against a particular set of ncurses libraries.
+       This  program  development  aid  simplifies  the process of configuring
+       applications against a particular set of ncurses libraries.

                  OPTIONS

                          --prefix
-              echos the package-prefix of ncurses
+              reports the package prefix of ncurses.
 
        --exec-prefix
-              echos the executable-prefix of ncurses
+              reports the executable prefix of ncurses.
 
        --cflags
-              echos the C compiler flags needed to compile with ncurses
+              reports the C compiler flags needed to compile with ncurses.
 
-       --libs echos the libraries needed to link with ncurses
+       --libs reports the libraries needed to link with ncurses.
 
        --version
-              echos the release+patchdate version of ncurses
+              reports the release and patch date information  of  ncurses  and
+              exits successfully.
 
        --abi-version
-              echos the ABI version of ncurses
+              reports the ABI version of ncurses.
 
        --mouse-version
-              echos the mouse-interface version of ncurses
+              reports the mouse-interface version of ncurses.
 
        --bindir
-              echos the directory containing ncurses programs
+              reports the directory containing ncurses programs.
 
        --datadir
-              echos the directory containing ncurses data
+              reports the directory containing ncurses data.
 
        --includedir
-              echos the directory containing ncurses header files
+              reports the directory containing ncurses header files.
 
        --libdir
-              echos the directory containing ncurses libraries
+              reports the directory containing ncurses libraries.
 
        --mandir
-              echos the directory containing ncurses manpages
+              reports the directory containing ncurses man pages.
 
        --terminfo
-              echos the $TERMINFO terminfo database path, e.g.,
-              /usr/share/terminfo
+              reports   the  TERMINFO  terminfo  database  path,  for  example
+              /usr/share/terminfo.
 
        --terminfo-dirs
-              echos the $TERMINFO_DIRS directory list, e.g.,
-              /usr/share/terminfo
+              reports the  TERMINFO_DIRS  supplemental  search  path  for  the
+              terminfo database, for example /usr/share/terminfo.
 
        --termpath
-              echos the $TERMPATH termcap list,  if  support  for  termcap  is
-              configured.
+              reports  the  TERMPATH  supplemental search path for the termcap
+              database, if support for termcap is configured.
 
-       --help prints this message
+       --help issues a usage message and exits successfully.

                  SEE ALSO

                          curses(3x)
 
-       This describes ncurses version 6.4 (patch 20230311).
-
 
 
-                                                            ncurses6-config(1)
+ncurses 6.4                       2023-10-01                ncurses6-config(1)
                    diff --git a/doc/html/man/ncursesw6-config.1.html b/doc/html/man/ncursesw6-config.1.html new file mode 100644 index 00000000..61748865 --- /dev/null +++ b/doc/html/man/ncursesw6-config.1.html @@ -0,0 +1,127 @@ + + + + + + +ncursesw6\-config 1 2024-05-11 ncurses 6.5 User commands + + + + +

                    ncursesw6\-config 1 2024-05-11 ncurses 6.5 User commands

                    +
                    +ncursesw6-config(1)              User commands             ncursesw6-config(1)
+
+
+
+
+

                    NAME

                    +       ncursesw6-config - configuration helper for ncurses libraries
+
+
+

                    SYNOPSIS

                    +       ncursesw6-config option ...
+
+       ncursesw6-config --version
+
+       ncursesw6-config --help
+
+
+

                    DESCRIPTION

                    +       This  program  development  aid  simplifies  the process of configuring
+       applications against a particular set of ncurses libraries.
+
+
+

                    OPTIONS

                    +       --prefix          reports the package prefix of ncurses.
+
+       --exec-prefix     reports the executable prefix of ncurses.
+
+       --cflags          reports the C compiler flags needed to  compile  with
+                         ncurses.
+
+       --libs            reports the libraries needed to link with ncurses.
+
+       --abi-version     reports the ABI version of ncurses.
+
+       --mouse-version   reports the mouse-interface version of ncurses.
+
+       --bindir          reports the directory containing ncurses programs.
+
+       --datadir         reports the directory containing ncurses data.
+
+       --includedir      reports   the  directory  containing  ncurses  header
+                         files.
+
+       --libdir          reports the directory containing ncurses libraries.
+
+       --mandir          reports the directory containing ncurses man pages.
+
+       --terminfo        reports the  TERMINFO  terminfo  database  path,  for
+                         example /usr/share/terminfo.
+
+       --terminfo-dirs   reports  the  TERMINFO_DIRS  supplemental search path
+                         for    the    terminfo    database,    for    example
+                         /usr/share/terminfo.
+
+       --termpath        reports the TERMPATH supplemental search path for the
+                         termcap  database,  if   support   for   termcap   is
+                         configured.
+
+       The following options cause all others to be ignored.
+
+       --help     issues a usage message and exits successfully.
+
+       --version  issues the release and patch date information of ncurses and
+                  exits successfully.
+
+
+

                    SEE ALSO

                    +       curses(3x)
+
+
+
+ncurses 6.5                       2024-05-11               ncursesw6-config(1)
+
                    +
                    + +
                    + + diff --git a/doc/html/man/new_pair.3x.html b/doc/html/man/new_pair.3x.html index 524f96cd..f11e439d 100644 --- a/doc/html/man/new_pair.3x.html +++ b/doc/html/man/new_pair.3x.html @@ -1,6 +1,6 @@ -new_pair 3x +new_pair 3x 2025-01-18 ncurses 6.5 Library calls -

                    new_pair 3x

                    +

                    new_pair 3x 2025-01-18 ncurses 6.5 Library calls

                    -new_pair(3x)                                                      new_pair(3x)
+new_pair(3x)                     Library calls                    new_pair(3x)

                    NAME

                    -       alloc_pair, find_pair, free_pair - new curses color-pair functions
+       alloc_pair,  find_pair,  free_pair  - dynamically allocate curses color
+       pairs

                    SYNOPSIS

                    @@ -60,31 +61,31 @@ 
                    new_pair 3x

                    DESCRIPTION

                    -       These functions are an extension to the curses library.  They permit an
-       application  to  dynamically  allocate   a   color   pair   using   the
-       foreground/background  colors  rather  than  assign  a fixed color pair
+       These functions are an extension to the curses library.  They permit an
+       application   to   dynamically   allocate   a   color  pair  using  the
+       foreground/background colors rather than  assign  a  fixed  color  pair
        number, and return an unused pair to the pool.
 
-       The number of colors may be related to the  number  of  possible  color
+       The  number  of  colors  may be related to the number of possible color
        pairs for a given terminal, or it may not:
 
-       o   While  almost  all  terminals  allow  setting  the color attributes
-           independently, it is unlikely that  your  terminal  allows  you  to
-           modify  the  attributes of a given character cell without rewriting
+       o   While almost all  terminals  allow  setting  the  color  attributes
+           independently,  it  is  unlikely  that  your terminal allows you to
+           modify the attributes of a given character cell  without  rewriting
            it.  That is, the foreground and background colors are applied as a
            pair.
 
-       o   Color  pairs  are  the  curses  library's  way  of managing a color
-           palette on a terminal.  If the library does not keep track  of  the
+       o   Color pairs are the  curses  library's  way  of  managing  a  color
+           palette  on  a terminal.  If the library does not keep track of the
            combinations of colors which are displayed, it will be inefficient.
 
-       o   For   simple  terminal  emulators  with  only  a  few  dozen  color
-           combinations, it  is  convenient  to  use  the  maximum  number  of
+       o   For  simple  terminal  emulators  with  only  a  few  dozen   color
+           combinations,  it  is  convenient  to  use  the  maximum  number of
            combinations as the limit on color pairs:
 
                COLORS * COLORS
 
-       o   Terminals  which support default colors distinct from "ANSI colors"
+       o   Terminals which support default colors distinct from "ANSI  colors"
            add to the possible combinations, producing this total:
 
                ( COLORS + 1 ) * ( COLORS + 1 )
@@ -92,43 +93,43 @@ 
                    new_pair 3x
                    
        o   An application might use up to a few dozen color pairs to implement
            a predefined color scheme.
 
-           Beyond  that lies in the realm of programs using the foreground and
-           background colors  for  "ASCII  art"  (or  some  other  non-textual
+           Beyond that lies in the realm of programs using the foreground  and
+           background  colors  for  "ASCII  art"  (or  some  other non-textual
            application).
 
            Also beyond those few dozen pairs, the required size for a table to
-           represent the combinations grows rapidly with an increasing  number
+           represent  the combinations grows rapidly with an increasing number
            of colors.
 
-           These  functions allow a developer to let the screen library manage
+           These functions allow a developer to let the screen library  manage
            color pairs.

                    alloc_pair

                    -       The  alloc_pair  function  accepts  parameters   for   foreground   and
-       background  color,  and  checks  if  that  color combination is already
+       The   alloc_pair   function   accepts  parameters  for  foreground  and
+       background color, and checks whether that color combination is  already
        associated with a color pair.
 
-       o   If the combination already exists, alloc_pair returns the  existing
+       o   If  the combination already exists, alloc_pair returns the existing
            pair.
 
        o   If the combination does not exist, alloc_pair allocates a new color
            pair and returns that.
 
-       o   If the table  fills  up,  alloc_pair  discards  the  least-recently
+       o   If  the  table  fills  up,  alloc_pair  discards the least-recently
            allocated entry using free_pair and allocates a new color pair.
 
-       All  of  the  color  pairs are allocated from a table of possible color
-       pairs.  The size of the table  is  determined  by  the  terminfo  pairs
-       capability.   The  table  is  shared with init_pair; in fact alloc_pair
-       calls init_pair after updating the ncurses library's fast index to  the
+       All of the color pairs are allocated from a  table  of  possible  color
+       pairs.   The  size  of  the  table  is determined by the terminfo pairs
+       capability.  The table is shared with  init_pair;  in  fact  alloc_pair
+       calls  init_pair after updating the ncurses library's fast index to the
        colors versus color pairs.

                    find_pair

                            The find_pair function accepts parameters for foreground and background
-       color, and checks if that color combination is already associated  with
-       a  color  pair,  returning  the  pair  number if it has been allocated.
+       color,  and checks whether that color combination is already associated
+       with a color pair, returning the pair number if it has been  allocated.
        Otherwise it returns -1.
 
 
@@ -137,34 +138,34 @@ 
                    new_pair 3x

                    RETURN VALUE

                    -       The alloc_pair function returns a color pair  number  in  the  range  1
-       through  COLOR_PAIRS-1, unless it encounters an error updating its fast
-       index to the color pair values, preventing it from allocating  a  color
+       The  alloc_pair  function  returns  a  color pair number in the range 1
+       through COLOR_PAIRS-1, unless it encounters an error updating its  fast
+       index  to  the color pair values, preventing it from allocating a color
        pair.  In that case, it returns -1.
 
-       The  find_pair  function returns a color pair number if the given color
+       The find_pair function returns a color pair number if the  given  color
        combination has been associated with a color pair, or -1 if not.
 
-       Likewise, free_pair returns OK unless it encounters an  error  updating
+       Likewise,  free_pair  returns OK unless it encounters an error updating
        the fast index or if no such color pair is in use.

                    PORTABILITY

                    -       These  routines  are  specific  to ncurses.  They were not supported on
+       These routines are specific to ncurses.  They  were  not  supported  on
        Version 7, BSD or System V implementations.  It is recommended that any
-       code depending on them be conditioned using NCURSES_VERSION.
+       code depending on them be conditioned using NCURSES_VERSION.
 
 
-

                    SEE ALSO

                    -       curs_color(3x).
+

                    AUTHORS

                    +       Thomas Dickey
 
 
-

                    AUTHOR

                    -       Thomas Dickey.
+

                    SEE ALSO

                    +       curs_color(3x)
 
 
 
-                                                                  new_pair(3x)
+ncurses 6.5                       2025-01-18                      new_pair(3x)
                    diff --git a/doc/html/man/panel.3x.html b/doc/html/man/panel.3x.html index a9e1976a..3a8353c3 100644 --- a/doc/html/man/panel.3x.html +++ b/doc/html/man/panel.3x.html @@ -1,6 +1,6 @@ -panel 3x +panel 3x 2024-12-28 ncurses 6.5 Library calls -

                    panel 3x

                    +

                    panel 3x 2024-12-28 ncurses 6.5 Library calls

                    -panel(3x)                                                            panel(3x)
+panel(3x)                        Library calls                       panel(3x)

                    NAME

                    -       panel - panel stack extension for curses
+       panel - manage overlapping curses windows

                    SYNOPSIS

                            #include <panel.h>
 
-       cc [flags] sourcefiles -lpanel -lncurses
-
        PANEL *new_panel(WINDOW *win);
 
        int bottom_panel(PANEL *pan);
@@ -93,25 +74,25 @@ 
                    panel 3x
                    
 
        int del_panel(PANEL *pan);
 
-       /* ncurses-extensions */
+       /* ncurses extensions */
        PANEL *ground_panel(SCREEN *sp);
        PANEL *ceiling_panel(SCREEN *sp);

                    DESCRIPTION

                    -       Panels  are  curses(3x) windows with the added feature of depth.  Panel
-       functions allow the use  of  stacked  windows  and  ensure  the  proper
-       portions  of  each  window  and  the curses stdscr window are hidden or
-       displayed when panels are added, moved, modified or removed.   The  set
+       Panels  are curses(3x) windows with the added property of depth.  Panel
+       functions allow the use of stacked windows and ensure that  the  proper
+       portions  of  each  window  and  the curses stdscr window are hidden or
+       displayed when panels are added, moved, modified, or removed.  The  set
        of  currently visible panels is the stack of panels.  The stdscr window
        is beneath all panels, and is not considered part of the stack.
 
-       A window is associated with every panel.  The panel routines enable you
-       to  create, move, hide, and show panels, as well as position a panel at
-       any desired location in the stack.
+       A window is associated with each panel.  The panel routines enable  you
+       to  create,  move,  hide, and show panels.  You can relocate a panel to
+       any desired position in the stack.
 
-       Panel routines are a functional layer added to  curses(3x),  make  only
-       high-level curses calls, and work anywhere terminfo curses does.
+       Panel routines are a functional layer added to curses, make only  high-
+       level curses calls, and work anywhere curses does.

                    FUNCTIONS

                    @@ -121,52 +102,52 @@ 
                    panel 3x

                    ceiling_panel

                    -       ceiling_panel(sp) acts like panel_below(NULL), for the given SCREEN sp.
+       ceiling_panel(sp) acts like panel_below(NULL) for the given SCREEN sp.

                    del_panel

                    -       del_panel(pan)  removes  the  given  panel  pan  from  the   stack  and
-       deallocates the PANEL structure (but not its associated window).
+       del_panel(pan)   removes  the  given  panel  pan  from  the  stack  and
+       deallocates the PANEL structure (but not its associated window).

                    ground_panel

                    -       ground_panel(sp) acts like panel_above(NULL), for the given SCREEN sp.
+       ground_panel(sp) acts like panel_above(NULL) for the given SCREEN sp.

                    hide_panel

                            hide_panel(pan) removes the given panel pan from the  panel  stack  and
-       thus  hides  it  from  view.   The  PANEL structure is not lost, merely
+       thus  hides  it  from  view.   The  PANEL structure is not lost, merely
        removed from the stack.

                    move_panel

                    -       move_panel(pan,starty,startx) moves the given  panel  pan's  window  so
+       move_panel(pan, starty, startx) moves the given panel pan's  window  so
        that  its  upper-left  corner is at starty, startx.  It does not change
        the position of the panel in the stack.  Be sure to use this  function,
        not mvwin(3x), to move a panel window.

                    new_panel

                    -       new_panel(win)  allocates  a  PANEL  structure, associates it with win,
-       places the panel on the top of the stack (causes  it to  be   displayed
+       new_panel(win)  allocates  a  PANEL  structure, associates it with win,
+       places the panel on the top of the stack (causes  it  to  be  displayed
        above any other panel) and returns a pointer to the new panel.

                    panel_above

                            panel_above(pan)  returns  a  pointer  to  the panel above pan.  If the
-       panel argument is (PANEL *)0, it returns a pointer to the bottom  panel
-       in the stack.
+       panel argument is "(PANEL *)0", it returns  a  pointer  to  the  bottom
+       panel in the stack.

                    panel_below

                            panel_below(pan) returns a pointer to the panel just below pan.  If the
-       panel argument is (PANEL *)0, it returns a pointer to the top panel  in
-       the stack.
+       panel argument is "(PANEL *)0", it returns a pointer to the  top  panel
+       in the stack.

                    panel_hidden

                    -       panel_hidden(pan)  returns TRUE if the panel pan is in the panel stack,
-       FALSE if it is not.  If the panel is a null pointer, return ERR.
+       panel_hidden(pan) returns FALSE if the panel pan is in the panel stack,
+       and TRUE if it is not.  If the panel is a null pointer, it returns ERR.

                    panel_userptr

                    @@ -179,89 +160,87 @@ 
                    panel 3x

                    replace_panel

                    -       replace_panel(pan,window) replaces the current window of panel pan with
-       window This is useful, for example if you want to resize a  panel.   In
-       ncurses,  you  can  call replace_panel to resize a panel using a window
+       replace_panel(pan,  window)  replaces  the  current window of panel pan
+       with window This is useful if, for example, you want to resize a panel.
+       In ncurses, you can call replace_panel to resize a panel using a window
        resized with wresize(3x).  It does not change the position of the panel
        in the stack.

                    set_panel_userptr

                    -       set_panel_userptr(pan,ptr) sets the panel's user pointer.
+       set_panel_userptr(pan, ptr) sets the panel's user pointer.

                    show_panel

                            show_panel(pan)  makes  a  hidden panel visible by placing it on top of
-       the panels in the panel stack.  See COMPATIBILITY below.
+       the panels in the panel stack.  See "PORTABILITY" below.

                    top_panel

                            top_panel(pan) puts the given visible panel pan on top of all panels in
-       the stack.  See COMPATIBILITY below.
+       the stack.  See "PORTABILITY" below.

                    update_panels

                    -       update_panels()  refreshes  the virtual screen to reflect the relations
+       update_panels()  refreshes  the virtual screen to reflect the relations
        between the panels in the stack, but  does  not  call  doupdate(3x)  to
-       refresh the physical screen.  Use this function and not wrefresh(3x) or
+       refresh the physical screen.  Use this function and not wrefresh(3x) or
        wnoutrefresh(3x).
 
        update_panels may be called more than once before a call  to  doupdate,
-       but  doupdate  is  the  function  responsible for updating the physical
-       screen.
+       but  doupdate  is  the  function  responsible for updating the physical
+       screen.
 
 
-

                    DIAGNOSTICS

                    -       Each routine that returns a pointer returns NULL if  an  error  occurs.
+

                    RETURN VALUE

                    +       Each routine that returns a pointer returns NULL if  an  error  occurs.
        Each  routine  that  returns  an  int  value  returns OK if it executes
        successfully and ERR if not.
 
        Except as noted, the pan and window parameters must  be  non-null.   If
-       those are null, an error is returned.
+       either is null, an error is returned.
+
+       The  move_panel  function  uses  mvwin(3x),  and  returns  ERR if mvwin
+       returns ERR.
 
-       The  move_panel  function  uses  mvwin(3x), and will return an error if
-       mvwin returns an error.
 
+

                    NOTES

                    +       The header file panel.h itself includes the header file curses.h.
 
-

                    COMPATIBILITY

                    -       Reasonable care has been taken  to   ensure   compatibility  with   the
-       native   panel  facility introduced in System V (inspection of the SVr4
-       manual pages suggests the programming  interface  is  unchanged).   The
-       PANEL   data  structures  are  merely   similar.   The   programmer  is
-       cautioned not to directly use PANEL fields.
+
+

                    PORTABILITY

                    +       Reasonable care has been taken to ensure compatibility with the  native
+       panel  facility  introduced  in System V; inspection of the SVr4 manual
+       pages suggests the programming interface never changed.  The PANEL data
+       structures  are  merely  similar.   The  programmer is cautioned not to
+       directly use PANEL fields.
 
        The  functions  show_panel  and  top_panel  are   identical   in   this
        implementation,  and work equally well with displayed or hidden panels.
-       In the native System  V  implementation,  show_panel  is  intended  for
-       making  a  hidden panel visible (at the top of the stack) and top_panel
-       is intended for making an already-visible panel move to the top of  the
+       In the System V implementation, show_panel is  intended  for  making  a
+       hidden  panel  visible  (at  the  top  of  the  stack) and top_panel is
+       intended for making an already-visible panel move to  the  top  of  the
        stack.   You  are  cautioned  to  use  the  correct  function to ensure
-       compatibility with native panel libraries.
+       compatibility with System V panel libraries.
 
 
-

                    NOTE

                    -       In your library list, libpanel.a should be  before  libncurses.a;  that
-       is, you should say "-lpanel -lncurses", not the other way around (which
-       would give a link-error with static libraries).
-
-
-

                    PORTABILITY

                    -       The panel facility was documented in SVr4.2 in Character User Interface
-       Programming (UNIX SVR4.2).
+

                    HISTORY

                    +       A panel facility was documented in SVr4.2's  Character  User  Interface
+       Programming document.
 
        It is not part of X/Open Curses.
 
        A few implementations exist:
 
-       o   Systems  based  on  SVr4  source  code, e.g., Solaris, provide this
+       o   Systems  based  on  SVr4 source code, such as Solaris, provide this
            library.
 
-       o   ncurses (since version 0.6 in 1993) and PDCurses (since version 2.2
-           in 1995) provide a panel library whose common ancestor was a public
+       o   ncurses (since version 0.6 in 1993) and PDCurses (since version 2.2
+           in  1995) provide a panel library whose common ancestor is a public
            domain implementation by Warren Tucker published  in  u386mon  2.20
            (1990).
 
-           According  to  Tucker, the SystemV panel library was first released
+           According  to Tucker, the System V panel library was first released
            in SVr3.2 (1988), and his implementation  helped  with  a  port  to
            SVr3.1 (1987).
 
@@ -269,33 +248,25 @@ 
                    panel 3x
                    
            the same as Tucker's implementation.
 
        o   NetBSD 8 (2018) has a panel library  begun  by  Valery  Ushakov  in
-           2015.  This is based on the AT&T documentation.
-
+           2015, based on the System V documentation.
 
-

                    FILES

                    -       panel.h interface for the panels library
 
-       libpanel.a the panels library itself
+

                    AUTHORS

                    +       Warren   Tucker   <wht@n4hgf.mt-park.ga.us>   originally   wrote   this
+       implementation, primarily to  assist  in  porting  u386mon  to  systems
+       without a native panel library.
 
+       Zeyd ben-Halim repackaged it for ncurses.
 
-

                    SEE ALSO

                    -       curses(3x), curs_variables(3x),
-
-       This describes ncurses version 6.4 (patch 20230311).
+       Juergen Pfeifer and Thomas E. Dickey revised and improved the library.
 
 
-

                    AUTHOR

                    -       Originally   written   by   Warren   Tucker  <wht@n4hgf.mt-park.ga.us>,
-       primarily to assist in porting u386mon  to  systems  without  a  native
-       panels library.
-
-       Repackaged for ncurses by Zeyd ben-Halim.
-
-       Juergen Pfeifer and Thomas E. Dickey revised/improved the library.
+

                    SEE ALSO

                    +       curses(3x), curs_variables(3x)
 
 
 
-                                                                     panel(3x)
+ncurses 6.5                       2024-12-28                         panel(3x)
                    -
                  • DIAGNOSTICS
                    • -
                  • COMPATIBILITY
                    • -
                  • NOTE
                    • +
                  • RETURN VALUE
                    • +
                  • NOTES
                  • PORTABILITY
                    • -
                  • FILES
                    • +
                  • HISTORY
                    • +
                  • AUTHORS
                  • SEE ALSO
                    • -
                  • AUTHOR
                  diff --git a/doc/html/man/resizeterm.3x.html b/doc/html/man/resizeterm.3x.html index ebf6c55c..e67be669 100644 --- a/doc/html/man/resizeterm.3x.html +++ b/doc/html/man/resizeterm.3x.html @@ -1,6 +1,6 @@ -resizeterm 3x +resizeterm 3x 2024-12-28 ncurses 6.5 Library calls -

                  resizeterm 3x

                  +

                  resizeterm 3x 2024-12-28 ncurses 6.5 Library calls

                  -resizeterm(3x)                                                  resizeterm(3x)
+resizeterm(3x)                   Library calls                  resizeterm(3x)

                  NAME

                  -       is_term_resized,  resize_term,  resizeterm - change the curses terminal
-       size
+       is_term_resized,   resize_term,   resizeterm   -  manage  the  terminal
+       dimensions understood by curses

                  SYNOPSIS

                  @@ -61,21 +61,21 @@ 
                  resizeterm 3x

                  DESCRIPTION

                  -       This is an extension to the curses library.  It provides callers with a
-       hook  into  the  ncurses  data  to resize windows, primarily for use by
+       This is an extension to the curses library.  It provides callers with a
+       hook  into  the  ncurses  data  to resize windows, primarily for use by
        programs running in  an  X  Window  terminal  (e.g.,  xterm)  when  the
        terminal's screen size is changed by the user:
 
-       o   Curses  windows  cannot extend outside the screen.  If the terminal
-           is shrunk, curses windows must be shrunk to fit.
+       o   curses  windows  cannot extend outside the screen.  If the terminal
+           is shrunk, curses windows must be shrunk to fit.
 
        o   If the terminal is stretched, rows and/or columns can be  added  to
            existing  windows.   The  added  cells  should  match  the  current
            attributes of the windows.
 
        If the calling program has not set up a handler for  SIGWINCH  when  it
-       initializes  ncurses  (e.g.,  using  initscr(3x)  or newterm(3x)), then
-       ncurses sets a handler for SIGWINCH which notifies the library  when  a
+       initializes  ncurses  (e.g.,  using  initscr(3x)  or newterm(3x)), then
+       ncurses sets a handler for SIGWINCH which notifies the library  when  a
        window-size   event   has   occurred.   The  library  checks  for  this
        notification
 
@@ -99,7 +99,7 @@ 
                  resizeterm 3x

                  resizeterm

                          The function resizeterm resizes the standard and current windows (i.e.,
        stdscr  and  curscr)  to  the  specified  dimensions, and adjusts other
-       bookkeeping data used by the ncurses library  that  record  the  window
+       bookkeeping data used by the ncurses library  that  record  the  window
        dimensions such as the LINES and COLS variables.
 
 
@@ -144,7 +144,7 @@ 
                  resizeterm 3x
                  
        them in a context where malloc or realloc may  have  been  interrupted,
        since it uses those functions.
 
-       If ncurses is configured to supply its own SIGWINCH handler,
+       If ncurses is configured to supply its own SIGWINCH handler,
 
        o   on receipt of a SIGWINCH, the handler sets a flag
 
@@ -161,38 +161,38 @@ 
                  resizeterm 3x
                  
 
            Calling resizeterm or resize_term directly from a signal handler is
            unsafe.   This  indirect  method  is  used to provide a safe way to
-           resize the ncurses data structures.
+           resize the ncurses data structures.
 
-       If the environment variables LINES or COLUMNS are set,  this  overrides
+       If the environment variables LINES or COLUMNS are set,  this  overrides
        the  library's  use  of  the  window  size  obtained from the operating
        system.  Thus, even if a SIGWINCH is received, no  screen  size  change
        may be recorded.

                  PORTABILITY

                  -       It is possible to resize the screen with SVr4 curses, by
+       It is possible to resize the screen with SVr4 curses, by
 
-       o   exiting curses with endwin(3x) and
+       o   exiting curses with endwin(3x) and
 
        o   resuming using refresh(3x).
 
        Doing that clears the screen and is visually distracting.
 
-       This  extension  of ncurses was introduced in mid-1995.  It was adopted
-       in NetBSD curses (2001) and PDCurses (2003).
+       ncurses  introduced  this extension in mid-1995.  NetBSD curses adopted
+       it in 2001 and PDCurses in 2003.
 
 
-

                  SEE ALSO

                  -       curs_getch(3x), curs_variables(3x), wresize(3x).
+

                  AUTHORS

                  +       Thomas Dickey (from an equivalent function  written  in  1988  for  BSD
+       curses)
 
 
-

                  AUTHOR

                  -       Thomas Dickey (from an equivalent function  written  in  1988  for  BSD
-       curses).
+

                  SEE ALSO

                  +       curs_getch(3x), curs_variables(3x), wresize(3x)
 
 
 
-                                                                resizeterm(3x)
+ncurses 6.5                       2024-12-28                    resizeterm(3x)
                  diff --git a/doc/html/man/scr_dump.5.html b/doc/html/man/scr_dump.5.html index 459a30cc..1da7e511 100644 --- a/doc/html/man/scr_dump.5.html +++ b/doc/html/man/scr_dump.5.html @@ -1,6 +1,6 @@ -scr_dump 5 +scr_dump 5 2025-01-18 ncurses 6.5 File formats -

                  scr_dump 5

                  +

                  scr_dump 5 2025-01-18 ncurses 6.5 File formats

                  -scr_dump(5)                   File Formats Manual                  scr_dump(5)
+scr_dump(5)                      File formats                      scr_dump(5)

                  NAME

                  -       scr_dump - format of curses screen-dumps.
-
-
-

                  SYNOPSIS

                  -       scr_dump
+       scr_dump - curses screen dump

                  DESCRIPTION

                  @@ -110,67 +106,53 @@ 
                  scr_dump 5
                  
        o   The ncurses6 getwin reads the legacy screen dumps from ncurses5.
 
 
-

                  ncurses5 (legacy)

                  -       The screen-dump feature was added to ncurses in June 1995.  While there
+

                  ncurses5 (Legacy)

                  +       The screen-dump feature was added to ncurses in June 1995.  While there
        were fixes and improvements in succeeding years, the basic  scheme  was
        unchanged:
 
-       o   The WINDOW structure was written in binary form.
+       o   The WINDOW structure was written in binary form.
 
-       o   The WINDOW structure refers to lines of data, which were written as
-           an array of binary data following the WINDOW.
+       o   The WINDOW structure refers to lines of data, which were written as
+           an array of binary data following the WINDOW.
 
        o   When getwin restored the window, it would  keep  track  of  offsets
-           into  the  array of line-data and adjust the WINDOW structure which
+           into  the  array of line-data and adjust the WINDOW structure which
            was read back into memory.
 
-       This is similar to Unix SystemV, but does not write a "magic number" to
-       identify the file format.
+       This is similar to Unix System V, but does not write a  "magic  number"
+       to identify the file format.

                  PORTABILITY

                  -       There  is  no  standard  format for putwin.  This section gives a brief
-       description of the existing formats.
+       There is no standard format for curses screen dumps.  A brief survey of
+       the existing implementations follows.

                  X/Open Curses

                  -       Refer to X/Open Curses, Issue 7 (2009).
+       X/Open Curses Issue 7 specifies little.   It  says  (boldface  emphasis
+       added)
 
-       X/Open's documentation for enhanced curses says only:
-
-          The getwin( ) function reads window-related data stored in the  file
-          by  putwin( ).   The  function  then  creates  and initializes a new
+          "[t]he  getwin()  function  reads  window-related data stored in the
+          file by putwin().  The function then creates and initializes  a  new
           window using that data.
 
-          The putwin( ) function writes all data associated with win into  the
-          stdio(3)  stream to which filep points, using an unspecified format.
-          This information can be retrieved later using getwin( ).
-
-       In the mid-1990s when the X/Open Curses  document  was  written,  there
-       were  still  systems  using older, less capable curses libraries (aside
-       from the BSD curses library which was not relevant to X/Open because it
-       did not meet the criteria for base curses).  The document explained the
-       term "enhanced" as follows:
+          The  putwin()  function writes all data associated with win into the
+          stdio stream to which filep points,  using  an  unspecified  format.
+          This information can be retrieved later using getwin()."
 
-          o   Shading is used to identify  X/Open  Enhanced  Curses  material,
-              relating to interfaces included to provide enhanced capabilities
-              for applications originally written to be  compiled  on  systems
-              based  on  the  UNIX  operating system.  Therefore, the features
-              described may not be present on systems that conform to XPG4  or
-              to  earlier  XPG  releases.   The  relevant  reference pages may
-              provide additional or more specific portability  warnings  about
-              use of the material.
+       In  the  mid-1990s  when  the X/Open Curses document was written, there
+       were still System V systems using older, less capable curses libraries.
+       BSD  curses  was  not  relevant  to  X/Open because it did not meet the
+       criteria for base-level conformance; see ncurses(3x).
 
-       In  the foregoing, emphasis was added to unspecified format and to XPG4
-       or to earlier XPG releases, for clarity.
 
+

                  System V

                  +       System V curses identified the file format by writing a "magic  number"
+       at  the  beginning  of the dump.  The WINDOW data and the lines of text
+       follow, all in binary form.
 
-

                  Unix SystemV

                  -       Unix SystemV curses identified the file  format  by  writing  a  "magic
-       number" at the beginning of the dump.  The WINDOW data and the lines of
-       text follow, all in binary form.
-
-       The Solaris curses source has these definitions:
+       Solaris curses has the following definitions.
 
            /* terminfo magic number */
            #define MAGNUM  0432
@@ -180,86 +162,87 @@ 
                  scr_dump 5
                  
            #define SVR3_DUMP_MAGIC_NUMBER  0434
 
        That is, the feature was likely introduced in SVr2 (1984), and improved
-       in SVr3 (1987).  The Solaris curses source has no magic number for SVr4
-       (1989).  Other operating systems (AIX and  HPUX)  use  a  magic  number
-       which would correspond to this definition:
+       in  SVr3  (1987).   Solaris curses has no magic number for SVr4 (1989).
+       Other System V operating systems (AIX and HP-UX)  use  a  magic  number
+       that would correspond to the following.
 
            /* curses screen dump magic number */
            #define SVR4_DUMP_MAGIC_NUMBER  0435
 
-       That  octal number in bytes is 001, 035.  Because most Unix vendors use
-       big-endian hardware, the magic number is written  with  the  high-order
-       byte first, e.g.,
+       That  octal  number in bytes is 001, 035.  Because most Unix vendors at
+       the time used big-endian hardware, the magic number is written with the
+       high-order byte first.
 
-            01 35
+           \001\035
 
-       After  the magic number, the WINDOW structure and line-data are written
-       in binary format.  While the magic number used by the Unix systems  can
-       be seen using od(1), none of the Unix systems documents the format used
-       for screen-dumps.
+       After  the magic number, the WINDOW structure and line data are written
+       in binary format.  While the magic number used by these systems can  be
+       observed  with od(1), none of them documents the format used for screen
+       dumps.
 
-       The Unix systems  do  not  use  identical  formats.   While  collecting
-       information  for  for  this  manual  page,  the savescreen test-program
-       produced dumps of different size (all  on  64-bit  hardware,  on  40x80
-       screens):
+       Nor do they use an identical format, even  with  the  System V  family.
+       The ncurses savescreen test program was used to collect information for
+       this manual page.  It produced dumps of different size (all  on  64-bit
+       hardware, on 40x80 screens):
 
        o   AIX (51817 bytes)
 
-       o   HPUX (90093 bytes)
+       o   HP-UX (90093 bytes)
 
        o   Solaris 10 (13273 bytes)
 
-       o   ncurses5 (12888 bytes)
+       o   ncurses5 (12888 bytes)

                  Solaris

                  -       As  noted  above,  Solaris  curses has no magic number corresponding to
-       SVr4 curses.  This is odd since Solaris was the first operating  system
-       to pass the SVr4 guidelines.  Solaris has two versions of curses:
+       As  noted  above,  Solaris  curses has no magic number corresponding to
+       SVr4 curses.  This is odd, since Solaris was the first operating system
+       to meet the SVr4 guidelines.  Solaris furthermore supplies two versions
+       of curses.
 
-       o   The default curses library uses the SVr3 magic number.
+       o   The default curses library uses the SVr3 magic number.
 
-       o   There  is  an  alternate  curses library in /usr/xpg4.  This uses a
-           textual format with no magic number.
+       o   An alternate curses library (which we term xcurses),  available  in
+           /usr/xpg4, uses a textual format with no magic number.
 
-           According to the copyright notice, the xpg4 Solaris curses  library
-           was developed by MKS (Mortice Kern Systems) from 1990 to 1995.
+           According  to  its  copyright  notice,  this  xcurses  library  was
+           developed by MKS (Mortice Kern Systems) from 1990 to 1995.
 
-           Like  ncurses6,  there  is  a  file-header with parameters.  Unlike
-           ncurses6, the contents of the window are  written  piecemeal,  with
-           coordinates  and  attributes  for  each  chunk  of text rather than
+           Like ncurses6,  it  includes  a  header  with  parameters.   Unlike
+           ncurses6,  the  contents  of the window are written piecemeal, with
+           coordinates and attributes for  each  chunk  of  text  rather  than
            writing the whole window from top to bottom.

                  PDCurses

                  -       PDCurses added support for screen dumps in version  2.7  (2005).   Like
-       Unix  SystemV  and  ncurses5, it writes the WINDOW structure in binary,
-       but begins the file with its three-byte identifier "PDC", followed by a
-       one-byte version, e.g.,
+       PDCurses  added  support  for screen dumps in version 2.7 (2005).  Like
+       System V and ncurses5, it writes the WINDOW structure  in  binary,  but
+       begins  the  file  with  its three-byte identifier "PDC", followed by a
+       single-byte version number.
 
                 "PDC\001"

                  NetBSD

                  -       As  of  April  2017,  NetBSD  curses  does  not  support  scr_dump  and
+       As  of  April  2017,  NetBSD  curses  does  not  support  scr_dump  and
        scr_restore (or scr_init, scr_set), although it has putwin and getwin.
 
-       Like ncurses5, NetBSD putwin does not identify its dumps with a  useful
+       Like  ncurses5, NetBSD putwin does not identify its dumps with a useful
        magic number.  It writes
 
-       o   the curses shared library major and minor versions as the first two
-           bytes (e.g., 7 and 1),
+       o   the curses shared library major and minor versions as the first two
+           bytes (for example, 7 and 1),
 
-       o   followed by a binary dump of the WINDOW,
+       o   followed by a binary dump of the WINDOW,
 
-       o   some data for wide-characters referenced by the  WINDOW  structure,
+       o   some  data  for wide characters referenced by the WINDOW structure,
            and
 
        o   finally, lines as done by other implementations.
 
 
-

                  EXAMPLE

                  -       Given  a  simple  program  which writes text to the screen (and for the
+

                  EXAMPLES

                  +       Given a simple program which writes text to the  screen  (and  for  the
        sake of example, limiting the screen-size to 10x20):
 
            #include <curses.h>
@@ -317,13 +300,13 @@ 
                  scr_dump 5
                  
 
        o   The actual color pair values are not written to the file.
 
-       o   All  characters  are  shown  in  printable form; spaces are "\s" to
+       o   All characters are shown in printable  form;  spaces  are  "\s"  to
            ensure they are not overlooked.
 
-       o   Attributes are written in escaped curly  braces,  e.g.,  "\{BOLD}",
-           and may include a color-pair (C1 or C2 in this example).
+       o   Attributes  are  written  in escaped curly braces, e.g., "\{BOLD}",
+           and may include a color pair (C1 or C2 in this example).
 
-       o   The  parameters  in  the  header  are  written out only if they are
+       o   The parameters in the header are  written  out  only  if  they  are
            nonzero.  When reading back, order does not matter.
 
        Running the same program with Solaris xpg4 curses gives this dump:
@@ -362,12 +345,12 @@ 
                  scr_dump 5
                  
            9,19,0,0,
            CUR=11,5
 
-       Solaris getwin requires that all parameters are  present,  and  in  the
-       same  order.  The xpg4 curses library does not know about the bce (back
+       Solaris  getwin  requires  that  all parameters are present, and in the
+       same order.  The xpg4 curses library does not know about the bce  (back
        color erase) capability, and does not color the window background.
 
-       On the other  hand,  the  SVr4  curses  library  does  know  about  the
-       background  color.   However,  its screen dumps are in binary.  Here is
+       On  the  other  hand,  the  SVr4  curses  library  does  know about the
+       background color.  However, its screen dumps are in  binary.   Here  is
        the corresponding dump (using "od -t x1"):
 
            0000000 1c 01 c3 d6 f3 58 05 00 0b 00 0a 00 14 00 00 00
@@ -394,43 +377,42 @@ 
                  scr_dump 5
                  
            0002371
 
 
-

                  SEE ALSO

                  -       curs_scr_dump(3x), curs_util(3x).
-
-

                  AUTHORS

                          Thomas E. Dickey
-       extended screen-dump format for ncurses 6.0 (2015)
+       extended screen-dump format for ncurses 6.0 (2015)
 
        Eric S. Raymond
-       screen dump feature in ncurses 1.9.2d (1995)
+       screen dump feature in ncurses 1.9.2d (1995)
+
+
+

                  SEE ALSO

                  +       curs_scr_dump(3x), curs_util(3x)
 
 
 
-                                                                   scr_dump(5)
+ncurses 6.5                       2025-01-18                       scr_dump(5)
                  diff --git a/doc/html/man/tabs.1.html b/doc/html/man/tabs.1.html index 5eb35247..ce56612a 100644 --- a/doc/html/man/tabs.1.html +++ b/doc/html/man/tabs.1.html @@ -1,6 +1,6 @@ -tabs 1 +tabs 1 2025-02-15 ncurses 6.5 User commands -

                  tabs 1

                  +

                  tabs 1 2025-02-15 ncurses 6.5 User commands

                  -tabs(1)                     General Commands Manual                    tabs(1)
+tabs(1)                          User commands                         tabs(1)

                  NAME

                  -       tabs - set tabs on a terminal
+       tabs - set terminal tab stops

                  SYNOPSIS

                  -       tabs [options]] [tabstop-list]
+       tabs [options] [tabstop-list]

                  DESCRIPTION

                  @@ -97,7 +97,7 @@ 
                  tabs 1
                  
        -n   This  option tells tabs to check the options and run any debugging
             option, but not to modify the terminal settings.
 
-       -V   reports the version of ncurses which was used in this program, and
+       -V   reports the version of ncurses which was used in this program, and
             exits.
 
        The tabs program processes a single list of tab stops.  The last option
@@ -132,7 +132,7 @@ 
                  tabs 1
                  
        which is equivalent to the 1,6,11,16,21 example.
 
 
-

                  Predefined Tab-Stops

                  +

                  Predefined Tab Stops

                          POSIX defines several predefined lists of tab stops.
 
        -a   Assembler, IBM S/370, first format
@@ -164,99 +164,100 @@ 
                  tabs 1

                  Margins

                  -       A  few  terminals  provide the capability for changing their left/right
-       margins.  The tabs program has an option to use this feature:
+       A  few  terminals  expose  a  means  of  changing  their left and right
+       margins.  tabs supports this feature with an option.
 
        +m margin
             The  effect  depends  on  whether  the  terminal  has  the  margin
             capabilities:
 
             o   If  the  terminal provides the capability for setting the left
-                margin, tabs uses this, and adjusts the  available  width  for
-                tab-stops.
+                margin, tabs uses this, and adjusts  the  available  tab  stop
+                widths.
 
-            o   If the terminal does not provide the margin capabilities, tabs
-                imitates the effect, putting the tab stops at the  appropriate
-                place  on  each  line.   The  terminal's  left-margin  is  not
-                modified.
+            o   If the terminal does not provide the margin capabilities, tabs
+                imitates their effect, putting tab stops at appropriate places
+                on each line.  The terminal's left margin is not modified.
 
             If the margin parameter is omitted, the default is 10.  Use +m0 to
-            reset  the  left  margin, i.e., to the left edge of the terminal's
-            display.  Before setting a left-margin, tabs resets the margin  to
-            reduce  problems which might arise on moving the cursor before the
-            current left-margin.
+            reset the left margin, that is, to make it the left  edge  of  the
+            terminal's display.  Before setting a left margin, tabs resets the
+            margin to reduce problems that might arise from moving the  cursor
+            to the left of the current left margin.
 
-       When setting or resetting the left-margin, tabs may  reset  the  right-
-       margin.
+       When  setting  or  resetting  the  left margin, tabs may also reset the
+       right margin.
+
+
+

                  FILES

                  +       /usr/share/tabset
+              tab stop initialization database

                  PORTABILITY

                  -       IEEE   Std   1003.1/The   Open   Group   Base  Specifications  Issue  7
-       (POSIX.1-2008) describes a tabs utility.  However
-
-       o   This standard describes a +m option,  to  set  a  terminal's  left-
-           margin.   Very  few of the entries in the terminal database provide
-           the  smgl   (set_left_margin)   or   smglp   (set_left_margin_parm)
-           capability needed to support the feature.
-
-       o   There  is no counterpart in X/Open Curses Issue 7 for this utility,
-           unlike tput(1).
-
-       The -d (debug) and -n (no-op) options are extensions  not  provided  by
-       other implementations.
-
-       A  tabs  utility  appeared in PWB/Unix 1.0 (1977).  There was a reduced
-       version of the tabs utility in Unix 7th edition  and  in  3BSD  (1979).
-       The  latter supported a single "-n" option (to cause the first tab stop
-       to be set on the left margin).  That option is not documented by POSIX.
-
-       The PWB/Unix tabs utility, which was included  in  System  III  (1980),
-       used  built-in  tables  rather than the terminal database, to support a
-       half-dozen hardcopy terminal (printer) types.   It  also  had  built-in
-       logic  to support the left-margin, as well as a feature for copying the
-       tab settings from a file.
-
-       Later versions of Unix, e.g., SVr4,  added  support  for  the  terminal
-       database,  but  kept the tables to support the printers.  In an earlier
-       development effort, the tab-stop initialization provided by tset (1982)
-       and incorporated into tput uses the terminal database,
-
-       The  +m  option  was  documented  in  the  Base  Specifications Issue 5
-       (Unix98,  1997),  and  omitted  in  Issue  6  (Unix03,  2004)   without
-       documenting   the   rationale,  though  an  introductory  comment  "and
-       optionally adjusts the margin" remains, overlooked in the removal.  The
-       documented  tabs  utility  in  Issues  6 and later has no mechanism for
-       setting margins.  The +m option in this implementation differs from the
-       feature  in  SVr4  by  using terminal capabilities rather than built-in
-       tables.
-
-       POSIX documents no limits on the number of  tab  stops.   Documentation
-       for other implementations states that there is a limit on the number of
-       tab stops (e.g., 20 in PWB/Unix's tabs utility).  While some  terminals
-       may  not  accept  an arbitrary number of tab stops, this implementation
-       will attempt to set tab stops up to the right margin of the screen,  if
-       the given list happens to be that long.
-
-       The  Rationale section of the POSIX documentation goes into some detail
-       about the ways the committee considered redesigning the tabs  and  tput
-       utilities, without proposing an improved solution.  It comments that
-
-            no  known  historical  version  of tabs supports the capability of
-            setting arbitrary tab stops.
-
-       However,  the  Explicit  Lists  described  in  this  manual  page  were
-       implemented  in  PWB/Unix.   Those  provide  the  capability of setting
-       abitrary tab stops.
+       IEEE  Std   1003.1/The   Open   Group   Base   Specifications   Issue 7
+       (POSIX.1-2008) describes a tabs utility.  However,
 
+       o   this  standard  describes  a  +m  option  to  set a terminal's left
+           margin.  Very few of the entries in the terminal  database  provide
+           the   set_left_margin   (smgl)   or   set_left_margin_parm  (smglp)
+           capabilities needed to support the feature.
 
-

                  SEE ALSO

                  -       infocmp(1m), tset(1), curses(3x), terminfo(5).
+       o   Unlike tput, tabs has no specification in X/Open Curses Issue 7.
+
+       The -d (debug) and  -n  (no-op)  options  are  ncurses  extensions  not
+       provided by other implementations.
+
+
+

                  HISTORY

                  +       A  tabs  utility  appeared  in  PWB/Unix 1.0 (1977).  A reduced version
+       shipped in Seventh Edition Unix (early 1979) and  in  3BSD  (later  the
+       same  year);  it  supported an option "-n" to set the first tab stop at
+       the left margin.  That option is not specified by POSIX.
+
+       The PWB/Unix tabs utility returned  in  System  III  (1980),  and  used
+       built-in  tables  to  support  a half-dozen hardcopy terminal (printer)
+       types.  It also had logic to support setting the left margin,  as  well
+       as a feature for copying the tab settings from a file.
+
+       Versions  of  the program in later releases of AT&T Unix, such as SVr4,
+       added support for the terminal database, but  retained  the  tables  to
+       support the printers.  By this time, System V tput had incorporated the
+       tab stop initialization feature of BSD's tset from 1982,  but  employed
+       the terminfo database to do so.
 
-       This describes ncurses version 6.4 (patch 20230311).
+       The  +m  option was documented in the POSIX Base Specifications Issue 5
+       (Unix98, 1997), then omitted in Issue 6 (Unix03, 2004) without  express
+       motivation,  though an introductory comment "and optionally adjusts the
+       margin"  remains,  overlooked  in  the  removal.   The   tabs   utility
+       documented  in Issues 6 and later has no mechanism for setting margins.
+       The +m option in ncurses's implementation differs from the SVr4 feature
+       by using terminal capabilities rather than built-in tables.
+
+       POSIX   documents   no  limit  on  the  number  of  tab  stops.   Other
+       implementations impose one; the limit is 20 in PWB/Unix's tabs utility.
+       While  some  terminals may not accept an arbitrary number of tab stops,
+       ncurses attempts to set tab stops up to the right margin  if  the  list
+       thereof is sufficiently long.
+
+       The  "Rationale" section of the Issue 6 tabs reference page details how
+       the committee considered  redesigning  the  tabs  and  tput  utilities,
+       without settling on an improved solution.  It claims that
+
+           no  known  historical  version  of  tabs supports the capability of
+           setting arbitrary tab stops.
+
+       The  feature  described  in  subsection  "Explicit  Lists"  above   was
+       implemented  in  PWB/Unix,  and  permitted the setting of arbitrary tab
+       stops nevertheless.
+
+
+

                  SEE ALSO

                  +       infocmp(1m), tset(1), curses(3x), terminfo(5)
 
 
 
-                                                                       tabs(1)
+ncurses 6.5                       2025-02-15                           tabs(1)
                  +
                • FILES
                • PORTABILITY
                  • +
                • HISTORY
                • SEE ALSO
                diff --git a/doc/html/man/term.5.html b/doc/html/man/term.5.html index ebeee22a..192bf039 100644 --- a/doc/html/man/term.5.html +++ b/doc/html/man/term.5.html @@ -1,6 +1,7 @@ -term 5 +term 5 2024-06-15 ncurses 6.5 File formats -

                term 5

                +

                term 5 2024-06-15 ncurses 6.5 File formats

                -term(5)                       File Formats Manual                      term(5)
+term(5)                          File formats                          term(5)

                NAME

                -       term - format of compiled term file.
-
-
-

                SYNOPSIS

                -       term
+       term - compiled terminfo terminal description

                DESCRIPTION

                +       tic(1) compiles a terminfo terminal type description, and setupterm(3x)
+       reads it.  A compiled description may be stored  in  a  file  or  in  a
+       database  of, potentially, many such descriptions.  Further, a compiled
+       description may be in one of two formats: one similar to that  used  by
+       System V,  and  a  newer,  extensible  format  employed  exclusively by
+       ncurses.
 
-

                STORAGE LOCATION

                -       Compiled   terminfo   descriptions   are  placed  under  the  directory
-       /usr/share/terminfo.  Two configurations are supported  (when  building
-       the ncurses libraries):
+
+

                Storage Location

                +       Compiled  terminfo  descriptions  are  placed   under   the   directory
+       /usr/share/terminfo.   One  of  two  configurations  is  selected  when
+       building the ncurses libraries.
 
        directory tree
-            A two-level scheme is used to avoid a linear search of a huge UNIX
-            system directory: /usr/share/terminfo/c/name  where  name  is  the
+            A two-level scheme is used to avoid a linear search of a huge Unix
+            system  directory:  /usr/share/terminfo/c/name  where  name is the
             name of the terminal, and c is the first character of name.  Thus,
-            act4  can  be  found  in  the   file   /usr/share/terminfo/a/act4.
-            Synonyms  for  the same terminal are implemented by multiple links
-            to the same compiled file.
+            the  compiled  description of terminal type "act4" is found in the
+            file /usr/share/terminfo/a/act4.  Synonyms for the  same  terminal
+            are implemented by multiple links to the same compiled file.
 
        hashed database
-            Using Berkeley database, two types  of  records  are  stored:  the
-            terminfo  data  in  the  same format as stored in a directory tree
-            with the terminfo's primary name as a key, and records  containing
-            only aliases pointing to the primary name.
-
-            If  built  to  write  hashed  databases,  ncurses  can  still read
-            terminfo databases organized as a directory tree, but cannot write
-            entries  into  the  directory  tree.   It  can  write (or rewrite)
+            Using  the Berkeley database API, two types of records are stored:
+            the terminfo data in the same format as that stored in a directory
+            tree  with  the terminal's primary type name as a key, and records
+            containing only aliases pointing to the primary name.
+
+            If built to write hashed databases, ncurses can still  read  term-
+            info  databases  organized  as  a directory tree, but cannot write
+            entries into the  directory  tree.   It  can  write  (or  rewrite)
             entries in the hashed database.
 
-            ncurses  distinguishes  the  two  cases  in   the   TERMINFO   and
-            TERMINFO_DIRS  environment  variable  by assuming a directory tree
-            for entries that correspond to an existing directory,  and  hashed
+            ncurses   distinguishes   the   two  cases  in  the  TERMINFO  and
+            TERMINFO_DIRS environment variable by assuming  a  directory  tree
+            for entries that correspond to an existing directory, and a hashed
             database otherwise.
 
 
-

                LEGACY STORAGE FORMAT

                +

                Legacy Storage Format

                        The format has been chosen so that it will be the same on all hardware.
-       An 8 or more bit  byte  is  assumed,  but  no  assumptions  about  byte
-       ordering or sign extension are made.
+       A  byte  of  at  least eight bits' width is assumed, but no assumptions
+       about bit ordering or sign extension are made.
 
-       The  compiled  file  is  created  with the tic program, and read by the
-       routine setupterm(3x).  The file is divided into six parts:
+       The file is divided into six parts:
 
-            a) header,
+            (a) header,
 
-            b) terminal names,
+            (b) terminal names,
 
-            c) boolean flags,
+            (c) Boolean flags,
 
-            d) numbers,
+            (d) numbers,
 
-            e) strings, and
+            (e) strings, and
 
-            f) string table.
+            (f) a string table.
 
        The header section begins the file.  This section  contains  six  short
        integers in the format described below.  These integers are
 
-            (1) the magic number (octal 0432);
+            (1) the magic number
+                 (octal 0432);
 
-            (2) the size, in bytes, of the terminal names section;
+            (2) the size,
+                 in bytes, of the terminal names section;
 
-            (3) the number of bytes in the boolean flags section;
+            (3) the number of bytes in the Boolean flags section;
 
             (4) the number of short integers in the numbers section;
 
-            (5) the number of offsets (short integers) in the strings section;
+            (5) the number of offsets
+                 (short integers) in the strings section;
 
-            (6) the size, in bytes, of the string table.
+            (6) the size,
+                 in bytes, of the string table.
 
-       The  capabilities  in  the boolean flags, numbers, and strings sections
-       are in the same order as the file <term.h>.
+       The  capabilities  in  the Boolean flags, numbers, and strings sections
+       are in the same order as in the header file term.h.
 
-       Short integers are signed, in the range  -32768  to  32767.   They  are
-       stored  as  two  8-bit  bytes.   The  first  byte  contains  the  least
-       significant 8 bits of the value, and the second byte contains the  most
-       significant 8 bits.  (Thus, the value represented is 256*second+first.)
-       This format corresponds to the hardware of the VAX and PDP-11 (that is,
-       little-endian  machines).   Machines  where this does not correspond to
-       the hardware must read the  integers  as  two  bytes  and  compute  the
-       little-endian value.
+       Short integers are signed, in the range -32768 to 32767, and stored  in
+       little-endian format.
 
        Numbers  in  a  terminal  description,  whether they are entries in the
        numbers or strings table, are positive  integers.   Boolean  flags  are
        treated  as  positive  one-byte integers.  In each case, those positive
-       integers represent a terminal capability.  The  terminal  compiler  tic
+       integers represent a terminal capability.  The  terminal  compiler  tic
        uses  negative  integers  to handle the cases where a capability is not
        available:
 
-       o   If a capability is absent from this terminal, tic stores  a  -1  in
+       o   If a capability is absent from this terminal, tic stores  a  -1  in
            the corresponding table.
 
            The integer value -1 is represented by two bytes 0377, 0377.
-           Absent boolean values are represented by the byte 0 (false).
+           Absent Boolean values are represented by the byte 0 (false).
 
-       o   If  a capability has been canceled from this terminal, tic stores a
+       o   If  a capability has been canceled from this terminal, tic stores a
            -2 in the corresponding table.
 
            The integer value -2 is represented by two bytes 0377, 0376.
-           The boolean value -2 is represented by the byte 0376.
+           The Boolean value -2 is represented by the byte 0376.
 
        o   Other negative values are illegal.
 
        The terminal names section comes after the  header.   It  contains  the
-       first  line  of the terminfo description, listing the various names for
+       first  line  of the terminfo description, listing the various names for
        the terminal, separated by  the  "|"  character.   The  terminal  names
        section is terminated with an ASCII NUL character.
 
-       The  boolean  flags  section  has  one  byte  for  each  flag.  Boolean
+       The  Boolean  flags  section  has  one  byte  for  each  flag.  Boolean
        capabilities are either 1 or 0 (true or false) according to whether the
        terminal supports the given capability or not.
 
-       Between  the  boolean flags section and the number section, a null byte
+       Between  the  Boolean flags section and the number section, a null byte
        will be inserted, if necessary,  to  ensure  that  the  number  section
        begins  on  an even byte This is a relic of the PDP-11's word-addressed
        architecture, originally designed to avoid traps induced by  addressing
        a  word  on  an odd byte boundary.  All short integers are aligned on a
        short word boundary.
 
-       The numbers section is similar to  the  boolean  flags  section.   Each
+       The numbers section is similar to  the  Boolean  flags  section.   Each
        capability  takes  up two bytes, and is stored as a little-endian short
        integer.
 
@@ -181,27 +182,27 @@ 
                term 5
                
        string capabilities referenced in the strings section.  Each string  is
        null-terminated.  Special characters in ^X or \c notation are stored in
        their interpreted  form,  not  the  printing  representation.   Padding
-       information  $<nn>  and  parameter  information %x are stored intact in
+       information  $<nn>  and  parameter  information %x are stored intact in
        uninterpreted form.
 
 
-

                EXTENDED STORAGE FORMAT

                -       The previous section describes the conventional terminfo binary format.
+

                Extended Storage Format

                +       The previous section describes the conventional terminfo binary format.
        With  some  minor variations of the offsets (see PORTABILITY), the same
-       binary format is used in all modern UNIX systems.  Each system  uses  a
-       predefined set of boolean, number or string capabilities.
+       binary format is used in all modern Unix systems.  Each system  uses  a
+       predefined set of Boolean, number or string capabilities.
 
-       The ncurses libraries and applications support extended terminfo binary
-       format, allowing users to  define  capabilities  which  are  loaded  at
+       The ncurses libraries and applications support extended terminfo binary
+       format, allowing users  to  define  capabilities  that  are  loaded  at
        runtime.   This  extension  is made possible by using the fact that the
-       other implementations stop reading the terminfo  data  when  they  have
-       reached  the  end  of the size given in the header.  ncurses checks the
-       size, and if it exceeds that due to the predefined data,  continues  to
-       parse according to its own scheme.
+       other implementations stop reading the terminfo data  when  they  reach
+       the  end of the size given in the header.  ncurses checks the size, and
+       if it exceeds that due to  the  predefined  data,  continues  to  parse
+       according to its own scheme.
 
        First, it reads the extended header (5 short integers):
 
-            (1)  count of extended boolean capabilities
+            (1)  count of extended Boolean capabilities
 
             (2)  count of extended numeric capabilities
 
@@ -214,23 +215,27 @@ 
                term 5
                
        The  count-  and  size-values for the extended string table include the
        extended capability names as well as extended capability values.
 
-       Using the counts and sizes, ncurses allocates arrays and reads data for
+       Using the counts and sizes, ncurses allocates arrays and reads data for
        the extended capabilities in the same order as the header information.
 
        The  extended  string  table  contains  values for string capabilities.
        After the end of these values, it contains the names for  each  of  the
-       extended  capabilities  in  order,  e.g.,  booleans,  then  numbers and
-       finally strings.
+       extended capabilities in order: Boolean, numeric, and string.
+
+       By  storing  terminal  descriptions  in  this  way,  ncurses is able to
+       provide  a  database  useful  with  legacy  applications,  as  well  as
+       providing  data  for applications that require more information about a
+       terminal type than was anticipated by X/Open Curses.  See  user_caps(5)
+       for an overview of the way ncurses uses this extended information.
 
-       Applications which manipulate terminal data  can  use  the  definitions
-       described  in  term_variables(3x)  which  associate the long capability
-       names with members of a TERMTYPE structure.
+       Applications  that  manipulate  terminal  data  can use the definitions
+       described in term_variables(3x) associating the long  capability  names
+       with members of a TERMTYPE structure.
 
 
-

                EXTENDED NUMBER FORMAT

                -       On occasion, 16-bit signed integers are not large enough.  With ncurses
-       6.1,  a new format was introduced by making a few changes to the legacy
-       format:
+

                Extended Number Format

                +       On  occasion, 16-bit signed integers are not large enough.  ncurses 6.1
+       introduced a new format by making a few changes to the legacy format:
 
        o   a different magic number (octal 01036)
 
@@ -238,10 +243,15 @@ 
                term 5
                
            to signed 32-bit integers.
 
        To   maintain   compatibility,  the  library  presents  the  same  data
-       structures to direct users of the TERMTYPE  structure  as  in  previous
+       structures to direct users of the TERMTYPE  structure  as  in  previous
        formats.   However,  that  cannot  provide  callers  with  the extended
        numbers.   The  library  uses  a  similar  but  hidden  data  structure
-       TERMTYPE2 to provide data for the terminfo functions.
+       TERMTYPE2 to provide data for the terminfo functions.
+
+
+

                FILES

                +       /usr/share/terminfo
+              compiled terminal description database

                PORTABILITY

                @@ -255,97 +265,70 @@ 
                term 5
                
        (resulting in missing entries).  The routine setupterm must be prepared
        for  both  possibilities  -  this  is  why  the  numbers  and sizes are
        included.  Also, new capabilities must always be added at  the  end  of
-       the lists of boolean, number, and string capabilities.
-
-
-

                Binary format

                -       X/Open  Curses  does  not  specify  a format for the terminfo database.
-       UNIX System V curses used a directory-tree of  binary  files,  one  per
-       terminal description.
-
-       Despite  the  consistent  use  of  little-endian  for  numbers  and the
-       otherwise  self-describing  format,  it  is  not  wise  to   count   on
-       portability   of   binary  terminfo  entries  between  commercial  UNIX
-       versions.  The problem is that there are at  least  three  versions  of
-       terminfo  (under  HP-UX,  AIX,  and OSF/1) which diverged from System V
-       terminfo after SVr1, and  have  added  extension  capabilities  to  the
-       string  table that (in the binary format) collide with System V and XSI
-       Curses extensions.  See terminfo(5) for detailed discussion of terminfo
-       source compatibility issues.
-
-       This  implementation  is by default compatible with the binary terminfo
-       format used by Solaris curses, except in a few less-used details  where
+       the lists of Boolean, number, and string capabilities.
+
+
+

                Binary Format

                +       X/Open  Curses  does  not  specify  a format for the terminfo database.
+       System V curses used a directory-tree of binary files, one per terminal
+       description.
+
+       Despite  the  consistent use of little-endian numbers and the otherwise
+       self-describing format, it is not  wise  to  count  on  portability  of
+       binary  terminfo entries between commercial Unix versions.  The problem
+       is that there are at least three versions  of  terminfo  (under  HP-UX,
+       AIX,  and  OSF/1)  each  of which diverged from System V terminfo after
+       SVr1, and added extension capabilities to the string table that (in the
+       binary format) collide with System V and X/Open Curses extensions.  See
+       terminfo(5) for detailed discussion of  terminfo  source  compatibility
+       issues.
+
+       This  implementation  is by default compatible with the binary terminfo
+       format used by Solaris curses, except in a few less-used details  where
        it  was  found that the latter did not match X/Open Curses.  The format
-       used by the other Unix versions can be matched by building ncurses with
+       used by the other Unix versions can be matched by building ncurses with
        different configuration options.
 
 
-

                Magic codes

                -       The  magic  number  in a binary terminfo file is the first 16-bits (two
+

                Magic Codes

                +       The  magic  number  in a binary terminfo file is the first 16 bits (two
        bytes).  Besides making it more reliable for the library to check  that
-       a  file  is  terminfo,  utilities such as file(1) also use that to tell
+       a  file  is  terminfo,  utilities such as file(1) also use that to tell
        what the file-format is.  System V defined more than one magic  number,
        with 0433, 0435 as screen-dumps (see scr_dump(5)).  This implementation
        uses 01036 as a continuation of that sequence,  but  with  a  different
        high-order byte to avoid confusion.
 
+   The TERMTYPE Structure
+       Direct  access  to  the  TERMTYPE  structure  is  provided  for  legacy
+       applications.   Portable  applications  should  use  tigetflag(3x)  and
+       related functions to read terminal capabilities.
 
-

                The TERMTYPE structure

                -       Direct  access  to  the  TERMTYPE  structure  is  provided  for  legacy
-       applications.  Portable  applications  should  use  the  tigetflag  and
-       related  functions  described in curs_terminfo(3x) for reading terminal
-       capabilities.
 
-
-

                Mixed-case terminal names

                -       A small number of terminal descriptions  use  uppercase  characters  in
-       their  names.   If  the  underlying  filesystem  ignores the difference
-       between  uppercase  and  lowercase,  ncurses  represents   the   "first
-       character"  of  the  terminal  name used as the intermediate level of a
+

                Mixed-case Terminal Names

                +       A  small  number  of  terminal descriptions use uppercase characters in
+       their names.  If the underlying  file  system  ignores  the  difference
+       between   uppercase   and  lowercase,  ncurses  represents  the  "first
+       character" of the terminal name used as the  intermediate  level  of  a
        directory tree in (two-character) hexadecimal form.
 
 
-

                EXAMPLE

                -       As an example, here is a description  for  the  Lear-Siegler  ADM-3,  a
-       popular though rather stupid early terminal:
-
-           adm3a|lsi adm3a,
-                   am,
-                   cols#80, lines#24,
-                   bel=^G, clear= 32$<1>, cr=^M, cub1=^H, cud1=^J,
-                   cuf1=^L, cup=\E=%p1%{32}%+%c%p2%{32}%+%c, cuu1=^K,
-                   home=^^, ind=^J,
-
-
-       and a hexadecimal dump of the compiled terminal description:
-
-           0000  1a 01 10 00 02 00 03 00  82 00 31 00 61 64 6d 33  ........ ..1.adm3
-           0010  61 7c 6c 73 69 20 61 64  6d 33 61 00 00 01 50 00  a|lsi ad m3a...P.
-           0020  ff ff 18 00 ff ff 00 00  02 00 ff ff ff ff 04 00  ........ ........
-           0030  ff ff ff ff ff ff ff ff  0a 00 25 00 27 00 ff ff  ........ ..%.'...
-           0040  29 00 ff ff ff ff 2b 00  ff ff 2d 00 ff ff ff ff  ).....+. ..-.....
-           0050  ff ff ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  ........ ........
-           0060  ff ff ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  ........ ........
-           0070  ff ff ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  ........ ........
-           0080  ff ff ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  ........ ........
-           0090  ff ff ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  ........ ........
-           00a0  ff ff ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  ........ ........
-           00b0  ff ff ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  ........ ........
-           00c0  ff ff ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  ........ ........
-           00d0  ff ff ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  ........ ........
-           00e0  ff ff ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  ........ ........
-           00f0  ff ff ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  ........ ........
-           0100  ff ff ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  ........ ........
-           0110  ff ff ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  ........ ........
-           0120  ff ff ff ff ff ff 2f 00  07 00 0d 00 1a 24 3c 31  ....../. .....$<1
-           0130  3e 00 1b 3d 25 70 31 25  7b 33 32 7d 25 2b 25 63  >..=%p1% {32}%+%c
-           0140  25 70 32 25 7b 33 32 7d  25 2b 25 63 00 0a 00 1e  %p2%{32} %+%c....
-           0150  00 08 00 0c 00 0b 00 0a  00                       ........ .
-
-
-
-

                LIMITS

                -       Some limitations:
+

                Limits

                +       ncurses stores compiled terminal descriptions in three related formats,
+       described in the subsections
+
+       o   Legacy Storage Format, and
+
+       o   Extended Storage Format, and
+
+       o   Extended Number Format.
+
+       The legacy storage format and the extended number format differ by  the
+       types  of  numeric  capability  that  they  can store (for example, 16-
+       versus 32-bit integers).  The extended  storage  format  introduced  by
+       ncurses 5.0 adds data to either of these formats.
+
+       Some limitations apply:
 
        o   total  compiled  entries  cannot  exceed  4096  bytes in the legacy
            format.
@@ -357,57 +340,89 @@ 
                term 5
                
 
        Compiled  entries  are  limited to 32768 bytes because offsets into the
        strings table use two-byte integers.   The  legacy  format  could  have
-       supported  32768-byte  entries, but was limited a virtual memory page's
-       4096 bytes.
-
-
-

                FILES

                -       /usr/share/terminfo/*/*  compiled terminal capability database
-
-
-

                SEE ALSO

                -       curses(3x), terminfo(5).
+       supported  32768-byte  entries,  but  was  limited  to a virtual memory
+       page's 4096 bytes.
+
+
+

                EXAMPLES

                +       Here is a terminfo description of the  Lear-Siegler  ADM-3,  a  popular
+       though rather stupid early terminal.
+
+       adm3a|lsi adm3a,
+               am,
+               cols#80, lines#24,
+               bel=^G, clear=\032$<1>, cr=^M, cub1=^H, cud1=^J,
+               cuf1=^L, cup=\E=%p1%{32}%+%c%p2%{32}%+%c, cuu1=^K,
+               home=^^, ind=^J,
+
+       A  hexadecimal  dump  of  its  compiled terminal description (in legacy
+       format) follows.
+
+       0000  1a 01 10 00 02 00 03 00  82 00 31 00 61 64 6d 33  ........ ..1.adm3
+       0010  61 7c 6c 73 69 20 61 64  6d 33 61 00 00 01 50 00  a|lsi ad m3a...P.
+       0020  ff ff 18 00 ff ff 00 00  02 00 ff ff ff ff 04 00  ........ ........
+       0030  ff ff ff ff ff ff ff ff  0a 00 25 00 27 00 ff ff  ........ ..%.'...
+       0040  29 00 ff ff ff ff 2b 00  ff ff 2d 00 ff ff ff ff  ).....+. ..-.....
+       0050  ff ff ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  ........ ........
+       0060  ff ff ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  ........ ........
+       0070  ff ff ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  ........ ........
+       0080  ff ff ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  ........ ........
+       0090  ff ff ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  ........ ........
+       00a0  ff ff ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  ........ ........
+       00b0  ff ff ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  ........ ........
+       00c0  ff ff ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  ........ ........
+       00d0  ff ff ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  ........ ........
+       00e0  ff ff ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  ........ ........
+       00f0  ff ff ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  ........ ........
+       0100  ff ff ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  ........ ........
+       0110  ff ff ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  ........ ........
+       0120  ff ff ff ff ff ff 2f 00  07 00 0d 00 1a 24 3c 31  ....../. .....$<1
+       0130  3e 00 1b 3d 25 70 31 25  7b 33 32 7d 25 2b 25 63  >..=%p1% {32}%+%c
+       0140  25 70 32 25 7b 33 32 7d  25 2b 25 63 00 0a 00 1e  %p2%{32} %+%c....
+       0150  00 08 00 0c 00 0b 00 0a  00                       ........ .

                AUTHORS

                        Thomas E. Dickey
-       extended terminfo format for ncurses 5.0
-       hashed database support for ncurses 5.6
-       extended number support for ncurses 6.1
+       extended terminfo format for ncurses 5.0
+       hashed database support for ncurses 5.6
+       extended number support for ncurses 6.1
 
        Eric S. Raymond
-       documented legacy terminfo format, e.g., from pcurses.
+       documented legacy terminfo format (that used by pcurses).
 
 
+

                SEE ALSO

                +       curses(3x), curs_terminfo(3x), terminfo(5), user_caps(5)
 
-                                                                       term(5)
+
+
+ncurses 6.5                       2024-06-15                           term(5)
                diff --git a/doc/html/man/term.7.html b/doc/html/man/term.7.html index 009f6741..f19821b1 100644 --- a/doc/html/man/term.7.html +++ b/doc/html/man/term.7.html @@ -1,6 +1,6 @@ -term 7 +term 7 2024-05-11 ncurses 6.5 Miscellaneous -

                term 7

                +

                term 7 2024-05-11 ncurses 6.5 Miscellaneous

                -term(7)                Miscellaneous Information Manual                term(7)
+term(7)                          Miscellaneous                         term(7)
 
 
 
@@ -51,35 +51,35 @@ 
                term 7

                DESCRIPTION

                -       The  environment variable TERM should normally contain the type name of
+       The  environment variable TERM should normally contain the type name of
        the terminal, console or  display-device  type  you  are  using.   This
        information  is  critical  for  all screen-oriented programs, including
        your editor and mailer.
 
-       A default TERM value  will  be  set  on  a  per-line  basis  by  either
-       /etc/inittab  (e.g.,  System-V-like  UNIXes) or /etc/ttys (BSD UNIXes).
+       A default TERM value  will  be  set  on  a  per-line  basis  by  either
+       /etc/inittab  (e.g.,  System-V-like  Unices) or /etc/ttys (BSD Unices).
        This will nearly  always  suffice  for  workstation  and  microcomputer
        consoles.
 
        If  you  use a dialup line, the type of device attached to it may vary.
-       Older UNIX systems pre-set a very dumb terminal  type  like  "dumb"  or
+       Older Unix systems pre-set a very dumb terminal  type  like  "dumb"  or
        "dialup"  on  dialup lines.  Newer ones may pre-set "vt100", reflecting
        the prevalence of DEC VT100-compatible terminals and  personal-computer
        emulators.
 
-       Modern  telnets pass your TERM environment variable from the local side
+       Modern  telnets pass your TERM environment variable from the local side
        to the remote one.  There can be problems if  the  remote  terminfo  or
        termcap  entry  for  your  type  is not compatible with yours, but this
        situation is rare and  can  almost  always  be  avoided  by  explicitly
        exporting  "vt100"  (assuming  you  are  in fact using a VT100-superset
        console, terminal, or terminal emulator).
 
-       In any case, you are free to override the system TERM setting  to  your
+       In any case, you are free to override the system TERM setting  to  your
        taste in your shell profile.  The tset(1) utility may be of assistance;
        you can give it a set of rules for deducing or  requesting  a  terminal
        type based on the tty device and baud rate.
 
-       Setting  your  own  TERM value may also be useful if you have created a
+       Setting  your  own  TERM value may also be useful if you have created a
        custom entry incorporating options (such as  visual  bell  or  reverse-
        video)  which  you  wish  to  override the system default type for your
        line.
@@ -88,14 +88,14 @@ 
                term 7
                
        underneath /usr/share/terminfo.  To browse a list of all terminal names
        recognized by the system, do
 
-            toe | more
+               toe | more
 
        from your shell.   These  capability  files  are  in  a  binary  format
        optimized for retrieval speed (unlike the old text-based termcap format
        they replace); to examine  an  entry,  you  must  use  the  infocmp(1m)
        command.  Invoke it as follows:
 
-            infocmp entry_name
+               infocmp entry_name
 
        where  entry_name  is the name of the type you wish to examine (and the
        name of its capability file  the  subdirectory  of  /usr/share/terminfo
@@ -105,7 +105,7 @@ 
                term 7
                
        The first line of a terminfo(5) description gives the  names  by  which
        terminfo  knows a terminal, separated by "|" (pipe-bar) characters with
        the last name field terminated by a comma.  The first name field is the
-       type's primary name, and is the one to use when setting TERM.  The last
+       type's primary name, and is the one to use when setting TERM.  The last
        name field (if distinct from the first) is actually  a  description  of
        the  terminal  type  (it  may contain blanks; the others must be single
        words).  Name fields between  the  first  and  last  (if  present)  are
@@ -191,39 +191,39 @@ 
                term 7
                
 
        Commands which use a terminal type to control display often accept a -T
        option that accepts a terminal name  argument.   Such  programs  should
-       fall  back  on  the  TERM  environment  variable  when  no -T option is
+       fall  back  on  the  TERM  environment  variable  when  no -T option is
        specified.
 
 
-

                PORTABILITY

                -       For maximum compatibility with older System V UNIXes, names and aliases
-       should be unique within the first 14 characters.
+

                FILES

                +       /usr/share/terminfo
+              compiled terminal description database
 
+       /etc/inittab
+              tty line initialization (AT&T-like Unices)
 
-

                FILES

                -       /usr/share/terminfo/?/*
-            compiled terminal capability database
+       /etc/ttys
+              tty line initialization (BSD-like Unices)
 
-       /etc/inittab
-            tty line initialization (AT&T-like UNIXes)
 
-       /etc/ttys
-            tty line initialization (BSD-like UNIXes)
+

                PORTABILITY

                +       For maximum compatibility with older System V Unices, names and aliases
+       should be unique within the first 14 characters.

                SEE ALSO

                -       curses(3x), terminfo(5), term(5).
+       curses(3x), term(5), terminfo(5)
 
 
 
-                                                                       term(7)
+ncurses 6.5                       2024-05-11                           term(7)
                diff --git a/doc/html/man/term_variables.3x.html b/doc/html/man/term_variables.3x.html index 4dd4977d..62d1cc34 100644 --- a/doc/html/man/term_variables.3x.html +++ b/doc/html/man/term_variables.3x.html @@ -1,6 +1,6 @@ -term_variables 3x +term_variables 3x 2024-12-28 ncurses 6.5 Library calls -

                term_variables 3x

                +

                term_variables 3x 2024-12-28 ncurses 6.5 Library calls

                -term_variables(3x)                                          term_variables(3x)
+term_variables(3x)               Library calls              term_variables(3x)

                NAME

                -       SP, acs_map, boolcodes, boolfnames, boolnames, cur_term, numcodes,
-       numfnames, numnames, strcodes, strfnames, strnames, ttytype - curses
-       terminfo global variables
+       SP,  acs_map,  boolcodes,  boolfnames,  boolnames,  cur_term, numcodes,
+       numfnames, numnames, strcodes, strfnames, strnames, ttytype -  terminfo
+       global variables

                SYNOPSIS

                @@ -78,105 +78,104 @@ 
                term_variables 3x

                DESCRIPTION

                -       This  page  summarizes  variables provided by the curses library's low-
-       level terminfo interface.  A more complete description is given in  the
+       This  page summarizes variables provided by the curses library's lower-
+       level terminfo interface.  Locate a more complete  description  in  the
        curs_terminfo(3x) manual page.
 
-       Depending  on  the  configuration,  these  may  be actual variables, or
-       macros (see curs_threads(3x)) which provide read-only access  to  curs-
-       es's state.  In either case, applications should treat them as read-on-
-       ly to avoid confusing the library.
+       Depending  on  ncurses's  build-time configuration, these may be actual
+       variables, or macros  (see  curs_threads(3x))  that  provide  read-only
+       access  to  curses's  state.  In either case, applications should treat
+       them as read-only to avoid confusing the library.

                Alternate Character Set Mapping

                -       After initializing the curses or terminfo interfaces, the acs_map array
+       After initializing the curses or terminfo interfaces, the acs_map array
        holds  information  used to translate cells with the A_ALTCHARSET video
        attribute into line-drawing characters.
 
        The encoding of the information in this array has changed periodically.
        Application  developers  need  only know that it is used for the "ACS_"
-       constants in <curses.h>.
+       constants in curses.h.
 
-       The comparable data for the wide-character library is a  private  vari-
-       able.
+       The comparable data for the wide-character library are not  exposed  as
+       symbols in the API.

                Current Terminal Data

                -       After initializing the curses or terminfo interfaces, the cur_term con-
-       tains data describing the current terminal.  This variable is also  set
-       as a side-effect of set_term(3x) and delscreen(3x).
+       After initializing the curses or terminfo interfaces, cur_term contains
+       data describing the current terminal.  It is also updated  as  a  side-
+       effect of set_term(3x) and delscreen(3x).
 
-       It  is possible to save a value of cur_term for subsequent use as a pa-
-       rameter to set_term, for switching between screens.  Alternatively, one
-       can  save  the  return  value from newterm or setupterm(3x) to reuse in
-       set_term.
+       It  is  possible  to  save  a value of cur_term for subsequent use as a
+       parameter   to   set_term(3x)   for    switching    between    screens.
+       Alternatively,  one  can  save  the  return  value  from newterm(3x) or
+       setupterm(3x) to reuse in set_term(3x).
 
 
-

                Terminfo Lookup Tables

                +

                terminfo Lookup Tables

                        The tic(1) and infocmp(1) programs use lookup tables for the  long  and
-       short  names  of  terminfo  capabilities,  as well as the corresponding
-       names for termcap capabilities.  These are available to other  applica-
-       tions,  although the hash-tables used by the terminfo and termcap func-
-       tions are not available.
+       short  names  of  terminfo  capabilities,  as well as the corresponding
+       names  for  termcap  capabilities.   These  are  available   to   other
+       applications,  though  the hash tables used by the terminfo and termcap
+       functions are not.
 
-       The long terminfo capability names use a  "f"  (eff)  in  their  names:
-       boolfnames, numfnames, and strfnames.
-
-       These  are  the  short names for terminfo capabilities: boolnames, num-
-       names, and strnames.
-
-       These are the corresponding names used for termcap descriptions:  bool-
-       codes, numcodes, and strcodes.
+       terminfo stores capability names in arrays with an "f" (eff)  in  their
+       names:  boolfnames,  numfnames,  and  strfnames.  It stores the briefer
+       capability codes in arrays without the "f":  boolnames,  numnames,  and
+       strnames.   The  corresponding  termcap  capability codes are stored in
+       boolcodes, numcodes, and strcodes.  terminfo(5) catalogs these.

                Terminal Type

                        A terminal description begins with one or more terminal names separated
-       by "|" (vertical bars).  On initialization of the  curses  or  terminfo
-       interfaces,  setupterm(3x)  copies the terminal names to the array tty-
-       type.
+       by  "|"  (vertical  bars).  On initialization of the curses or terminfo
+       interfaces,  setupterm(3x)  copies  the  terminal  name  to  the  array
+       ttytype.
 
 
-

                Terminfo Names

                -       In addition to the variables, <term.h> also defines a symbol  for  each
-       terminfo  capability  long name.  These are in terms of the symbol CUR,
-       which is defined
+

                terminfo Names

                +       In  addition  to  the  variables, term.h also defines a symbol for each
+       terminfo capability name.  These are in terms of the symbol CUR,  which
+       is defined
 
-       #define CUR ((TERMTYPE *)(cur_term))->
+              #define CUR ((TERMTYPE *)(cur_term))->
 
-       These symbols provide a faster method of accessing  terminfo  capabili-
-       ties than using tigetstr(3x), etc.
+       These   symbols   provide   a   faster  method  of  accessing  terminfo
+       capabilities than using, for example, tigetstr(3x).
 
-       The  actual definition of CUR depends upon the implementation, but each
-       terminfo library provides these long names defined to  point  into  the
-       current terminal description loaded into memory.
+       The definition of CUR is implementation-dependent,  but  each  terminfo
+       library  defines these names to point into the in-memory description of
+       the  current  terminal.   For  example,  in  ncurses,  the  expressions
+       tigetstr("key_dc") and "CUR Strings[59]" are equivalent.
 
 
-

                NOTES

                -       The  low-level  terminfo  interface is initialized using setupterm(3x).
-       The upper-level curses interface uses the low-level terminfo interface,
-       internally.
+

                terminfo and curses

                +       setupterm(3x)  initializes  the  lower-level  terminfo  interface.  The
+       higher-level curses interface uses the terminfo  interface  internally;
+       the symbol SP bridges the curses SCREEN type with the terminfo TERMINAL
+       type.

                PORTABILITY

                -       X/Open Curses does not describe any of these except for cur_term.  (The
-       inclusion of cur_term appears to be an oversight, since other  compara-
-       ble low-level information is omitted by X/Open).
+       X/Open Curses does  not  describe  any  of  these  symbols  except  for
+       cur_term.  (The inclusion of cur_term appears to be an oversight, since
+       other comparable low-level information is omitted by X/Open.)
 
-       Other  implementations may have comparable variables.  Some implementa-
-       tions provide the variables in their libraries, but omit them from  the
-       header files.
+       Other   implementations   may   have   comparable   variables.     Some
+       implementations provide the variables in their libraries, but omit them
+       from the header files.
 
-       All  implementations  which provide terminfo interfaces add definitions
-       as described in the Terminfo Names section.  Most, but  not  all,  base
-       the definition upon the cur_term variable.
+       All implementations that provide terminfo interfaces add definitions as
+       described  in  the  "terminfo Names" section above.  Most, but not all,
+       base the definition upon the cur_term variable.

                SEE ALSO

                -       curses(3x), curs_terminfo(3x), curs_threads(3x), terminfo(5).
+       curses(3x), curs_terminfo(3x), curs_threads(3x), terminfo(5)
 
 
 
-                                                            term_variables(3x)
+ncurses 6.5                       2024-12-28                term_variables(3x)
                diff --git a/doc/html/man/terminfo.5.html b/doc/html/man/terminfo.5.html index d5ad0da3..cc97140e 100644 --- a/doc/html/man/terminfo.5.html +++ b/doc/html/man/terminfo.5.html @@ -5,7 +5,7 @@ * Note: this must be run through tbl before nroff. * The magic cookie on the first line triggers this under some man programs. **************************************************************************** - * Copyright 2018-2020,2021 Thomas E. Dickey * + * Copyright 2018-2023,2024 Thomas E. Dickey * * Copyright 1998-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -32,62 +32,27 @@ * sale, use or other dealings in this Software without prior written * * authorization. * **************************************************************************** - * @Id: terminfo.head,v 1.42 2021/12/25 17:39:16 tom Exp @ - * Head of terminfo man page ends here - **************************************************************************** - * Copyright 2018-2021,2022 Thomas E. Dickey * - * Copyright 1998-2016,2017 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 * - * "Software"), to deal in the Software without restriction, including * - * without limitation the rights to use, copy, modify, merge, publish, * - * distribute, distribute with modifications, sublicense, and/or sell * - * copies of the Software, and to permit persons to whom the Software is * - * furnished to do so, subject to the following conditions: * - * * - * The above copyright notice and this permission notice shall be included * - * in all copies or substantial portions of the Software. * - * * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS * - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. * - * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, * - * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR * - * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR * - * THE USE OR OTHER DEALINGS IN THE SOFTWARE. * - * * - * Except as contained in this notice, the name(s) of the above copyright * - * holders shall not be used in advertising or otherwise to promote the * - * sale, use or other dealings in this Software without prior written * - * authorization. * - **************************************************************************** - * @Id: terminfo.tail,v 1.113 2022/12/10 19:51:10 tom Exp @ - *.in -2 - *.in +2 - *.in -2 - *.in +2 - *.TH + * @Id: terminfo.head,v 1.66 2024/05/11 20:39:53 tom Exp @ --> -terminfo 5 File Formats +terminfo 5 2024-05-11 ncurses 6.5 File formats -

                terminfo 5 File Formats

                +

                terminfo 5 2024-05-11 ncurses 6.5 File formats

                -terminfo(5)                      File Formats                      terminfo(5)
+terminfo(5)                      File formats                      terminfo(5)

                NAME

                -       terminfo - terminal capability database
+       terminfo - terminal capability database

                SYNOPSIS

                @@ -106,10 +71,10 @@ 
                terminfo 5   File Formats
                
        have, by specifying how to perform screen operations, and by specifying
        padding requirements and initialization sequences.
 
-       This manual describes ncurses version 6.4 (patch 20230311).
+       This document describes ncurses version 6.5 (patch 20250301).
 
 
-

                Terminfo Entry Syntax

                +

                terminfo Entry Syntax

                        Entries in terminfo consist of a sequence of fields:
 
        o   Each field ends with a comma "," (embedded commas  may  be  escaped
@@ -148,7 +113,7 @@ 
                terminfo 5   File Formats
                
        o   Lines  beginning  with  a  "#"  in  the first column are treated as
            comments.
 
-           While comment lines are legal at any point, the output of captoinfo
+           While comment lines are valid at any point, the output of captoinfo
            and  infotocap  (aliases  for tic) will move comments so they occur
            only between entries.
 
@@ -160,35 +125,36 @@ 
                terminfo 5   File Formats
                
        suffix.   Thus,  a  vt100  in  132-column  mode  would be vt100-w.  The
        following suffixes should be used where possible:
 
-            Suffix                  Meaning                   Example
-            -nn      Number of lines on the screen            aaa-60
-            -np      Number of pages of memory                c100-4p
-            -am      With automargins (usually the default)   vt100-am
-            -m       Mono mode; suppress color                ansi-m
-            -mc      Magic cookie; spaces when highlighting   wy30-mc
-            -na      No arrow keys (leave them in local)      c100-na
-            -nam     Without automatic margins                vt100-nam
-            -nl      No status line                           att4415-nl
-            -ns      No status line                           hp2626-ns
-            -rv      Reverse video                            c100-rv
-            -s       Enable status line                       vt100-s
-            -vb      Use visible bell instead of beep         wy370-vb
-            -w       Wide mode (> 80 columns, usually 132)    vt100-w
+       Suffix   Example     Meaning
+       ------------------------------------------------------------------------
+       -nn      aaa-60      Number of lines on the screen
+       -np      c100-4p     Number of pages of memory
+       -am      vt100-am    With automargins (usually the default)
+       -m       ansi-m      Mono mode; suppress color
+       -mc      wy30-mc     Magic cookie; spaces when highlighting
+       -na      c100-na     No arrow keys (leave them in local)
+       -nam     vt100-nam   Without automatic margins
+       -nl      hp2621-nl   No status line
+       -ns      hp2626-ns   No status line
+       -rv      c100-rv     Reverse video
+       -s       vt100-s     Enable status line
+       -vb      wy370-vb    Use visible bell instead of beep
+       -w       vt100-w     Wide mode (> 80 columns, usually 132)
 
        For more on terminal naming conventions, see the term(7) manual page.
 
 
-

                Terminfo Capabilities Syntax

                +

                terminfo Capabilities Syntax

                        The terminfo entry consists of  several  capabilities,  i.e.,  features
        that  the  terminal  has,  or  methods  for  exercising  the terminal's
        features.
 
        After the first field (giving the name(s) of the terminal entry), there
-       should be one or more capability fields.  These are boolean, numeric or
+       should be one or more capability fields.  These are Boolean, numeric or
        string names with corresponding values:
 
        o   Boolean capabilities are true  when  present,  false  when  absent.
-           There is no explicit value for boolean capabilities.
+           There is no explicit value for Boolean capabilities.
 
        o   Numeric  capabilities  have  a  "#"  following  the  name,  then an
            unsigned decimal integer value.
@@ -239,901 +205,727 @@ 
                terminfo 5   File Formats

                Predefined Capabilities

                -       The following is a complete table of the  capabilities  included  in  a
-       terminfo  description  block  and available to terminfo-using code.  In
-       each line of the table,
-
-       The variable is the name by  which  the  programmer  (at  the  terminfo
-       level) accesses the capability.
-
-       The  capname is the short name used in the text of the database, and is
-       used by a person updating the database.   Whenever  possible,  capnames
-       are chosen to be the same as or similar to the ANSI X3.64-1979 standard
-       (now superseded by  ECMA-48,  which  uses  identical  or  very  similar
-       names).    Semantics   are   also   intended  to  match  those  of  the
-       specification.
-
-       The termcap code is the old termcap capability name (some  capabilities
-       are new, and have names which termcap did not originate).
-
-       Capability  names have no hard length limit, but an informal limit of 5
-       characters has been adopted to keep them short and to allow the tabs in
-       the source file Caps to line up nicely.
-
-       Finally,  the description field attempts to convey the semantics of the
-       capability.  You may find some codes in the description field:
-
-       (P)    indicates that padding may be specified
-
-       #[1-9] in the description field indicates that  the  string  is  passed
-              through tparm(3x) with parameters as given (#i).
-
-              If  no  parameters  are  listed  in the description, passing the
-              string through tparm(3x) may give unexpected results,  e.g.,  if
-              it contains percent (%%) signs.
-
-       (P*)   indicates  that  padding may vary in proportion to the number of
-              lines affected
-
-       (#i)   indicates the ith parameter.
-
-
-       These are the boolean capabilities:
-
-
-                  Variable            Cap-      TCap       Description
-                  Booleans            name      Code
-
-
-
-          auto_left_margin            bw        bw     cub1 wraps from
-                                                       column 0 to last
-                                                       column
-          auto_right_margin           am        am     terminal has
-                                                       automatic margins
-          back_color_erase            bce       ut     screen erased with
-                                                       background color
-          can_change                  ccc       cc     terminal can re-
-                                                       define existing
-                                                       colors
-          ceol_standout_glitch        xhp       xs     standout not erased
-                                                       by overwriting (hp)
-          col_addr_glitch             xhpa      YA     only positive motion
-                                                       for hpa/mhpa caps
-          cpi_changes_res             cpix      YF     changing character
-                                                       pitch changes
-                                                       resolution
-          cr_cancels_micro_mode       crxm      YB     using cr turns off
-                                                       micro mode
-          dest_tabs_magic_smso        xt        xt     tabs destructive,
-                                                       magic so char
-                                                       (t1061)
-          eat_newline_glitch          xenl      xn     newline ignored
-                                                       after 80 cols
-                                                       (concept)
-          erase_overstrike            eo        eo     can erase
-                                                       overstrikes with a
-                                                       blank
-          generic_type                gn        gn     generic line type
-          hard_copy                   hc        hc     hardcopy terminal
-          hard_cursor                 chts      HC     cursor is hard to
-                                                       see
-          has_meta_key                km        km     Has a meta key
-                                                       (i.e., sets 8th-bit)
-          has_print_wheel             daisy     YC     printer needs
-                                                       operator to change
-                                                       character set
-          has_status_line             hs        hs     has extra status
-                                                       line
-          hue_lightness_saturation    hls       hl     terminal uses only
-                                                       HLS color notation
-                                                       (Tektronix)
-          insert_null_glitch          in        in     insert mode
-                                                       distinguishes nulls
-          lpi_changes_res             lpix      YG     changing line pitch
-                                                       changes resolution
-          memory_above                da        da     display may be
-                                                       retained above the
-                                                       screen
-          memory_below                db        db     display may be
-                                                       retained below the
-                                                       screen
-          move_insert_mode            mir       mi     safe to move while
-                                                       in insert mode
-          move_standout_mode          msgr      ms     safe to move while
-                                                       in standout mode
-          needs_xon_xoff              nxon      nx     padding will not
-                                                       work, xon/xoff
-                                                       required
-          no_esc_ctlc                 xsb       xb     beehive (f1=escape,
-                                                       f2=ctrl C)
-          no_pad_char                 npc       NP     pad character does
-                                                       not exist
-          non_dest_scroll_region      ndscr     ND     scrolling region is
-                                                       non-destructive
-
-          non_rev_rmcup               nrrmc     NR     smcup does not
-                                                       reverse rmcup
-          over_strike                 os        os     terminal can
-                                                       overstrike
-          prtr_silent                 mc5i      5i     printer will not
-                                                       echo on screen
-          row_addr_glitch             xvpa      YD     only positive motion
-                                                       for vpa/mvpa caps
-          semi_auto_right_margin      sam       YE     printing in last
-                                                       column causes cr
-          status_line_esc_ok          eslok     es     escape can be used
-                                                       on the status line
-          tilde_glitch                hz        hz     cannot print ~'s
-                                                       (Hazeltine)
-          transparent_underline       ul        ul     underline character
-                                                       overstrikes
-          xon_xoff                    xon       xo     terminal uses
-                                                       xon/xoff handshaking
-
-       These are the numeric capabilities:
-
-
-                  Variable            Cap-      TCap       Description
-                   Numeric            name      Code
-          columns                     cols      co     number of columns in
-                                                       a line
-          init_tabs                   it        it     tabs initially every
-                                                       # spaces
-          label_height                lh        lh     rows in each label
-          label_width                 lw        lw     columns in each
-                                                       label
-          lines                       lines     li     number of lines on
-                                                       screen or page
-          lines_of_memory             lm        lm     lines of memory if >
-                                                       line. 0 means varies
-          magic_cookie_glitch         xmc       sg     number of blank
-                                                       characters left by
-                                                       smso or rmso
-          max_attributes              ma        ma     maximum combined
-                                                       attributes terminal
-                                                       can handle
-          max_colors                  colors    Co     maximum number of
-                                                       colors on screen
-          max_pairs                   pairs     pa     maximum number of
-                                                       color-pairs on the
-                                                       screen
-          maximum_windows             wnum      MW     maximum number of
-                                                       definable windows
-          no_color_video              ncv       NC     video attributes
-                                                       that cannot be used
-                                                       with colors
-          num_labels                  nlab      Nl     number of labels on
-                                                       screen
-          padding_baud_rate           pb        pb     lowest baud rate
-                                                       where padding needed
-          virtual_terminal            vt        vt     virtual terminal
-                                                       number (CB/unix)
-          width_status_line           wsl       ws     number of columns in
-                                                       status line
-
-       The  following  numeric  capabilities  are  present  in the SVr4.0 term
-       structure, but are not yet documented in the man page.   They  came  in
+       Tables of capabilities ncurses recognizes in a terminfo  terminal  type
+       description and available to terminfo-using code follow.
+
+       o   The  capability  name identifies the symbol by which the programmer
+           using the terminfo API accesses the capability.
+
+       o   The TI (terminfo) code is the short name used by a person composing
+           or updating a terminal type entry.
+
+           Whenever  possible, these codes are the same as or similar to those
+           of the ANSI X3.64-1979 standard (now superseded by  ECMA-48,  which
+           uses identical or very similar names).  Semantics are also intended
+           to match those of the specification.
+
+           terminfo codes have no hard length limit, but ncurses maintains  an
+           informal  one  of  5 characters to keep them short and to allow the
+           tabs in the source file Caps to line  up  nicely.   (Some  standard
+           codes exceed this limit regardless.)
+
+       o   The  TC  (termcap)  code  is  that used by the corresponding API of
+           ncurses.  (Some capabilities are  new,  and  have  names  that  BSD
+           termcap did not originate.)
+
+       o   The   description   field   attempts  to  convey  the  capability's
+           semantics.
+
+       The description field employs a handful of notations.
+
+       (P)    indicates that padding may be specified.
+
+       (P*)   indicates that padding may vary in proportion to the  number  of
+              output lines affected.
+
+       #i     indicates   the  ith  parameter  of  a  string  capability;  the
+              programmer  should  pass  the  string  to  tparm(3x)  with   the
+              parameters listed.
+
+              If  the  description  lists no parameters, passing the string to
+              tparm(3x) may produce unexpected behavior, for instance  if  the
+              string contains percent signs.
+
+                                      Code
+       Boolean Capability Name    TI        TC  Description
+       ------------------------------------------------------------------------
+
+
+       auto_left_margin           bw        bw  cub1 wraps from column 0 to
+                                                last column
+       auto_right_margin          am        am  terminal has automatic margins
+       no_esc_ctlc                xsb       xb  beehive (f1=escape, f2=ctrl C)
+       ceol_standout_glitch       xhp       xs  standout not erased by
+                                                overwriting (hp)
+       eat_newline_glitch         xenl      xn  newline ignored after 80 cols
+                                                (concept)
+       erase_overstrike           eo        eo  can erase overstrikes with a
+                                                blank
+       generic_type               gn        gn  generic line type
+       hard_copy                  hc        hc  hardcopy terminal
+       has_meta_key               km        km  Has a meta key (i.e., sets
+                                                8th-bit)
+       has_status_line            hs        hs  has extra status line
+       insert_null_glitch         in        in  insert mode distinguishes
+                                                nulls
+       memory_above               da        da  display may be retained above
+                                                the screen
+       memory_below               db        db  display may be retained below
+                                                the screen
+       move_insert_mode           mir       mi  safe to move while in insert
+                                                mode
+       move_standout_mode         msgr      ms  safe to move while in standout
+                                                mode
+       over_strike                os        os  terminal can overstrike
+       status_line_esc_ok         eslok     es  escape can be used on the
+                                                status line
+       dest_tabs_magic_smso       xt        xt  tabs destructive, magic so
+                                                char (t1061)
+       tilde_glitch               hz        hz  cannot print ~'s (Hazeltine)
+       transparent_underline      ul        ul  underline character
+                                                overstrikes
+       xon_xoff                   xon       xo  terminal uses xon/xoff
+                                                handshaking
+       needs_xon_xoff             nxon      nx  padding will not work,
+                                                xon/xoff required
+       prtr_silent                mc5i      5i  printer will not echo on
+                                                screen
+       hard_cursor                chts      HC  cursor is hard to see
+       non_rev_rmcup              nrrmc     NR  smcup does not reverse rmcup
+       no_pad_char                npc       NP  pad character does not exist
+       non_dest_scroll_region     ndscr     ND  scrolling region is non-
+                                                destructive
+       can_change                 ccc       cc  terminal can re-define
+                                                existing colors
+       back_color_erase           bce       ut  screen erased with background
+                                                color
+       hue_lightness_saturation   hls       hl  terminal uses only HLS color
+                                                notation (Tektronix)
+       col_addr_glitch            xhpa      YA  only positive motion for
+                                                hpa/mhpa caps
+       cr_cancels_micro_mode      crxm      YB  using cr turns off micro mode
+       has_print_wheel            daisy     YC  printer needs operator to
+                                                change character set
+       row_addr_glitch            xvpa      YD  only positive motion for
+                                                vpa/mvpa caps
+       semi_auto_right_margin     sam       YE  printing in last column causes
+                                                cr
+       cpi_changes_res            cpix      YF  changing character pitch
+                                                changes resolution
+       lpi_changes_res            lpix      YG  changing line pitch changes
+                                                resolution
+
+                                      Code
+
+       Numeric Capability Name    TI        TC  Description
+       ------------------------------------------------------------------------
+       columns                    cols      co  number of columns in a line
+       init_tabs                  it        it  tabs initially every # spaces
+       lines                      lines     li  number of lines on screen or
+                                                page
+       lines_of_memory            lm        lm  lines of memory if > line. 0
+                                                means varies
+       magic_cookie_glitch        xmc       sg  number of blank characters
+                                                left by smso or rmso
+       padding_baud_rate          pb        pb  lowest baud rate where padding
+                                                needed
+       virtual_terminal           vt        vt  virtual terminal number
+                                                (CB/unix)
+       width_status_line          wsl       ws  number of columns in status
+                                                line
+       num_labels                 nlab      Nl  number of labels on screen
+       label_height               lh        lh  rows in each label
+       label_width                lw        lw  columns in each label
+       max_attributes             ma        ma  maximum combined attributes
+                                                terminal can handle
+       maximum_windows            wnum      MW  maximum number of definable
+                                                windows
+       max_colors                 colors    Co  maximum number of colors on
+                                                screen
+       max_pairs                  pairs     pa  maximum number of color-pairs
+                                                on the screen
+       no_color_video             ncv       NC  video attributes that cannot
+                                                be used with colors
+
+       The following numeric capabilities  are  present  in  the  SVr4.0  term
+       structure,  but  are  not yet documented in the man page.  They came in
        with SVr4's printer support.
 
-
-
-                  Variable            Cap-      TCap       Description
-                   Numeric            name      Code
-          bit_image_entwining         bitwin    Yo     number of passes for
-                                                       each bit-image row
-          bit_image_type              bitype    Yp     type of bit-image
-                                                       device
-          buffer_capacity             bufsz     Ya     numbers of bytes
-                                                       buffered before
-                                                       printing
-          buttons                     btns      BT     number of buttons on
-                                                       mouse
-          dot_horz_spacing            spinh     Yc     spacing of dots
-                                                       horizontally in dots
-                                                       per inch
-          dot_vert_spacing            spinv     Yb     spacing of pins
-                                                       vertically in pins
-                                                       per inch
-          max_micro_address           maddr     Yd     maximum value in
-                                                       micro_..._address
-          max_micro_jump              mjump     Ye     maximum value in
-                                                       parm_..._micro
-          micro_col_size              mcs       Yf     character step size
-                                                       when in micro mode
-          micro_line_size             mls       Yg     line step size when
-                                                       in micro mode
-          number_of_pins              npins     Yh     numbers of pins in
-                                                       print-head
-          output_res_char             orc       Yi     horizontal
-                                                       resolution in units
-                                                       per line
-          output_res_horz_inch        orhi      Yk     horizontal
-                                                       resolution in units
-                                                       per inch
-          output_res_line             orl       Yj     vertical resolution
-                                                       in units per line
-          output_res_vert_inch        orvi      Yl     vertical resolution
-                                                       in units per inch
-          print_rate                  cps       Ym     print rate in
-                                                       characters per
-                                                       second
-          wide_char_size              widcs     Yn     character step size
-                                                       when in double wide
-                                                       mode
-
-       These are the string capabilities:
-
-
-                  Variable            Cap-      TCap       Description
-                   String             name      Code
-          acs_chars                   acsc      ac     graphics charset
-                                                       pairs, based on
-                                                       vt100
-          back_tab                    cbt       bt     back tab (P)
-          bell                        bel       bl     audible signal
-                                                       (bell) (P)
-          carriage_return             cr        cr     carriage return (P*)
-                                                       (P*)
-          change_char_pitch           cpi       ZA     Change number of
-                                                       characters per inch
-                                                       to #1
-          change_line_pitch           lpi       ZB     Change number of
-                                                       lines per inch to #1
-          change_res_horz             chr       ZC     Change horizontal
-                                                       resolution to #1
-
-
-          change_res_vert             cvr       ZD     Change vertical
-                                                       resolution to #1
-          change_scroll_region        csr       cs     change region to
-                                                       line #1 to line #2
-                                                       (P)
-          char_padding                rmp       rP     like ip but when in
-                                                       insert mode
-          clear_all_tabs              tbc       ct     clear all tab stops
-                                                       (P)
-          clear_margins               mgc       MC     clear right and left
-                                                       soft margins
-          clear_screen                clear     cl     clear screen and
-                                                       home cursor (P*)
-          clr_bol                     el1       cb     Clear to beginning
-                                                       of line
-          clr_eol                     el        ce     clear to end of line
-                                                       (P)
-          clr_eos                     ed        cd     clear to end of
-                                                       screen (P*)
-          column_address              hpa       ch     horizontal position
-                                                       #1, absolute (P)
-          command_character           cmdch     CC     terminal settable
-                                                       cmd character in
-                                                       prototype !?
-          create_window               cwin      CW     define a window #1
-                                                       from #2,#3 to #4,#5
-          cursor_address              cup       cm     move to row #1
-                                                       columns #2
-          cursor_down                 cud1      do     down one line
-          cursor_home                 home      ho     home cursor (if no
-                                                       cup)
-          cursor_invisible            civis     vi     make cursor
-                                                       invisible
-          cursor_left                 cub1      le     move left one space
-          cursor_mem_address          mrcup     CM     memory relative
-                                                       cursor addressing,
-                                                       move to row #1
-                                                       columns #2
-          cursor_normal               cnorm     ve     make cursor appear
-                                                       normal (undo
-                                                       civis/cvvis)
-          cursor_right                cuf1      nd     non-destructive
-                                                       space (move right
-                                                       one space)
-          cursor_to_ll                ll        ll     last line, first
-                                                       column (if no cup)
-          cursor_up                   cuu1      up     up one line
-          cursor_visible              cvvis     vs     make cursor very
-                                                       visible
-          define_char                 defc      ZE     Define a character
-                                                       #1, #2 dots wide,
-                                                       descender #3
-          delete_character            dch1      dc     delete character
-                                                       (P*)
-          delete_line                 dl1       dl     delete line (P*)
-          dial_phone                  dial      DI     dial number #1
-          dis_status_line             dsl       ds     disable status line
-          display_clock               dclk      DK     display clock
-          down_half_line              hd        hd     half a line down
-          ena_acs                     enacs     eA     enable alternate
-                                                       char set
-          enter_alt_charset_mode      smacs     as     start alternate
-                                                       character set (P)
-          enter_am_mode               smam      SA     turn on automatic
-                                                       margins
-
-          enter_blink_mode            blink     mb     turn on blinking
-          enter_bold_mode             bold      md     turn on bold (extra
-                                                       bright) mode
-          enter_ca_mode               smcup     ti     string to start
-                                                       programs using cup
-          enter_delete_mode           smdc      dm     enter delete mode
-          enter_dim_mode              dim       mh     turn on half-bright
-                                                       mode
-          enter_doublewide_mode       swidm     ZF     Enter double-wide
-                                                       mode
-          enter_draft_quality         sdrfq     ZG     Enter draft-quality
-                                                       mode
-          enter_insert_mode           smir      im     enter insert mode
-          enter_italics_mode          sitm      ZH     Enter italic mode
-          enter_leftward_mode         slm       ZI     Start leftward
-                                                       carriage motion
-          enter_micro_mode            smicm     ZJ     Start micro-motion
-                                                       mode
-          enter_near_letter_quality   snlq      ZK     Enter NLQ mode
-          enter_normal_quality        snrmq     ZL     Enter normal-quality
-                                                       mode
-          enter_protected_mode        prot      mp     turn on protected
-                                                       mode
-          enter_reverse_mode          rev       mr     turn on reverse
-                                                       video mode
-          enter_secure_mode           invis     mk     turn on blank mode
-                                                       (characters
-                                                       invisible)
-          enter_shadow_mode           sshm      ZM     Enter shadow-print
-                                                       mode
-          enter_standout_mode         smso      so     begin standout mode
-          enter_subscript_mode        ssubm     ZN     Enter subscript mode
-          enter_superscript_mode      ssupm     ZO     Enter superscript
-                                                       mode
-          enter_underline_mode        smul      us     begin underline mode
-          enter_upward_mode           sum       ZP     Start upward
-                                                       carriage motion
-          enter_xon_mode              smxon     SX     turn on xon/xoff
-                                                       handshaking
-          erase_chars                 ech       ec     erase #1 characters
-                                                       (P)
-          exit_alt_charset_mode       rmacs     ae     end alternate
-                                                       character set (P)
-          exit_am_mode                rmam      RA     turn off automatic
-                                                       margins
-          exit_attribute_mode         sgr0      me     turn off all
-                                                       attributes
-          exit_ca_mode                rmcup     te     strings to end
-                                                       programs using cup
-          exit_delete_mode            rmdc      ed     end delete mode
-          exit_doublewide_mode        rwidm     ZQ     End double-wide mode
-          exit_insert_mode            rmir      ei     exit insert mode
-          exit_italics_mode           ritm      ZR     End italic mode
-          exit_leftward_mode          rlm       ZS     End left-motion mode
-          exit_micro_mode             rmicm     ZT     End micro-motion
-                                                       mode
-          exit_shadow_mode            rshm      ZU     End shadow-print
-                                                       mode
-          exit_standout_mode          rmso      se     exit standout mode
-          exit_subscript_mode         rsubm     ZV     End subscript mode
-          exit_superscript_mode       rsupm     ZW     End superscript mode
-          exit_underline_mode         rmul      ue     exit underline mode
-          exit_upward_mode            rum       ZX     End reverse
-                                                       character motion
-
-
-          exit_xon_mode               rmxon     RX     turn off xon/xoff
-                                                       handshaking
-          fixed_pause                 pause     PA     pause for 2-3
-                                                       seconds
-          flash_hook                  hook      fh     flash switch hook
-          flash_screen                flash     vb     visible bell (may
-                                                       not move cursor)
-          form_feed                   ff        ff     hardcopy terminal
-                                                       page eject (P*)
-          from_status_line            fsl       fs     return from status
-                                                       line
-          goto_window                 wingo     WG     go to window #1
-          hangup                      hup       HU     hang-up phone
-          init_1string                is1       i1     initialization
-                                                       string
-          init_2string                is2       is     initialization
-                                                       string
-          init_3string                is3       i3     initialization
-                                                       string
-          init_file                   if        if     name of
-                                                       initialization file
-          init_prog                   iprog     iP     path name of program
-                                                       for initialization
-          initialize_color            initc     Ic     initialize color #1
-                                                       to (#2,#3,#4)
-          initialize_pair             initp     Ip     Initialize color
-                                                       pair #1 to
-                                                       fg=(#2,#3,#4),
-                                                       bg=(#5,#6,#7)
-          insert_character            ich1      ic     insert character (P)
-          insert_line                 il1       al     insert line (P*)
-          insert_padding              ip        ip     insert padding after
-                                                       inserted character
-          key_a1                      ka1       K1     upper left of keypad
-          key_a3                      ka3       K3     upper right of
-                                                       keypad
-          key_b2                      kb2       K2     center of keypad
-          key_backspace               kbs       kb     backspace key
-          key_beg                     kbeg      @1     begin key
-          key_btab                    kcbt      kB     back-tab key
-          key_c1                      kc1       K4     lower left of keypad
-          key_c3                      kc3       K5     lower right of
-                                                       keypad
-          key_cancel                  kcan      @2     cancel key
-          key_catab                   ktbc      ka     clear-all-tabs key
-          key_clear                   kclr      kC     clear-screen or
-                                                       erase key
-          key_close                   kclo      @3     close key
-          key_command                 kcmd      @4     command key
-          key_copy                    kcpy      @5     copy key
-          key_create                  kcrt      @6     create key
-          key_ctab                    kctab     kt     clear-tab key
-          key_dc                      kdch1     kD     delete-character key
-          key_dl                      kdl1      kL     delete-line key
-          key_down                    kcud1     kd     down-arrow key
-          key_eic                     krmir     kM     sent by rmir or smir
-                                                       in insert mode
-          key_end                     kend      @7     end key
-          key_enter                   kent      @8     enter/send key
-          key_eol                     kel       kE     clear-to-end-of-line
-                                                       key
-          key_eos                     ked       kS     clear-to-end-of-
-                                                       screen key
-          key_exit                    kext      @9     exit key
-          key_f0                      kf0       k0     F0 function key
-
-          key_f1                      kf1       k1     F1 function key
-          key_f10                     kf10      k;     F10 function key
-          key_f11                     kf11      F1     F11 function key
-          key_f12                     kf12      F2     F12 function key
-          key_f13                     kf13      F3     F13 function key
-          key_f14                     kf14      F4     F14 function key
-          key_f15                     kf15      F5     F15 function key
-          key_f16                     kf16      F6     F16 function key
-          key_f17                     kf17      F7     F17 function key
-          key_f18                     kf18      F8     F18 function key
-          key_f19                     kf19      F9     F19 function key
-          key_f2                      kf2       k2     F2 function key
-          key_f20                     kf20      FA     F20 function key
-          key_f21                     kf21      FB     F21 function key
-          key_f22                     kf22      FC     F22 function key
-          key_f23                     kf23      FD     F23 function key
-          key_f24                     kf24      FE     F24 function key
-          key_f25                     kf25      FF     F25 function key
-          key_f26                     kf26      FG     F26 function key
-          key_f27                     kf27      FH     F27 function key
-          key_f28                     kf28      FI     F28 function key
-          key_f29                     kf29      FJ     F29 function key
-          key_f3                      kf3       k3     F3 function key
-          key_f30                     kf30      FK     F30 function key
-          key_f31                     kf31      FL     F31 function key
-          key_f32                     kf32      FM     F32 function key
-          key_f33                     kf33      FN     F33 function key
-          key_f34                     kf34      FO     F34 function key
-          key_f35                     kf35      FP     F35 function key
-          key_f36                     kf36      FQ     F36 function key
-          key_f37                     kf37      FR     F37 function key
-          key_f38                     kf38      FS     F38 function key
-          key_f39                     kf39      FT     F39 function key
-          key_f4                      kf4       k4     F4 function key
-          key_f40                     kf40      FU     F40 function key
-          key_f41                     kf41      FV     F41 function key
-          key_f42                     kf42      FW     F42 function key
-          key_f43                     kf43      FX     F43 function key
-          key_f44                     kf44      FY     F44 function key
-          key_f45                     kf45      FZ     F45 function key
-          key_f46                     kf46      Fa     F46 function key
-          key_f47                     kf47      Fb     F47 function key
-          key_f48                     kf48      Fc     F48 function key
-          key_f49                     kf49      Fd     F49 function key
-          key_f5                      kf5       k5     F5 function key
-          key_f50                     kf50      Fe     F50 function key
-          key_f51                     kf51      Ff     F51 function key
-          key_f52                     kf52      Fg     F52 function key
-          key_f53                     kf53      Fh     F53 function key
-          key_f54                     kf54      Fi     F54 function key
-          key_f55                     kf55      Fj     F55 function key
-          key_f56                     kf56      Fk     F56 function key
-          key_f57                     kf57      Fl     F57 function key
-          key_f58                     kf58      Fm     F58 function key
-          key_f59                     kf59      Fn     F59 function key
-          key_f6                      kf6       k6     F6 function key
-          key_f60                     kf60      Fo     F60 function key
-          key_f61                     kf61      Fp     F61 function key
-          key_f62                     kf62      Fq     F62 function key
-          key_f63                     kf63      Fr     F63 function key
-          key_f7                      kf7       k7     F7 function key
-          key_f8                      kf8       k8     F8 function key
-          key_f9                      kf9       k9     F9 function key
-          key_find                    kfnd      @0     find key
-          key_help                    khlp      %1     help key
-
-          key_home                    khome     kh     home key
-          key_ic                      kich1     kI     insert-character key
-          key_il                      kil1      kA     insert-line key
-          key_left                    kcub1     kl     left-arrow key
-          key_ll                      kll       kH     lower-left key (home
-                                                       down)
-          key_mark                    kmrk      %2     mark key
-          key_message                 kmsg      %3     message key
-          key_move                    kmov      %4     move key
-          key_next                    knxt      %5     next key
-          key_npage                   knp       kN     next-page key
-          key_open                    kopn      %6     open key
-          key_options                 kopt      %7     options key
-          key_ppage                   kpp       kP     previous-page key
-          key_previous                kprv      %8     previous key
-          key_print                   kprt      %9     print key
-          key_redo                    krdo      %0     redo key
-          key_reference               kref      &1     reference key
-          key_refresh                 krfr      &2     refresh key
-          key_replace                 krpl      &3     replace key
-          key_restart                 krst      &4     restart key
-          key_resume                  kres      &5     resume key
-          key_right                   kcuf1     kr     right-arrow key
-          key_save                    ksav      &6     save key
-          key_sbeg                    kBEG      &9     shifted begin key
-          key_scancel                 kCAN      &0     shifted cancel key
-          key_scommand                kCMD      *1     shifted command key
-          key_scopy                   kCPY      *2     shifted copy key
-          key_screate                 kCRT      *3     shifted create key
-          key_sdc                     kDC       *4     shifted delete-
-                                                       character key
-          key_sdl                     kDL       *5     shifted delete-line
-                                                       key
-          key_select                  kslt      *6     select key
-          key_send                    kEND      *7     shifted end key
-          key_seol                    kEOL      *8     shifted clear-to-
-                                                       end-of-line key
-          key_sexit                   kEXT      *9     shifted exit key
-          key_sf                      kind      kF     scroll-forward key
-          key_sfind                   kFND      *0     shifted find key
-          key_shelp                   kHLP      #1     shifted help key
-          key_shome                   kHOM      #2     shifted home key
-          key_sic                     kIC       #3     shifted insert-
-                                                       character key
-          key_sleft                   kLFT      #4     shifted left-arrow
-                                                       key
-          key_smessage                kMSG      %a     shifted message key
-          key_smove                   kMOV      %b     shifted move key
-          key_snext                   kNXT      %c     shifted next key
-          key_soptions                kOPT      %d     shifted options key
-          key_sprevious               kPRV      %e     shifted previous key
-          key_sprint                  kPRT      %f     shifted print key
-          key_sr                      kri       kR     scroll-backward key
-          key_sredo                   kRDO      %g     shifted redo key
-          key_sreplace                kRPL      %h     shifted replace key
-          key_sright                  kRIT      %i     shifted right-arrow
-                                                       key
-          key_srsume                  kRES      %j     shifted resume key
-          key_ssave                   kSAV      !1     shifted save key
-          key_ssuspend                kSPD      !2     shifted suspend key
-          key_stab                    khts      kT     set-tab key
-          key_sundo                   kUND      !3     shifted undo key
-          key_suspend                 kspd      &7     suspend key
-          key_undo                    kund      &8     undo key
-          key_up                      kcuu1     ku     up-arrow key
-
-          keypad_local                rmkx      ke     leave
-                                                       'keyboard_transmit'
-                                                       mode
-          keypad_xmit                 smkx      ks     enter
-                                                       'keyboard_transmit'
-                                                       mode
-          lab_f0                      lf0       l0     label on function
-                                                       key f0 if not f0
-          lab_f1                      lf1       l1     label on function
-                                                       key f1 if not f1
-          lab_f10                     lf10      la     label on function
-                                                       key f10 if not f10
-          lab_f2                      lf2       l2     label on function
-                                                       key f2 if not f2
-          lab_f3                      lf3       l3     label on function
-                                                       key f3 if not f3
-          lab_f4                      lf4       l4     label on function
-                                                       key f4 if not f4
-          lab_f5                      lf5       l5     label on function
-                                                       key f5 if not f5
-          lab_f6                      lf6       l6     label on function
-                                                       key f6 if not f6
-          lab_f7                      lf7       l7     label on function
-                                                       key f7 if not f7
-          lab_f8                      lf8       l8     label on function
-                                                       key f8 if not f8
-          lab_f9                      lf9       l9     label on function
-                                                       key f9 if not f9
-          label_format                fln       Lf     label format
-          label_off                   rmln      LF     turn off soft labels
-          label_on                    smln      LO     turn on soft labels
-          meta_off                    rmm       mo     turn off meta mode
-          meta_on                     smm       mm     turn on meta mode
-                                                       (8th-bit on)
-          micro_column_address        mhpa      ZY     Like column_address
-                                                       in micro mode
-          micro_down                  mcud1     ZZ     Like cursor_down in
-                                                       micro mode
-          micro_left                  mcub1     Za     Like cursor_left in
-                                                       micro mode
-          micro_right                 mcuf1     Zb     Like cursor_right in
-                                                       micro mode
-          micro_row_address           mvpa      Zc     Like row_address #1
-                                                       in micro mode
-          micro_up                    mcuu1     Zd     Like cursor_up in
-                                                       micro mode
-          newline                     nel       nw     newline (behave like
-                                                       cr followed by lf)
-          order_of_pins               porder    Ze     Match software bits
-                                                       to print-head pins
-          orig_colors                 oc        oc     Set all color pairs
-                                                       to the original ones
-          orig_pair                   op        op     Set default pair to
-                                                       its original value
-          pad_char                    pad       pc     padding char
-                                                       (instead of null)
-          parm_dch                    dch       DC     delete #1 characters
-                                                       (P*)
-          parm_delete_line            dl        DL     delete #1 lines (P*)
-          parm_down_cursor            cud       DO     down #1 lines (P*)
-          parm_down_micro             mcud      Zf     Like
-                                                       parm_down_cursor in
-                                                       micro mode
-          parm_ich                    ich       IC     insert #1 characters
-                                                       (P*)
-
-          parm_index                  indn      SF     scroll forward #1
-                                                       lines (P)
-          parm_insert_line            il        AL     insert #1 lines (P*)
-          parm_left_cursor            cub       LE     move #1 characters
-                                                       to the left (P)
-          parm_left_micro             mcub      Zg     Like
-                                                       parm_left_cursor in
-                                                       micro mode
-          parm_right_cursor           cuf       RI     move #1 characters
-                                                       to the right (P*)
-          parm_right_micro            mcuf      Zh     Like
-                                                       parm_right_cursor in
-                                                       micro mode
-          parm_rindex                 rin       SR     scroll back #1 lines
-                                                       (P)
-          parm_up_cursor              cuu       UP     up #1 lines (P*)
-          parm_up_micro               mcuu      Zi     Like parm_up_cursor
-                                                       in micro mode
-          pkey_key                    pfkey     pk     program function key
-                                                       #1 to type string #2
-          pkey_local                  pfloc     pl     program function key
-                                                       #1 to execute string
-                                                       #2
-          pkey_xmit                   pfx       px     program function key
-                                                       #1 to transmit
-                                                       string #2
-          plab_norm                   pln       pn     program label #1 to
-                                                       show string #2
-          print_screen                mc0       ps     print contents of
-                                                       screen
-          prtr_non                    mc5p      pO     turn on printer for
-                                                       #1 bytes
-          prtr_off                    mc4       pf     turn off printer
-          prtr_on                     mc5       po     turn on printer
-          pulse                       pulse     PU     select pulse dialing
-          quick_dial                  qdial     QD     dial number #1
-                                                       without checking
-          remove_clock                rmclk     RC     remove clock
-          repeat_char                 rep       rp     repeat char #1 #2
-                                                       times (P*)
-          req_for_input               rfi       RF     send next input char
-                                                       (for ptys)
-          reset_1string               rs1       r1     reset string
-          reset_2string               rs2       r2     reset string
-          reset_3string               rs3       r3     reset string
-          reset_file                  rf        rf     name of reset file
-          restore_cursor              rc        rc     restore cursor to
-                                                       position of last
-                                                       save_cursor
-          row_address                 vpa       cv     vertical position #1
-                                                       absolute (P)
-          save_cursor                 sc        sc     save current cursor
-                                                       position (P)
-          scroll_forward              ind       sf     scroll text up (P)
-          scroll_reverse              ri        sr     scroll text down (P)
-          select_char_set             scs       Zj     Select character
-                                                       set, #1
-          set_attributes              sgr       sa     define video
-                                                       attributes #1-#9
-                                                       (PG9)
-          set_background              setb      Sb     Set background color
-                                                       #1
-          set_bottom_margin           smgb      Zk     Set bottom margin at
-                                                       current line
-
-
-          set_bottom_margin_parm      smgbp     Zl     Set bottom margin at
-                                                       line #1 or (if smgtp
-                                                       is not given) #2
-                                                       lines from bottom
-          set_clock                   sclk      SC     set clock, #1 hrs #2
-                                                       mins #3 secs
-          set_color_pair              scp       sp     Set current color
-                                                       pair to #1
-          set_foreground              setf      Sf     Set foreground color
-                                                       #1
-          set_left_margin             smgl      ML     set left soft margin
-                                                       at current
-                                                       column.     (ML is
-                                                       not in BSD termcap).
-          set_left_margin_parm        smglp     Zm     Set left (right)
-                                                       margin at column #1
-          set_right_margin            smgr      MR     set right soft
-                                                       margin at current
-                                                       column
-          set_right_margin_parm       smgrp     Zn     Set right margin at
-                                                       column #1
-          set_tab                     hts       st     set a tab in every
-                                                       row, current columns
-          set_top_margin              smgt      Zo     Set top margin at
-                                                       current line
-          set_top_margin_parm         smgtp     Zp     Set top (bottom)
-                                                       margin at row #1
-          set_window                  wind      wi     current window is
-                                                       lines #1-#2 cols
-                                                       #3-#4
-          start_bit_image             sbim      Zq     Start printing bit
-                                                       image graphics
-          start_char_set_def          scsd      Zr     Start character set
-                                                       definition #1, with
-                                                       #2 characters in the
-                                                       set
-          stop_bit_image              rbim      Zs     Stop printing bit
-                                                       image graphics
-          stop_char_set_def           rcsd      Zt     End definition of
-                                                       character set #1
-          subscript_characters        subcs     Zu     List of
-                                                       subscriptable
-                                                       characters
-          superscript_characters      supcs     Zv     List of
-                                                       superscriptable
-                                                       characters
-          tab                         ht        ta     tab to next 8-space
-                                                       hardware tab stop
-          these_cause_cr              docr      Zw     Printing any of
-                                                       these characters
-                                                       causes CR
-          to_status_line              tsl       ts     move to status line,
-                                                       column #1
-          tone                        tone      TO     select touch tone
-                                                       dialing
-          underline_char              uc        uc     underline char and
-                                                       move past it
-          up_half_line                hu        hu     half a line up
-          user0                       u0        u0     User string #0
-          user1                       u1        u1     User string #1
-          user2                       u2        u2     User string #2
-          user3                       u3        u3     User string #3
-          user4                       u4        u4     User string #4
-          user5                       u5        u5     User string #5
-          user6                       u6        u6     User string #6
-
-          user7                       u7        u7     User string #7
-          user8                       u8        u8     User string #8
-          user9                       u9        u9     User string #9
-          wait_tone                   wait      WA     wait for dial-tone
-          xoff_character              xoffc     XF     XOFF character
-          xon_character               xonc      XN     XON character
-          zero_motion                 zerom     Zx     No motion for
-                                                       subsequent character
+                                      Code
+       Numeric Capability Name    TI        TC  Description
+       ------------------------------------------------------------------------
+       buffer_capacity            bufsz     Ya  numbers of bytes buffered
+                                                before printing
+       dot_vert_spacing           spinv     Yb  spacing of pins vertically in
+                                                pins per inch
+       dot_horz_spacing           spinh     Yc  spacing of dots horizontally
+                                                in dots per inch
+       max_micro_address          maddr     Yd  maximum value in
+                                                micro_..._address
+       max_micro_jump             mjump     Ye  maximum value in
+                                                parm_..._micro
+       micro_col_size             mcs       Yf  character step size when in
+                                                micro mode
+       micro_line_size            mls       Yg  line step size when in micro
+                                                mode
+       number_of_pins             npins     Yh  numbers of pins in print-head
+       output_res_char            orc       Yi  horizontal resolution in units
+                                                per line
+       output_res_line            orl       Yj  vertical resolution in units
+                                                per line
+       output_res_horz_inch       orhi      Yk  horizontal resolution in units
+                                                per inch
+       output_res_vert_inch       orvi      Yl  vertical resolution in units
+                                                per inch
+       print_rate                 cps       Ym  print rate in characters per
+                                                second
+       wide_char_size             widcs     Yn  character step size when in
+                                                double wide mode
+       buttons                    btns      BT  number of buttons on mouse
+
+       bit_image_entwining        bitwin    Yo  number of passes for each bit-
+                                                image row
+       bit_image_type             bitype    Yp  type of bit-image device
+
+                                      Code
+       String Capability Name     TI        TC  Description
+       ------------------------------------------------------------------------
+       back_tab                   cbt       bt  back tab (P)
+       bell                       bel       bl  audible signal (bell) (P)
+       carriage_return            cr        cr  carriage return (P*) (P*)
+       change_scroll_region       csr       cs  change region to line #1 to
+                                                line #2 (P)
+       clear_all_tabs             tbc       ct  clear all tab stops (P)
+       clear_screen               clear     cl  clear screen and home cursor
+                                                (P*)
+       clr_eol                    el        ce  clear to end of line (P)
+       clr_eos                    ed        cd  clear to end of screen (P*)
+       column_address             hpa       ch  horizontal position #1,
+                                                absolute (P)
+       command_character          cmdch     CC  terminal settable cmd
+                                                character in prototype !?
+       cursor_address             cup       cm  move to row #1 columns #2
+       cursor_down                cud1      do  down one line
+       cursor_home                home      ho  home cursor (if no cup)
+       cursor_invisible           civis     vi  make cursor invisible
+       cursor_left                cub1      le  move left one space
+       cursor_mem_address         mrcup     CM  memory relative cursor
+                                                addressing, move to row #1
+                                                columns #2
+       cursor_normal              cnorm     ve  make cursor appear normal
+                                                (undo civis/cvvis)
+       cursor_right               cuf1      nd  non-destructive space (move
+                                                right one space)
+       cursor_to_ll               ll        ll  last line, first column (if no
+                                                cup)
+       cursor_up                  cuu1      up  up one line
+       cursor_visible             cvvis     vs  make cursor very visible
+       delete_character           dch1      dc  delete character (P*)
+       delete_line                dl1       dl  delete line (P*)
+       dis_status_line            dsl       ds  disable status line
+       down_half_line             hd        hd  half a line down
+       enter_alt_charset_mode     smacs     as  start alternate character set
+                                                (P)
+       enter_blink_mode           blink     mb  turn on blinking
+       enter_bold_mode            bold      md  turn on bold (extra bright)
+                                                mode
+       enter_ca_mode              smcup     ti  string to start programs using
+                                                cup
+       enter_delete_mode          smdc      dm  enter delete mode
+       enter_dim_mode             dim       mh  turn on half-bright mode
+       enter_insert_mode          smir      im  enter insert mode
+       enter_secure_mode          invis     mk  turn on blank mode (characters
+                                                invisible)
+       enter_protected_mode       prot      mp  turn on protected mode
+       enter_reverse_mode         rev       mr  turn on reverse video mode
+       enter_standout_mode        smso      so  begin standout mode
+       enter_underline_mode       smul      us  begin underline mode
+       erase_chars                ech       ec  erase #1 characters (P)
+       exit_alt_charset_mode      rmacs     ae  end alternate character set
+                                                (P)
+       exit_attribute_mode        sgr0      me  turn off all attributes
+       exit_ca_mode               rmcup     te  strings to end programs using
+                                                cup
+       exit_delete_mode           rmdc      ed  end delete mode
+       exit_insert_mode           rmir      ei  exit insert mode
+
+       exit_standout_mode         rmso      se  exit standout mode
+       exit_underline_mode        rmul      ue  exit underline mode
+       flash_screen               flash     vb  visible bell (may not move
+                                                cursor)
+       form_feed                  ff        ff  hardcopy terminal page eject
+                                                (P*)
+       from_status_line           fsl       fs  return from status line
+       init_1string               is1       i1  initialization string
+       init_2string               is2       is  initialization string
+       init_3string               is3       i3  initialization string
+       init_file                  if        if  name of initialization file
+       insert_character           ich1      ic  insert character (P)
+       insert_line                il1       al  insert line (P*)
+       insert_padding             ip        ip  insert padding after inserted
+                                                character
+       key_backspace              kbs       kb  backspace key
+       key_catab                  ktbc      ka  clear-all-tabs key
+       key_clear                  kclr      kC  clear-screen or erase key
+       key_ctab                   kctab     kt  clear-tab key
+       key_dc                     kdch1     kD  delete-character key
+       key_dl                     kdl1      kL  delete-line key
+       key_down                   kcud1     kd  down-arrow key
+
+       key_eic                    krmir     kM  sent by rmir or smir in insert
+                                                mode
+       key_eol                    kel       kE  clear-to-end-of-line key
+       key_eos                    ked       kS  clear-to-end-of-screen key
+       key_f0                     kf0       k0  F0 function key
+       key_f1                     kf1       k1  F1 function key
+       key_f10                    kf10      k;  F10 function key
+       key_f2                     kf2       k2  F2 function key
+       key_f3                     kf3       k3  F3 function key
+       key_f4                     kf4       k4  F4 function key
+       key_f5                     kf5       k5  F5 function key
+       key_f6                     kf6       k6  F6 function key
+       key_f7                     kf7       k7  F7 function key
+       key_f8                     kf8       k8  F8 function key
+       key_f9                     kf9       k9  F9 function key
+       key_home                   khome     kh  home key
+       key_ic                     kich1     kI  insert-character key
+       key_il                     kil1      kA  insert-line key
+       key_left                   kcub1     kl  left-arrow key
+       key_ll                     kll       kH  lower-left key (home down)
+       key_npage                  knp       kN  next-page key
+       key_ppage                  kpp       kP  previous-page key
+       key_right                  kcuf1     kr  right-arrow key
+       key_sf                     kind      kF  scroll-forward key
+       key_sr                     kri       kR  scroll-backward key
+       key_stab                   khts      kT  set-tab key
+       key_up                     kcuu1     ku  up-arrow key
+       keypad_local               rmkx      ke  leave keyboard transmit mode
+       keypad_xmit                smkx      ks  enter keyboard transmit mode
+       lab_f0                     lf0       l0  label on function key f0 if
+                                                not f0
+       lab_f1                     lf1       l1  label on function key f1 if
+                                                not f1
+       lab_f10                    lf10      la  label on function key f10 if
+                                                not f10
+       lab_f2                     lf2       l2  label on function key f2 if
+                                                not f2
+       lab_f3                     lf3       l3  label on function key f3 if
+                                                not f3
+       lab_f4                     lf4       l4  label on function key f4 if
+                                                not f4
+
+
+       lab_f5                     lf5       l5  label on function key f5 if
+                                                not f5
+       lab_f6                     lf6       l6  label on function key f6 if
+                                                not f6
+       lab_f7                     lf7       l7  label on function key f7 if
+                                                not f7
+       lab_f8                     lf8       l8  label on function key f8 if
+                                                not f8
+       lab_f9                     lf9       l9  label on function key f9 if
+                                                not f9
+       meta_off                   rmm       mo  turn off meta mode
+       meta_on                    smm       mm  turn on meta mode (8th-bit on)
+       newline                    nel       nw  newline (behave like cr
+                                                followed by lf)
+       pad_char                   pad       pc  padding char (instead of null)
+       parm_dch                   dch       DC  delete #1 characters (P*)
+       parm_delete_line           dl        DL  delete #1 lines (P*)
+       parm_down_cursor           cud       DO  down #1 lines (P*)
+       parm_ich                   ich       IC  insert #1 characters (P*)
+       parm_index                 indn      SF  scroll forward #1 lines (P)
+       parm_insert_line           il        AL  insert #1 lines (P*)
+       parm_left_cursor           cub       LE  move #1 characters to the left
+                                                (P)
+       parm_right_cursor          cuf       RI  move #1 characters to the
+                                                right (P*)
+       parm_rindex                rin       SR  scroll back #1 lines (P)
+       parm_up_cursor             cuu       UP  up #1 lines (P*)
+       pkey_key                   pfkey     pk  program function key #1 to
+                                                type string #2
+       pkey_local                 pfloc     pl  program function key #1 to
+                                                execute string #2
+       pkey_xmit                  pfx       px  program function key #1 to
+                                                transmit string #2
+       print_screen               mc0       ps  print contents of screen
+       prtr_off                   mc4       pf  turn off printer
+       prtr_on                    mc5       po  turn on printer
+       repeat_char                rep       rp  repeat char #1 #2 times (P*)
+       reset_1string              rs1       r1  reset string
+       reset_2string              rs2       r2  reset string
+
+       reset_3string              rs3       r3  reset string
+       reset_file                 rf        rf  name of reset file
+       restore_cursor             rc        rc  restore cursor to position of
+                                                last save_cursor
+       row_address                vpa       cv  vertical position #1 absolute
+                                                (P)
+       save_cursor                sc        sc  save current cursor position
+                                                (P)
+       scroll_forward             ind       sf  scroll text up (P)
+       scroll_reverse             ri        sr  scroll text down (P)
+       set_attributes             sgr       sa  define video attributes #1-#9
+                                                (PG9)
+       set_tab                    hts       st  set a tab in every row,
+                                                current columns
+       set_window                 wind      wi  current window is lines #1-#2
+                                                cols #3-#4
+       tab                        ht        ta  tab to next 8-space hardware
+                                                tab stop
+       to_status_line             tsl       ts  move to status line, column #1
+       underline_char             uc        uc  underline char and move past
+                                                it
+       up_half_line               hu        hu  half a line up
+       init_prog                  iprog     iP  path name of program for
+                                                initialization
+       key_a1                     ka1       K1  upper left of keypad
+
+       key_a3                     ka3       K3  upper right of keypad
+       key_b2                     kb2       K2  center of keypad
+       key_c1                     kc1       K4  lower left of keypad
+       key_c3                     kc3       K5  lower right of keypad
+       prtr_non                   mc5p      pO  turn on printer for #1 bytes
+       char_padding               rmp       rP  like ip but when in insert
+                                                mode
+       acs_chars                  acsc      ac  graphics charset pairs, based
+                                                on vt100
+       plab_norm                  pln       pn  program label #1 to show
+                                                string #2
+       key_btab                   kcbt      kB  back-tab key
+       enter_xon_mode             smxon     SX  turn on xon/xoff handshaking
+       exit_xon_mode              rmxon     RX  turn off xon/xoff handshaking
+       enter_am_mode              smam      SA  turn on automatic margins
+       exit_am_mode               rmam      RA  turn off automatic margins
+       xon_character              xonc      XN  XON character
+       xoff_character             xoffc     XF  XOFF character
+       ena_acs                    enacs     eA  enable alternate char set
+       label_on                   smln      LO  turn on soft labels
+       label_off                  rmln      LF  turn off soft labels
+       key_beg                    kbeg      @1  begin key
+       key_cancel                 kcan      @2  cancel key
+       key_close                  kclo      @3  close key
+       key_command                kcmd      @4  command key
+       key_copy                   kcpy      @5  copy key
+       key_create                 kcrt      @6  create key
+       key_end                    kend      @7  end key
+       key_enter                  kent      @8  enter/send key
+       key_exit                   kext      @9  exit key
+       key_find                   kfnd      @0  find key
+       key_help                   khlp      %1  help key
+       key_mark                   kmrk      %2  mark key
+       key_message                kmsg      %3  message key
+       key_move                   kmov      %4  move key
+       key_next                   knxt      %5  next key
+       key_open                   kopn      %6  open key
+       key_options                kopt      %7  options key
+       key_previous               kprv      %8  previous key
+       key_print                  kprt      %9  print key
+       key_redo                   krdo      %0  redo key
+       key_reference              kref      &1  reference key
+       key_refresh                krfr      &2  refresh key
+       key_replace                krpl      &3  replace key
+       key_restart                krst      &4  restart key
+       key_resume                 kres      &5  resume key
+       key_save                   ksav      &6  save key
+       key_suspend                kspd      &7  suspend key
+       key_undo                   kund      &8  undo key
+
+       key_sbeg                   kBEG      &9  shifted begin key
+       key_scancel                kCAN      &0  shifted cancel key
+       key_scommand               kCMD      *1  shifted command key
+       key_scopy                  kCPY      *2  shifted copy key
+       key_screate                kCRT      *3  shifted create key
+       key_sdc                    kDC       *4  shifted delete-character key
+       key_sdl                    kDL       *5  shifted delete-line key
+       key_select                 kslt      *6  select key
+       key_send                   kEND      *7  shifted end key
+       key_seol                   kEOL      *8  shifted clear-to-end-of-line
+                                                key
+       key_sexit                  kEXT      *9  shifted exit key
+       key_sfind                  kFND      *0  shifted find key
+       key_shelp                  kHLP      #1  shifted help key
+       key_shome                  kHOM      #2  shifted home key
+
+       key_sic                    kIC       #3  shifted insert-character key
+       key_sleft                  kLFT      #4  shifted left-arrow key
+       key_smessage               kMSG      %a  shifted message key
+       key_smove                  kMOV      %b  shifted move key
+       key_snext                  kNXT      %c  shifted next key
+       key_soptions               kOPT      %d  shifted options key
+       key_sprevious              kPRV      %e  shifted previous key
+       key_sprint                 kPRT      %f  shifted print key
+       key_sredo                  kRDO      %g  shifted redo key
+       key_sreplace               kRPL      %h  shifted replace key
+       key_sright                 kRIT      %i  shifted right-arrow key
+       key_srsume                 kRES      %j  shifted resume key
+       key_ssave                  kSAV      !1  shifted save key
+       key_ssuspend               kSPD      !2  shifted suspend key
+       key_sundo                  kUND      !3  shifted undo key
+       req_for_input              rfi       RF  send next input char (for
+                                                ptys)
+       key_f11                    kf11      F1  F11 function key
+       key_f12                    kf12      F2  F12 function key
+       key_f13                    kf13      F3  F13 function key
+       key_f14                    kf14      F4  F14 function key
+       key_f15                    kf15      F5  F15 function key
+       key_f16                    kf16      F6  F16 function key
+       key_f17                    kf17      F7  F17 function key
+       key_f18                    kf18      F8  F18 function key
+       key_f19                    kf19      F9  F19 function key
+       key_f20                    kf20      FA  F20 function key
+       key_f21                    kf21      FB  F21 function key
+       key_f22                    kf22      FC  F22 function key
+       key_f23                    kf23      FD  F23 function key
+       key_f24                    kf24      FE  F24 function key
+       key_f25                    kf25      FF  F25 function key
+       key_f26                    kf26      FG  F26 function key
+       key_f27                    kf27      FH  F27 function key
+       key_f28                    kf28      FI  F28 function key
+       key_f29                    kf29      FJ  F29 function key
+       key_f30                    kf30      FK  F30 function key
+       key_f31                    kf31      FL  F31 function key
+       key_f32                    kf32      FM  F32 function key
+       key_f33                    kf33      FN  F33 function key
+       key_f34                    kf34      FO  F34 function key
+       key_f35                    kf35      FP  F35 function key
+       key_f36                    kf36      FQ  F36 function key
+       key_f37                    kf37      FR  F37 function key
+       key_f38                    kf38      FS  F38 function key
+       key_f39                    kf39      FT  F39 function key
+       key_f40                    kf40      FU  F40 function key
+       key_f41                    kf41      FV  F41 function key
+       key_f42                    kf42      FW  F42 function key
+
+       key_f43                    kf43      FX  F43 function key
+       key_f44                    kf44      FY  F44 function key
+       key_f45                    kf45      FZ  F45 function key
+       key_f46                    kf46      Fa  F46 function key
+       key_f47                    kf47      Fb  F47 function key
+       key_f48                    kf48      Fc  F48 function key
+       key_f49                    kf49      Fd  F49 function key
+       key_f50                    kf50      Fe  F50 function key
+       key_f51                    kf51      Ff  F51 function key
+       key_f52                    kf52      Fg  F52 function key
+       key_f53                    kf53      Fh  F53 function key
+       key_f54                    kf54      Fi  F54 function key
+       key_f55                    kf55      Fj  F55 function key
+       key_f56                    kf56      Fk  F56 function key
+       key_f57                    kf57      Fl  F57 function key
+
+       key_f58                    kf58      Fm  F58 function key
+       key_f59                    kf59      Fn  F59 function key
+       key_f60                    kf60      Fo  F60 function key
+       key_f61                    kf61      Fp  F61 function key
+       key_f62                    kf62      Fq  F62 function key
+       key_f63                    kf63      Fr  F63 function key
+       clr_bol                    el1       cb  Clear to beginning of line
+       clear_margins              mgc       MC  clear right and left soft
+                                                margins
+       set_left_margin            smgl      ML  set left soft margin at
+                                                current column (not in BSD
+                                                termcap)
+       set_right_margin           smgr      MR  set right soft margin at
+                                                current column
+       label_format               fln       Lf  label format
+       set_clock                  sclk      SC  set clock, #1 hrs #2 mins #3
+                                                secs
+       display_clock              dclk      DK  display clock
+       remove_clock               rmclk     RC  remove clock
+       create_window              cwin      CW  define a window #1 from #2,#3
+                                                to #4,#5
+       goto_window                wingo     WG  go to window #1
+       hangup                     hup       HU  hang-up phone
+       dial_phone                 dial      DI  dial number #1
+       quick_dial                 qdial     QD  dial number #1 without
+                                                checking
+       tone                       tone      TO  select touch tone dialing
+       pulse                      pulse     PU  select pulse dialing
+       flash_hook                 hook      fh  flash switch hook
+       fixed_pause                pause     PA  pause for 2-3 seconds
+       wait_tone                  wait      WA  wait for dial-tone
+       user0                      u0        u0  User string #0
+       user1                      u1        u1  User string #1
+       user2                      u2        u2  User string #2
+       user3                      u3        u3  User string #3
+       user4                      u4        u4  User string #4
+       user5                      u5        u5  User string #5
+       user6                      u6        u6  User string #6
+       user7                      u7        u7  User string #7
+       user8                      u8        u8  User string #8
+       user9                      u9        u9  User string #9
+       orig_pair                  op        op  Set default pair to its
+                                                original value
+       orig_colors                oc        oc  Set all color pairs to the
+                                                original ones
+       initialize_color           initc     Ic  initialize color #1 to
+                                                (#2,#3,#4)
+       initialize_pair            initp     Ip  Initialize color pair #1 to
+                                                fg=(#2,#3,#4), bg=(#5,#6,#7)
+       set_color_pair             scp       sp  Set current color pair to #1
+       set_foreground             setf      Sf  Set foreground color #1
+       set_background             setb      Sb  Set background color #1
+       change_char_pitch          cpi       ZA  Change number of characters
+                                                per inch to #1
+       change_line_pitch          lpi       ZB  Change number of lines per
+                                                inch to #1
+       change_res_horz            chr       ZC  Change horizontal resolution
+                                                to #1
+       change_res_vert            cvr       ZD  Change vertical resolution to
+                                                #1
+       define_char                defc      ZE  Define a character #1, #2 dots
+                                                wide, descender #3
+       enter_doublewide_mode      swidm     ZF  Enter double-wide mode
+
+       enter_draft_quality        sdrfq     ZG  Enter draft-quality mode
+
+       enter_italics_mode         sitm      ZH  Enter italic mode
+       enter_leftward_mode        slm       ZI  Start leftward carriage motion
+       enter_micro_mode           smicm     ZJ  Start micro-motion mode
+       enter_near_letter_quality  snlq      ZK  Enter NLQ mode
+       enter_normal_quality       snrmq     ZL  Enter normal-quality mode
+       enter_shadow_mode          sshm      ZM  Enter shadow-print mode
+       enter_subscript_mode       ssubm     ZN  Enter subscript mode
+       enter_superscript_mode     ssupm     ZO  Enter superscript mode
+       enter_upward_mode          sum       ZP  Start upward carriage motion
+       exit_doublewide_mode       rwidm     ZQ  End double-wide mode
+       exit_italics_mode          ritm      ZR  End italic mode
+       exit_leftward_mode         rlm       ZS  End left-motion mode
+       exit_micro_mode            rmicm     ZT  End micro-motion mode
+       exit_shadow_mode           rshm      ZU  End shadow-print mode
+       exit_subscript_mode        rsubm     ZV  End subscript mode
+       exit_superscript_mode      rsupm     ZW  End superscript mode
+       exit_upward_mode           rum       ZX  End reverse character motion
+       micro_column_address       mhpa      ZY  Like column_address in micro
+                                                mode
+       micro_down                 mcud1     ZZ  Like cursor_down in micro mode
+       micro_left                 mcub1     Za  Like cursor_left in micro mode
+       micro_right                mcuf1     Zb  Like cursor_right in micro
+                                                mode
+       micro_row_address          mvpa      Zc  Like row_address #1 in micro
+                                                mode
+       micro_up                   mcuu1     Zd  Like cursor_up in micro mode
+       order_of_pins              porder    Ze  Match software bits to print-
+                                                head pins
+       parm_down_micro            mcud      Zf  Like parm_down_cursor in micro
+                                                mode
+       parm_left_micro            mcub      Zg  Like parm_left_cursor in micro
+                                                mode
+       parm_right_micro           mcuf      Zh  Like parm_right_cursor in
+                                                micro mode
+       parm_up_micro              mcuu      Zi  Like parm_up_cursor in micro
+                                                mode
+       select_char_set            scs       Zj  Select character set, #1
+       set_bottom_margin          smgb      Zk  Set bottom margin at current
+                                                line
+       set_bottom_margin_parm     smgbp     Zl  Set bottom margin at line #1
+                                                or (if smgtp is not given) #2
+                                                lines from bottom
+       set_left_margin_parm       smglp     Zm  Set left (right) margin at
+                                                column #1
+       set_right_margin_parm      smgrp     Zn  Set right margin at column #1
+       set_top_margin             smgt      Zo  Set top margin at current line
+       set_top_margin_parm        smgtp     Zp  Set top (bottom) margin at row
+                                                #1
+       start_bit_image            sbim      Zq  Start printing bit image
+                                                graphics
+       start_char_set_def         scsd      Zr  Start character set definition
+                                                #1, with #2 characters in the
+                                                set
+       stop_bit_image             rbim      Zs  Stop printing bit image
+                                                graphics
+       stop_char_set_def          rcsd      Zt  End definition of character
+                                                set #1
+       subscript_characters       subcs     Zu  List of subscriptable
+                                                characters
+       superscript_characters     supcs     Zv  List of superscriptable
+                                                characters
+       these_cause_cr             docr      Zw  Printing any of these
+                                                characters causes CR
+       zero_motion                zerom     Zx  No motion for subsequent
+                                                character
 
        The following string  capabilities  are  present  in  the  SVr4.0  term
        structure, but were originally not documented in the man page.
 
-
-                  Variable            Cap-       TCap      Description
-                   String             name       Code
-          alt_scancode_esc            scesa      S8     Alternate escape
-                                                        for scancode
-                                                        emulation
-          bit_image_carriage_return   bicr       Yv     Move to beginning
-                                                        of same row
-          bit_image_newline           binel      Zz     Move to next row
-                                                        of the bit image
-          bit_image_repeat            birep      Xy     Repeat bit image
-                                                        cell #1 #2 times
-          char_set_names              csnm       Zy     Produce #1'th item
-                                                        from list of
-                                                        character set
-                                                        names
-          code_set_init               csin       ci     Init sequence for
-                                                        multiple codesets
-          color_names                 colornm    Yw     Give name for
-                                                        color #1
-          define_bit_image_region     defbi      Yx     Define rectangular
-                                                        bit image region
-          device_type                 devt       dv     Indicate
-                                                        language/codeset
-                                                        support
-          display_pc_char             dispc      S1     Display PC
-                                                        character #1
-          end_bit_image_region        endbi      Yy     End a bit-image
-                                                        region
-          enter_pc_charset_mode       smpch      S2     Enter PC character
-                                                        display mode
-          enter_scancode_mode         smsc       S4     Enter PC scancode
-                                                        mode
-          exit_pc_charset_mode        rmpch      S3     Exit PC character
-                                                        display mode
-          exit_scancode_mode          rmsc       S5     Exit PC scancode
-                                                        mode
-          get_mouse                   getm       Gm     Curses should get
-                                                        button events,
-                                                        parameter #1 not
-                                                        documented.
-          key_mouse                   kmous      Km     Mouse event has
-                                                        occurred
-          mouse_info                  minfo      Mi     Mouse status
-                                                        information
-          pc_term_options             pctrm      S6     PC terminal
-                                                        options
-          pkey_plab                   pfxl       xl     Program function
-                                                        key #1 to type
-                                                        string #2 and show
-                                                        string #3
-          req_mouse_pos               reqmp      RQ     Request mouse
-                                                        position
-
-          scancode_escape             scesc      S7     Escape for
-                                                        scancode emulation
-          set0_des_seq                s0ds       s0     Shift to codeset 0
-                                                        (EUC set 0, ASCII)
-          set1_des_seq                s1ds       s1     Shift to codeset 1
-          set2_des_seq                s2ds       s2     Shift to codeset 2
-          set3_des_seq                s3ds       s3     Shift to codeset 3
-          set_a_background            setab      AB     Set background
-                                                        color to #1, using
-                                                        ANSI escape
-          set_a_foreground            setaf      AF     Set foreground
-                                                        color to #1, using
-                                                        ANSI escape
-          set_color_band              setcolor   Yz     Change to ribbon
-                                                        color #1
-          set_lr_margin               smglr      ML     Set both left and
-                                                        right margins to
-                                                        #1, #2.  (ML is
-                                                        not in BSD
-                                                        termcap).
-          set_page_length             slines     YZ     Set page length to
-                                                        #1 lines
-          set_tb_margin               smgtb      MT     Sets both top and
-                                                        bottom margins to
-                                                        #1, #2
-
-        The XSI Curses standard added these hardcopy capabilities.  They  were
-        used  in  some post-4.1 versions of System V curses, e.g., Solaris 2.5
-        and IRIX 6.x.  Except for YI, the ncurses termcap names for  them  are
-        invented.   According to the XSI Curses standard, they have no termcap
-        names.  If your compiled terminfo entries use these, they may  not  be
-        binary-compatible with System V terminfo entries after SVr4.1; beware!
-
-
-                  Variable            Cap-      TCap       Description
-                   String             name      Code
-          enter_horizontal_hl_mode    ehhlm     Xh     Enter horizontal
-                                                       highlight mode
-          enter_left_hl_mode          elhlm     Xl     Enter left highlight
-                                                       mode
-          enter_low_hl_mode           elohlm    Xo     Enter low highlight
-                                                       mode
-          enter_right_hl_mode         erhlm     Xr     Enter right
-                                                       highlight mode
-          enter_top_hl_mode           ethlm     Xt     Enter top highlight
-                                                       mode
-          enter_vertical_hl_mode      evhlm     Xv     Enter vertical
-                                                       highlight mode
-          set_a_attributes            sgr1      sA     Define second set of
-                                                       video attributes
-                                                       #1-#6
-          set_pglen_inch              slength   YI     Set page length to
-                                                       #1 hundredth of an
-                                                       inch (some
-                                                       implementations use
-                                                       sL for termcap).
+                                      Code
+       String Capability Name     TI        TC  Description
+       ------------------------------------------------------------------------
+       char_set_names             csnm      Zy  Produce #1'th item from list
+                                                of character set names
+       key_mouse                  kmous     Km  Mouse event has occurred
+       mouse_info                 minfo     Mi  Mouse status information
+       req_mouse_pos              reqmp     RQ  Request mouse position
+       get_mouse                  getm      Gm  Curses should get button
+                                                events, parameter #1 not
+                                                documented.
+       set_a_foreground           setaf     AF  Set foreground color to #1,
+                                                using ANSI escape
+       set_a_background           setab     AB  Set background color to #1,
+                                                using ANSI escape
+       pkey_plab                  pfxl      xl  Program function key #1 to
+                                                type string #2 and show string
+                                                #3
+       device_type                devt      dv  Indicate language, codeset
+                                                support
+       code_set_init              csin      ci  Init sequence for multiple
+                                                codesets
+       set0_des_seq               s0ds      s0  Shift to codeset 0 (EUC set 0,
+                                                ASCII)
+       set1_des_seq               s1ds      s1  Shift to codeset 1
+       set2_des_seq               s2ds      s2  Shift to codeset 2
+       set3_des_seq               s3ds      s3  Shift to codeset 3
+       set_lr_margin              smglr     ML  Set both left and right
+                                                margins to #1, #2.  (ML is not
+                                                in BSD termcap).
+       set_tb_margin              smgtb     MT  Sets both top and bottom
+                                                margins to #1, #2
+       bit_image_repeat           birep     Xy  Repeat bit image cell #1 #2
+                                                times
+       bit_image_newline          binel     Zz  Move to next row of the bit
+                                                image
+       bit_image_carriage_return  bicr      Yv  Move to beginning of same row
+       color_names                colornm   Yw  Give name for color #1
+       define_bit_image_region    defbi     Yx  Define rectangular bit image
+                                                region
+       end_bit_image_region       endbi     Yy  End a bit-image region
+       set_color_band             setcolor  Yz  Change to ribbon color #1
+       set_page_length            slines    YZ  Set page length to #1 lines
+       display_pc_char            dispc     S1  Display PC character #1
+       enter_pc_charset_mode      smpch     S2  Enter PC character display
+                                                mode
+       exit_pc_charset_mode       rmpch     S3  Exit PC character display mode
+       enter_scancode_mode        smsc      S4  Enter PC scancode mode
+       exit_scancode_mode         rmsc      S5  Exit PC scancode mode
+       pc_term_options            pctrm     S6  PC terminal options
+       scancode_escape            scesc     S7  Escape for scancode emulation
+       alt_scancode_esc           scesa     S8  Alternate escape for scancode
+                                                emulation
+
+       The  XSI  Curses standard added these hardcopy capabilities.  They were
+       used in some post-4.1 versions of System V curses,  e.g.,  Solaris  2.5
+       and  IRIX  6.x.   Except for YI, the ncurses termcap names for them are
+       invented.  According to the XSI Curses standard, they have  no  termcap
+       names.   If  your  compiled terminfo entries use these, they may not be
+       binary-compatible with System V terminfo entries after SVr4.1; beware!
+
+                                      Code
+
+       String Capability Name     TI        TC  Description
+       ------------------------------------------------------------------------
+       enter_horizontal_hl_mode   ehhlm     Xh  Enter horizontal highlight
+                                                mode
+       enter_left_hl_mode         elhlm     Xl  Enter left highlight mode
+       enter_low_hl_mode          elohlm    Xo  Enter low highlight mode
+       enter_right_hl_mode        erhlm     Xr  Enter right highlight mode
+       enter_top_hl_mode          ethlm     Xt  Enter top highlight mode
+       enter_vertical_hl_mode     evhlm     Xv  Enter vertical highlight mode
+       set_a_attributes           sgr1      sA  Define second set of video
+                                                attributes #1-#6
+       set_pglen_inch             slength   YI  Set page length to #1
+                                                hundredth of an inch (some
+                                                implementations use sL for
+                                                termcap).

                User-Defined Capabilities

                @@ -1143,20 +935,20 @@ 
                terminfo 5   File Formats
                
        which are awkward or impossible to represent by reusing the  predefined
        capabilities.
 
-       ncurses    addresses   this   limitation   by   allowing   user-defined
+       ncurses    addresses   this   limitation   by   allowing   user-defined
        capabilities.  The tic and infocmp programs provide the -x  option  for
        this purpose.  When -x is set, tic treats unknown capabilities as user-
        defined.  That is, if tic encounters a capability name  which  it  does
-       not  recognize, it infers its type (boolean, number or string) from the
+       not  recognize, it infers its type (Boolean, number or string) from the
        syntax and makes an extended table  entry  for  that  capability.   The
        use_extended_names(3x)  function  makes  this information conditionally
-       available to applications.   The  ncurses  library  provides  the  data
+       available to applications.   The  ncurses  library  provides  the  data
        leaving most of the behavior to applications:
 
        o   User-defined  capability  strings  whose  name  begins with "k" are
            treated as function keys.
 
-       o   The types (boolean,  number,  string)  determined  by  tic  can  be
+       o   The types (Boolean,  number,  string)  determined  by  tic  can  be
            inferred by successful calls on tigetflag, etc.
 
        o   If the capability name happens to be two characters, the capability
@@ -1166,15 +958,20 @@ 
                terminfo 5   File Formats
                
        predefined  set of capabilities, in practice it has been limited to the
        capabilities defined by terminfo implementations.   As  a  rule,  user-
        defined capabilities intended for use by termcap applications should be
-       limited to booleans and numbers to avoid running  past  the  1023  byte
+       limited to Booleans and numbers to avoid running  past  the  1023  byte
        limit  assumed  by  termcap implementations and their applications.  In
        particular, providing extended sets  of  function  keys  (past  the  60
        numbered keys and the handful of special named keys) is best done using
        the longer names available using terminfo.
 
+       The ncurses library uses a few of these user-defined  capabilities,  as
+       described  in user_caps(5).  Other user-defined capabilities (including
+       function keys) are described in the terminal database, in  the  section
+       on NCURSES USER-DEFINABLE CAPABILITIES
+

                A Sample Entry

                -       The  following  entry,  describing  an   ANSI-standard   terminal,   is
+       The   following   entry,   describing  an  ANSI-standard  terminal,  is
        representative of what a terminfo entry for a modern terminal typically
        looks like.
 
@@ -1209,41 +1006,41 @@ 
                terminfo 5   File Formats
                
                smul=\E[4m, tbc=\E[3g, u6=\E[%i%d;%dR, u7=\E[6n,
                u8=\E[?%[;0123456789]c, u9=\E[c, vpa=\E[%i%p1%dd,
 
-       Entries may continue onto multiple lines by placing white space at  the
-       beginning  of  each line except the first.  Comments may be included on
+       Entries  may continue onto multiple lines by placing white space at the
+       beginning of each line except the first.  Comments may be  included  on
        lines beginning with "#".  Capabilities in terminfo are of three types:
 
-       o   Boolean capabilities which indicate  that  the  terminal  has  some
+       o   Boolean  capabilities  which  indicate  that  the terminal has some
            particular feature,
 
        o   numeric capabilities giving the size of the terminal or the size of
            particular delays, and
 
-       o   string capabilities, which give a sequence which  can  be  used  to
+       o   string  capabilities,  which  give  a sequence which can be used to
            perform particular terminal operations.

                Types of Capabilities

                        All capabilities have names.  For instance, the fact that ANSI-standard
-       terminals have automatic margins (i.e., an automatic return  and  line-
-       feed  when the end of a line is reached) is indicated by the capability
-       am.  Hence the description of ansi includes am.   Numeric  capabilities
-       are  followed  by  the  character  "#" and then a positive value.  Thus
+       terminals  have  automatic margins (i.e., an automatic return and line-
+       feed when the end of a line is reached) is indicated by the  capability
+       am.   Hence  the description of ansi includes am.  Numeric capabilities
+       are followed by the character "#" and  then  a  positive  value.   Thus
        cols, which indicates the number of columns the terminal has, gives the
-       value  "80" for ansi.  Values for numeric capabilities may be specified
-       in decimal, octal or hexadecimal,  using  the  C  programming  language
+       value "80" for ansi.  Values for numeric capabilities may be  specified
+       in  decimal,  octal,  or  hexadecimal, using the C programming language
        conventions (e.g., 255, 0377 and 0xff or 0xFF).
 
-       Finally,  string  valued capabilities, such as el (clear to end of line
-       sequence) are given by the two-character  code,  an  "=",  and  then  a
+       Finally, string valued capabilities, such as el (clear to end  of  line
+       sequence)  are  given  by  the  two-character  code, an "=", and then a
        string ending at the next following ",".
 
-       A  number  of  escape  sequences  are  provided  in  the  string valued
+       A number  of  escape  sequences  are  provided  in  the  string  valued
        capabilities for easy encoding of characters there:
 
        o   Both \E and \e map to an ESCAPE character,
 
-       o   ^x maps to a control-x for any appropriate x, and
+       o   ^x maps to a control-x for any appropriate x, and
 
        o   the sequences
 
@@ -1256,10 +1053,10 @@ 
                terminfo 5   File Formats
                
            respectively.
 
        X/Open Curses does not say what "appropriate x" might be.  In practice,
-       that  is a printable ASCII graphic character.  The special case "^?" is
-       interpreted as DEL (127).  In all other cases, the character  value  is
-       AND'd  with 0x1f, mapping to ASCII control codes in the range 0 through
-       31.
+       that is a printable ASCII graphic character.  The special case "^?"  is
+       interpreted  as  DEL (127).  In all other cases, the character value is
+       logically "and"-ed with 0x1f, mapping to ASCII  control  codes  in  the
+       range 0 through 31.
 
        Other escapes include
 
@@ -1274,70 +1071,89 @@ 
                terminfo 5   File Formats
                
        o   and \0 for null.
 
            \0 will produce \200, which does not terminate a string but behaves
-           as  a null character on most terminals, providing CS7 is specified.
+           as a null character on most terminals, providing CS7 is  specified.
            See stty(1).
 
-           The reason for this quirk is to maintain  binary  compatibility  of
-           the  compiled  terminfo files with other implementations, e.g., the
-           SVr4 systems, which document this.   Compiled  terminfo  files  use
-           null-terminated  strings,  with  no  lengths.  Modifying this would
-           require a new binary  format,  which  would  not  work  with  other
+           The  reason  for  this quirk is to maintain binary compatibility of
+           the compiled terminfo files with other implementations,  e.g.,  the
+           SVr4  systems,  which  document  this.  Compiled terminfo files use
+           null-terminated strings, with no  lengths.   Modifying  this  would
+           require  a  new  binary  format,  which  would  not work with other
            implementations.
 
        Finally, characters may be given as three octal digits after a \.
 
-       A  delay  in  milliseconds  may appear anywhere in a string capability,
-       enclosed in $<..> brackets, as in el=\EK$<5>,  and  padding  characters
+       A delay in milliseconds may appear anywhere  in  a  string  capability,
+       enclosed  in  $<..>  brackets, as in el=\EK$<5>, and padding characters
        are supplied by tputs(3x) to provide this delay.
 
-       o   The  delay  must  be  a  number  with  at most one decimal place of
+       o   The delay must be a number  with  at  most  one  decimal  place  of
            precision; it may be followed by suffixes "*" or "/" or both.
 
-       o   A "*" indicates that the padding required is  proportional  to  the
-           number  of lines affected by the operation, and the amount given is
-           the per-affected-unit padding required.  (In  the  case  of  insert
+       o   A  "*"  indicates  that the padding required is proportional to the
+           number of lines affected by the operation, and the amount given  is
+           the  per-affected-unit  padding  required.   (In the case of insert
            character, the factor is still the number of lines affected.)
 
            Normally, padding is advisory if the device has the xon capability;
            it is used for cost computation but does not trigger delays.
 
-       o   A "/" suffix indicates that the padding is mandatory and  forces  a
+       o   A  "/"  suffix indicates that the padding is mandatory and forces a
            delay of the given number of milliseconds even on devices for which
            xon is present to indicate flow control.
 
-       Sometimes individual capabilities must be commented out.  To  do  this,
-       put  a  period before the capability name.  For example, see the second
+       Sometimes  individual  capabilities must be commented out.  To do this,
+       put a period before the capability name.  For example, see  the  second
        ind in the example above.

                Fetching Compiled Descriptions

                -       The ncurses library  searches  for  terminal  descriptions  in  several
-       places.   It  uses only the first description found.  The library has a
-       compiled-in list of  places  to  search  which  can  be  overridden  by
-       environment  variables.   Before starting to search, ncurses eliminates
-       duplicates in its search list.
+       Terminal  descriptions  in  ncurses  are  stored in terminal databases.
+       These databases, which are found by their pathname, may  be  configured
+       either as directory trees or hashed databases (see term(5)),
+
+       The  library  uses  a  compiled-in  list  of  pathnames,  which  can be
+       overridden  by  environment  variables.   Before  starting  to  search,
+       ncurses  checks  the  search list, eliminating duplicates and pathnames
+       where no terminal database is found.  The  ncurses  library  reads  the
+       first description which passes its consistency checks.
+
+       o   The  environment variable TERMINFO is checked first, for a terminal
+           database containing the terminal description.
 
-       o   If the environment variable TERMINFO is set, it is  interpreted  as
-           the pathname of a directory containing the compiled description you
-           are working on.  Only that directory is searched.
+       o   Next, ncurses looks in $HOME/.terminfo for a compiled description.
 
-       o   If TERMINFO is not set, ncurses will instead look in the  directory
-           $HOME/.terminfo for a compiled description.
+           This is an optional feature which may be omitted entirely from  the
+           library,  or  limited  to  prevent  accidental  use  by  privileged
+           applications.
 
-       o   Next,  if  the  environment  variable TERMINFO_DIRS is set, ncurses
-           will interpret the contents of that variable as a  list  of  colon-
-           separated directories (or database files) to be searched.
+       o   Next, if the environment variable  TERMINFO_DIRS  is  set,  ncurses
+           interprets  the  contents  of  that  variable  as  a list of colon-
+           separated pathnames of terminal databases to be searched.
 
-           An  empty directory name (i.e., if the variable begins or ends with
-           a colon, or contains adjacent colons) is interpreted as the  system
+           An empty pathname (i.e., if the variable  begins  or  ends  with  a
+           colon,  or  contains  adjacent colons) is interpreted as the system
            location /usr/share/terminfo.
 
-       o   Finally, ncurses searches these compiled-in locations:
+       o   Finally, ncurses searches these compiled-in locations:
 
-           o   a list of directories (no default value), and
+           o   a list of directories (/usr/share/terminfo), and
 
-           o   the   system   terminfo   directory,  /usr/share/terminfo  (the
-               compiled-in default).
+           o   the system terminfo directory, /usr/share/terminfo
+
+       The TERMINFO variable can contain a terminal description instead of the
+       pathname  of  a terminal database.  If this variable begins with "hex:"
+       or "b64:" then ncurses reads a terminal description  from  hexadecimal-
+       or  base64-encoded  data,  and  if  that  description  matches the name
+       sought, will use that.  This encoded data can be  set  using  the  "-Q"
+       option of tic or infocmp.
+
+       The  preceding addresses the usual configuration of ncurses, which uses
+       terminal descriptions prepared in terminfo format.   While  termcap  is
+       less  expressive,  ncurses  can  also  be  configured  to  read termcap
+       descriptions.   In  that  configuration,  it  checks  the  TERMCAP  and
+       TERMPATH  variables  (for  content and search path, respectively) after
+       the system terminal database.

                Preparing Descriptions

                @@ -1370,9 +1186,9 @@ 
                terminfo 5   File Formats
                
        printing terminal, with no soft copy unit, give it both hc and os.  (os
        applies  to  storage scope terminals, such as TEKTRONIX 4010 series, as
        well as hard copy and APL terminals.)  If there is a code to  move  the
-       cursor to the left edge of the current row, give this as cr.  (Normally
-       this will be carriage return,  control/M.)   If  there  is  a  code  to
-       produce an audible signal (bell, beep, etc) give this as bel.
+       cursor  to  the  left  edge  of  the  current  line,  give  this as cr.
+       (Normally this will be carriage return, control/M.)  If there is a code
+       to produce an audible signal (bell, beep, etc) give this as bel.
 
        If there is a code to move the cursor one position to the left (such as
        backspace) that capability should be given as cub1.   Similarly,  codes
@@ -1401,7 +1217,7 @@ 
                terminfo 5   File Formats
                
        the  screen when text is output, but this does not necessarily apply to
        a cuf1 from the last column.  The only local motion  which  is  defined
        from  the  left  edge is if bw is given, then a cub1 from the left edge
-       will move to the right edge of the previous row.  If bw is  not  given,
+       will move to the right edge of the previous line.  If bw is not  given,
        the  effect  is undefined.  This is useful for drawing a box around the
        edge of the screen, for example.  If the terminal has switch selectable
        automatic  margins,  the terminfo file usually assumes that this is on;
@@ -1428,8 +1244,8 @@ 
                terminfo 5   File Formats
                
        Cursor  addressing  and  other  strings  requiring  parameters  in  the
        terminal are described  by  a  parameterized  string  capability,  with
        printf-like  escapes  such  as  %x  in it.  For example, to address the
-       cursor, the cup capability is given, using two parameters: the row  and
-       column  to  address  to.   (Rows and columns are numbered from zero and
+       cursor, the cup capability is given, using two parameters: the line and
+       column  to  address  to.  (Lines and columns are numbered from zero and
        refer to the physical screen visible to the user,  not  to  any  unseen
        memory.)   If  the terminal has memory relative cursor addressing, that
        can be indicated by mrcup.
@@ -1450,7 +1266,7 @@ 
                terminfo 5   File Formats
                
             the next character to be a "-" flag, avoiding interpreting "%-" as
             an operator.
 
-       %c   print pop() like %c in printf
+       %c   print pop() like %c in printf
 
        %s   print pop() like %s in printf
 
@@ -1482,7 +1298,7 @@ 
                terminfo 5   File Formats
                
                 stack in the tparm function.
 
             o   SVr3.2  curses supported static variables.  Those are an array
-                in the TERMINAL structure (declared in term.h), and are zeroed
+                in the TERMINAL structure (declared in term.h), and are zeroed
                 automatically when the setupterm function allocates the data.
 
             o   SVr4 curses made no further improvements to the dynamic/static
@@ -1492,16 +1308,16 @@ 
                terminfo 5   File Formats
                
                 static  variables.  They are the same.  Like SVr4 curses, XPG4
                 curses does not initialize these explicitly.
 
-            o   Before version 6.3, ncurses stores  both  dynamic  and  static
+            o   Before version 6.3, ncurses stores  both  dynamic  and  static
                 variables in persistent storage, initialized to zeros.
 
-            o   Beginning  with version 6.3, ncurses stores static and dynamic
+            o   Beginning  with version 6.3, ncurses stores static and dynamic
                 variables in the same manner as SVr4.
 
-                o   Unlike  other  implementations,  ncurses   zeros   dynamic
+                o   Unlike  other  implementations,  ncurses   zeros   dynamic
                     variables before the first %g or %P operator.
 
-                o   Like  SVr2,  the  scope of dynamic variables in ncurses is
+                o   Like  SVr2,  the  scope of dynamic variables in ncurses is
                     within the current call to tparm.  Use static variables if
                     persistent storage is needed.
 
@@ -1516,13 +1332,14 @@ 
                terminfo 5   File Formats
                
             arithmetic (%m is mod): push(pop() op pop())
 
        %&, %|, %^
-            bit operations (AND, OR and exclusive-OR): push(pop() op pop())
+            bit  operations  ("and",  "or"  and exclusive "or"): push(pop() op
+            pop())
 
        %=, %>, %<
             logical operations: push(pop() op pop())
 
        %A, %O
-            logical AND and OR operations (for conditionals)
+            logical "and" and "or" operations (for conditionals)
 
        %!, %~
             unary operations (logical and bit complement): push(op pop())
@@ -1531,8 +1348,8 @@ 
                terminfo 5   File Formats
                
 
        %? expr %t thenpart %e elsepart %;
             This forms an if-then-else.  The %e elsepart is optional.  Usually
-            the %? expr part pushes a value onto the stack,  and  %t  pops  it
-            from  the  stack,  testing if it is nonzero (true).  If it is zero
+            the  %?  expr  part  pushes a value onto the stack, and %t pops it
+            from the stack, testing if it is nonzero (true).  If  it  is  zero
             (false), control passes to the %e (else) part.
 
             It is possible to form else-if's a la Algol 68:
@@ -1540,81 +1357,84 @@ 
                terminfo 5   File Formats
                
 
             where ci are conditions, bi are bodies.
 
-            Use the -f option of tic or infocmp to see the  structure  of  if-
+            Use  the  -f  option of tic or infocmp to see the structure of if-
             then-else's.  Some strings, e.g., sgr can be very complicated when
-            written on one line.  The -f option splits the string  into  lines
+            written  on  one line.  The -f option splits the string into lines
             with the parts indented.
 
-       Binary  operations  are  in postfix form with the operands in the usual
-       order.  That is, to get x-5 one  would  use  "%gx%{5}%-".   %P  and  %g
+       Binary operations are in postfix form with the operands  in  the  usual
+       order.   That  is,  to  get  x-5  one would use "%gx%{5}%-".  %P and %g
        variables are persistent across escape-string evaluations.
 
-       Consider  the HP2645, which, to get to row 3 and column 12, needs to be
-       sent \E&a12c03Y padded for 6 milliseconds.  Note that the order of  the
-       rows  and  columns  is  inverted  here, and that the row and column are
-       printed   as   two   digits.     Thus    its    cup    capability    is
-       "cup=6\E&%p2%2dc%p1%2dY".
-
-       The  Microterm ACT-IV needs the current row and column sent preceded by
-       a  ^T,  with  the  row   and   column   simply   encoded   in   binary,
-       "cup=^T%p1%c%p2%c".   Terminals  which  use  "%c"  need  to  be able to
-       backspace the cursor (cub1), and to move the cursor up one line on  the
-       screen  (cuu1).   This  is  necessary  because it is not always safe to
-       transmit \n ^D and \r, as the system may change or discard them.   (The
-       library  routines  dealing with terminfo set tty modes so that tabs are
-       never expanded, so \t is safe to send.  This turns out to be  essential
-       for the Ann Arbor 4080.)
-
-       A  final example is the LSI ADM-3a, which uses row and column offset by
-       a blank character, thus "cup=\E=%p1%' '%+%c%p2%' '%+%c".  After sending
-       "\E=",  this  pushes  the first parameter, pushes the ASCII value for a
-       space (32), adds them (pushing the sum on the stack in place of the two
-       previous  values) and outputs that value as a character.  Then the same
-       is done for the second parameter.  More complex arithmetic is  possible
-       using the stack.
+       Consider the HP2645, which, to get to line 3 and column 12, needs to be
+       sent  \E&a12c03Y padded for 6 milliseconds.  The order of the lines and
+       columns is inverted here, and the lines and column are printed  as  two
+       digits.  The corresponding terminal description is expressed thus:
+              cup=\E&a%p2%dc%p1%dY$<6>,
+
+       The Microterm ACT-IV needs the current line and column sent preceded by
+       a ^T, with the line and column simply encoded in binary,
+              cup=^T%p1%c%p2%c
+
+       Terminals which use "%c" need  to  be  able  to  backspace  the  cursor
+       (cub1),  and to move the cursor up one line on the screen (cuu1).  This
+       is necessary because it is not always safe to transmit \n ^D and \r, as
+       the  system  may change or discard them.  (The library routines dealing
+       with terminfo set tty modes so that tabs are never expanded, so  \t  is
+       safe to send.  This turns out to be essential for the Ann Arbor 4080.)
+
+       A final example is the LSI ADM-3A, which uses line and column offset by
+       a space, thus
+              cup=\E=%p1%' '%+%c%p2%' '%+%c
+
+       After sending "\E=", this pushes the first parameter, pushes the  ASCII
+       value  for  a  space  (32),  adds them (pushing the sum on the stack in
+       place of  the  two  previous  values)  and  outputs  that  value  as  a
+       character.   Then  the  same  is  done  for the second parameter.  More
+       complex arithmetic is possible using the stack.

                Cursor Motions

                -       If  the  terminal has a fast way to home the cursor (to very upper left
-       corner of screen) then this can be given as home; similarly a fast  way
-       of  getting  to the lower left-hand corner can be given as ll; this may
+       If the terminal has a fast way to home the cursor (to very  upper  left
+       corner  of screen) then this can be given as home; similarly a fast way
+       of getting to the lower left-hand corner can be given as ll;  this  may
        involve going up with cuu1 from the home position, but a program should
        never do this itself (unless ll does) because it can make no assumption
-       about the effect of moving up from the home position.   Note  that  the
-       home  position  is  the  same  as  addressing to (0,0): to the top left
-       corner of the screen, not of memory.  (Thus, the  \EH  sequence  on  HP
+       about  the  effect  of moving up from the home position.  Note that the
+       home position is the same as addressing  to  (0,0):  to  the  top  left
+       corner  of  the  screen,  not of memory.  (Thus, the \EH sequence on HP
        terminals cannot be used for home.)
 
-       If the terminal has row or column absolute cursor addressing, these can
-       be given as single  parameter  capabilities  hpa  (horizontal  position
-       absolute)  and  vpa  (vertical position absolute).  Sometimes these are
-       shorter than the more general  two  parameter  sequence  (as  with  the
-       hp2645)   and  can  be  used  in  preference  to  cup.   If  there  are
-       parameterized local motions (e.g., move n spaces to  the  right)  these
-       can  be  given  as  cud,  cub,  cuf,  and  cuu  with a single parameter
-       indicating how many spaces to move.  These are primarily useful if  the
+       If the terminal has line or column absolute  cursor  addressing,  these
+       can  be given as single parameter capabilities hpa (horizontal position
+       absolute) and vpa (vertical position absolute).   Sometimes  these  are
+       shorter  than  the  more  general  two  parameter sequence (as with the
+       hp2645)  and  can  be  used  in  preference  to  cup.   If  there   are
+       parameterized  local  motions  (e.g., move n spaces to the right) these
+       can be given as  cud,  cub,  cuf,  and  cuu  with  a  single  parameter
+       indicating  how many spaces to move.  These are primarily useful if the
        terminal does not have cup, such as the TEKTRONIX 4025.
 
-       If  the  terminal  needs to be in a special mode when running a program
+       If the terminal needs to be in a special mode when  running  a  program
        that uses these capabilities, the codes to enter and exit this mode can
-       be  given as smcup and rmcup.  This arises, for example, from terminals
-       like the Concept with more than one page of memory.   If  the  terminal
-       has  only  memory  relative  cursor  addressing and not screen relative
-       cursor addressing, a one screen-sized window must  be  fixed  into  the
+       be given as smcup and rmcup.  This arises, for example, from  terminals
+       like  the  Concept  with more than one page of memory.  If the terminal
+       has only memory relative cursor  addressing  and  not  screen  relative
+       cursor  addressing,  a  one  screen-sized window must be fixed into the
        terminal for cursor addressing to work properly.  This is also used for
-       the TEKTRONIX 4025, where smcup sets the command character  to  be  the
-       one  used  by  terminfo.   If  the  smcup sequence will not restore the
-       screen after an rmcup  sequence  is  output  (to  the  state  prior  to
+       the  TEKTRONIX  4025,  where smcup sets the command character to be the
+       one used by terminfo.  If the  smcup  sequence  will  not  restore  the
+       screen  after  an  rmcup  sequence  is  output  (to  the state prior to
        outputting rmcup), specify nrrmc.

                Margins

                -       SVr4  (and  X/Open Curses) list several string capabilities for setting
-       margins.  Two were intended for use with  terminals,  and  another  six
+       SVr4 (and X/Open Curses) list several string capabilities  for  setting
+       margins.   Two  were  intended  for use with terminals, and another six
        were intended for use with printers.
 
        o   The two terminal capabilities assume that the terminal may have the
-           capability of setting the left and/or right margin at  the  current
+           capability  of  setting the left and/or right margin at the current
            cursor column position.
 
        o   The printer capabilities assume that the printer may have two types
@@ -1623,370 +1443,370 @@ 
                terminfo 5   File Formats
                
            o   the ability to set a top and/or bottom margin using the current
                line position, and
 
-           o   parameterized  capabilities  for setting the top, bottom, left,
-               right margins given the number of rows or columns.
+           o   parameterized capabilities for setting the top,  bottom,  left,
+               right margins given the number of lines or columns.
 
-       In practice, the categorization into "terminal" and  "printer"  is  not
+       In  practice,  the  categorization into "terminal" and "printer" is not
        suitable:
 
-       o   The  AT&T  SVr4  terminal  database  uses smgl four times, for AT&T
+       o   The AT&T SVr4 terminal database uses  smgl  four  times,  for  AT&T
            hardware.
 
-           Three of the four are printers.   They  lack  the  ability  to  set
+           Three  of  the  four  are  printers.   They lack the ability to set
            left/right margins by specifying the column.
 
-       o   Other  (non-AT&T) terminals may support margins but using different
+       o   Other (non-AT&T) terminals may support margins but using  different
            assumptions from AT&T.
 
-           For instance, the DEC VT420 supports left/right margins,  but  only
+           For  instance,  the DEC VT420 supports left/right margins, but only
            using a column parameter.  As an added complication, the VT420 uses
-           two settings to fully enable left/right margins (left/right  margin
-           mode,  and  origin  mode).   The  former enables the margins, which
-           causes printed text to wrap  within  margins,  but  the  latter  is
+           two  settings to fully enable left/right margins (left/right margin
+           mode, and origin mode).  The  former  enables  the  margins,  which
+           causes  printed  text  to  wrap  within  margins, but the latter is
            needed to prevent cursor-addressing outside those margins.
 
-       o   Both  DEC  VT420  left/right  margins are set with a single control
+       o   Both DEC VT420 left/right margins are set  with  a  single  control
            sequence.  If either is omitted, the corresponding margin is set to
-           the  left  or  right  edge  of the display (rather than leaving the
+           the left or right edge of the  display  (rather  than  leaving  the
            margin unmodified).
 
        These are the margin-related capabilities:
 
-                Name       Description
-                ------------------------------------------------------
-                smgl       Set left margin at current column
-                smgr       Set right margin at current column
-                smgb       Set bottom margin at current line
-                smgt       Set top margin at current line
-                smgbp      Set bottom margin at line N
-                smglp      Set left margin at column N
-                smgrp      Set right margin at column N
-                smgtp      Set top margin at line N
-                smglr      Set both left and right margins to L and R
-                smgtb      Set both top and bottom margins to T and B
-
-       When writing an application that uses these  string  capabilities,  the
-       pairs  should be first checked to see if each capability in the pair is
+                 Name    Description
+                 ---------------------------------------------------
+                 smgl    Set left margin at current column
+                 smgr    Set right margin at current column
+                 smgb    Set bottom margin at current line
+                 smgt    Set top margin at current line
+                 smgbp   Set bottom margin at line N
+                 smglp   Set left margin at column N
+                 smgrp   Set right margin at column N
+                 smgtp   Set top margin at line N
+                 smglr   Set both left and right margins to L and R
+                 smgtb   Set both top and bottom margins to T and B
+
+       When  writing  an  application that uses these string capabilities, the
+       pairs should be first checked to see if each capability in the pair  is
        set or only one is set:
 
-       o   If both smglp and smgrp  are  set,  each  is  used  with  a  single
-           argument,  N,  that  gives  the column number of the left and right
+       o   If  both  smglp  and  smgrp  are  set,  each  is used with a single
+           argument, N, that gives the column number of  the  left  and  right
            margin, respectively.
 
-       o   If both smgtp and smgbp are set, each is used to set  the  top  and
+       o   If  both  smgtp  and smgbp are set, each is used to set the top and
            bottom margin, respectively:
 
            o   smgtp is used with a single argument, N, the line number of the
                top margin.
 
-           o   smgbp is used with two arguments, N and M, that give  the  line
+           o   smgbp  is  used with two arguments, N and M, that give the line
                number of the bottom margin, the first counting from the top of
-               the page  and  the  second  counting  from  the  bottom.   This
-               accommodates  the two styles of specifying the bottom margin in
+               the  page  and  the  second  counting  from  the  bottom.  This
+               accommodates the two styles of specifying the bottom margin  in
                different manufacturers' printers.
 
-           When designing a terminfo entry for a printer that has  a  settable
-           bottom  margin,  only  the first or second argument should be used,
+           When  designing  a terminfo entry for a printer that has a settable
+           bottom margin, only the first or second argument  should  be  used,
            depending on the printer.  When developing an application that uses
            smgbp to set the bottom margin, both arguments must be given.
 
        Conversely, when only one capability in the pair is set:
 
-       o   If  only  one  of  smglp and smgrp is set, then it is used with two
+       o   If only one of smglp and smgrp is set, then it  is  used  with  two
            arguments, the column number of the left and right margins, in that
            order.
 
-       o   Likewise,  if  only  one of smgtp and smgbp is set, then it is used
-           with two arguments that give the top and bottom  margins,  in  that
+       o   Likewise, if only one of smgtp and smgbp is set, then  it  is  used
+           with  two  arguments  that give the top and bottom margins, in that
            order, counting from the top of the page.
 
            When designing a terminfo entry for a printer that requires setting
-           both left and right or top and bottom margins simultaneously,  only
-           one  capability  in  the  pairs  smglp and smgrp or smgtp and smgbp
+           both  left and right or top and bottom margins simultaneously, only
+           one capability in the pairs smglp and  smgrp  or  smgtp  and  smgbp
            should be defined, leaving the other unset.
 
-       Except for very old terminal descriptions, e.g.,  those  developed  for
-       SVr4,  the  scheme  just  described  should be considered obsolete.  An
+       Except  for  very  old terminal descriptions, e.g., those developed for
+       SVr4, the scheme just described  should  be  considered  obsolete.   An
        improved set of capabilities was added late in the SVr4 releases (smglr
-       and  smgtb),  which  explicitly  use  two  parameters  for  setting the
+       and smgtb),  which  explicitly  use  two  parameters  for  setting  the
        left/right or top/bottom margins.
 
        When setting margins, the line- and column-values are zero-based.
 
-       The mgc string capability should  be  defined.   Applications  such  as
+       The  mgc  string  capability  should  be defined.  Applications such as
        tabs(1) rely upon this to reset all margins.

                Area Clears

                -       If  the  terminal can clear from the current position to the end of the
-       line, leaving the cursor where it is, this should be given as  el.   If
-       the  terminal  can  clear from the beginning of the line to the current
-       position inclusive, leaving the cursor where  it  is,  this  should  be
-       given  as  el1.  If the terminal can clear from the current position to
-       the end of the display, then this should be given as ed.   Ed  is  only
+       If the terminal can clear from the current position to the end  of  the
+       line,  leaving  the cursor where it is, this should be given as el.  If
+       the terminal can clear from the beginning of the line  to  the  current
+       position  inclusive,  leaving  the  cursor  where it is, this should be
+       given as el1.  If the terminal can clear from the current  position  to
+       the  end  of  the display, then this should be given as ed.  Ed is only
        defined from the first column of a line.  (Thus, it can be simulated by
-       a request to delete a large number of  lines,  if  a  true  ed  is  not
+       a  request  to  delete  a  large  number  of lines, if a true ed is not
        available.)
 
 
-

                Insert/delete line and vertical motions

                -       If  the  terminal  can  open a new blank line before the line where the
-       cursor is, this should be given as il1; this  is  done  only  from  the
-       first  position  of  a  line.  The cursor must then appear on the newly
-       blank line.  If the terminal can delete the line which  the  cursor  is
-       on,  then this should be given as dl1; this is done only from the first
+

                Insert/Delete Line and Vertical Motions

                +       If the terminal can open a new blank line before  the  line  where  the
+       cursor  is,  this  should  be  given as il1; this is done only from the
+       first position of a line.  The cursor must then  appear  on  the  newly
+       blank  line.   If  the terminal can delete the line which the cursor is
+       on, then this should be given as dl1; this is done only from the  first
        position on the line to be deleted.  Versions of il1 and dl1 which take
        a single parameter and insert or delete that many lines can be given as
        il and dl.
 
-       If the terminal has a settable scrolling region (like  the  vt100)  the
-       command  to  set  this  can be described with the csr capability, which
+       If  the  terminal  has a settable scrolling region (like the vt100) the
+       command to set this can be described with  the  csr  capability,  which
        takes two parameters: the top and bottom lines of the scrolling region.
        The cursor position is, alas, undefined after using this command.
 
-       It  is possible to get the effect of insert or delete line using csr on
-       a properly chosen region; the sc  and  rc  (save  and  restore  cursor)
+       It is possible to get the effect of insert or delete line using csr  on
+       a  properly  chosen  region;  the  sc  and rc (save and restore cursor)
        commands may be useful for ensuring that your synthesized insert/delete
-       string does not move the cursor.  (Note that  the  ncurses(3x)  library
-       does   this   synthesis   automatically,   so   you  need  not  compose
+       string  does  not  move the cursor.  (Note that the ncurses(3x) library
+       does  this  synthesis  automatically,   so   you   need   not   compose
        insert/delete strings for an entry with csr).
 
-       Yet another way to construct insert  and  delete  might  be  to  use  a
-       combination  of  index  with  the  memory-lock  feature  found  on some
-       terminals  (like  the  HP-700/90  series,  which   however   also   has
+       Yet  another  way  to  construct  insert  and  delete might be to use a
+       combination of  index  with  the  memory-lock  feature  found  on  some
+       terminals   (like   the   HP-700/90  series,  which  however  also  has
        insert/delete).
 
-       Inserting  lines  at  the  top or bottom of the screen can also be done
-       using ri or ind on many terminals without a  true  insert/delete  line,
+       Inserting lines at the top or bottom of the screen  can  also  be  done
+       using  ri  or  ind on many terminals without a true insert/delete line,
        and is often faster even on terminals with those features.
 
-       The  boolean  non_dest_scroll_region  should  be  set if each scrolling
-       window is effectively a view port on a screen-sized  canvas.   To  test
-       for  this  capability,  create  a scrolling region in the middle of the
-       screen, write something to the bottom line, move the cursor to the  top
-       of  the region, and do ri followed by dl1 or ind.  If the data scrolled
-       off the bottom of the region by the ri re-appears,  then  scrolling  is
-       non-destructive.   System  V  and XSI Curses expect that ind, ri, indn,
+       The Boolean non_dest_scroll_region should  be  set  if  each  scrolling
+       window  is  effectively  a view port on a screen-sized canvas.  To test
+       for this capability, create a scrolling region in  the  middle  of  the
+       screen,  write something to the bottom line, move the cursor to the top
+       of the region, and do ri followed by dl1 or ind.  If the data  scrolled
+       off  the  bottom  of the region by the ri re-appears, then scrolling is
+       non-destructive.  System V and X/Open Curses expect that ind, ri, indn,
        and  rin  will  simulate  destructive  scrolling;  their  documentation
-       cautions  you  not  to  define  csr  unless  this is true.  This curses
-       implementation is more  liberal  and  will  do  explicit  erases  after
+       cautions you not to define  csr  unless  this  is  true.   This  curses
+       implementation  is  more  liberal  and  will  do  explicit erases after
        scrolling if ndsrc is defined.
 
-       If  the  terminal has the ability to define a window as part of memory,
-       which all commands affect, it should  be  given  as  the  parameterized
-       string  wind.  The four parameters are the starting and ending lines in
+       If the terminal has the ability to define a window as part  of  memory,
+       which  all  commands  affect,  it  should be given as the parameterized
+       string wind.  The four parameters are the starting and ending lines  in
        memory and the starting and ending columns in memory, in that order.
 
        If the terminal can retain display memory above, then the da capability
-       should  be  given;  if  display  memory  can be retained below, then db
-       should be given.  These indicate that deleting a line or scrolling  may
-       bring  non-blank lines up from below or that scrolling back with ri may
+       should be given; if display memory  can  be  retained  below,  then  db
+       should  be given.  These indicate that deleting a line or scrolling may
+       bring non-blank lines up from below or that scrolling back with ri  may
        bring down non-blank lines.

                Insert/Delete Character

                -       There are two basic kinds of  intelligent  terminals  with  respect  to
-       insert/delete  character  which  can  be described using terminfo.  The
-       most  common  insert/delete  character  operations  affect   only   the
-       characters  on the current line and shift characters off the end of the
-       line rigidly.  Other terminals, such as the Concept 100 and the  Perkin
-       Elmer  Owl,  make a distinction between typed and untyped blanks on the
-       screen, shifting upon an insert or delete only to an untyped  blank  on
-       the  screen  which  is  either  eliminated,  or expanded to two untyped
+       There  are  two  basic  kinds  of intelligent terminals with respect to
+       insert/delete character which can be  described  using  terminfo.   The
+       most   common   insert/delete  character  operations  affect  only  the
+       characters on the current line and shift characters off the end of  the
+       line  rigidly.  Other terminals, such as the Concept 100 and the Perkin
+       Elmer Owl, make a distinction between typed and untyped blanks  on  the
+       screen,  shifting  upon an insert or delete only to an untyped blank on
+       the screen which is either  eliminated,  or  expanded  to  two  untyped
        blanks.
 
-       You can determine the kind of terminal you have by clearing the  screen
-       and  then  typing  text separated by cursor motions.  Type "abc    def"
-       using local cursor motions (not  spaces)  between  the  "abc"  and  the
-       "def".   Then position the cursor before the "abc" and put the terminal
-       in insert mode.  If typing characters causes the rest of  the  line  to
-       shift  rigidly  and  characters to fall off the end, then your terminal
-       does not distinguish between blanks  and  untyped  positions.   If  the
-       "abc"  shifts over to the "def" which then move together around the end
-       of the current line and onto the next  as  you  insert,  you  have  the
-       second  type  of  terminal,  and  should  give the capability in, which
+       You  can determine the kind of terminal you have by clearing the screen
+       and then typing text separated by cursor  motions.   Type  "abc    def"
+       using  local  cursor  motions  (not  spaces)  between the "abc" and the
+       "def".  Then position the cursor before the "abc" and put the  terminal
+       in  insert  mode.   If typing characters causes the rest of the line to
+       shift rigidly and characters to fall off the end,  then  your  terminal
+       does  not  distinguish  between  blanks  and untyped positions.  If the
+       "abc" shifts over to the "def" which then move together around the  end
+       of  the  current  line  and  onto  the next as you insert, you have the
+       second type of terminal, and  should  give  the  capability  in,  which
        stands for "insert null".
 
-       While these are two logically  separate  attributes  (one  line  versus
-       multi-line  insert  mode,  and  special treatment of untyped spaces) we
-       have seen no terminals whose insert mode cannot be described  with  the
+       While  these  are  two  logically  separate attributes (one line versus
+       multi-line insert mode, and special treatment  of  untyped  spaces)  we
+       have  seen  no terminals whose insert mode cannot be described with the
        single attribute.
 
-       Terminfo  can  describe  both  terminals which have an insert mode, and
-       terminals which send a simple sequence to open a blank position on  the
+       Terminfo can describe both terminals which have  an  insert  mode,  and
+       terminals  which send a simple sequence to open a blank position on the
        current line.  Give as smir the sequence to get into insert mode.  Give
-       as rmir the sequence to leave  insert  mode.   Now  give  as  ich1  any
-       sequence  needed  to  be  sent  just before sending the character to be
-       inserted.  Most terminals with a true insert mode will not  give  ich1;
-       terminals  which  send a sequence to open a screen position should give
+       as  rmir  the  sequence  to  leave  insert  mode.  Now give as ich1 any
+       sequence needed to be sent just before  sending  the  character  to  be
+       inserted.   Most  terminals with a true insert mode will not give ich1;
+       terminals which send a sequence to open a screen position  should  give
        it here.
 
-       If your terminal has both, insert mode is usually preferable  to  ich1.
-       Technically,  you  should  not  give  both unless the terminal actually
-       requires both to be used in combination.  Accordingly, some  non-curses
-       applications  get  confused if both are present; the symptom is doubled
-       characters in an update using insert.  This requirement  is  now  rare;
-       most  ich  sequences do not require previous smir, and most smir insert
-       modes do not require ich1 before each character.   Therefore,  the  new
-       curses  actually  assumes this is the case and uses either rmir/smir or
-       ich/ich1 as appropriate (but not both).  If you have to write an  entry
-       to  be  used  under  new curses for a terminal old enough to need both,
+       If  your  terminal has both, insert mode is usually preferable to ich1.
+       Technically, you should not give  both  unless  the  terminal  actually
+       requires  both to be used in combination.  Accordingly, some non-curses
+       applications get confused if both are present; the symptom  is  doubled
+       characters  in  an  update using insert.  This requirement is now rare;
+       most ich sequences do not require previous smir, and most  smir  insert
+       modes  do  not  require ich1 before each character.  Therefore, the new
+       curses actually assumes this is the case and uses either  rmir/smir  or
+       ich/ich1  as appropriate (but not both).  If you have to write an entry
+       to be used under new curses for a terminal old  enough  to  need  both,
        include the rmir/smir sequences in ich1.
 
        If post insert padding is needed, give this as a number of milliseconds
-       in  ip (a string option).  Any other sequence which may need to be sent
+       in ip (a string option).  Any other sequence which may need to be  sent
        after an insert of a single character may also be given in ip.  If your
-       terminal  needs  both  to be placed into an "insert mode" and a special
-       code to precede each inserted character, then both smir/rmir  and  ich1
-       can  be  given,  and  both  will be used.  The ich capability, with one
+       terminal needs both to be placed into an "insert mode"  and  a  special
+       code  to  precede each inserted character, then both smir/rmir and ich1
+       can be given, and both will be used.   The  ich  capability,  with  one
        parameter, n, will repeat the effects of ich1 n times.
 
-       If padding is necessary between characters typed while  not  in  insert
+       If  padding  is  necessary between characters typed while not in insert
        mode, give this as a number of milliseconds padding in rmp.
 
-       It  is  occasionally  necessary  to move around while in insert mode to
-       delete characters on the same line (e.g., if there is a tab  after  the
-       insertion  position).   If  your terminal allows motion while in insert
-       mode you can give the capability mir to  speed  up  inserting  in  this
-       case.   Omitting  mir  will affect only speed.  Some terminals (notably
-       Datamedia's) must not have mir because of the  way  their  insert  mode
+       It is occasionally necessary to move around while  in  insert  mode  to
+       delete  characters  on the same line (e.g., if there is a tab after the
+       insertion position).  If your terminal allows motion  while  in  insert
+       mode  you  can  give  the  capability mir to speed up inserting in this
+       case.  Omitting mir will affect only speed.   Some  terminals  (notably
+       Datamedia's)  must  not  have  mir because of the way their insert mode
        works.
 
-       Finally,  you  can  specify dch1 to delete a single character, dch with
-       one parameter, n, to delete n characters, and  delete  mode  by  giving
-       smdc  and  rmdc  to  enter  and exit delete mode (any mode the terminal
+       Finally, you can specify dch1 to delete a single  character,  dch  with
+       one  parameter,  n,  to  delete n characters, and delete mode by giving
+       smdc and rmdc to enter and exit delete  mode  (any  mode  the  terminal
        needs to be placed in for dch1 to work).
 
-       A command to erase n characters  (equivalent  to  outputting  n  blanks
+       A  command  to  erase  n  characters (equivalent to outputting n blanks
        without moving the cursor) can be given as ech with one parameter.
 
 
-

                Highlighting, Underlining, and Visible Bells

                +

                Highlighting, Underlining, and Visible Bells

                        If your terminal has one or more kinds of display attributes, these can
-       be represented in a number of different ways.  You  should  choose  one
-       display  form  as  standout  mode,  representing a good, high contrast,
-       easy-on-the-eyes, format for  highlighting  error  messages  and  other
-       attention  getters.   (If  you  have a choice, reverse video plus half-
-       bright is good, or reverse video alone.)  The sequences  to  enter  and
-       exit  standout  mode  are given as smso and rmso, respectively.  If the
-       code to change into or out of standout mode  leaves  one  or  even  two
-       blank  spaces  on  the screen, as the TVI 912 and Teleray 1061 do, then
+       be  represented  in  a number of different ways.  You should choose one
+       display form as standout mode,  representing  a  good,  high  contrast,
+       easy-on-the-eyes,  format  for  highlighting  error  messages and other
+       attention getters.  (If you have a choice,  reverse  video  plus  half-
+       bright  is  good,  or reverse video alone.)  The sequences to enter and
+       exit standout mode are given as smso and rmso,  respectively.   If  the
+       code  to  change  into  or  out of standout mode leaves one or even two
+       blank spaces on the screen, as the TVI 912 and Teleray  1061  do,  then
        xmc should be given to tell how many spaces are left.
 
        Codes to begin underlining and end underlining can be given as smul and
        rmul respectively.  If the terminal has a code to underline the current
-       character and move the cursor one space  to  the  right,  such  as  the
+       character  and  move  the  cursor  one  space to the right, such as the
        Microterm Mime, this can be given as uc.
 
-       Other  capabilities  to  enter various highlighting modes include blink
-       (blinking) bold (bold or extra bright) dim (dim or  half-bright)  invis
-       (blanking  or invisible text) prot (protected) rev (reverse video) sgr0
-       (turn off all attribute modes) smacs  (enter  alternate  character  set
+       Other capabilities to enter various highlighting  modes  include  blink
+       (blinking)  bold  (bold or extra bright) dim (dim or half-bright) invis
+       (blanking or invisible text) prot (protected) rev (reverse video)  sgr0
+       (turn  off  all  attribute  modes) smacs (enter alternate character set
        mode) and rmacs (exit alternate character set mode).  Turning on any of
        these modes singly may or may not turn off other modes.
 
-       If there is a sequence to set arbitrary  combinations  of  modes,  this
-       should  be  given  as  sgr (set attributes), taking 9 parameters.  Each
-       parameter is either 0 or nonzero, as the corresponding attribute is  on
-       or  off.  The 9 parameters are, in order: standout, underline, reverse,
-       blink, dim, bold, blank, protect, alternate  character  set.   Not  all
-       modes  need  be  supported  by  sgr, only those for which corresponding
-       separate attribute commands exist.
+       If  there  is  a  sequence to set arbitrary combinations of modes, this
+       should be given as sgr (set attributes),  taking  9  parameters.   Each
+       parameter is either zero (0) or nonzero, as the corresponding attribute
+       is on or off.  The 9 parameters are,  in  order:  standout,  underline,
+       reverse,  blink,  dim,  bold,  blank, protect, alternate character set.
+       Not  all  modes  need  be  supported  by  sgr,  only  those  for  which
+       corresponding separate attribute commands exist.
 
        For example, the DEC vt220 supports most of the modes:
 
-               tparm parameter      attribute        escape sequence
-
-               none                 none             \E[0m
-               p1                   standout         \E[0;1;7m
-               p2                   underline        \E[0;4m
-               p3                   reverse          \E[0;7m
-               p4                   blink            \E[0;5m
-               p5                   dim              not available
-               p6                   bold             \E[0;1m
-               p7                   invis            \E[0;8m
-               p8                   protect          not used
-               p9                   altcharset       ^O (off) ^N (on)
-
-       We begin each escape sequence by turning off any existing modes,  since
-       there  is  no quick way to determine whether they are active.  Standout
-       is set up to be  the  combination  of  reverse  and  bold.   The  vt220
-       terminal  has  a  protect  mode,  though it is not commonly used in sgr
-       because it protects characters on the screen from the host's  erasures.
-       The  altcharset  mode  also is different in that it is either ^O or ^N,
-       depending on whether it is off or on.  If all modes are turned on,  the
+                   tparm Parameter   Attribute    Escape Sequence
+                   ------------------------------------------------
+                   none              none         \E[0m
+                   p1                standout     \E[0;1;7m
+                   p2                underline    \E[0;4m
+                   p3                reverse      \E[0;7m
+                   p4                blink        \E[0;5m
+                   p5                dim          not available
+                   p6                bold         \E[0;1m
+                   p7                invis        \E[0;8m
+                   p8                protect      not used
+                   p9                altcharset   ^O (off) ^N (on)
+
+       We  begin each escape sequence by turning off any existing modes, since
+       there is no quick way to determine whether they are  active.   Standout
+       is  set  up  to  be  the  combination  of  reverse and bold.  The vt220
+       terminal has a protect mode, though it is  not  commonly  used  in  sgr
+       because  it protects characters on the screen from the host's erasures.
+       The altcharset mode also is different in that it is either  ^O  or  ^N,
+       depending  on whether it is off or on.  If all modes are turned on, the
        resulting sequence is \E[0;1;4;5;7;8m^N.
 
-       Some  sequences  are  common  to  different  modes.  For example, ;7 is
-       output when either p1 or p3 is true, that is,  if  either  standout  or
+       Some sequences are common to  different  modes.   For  example,  ;7  is
+       output  when  either  p1  or p3 is true, that is, if either standout or
        reverse modes are turned on.
 
        Writing out the above sequences, along with their dependencies yields
 
-            sequence             when to output      terminfo translation
-
-            \E[0                 always              \E[0
-            ;1                   if p1 or p6         %?%p1%p6%|%t;1%;
-            ;4                   if p2               %?%p2%|%t;4%;
-            ;5                   if p4               %?%p4%|%t;5%;
-            ;7                   if p1 or p3         %?%p1%p3%|%t;7%;
-            ;8                   if p7               %?%p7%|%t;8%;
-            m                    always              m
-            ^N or ^O             if p9 ^N, else ^O   %?%p9%t^N%e^O%;
+                 Sequence   When to Output      terminfo Translation
+                 ----------------------------------------------------
+                 \E[0       always              \E[0
+                 ;1         if p1 or p6         %?%p1%p6%|%t;1%;
+                 ;4         if p2               %?%p2%|%t;4%;
+                 ;5         if p4               %?%p4%|%t;5%;
+                 ;7         if p1 or p3         %?%p1%p3%|%t;7%;
+                 ;8         if p7               %?%p7%|%t;8%;
+                 m          always              m
+                 ^N or ^O   if p9 ^N, else ^O   %?%p9%t^N%e^O%;
 
        Putting this all together into the sgr sequence gives:
 
            sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p4%t;5%;
                %?%p1%p3%|%t;7%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
 
-       Remember  that  if  you specify sgr, you must also specify sgr0.  Also,
-       some implementations rely on sgr  being  given  if  sgr0  is,  Not  all
+       Remember that if you specify sgr, you must also  specify  sgr0.   Also,
+       some  implementations  rely  on  sgr  being  given  if sgr0 is, Not all
        terminfo  entries  necessarily  have  an  sgr  string,  however.   Many
-       terminfo entries are derived from termcap entries  which  have  no  sgr
+       terminfo  entries  are  derived  from termcap entries which have no sgr
        string.  The only drawback to adding an sgr string is that termcap also
        assumes that sgr0 does not exit alternate character set mode.
 
-       Terminals  with  the  "magic  cookie"  glitch  (xmc)  deposit   special
-       "cookies"  when  they  receive mode-setting sequences, which affect the
-       display algorithm rather than having extra  bits  for  each  character.
-       Some  terminals, such as the HP 2621, automatically leave standout mode
-       when they move to a new line or  the  cursor  is  addressed.   Programs
-       using  standout mode should exit standout mode before moving the cursor
-       or sending a newline, unless the msgr capability, asserting that it  is
+       Terminals   with  the  "magic  cookie"  glitch  (xmc)  deposit  special
+       "cookies" when they receive mode-setting sequences,  which  affect  the
+       display  algorithm  rather  than  having extra bits for each character.
+       Some terminals, such as the HP 2621, automatically leave standout  mode
+       when  they  move  to  a  new line or the cursor is addressed.  Programs
+       using standout mode should exit standout mode before moving the  cursor
+       or  sending a newline, unless the msgr capability, asserting that it is
        safe to move in standout mode, is present.
 
-       If  the  terminal has a way of flashing the screen to indicate an error
-       quietly (a bell replacement) then this can be given as flash;  it  must
+       If the terminal has a way of flashing the screen to indicate  an  error
+       quietly  (a  bell replacement) then this can be given as flash; it must
        not move the cursor.
 
-       If  the cursor needs to be made more visible than normal when it is not
+       If the cursor needs to be made more visible than normal when it is  not
        on the bottom line (to make, for example, a non-blinking underline into
-       an  easier  to  find block or blinking underline) give this sequence as
+       an easier to find block or blinking underline) give  this  sequence  as
        cvvis.  If there is a way to make the cursor completely invisible, give
-       that  as  civis.  The capability cnorm should be given which undoes the
+       that as civis.  The capability cnorm should be given which  undoes  the
        effects of both of these modes.
 
-       If your terminal correctly generates  underlined  characters  (with  no
-       special  codes  needed)  even  though  it does not overstrike, then you
-       should give the capability ul.  If  a  character  overstriking  another
-       leaves  both  characters  on the screen, specify the capability os.  If
+       If  your  terminal  correctly  generates underlined characters (with no
+       special codes needed) even though it  does  not  overstrike,  then  you
+       should  give  the  capability  ul.  If a character overstriking another
+       leaves both characters on the screen, specify the  capability  os.   If
        overstrikes are erasable with a blank, then this should be indicated by
        giving eo.

                Keypad and Function Keys

                -       If  the  terminal  has  a keypad that transmits codes when the keys are
-       pressed, this information can be given.  Note that it is  not  possible
+       If the terminal has a keypad that transmits codes  when  the  keys  are
+       pressed,  this  information can be given.  Note that it is not possible
        to handle terminals where the keypad only works in local (this applies,
-       for example, to the unshifted HP 2621 keys).  If the keypad can be  set
-       to  transmit  or  not  transmit,  give  these  codes  as smkx and rmkx.
+       for  example, to the unshifted HP 2621 keys).  If the keypad can be set
+       to transmit or not  transmit,  give  these  codes  as  smkx  and  rmkx.
        Otherwise the keypad is assumed to always transmit.
 
-       The codes sent by the left arrow, right arrow, up  arrow,  down  arrow,
-       and  home  keys  can  be given as kcub1, kcuf1, kcuu1, kcud1, and khome
+       The  codes  sent  by the left arrow, right arrow, up arrow, down arrow,
+       and home keys can be given as kcub1, kcuf1,  kcuu1,  kcud1,  and  khome
        respectively.  If there are function keys such as f0, f1, ..., f10, the
-       codes  they  send  can  be given as kf0, kf1, ..., kf10.  If these keys
-       have labels other than the default f0 through f10, the  labels  can  be
+       codes they send can be given as kf0, kf1, ...,  kf10.   If  these  keys
+       have  labels  other  than the default f0 through f10, the labels can be
        given as lf0, lf1, ..., lf10.
 
        The codes transmitted by certain other special keys can be given:
@@ -2025,64 +1845,64 @@ 
                terminfo 5   File Formats
                
 
        o   khts (set a tab stop in this column).
 
-       In  addition,  if  the  keypad has a 3 by 3 array of keys including the
-       four arrow keys, the other five keys can be given  as  ka1,  ka3,  kb2,
-       kc1,  and  kc3.   These  keys  are  useful when the effects of a 3 by 3
+       In addition, if the keypad has a 3 by 3 array  of  keys  including  the
+       four  arrow  keys,  the  other five keys can be given as ka1, ka3, kb2,
+       kc1, and kc3.  These keys are useful when the  effects  of  a  3  by  3
        directional pad are needed.
 
        Strings to program function keys can be given as pfkey, pfloc, and pfx.
-       A  string to program screen labels should be specified as pln.  Each of
-       these strings takes two parameters: the function key number to  program
+       A string to program screen labels should be specified as pln.  Each  of
+       these  strings takes two parameters: the function key number to program
        (from 0 to 10) and the string to program it with.  Function key numbers
-       out of this range may program undefined keys in  a  terminal  dependent
-       manner.   The  difference between the capabilities is that pfkey causes
-       pressing the given key to be the same as  the  user  typing  the  given
-       string;  pfloc  causes  the  string  to  be executed by the terminal in
+       out  of  this  range may program undefined keys in a terminal dependent
+       manner.  The difference between the capabilities is that  pfkey  causes
+       pressing  the  given  key  to  be the same as the user typing the given
+       string; pfloc causes the string to  be  executed  by  the  terminal  in
        local; and pfx causes the string to be transmitted to the computer.
 
-       The capabilities nlab, lw and lh  define  the  number  of  programmable
-       screen  labels  and  their  width and height.  If there are commands to
-       turn the labels on and off, give  them  in  smln  and  rmln.   smln  is
-       normally  output  after one or more pln sequences to make sure that the
+       The  capabilities  nlab,  lw  and  lh define the number of programmable
+       screen labels and their width and height.  If  there  are  commands  to
+       turn  the  labels  on  and  off,  give  them in smln and rmln.  smln is
+       normally output after one or more pln sequences to make sure  that  the
        change becomes visible.

                Tabs and Initialization

                        A few capabilities are used only for tabs:
 
-       o   If the terminal has hardware tabs, the command to  advance  to  the
+       o   If  the  terminal  has hardware tabs, the command to advance to the
            next tab stop can be given as ht (usually control/I).
 
        o   A "back-tab" command which moves leftward to the preceding tab stop
            can be given as cbt.
 
-           By convention, if the teletype modes indicate that tabs  are  being
-           expanded  by  the  computer rather than being sent to the terminal,
-           programs should not use ht or cbt even if they are  present,  since
+           By  convention,  if the teletype modes indicate that tabs are being
+           expanded by the computer rather than being sent  to  the  terminal,
+           programs  should  not use ht or cbt even if they are present, since
            the user may not have the tab stops properly set.
 
-       o   If  the  terminal has hardware tabs which are initially set every n
+       o   If the terminal has hardware tabs which are initially set  every  n
            spaces when the terminal is powered up, the numeric parameter it is
            given, showing the number of spaces the tabs are set to.
 
            The it capability is normally used by the tset command to determine
-           whether to set the mode for hardware tab expansion, and whether  to
+           whether  to set the mode for hardware tab expansion, and whether to
            set the tab stops.  If the terminal has tab stops that can be saved
-           in non-volatile memory, the terminfo description  can  assume  that
+           in  non-volatile  memory,  the terminfo description can assume that
            they are properly set.
 
        Other capabilities include
 
        o   is1, is2, and is3, initialization strings for the terminal,
 
-       o   iprog,  the  path  name  of  a  program to be run to initialize the
+       o   iprog, the path name of a program  to  be  run  to  initialize  the
            terminal,
 
        o   and if, the name of a file containing long initialization strings.
 
-       These strings are expected to set the terminal  into  modes  consistent
-       with  the  rest of the terminfo description.  They are normally sent to
-       the terminal, by the init option of the tput  program,  each  time  the
+       These  strings  are  expected to set the terminal into modes consistent
+       with the rest of the terminfo description.  They are normally  sent  to
+       the  terminal,  by  the  init option of the tput program, each time the
        user logs in.  They will be printed in the following order:
 
               run the program
@@ -2106,34 +1926,34 @@ 
                terminfo 5   File Formats
                
               and finally output
                      is3.
 
-       Most  initialization  is  done with is2.  Special terminal modes can be
-       set up without duplicating strings by putting the common  sequences  in
+       Most initialization is done with is2.  Special terminal  modes  can  be
+       set  up  without duplicating strings by putting the common sequences in
        is2 and special cases in is1 and is3.
 
-       A  set  of  sequences  that  does a harder reset from a totally unknown
+       A set of sequences that does a harder  reset  from  a  totally  unknown
        state can be given as rs1, rs2, rf and rs3, analogous to is1 , is2 , if
-       and  is3  respectively.   These  strings  are output by reset option of
-       tput, or by the reset program (an alias of tset), which  is  used  when
+       and is3 respectively.  These strings are  output  by  reset  option  of
+       tput,  or  by  the reset program (an alias of tset), which is used when
        the terminal gets into a wedged state.  Commands are normally placed in
        rs1, rs2 rs3 and rf only if they produce annoying effects on the screen
        and are not necessary when logging in.  For example, the command to set
-       the vt100 into 80-column mode would normally be part  of  is2,  but  it
-       causes  an  annoying  glitch  of  the screen and is not normally needed
+       the  vt100  into  80-column  mode would normally be part of is2, but it
+       causes an annoying glitch of the screen  and  is  not  normally  needed
        since the terminal is usually already in 80-column mode.
 
-       The reset program writes strings including iprog,  etc.,  in  the  same
-       order  as  the  init program, using rs1, etc., instead of is1, etc.  If
-       any of rs1, rs2, rs3, or rf reset capability strings are  missing,  the
-       reset   program   falls  back  upon  the  corresponding  initialization
+       The  reset  program  writes  strings including iprog, etc., in the same
+       order as the init program, using rs1, etc., instead of  is1,  etc.   If
+       any  of  rs1, rs2, rs3, or rf reset capability strings are missing, the
+       reset  program  falls  back  upon  the   corresponding   initialization
        capability string.
 
-       If there are commands to set and clear tab stops, they can be given  as
+       If  there are commands to set and clear tab stops, they can be given as
        tbc (clear all tab stops) and hts (set a tab stop in the current column
-       of every row).  If a more complex sequence is needed to  set  the  tabs
+       of  every  line).  If a more complex sequence is needed to set the tabs
        than can be described by this, the sequence can be placed in is2 or if.
 
-       The  tput  reset  command uses the same capability strings as the reset
-       command, although the two programs (tput and reset)  provide  different
+       The tput reset command uses the same capability strings  as  the  reset
+       command,  although  the two programs (tput and reset) provide different
        command-line options.
 
        In  practice,  these  terminfo  capabilities  are  not  often  used  in
@@ -2142,393 +1962,402 @@ 
                terminfo 5   File Formats
                
        o   Almost all hardware terminals (at least those which supported tabs)
            initialized those to every eight columns:
 
-           The  only  exception  was  the  AT&T 2300 series, which set tabs to
+           The only exception was the AT&T 2300  series,  which  set  tabs  to
            every five columns.
 
-       o   In particular, developers  of  the  hardware  terminals  which  are
-           commonly  used  as  models  for  modern terminal emulators provided
+       o   In  particular,  developers  of  the  hardware  terminals which are
+           commonly used as models  for  modern  terminal  emulators  provided
            documentation demonstrating that eight columns were the standard.
 
        o   Because of this, the terminal initialization programs tput and tset
-           use   the  tbc  (clear_all_tabs)  and  hts  (set_tab)  capabilities
-           directly only when the it (init_tabs) capability is set to a  value
+           use  the  tbc  (clear_all_tabs)  and  hts  (set_tab)   capabilities
+           directly  only when the it (init_tabs) capability is set to a value
            other than eight.

                Delays and Padding

                -       Many  older  and slower terminals do not support either XON/XOFF or DTR
-       handshaking, including hard copy terminals and some very  archaic  CRTs
-       (including,  for  example,  DEC  VT100s).   These  may  require padding
+       Many older and slower terminals do not support either XON/XOFF  or  DTR
+       handshaking,  including  hard copy terminals and some very archaic CRTs
+       (including, for  example,  DEC  VT100s).   These  may  require  padding
        characters after certain cursor motions and screen changes.
 
        If the terminal uses xon/xoff handshaking for flow control (that is, it
-       automatically  emits  ^S  back  to  the host when its input buffers are
-       close to full), set xon.  This capability suppresses  the  emission  of
-       padding.   You  can  also  set  it  for  memory-mapped  console devices
+       automatically emits ^S back to the host  when  its  input  buffers  are
+       close  to  full),  set xon.  This capability suppresses the emission of
+       padding.  You  can  also  set  it  for  memory-mapped  console  devices
        effectively that do not have a speed limit.  Padding information should
-       still  be  included  so  that  routines can make better decisions about
+       still be included so that routines  can  make  better  decisions  about
        relative costs, but actual pad characters will not be transmitted.
 
        If pb (padding baud rate) is given, padding is suppressed at baud rates
-       below  the  value  of  pb.  If the entry has no padding baud rate, then
+       below the value of pb.  If the entry has no  padding  baud  rate,  then
        whether padding is emitted or not is completely controlled by xon.
 
-       If the terminal requires other than a null (zero) character as  a  pad,
-       then  this  can  be  given as pad.  Only the first character of the pad
+       If  the  terminal requires other than a null (zero) character as a pad,
+       then this can be given as pad.  Only the first  character  of  the  pad
        string is used.

                Status Lines

                -       Some terminals have an extra "status line" which is not  normally  used
+       Some  terminals  have an extra "status line" which is not normally used
        by software (and thus not counted in the terminal's lines capability).
 
-       The  simplest case is a status line which is cursor-addressable but not
+       The simplest case is a status line which is cursor-addressable but  not
        part of the main scrolling region on the screen; the Heathkit H19 has a
-       status  line  of  this  kind,  as  would a 24-line VT100 with a 23-line
+       status line of this kind, as would  a  24-line  VT100  with  a  23-line
        scrolling region set up on initialization.  This situation is indicated
        by the hs capability.
 
-       Some  terminals  with status lines need special sequences to access the
-       status line.  These may be expressed as a string with single  parameter
-       tsl  which takes the cursor to a given zero-origin column on the status
-       line.  The  capability  fsl  must  return  to  the  main-screen  cursor
+       Some terminals with status lines need special sequences to  access  the
+       status  line.  These may be expressed as a string with single parameter
+       tsl which takes the cursor to a given zero-origin column on the  status
+       line.   The  capability  fsl  must  return  to  the  main-screen cursor
        positions before the last tsl.  You may need to embed the string values
-       of sc (save  cursor)  and  rc  (restore  cursor)  in  tsl  and  fsl  to
+       of  sc  (save  cursor)  and  rc  (restore  cursor)  in  tsl  and fsl to
        accomplish this.
 
-       The  status  line is normally assumed to be the same width as the width
-       of the terminal.  If this is  untrue,  you  can  specify  it  with  the
+       The status line is normally assumed to be the same width as  the  width
+       of  the  terminal.   If  this  is  untrue,  you can specify it with the
        numeric capability wsl.
 
        A command to erase or blank the status line may be specified as dsl.
 
-       The  boolean  capability  eslok  specifies that escape sequences, tabs,
+       The Boolean capability eslok specifies  that  escape  sequences,  tabs,
        etc., work ordinarily in the status line.
 
-       The ncurses implementation does not yet use any of these  capabilities.
+       The  ncurses implementation does not yet use any of these capabilities.
        They are documented here in case they ever become important.

                Line Graphics

                -       Many  terminals have alternate character sets useful for forms-drawing.
-       Terminfo and curses have built-in  support  for  most  of  the  drawing
-       characters  supported  by the VT100, with some characters from the AT&T
-       4410v1 added.  This alternate character set may  be  specified  by  the
+       Many terminals have alternate character sets useful for  forms-drawing.
+       Terminfo  and  curses  have  built-in  support  for most of the drawing
+       characters supported by the VT100, with some characters from  the  AT&T
+       4410v1  added.   This  alternate  character set may be specified by the
        acsc capability.
 
-         Glyph                       ACS            Ascii     acsc     acsc
-         Name                        Name           Default   Char     Value
-         --------------------------------------------------------------------
-         arrow pointing right        ACS_RARROW     >         +        0x2b
-         arrow pointing left         ACS_LARROW     <         ,        0x2c
-
-         arrow pointing up           ACS_UARROW     ^         -        0x2d
-         arrow pointing down         ACS_DARROW     v         .        0x2e
-         solid square block          ACS_BLOCK      #         0        0x30
-         diamond                     ACS_DIAMOND    +         `        0x60
-         checker board (stipple)     ACS_CKBOARD    :         a        0x61
-         degree symbol               ACS_DEGREE     \         f        0x66
-         plus/minus                  ACS_PLMINUS    #         g        0x67
-         board of squares            ACS_BOARD      #         h        0x68
-         lantern symbol              ACS_LANTERN    #         i        0x69
-         lower right corner          ACS_LRCORNER   +         j        0x6a
-         upper right corner          ACS_URCORNER   +         k        0x6b
-         upper left corner           ACS_ULCORNER   +         l        0x6c
-         lower left corner           ACS_LLCORNER   +         m        0x6d
-         large plus or crossover     ACS_PLUS       +         n        0x6e
-         scan line 1                 ACS_S1         ~         o        0x6f
-         scan line 3                 ACS_S3         -         p        0x70
-         horizontal line             ACS_HLINE      -         q        0x71
-         scan line 7                 ACS_S7         -         r        0x72
-         scan line 9                 ACS_S9         _         s        0x73
-         tee pointing right          ACS_LTEE       +         t        0x74
-         tee pointing left           ACS_RTEE       +         u        0x75
-         tee pointing up             ACS_BTEE       +         v        0x76
-         tee pointing down           ACS_TTEE       +         w        0x77
-         vertical line               ACS_VLINE      |         x        0x78
-         less-than-or-equal-to       ACS_LEQUAL     <         y        0x79
-         greater-than-or-equal-to    ACS_GEQUAL     >         z        0x7a
-         greek pi                    ACS_PI         *         {        0x7b
-         not-equal                   ACS_NEQUAL     !         |        0x7c
-         UK pound sign               ACS_STERLING   f         }        0x7d
-         bullet                      ACS_BULLET     o         ~        0x7e
+                          acsc
+       ACS Name      Value   Symbol   ASCII Fallback / Glyph Name
+       ------------------------------------------------------------------------
+       ACS_RARROW    0x2b      +      >  arrow pointing right
+       ACS_LARROW    0x2c      ,      <  arrow pointing left
+       ACS_UARROW    0x2d      -      ^  arrow pointing up
+       ACS_DARROW    0x2e      .      v  arrow pointing down
+       ACS_BLOCK     0x30      0      #  solid square block
+       ACS_DIAMOND   0x60      `      +  diamond
+       ACS_CKBOARD   0x61      a      :  checker board (stipple)
+       ACS_DEGREE    0x66      f      \  degree symbol
+       ACS_PLMINUS   0x67      g      #  plus/minus
+       ACS_BOARD     0x68      h      #  board of squares
+       ACS_LANTERN   0x69      i      #  lantern symbol
+
+       ACS_LRCORNER  0x6a      j      +  lower right corner
+       ACS_URCORNER  0x6b      k      +  upper right corner
+       ACS_ULCORNER  0x6c      l      +  upper left corner
+       ACS_LLCORNER  0x6d      m      +  lower left corner
+       ACS_PLUS      0x6e      n      +  large plus or crossover
+       ACS_S1        0x6f      o      ~  scan line 1
+       ACS_S3        0x70      p      -  scan line 3
+       ACS_HLINE     0x71      q      -  horizontal line
+       ACS_S7        0x72      r      -  scan line 7
+       ACS_S9        0x73      s      _  scan line 9
+       ACS_LTEE      0x74      t      +  tee pointing right
+       ACS_RTEE      0x75      u      +  tee pointing left
+       ACS_BTEE      0x76      v      +  tee pointing up
+       ACS_TTEE      0x77      w      +  tee pointing down
+       ACS_VLINE     0x78      x      |  vertical line
+       ACS_LEQUAL    0x79      y      <  less-than-or-equal-to
+       ACS_GEQUAL    0x7a      z      >  greater-than-or-equal-to
+       ACS_PI        0x7b      {      *  greek pi
+       ACS_NEQUAL    0x7c      |      !  not-equal
+       ACS_STERLING  0x7d      }      f  UK pound sign
+       ACS_BULLET    0x7e      ~      o  bullet
 
        A few notes apply to the table itself:
 
-       o   X/Open  Curses  incorrectly  states that the mapping for lantern is
-           uppercase "I" although Unix implementations use the  lowercase  "i"
+       o   X/Open Curses incorrectly states that the mapping  for  lantern  is
+           uppercase  "I"  although Unix implementations use the lowercase "i"
            mapping.
 
-       o   The  DEC  VT100  implemented graphics using the alternate character
-           set feature, temporarily switching modes and sending characters  in
-           the  range  0x60  (96)  to 0x7e (126) (the acsc Value column in the
+       o   The DEC VT100 implemented graphics using  the  alternate  character
+           set  feature, temporarily switching modes and sending characters in
+           the range 0x60 (96) to 0x7e (126) (the acsc  Value  column  in  the
            table).
 
        o   The AT&T terminal added graphics characters outside that range.
 
-           Some of the characters within the range do  not  match  the  VT100;
-           presumably  they  were  used in the AT&T terminal: board of squares
-           replaces the VT100 newline symbol, while  lantern  symbol  replaces
+           Some  of  the  characters  within the range do not match the VT100;
+           presumably they were used in the AT&T terminal:  board  of  squares
+           replaces  the  VT100  newline symbol, while lantern symbol replaces
            the VT100 vertical tab symbol.  The other VT100 symbols for control
-           characters (horizontal tab, carriage return and line-feed) are  not
+           characters  (horizontal tab, carriage return and line-feed) are not
            (re)used in curses.
 
-       The  best  way to define a new device's graphics set is to add a column
-       to a copy of this table for your terminal, giving the  character  which
-       (when  emitted  between  smacs/rmacs  switches) will be rendered as the
+       The best way to define a new device's graphics set is to add  a  column
+       to  a  copy of this table for your terminal, giving the character which
+       (when emitted between smacs/rmacs switches) will  be  rendered  as  the
        corresponding graphic.  Then read off the VT100/your terminal character
        pairs right to left in sequence; these become the ACSC string.

                Color Handling

                -       The  curses  library  functions init_pair and init_color manipulate the
-       color  pairs  and  color  values  discussed  in   this   section   (see
+       The curses library functions init_pair and  init_color  manipulate  the
+       color   pairs   and   color  values  discussed  in  this  section  (see
        curs_color(3x) for details on these and related functions).
 
        Most color terminals are either "Tektronix-like" or "HP-like":
 
        o   Tektronix-like terminals have a predefined set of N colors (where N
            is usually 8), and can set character-cell foreground and background
-           characters independently, mixing them into N * N color-pairs.
+           colors independently, mixing them into N * N color pairs.
 
-       o   On  HP-like  terminals,  the  user  must  set  each  color  pair up
-           separately  (foreground  and  background  are   not   independently
-           settable).   Up  to  M color-pairs may be set up from 2*M different
+       o   On HP-like  terminals,  the  user  must  set  each  color  pair  up
+           separately   (foreground   and  background  are  not  independently
+           settable).  Up to M color pairs may be set up  from  2*M  different
            colors.  ANSI-compatible terminals are Tektronix-like.
 
        Some basic color capabilities are independent of the color method.  The
-       numeric  capabilities  colors  and pairs specify the maximum numbers of
-       colors and color-pairs that can be displayed  simultaneously.   The  op
+       numeric capabilities colors and pairs specify the  maximum  numbers  of
+       colors  and  color  pairs that can be displayed simultaneously.  The op
        (original pair) string resets foreground and background colors to their
-       default values for the terminal.  The oc string resets  all  colors  or
-       color-pairs  to  their default values for the terminal.  Some terminals
-       (including many PC terminal emulators)  erase  screen  areas  with  the
-       current  background  color rather than the power-up default background;
-       these should have the boolean capability bce.
-
-       While the  curses  library  works  with  color  pairs  (reflecting  the
-       inability  of  some  devices  to  set  foreground and background colors
-       independently), there  are  separate  capabilities  for  setting  these
+       default  values  for  the terminal.  The oc string resets all colors or
+       color pairs to their default values for the terminal.   Some  terminals
+       (including  many  PC  terminal  emulators)  erase screen areas with the
+       current background color rather than the power-up  default  background;
+       these should have the Boolean capability bce.
+
+       While  the  curses  library  works  with  color  pairs  (reflecting the
+       inability of some devices  to  set  foreground  and  background  colors
+       independently),  there  are  separate  capabilities  for  setting these
        features:
 
-       o   To   change  the  current  foreground  or  background  color  on  a
-           Tektronix-type terminal, use setaf (set ANSI foreground) and  setab
-           (set  ANSI  background)  or  setf  (set  foreground)  and setb (set
+       o   To  change  the  current  foreground  or  background  color  on   a
+           Tektronix-type  terminal, use setaf (set ANSI foreground) and setab
+           (set ANSI background)  or  setf  (set  foreground)  and  setb  (set
            background).  These take one parameter, the color number.  The SVr4
-           documentation  describes only setaf/setab; the XPG4 draft says that
-           "If the terminal supports ANSI escape sequences to  set  background
-           and   foreground,   they  should  be  coded  as  setaf  and  setab,
+           documentation describes only setaf/setab; the XPG4 draft says  that
+           "If  the  terminal supports ANSI escape sequences to set background
+           and  foreground,  they  should  be  coded  as  setaf   and   setab,
            respectively.
 
-       o   If the terminal supports other escape sequences to  set  background
-           and   foreground,   they   should   be  coded  as  setf  and  setb,
-           respectively.  The vidputs and the refresh(3x)  functions  use  the
+       o   If  the  terminal supports other escape sequences to set background
+           and  foreground,  they  should  be  coded   as   setf   and   setb,
+           respectively.   The  vidputs  and the refresh(3x) functions use the
            setaf and setab capabilities if they are defined.
 
-       The  setaf/setab  and  setf/setb  capabilities  take  a  single numeric
+       The setaf/setab  and  setf/setb  capabilities  take  a  single  numeric
        argument each.  Argument values 0-7 of setaf/setab are portably defined
-       as  follows (the middle column is the symbolic #define available in the
-       header for the curses or ncurses libraries).  The terminal hardware  is
-       free  to  map  these  as  it  likes, but the RGB values indicate normal
+       as follows (the middle column is the symbolic #define available in  the
+       header  for the curses or ncurses libraries).  The terminal hardware is
+       free to map these as it likes,  but  the  RGB  values  indicate  normal
        locations in color space.
 
-                    Color       #define       Value       RGB
-                    black     COLOR_BLACK       0     0, 0, 0
-                    red       COLOR_RED         1     max,0,0
-                    green     COLOR_GREEN       2     0,max,0
-                    yellow    COLOR_YELLOW      3     max,max,0
-                    blue      COLOR_BLUE        4     0,0,max
-                    magenta   COLOR_MAGENTA     5     max,0,max
-                    cyan      COLOR_CYAN        6     0,max,max
-                    white     COLOR_WHITE       7     max,max,max
+                    Color      #define       Value        RGB
+                   ------------------------------------------------
+                   black     COLOR_BLACK       0     0,   0,   0
+                   red       COLOR_RED         1     max, 0,   0
+                   green     COLOR_GREEN       2     0,   max, 0
+                   yellow    COLOR_YELLOW      3     max, max, 0
+                   blue      COLOR_BLUE        4     0,   0,   max
+                   magenta   COLOR_MAGENTA     5     max, 0,   max
+                   cyan      COLOR_CYAN        6     0,   max, max
+                   white     COLOR_WHITE       7     max, max, max
 
        The argument values of setf/setb historically correspond to a different
        mapping, i.e.,
 
-                    Color       #define       Value       RGB
-                    black     COLOR_BLACK       0     0, 0, 0
-                    blue      COLOR_BLUE        1     0,0,max
-                    green     COLOR_GREEN       2     0,max,0
-                    cyan      COLOR_CYAN        3     0,max,max
-                    red       COLOR_RED         4     max,0,0
-                    magenta   COLOR_MAGENTA     5     max,0,max
-                    yellow    COLOR_YELLOW      6     max,max,0
-                    white     COLOR_WHITE       7     max,max,max
-
-       It  is  important  to  not  confuse the two sets of color capabilities;
+                    Color      #define       Value        RGB
+                   ------------------------------------------------
+                   black     COLOR_BLACK       0     0,   0,   0
+                   blue      COLOR_BLUE        1     0,   0,   max
+                   green     COLOR_GREEN       2     0,   max, 0
+                   cyan      COLOR_CYAN        3     0,   max, max
+                   red       COLOR_RED         4     max, 0,   0
+                   magenta   COLOR_MAGENTA     5     max, 0,   max
+                   yellow    COLOR_YELLOW      6     max, max, 0
+                   white     COLOR_WHITE       7     max, max, max
+
+       It is important to not confuse the  two  sets  of  color  capabilities;
        otherwise red/blue will be interchanged on the display.
 
-       On an HP-like terminal, use scp with a color-pair number  parameter  to
+       On  an  HP-like terminal, use scp with a color pair number parameter to
        set which color pair is current.
 
        Some terminals allow the color values to be modified:
 
-       o   On  a Tektronix-like terminal, the capability ccc may be present to
-           indicate that colors can be modified.  If so, the initc  capability
+       o   On a Tektronix-like terminal, the capability ccc may be present  to
+           indicate  that colors can be modified.  If so, the initc capability
            will take a color number (0 to colors - 1)and three more parameters
-           which describe the color.  These three parameters default to  being
-           interpreted  as  RGB  (Red,  Green,  Blue)  values.  If the boolean
+           which  describe the color.  These three parameters default to being
+           interpreted as RGB (Red,  Green,  Blue)  values.   If  the  Boolean
            capability hls is present, they are instead as HLS (Hue, Lightness,
            Saturation) indices.  The ranges are terminal-dependent.
 
-       o   On  an HP-like terminal, initp may give a capability for changing a
-           color-pair value.  It will  take  seven  parameters;  a  color-pair
-           number  (0  to  max_pairs  -  1),  and two triples describing first
-           background and then foreground colors.  These  parameters  must  be
-           (Red,  Green,  Blue)  or  (Hue, Lightness, Saturation) depending on
+       o   On an HP-like terminal, initp may give a capability for changing  a
+           color  pair  value.   It  will  take seven parameters; a color pair
+           number (0 to max_pairs -  1),  and  two  triples  describing  first
+           background  and  then  foreground colors.  These parameters must be
+           (Red, Green, Blue) or (Hue,  Lightness,  Saturation)  depending  on
            hls.
 
-       On some color terminals,  colors  collide  with  highlights.   You  can
-       register  these collisions with the ncv capability.  This is a bit-mask
-       of  attributes  not  to  be  used  when  colors   are   enabled.    The
+       On  some  color  terminals,  colors  collide  with highlights.  You can
+       register these collisions with the ncv capability.  This is a bit  mask
+       of   attributes   not   to  be  used  when  colors  are  enabled.   The
        correspondence with the attributes understood by curses is as follows:
 
-                  Attribute              Bit   Decimal      Set by
-                  A_STANDOUT             0     1            sgr
-                  A_UNDERLINE            1     2            sgr
-                  A_REVERSE              2     4            sgr
-                  A_BLINK                3     8            sgr
-                  A_DIM                  4     16           sgr
-                  A_BOLD                 5     32           sgr
-                  A_INVIS                6     64           sgr
-                  A_PROTECT              7     128          sgr
-                  A_ALTCHARSET           8     256          sgr
-                  A_HORIZONTAL           9     512          sgr1
-                  A_LEFT                 10    1024         sgr1
-                  A_LOW                  11    2048         sgr1
-                  A_RIGHT                12    4096         sgr1
-                  A_TOP                  13    8192         sgr1
-                  A_VERTICAL             14    16384        sgr1
-                  A_ITALIC               15    32768        sitm
-
-       For  example, on many IBM PC consoles, the underline attribute collides
-       with the foreground color blue and is  not  available  in  color  mode.
+                         Attribute     Bit   Decimal   Set by
+                        --------------------------------------
+                        A_STANDOUT      0         1    sgr
+                        A_UNDERLINE     1         2    sgr
+                        A_REVERSE       2         4    sgr
+                        A_BLINK         3         8    sgr
+                        A_DIM           4        16    sgr
+                        A_BOLD          5        32    sgr
+                        A_INVIS         6        64    sgr
+                        A_PROTECT       7       128    sgr
+                        A_ALTCHARSET    8       256    sgr
+                        A_HORIZONTAL    9       512    sgr1
+                        A_LEFT         10      1024    sgr1
+                        A_LOW          11      2048    sgr1
+                        A_RIGHT        12      4096    sgr1
+                        A_TOP          13      8192    sgr1
+                        A_VERTICAL     14     16384    sgr1
+                        A_ITALIC       15     32768    sitm
+
+       For example, on many IBM PC consoles, the underline attribute  collides
+       with  the  foreground  color  blue  and is not available in color mode.
        These should have an ncv capability of 2.
 
-       SVr4  curses does nothing with ncv, ncurses recognizes it and optimizes
+       SVr4 curses does nothing with ncv, ncurses recognizes it and  optimizes
        the output in favor of colors.

                Miscellaneous

                -       If the terminal requires other than a null (zero) character as  a  pad,
-       then  this  can  be  given as pad.  Only the first character of the pad
+       If  the  terminal requires other than a null (zero) character as a pad,
+       then this can be given as pad.  Only the first  character  of  the  pad
        string is used.  If the terminal does not have a pad character, specify
-       npc.   Note that ncurses implements the termcap-compatible PC variable;
-       though the application may set this value to  something  other  than  a
-       null,  ncurses will test npc first and use napms if the terminal has no
+       npc.  Note that ncurses implements the termcap-compatible PC  variable;
+       though  the  application  may  set this value to something other than a
+       null, ncurses will test npc first and use napms if the terminal has  no
        pad character.
 
-       If the terminal can move up or down half a line, this can be  indicated
-       with  hu  (half-line  up)  and  hd (half-line down).  This is primarily
-       useful for superscripts and subscripts on hard-copy  terminals.   If  a
+       If  the terminal can move up or down half a line, this can be indicated
+       with hu (half-line up) and hd  (half-line  down).   This  is  primarily
+       useful  for  superscripts  and subscripts on hard-copy terminals.  If a
        hard-copy terminal can eject to the next page (form feed), give this as
        ff (usually control/L).
 
-       If there is a command to repeat a given character  a  given  number  of
-       times   (to   save  time  transmitting  a  large  number  of  identical
-       characters) this can be indicated with the  parameterized  string  rep.
-       The  first  parameter is the character to be repeated and the second is
+       If  there  is  a  command to repeat a given character a given number of
+       times  (to  save  time  transmitting  a  large  number   of   identical
+       characters)  this  can  be indicated with the parameterized string rep.
+       The first parameter is the character to be repeated and the  second  is
        the number of times to repeat it.  Thus, tparm(repeat_char, 'x', 10) is
        the same as "xxxxxxxxxx".
 
        If the terminal has a settable command character, such as the TEKTRONIX
-       4025, this can be indicated with cmdch.  A prototype command  character
-       is  chosen  which is used in all capabilities.  This character is given
-       in the cmdch capability to identify it.  The  following  convention  is
-       supported on some UNIX systems: The environment is to be searched for a
-       CC variable, and if found, all occurrences of the  prototype  character
+       4025,  this can be indicated with cmdch.  A prototype command character
+       is chosen which is used in all capabilities.  This character  is  given
+       in  the  cmdch  capability to identify it.  The following convention is
+       supported on some Unix systems: The environment is to be searched for a
+       CC  variable,  and if found, all occurrences of the prototype character
        are replaced with the character in the environment variable.
 
-       Terminal  descriptions  that  do not represent a specific kind of known
-       terminal, such as switch, dialup, patch, and  network,  should  include
-       the  gn (generic) capability so that programs can complain that they do
-       not know how to talk to the terminal.  (This capability does not  apply
-       to  virtual  terminal  descriptions  for which the escape sequences are
+       Terminal descriptions that do not represent a specific  kind  of  known
+       terminal,  such  as  switch, dialup, patch, and network, should include
+       the gn (generic) capability so that programs can complain that they  do
+       not  know how to talk to the terminal.  (This capability does not apply
+       to virtual terminal descriptions for which  the  escape  sequences  are
        known.)
 
        If the terminal has a "meta key" which acts as a shift key, setting the
-       8th  bit  of any character transmitted, this fact can be indicated with
-       km.  Otherwise, software will assume that the 8th bit is parity and  it
-       will  usually be cleared.  If strings exist to turn this "meta mode" on
+       8th bit of any character transmitted, this fact can be  indicated  with
+       km.   Otherwise, software will assume that the 8th bit is parity and it
+       will usually be cleared.  If strings exist to turn this "meta mode"  on
        and off, they can be given as smm and rmm.
 
        If the terminal has more lines of memory than will fit on the screen at
-       once,  the number of lines of memory can be indicated with lm.  A value
+       once, the number of lines of memory can be indicated with lm.  A  value
        of lm#0 indicates that the number of lines is not fixed, but that there
        is still more memory than fits on the screen.
 
-       If  the terminal is one of those supported by the UNIX virtual terminal
+       If the terminal is one of those supported by the Unix virtual  terminal
        protocol, the terminal number can be given as vt.
 
-       Media copy strings which control an auxiliary printer connected to  the
-       terminal  can  be  given as mc0: print the contents of the screen, mc4:
-       turn off the printer, and mc5: turn on the printer.  When  the  printer
-       is  on,  all text sent to the terminal will be sent to the printer.  It
-       is undefined whether the text is also displayed on the terminal  screen
-       when  the  printer  is  on.   A variation mc5p takes one parameter, and
-       leaves the printer on for as  many  characters  as  the  value  of  the
+       Media  copy strings which control an auxiliary printer connected to the
+       terminal can be given as mc0: print the contents of  the  screen,  mc4:
+       turn  off  the printer, and mc5: turn on the printer.  When the printer
+       is on, all text sent to the terminal will be sent to the  printer.   It
+       is  undefined whether the text is also displayed on the terminal screen
+       when the printer is on.  A variation  mc5p  takes  one  parameter,  and
+       leaves  the  printer  on  for  as  many  characters as the value of the
        parameter, then turns the printer off.  The parameter should not exceed
-       255.  All text, including mc4, is transparently passed to  the  printer
+       255.   All  text, including mc4, is transparently passed to the printer
        while an mc5p is in effect.
 
 
-

                Glitches and Braindamage

                -       Hazeltine  terminals, which do not allow "~" characters to be displayed
+

                Glitches and Brain Damage

                +       Hazeltine terminals, which do not allow "~" characters to be  displayed
        should indicate hz.
 
-       Terminals which ignore a line-feed immediately after an am  wrap,  such
+       Terminals  which  ignore a line-feed immediately after an am wrap, such
        as the Concept and vt100, should indicate xenl.
 
-       If  el  is  required  to get rid of standout (instead of merely writing
+       If el is required to get rid of standout  (instead  of  merely  writing
        normal text on top of it), xhp should be given.
 
        Teleray terminals, where tabs turn all characters moved over to blanks,
-       should  indicate  xt (destructive tabs).  Note: the variable indicating
-       this  is  now  "dest_tabs_magic_smso";  in  older  versions,   it   was
-       teleray_glitch.   This  glitch  is  also  taken  to mean that it is not
-       possible to position the cursor on top of a  "magic  cookie",  that  to
-       erase  standout  mode  it is instead necessary to use delete and insert
-       line.  The ncurses implementation ignores this glitch.
-
-       The Beehive Superbee, which is unable to correctly transmit the  escape
-       or  control/C  characters,  has xsb, indicating that the f1 key is used
-       for escape and f2 for control/C.  (Only  certain  Superbees  have  this
-       problem,  depending on the ROM.)  Note that in older terminfo versions,
+       should indicate xt (destructive tabs).  Note: the  variable  indicating
+       this   is   now  "dest_tabs_magic_smso";  in  older  versions,  it  was
+       teleray_glitch.  This glitch is also taken  to  mean  that  it  is  not
+       possible  to  position  the  cursor on top of a "magic cookie", that to
+       erase standout mode it is instead necessary to use  delete  and  insert
+       line.  The ncurses implementation ignores this glitch.
+
+       The  Beehive Superbee, which is unable to correctly transmit the escape
+       or control/C characters, has xsb, indicating that the f1  key  is  used
+       for  escape  and  f2  for control/C.  (Only certain Superbees have this
+       problem, depending on the ROM.)  Note that in older terminfo  versions,
        this capability was called "beehive_glitch"; it is now "no_esc_ctl_c".
 
-       Other specific terminal  problems  may  be  corrected  by  adding  more
+       Other  specific  terminal  problems  may  be  corrected  by adding more
        capabilities of the form xx.

                Pitfalls of Long Entries

                -       Long  terminfo  entries are unlikely to be a problem; to date, no entry
-       has  even  approached  terminfo's   4096-byte   string-table   maximum.
-       Unfortunately,  the termcap translations are much more strictly limited
+       Long terminfo entries are unlikely to be a problem; to date,  no  entry
+       has   even   approached   terminfo's  4096-byte  string-table  maximum.
+       Unfortunately, the termcap translations are much more strictly  limited
        (to 1023 bytes), thus termcap translations of long terminfo entries can
        cause problems.
 
-       The  man  pages  for  4.3BSD and older versions of tgetent instruct the
-       user to allocate a 1024-byte buffer for the termcap entry.   The  entry
-       gets  null-terminated by the termcap library, so that makes the maximum
-       safe length for a termcap entry 1k-1 (1023) bytes.  Depending  on  what
-       the  application  and the termcap library being used does, and where in
-       the termcap file the terminal type that tgetent is  searching  for  is,
-       several bad things can happen.
-
-       Some  termcap libraries print a warning message or exit if they find an
-       entry that's longer than 1023 bytes; others do not; others truncate the
-       entries  to  1023  bytes.  Some application programs allocate more than
-       the recommended 1K for the termcap entry; others do not.
-
-       Each termcap entry has two important sizes associated with  it:  before
-       "tc"  expansion, and after "tc" expansion.  "tc" is the capability that
+       The man pages for 4.3BSD and older versions  of  tgetent  instruct  the
+       user  to  allocate a 1024-byte buffer for the termcap entry.  The entry
+       gets null-terminated by the termcap library, so that makes the  maximum
+       safe  length  for a termcap entry 1k-1 (1023) bytes.  Depending on what
+       the application and the termcap library being used does, and  where  in
+       the  termcap  file  the terminal type that tgetent is searching for is,
+       several bad things can happen:
+
+       o   some termcap libraries print a warning message,
+
+       o   some exit if they find an entry that's longer than 1023 bytes,
+
+       o   some neither exit nor warn, doing nothing useful, and
+
+       o   some simply truncate the entries to 1023 bytes.
+
+       Some application programs allocate more than the recommended 1K for the
+       termcap entry; others do not.
+
+       Each  termcap  entry has two important sizes associated with it: before
+       "tc" expansion, and after "tc" expansion.  "tc" is the capability  that
        tacks on another termcap entry to the end of the current one, to add on
        its capabilities.  If a termcap entry does not use the "tc" capability,
        then of course the two lengths are the same.
 
-       The "before tc expansion" length is the most important one, because  it
-       affects  more than just users of that particular terminal.  This is the
-       length of the entry as it exists in /etc/termcap, minus the  backslash-
+       The  "before tc expansion" length is the most important one, because it
+       affects more than just users of that particular terminal.  This is  the
+       length  of the entry as it exists in /etc/termcap, minus the backslash-
        newline pairs, which tgetent strips out while reading it.  Some termcap
        libraries strip off the final newline, too (GNU termcap does not).  Now
        suppose:
@@ -2537,54 +2366,50 @@ 
                terminfo 5   File Formats
                
 
        o   and the application has only allocated a 1k buffer,
 
-       o   and  the termcap library (like the one in BSD/OS 1.1 and GNU) reads
-           the whole entry into the buffer, no matter what its length, to  see
+       o   and the termcap library (like the one in BSD/OS 1.1 and GNU)  reads
+           the  whole entry into the buffer, no matter what its length, to see
            if it is the entry it wants,
 
-       o   and  tgetent  is  searching  for a terminal type that either is the
-           long entry, appears in the termcap file after the  long  entry,  or
-           does  not  appear in the file at all (so that tgetent has to search
+       o   and tgetent is searching for a terminal type  that  either  is  the
+           long  entry,  appears  in the termcap file after the long entry, or
+           does not appear in the file at all (so that tgetent has  to  search
            the whole termcap file).
 
-       Then tgetent will overwrite memory, perhaps  its  stack,  and  probably
-       core   dump   the  program.   Programs  like  telnet  are  particularly
-       vulnerable; modern telnets pass along values  like  the  terminal  type
-       automatically.   The  results  are almost as undesirable with a termcap
-       library, like SunOS 4.1.3 and Ultrix 4.4, that prints warning  messages
-       when  it  reads  an  overly  long  termcap entry.  If a termcap library
-       truncates long entries, like OSF/1 3.0, it is immune to dying here  but
+       Then  tgetent  will  overwrite  memory, perhaps its stack, and probably
+       core  dump  the  program.   Programs  like  telnet   are   particularly
+       vulnerable;  modern  telnets  pass  along values like the terminal type
+       automatically.  The results are almost as undesirable  with  a  termcap
+       library,  like SunOS 4.1.3 and Ultrix 4.4, that prints warning messages
+       when it reads an overly long  termcap  entry.   If  a  termcap  library
+       truncates  long entries, like OSF/1 3.0, it is immune to dying here but
        will return incorrect data for the terminal.
 
-       The  "after  tc  expansion"  length  will  have a similar effect to the
-       above, but only for people who actually set TERM to that terminal type,
-       since  tgetent  only  does "tc" expansion once it is found the terminal
+       The "after tc expansion" length will  have  a  similar  effect  to  the
+       above, but only for people who actually set TERM to that terminal type,
+       since tgetent only does "tc" expansion once it is  found  the  terminal
        type it was looking for, not while searching.
 
-       In summary, a termcap entry that is longer than 1023 bytes  can  cause,
-       on  various  combinations of termcap libraries and applications, a core
-       dump, warnings, or incorrect operation.  If it is too long even  before
-       "tc"  expansion,  it will have this effect even for users of some other
-       terminal types and users whose TERM variable does not  have  a  termcap
+       In  summary,  a termcap entry that is longer than 1023 bytes can cause,
+       on various combinations of termcap libraries and applications,  a  core
+       dump,  warnings, or incorrect operation.  If it is too long even before
+       "tc" expansion, it will have this effect even for users of  some  other
+       terminal  types  and  users whose TERM variable does not have a termcap
        entry.
 
-       When  in  -C (translate to termcap) mode, the ncurses implementation of
-       tic(1m) issues warning messages when the pre-tc  length  of  a  termcap
-       translation  is  too  long.  The -c (check) option also checks resolved
+       When in -C (translate to termcap) mode, the ncurses  implementation  of
+       tic(1m)  issues  warning  messages  when the pre-tc length of a termcap
+       translation is too long.  The -c (check) option  also  checks  resolved
        (after tc expansion) lengths.
 
 
-

                Binary Compatibility

                -       It is not wise to count  on  portability  of  binary  terminfo  entries
-       between  commercial  UNIX  versions.   The problem is that there are at
-       least two versions of terminfo (under HP-UX  and  AIX)  which  diverged
-       from   System   V   terminfo  after  SVr1,  and  have  added  extension
-       capabilities to the string table that (in the  binary  format)  collide
-       with System V and XSI Curses extensions.
+

                FILES

                +       /usr/share/terminfo
+              compiled terminal description database directory

                EXTENSIONS

                -       Searching    for   terminal   descriptions   in   $HOME/.terminfo   and
-       TERMINFO_DIRS is not supported by older implementations.
+       Searching    for   terminal   descriptions   in   $HOME/.terminfo   and
+       TERMINFO_DIRS is not supported by older implementations.
 
        Some SVr4 curses implementations, and all  previous  to  SVr4,  do  not
        interpret the %A and %O operators in parameter strings.
@@ -2592,63 +2417,63 @@ 
                terminfo 5   File Formats
                
        SVr4/XPG4  do  not  specify  whether msgr licenses movement while in an
        alternate-character-set mode (such modes may, among other  things,  map
        CR  and  NL  to  characters  that  do  not trigger local motions).  The
-       ncurses implementation ignores msgr in ALTCHARSET  mode.   This  raises
+       ncurses implementation ignores msgr in ALTCHARSET  mode.   This  raises
        the  possibility  that  an  XPG4  implementation  making  the  opposite
-       interpretation may need terminfo entries made for ncurses to have  msgr
+       interpretation may need terminfo entries made for ncurses to have  msgr
        turned off.
 
-       The ncurses library handles insert-character and insert-character modes
+       The ncurses library handles insert-character and insert-character modes
        in a slightly non-standard way to get better  update  efficiency.   See
        the Insert/Delete Character subsection above.
 
        The  parameter  substitutions  for  set_clock and display_clock are not
-       documented in SVr4 or the XSI Curses standard.  They are  deduced  from
-       the documentation for the AT&T 505 terminal.
+       documented in SVr4  or  X/Open  Curses.   They  are  deduced  from  the
+       documentation for the AT&T 505 terminal.
 
-       Be  careful  assigning the kmous capability.  The ncurses library wants
+       Be  careful  assigning the kmous capability.  The ncurses library wants
        to interpret it as KEY_MOUSE, for use by terminals and  emulators  like
        xterm  that can return mouse-tracking information in the keyboard-input
        stream.
 
        X/Open Curses does not mention  italics.   Portable  applications  must
        assume  that  numeric  capabilities  are  signed  16-bit  values.  This
-       includes the no_color_video (ncv) capability.   The  32768  mask  value
-       used  for  italics with ncv can be confused with an absent or cancelled
-       ncv.  If italics should work with colors, then the ncv  value  must  be
+       includes the no_color_video (ncv) capability.   The  32768  mask  value
+       used  for  italics  with ncv can be confused with an absent or canceled
+       ncv.  If italics should work with colors, then the ncv  value  must  be
        specified, even if it is zero.
 
-       Different  commercial  ports  of  terminfo and curses support different
-       subsets of the XSI  Curses  standard  and  (in  some  cases)  different
-       extension sets.  Here is a summary, accurate as of October 1995:
+       Different  commercial  ports  of  terminfo and curses support different
+       subsets of X/Open Curses and  (in  some  cases)  different  extensions.
+       Here  is  a  summary,  accurate  as  of  October  1995, after which the
+       commercial Unix market contracted and lost diversity.
 
-       o   SVR4, Solaris, ncurses -- These support all SVr4 capabilities.
+       o   SVr4, Solaris, and ncurses support all SVr4 capabilities.
 
-       o   SGI -- Supports the SVr4 set, adds one undocumented extended string
-           capability (set_pglen).
+       o   IRIX supports the SVr4  set  and  adds  one  undocumented  extended
+           string capability (set_pglen).
 
-       o   SVr1, Ultrix -- These  support  a  restricted  subset  of  terminfo
-           capabilities.   The  booleans  end with xon_xoff; the numerics with
+       o   SVr1   and   Ultrix   support   a  restricted  subset  of  terminfo
+           capabilities.  The Booleans end with xon_xoff;  the  numerics  with
            width_status_line; and the strings with prtr_non.
 
-       o   HP/UX -- Supports the  SVr1  subset,  plus  the  SVr[234]  numerics
-           num_labels,   label_height,  label_width,  plus  function  keys  11
-           through 63, plus plab_norm,  label_on,  and  label_off,  plus  some
-           incompatible extensions in the string table.
+       o   HP/UX   supports  the  SVr1  subset,  plus  the  SVr[234]  numerics
+           num_labels,  label_height,  label_width,  plus  function  keys   11
+           through  63, plus plab_norm, label_on, and label_off, plus a number
+           of incompatible string table extensions.
 
-       o   AIX  -- Supports the SVr1 subset, plus function keys 11 through 63,
+       o   AIX supports the SVr1 subset, plus function  keys  11  through  63,
            plus a number of incompatible string table extensions.
 
-       o   OSF -- Supports both the SVr4 set and the AIX extensions.
+       o   OSF/1 supports both the SVr4 set and the AIX extensions.
 
 
-

                FILES

                -       /usr/share/terminfo/?/*  files containing terminal descriptions
-
-
-

                SEE ALSO

                -       infocmp(1m),    tabs(1),    tic(1m),    curses(3x),     curs_color(3x),
-       curs_variables(3x),     printf(3),     term_variables(3x).     term(5).
-       user_caps(5).
+

                PORTABILITY

                +       Do  not  count  on  compiled  (binary)  terminfo entries being portable
+       between commercial Unix  systems.   At  least  two  implementations  of
+       terminfo (those of HP-UX and AIX) diverged from those of other System V
+       Unices after SVr1, adding extension capabilities to  the  string  table
+       that (in the binary format) collide with subsequent System V and X/Open
+       Curses extensions.

                AUTHORS

                @@ -2656,8 +2481,14 @@ 
                terminfo 5   File Formats
                
        by Pavel Curtis.
 
 
+

                SEE ALSO

                +       infocmp(1m),     tabs(1),    tic(1m),    curses(3x),    curs_color(3x),
+       curs_terminfo(3x), curs_variables(3x),  printf(3),  term_variables(3x),
+       term(5), user_caps(5)
+
 
-                                                                   terminfo(5)
+
+ncurses 6.5                       2024-05-11                       terminfo(5)
                diff --git a/doc/html/man/tic.1m.html b/doc/html/man/tic.1m.html index 0fa0e3cb..5f2a4cfd 100644 --- a/doc/html/man/tic.1m.html +++ b/doc/html/man/tic.1m.html @@ -1,6 +1,6 @@ -tic 1m +tic 1m 2025-01-18 ncurses 6.5 User commands -

                tic 1m

                +

                tic 1m 2025-01-18 ncurses 6.5 User commands

                -tic(1m)                                                                tic(1m)
+tic(1m)                          User commands                         tic(1m)

                NAME

                -       tic - the terminfo entry-description compiler
+       tic - compile terminal descriptions for terminfo or termcap

                SYNOPSIS

                -       tic  [-01CDGIKLNTUVWacfgqrstx]  [-e names] [-o dir] [-Q[n]] [-R subset]
-       [-v[n]] [-w[n]] file
+       tic  [-01acCDfgGIKLNqrstTUVWx] [-e terminal-type-list] [-o dir] [-Q[n]]
+       [-R subset] [-v[n]] [-w[n]] file

                DESCRIPTION

                @@ -84,30 +84,33 @@ 
                tic 1m
                
        in a different terminfo database.  There are two ways to achieve this:
 
        o   First,  you  may override the system default either by using the -o
-           option,  or  by  setting  the  variable  TERMINFO  in  your   shell
+           option,  or  by  setting  the  variable  TERMINFO  in  your   shell
            environment to a valid database location.
 
        o   Secondly,  if  tic  cannot  write  in  /usr/share/terminfo  or  the
-           location specified using your TERMINFO variable, it looks  for  the
+           location specified using your TERMINFO variable, it looks  for  the
            directory  $HOME/.terminfo (or hashed database $HOME/.terminfo.db);
            if that location exists, the entry is placed there.
 
        Libraries  that  read  terminfo  entries  are  expected  to  check   in
        succession
 
-       o   a location specified with the TERMINFO environment variable,
+       o   a location specified with the TERMINFO environment variable,
 
        o   $HOME/.terminfo,
 
-       o   directories listed in the TERMINFO_DIRS environment variable,
+       o   directories listed in the TERMINFO_DIRS environment variable,
 
-       o   a compiled-in list of directories (no default value), and
+       o   a compiled-in list of directories (/usr/share/terminfo), and
 
        o   the system terminfo database (/usr/share/terminfo).
 
+       The  Fetching  Compiled  Descriptions section in the terminfo(5) manual
+       goes into further detail.
 
-

                ALIASES

                -       This  is the same program as infotocap and captoinfo; usually those are
+
+

                Aliases

                +       This is the same program as infotocap and captoinfo; usually those  are
        linked to, or copied from this program:
 
        o   When invoked as infotocap, tic sets the -I option.
@@ -115,101 +118,101 @@ 
                tic 1m
                
        o   When invoked as captoinfo, tic sets the -C option.
 
 
-

                OPTIONS

                +

                OPTIONS

                        -0     restricts the output to a single line
 
        -1     restricts the output to a single column
 
-       -a     tells tic  to  retain  commented-out  capabilities  rather  than
-              discarding  them.   Capabilities are commented by prefixing them
-              with a period.  This sets the -x option, because it  treats  the
-              commented-out  entries  as user-defined names.  If the source is
-              termcap, accept the 2-character names  required  by  version  6.
+       -a     tells  tic  to  retain  commented-out  capabilities  rather than
+              discarding them.  Capabilities are commented by  prefixing  them
+              with  a  period.  This sets the -x option, because it treats the
+              commented-out entries as user-defined names.  If the  source  is
+              termcap,  accept  the  2-character  names required by version 6.
               Otherwise these are ignored.
 
-       -C     Force  source translation to termcap format.  Note: this differs
-              from the -C option of infocmp(1m) in that  it  does  not  merely
+       -C     Force source translation to termcap format.  Note: this  differs
+              from  the  -C  option  of infocmp(1m) in that it does not merely
               translate capability names, but also translates terminfo strings
-              to termcap format.  Capabilities that are not  translatable  are
-              left  in  the entry under their terminfo names but commented out
-              with two preceding dots.  The actual  format  used  incorporates
-              some  improvements  for escaped characters from terminfo format.
+              to  termcap  format.  Capabilities that are not translatable are
+              left in the entry under their terminfo names but  commented  out
+              with  two  preceding  dots.  The actual format used incorporates
+              some improvements for escaped characters from  terminfo  format.
               For a stricter BSD-compatible translation, add the -K option.
 
-              If this is combined with -c,  tic  makes  additional  checks  to
-              report  cases  where  the  terminfo  values do not have an exact
+              If  this  is  combined  with  -c, tic makes additional checks to
+              report cases where the terminfo values  do  not  have  an  exact
               equivalent in termcap form.  For example:
 
-              o   sgr usually will not  convert,  because  termcap  lacks  the
-                  ability  to  work with more than two parameters, and because
-                  termcap lacks many of the arithmetic/logical operators  used
+              o   sgr  usually  will  not  convert,  because termcap lacks the
+                  ability to work with more than two parameters,  and  because
+                  termcap  lacks many of the arithmetic/logical operators used
                   in terminfo.
 
-              o   capabilities  with more than one delay or with delays before
+              o   capabilities with more than one delay or with delays  before
                   the end of the string will not convert completely.
 
-       -c     tells tic to  only  check  file  for  errors,  including  syntax
-              problems  and  bad  use-links.  If you specify -C (-I) with this
-              option, the code will print warnings about entries which,  after
-              use  resolution, are more than 1023 (4096) bytes long.  Due to a
+       -c     tells  tic  to  only  check  file  for  errors, including syntax
+              problems and bad use-links.  If you specify -C  (-I)  with  this
+              option,  the code will print warnings about entries which, after
+              use resolution, are more than 1023 (4096) bytes long.  Due to  a
               fixed buffer length in older termcap libraries, as well as buggy
-              checking  for  the  buffer  length  (and  a  documented limit in
+              checking for the  buffer  length  (and  a  documented  limit  in
               terminfo),  these  entries  may  cause  core  dumps  with  other
               implementations.
 
               tic  checks  string  capabilities  to  ensure  that  those  with
-              parameters will be valid expressions.  It does this  check  only
-              for  the predefined string capabilities; those which are defined
+              parameters  will  be valid expressions.  It does this check only
+              for the predefined string capabilities; those which are  defined
               with the -x option are ignored.
 
-       -D     tells tic to print the database locations that it  knows  about,
+       -D     tells  tic  to print the database locations that it knows about,
               and exit.  The first location shown is the one to which it would
-              write compiled terminal descriptions.  If tic  is  not  able  to
+              write  compiled  terminal  descriptions.   If tic is not able to
               find  a  writable  database  location  according  to  the  rules
-              summarized above, it will print a diagnostic and  exit  with  an
+              summarized  above,  it  will print a diagnostic and exit with an
               error rather than printing a list of database locations.
 
-       -e names
-              Limit  writes  and translations to the following comma-separated
-              list of terminals.  If any name or alias of a  terminal  matches
-              one  of  the  names  in  the  list, the entry will be written or
+       -e list
+              Limit writes and translations to  the  comma-separated  list  of
+              terminal  types.  If any name or alias of a terminal matches one
+              of the  names  in  the  list,  the  entry  will  be  written  or
               translated as normal.  Otherwise no output will be generated for
-              it.   The  option  value is interpreted as a file containing the
-              list if it contains a '/'.  (Note:  depending  on  how  tic  was
+              it.  The option value is interpreted as a  file  containing  the
+              list  if  it  contains  a  '/'.  (Note: depending on how tic was
               compiled, this option may require -I or -C.)
 
-       -f     Display     complex     terminfo     strings    which    contain
+       -f     Display    complex    terminfo     strings     which     contain
               if/then/else/endif expressions indented for readability.
 
-       -G     Display constant literals in  decimal  form  rather  than  their
+       -G     Display  constant  literals  in  decimal  form rather than their
               character equivalents.
 
-       -g     Display  constant  character literals in quoted form rather than
+       -g     Display constant character literals in quoted form  rather  than
               their decimal equivalents.
 
        -I     Force source translation to terminfo format.
 
-       -K     Suppress some longstanding ncurses extensions to termcap format,
+       -K     Suppress some longstanding ncurses extensions to termcap format,
               e.g., "\s" for space.
 
-       -L     Force  source  translation  to  terminfo format using the long C
+       -L     Force source translation to terminfo format  using  the  long  C
               variable names listed in <term.h>
 
        -N     Disable smart defaults.  Normally, when translating from termcap
-              to  terminfo,  the  compiler makes a number of assumptions about
-              the   defaults    of    string    capabilities    reset1_string,
-              carriage_return,  cursor_left, cursor_down, scroll_forward, tab,
+              to terminfo, the compiler makes a number  of  assumptions  about
+              the    defaults    of    string    capabilities   reset1_string,
+              carriage_return, cursor_left, cursor_down, scroll_forward,  tab,
               newline, key_backspace, key_left, and key_down, then attempts to
-              use  obsolete termcap capabilities to deduce correct values.  It
+              use obsolete termcap capabilities to deduce correct values.   It
               also normally suppresses output of obsolete termcap capabilities
-              such  as bs.  This option forces a more literal translation that
+              such as bs.  This option forces a more literal translation  that
               also preserves the obsolete capabilities.
 
-       -odir  Write compiled entries to given  database  location.   Overrides
-              the TERMINFO environment variable.
+       -odir  Write  compiled  entries  to given database location.  Overrides
+              the TERMINFO environment variable.
 
-       -Qn    Rather  than  show  source  in terminfo (text) format, print the
-              compiled  (binary)  format  in  hexadecimal  or   base64   form,
+       -Qn    Rather than show source in terminfo  (text)  format,  print  the
+              compiled   (binary)   format  in  hexadecimal  or  base64  form,
               depending on the option's value:
 
                1  hexadecimal
@@ -222,202 +225,135 @@ 
                tic 1m
                
               source.
 
        -Rsubset
-              Restrict output to a given subset.  This option is for use  with
-              archaic  versions of terminfo like those on SVr1, Ultrix, or HP-
+              Restrict  output to a given subset.  This option is for use with
+              archaic versions of terminfo like those on SVr1, Ultrix, or  HP-
               UX that do not support the full set of SVR4/XSI Curses terminfo;
-              and  outright  broken  ports  like  AIX  3.x that have their own
-              extensions incompatible with SVr4/XSI.   Available  subsets  are
-              "SVr1",  "Ultrix",  "HP",  "BSD"  and "AIX"; see terminfo(5) for
-              details.
-
-       -r     Force  entry  resolution  (so  there   are   no   remaining   tc
-              capabilities)  even  when  doing  translation to termcap format.
-              This may be needed if you are preparing a  termcap  file  for  a
-              termcap  library (such as GNU termcap through version 1.3 or BSD
+              and outright broken ports like  AIX  3.x  that  have  their  own
+              extensions incompatible with SVr4/XSI.
+
+              Available subsets are
+              "SVr1", "Ultrix", "HP", "BSD", and "AIX"
+
+              See terminfo(5) for details.
+
+       -r     Force   entry   resolution   (so   there  are  no  remaining  tc
+              capabilities) even when doing  translation  to  termcap  format.
+              This  may  be  needed  if you are preparing a termcap file for a
+              termcap library (such as GNU termcap through version 1.3 or  BSD
               termcap  through  4.3BSD)  that  does  not  handle  multiple  tc
               capabilities per entry.
 
-       -s     Summarize  the  compile  by  showing  the database location into
-              which entries are written, and the number of entries  which  are
+       -s     Summarize the compile by  showing  the  database  location  into
+              which  entries  are written, and the number of entries which are
               compiled.
 
-       -T     eliminates  size-restrictions  on  the  generated text.  This is
-              mainly useful for  testing  and  analysis,  since  the  compiled
-              descriptions  are  limited  (e.g.,  1023  for  termcap, 4096 for
+       -T     eliminates size-restrictions on the  generated  text.   This  is
+              mainly  useful  for  testing  and  analysis,  since the compiled
+              descriptions are limited  (e.g.,  1023  for  termcap,  4096  for
               terminfo).
 
-       -t     tells tic to discard commented-out capabilities.  Normally  when
-              translating    from    terminfo   to   termcap,   untranslatable
+       -t     tells  tic to discard commented-out capabilities.  Normally when
+              translating   from   terminfo   to    termcap,    untranslatable
               capabilities are commented-out.
 
-       -U   tells tic to not post-process the data after  parsing  the  source
-            file.  Normally, it infers data which is commonly missing in older
-            terminfo data, or in termcaps.
+       -U     tells  tic to not post-process the data after parsing the source
+              file.  Normally, it infers data which  is  commonly  missing  in
+              older terminfo data, or in termcaps.
 
-       -V   reports the version of ncurses which was used in this program, and
-            exits.
+       -V     reports  the  version of ncurses which was used in this program,
+              and exits.
 
-       -vn  specifies that (verbose) output be written to standard error trace
-            information showing tic's progress.
+       -vn    specifies that (verbose) output be  written  to  standard  error
+              trace information showing tic's progress.
 
-            The optional parameter n is a  number  from  1  to  9,  inclusive,
-            indicating the desired level of detail of information.
+              The  optional  parameter  n  is a number from 1 to 9, inclusive,
+              indicating the desired level of detail of information.
 
-            o   If  ncurses  is  built  without  tracing support, the optional
-                parameter is ignored.
+              o   If ncurses is built without tracing  support,  the  optional
+                  parameter is ignored.
 
-            o   If n is omitted, the default level is 1.
+              o   If n is omitted, the default level is 1.
 
-            o   If n is specified and greater than 1, the level of  detail  is
-                increased,   and   the   output   is   written  (with  tracing
-                information) to the "trace" file.
+              o   If n is specified and greater than 1, the level of detail is
+                  increased,  and  the  output  is   written   (with   tracing
+                  information) to the "trace" file.
 
-            The debug flag levels are as follows:
+              The debug flag levels are as follows:
 
-            1   Names of files created and linked
+              1   Names of files created and linked
 
-            2   Information related to the "use" facility
+              2   Information related to the "use" facility
 
-            3   Statistics from the hashing algorithm
+              3   Statistics from the hashing algorithm
 
-            4   Details of extended capabilities
+              4   Details of extended capabilities
 
-            5   (unused)
+              5   (unused)
 
-            6   (unused)
+              6   (unused)
 
-            7   Entries into the string-table
+              7   Entries into the string-table
 
-            8   List of tokens encountered by scanner
+              8   List of tokens encountered by scanner
 
-            9   All values computed in construction of the hash table
+              9   All values computed in construction of the hash table
 
-       -W   By itself, the -w  option  will  not  force  long  strings  to  be
-            wrapped.  Use the -W option to do this.
+       -W     By  itself,  the  -w  option  will  not force long strings to be
+              wrapped.  Use the -W option to do this.
 
-            If  you specify both -f and -W options, the latter is ignored when
-            -f has already split the line.
+              If you specify both -f and -W options,  the  latter  is  ignored
+              when -f has already split the line.
 
-       -wn  specifies the width of the output.  The parameter is optional.  If
-            it is omitted, it defaults to 60.
+       -wn    specifies  the  width of the output.  The parameter is optional.
+              If it is omitted, it defaults to 60.
 
-       -x   Treat  unknown  capabilities  as  user-defined (see user_caps(5)).
-            That is, if you supply  a  capability  name  which  tic  does  not
-            recognize, it will infer its type (boolean, number or string) from
-            the syntax and make an  extended  table  entry  for  that.   User-
-            defined  capability strings whose name begins with "k" are treated
-            as function keys.
+       -x     Treat unknown capabilities as user-defined  (see  user_caps(5)).
+              That  is,  if  you  supply  a capability name which tic does not
+              recognize, it will infer its type (Boolean,  number  or  string)
+              from  the  syntax  and  make  an  extended table entry for that.
+              User-defined capability strings whose name begins with  "k"  are
+              treated as function keys.
 
 
-

                PARAMETERS

                -       file   contains one or more terminfo terminal  descriptions  in  source
-              format   [see   terminfo(5)].   Each  description  in  the  file
+

                Parameters

                +       file   contains  one  or  more terminfo terminal descriptions in source
+              format  [see  terminfo(5)].   Each  description  in   the   file
               describes the capabilities of a particular terminal.
 
-              If file is "-", then the data is read from the  standard  input.
+              If  file  is "-", then the data is read from the standard input.
               The file parameter may also be the path of a character-device.
 
 
-

                PROCESSING

                -       All  but  one  of  the capabilities recognized by tic are documented in
+

                Processing

                +       All but one of the capabilities recognized by  tic  are  documented  in
        terminfo(5).  The exception is the use capability.
 
        When a use=entry-name field is discovered in a terminal entry currently
-       being  compiled,  tic  reads  in the binary from /usr/share/terminfo to
-       complete the entry.  (Entries created from file  will  be  used  first.
-       tic  duplicates  the  capabilities in entry-name for the current entry,
+       being compiled, tic reads in the  binary  from  /usr/share/terminfo  to
+       complete  the  entry.   (Entries  created from file will be used first.
+       tic duplicates the capabilities in entry-name for  the  current  entry,
        with the exception of those capabilities that explicitly are defined in
        the current entry.
 
-       When  an  entry, e.g., entry_name_1, contains a use=entry_name_2 field,
-       any  canceled  capabilities  in  entry_name_2  must  also   appear   in
-       entry_name_1  before  use=  for  these  capabilities  to be canceled in
+       When an entry, e.g., entry_name_1, contains a  use=entry_name_2  field,
+       any   canceled   capabilities  in  entry_name_2  must  also  appear  in
+       entry_name_1 before use= for  these  capabilities  to  be  canceled  in
        entry_name_1.
 
-       Total compiled entries cannot exceed 4096 bytes.  The name field cannot
-       exceed  512  bytes.   Terminal names exceeding the maximum alias length
-       (32 characters on systems with long filenames, 14 characters otherwise)
-       will  be  truncated  to  the maximum alias length and a warning message
-       will be printed.
-
-
-

                HISTORY

                -       System V Release 2 provided  a  tic  utility.   It  accepted  a  single
-       option:  -v  (optionally  followed  by  a  number).   According to Ross
-       Ridge's comment in mytinfo, this version of tic was unable to represent
-       cancelled capabilities.
-
-       System  V  Release 3 provided a different tic utility, written by Pavel
-       Curtis, (originally named "compile" in pcurses).  This added an  option
-       -c  to check the file for errors, with the caveat that errors in "use="
-       links would not be reported.  System  V  Release  3  documented  a  few
-       warning  messages  which  did not appear in pcurses.  While the program
-       itself was changed  little  as  development  continued  with  System  V
-       Release  4,  the  table  of capabilities grew from 180 (pcurses) to 464
-       (Solaris).
-
-       In early development of ncurses (1993), Zeyd Ben-Halim used  the  table
-       from  mytinfo  to  extend  the  pcurses  table to 469 capabilities (456
-       matched SVr4, 8 were only in SVr4, 13 were not in SVr4).  Of those  13,
-       11  were  ultimately  discarded  (perhaps  to match the draft of X/Open
-       Curses).  The exceptions were memory_lock_above and memory_unlock  (see
-       user_caps(5)).
-
-       Eric  Raymond  incorporated  parts of mytinfo into ncurses to implement
-       the termcap-to-terminfo source conversion, and extended that  to  begin
-       development of the corresponding terminfo-to-termcap source conversion,
-       Thomas Dickey completed that development over  the  course  of  several
-       years.
-
-       In  1999,  Thomas  Dickey  added  the -x option to support user-defined
-       capabilities.
-
-       In 2010, Roy Marples provided a tic program and  terminfo  library  for
-       NetBSD.   That  implementation  adapts  several  features from ncurses,
-       including tic's -x option.
-
-       The -c option tells tic to check for problems in  the  terminfo  source
-       file.  Continued development provides additional checks:
-
-       o   pcurses had 8 warnings
-
-       o   ncurses in 1996 had 16 warnings
-
-       o   Solaris (SVr4) curses has 28 warnings
-
-       o   NetBSD tic in 2019 has 19 warnings.
+       Total  compiled  entries cannot exceed 4096 bytes in the legacy storage
+       format, or 32768 using the extended  number  format.   The  name  field
+       cannot  exceed  512  bytes.  Terminal names exceeding the maximum alias
+       length (32 characters on systems with  long  filenames,  14  characters
+       otherwise)  will be truncated to the maximum alias length and a warning
+       message will be printed.
 
-       o   ncurses in 2019 has 96 warnings
 
-       The checking done in ncurses' tic helps with the conversion to termcap,
-       as well as pointing out errors and inconsistencies.  It is also used to
-       ensure  consistency  with the user-defined capabilities.  There are 527
-       distinct capabilities in ncurses' terminal database; 128 of  those  are
-       user-defined.
-
-
-

                PORTABILITY

                -       X/Open  Curses, Issue 7 (2009) provides a brief description of tic.  It
-       lists one option: -c.  The omission of -v is  unexpected.   The  change
-       history  states  that  the  description  is  derived  from True64 UNIX.
-       According to its manual  pages,  that  system  also  supported  the  -v
-       option.
-
-       Shortly  after  Issue  7  was  released, Tru64 was discontinued.  As of
-       2019, the surviving implementations of tic are  SVr4  (AIX,  HP-UX  and
-       Solaris), ncurses and NetBSD curses.  The SVr4 tic programs all support
-       the -v option.  The NetBSD tic program follows X/Open's  documentation,
-       omitting the -v option.
-
-       The  X/Open  rationale  states  that  some  implementations of tic read
-       terminal descriptions from the standard input if the file parameter  is
-       omitted.   None of these implementations do that.  Further, it comments
-       that some  may  choose  to  read  from  "./terminfo.src"  but  that  is
-       obsolescent  behavior  from SVr2, and is not (for example) a documented
-       feature of SVr3.
+

                FILES

                +       /usr/share/terminfo
+              compiled terminal description database
 
 
-

                COMPATIBILITY

                +

                NOTES

                        There is  some  evidence  that  historic  tic  implementations  treated
        description  fields with no whitespace in them as additional aliases or
        short names.  This tic  does  not  do  that,  but  it  does  warn  when
@@ -425,7 +361,7 @@ 
                tic 1m
                
        characters.
 
 
-

                EXTENSIONS

                +

                EXTENSIONS

                        Unlike the SVr4 tic command, this implementation can  actually  compile
        termcap  sources.   In fact, entries in terminfo and termcap syntax can
        be mixed in a single source file.  See  terminfo(5)  for  the  list  of
@@ -434,7 +370,7 @@ 
                tic 1m
                
        The  SVr4  manual  pages  are not clear on the resolution rules for use
        capabilities.   This  implementation  of  tic  will  find  use  targets
        anywhere  in  the  source  file, or anywhere in the file tree rooted at
-       TERMINFO (if TERMINFO is defined), or  in  the  user's  $HOME/.terminfo
+       TERMINFO (if TERMINFO is defined), or  in  the  user's  $HOME/.terminfo
        database  (if  it  exists),  or (finally) anywhere in the system's file
        tree of compiled entries.
 
@@ -447,7 +383,7 @@ 
                tic 1m
                
 
            -0 -1 -C -G -I -N -R -T -V -a -e -f -g -o -r -s -t -x
 
-       o   The NetBSD tic  supports a few of the ncurses options
+       o   The NetBSD tic supports a few of the ncurses options
 
            -a -o -x
 
@@ -457,28 +393,96 @@ 
                tic 1m
                
        The SVr4 -c mode does not report bad "use=" links.
 
        System V does  not  compile  entries  to  or  read  entries  from  your
-       $HOME/.terminfo database unless TERMINFO is explicitly set to it.
+       $HOME/.terminfo database unless TERMINFO is explicitly set to it.
 
 
-

                FILES

                -       /usr/share/terminfo/?/*
-            Compiled terminal description database.
+

                PORTABILITY

                +       X/Open  Curses  Issue 7 (2009) provides a brief description of tic.  It
+       lists one option: -c.  The omission of -v is  unexpected.   The  change
+       history  states  that the description is derived from Tru64.  According
+       to its manual pages, that system also supported the -v option.
 
+       Shortly after Issue 7 was released,  Tru64  was  discontinued.   As  of
+       2019,  the  surviving  implementations  of tic are SVr4 (AIX, HP-UX and
+       Solaris), ncurses and NetBSD curses.  The SVr4 tic programs all support
+       the  -v option.  The NetBSD tic program follows X/Open's documentation,
+       omitting the -v option.
 
-

                SEE ALSO

                -       captoinfo(1m),   infocmp(1m),   infotocap(1m),   toe(1m),   curses(3x),
-       term(5).  terminfo(5).  user_caps(5).
+       The X/Open rationale states  that  some  implementations  of  tic  read
+       terminal  descriptions from the standard input if the file parameter is
+       omitted.  None of these implementations do that.  Further, it  comments
+       that  some  may  choose  to  read  from  "./terminfo.src"  but  that is
+       obsolescent behavior from SVr2, and is not (for example)  a  documented
+       feature of SVr3.
+
+
+

                HISTORY

                +       System  V  Release  2  provided  a  tic  utility.  It accepted a single
+       option: -v (optionally  followed  by  a  number).   According  to  Ross
+       Ridge's comment in mytinfo, this version of tic was unable to represent
+       canceled capabilities.
+
+       System V Release 3 provided a different tic utility, written  by  Pavel
+       Curtis,  (originally named "compile" in pcurses).  This added an option
+       -c to check the file for errors, with the caveat that errors in  "use="
+       links  would  not  be  reported.   System  V Release 3 documented a few
+       warning messages which did not appear in pcurses.   While  the  program
+       itself  was  changed  little  as  development  continued  with System V
+       Release 4, the table of capabilities grew from  180  (pcurses)  to  464
+       (Solaris).
+
+       In  early  development of ncurses (1993), Zeyd Ben-Halim used the table
+       from mytinfo to extend the  pcurses  table  to  469  capabilities  (456
+       matched  SVr4, 8 were only in SVr4, 13 were not in SVr4).  Of those 13,
+       11 were ultimately discarded (perhaps to  match  the  draft  of  X/Open
+       Curses).   The exceptions were memory_lock_above and memory_unlock (see
+       user_caps(5)).
+
+       Eric Raymond incorporated parts of mytinfo into  ncurses  to  implement
+       the  termcap-to-terminfo  source conversion, and extended that to begin
+       development of the corresponding terminfo-to-termcap source conversion,
+       Thomas  Dickey  completed  that  development over the course of several
+       years.
+
+       In 1999, Thomas Dickey added the  -x  option  to  support  user-defined
+       capabilities.
+
+       In  2010,  Roy  Marples provided a tic program and terminfo library for
+       NetBSD.  That implementation  adapts  several  features  from  ncurses,
+       including tic's -x option.
+
+       The  -c  option  tells tic to check for problems in the terminfo source
+       file.  Continued development provides additional checks:
+
+       o   pcurses had 8 warnings
 
-       This describes ncurses version 6.4 (patch 20230311).
+       o   ncurses in 1996 had 16 warnings
 
+       o   Solaris (SVr4) curses has 28 warnings
+
+       o   NetBSD tic in 2019 has 19 warnings.
 
-

                AUTHOR

                +       o   ncurses in 2019 has 96 warnings
+
+       The checking done in ncurses' tic helps with the conversion to termcap,
+       as well as pointing out errors and inconsistencies.  It is also used to
+       ensure consistency with the user-defined capabilities.  There  are  527
+       distinct  capabilities  in ncurses' terminal database; 128 of those are
+       user-defined.
+
+
+

                AUTHORS

                        Eric S. Raymond <esr@snark.thyrsus.com> and
        Thomas E. Dickey <dickey@invisible-island.net>
 
 
+

                SEE ALSO

                +       captoinfo(1m),   infocmp(1m),   infotocap(1m),   toe(1m),   curses(3x),
+       term(5), terminfo(5), user_caps(5)
 
-                                                                       tic(1m)
+
+
+ncurses 6.5                       2025-01-18                           tic(1m)
                diff --git a/doc/html/man/toe.1m.html b/doc/html/man/toe.1m.html index 430675c5..2413ecec 100644 --- a/doc/html/man/toe.1m.html +++ b/doc/html/man/toe.1m.html @@ -1,6 +1,7 @@ -toe 1m +toe 1m 2025-02-15 ncurses 6.5 User commands -

                toe 1m

                +

                toe 1m 2025-02-15 ncurses 6.5 User commands

                -toe(1m)                                                                toe(1m)
+toe(1m)                          User commands                         toe(1m)

                NAME

                -       toe - table of (terminfo) entries
+       toe - list table of entries of terminfo terminal types

                SYNOPSIS

                -       toe [-v[n]] [-ahsuUV] file...
+       toe [-ahs] [-v [n]] [directory ...]
+
+       toe [-u|-U] file
+
+       toe -V

                DESCRIPTION

                -       With no options, toe lists all available terminal types by primary name
-       with descriptions.   File  arguments  specify  the  directories  to  be
-       scanned;  if  no  such  arguments  are  given,  your  default  terminfo
-       directory is scanned.  If you also specify the -h option,  a  directory
-       header will be issued as each directory is entered.
+       toe  reports  to  the  standard  output  stream the (primary) names and
+       descriptions of the terminal types available to the  terminfo  library.
+       Each  directory  is  scanned;  if none are given, toe scans the default
+       terminfo directory.
 
-       There are other options intended for use by terminfo file maintainers:
 
-       -a     report  on  all  of  the  terminal databases which ncurses would
-              search, rather than only the first one that it finds.
+

                OPTIONS

                +       The -h option can be helpful  to  observe  where  toe  is  looking  for
+       terminal  descriptions.   Other options support maintainers of terminfo
+       terminal descriptions.
 
-              If the -s is also given,  toe  adds  a  column  to  the  report,
-              showing (like conflict(1)) which entries which belong to a given
-              terminal database.  An "*" marks entries which differ,  and  "+"
-              marks equivalent entries.
+       -a       lists entries from  all  terminal  database  directories  that
+                terminfo  would  search,  instead  of  only  the first that it
+                finds.
 
-              Without  the -s option, toe does not attempt to merge duplicates
-              in its report
+                If  -s  is  also  given,  toe   additionally   reports,   like
+                conflict(1),  which  entries  correspond  to  a given terminal
+                database.  An "*" marks entries that  differ,  and  "+"  marks
+                equivalent entries.
 
-       -s     sort the output by the entry names.
+                Without   the  -s  option,  toe  does  not  attempt  to  merge
+                duplicates in its report.
 
-       -u file
-              says  to  write  a  report  to  the  standard  output,   listing
-              dependencies  in  the  given  terminfo/termcap source file.  The
-              report condenses the "use" relation: each line consists  of  the
-              primary  name  of a terminal that has use capabilities, followed
-              by a colon, followed by the whitespace-separated  primary  names
-              of all terminals which occur in those use capabilities, followed
-              by a newline
+       -h       writes a heading naming each directory as it is accessed.
 
-       -U file
-              says to write a report to the standard output,  listing  reverse
-              dependencies  in  the  given  terminfo/termcap source file.  The
-              report reverses the "use" relation: each line  consists  of  the
-              primary  name  of  a  terminal  that occurs in use capabilities,
-              followed  by  a  colon,  followed  by  the  whitespace-separated
-              primary names of all terminals which depend on it, followed by a
-              newline.
+       -s       sorts the output by the entry names.
 
-       -vn    specifies that (verbose) output be written  to  standard  error,
-              showing toe's progress.
+       -u file  lists terminal type dependencies in  file,  a  terminfo  entry
+                source  or  termcap  database file.  The report summarizes the
+                "use"  (terminfo)  and  tc  (termcap)  relations:  each   line
+                comprises the primary name of a terminal type employing use/tc
+                capabilities, a colon, a  space-  and  tab-separated  list  of
+                primary names of terminal types thus named, and a newline.
 
-              The  optional  parameter n is a number from 1 to 10, interpreted
-              as for tic(1m).  If ncurses is built  without  tracing  support,
-              the optional parameter is ignored.
+       -U file  lists  terminal  type reverse dependencies in file, a terminfo
+                entry source or termcap database file.  The report  summarizes
+                the  "use" (terminfo) and tc (termcap) reverse relations: each
+                line comprises the primary name of a terminal  type  occurring
+                in  use/tc  capabilities,  a colon, a space- and tab-separated
+                list of primary names of terminal types naming them thus,  and
+                a newline.
 
-       -V     reports  the  version of ncurses which was used in this program,
-              and exits.
+       -v [n]   reports  verbose  status  information  to  the  standard error
+                stream, showing toe's progress.
 
+                The optional parameter n  is  an  integer  between  1  and  10
+                inclusive,  interpreted  as  for tic(1m).  If ncurses is built
+                without tracing support, n is ignored.
 
-

                EXAMPLES

                -       Without sorting, the -a option reports all of the names found in all of
-       the   terminal  databases  found  by  the  TERMINFO  and  TERMINFO_DIRS
-       environment variables:
-
-           MtxOrb162      16x2 Matrix Orbital LCD display
-           MtxOrb204      20x4 Matrix Orbital LCD display
-           MtxOrb         Generic Matrix Orbital LCD display
-           qvt101+        qume qvt 101 PLUS product
-           qvt119+-25     QVT 119 PLUS with 25 data lines
-           qansi-g        QNX ANSI
-           qvt103         qume qvt 103
-           qnxw           QNX4 windows
-           qansi-w        QNX ansi for windows
-           qnxm           QNX4 with mouse events
-           qvt203-25-w    QVT 203 PLUS with 25 by 132 columns
-           qansi-t        QNX ansi without console writes
-           . . .
-
-       Use the -a  and  -s  options  together  to  show  where  each  terminal
-       description was found:
-
-           --> /usr/local/ncurses/share/terminfo
-           ----> /usr/share/terminfo
-           *-+-:     9term          Plan9 terminal emulator for X
-           *---:     Eterm          Eterm with xterm-style color support (X Window System)
-           *-*-:     Eterm-256color Eterm with xterm 256-colors
-           *-*-:     Eterm-88color  Eterm with 88 colors
-           *-+-:     MtxOrb         Generic Matrix Orbital LCD display
-           *-+-:     MtxOrb162      16x2 Matrix Orbital LCD display
-           *-+-:     MtxOrb204      20x4 Matrix Orbital LCD display
-           *-*-:     NCR260VT300WPP NCR 2900_260 vt300 wide mode pc+  kybd
-           *-+-:     aaa            ann arbor ambassador/30 lines
-           *-+-:     aaa+dec        ann arbor ambassador in dec vt100 mode
-           *-+-:     aaa+rv         ann arbor ambassador in reverse video
-           . . .
+       -V       reports the version of ncurses associated  with  this  program
+                and exits with a successful status.

                FILES

                -       /usr/share/terminfo/?/*
-            Compiled terminal description database.
+       /usr/share/terminfo
+              compiled terminal description database
+
+
+

                PORTABILITY

                +       toe  is  not provided by other implementations.  There is no applicable
+       X/Open or POSIX standard for it.

                HISTORY

                -       This  utility  is  not  provided by other implementations.  There is no
-       relevant X/Open or POSIX standard for toe.
+       toe replaces a -T option that was  briefly  supported  by  the  ncurses
+       infocmp utility in 1995.
 
-       The program name refers to a developer's pun:
+       The -a and -s options were added in 2006 and 2011, respectively.
+
+       The program's name originates with a developer's pun:
 
        o   tic,
 
@@ -160,31 +137,66 @@ 
                toe 1m
                
 
        o   toe.
 
-       It replaced a -T option which was  briefly  supported  by  the  ncurses
-       infocmp utility in 1995.
 
-       The  -a  and -s options were added to toe several years later (2006 and
-       2011, respectively).
+

                EXAMPLES

                +       When  not  sorting with the -s option, the -a option reports all of the
+       names found in all of the terminal database directories  named  in  the
+       TERMINFO and TERMINFO_DIRS environment variables.
+
+           xterm-color     generic color xterm
+           xterm-xfree86   xterm terminal emulator (XFree86)
+           xterm-vt220     xterm emulating vt220
+           xterm-256color  xterm with 256 colors
+           xterm-r6        xterm X11R6 version
+           xterm-r5        xterm R5 version
+           xterm-mono      monochrome xterm
+           xterm           xterm terminal emulator (X Window System)
+           vt220           dec vt220
+           vt102           dec vt102
+           vt100           dec vt100 (w/advanced video)
+           vt52            dec vt52
+           ...
+
+       Use  the  -a  and  -s  options  together  to  show  where each terminal
+       description was found.
+
+           --> /etc/terminfo
+           ----> /lib/terminfo
+           ------> /usr/share/terminfo
+
+           --*---: vt100           dec vt100 (w/advanced video)
+           --*---: vt102           dec vt102
+           --*---: vt220           dec vt220
+           --*---: vt52            dec vt52
+           --*---: xterm           xterm terminal emulator (X Window System)
+           --*---: xterm-256color  xterm with 256 colors
+           --*---: xterm-color     generic color xterm
+           --*---: xterm-mono      monochrome xterm
+           --*---: xterm-r5        xterm R5 version
+           --*---: xterm-r6        xterm X11R6 version
+           --*---: xterm-vt220     xterm emulating vt220
+           --*---: xterm-xfree86   xterm terminal emulator (XFree86)
+           ...

                SEE ALSO

                        captoinfo(1m),   infocmp(1m),   infotocap(1m),   tic(1m),   curses(3x),
-       terminfo(5).
+       terminfo(5)
 
-       This describes ncurses version 6.4 (patch 20230311).
 
 
-
-                                                                       toe(1m)
+ncurses 6.5                       2025-02-15                           toe(1m)
                diff --git a/doc/html/man/tput.1.html b/doc/html/man/tput.1.html index c4916439..83fad03c 100644 --- a/doc/html/man/tput.1.html +++ b/doc/html/man/tput.1.html @@ -1,7 +1,7 @@ -tput 1 +tput 1 2025-03-01 ncurses 6.5 User commands -

                tput 1

                +

                tput 1 2025-03-01 ncurses 6.5 User commands

                -tput(1)                     General Commands Manual                    tput(1)
+tput(1)                          User commands                         tput(1)

                NAME

                -       tput, reset - initialize a terminal or query terminfo database
+       tput - initialize a terminal, exercise its capabilities, or query term-
+       info database

                SYNOPSIS

                -       tput [-Ttype] capname [parameters]
-       tput [-Ttype] [-x] clear
-       tput [-Ttype] init
-       tput [-Ttype] reset
-       tput [-Ttype] longname
-       tput -S  <<
-       tput -V
+       tput [-v] [-T terminal-type] {cap-code [parameter ...]} ...
 
+       tput [-v] [-T terminal-type] [-x] clear
 
-

                DESCRIPTION

                -       The  tput  utility  uses  the  terminfo  database to make the values of
-       terminal-dependent capabilities and information available to the  shell
-       (see  sh(1)),  to  initialize or reset the terminal, or return the long
-       name of the requested terminal  type.   The  result  depends  upon  the
-       capability's type:
-
-          string
-               tput  writes  the  string  to the standard output.  No trailing
-               newline is supplied.
+       tput [-v] [-T terminal-type] init
 
-          integer
-               tput writes the decimal value to the standard  output,  with  a
-               trailing newline.
+       tput [-v] [-T terminal-type] reset
 
-          boolean
-               tput  simply sets the exit code (0 for TRUE if the terminal has
-               the capability, 1 for FALSE if it does not), and writes nothing
-               to the standard output.
-
-       Before  using  a value returned on the standard output, the application
-       should test the exit code (e.g., $?, see sh(1)) to be  sure  it  is  0.
-       (See  the EXIT CODES and DIAGNOSTICS sections.)  For a complete list of
-       capabilities and the capname associated with each, see terminfo(5).
+       tput [-v] [-T terminal-type] longname
 
+       tput [-v] -S
 
-

                Options

                -       -S     allows more than one capability per  invocation  of  tput.   The
-              capabilities  must  be  passed  to  tput from the standard input
-              instead of from  the  command  line  (see  example).   Only  one
-              capname  is allowed per line.  The -S option changes the meaning
-              of the 0 and 1 boolean and string exit codes (see the EXIT CODES
-              section).
+       tput [-v] -V
 
-              Because  some capabilities may use string parameters rather than
-              numbers, tput uses a table and the presence of parameters in its
-              input  to  decide whether to use tparm(3x), and how to interpret
-              the parameters.
 
-       -Ttype indicates  the  type  of  terminal.   Normally  this  option  is
-              unnecessary,  because  the default is taken from the environment
-              variable TERM.  If -T is specified,  then  the  shell  variables
-              LINES and COLUMNS will also be ignored.
+

                DESCRIPTION

                +       tput uses the terminfo library and database to  make  terminal-specific
+       capabilities  and  information available to the shell, to initialize or
+       reset the terminal, or to report  a  description  of  the  current  (or
+       specified)  terminal  type.  Terminal capabilities are accessed by cap-
+       code.
 
-       -V     reports  the  version of ncurses which was used in this program,
-              and exits.
+       terminfo(5) discusses terminal capabilities at length  and  presents  a
+       complete list of standard cap-codes.
 
-       -x     do not attempt to clear the terminal's scrollback  buffer  using
-              the extended "E3" capability.
+       When   retrieving  capability  values,  the  result  depends  upon  the
+       capability's type.
 
+       Boolean  tput sets its exit status to 0 if the terminal possesses  cap-
+                code, and 1 if it does not.
 
-

                Commands

                -       A few commands (init, reset and longname) are special; they are defined
-       by the tput program.  The others are the names of capabilities from the
-       terminal  database  (see  terminfo(5)  for  a list).  Although init and
-       reset resemble capability names,  tput  uses  several  capabilities  to
-       perform these special functions.
+       numeric  tput  writes  cap-code's  decimal value to the standard output
+                stream if defined (-1 if it is not) followed by a newline.
 
-       capname
-              indicates the capability from the terminal database.
+       string   tput writes cap-code's value to the standard output stream  if
+                defined, without a trailing newline.
 
-              If  the  capability  is  a  string  that  takes  parameters, the
-              arguments following the capability will be  used  as  parameters
-              for the string.
+       Before  using  a value returned on the standard output, the application
+       should test tput 's exit status to be sure it is 0; see  section  "EXIT
+       STATUS" below.
 
-              Most  parameters  are numbers.  Only a few terminal capabilities
-              require string parameters; tput uses a table to decide which  to
-              pass  as  strings.   Normally tput uses tparm(3x) to perform the
-              substitution.  If no parameters are given  for  the  capability,
-              tput writes the string without performing the substitution.
 
-       init   If  the terminal database is present and an entry for the user's
-              terminal exists (see -Ttype, above), the following will occur:
+

                Operands

                +       Generally,  an  operand  is  a  cap-code,  a  capability  code from the
+       terminal database, or a parameter thereto.  Three others are  specially
+       recognized by tput: init, reset, and longname.  Although these resemble
+       capability codes, they in fact receive special handling; we  term  them
+       "pseudo-capabilities".
 
-              (1)  first, tput retrieves the current  terminal  mode  settings
-                   for your terminal.  It does this by successively testing
+       cap-code   indicates a capability from the terminal database.
 
-                   o   the standard error,
+                  If  cap-code  is  of  string type and takes parameters, tput
+                  interprets arguments following cap-code as  the  parameters,
+                  up to the (fixed) quantity the capability requires.
 
-                   o   standard output,
+                  Most   parameters   are   numeric.    Only  a  few  terminal
+                  capabilities require string parameters; tput uses a table to
+                  decide  which  to  pass  as  strings.   Normally  tput  uses
+                  tparm(3x) to perform the substitution.  If no parameters are
+                  given  for  the  capability,  tput writes the string without
+                  performing the substitution.
 
-                   o   standard input and
+       init       initializes the  terminal.   If  the  terminal  database  is
+                  present  and  an  entry for the user's terminal type exists,
+                  the following occur.
 
-                   o   ultimately "/dev/tty"
+                  (1)  tput  retrieves  the  terminal's  mode  settings.    It
+                       successively  tests  the file descriptors corresponding
+                       to
 
-                   to   obtain  terminal  settings.   Having  retrieved  these
-                   settings, tput remembers which file descriptor to use  when
-                   updating settings.
+                       o   the standard error stream,
 
-              (2)  if  the  window  size cannot be obtained from the operating
-                   system, but the terminal description (or environment, e.g.,
-                   LINES  and  COLUMNS  variables  specify  this),  update the
-                   operating system's notion of the window size.
+                       o   the standard output stream,
 
-              (3)  the terminal modes will be updated:
+                       o   the standard input stream, and
 
-                   o   any delays (e.g., newline) specified in the entry  will
-                       be set in the tty driver,
+                       o   /dev/tty
 
-                   o   tabs  expansion  will  be turned on or off according to
-                       the specification in the entry, and
+                       to obtain terminal settings.   Having  retrieved  them,
+                       tput  remembers  which  descriptor  to  use for further
+                       updates.
 
-                   o   if tabs are not expanded, standard  tabs  will  be  set
-                       (every 8 spaces).
+                  (2)  If the terminal dimensions cannot be obtained from  the
+                       operating  system, but the environment or terminal type
+                       database  entry  describes  them,  tput   updates   the
+                       operating system's notion of them.
 
-              (4)  if  present,  the terminal's initialization strings will be
-                   output as detailed in the terminfo(5) section on  Tabs  and
-                   Initialization,
+                  (3)  tput updates the terminal modes.
 
-              (5)  output is flushed.
+                       o   Any  delays  specified  in  the entry (for example,
+                           when a newline is sent) are  set  in  the  terminal
+                           driver.
 
-              If  an  entry does not contain the information needed for any of
-              these activities, that activity will silently be skipped.
+                       o   Tab   expansion   is  turned  on  or  off  per  the
+                           specification in the entry, and
 
-       reset  This is similar to init, with two differences:
+                       o   if tabs are not expanded, standard  tabs  (every  8
+                           spaces) are set.
 
-              (1)  before any other initialization, the terminal modes will be
-                   reset to a "sane" state:
+                  (4)  If  initialization capabilities, detailed in subsection
+                       "Tabs and Initialization" of terminfo(5), are  present,
+                       tput writes them to the standard output stream.
 
-                   o   set cooked and echo modes,
+                  (5)  tput flushes the standard output stream.
 
-                   o   turn off cbreak and raw modes,
+                  If  an  entry  lacks  the information needed for an activity
+                  above, that activity is silently skipped.
 
-                   o   turn on newline translation and
+       reset      re-initializes  the  terminal.    A   reset   differs   from
+                  initialization in two ways.
 
-                   o   reset  any  unset  special  characters to their default
-                       values
+                  (1)  tput sets the terminal modes to a "sane" state,
 
-              (2)  Instead  of  putting  out   initialization   strings,   the
-                   terminal's  reset  strings  will be output if present (rs1,
-                   rs2, rs3, rf).  If the reset strings are not  present,  but
-                   initialization strings are, the initialization strings will
-                   be output.
+                       o   enabling canonical ("cooked") and echo modes,
 
-              Otherwise, reset acts identically to init.
+                       o   disabling cbreak and raw modes,
 
-       longname
-              If the terminal database is present and an entry for the  user's
-              terminal  exists  (see  -Ttype above), then the long name of the
-              terminal will be put out.  The long name is the last name in the
-              first  line  of  the  terminal's  description  in  the  terminfo
-              database [see term(5)].
+                       o   enabling newline translation, and
 
+                       o   setting  any  special  input  characters  to  their
+                           default values.
 
-

                Aliases

                -       tput handles the clear, init and reset commands  specially:  it  allows
-       for the possibility that it is invoked by a link with those names.
+                  (2)  If any reset capabilities are defined for the  terminal
+                       type,   tput   writes   them   to  the  output  stream.
+                       Otherwise,  tput  uses   any   defined   initialization
+                       capabilities.    Reset  capabilities  are  detailed  in
+                       subsection "Tabs and Initialization" of terminfo(5).
 
-       If  tput  is invoked by a link named reset, this has the same effect as
-       tput reset.  The  tset(1)  utility  also  treats  a  link  named  reset
-       specially.
+       longname   A terminfo entry begins with one or more names by  which  an
+                  application  can  refer  to  the  entry,  before the list of
+                  terminal capabilities.   The  names  are  separated  by  "|"
+                  characters.   X/Open  Curses  terms  the last name the "long
+                  name", and indicates that it may include blanks.
 
-       Before ncurses 6.1, the two utilities were different from each other:
+                  tic warns if the last  name  does  not  include  blanks,  to
+                  accommodate  old terminfo entries that treated the long name
+                  as an optional feature.  The long name is often referred  to
+                  as the description field.
 
-       o   tset  utility  reset the terminal modes and special characters (not
-           done with tput).
+                  If  the  terminal  database  is present and an entry for the
+                  user's terminal type exists, tput reports its description to
+                  the standard output stream, without a trailing newline.  See
+                  terminfo(5).
 
-       o   On the other hand, tset's repertoire of terminal  capabilities  for
-           resetting  the terminal was more limited, i.e., only reset_1string,
-           reset_2string and reset_file  in  contrast  to  the  tab-stops  and
-           margins which are set by this utility.
+       Note: Redirecting the output of "tput init" or "tput reset" to  a  file
+       will capture only part of their actions.  Changes to the terminal modes
+       are not affected by file descriptor  redirection,  since  the  terminal
+       modes are altered via ioctl(2).
 
-       o   The  reset  program  is  usually an alias for tset, because of this
-           difference with resetting terminal modes and special characters.
 
-       With the changes made for ncurses 6.1, the reset  feature  of  the  two
-       programs is (mostly) the same.  A few differences remain:
+

                Aliases

                +       If  tput  is  invoked  via  link  with any of the names clear, init, or
+       reset, it operates as if run with the corresponding (pseudo-)capability
+       operand.  For example, executing a link named reset that points to tput
+       has the same effect as "tput reset".
 
-       o   The  tset  program  waits  one  second  when  resetting, in case it
-           happens to be a hardware terminal.
+       This feature was introduced by ncurses 5.2 in 2000.  It is rarely used.
 
-       o   The two programs  write  the  terminal  initialization  strings  to
-           different  streams  (i.e.,  the  standard  error  for  tset and the
-           standard output for tput).
+       clear  is a separate program, which is both smaller and more frequently
+              executed.
 
-           Note:  although  these  programs  write   to   different   streams,
-           redirecting  their output to a file will capture only part of their
-           actions.  The changes to the terminal modes  are  not  affected  by
-           redirecting the output.
+       init   has the same name as another program in widespread use.
 
-       If  tput  is  invoked by a link named init, this has the same effect as
-       tput init.  Again, you are less likely to use that link because another
-       program named init has a more well-established use.
+       reset  is  provided  by  the  tset(1)  utility  (also  via a link named
+              reset).

                Terminal Size

                -       Besides  the  special  commands  (e.g.,  clear),  tput  treats  certain
-       terminfo  capabilities  specially:  lines   and   cols.    tput   calls
-       setupterm(3x) to obtain the terminal size:
+       Besides the pseudo-capabilities (such as init), tput treats  the  lines
+       and  cols  cap-codes specially: it may call setupterm(3x) to obtain the
+       terminal size.
 
-       o   first, it gets the size from the terminal database (which generally
-           is not provided for terminal emulators which do not  have  a  fixed
-           window size)
+       o   First, tput attempts to obtain these capabilities from the terminal
+           database.   This generally fails for terminal emulators, which lack
+           a fixed window size and thus omit the capabilities.
 
-       o   then  it  asks  the operating system for the terminal's size (which
-           generally works, unless connecting via a serial line which does not
-           support NAWS: negotiations about window size).
+       o   It then asks the operating system for the  terminal's  size,  which
+           generally  works,  unless  the connection is via a serial line that
+           does not support "NAWS": negotiations about window size.
 
-       o   finally,  it  inspects  the environment variables LINES and COLUMNS
+       o   Finally, it inspects the environment variables LINES  and  COLUMNS,
            which may override the terminal size.
 
-       If the -T option is given tput ignores  the  environment  variables  by
-       calling   use_tioctl(TRUE),  relying  upon  the  operating  system  (or
-       finally, the terminal database).
+       If  the  -T  option is given, tput ignores the environment variables by
+       calling  use_tioctl(TRUE),  relying  upon  the  operating  system  (or,
+       ultimately, the terminal database).
 
 
-

                EXAMPLES

                -       tput init
-            Initialize the terminal according to the type of terminal  in  the
-            environmental  variable  TERM.  This command should be included in
-            everyone's .profile after the environmental variable TERM has been
-            exported, as illustrated on the profile(5) manual page.
+

                OPTIONS

                +       -S       retrieves  more  than  one  capability per invocation of tput.
+                The capabilities must be passed  to  tput  from  the  standard
+                input  stream  instead  of  from the command line (see section
+                "EXAMPLES" below).  Only one cap-code  is  allowed  per  line.
+                The  -S  option  changes  the  meanings  of  the  0 and 1 exit
+                statuses (see section "EXIT STATUS" below).
 
-       tput -T5620 reset
-            Reset  an  AT&T  5620 terminal, overriding the type of terminal in
-            the environmental variable TERM.
+                Some capabilities use string parameters  rather  than  numeric
+                ones.   tput  employs  a  built-in  table  and the presence of
+                parameters in its input to decide how to interpret  them,  and
+                whether to use tparm(3x).
 
-       tput cup 0 0
-            Send the sequence to move the cursor to row 0, column 0 (the upper
-            left  corner  of  the  screen,  usually known as the "home" cursor
-            position).
+       -T type  indicates  the  terminal's  type.   Normally  this  option  is
+                unnecessary,  because  a  default  is  taken  from  the   TERM
+                environment variable.  If specified, the environment variables
+                LINES and COLUMNS are also ignored.
 
-       tput clear
-            Echo the clear-screen sequence for the current terminal.
+       -v       causes tput to operate verbosely, reporting warnings.
 
-       tput cols
-            Print the number of columns for the current terminal.
+       -V       reports the version of ncurses associated with tput, and exits
+                with a successful status.
 
-       tput -T450 cols
-            Print the number of columns for the 450 terminal.
+       -x       prevents  "tput clear" from attempting to clear the scrollback
+                buffer.
 
-       bold=`tput smso` offbold=`tput rmso`
-            Set the shell variables bold, to begin  stand-out  mode  sequence,
-            and  offbold,  to  end  standout  mode  sequence,  for the current
-            terminal.  This might be followed by a prompt: echo "${bold}Please
-            type in your name: ${offbold}\c"
 
-       tput hc
-            Set  exit  code to indicate if the current terminal is a hard copy
-            terminal.
+

                EXIT STATUS

                +       Normally, one should interpret tput's exit statuses as follows.
 
-       tput cup 23 4
-            Send the sequence to move the cursor to row 23, column 4.
+       Status   Meaning When -S Not Specified
+       ------------------------------------------------------------------------
+       0        Boolean or string capability present
+       1        Boolean or numeric capability absent
+       2        usage error or no terminal type specified
+       3        unrecognized terminal type
+       4        unrecognized capability code
+       >4       system error (4 + errno)
 
-       tput cup
-            Send the terminfo string for cursor-movement, with  no  parameters
-            substituted.
+       When the -S option is used, some statuses change meanings.
 
-       tput longname
-            Print  the  long  name  from the terminfo database for the type of
-            terminal specified in the environmental variable TERM.
+       Status   Meaning When -S Specified
+       ------------------------------------------------------------------------
+       0        all operands interpreted
+       1        unused
+       4        some operands not interpreted
+
+
+

                ENVIRONMENT

                +       tput reads up to three environment variables if the -T  option  is  not
+       specified.
 
-            tput -S <<!
-            > clear
-            > cup 10 10
-            > bold
-            > !
+       COLUMNS  specifies the width of the screen in characters.
 
-            This example shows tput processing  several  capabilities  in  one
-            invocation.   It  clears  the screen, moves the cursor to position
-            10, 10 and turns  on  bold  (extra  bright)  mode.   The  list  is
-            terminated by an exclamation mark (!) on a line by itself.
+       LINES    specifies the height of the screen in characters.
+
+       TERM     denotes  the  terminal  type.  Each terminal type is distinct,
+                though many are similar.

                FILES

                -       /usr/share/terminfo
+       /usr/share/tabset
+              tab stop initialization database
+
+       /usr/share/terminfo
               compiled terminal description database
 
-       /usr/share/tabset/*
-              tab  settings  for some terminals, in a format appropriate to be
-              output to the terminal (escape sequences that  set  margins  and
-              tabs);  for  more  information, see the Tabs and Initialization,
-              section of terminfo(5)
 
+

                PORTABILITY

                +       Over time ncurses tput has  differed  from  that  of  System V  in  two
+       important respects, one now mostly historical.
 
-

                EXIT CODES

                -       If the -S option is used, tput checks for errors from each line, and if
-       any  errors  are  found, will set the exit code to 4 plus the number of
-       lines with errors.  If no errors are found, the exit  code  is  0.   No
-       indication  of which line failed can be given so exit code 1 will never
-       appear.  Exit codes 2, 3, and 4 retain their usual interpretation.   If
-       the  -S  option  is  not  used,  the  exit  code depends on the type of
-       capname:
+       o   "tput  cap-code" writes to the standard output, which need not be a
+           terminal device.  However, the operands  that  manipulate  terminal
+           modes might not use the standard output.
 
-          boolean
-                 a value of 0 is set for TRUE and 1 for FALSE.
+           System V  tput's  init  and  reset  operands use logic from 4.1cBSD
+           tset,  manipulating  terminal  modes.   It  checks  the  same  file
+           descriptors  (and  /dev/tty) for association with a terminal device
+           as ncurses now does, and if none are, finally assumes a  1200  baud
+           terminal.  When updating terminal modes, it ignores errors.
 
-          string a value of 0 is set  if  the  capname  is  defined  for  this
-                 terminal  type  (the value of capname is returned on standard
-                 output); a value of 1 is set if capname is  not  defined  for
-                 this terminal type (nothing is written to standard output).
+           Until  ncurses  6.1  (see  section  "HISTORY"  below), tput did not
+           modify  terminal  modes.   It  now  employs  a  scheme  similar  to
+           System V, using functions shared with tset (and ultimately based on
+           4.4BSD tset).  If it is not able to open a terminal (for  instance,
+           when run by cron(1)), tput exits with an error status.
 
-          integer
-                 a value of 0 is always set, whether or not capname is defined
-                 for this terminal type.  To determine if capname  is  defined
-                 for  this terminal type, the user must test the value written
-                 to standard output.  A value of -1 means that capname is  not
-                 defined for this terminal type.
+       o   System V  tput  assumes  that  the  type  of  a cap-code operand is
+           numeric if all the characters of its value are decimal numbers;  if
+           they are not, it treats cap-code as a string capability.
 
-          other  reset  or  init  may fail to find their respective files.  In
-                 that case, the exit code is set to 4 + errno.
+           Most implementations that provide support for cap-code operands use
+           the tparm(3x) function to expand  its  parameters.   That  function
+           expects  a mixture of numeric and string parameters, requiring tput
+           to know which type to use.
+
+           ncurses tput uses a table to determine the parameter types for  the
+           standard  cap-code  operands,  and  an internal function to analyze
+           nonstandard cap-code operands.
+
+           While more reliable than System V's utility, a portability  problem
+           is  introduced  by this analysis.  An OpenBSD developer adapted the
+           internal library function from ncurses to  port  NetBSD's  termcap-
+           based  tput to terminfo, and modified it to interpret multiple cap-
+           codes (and parameters) on the command line.  Portable  applications
+           should  not  rely  upon  this feature; ncurses offers it to support
+           applications written specifically for OpenBSD.
+
+       This implementation, unlike others, accepts both termcap  and  terminfo
+       cap-codes  if  termcap  support is compiled in.  In that case, however,
+       the predefined termcap and terminfo codes have two ambiguities; ncurses
+       assumes the terminfo code.
+
+       o   The  cap-code  dl means delete_line to termcap but parm_delete_line
+           to terminfo.  termcap uses the code DL for parm_delete_line.  term-
+           info uses the code dl1 for delete_line.
+
+       o   The  cap-code  ed  means exit_delete_mode to termcap but clr_eos to
+           terminfo.  termcap uses the code cd for clr_eos.  terminfo uses the
+           code rmdc for exit_delete_mode.
+
+       The   longname  operand,  -S  option,  and  the  parameter-substitution
+       features used in the cup example below, were not supported in  AT&T/USL
+       curses before SVr4 (1989).  Later, 4.3BSD-Reno (1990) added support for
+       longname,  and  in  1994,  NetBSD  added  support  for  the  parameter-
+       substitution features.
+
+       IEEE   Std   1003.1/The   Open   Group   Base   Specifications  Issue 7
+       (POSIX.1-2008) documents only the clear, init, and reset  operands.   A
+       few observations of interest arise from that selection.
+
+       o   ncurses supports clear as it does any other standard cap-code.  The
+           others  (init  and  longname)  do  not   correspond   to   terminal
+           capabilities.
 
-       Any other exit code indicates an error; see the DIAGNOSTICS section.
+       o   The  tput on SVr4-based systems such as Solaris, IRIX64, and HP-UX,
+           as well as others such as AIX and Tru64, also support standard cap-
+           code operands.
 
+       o   A few platforms such as FreeBSD recognize termcap codes rather than
+           terminfo capability codes in their respective tput commands.  Since
+           2010,  NetBSD's  tput  uses  terminfo codes.  Before that, it (like
+           FreeBSD) recognized termcap codes.
 
-

                DIAGNOSTICS

                -       tput prints the following error messages  and  sets  the  corresponding
-       exit codes.
+           Beginning in 2021, FreeBSD uses ncurses tput, configured  for  both
+           terminfo (tested first) and termcap (as a fallback).
 
-       exit code   error message
-       ---------------------------------------------------------------------
-       0           (capname  is a numeric variable that is not specified in
-                   the terminfo(5) database for this  terminal  type,  e.g.
-                   tput -T450 lines and tput -Thp2621 xmc)
-       1           no error message is printed, see the EXIT CODES section.
-       2           usage error
-       3           unknown terminal type or no terminfo database
-       4           unknown terminfo capability capname
-       >4          error occurred in -S
-       ---------------------------------------------------------------------
+       Because (apparently) all certified Unix systems support the full set of
+       capability codes, the reason for documenting only  a  few  may  not  be
+       apparent.
+
+       o   X/Open Curses Issue 7 documents tput differently, with cap-code and
+           the other features used in this implementation.
+
+       o   That is, there are two standards for tput:  POSIX  (a  subset)  and
+           X/Open  Curses (the full implementation).  POSIX documents a subset
+           to avoid the  complication  of  including  X/Open  Curses  and  the
+           terminal capability database.
+
+       o   While  it  is  certainly  possible  to write a tput program without
+           using curses, no system with a  curses  implementation  provides  a
+           tput utility that does not also support standard cap-codes.
+
+       X/Open   Curses  Issue 7  (2009)  is  the  first  version  to  document
+       utilities.  However that part of X/Open Curses does not follow existing
+       practice (that is, System V curses behavior).
+
+       o   It  assigns  exit status 4 to "invalid operand", which may have the
+           same meaning as "unknown capability".   For  instance,  the  source
+           code for Solaris xcurses uses the term "invalid" in this case.
+
+       o   It  assigns  exit  status  255  to  a  numeric variable that is not
+           specified in the terminfo database.  That likely is a documentation
+           error,  mistaking  the  "-1"  written  to  the  standard  output to
+           indicate an absent or canceled numeric capability for an (unsigned)
+           exit status.
+
+       The various System V implementations (AIX, HP-UX, Solaris) use the same
+       exit statuses as ncurses.
+
+       NetBSD curses  documents  exit  statuses  that  correspond  to  neither
+       ncurses nor X/Open Curses.

                HISTORY

                -       The  tput  command  was begun by Bill Joy in 1980.  The initial version
-       only cleared the screen.
+       Bill  Joy  wrote  a  tput command during development of 4BSD in October
+       1980.  This initial version only cleared the screen, and did  not  ship
+       with official distributions.
 
-       AT&T System V provided a different tput command:
+       System V developed a different tput command.
 
-       o   SVr2 provided  a  rudimentary  tput  which  checked  the  parameter
-           against  each  predefined capability and returned the corresponding
-           value.  This  version  of  tput  did  not  use  tparm(3x)  for  the
-           capabilities which are parameterized.
+       o   SVr2  (1984) provided a rudimentary tput that checked the parameter
+           against each predefined capability and returned  the  corresponding
+           value.    This   version   of   tput  did  not  use  tparm(3x)  for
+           parameterized capabilities.
 
-       o   SVr3 replaced that, a year later, by a more extensive program whose
-           init and reset  subcommands  (more  than  half  the  program)  were
-           incorporated  from  the  reset  feature of BSD tset written by Eric
-           Allman.
+       o   SVr3 (1987) replaced that  with  a  more  extensive  program  whose
+           support  for  init  and reset operands (more than half the program)
+           incorporated the reset feature of BSD tset written by Eric Allman.
 
-       o   SVr4 added color initialization using the orig_colors and orig_pair
-           capabilities in the init subcommand.
+       o   SVr4 (1989) added color initialization  by  using  the  orig_colors
+           (oc) and orig_pair (op) capabilities in its init logic.
 
-       Keith  Bostic  replaced  the  BSD  tput  command  in  1989  with  a new
-       implementation based on the AT&T System V program tput.  Like the  AT&T
-       program,  Bostic's  version accepted some parameters named for terminfo
-       capabilities (clear, init, longname and reset).   However  (because  he
-       had  only  termcap  available),  it  accepted  termcap  names for other
-       capabilities.  Also, Bostic's BSD tput did not modify the terminal  I/O
-       modes as the earlier BSD tset had done.
+       Keith  Bostic  refactored  BSD tput for shipment in 4.3BSD-Reno (1990),
+       making it follow the interface  of  System V  tput  by  accepting  some
+       parameters  named  for  terminfo  (pseudo-)capabilities:  clear,  init,
+       longname, and reset.  However, because he had only  termcap  available,
+       it  accepted  termcap codes for other capabilities.  Also, Bostic's BSD
+       tput did not modify the terminal modes as  the  earlier  BSD  tset  had
+       done.  At the same time, Bostic added a shell script named "clear" that
+       used  tput  to  clear  the  screen.   These  became  the  "modern"  BSD
+       implementation of tput.
 
-       At the same time, Bostic added a shell script named "clear", which used
-       tput to clear the screen.
+       The  origin of ncurses tput lies outside both System V and BSD, in Ross
+       Ridge's mytinfo package, published  on  comp.sources.unix  in  December
+       1992.   Ridge's  program  made  more  sophisticated use of the terminal
+       capabilities than the BSD program.  Eric Raymond used that tput program
+       (and  other  parts  of mytinfo) in ncurses in June 1995.  Incorporating
+       the portions dealing with terminal capabilities almost without  change,
+       Raymond  made  improvements  to  the  way  command-line parameters were
+       handled.
 
-       Both  of  these  appeared  in  4.4BSD,  becoming   the   "modern"   BSD
-       implementation of tput.
+       Before ncurses 6.1 (2018), its tset and tput utilities differed.
 
-       This  implementation of tput began from a different source than AT&T or
-       BSD: Ross Ridge's mytinfo package, published  on  comp.sources.unix  in
-       December  1992.   Ridge's  program  made  more sophisticated use of the
-       terminal capabilities than the BSD program.   Eric  Raymond  used  that
-       tput  program  (and  other  parts  of mytinfo) in ncurses in June 1995.
-       Using the portions dealing with terminal  capabilities  almost  without
-       change,   Raymond   made  improvements  to  the  way  the  command-line
-       parameters were handled.
+       o   tset was more effective, resetting the terminal's modes and special
+           input characters.
 
+       o   On  the  other hand, tset's repertoire of terminal capabilities for
+           resetting the terminal was more limited; it had only equivalents of
+           reset_1string  (rs1), reset_2string (rs2), and reset_file (rf), and
+           not the tab stop and margin update features of tput.
 
-

                PORTABILITY

                -       This implementation of tput differs from AT&T  tput  in  two  important
-       areas:
+       The reset program is traditionally an alias for tset due to its ability
+       to reset the terminal's modes and special input characters.
 
-       o   tput  capname  writes  to  the standard output.  That need not be a
-           regular  terminal.   However,  the  subcommands  which   manipulate
-           terminal modes may not use the standard output.
+       As  of  ncurses  6.1,  the  "reset"  features  of  the two programs are
+       (mostly) the same.  Two minor differences remain.
 
-           The  AT&T  implementation's  init  and  reset  commands use the BSD
-           (4.1c)  tset  source,  which  manipulates   terminal   modes.    It
-           successively  tries standard output, standard error, standard input
-           before falling back to "/dev/tty" and finally just assumes a 1200Bd
-           terminal.  When updating terminal modes, it ignores errors.
+       o   When issuing a reset, the tset program checks  whether  the  device
+           appears  to  be  a  pseudoterminal  (as might be used by a terminal
+           emulator program), and, if it does not, waits one second in case it
+           is communicating with a hardware terminal.
 
-           Until  changes made after ncurses 6.0, tput did not modify terminal
-           modes.  tput now uses a similar scheme, using functions shared with
-           tset  (and ultimately based on the 4.4BSD tset).  If it is not able
-           to open a terminal, e.g., when running in cron(1), tput will return
-           an error.
+       o   The  two  programs  write  the  terminal  initialization strings to
+           different streams; that is, standard error for  tset  and  standard
+           output for tput.
 
-       o   AT&T tput guesses the type of its capname operands by seeing if all
-           of the characters are numeric, or not.
 
-           Most implementations which provide support for capname operands use
-           the  tparm  function  to  expand  parameters  in it.  That function
-           expects a mixture of numeric and string parameters, requiring  tput
-           to know which type to use.
+

                EXAMPLES

                +       tput init
+              Initialize the terminal according to the type of terminal in the
+              TERM environment variable.  If  the  system  does  not  reliably
+              initialize the terminal upon login, this command can be included
+              in $HOME/.profile after exporting the TERM environment variable.
 
-           This  implementation  uses a table to determine the parameter types
-           for the standard capname operands, and an internal library function
-           to analyze nonstandard capname operands.
-
-           Besides  providing  more  reliable operation than AT&T's utility, a
-           portability problem is introduced  by  this  analysis:  An  OpenBSD
-           developer  adapted  the  internal  library function from ncurses to
-           port NetBSD's  termcap-based  tput  to  terminfo.   That  had  been
-           modified  to  interpret  multiple  commands  on  a  line.  Portable
-           applications should not rely upon this feature; ncurses provides it
-           to support applications written specifically for OpenBSD.
-
-       This  implementation  (unlike  others)  can  accept  both  termcap  and
-       terminfo names for the capname feature, if termcap support is  compiled
-       in.   However,  the  predefined  termcap  and  terminfo  names have two
-       ambiguities in this case (and the terminfo name is assumed):
-
-       o   The termcap name dl corresponds to the terminfo  name  dl1  (delete
-           one line).
-           The  terminfo  name dl corresponds to the termcap name DL (delete a
-           given number of lines).
-
-       o   The termcap name ed corresponds to  the  terminfo  name  rmdc  (end
-           delete mode).
-           The  terminfo  name ed corresponds to the termcap name cd (clear to
-           end of screen).
-
-       The longname and -S options, and  the  parameter-substitution  features
-       used  in  the  cup  example,  were  not  supported in BSD curses before
-       4.3reno (1989) or in AT&T/USL curses before SVr4 (1988).
-
-       IEEE  Std  1003.1/The  Open  Group    Base   Specifications   Issue   7
-       (POSIX.1-2008)  documents  only the operands for clear, init and reset.
-       There are a few interesting observations to make regarding that:
-
-       o   In this implementation, clear is part of the capname support.   The
-           others   (init   and   longname)  do  not  correspond  to  terminal
-           capabilities.
+       tput -T5620 reset
+              Reset an AT&T 5620 terminal, overriding the terminal type in the
+              TERM environment variable.
 
-       o   Other  implementations  of  tput  on  SVr4-based  systems  such  as
-           Solaris,  IRIX64  and  HPUX as well as others such as AIX and Tru64
-           provide support for capname operands.
+       tput cnorm
+              Set cursor to normal visibility.
 
-       o   A few platforms such as FreeBSD recognize termcap names rather than
-           terminfo capability names in their respective tput commands.  Since
-           2010, NetBSD's tput uses terminfo names.   Before  that,  it  (like
-           FreeBSD) recognized termcap names.
+       tput home
+              Move  the  cursor  to line 0, column 0: the upper left corner of
+              the screen, usually known as the "home" cursor position.
 
-           Beginning  in  2021,  FreeBSD uses the ncurses tput, configured for
-           both terminfo (tested first) and termcap (as a fallback).
+       tput clear
+              Clear the screen: write the clear_screen capability's  value  to
+              the standard output stream.
 
-       Because (apparently) all of the certified Unix systems support the full
-       set  of  capability names, the reasoning for documenting only a few may
-       not be apparent.
+       tput cols
+              Report the number of columns used by the current terminal type.
 
-       o   X/Open Curses Issue 7 documents tput differently, with capname  and
-           the other features used in this implementation.
+       tput -Tadm3a cols
+              Report the number of columns used by an ADM-3A terminal.
 
-       o   That  is,  there  are  two standards for tput: POSIX (a subset) and
-           X/Open Curses (the full implementation).  POSIX documents a  subset
-           to  avoid  the  complication  of  including  X/Open  Curses and the
-           terminal capabilities database.
+       strong=`tput smso` normal=`tput rmso`
+              Set  shell variables to capability values: strong and normal, to
+              begin and end, respectively, stand-out mode  for  the  terminal.
+              One might use these to present a prompt.
 
-       o   While it is certainly possible to  write  a  tput  program  without
-           using   curses,   none   of   the   systems  which  have  a  curses
-           implementation provide a tput utility which does  not  provide  the
-           capname feature.
+                     printf "${strong}Username:${normal} "
 
-       X/Open  Curses  Issue  7  (2009)  is  the  first  version  to  document
-       utilities.  However that part of X/Open Curses does not follow existing
-       practice (i.e., Unix features documented in SVID 3):
+       tput hc
+              Indicate  via  exit  status  whether the terminal is a hard copy
+              device.
 
-       o   It  assigns exit code 4 to "invalid operand", which may be the same
-           as unknown capability.  For instance, the source code for  Solaris'
-           xcurses uses the term "invalid" in this case.
+       tput cup 23 4
+              Move the cursor to line 23, column 4.
 
-       o   It  assigns  exit  code  255  to  a  numeric  variable  that is not
-           specified in the terminfo database.  That likely is a documentation
-           error,  confusing  the  -1  written  to  the standard output for an
-           absent or cancelled numeric value versus an (unsigned) exit code.
+       tput cup
+              Report the value of the cursor_address  (cup)  capability  (used
+              for cursor movement), with no parameters substituted.
 
-       The various Unix systems (AIX, HPUX, Solaris) use the  same  exit-codes
-       as ncurses.
+       tput longname
+              Report  the terminfo database's description of the terminal type
+              specified in the TERM environment variable.
 
-       NetBSD curses documents different exit codes which do not correspond to
-       either ncurses or X/Open.
+       tput -S
+              Process multiple capabilities.  The -S option can be  profitably
+              used with a shell "here document".
 
+              $ tput -S <<!
+              > clear
+              > cup 10 10
+              > bold
+              > !
 
-

                SEE ALSO

                -       clear(1), stty(1), tabs(1), tset(1), curs_termcap(3x), terminfo(5).
+              The  foregoing  clears  the screen, moves the cursor to position
+              (10, 10) and turns on bold (extra bright) mode.
 
-       This describes ncurses version 6.4 (patch 20230311).
+       tput clear cup 10 10 bold
+              Perform the same actions as the foregoing "tput -S" example.
 
 
+

                SEE ALSO

                +       clear(1), stty(1), tabs(1), tset(1), curs_termcap(3x), terminfo(5)
+
 
-                                                                       tput(1)
+
+ncurses 6.5                       2025-03-01                           tput(1)
                diff --git a/doc/html/man/tset.1.html b/doc/html/man/tset.1.html index efb6a189..56b0e449 100644 --- a/doc/html/man/tset.1.html +++ b/doc/html/man/tset.1.html @@ -1,6 +1,6 @@ -tset 1 +tset 1 2025-01-18 ncurses 6.5 User commands -

                tset 1

                +

                tset 1 2025-01-18 ncurses 6.5 User commands

                -tset(1)                     General Commands Manual                    tset(1)
+tset(1)                          User commands                         tset(1)

                NAME

                -       tset, reset - terminal initialization
+       tset, reset - initialize or reset terminal state

                SYNOPSIS

                -       tset [-IQVcqrsw] [-] [-e ch] [-i ch] [-k ch] [-m mapping] [terminal]
-       reset [-IQVcqrsw] [-] [-e ch] [-i ch] [-k ch] [-m mapping] [terminal]
+       tset  [-IQVcqrsw]  [-]  [-e ch] [-i ch] [-k ch] [-m mapping] [terminal-
+       type]
+       reset [-IQVcqrsw] [-] [-e ch] [-i ch] [-k ch] [-m  mapping]  [terminal-
+       type]

                DESCRIPTION

                 
-

                tset - initialization

                +

                tset -- initialization

                        This program initializes terminals.
 
        First,  tset  retrieves  the  current  terminal  mode settings for your
@@ -79,63 +81,66 @@ 
                tset 1
                
 
        1. The terminal argument specified on the command line.
 
-       2. The value of the TERM environmental variable.
+       2. The value of the TERM environment variable.
 
        3. (BSD systems only.) The terminal type associated with  the  standard
-       error  output  device  in the /etc/ttys file.  (On System-V-like UNIXes
-       and systems using that convention, getty(1) does this  job  by  setting
-       TERM according to the type passed to it by /etc/inittab.)
-
-       4. The default terminal type, "unknown".
-
-       If  the  terminal  type  was  not specified on the command-line, the -m
-       option mappings are then applied (see the section TERMINAL TYPE MAPPING
-       for  more  information).   Then,  if  the  terminal  type begins with a
-       question mark ("?"), the user  is  prompted  for  confirmation  of  the
-       terminal  type.   An empty response confirms the type, or, another type
-       can be entered to specify a new type.  Once the terminal type has  been
-       determined, the terminal description for the terminal is retrieved.  If
-       no terminal description is found for the type, the user is prompted for
-       another terminal type.
+       error  output  device  in  the  /etc/ttys file.  (On System V hosts and
+       systems using that convention, getty(8) does this job by  setting  TERM
+       according to the type passed to it by /etc/inittab.)
+
+       4.  The  default  terminal  type, "unknown", is not suitable for curses
+       applications.
+
+       If the terminal type was not specified  on  the  command-line,  the  -m
+       option  mappings  are  then  applied;  see  subsection  "Terminal  Type
+       Mapping".  Then, if the terminal  type  begins  with  a  question  mark
+       ("?"),  the user is prompted for confirmation of the terminal type.  An
+       empty response confirms the type, or, another type can  be  entered  to
+       specify  a  new  type.  Once the terminal type has been determined, the
+       terminal description for the terminal is  retrieved.   If  no  terminal
+       description  is  found  for  the type, the user is prompted for another
+       terminal type.
 
        Once the terminal description is retrieved,
 
-       o   if  the  "-w"  option  is  enabled,  tset may update the terminal's
+       o   if the "-w" option is  enabled,  tset  may  update  the  terminal's
            window size.
 
-           If the window size cannot be obtained from  the  operating  system,
-           but  the  terminal  description  (or  environment,  e.g., LINES and
-           COLUMNS variables specify this), use  this  to  set  the  operating
+           If  the  window  size cannot be obtained from the operating system,
+           but the terminal  description  (or  environment,  e.g.,  LINES  and
+           COLUMNS  variables  specify  this),  use  this to set the operating
            system's notion of the window size.
 
-       o   if  the  "-c"  option is enabled, the backspace, interrupt and line
+       o   if the "-c" option is enabled, the backspace,  interrupt  and  line
            kill characters (among many other things) are set
 
-       o   unless  the  "-I"  option  is  enabled,  the   terminal   and   tab
-           initialization  strings  are sent to the standard error output, and
-           tset waits one second (in case a hardware reset was issued).
+       o   unless   the   "-I"   option  is  enabled,  the  terminal  and  tab
+           initialization strings are sent to the standard error output,  and,
+           if  the  terminal device does not appear to be a pseudoterminal (as
+           might be used by a  terminal  emulator  program),  tset  waits  one
+           second in case a hardware reset was issued.
 
-       o   Finally, if the erase, interrupt  and  line  kill  characters  have
-           changed,  or  are not set to their default values, their values are
+       o   Finally,  if  the  erase,  interrupt  and line kill characters have
+           changed, or are not set to their default values, their  values  are
            displayed to the standard error output.
 
 
-

                reset - reinitialization

                +

                reset -- reinitialization

                        When invoked as reset, tset sets the terminal modes to "sane" values:
 
-       o   sets cooked and echo modes,
+       o   sets canonical ("cooked") and echo modes,
 
        o   turns off cbreak and raw modes,
 
        o   turns on newline translation and
 
-       o   resets any unset special characters to their default values
+       o   resets special input characters to their default values
 
        before doing the terminal initialization described above.  Also, rather
-       than  using  the  terminal initialization strings, it uses the terminal
+       than using the terminal initialization strings, it  uses  the  terminal
        reset strings.
 
-       The reset command is useful after a program dies leaving a terminal  in
+       The  reset command is useful after a program dies leaving a terminal in
        an abnormal state:
 
        o   you may have to type
@@ -143,12 +148,76 @@ 
                tset 1
                
                <LF>reset<LF>
 
            (the line-feed character is normally control-J) to get the terminal
-           to work, as carriage-return may no  longer  work  in  the  abnormal
+           to  work,  as  carriage-return  may  no longer work in the abnormal
            state.
 
        o   Also, the terminal will often not echo the command.
 
 
+

                Setting the Environment

                +       It is often desirable to enter the terminal type and information  about
+       the terminal's capabilities into the shell's environment.  This is done
+       using the -s option.
+
+       When the -s option is specified, the commands to enter the  information
+       into  the  shell's  environment are written to the standard output.  If
+       the SHELL environment variable ends in  "csh",  the  commands  are  for
+       csh(1),  otherwise, they are for sh(1).  The csh commands set and unset
+       the shell variable noglob, leaving it unset.  The following line in the
+       .login or .profile files will initialize the environment correctly:
+
+           eval `tset -s options ... `
+
+
+

                Terminal Type Mapping

                +       When  the  terminal  is  not  hardwired into the system (or the current
+       system information is incorrect) the terminal  type  derived  from  the
+       /etc/ttys  file  or  the  TERM  environment variable is often something
+       generic like network, dialup, or unknown.   When  tset  is  used  in  a
+       startup  script  it is often desirable to provide information about the
+       type of terminal used on such ports.
+
+       The -m options maps from some set of conditions  to  a  terminal  type,
+       that is, to tell tset "If I'm on this port at a particular speed, guess
+       that I'm on that kind of terminal".
+
+       The argument to the -m option consists of an  optional  port  type,  an
+       optional  operator,  an  optional  baud rate specification, an optional
+       colon (":") character and a terminal type.  The port type is  a  string
+       (delimited  by  either  the  operator  or  the  colon  character).  The
+       operator may be any combination of ">", "<", "@", and  "!";  ">"  means
+       greater  than,  "<" means less than, "@" means equal to and "!" inverts
+       the sense of the test.  The baud rate is specified as a number  and  is
+       compared  with  the speed of the standard error output (which should be
+       the control terminal).  The terminal type is a string.
+
+       If the terminal type is not specified  on  the  command  line,  the  -m
+       mappings  are  applied to the terminal type.  If the port type and baud
+       rate match the mapping, the terminal  type  specified  in  the  mapping
+       replaces  the current type.  If more than one mapping is specified, the
+       first applicable mapping is used.
+
+       For example, consider the following  mapping:  dialup>9600:vt100.   The
+       port type is dialup , the operator is >, the baud rate specification is
+       9600, and the terminal type is vt100.  The result of this mapping is to
+       specify  that  if  the  terminal  type  is dialup, and the baud rate is
+       greater than 9600 baud, a terminal type of vt100 will be used.
+
+       If no baud rate is specified, the terminal type  will  match  any  baud
+       rate.   If  no port type is specified, the terminal type will match any
+       port type.  For example, -m dialup:vt100  -m  :?xterm  will  cause  any
+       dialup port, regardless of baud rate, to match the terminal type vt100,
+       and any non-dialup port type to match the terminal type ?xterm.   Note,
+       because  of  the  leading  question mark, the user will be queried on a
+       default port as to whether they are actually using an xterm terminal.
+
+       No whitespace characters are  permitted  in  the  -m  option  argument.
+       Also,  to avoid problems with meta-characters, it is suggested that the
+       entire -m option argument be placed within single quote characters, and
+       that   csh   users  insert  a  backslash  character  ("\")  before  any
+       exclamation marks ("!").
+
+

                OPTIONS

                        The options are as follows:
 
@@ -157,7 +226,7 @@ 
                tset 1
                
        -e ch
             Set the erase character to ch.
 
-       -I   Do  not  send  the  terminal  or tab initialization strings to the
+       -I   Do not send the terminal or  tab  initialization  strings  to  the
             terminal.
 
        -i ch
@@ -167,150 +236,87 @@ 
                tset 1
                
             Set the line kill character to ch.
 
        -m mapping
-            Specify a mapping from a port type to a terminal.  See the section
-            TERMINAL TYPE MAPPING for more information.
+            Specify  a  mapping from a port type to a terminal; see subsection
+            "Terminal Type Mapping".
 
-       -Q   Do  not  display any values for the erase, interrupt and line kill
-            characters.   Normally  tset  displays  the  values  for   control
+       -Q   Do not display any values for the erase, interrupt and  line  kill
+            characters.    Normally  tset  displays  the  values  for  control
             characters which differ from the system's default values.
 
-       -q   The  terminal  type  is  displayed to the standard output, and the
-            terminal is not initialized in any way.  The option "-" by  itself
+       -q   The terminal type is displayed to the  standard  output,  and  the
+            terminal  is not initialized in any way.  The option "-" by itself
             is equivalent but archaic.
 
        -r   Print the terminal type to the standard error output.
 
        -s   Print the sequence of shell commands to initialize the environment
-            variable TERM to the standard output.  See the section SETTING THE
-            ENVIRONMENT for details.
+            variable  TERM to the standard output; see subsection "Setting the
+            Environment".
 
-       -V   reports the version of ncurses which was used in this program, and
+       -V   reports the version of ncurses which was used in this program, and
             exits.
 
-       -w   Resize the window to match the  size  deduced  via  setupterm(3x).
-            Normally  this  has  no  effect,  unless  setupterm is not able to
+       -w   Resize  the  window  to  match the size deduced via setupterm(3x).
+            Normally this has no effect,  unless  setupterm  is  not  able  to
             detect the window size.
 
-       The arguments for the -e, -i, and -k options may either be  entered  as
-       actual  characters  or by using the "hat" notation, i.e., control-h may
+       The  arguments  for the -e, -i, and -k options may either be entered as
+       actual characters or by using the "hat" notation, i.e.,  control-h  may
        be specified as "^H" or "^h".
 
        If neither -c or -w is given, both options are assumed.
 
 
-

                SETTING THE ENVIRONMENT

                -       It is often desirable to enter the terminal type and information  about
-       the terminal's capabilities into the shell's environment.  This is done
-       using the -s option.
-
-       When the -s option is specified, the commands to enter the  information
-       into  the  shell's  environment are written to the standard output.  If
-       the SHELL environmental variable ends in "csh", the  commands  are  for
-       csh,  otherwise,  they  are  for sh(1).  Note, the csh commands set and
-       unset the shell variable noglob, leaving it unset.  The following  line
-       in  the  .login  or  .profile  files  will  initialize  the environment
-       correctly:
-
-           eval `tset -s options ... `
-
-
-

                TERMINAL TYPE MAPPING

                -       When the terminal is not hardwired into  the  system  (or  the  current
-       system  information  is  incorrect)  the terminal type derived from the
-       /etc/ttys file or the TERM environmental variable  is  often  something
-       generic  like  network,  dialup,  or  unknown.   When tset is used in a
-       startup script it is often desirable to provide information  about  the
-       type of terminal used on such ports.
-
-       The  -m  options  maps  from some set of conditions to a terminal type,
-       that is, to tell tset "If I'm on this port at a particular speed, guess
-       that I'm on that kind of terminal".
-
-       The  argument  to  the  -m option consists of an optional port type, an
-       optional operator, an optional baud  rate  specification,  an  optional
-       colon  (":")  character and a terminal type.  The port type is a string
-       (delimited by  either  the  operator  or  the  colon  character).   The
-       operator  may  be  any combination of ">", "<", "@", and "!"; ">" means
-       greater than, "<" means less than, "@" means equal to and  "!"  inverts
-       the  sense  of the test.  The baud rate is specified as a number and is
-       compared with the speed of the standard error output (which  should  be
-       the control terminal).  The terminal type is a string.
-
-       If  the  terminal  type  is  not  specified on the command line, the -m
-       mappings are applied to the terminal type.  If the port type  and  baud
-       rate  match  the  mapping,  the  terminal type specified in the mapping
-       replaces the current type.  If more than one mapping is specified,  the
-       first applicable mapping is used.
-
-       For  example,  consider  the following mapping: dialup>9600:vt100.  The
-       port type is dialup , the operator is >, the baud rate specification is
-       9600, and the terminal type is vt100.  The result of this mapping is to
-       specify that if the terminal type is  dialup,  and  the  baud  rate  is
-       greater than 9600 baud, a terminal type of vt100 will be used.
-
-       If  no  baud  rate  is specified, the terminal type will match any baud
-       rate.  If no port type is specified, the terminal type will  match  any
-       port  type.   For  example,  -m  dialup:vt100 -m :?xterm will cause any
-       dialup port, regardless of baud rate, to match the terminal type vt100,
-       and  any non-dialup port type to match the terminal type ?xterm.  Note,
-       because of the leading question mark, the user will  be  queried  on  a
-       default port as to whether they are actually using an xterm terminal.
-
-       No  whitespace  characters  are  permitted  in  the -m option argument.
-       Also, to avoid problems with meta-characters, it is suggested that  the
-       entire -m option argument be placed within single quote characters, and
-       that  csh  users  insert  a  backslash  character  ("\")   before   any
-       exclamation marks ("!").
+

                ENVIRONMENT

                +       The tset command uses these environment variables:
 
+       SHELL
+            tells  tset  whether  to  initialize  TERM  using  sh(1) or csh(1)
+            syntax.
 
-

                HISTORY

                -       A  reset command appeared in 1BSD (March 1978), written by Kurt Shoens.
-       This program set the erase and kill characters to ^H (backspace) and  @
-       respectively.  Mark Horton improved that in 3BSD (October 1979), adding
-       intr, quit, start/stop and eof  characters  as  well  as  changing  the
-       program  to  avoid  modifying any user settings.  That version of reset
-       did not use the termcap database.
+       TERM Denotes your terminal  type.   Each  terminal  type  is  distinct,
+            though many are similar.
 
-       A separate tset command was provided in 1BSD by Eric Allman, using  the
-       termcap  database.   Allman's comments in the source code indicate that
-       he began work in October 1977, continuing development over the next few
-       years.
+       TERMCAP
+            may  denote  the  location of a termcap database.  If it is not an
+            absolute pathname, e.g., begins  with  a  "/",  tset  removes  the
+            variable  from  the  environment  before  looking for the terminal
+            description.
 
-       According to comments in the source code, the tset program was modified
-       in September 1980, to use logic copied from the 3BSD  "reset"  when  it
-       was invoked as reset.  This version appeared in 4.1cBSD, late in 1982.
 
-       Other developers (e.g., Keith Bostic and Jim Bloom) continued to modify
-       tset until 4.4BSD was released in 1993.
+

                FILES

                +       /etc/ttys
+              system port name to terminal type mapping database (BSD versions
+              only).
 
-       The ncurses implementation was lightly adapted from the 4.4BSD  sources
-       for a terminfo environment by Eric S. Raymond <esr@snark.thyrsus.com>.
+       /usr/share/terminfo
+              compiled terminal description database directory
 
 
-

                COMPATIBILITY

                +

                PORTABILITY

                        Neither  IEEE  Std  1003.1/The  Open  Group Base Specifications Issue 7
        (POSIX.1-2008) nor X/Open Curses Issue 7 documents tset or reset.
 
-       The AT&T tput utility (AIX, HPUX, Solaris) incorporated  the  terminal-
+       The AT&T tput utility (AIX, HP-UX, Solaris) incorporated the  terminal-
        mode  manipulation  as well as termcap-based features such as resetting
        tabstops from tset in BSD (4.1c),  presumably  with  the  intention  of
        making  tset  obsolete.   However, each of those systems still provides
        tset.  In fact, the commonly-used reset utility is always an alias  for
        tset.
 
-       The   tset   utility   provides  for  backward-compatibility  with  BSD
-       environments (under most modern UNIXes, /etc/inittab and  getty(1)  can
-       set  TERM  appropriately  for each dial-up line; this obviates what was
-       tset's most important use).  This implementation  behaves  like  4.4BSD
-       tset, with a few exceptions specified here.
+       The tset utility provides backward compatibility with BSD environments;
+       under most modern  Unices,  /etc/inittab  and  getty(8)  can  set  TERM
+       appropriately  for  each  dial-up  line, obviating what was tset's most
+       important use.  This implementation behaves like 4.4BSD  tset,  with  a
+       few exceptions we shall consider now.
 
-       A  few  options are different because the TERMCAP variable is no longer
-       supported under terminfo-based ncurses:
+       A  few  options are different because the TERMCAP variable is no longer
+       supported under terminfo-based ncurses:
 
        o   The -S option of BSD tset no  longer  works;  it  prints  an  error
            message to the standard error and dies.
 
-       o   The -s option only sets TERM, not TERMCAP.
+       o   The -s option only sets TERM, not TERMCAP.
 
        There  was an undocumented 4.4BSD feature that invoking tset via a link
        named "TSET" (or via  any  other  name  beginning  with  an  upper-case
@@ -346,56 +352,50 @@ 
                tset 1
                
            to set the window size if tset is not able  to  obtain  the  window
            size from the operating system.
 
-       o   In ncurses, tset obtains the window size using setupterm, which may
-           be from the operating system, the  LINES  and  COLUMNS  environment
+       o   In ncurses, tset obtains the window size using setupterm(3x), which
+           may be from the operating system, the LINES and COLUMNS environment
            variables or the terminal description.
 
-       Obtaining  the  window  size from the terminal description is common to
-       both implementations, but considered obsolescent.  Its  only  practical
-       use is for hardware terminals.  Generally speaking, a window size would
-       be unset only if there were some problem obtaining the value  from  the
-       operating  system  (and  setupterm would still fail).  For that reason,
-       the LINES and COLUMNS environment variables may be useful  for  working
-       around  window-size  problems.   Those  have  the  drawback that if the
-       window is resized, those variables must be recomputed  and  reassigned.
-       To do this more easily, use the resize(1) program.
-
+       Obtaining  the window size from a terminal's type description is common
+       to  both  implementations,  but  considered  obsolescent.    Its   only
+       practical  use  is  for hardware terminals.  Generally, the window size
+       will remain uninitialized only if there were a  problem  obtaining  the
+       value  from the operating system (and setupterm would still fail).  The
+       LINES and COLUMNS environment variables may thus be useful for  working
+       around  window-size  problems, but have the drawback that if the window
+       is resized, their  values  must  be  recomputed  and  reassigned.   The
+       resize(1) program distributed with xterm(1) assists this activity.
 
-

                ENVIRONMENT

                -       The tset command uses these environment variables:
 
-       SHELL
-            tells  tset  whether  to  initialize  TERM  using  sh(1) or csh(1)
-            syntax.
-
-       TERM Denotes your terminal  type.   Each  terminal  type  is  distinct,
-            though many are similar.
-
-       TERMCAP
-            may  denote  the  location of a termcap database.  If it is not an
-            absolute pathname, e.g., begins  with  a  "/",  tset  removes  the
-            variable  from  the  environment  before  looking for the terminal
-            description.
-
-
-

                FILES

                -       /etc/ttys
-            system port name to terminal type mapping database  (BSD  versions
-            only).
-
-       /usr/share/terminfo
-            terminal capability database
+

                HISTORY

                +       A  reset  command written by Kurt Shoens appeared in 1BSD (March 1978).
+       It  set  the  erase  and  kill  characters  to  ^H  (backspace)  and  @
+       respectively.   Mark Horton improved this reset in 3BSD (October 1979),
+       adding intr, quit, start/stop, and eof characters as well  as  changing
+       the  program  to  avoid  modifying  any user settings.  That version of
+       reset did not use termcap.
+
+       Eric Allman wrote a distinct tset command for 1BSD, using a  forerunner
+       of  termcap  called  ttycap.   Allman's  comments  in  the  source code
+       indicate that he began work in  October  1977,  continuing  development
+       over  the next few years.  By late 1979, it had migrated to termcap and
+       handled the TERMCAP variable.  Later comments indicate  that  tset  was
+       modified  in  September  1980 to use logic copied from the 3BSD "reset"
+       program when it  was  invoked  as  reset.   This  version  appeared  in
+       4.1cBSD,  late  in 1982.  Other developers such as Keith Bostic and Jim
+       Bloom continued to modify tset until 4.4BSD was released in 1993.
+
+       The ncurses implementation was lightly adapted from the 4.4BSD  sources
+       to use the terminfo API by Eric S. Raymond <esr@snark.thyrsus.com>.

                SEE ALSO

                        csh(1),   sh(1),   stty(1),   curs_terminfo(3x),  tty(4),  terminfo(5),
        ttys(5), environ(7)
 
-       This describes ncurses version 6.4 (patch 20230311).
-
 
 
-                                                                       tset(1)
+ncurses 6.5                       2025-01-18                           tset(1)
                diff --git a/doc/html/man/user_caps.5.html b/doc/html/man/user_caps.5.html index d99c5397..61e2de80 100644 --- a/doc/html/man/user_caps.5.html +++ b/doc/html/man/user_caps.5.html @@ -1,6 +1,7 @@ -user_caps 5 +user_caps 5 2024-06-08 ncurses 6.5 File formats -

                user_caps 5

                +

                user_caps 5 2024-06-08 ncurses 6.5 File formats

                -user_caps(5)                  File Formats Manual                 user_caps(5)
+user_caps(5)                     File formats                     user_caps(5)

                NAME

                -       user_caps - user-defined terminfo capabilities
+       user_caps - user-defined terminfo capability format

                SYNOPSIS

                -       tic -x, infocmp -x
+       infocmp -x
+
+       tic -x

                DESCRIPTION

                Background

                -       Before  ncurses  5.0,  terminfo  databases  used  a fixed repertoire of
+       Before  ncurses  5.0,  terminfo  databases  used  a fixed repertoire of
        terminal capabilities designed for the SVr2 terminal database in  1984,
-       and  extended  in  stages  through SVr4 (1989), and standardized in the
-       Single Unix Specification beginning in 1995.
+       and  extended in stages through SVr4 (1989), and standardized in X/Open
+       Curses starting in 1995.
 
        Most of the extensions in this fixed repertoire were additions  to  the
-       tables of boolean, numeric and string capabilities.  Rather than change
+       tables of Boolean, numeric and string capabilities.  Rather than change
        the meaning of an existing capability,  a  new  name  was  added.   The
        terminfo  database  uses  a  binary  format;  binary  compatibility was
        ensured by using a header which gave the number of items in the  tables
@@ -89,21 +92,21 @@ 
                user_caps 5
                
            needed, while others were added  (out  of  order)  to  comply  with
            X/Open Curses.
 
-           While  ncurses' repertoire of predefined capabilities is closest to
+           While  ncurses' repertoire of predefined capabilities is closest to
            Solaris, Solaris's terminfo database has a few differences from the
-           list  published  by  X/Open  Curses.   For  example, ncurses can be
+           list  published  by  X/Open  Curses.   For  example, ncurses can be
            configured with tables which match the terminal databases for  AIX,
            HP-UX or OSF/1, rather than the default Solaris-like configuration.
 
-       o   In  SVr4  curses  and  ncurses, the terminal database is defined at
+       o   In  SVr4  curses  and  ncurses, the terminal database is defined at
            compile-time using a text file which lists the  different  terminal
            capabilities.
 
            In  principle,  the  text-file  can  be  extended,  but  doing this
            requires recompiling and reinstalling the library.   The  text-file
-           used  in  ncurses  for  terminal  capabilities includes details for
+           used  in  ncurses  for  terminal  capabilities includes details for
            various systems past the documented X/Open  Curses  features.   For
-           example, ncurses supports these capabilities in each configuration:
+           example, ncurses supports these capabilities in each configuration:
 
                memory_lock
                     (meml) lock memory above cursor
@@ -132,13 +135,13 @@ 
                user_caps 5
                
 
        Although  termcap's  extensibility  was  rarely  used (it was never the
        speaker who had actually used the feature), the criticism had a  point.
-       ncurses   5.0  provided  a  way  to  detect  nonstandard  capabilities,
+       ncurses   5.0  provided  a  way  to  detect  nonstandard  capabilities,
        determine their type and optionally store and retrieve them  in  a  way
        which did not interfere with other applications.  These are referred to
        as user-defined capabilities because no modifications to the  toolset's
        predefined capability names are needed.
 
-       The  ncurses  utilities tic and infocmp have a command-line option "-x"
+       The  ncurses  utilities tic and infocmp have a command-line option "-x"
        to  control  whether  the  nonstandard  capabilities  are   stored   or
        retrieved.   A  library function use_extended_names is provided for the
        same purpose.
@@ -147,7 +150,7 @@ 
                user_caps 5
                
        user-defined  capability  if  the  capability  name  is  not one of the
        predefined names.
 
-       Because ncurses provides  a  termcap  library  interface,  these  user-
+       Because ncurses provides  a  termcap  library  interface,  these  user-
        defined capabilities may be visible to termcap applications:
 
        o   The   termcap  interface  (like  all  implementations  of  termcap)
@@ -168,7 +171,7 @@ 
                user_caps 5
                
            predefined function-key names, to which a series  of  keys  can  be
            assigned,   that  is  insufficient  for  more  than  a  dozen  keys
            multiplied by more than a couple  of  modifier  combinations.   The
-           ncurses  database  uses  a  convention based on xterm(1) to provide
+           ncurses  database  uses  a  convention based on xterm(1) to provide
            extended special-key names.
 
            Fitting that into termcap's limitation of 2-character  names  would
@@ -176,12 +179,12 @@ 
                user_caps 5
                
            terminfo.
 
 
-

                Recognized capabilities

                -       The ncurses library uses the user-definable  capabilities.   While  the
-       terminfo  database  may  have  other extensions, ncurses makes explicit
+

                Recognized Capabilities

                +       The ncurses library uses the user-definable  capabilities.   While  the
+       terminfo  database  may  have  other extensions, ncurses makes explicit
        checks for these:
 
-          AX boolean, asserts that the terminal interprets SGR 39 and  SGR  49
+          AX Boolean, asserts that the terminal interprets SGR 39 and  SGR  49
              by  resetting  the foreground and background color, respectively,
              to the default.
 
@@ -193,24 +196,24 @@ 
                user_caps 5
                
 
              The command "tput clear" does the same thing.
 
-          NQ used to suppress a consistency  check  in  tic  for  the  ncurses
-             capabilities  in  user6  through  user9 (u6, u7, u8 and u9) which
-             tell how to query the terminal's cursor position and  its  device
-             attributes.
+          NQ Boolean, used to suppress a consistency  check  in  tic  for  the
+             ncurses  capabilities  in user6 through user9 (u6, u7, u8 and u9)
+             which tell how to query the terminal's cursor  position  and  its
+             device attributes.
 
           RGB
-             boolean,   number   or   string,   used   to   assert   that  the
+             Boolean,   number   or   string,   used   to   assert   that  the
              set_a_foreground and set_a_background capabilities correspond  to
              direct  colors,  using  an RGB (red/green/blue) convention.  This
              capability  allows   the   color_content   function   to   return
              appropriate   values   without   requiring   the  application  to
              initialize colors using init_color.
 
-             The capability type determines the values which ncurses sees:
+             The capability type determines the values which ncurses sees:
 
-             boolean
+             Boolean
                 implies that the number of bits for red, green  and  blue  are
-                the  same.   Using  the maximum number of colors, ncurses adds
+                the  same.   Using  the maximum number of colors, ncurses adds
                 two, divides that sum by three, and assigns the result to red,
                 green and blue in that order.
 
@@ -219,9 +222,9 @@ 
                user_caps 5
                
                 comparison to red.
 
              number
-                tells  ncurses  what result to add to red, green and blue.  If
-                ncurses runs out of bits, blue (and green) lose just as in the
-                boolean case.
+                tells  ncurses  what result to add to red, green and blue.  If
+                ncurses runs out of bits, blue (and green) lose just as in the
+                Boolean case.
 
              string
                 explicitly  list  the  number  of bits used for red, green and
@@ -233,7 +236,7 @@ 
                user_caps 5
                
              could  define  RGB#1 to represent the standard eight ANSI colors,
              i.e., one bit per color.
 
-          U8 number, asserts that ncurses must use Unicode  values  for  line-
+          U8 number, asserts that ncurses must use Unicode  values  for  line-
              drawing  characters,  and  that  it  should  ignore the alternate
              character set capabilities when the locale uses  UTF-8  encoding.
              For  more  information, see the discussion of NCURSES_NO_UTF8_ACS
@@ -241,16 +244,16 @@ 
                user_caps 5
                
 
              Set this capability to a nonzero value to enable it.
 
-          XM string, override ncurses's built-in string which enables/disables
+          XM string, override ncurses's built-in string which enables/disables
              xterm(1) mouse mode.
 
-             ncurses  sends a character sequence to the terminal to initialize
+             ncurses  sends a character sequence to the terminal to initialize
              mouse mode, and when the user clicks the  mouse  buttons  or  (in
              certain  modes) moves the mouse, handles the characters sent back
              by the terminal to tell it what was done with the mouse.
 
              The mouse protocol  is  enabled  when  the  mask  passed  in  the
-             mousemask  function  is nonzero.  By default, ncurses handles the
+             mousemask  function  is nonzero.  By default, ncurses handles the
              responses for the X11 xterm mouse protocol.  It also knows  about
              the  SGR  1006  xterm mouse protocol, but must to be told to look
              for this specifically.  It will not be able to guess  which  mode
@@ -259,7 +262,7 @@ 
                user_caps 5
                
 
              The XM capability has a single parameter.  If nonzero, the  mouse
              protocol  should  be enabled.  If zero, the mouse protocol should
-             be disabled.  ncurses inspects this capability if it is  present,
+             be disabled.  ncurses inspects this capability if it is  present,
              to  see whether the 1006 protocol is used.  If so, it expects the
              responses to use the SGR 1006 xterm mouse protocol.
 
@@ -311,32 +314,39 @@ 
                user_caps 5
                
                           %?%p4%tM%em%;,
 
 
-

                Extended key-definitions

                +

                Extended Key Definitions

                        Several  terminals  provide  the  ability  to send distinct strings for
        combinations of modified special keys.  There is no standard  for  what
        those keys can send.
 
        Since  1999,  xterm(1)  has  supported  shift,  control,  alt, and meta
        modifiers which produce distinct special-key strings.   In  a  terminal
-       description,  ncurses  has  no special knowledge of the modifiers used.
+       description,  ncurses  has  no special knowledge of the modifiers used.
        Applications can use the naming convention  established  for  xterm  to
        find these special keys in the terminal description.
 
-       Starting  with  the curses convention that key names begin with "k" and
-       that shifted special keys are  an  uppercase  name,  ncurses'  terminal
-       database defines these names to which a suffix is added:
-
-            Name   Description
-            ---------------------------------------------------------------
-            kDC    special form of kdch1 (delete character)
-            kDN    special form of kcud1 (cursor down)
-            kEND   special form of kend (End)
-            kHOM   special form of khome (Home)
-            kLFT   special form of kcub1 (cursor-left or cursor-back)
-            kNXT   special form of knext (Next, or Page-Down)
-            kPRV   special form of kprev (Prev, or Page-Up)
-            kRIT   special form of kcuf1 (cursor-right, or cursor-forward)
-            kUP    special form of kcuu1 (cursor-up)
+       Starting  with  the  curses convention that capability codes describing
+       the input generated by a terminal's key caps begin with "k",  and  that
+       shifted  special  keys  use uppercase letters in their names, ncurses's
+       terminal database defines the following names  and  codes  to  which  a
+       suffix is added.
+
+            Code   Description
+            -------------------------------------------------------------------
+            kDC    shifted kdch1 (delete character)
+            kDN    shifted kcud1 (cursor down)
+            kEND   shifted kend (end)
+            kHOM   shifted khome (home)
+            kLFT   shifted kcub1 (cursor back)
+            kNXT   shifted knext (next)
+            kPRV   shifted kprev (previous)
+            kRIT   shifted kcuf1 (cursor forward)
+            kUP    shifted kcuu1 (cursor up)
+
+       Keycap  nomenclature on the Unix systems for which curses was developed
+       differs from today's ubiquitous descendants of the IBM  PC/AT  keyboard
+       layout.  In the foregoing, interpret "backward" as "left", "forward" as
+       "right", "next" as "page down", and "prev(ious)" as "page up".
 
        These are the suffixes used to denote the modifiers:
 
@@ -358,42 +368,42 @@ 
                user_caps 5
                
             15      Meta + Ctrl + Alt
             16      Meta + Ctrl + Alt + Shift
 
-       None  of these are predefined; terminal descriptions can refer to names
-       which ncurses will allocate at runtime to key-codes.  To use these keys
-       in an ncurses program, an application could do this:
+       None of these are predefined; terminal descriptions can refer to  names
+       which ncurses will allocate at runtime to key-codes.  To use these keys
+       in an ncurses program, an application could do this:
 
-       o   using  a  list  of  extended  key names, ask tigetstr(3x) for their
+       o   using a list of extended key  names,  ask  tigetstr(3x)  for  their
            values, and
 
-       o   given the list of values,  ask  key_defined(3x)  for  the  key-code
+       o   given  the  list  of  values,  ask key_defined(3x) for the key-code
            which would be returned for those keys by wgetch(3x).

                PORTABILITY

                -       The  "-x"  extension  feature  of  tic  and infocmp has been adopted in
-       NetBSD curses.  That implementation stores  user-defined  capabilities,
+       The "-x" extension feature of tic  and  infocmp  has  been  adopted  in
+       NetBSD  curses.   That implementation stores user-defined capabilities,
        but makes no use of these capabilities itself.
 
 
+

                AUTHORS

                +       Thomas E. Dickey
+       beginning with ncurses 5.0 (1999)
+
+

                SEE ALSO

                -       infocmp(1m), tic(1m).
+       infocmp(1m), tic(1m)
 
        The  terminal  database  section  NCURSES  USER-DEFINABLE  CAPABILITIES
-       summarizes commonly-used user-defined capabilities which  are  used  in
-       the  terminal  descriptions.   Some  of those features are mentioned in
+       summarizes  commonly-used  user-defined  capabilities which are used in
+       the terminal descriptions.  Some of those  features  are  mentioned  in
        screen(1) or tmux(1).
 
-       XTerm Control Sequences provides further information  on  the  xterm(1)
-       features which are used in these extended capabilities.
-
-
-

                AUTHORS

                -       Thomas E. Dickey
-       beginning with ncurses 5.0 (1999)
+       XTerm  Control  Sequences  provides further information on the xterm(1)
+       features that are used in these extended capabilities.
 
 
 
-                                                                  user_caps(5)
+ncurses 6.5                       2024-06-08                      user_caps(5)
                diff --git a/doc/html/man/wresize.3x.html b/doc/html/man/wresize.3x.html index 905a2929..868daa6f 100644 --- a/doc/html/man/wresize.3x.html +++ b/doc/html/man/wresize.3x.html @@ -1,6 +1,6 @@ -wresize 3x +wresize 3x 2025-01-18 ncurses 6.5 Library calls -

                wresize 3x

                +

                wresize 3x 2025-01-18 ncurses 6.5 Library calls

                -wresize(3x)                                                        wresize(3x)
+wresize(3x)                      Library calls                     wresize(3x)

                NAME

                -       wresize - resize a curses window
+       wresize - resize a curses window

                SYNOPSIS

                        #include <curses.h>
 
-       int wresize(WINDOW *win, int lines, int columns);
+       int wresize(WINDOW * win, int lines, int columns);

                DESCRIPTION

                -       This is an extension to the curses library.  It reallocates storage for
-       an ncurses window to adjust its dimensions to the specified values.  If
-       either  dimension  is larger than the current values, the window's data
-       is filled with blanks that have the current  background  rendition  (as
-       set by wbkgdset) merged into them.
+       wresize,  an  ncurses  extension  to  the  curses  library, reallocates
+       storage for win, adjusting its dimensions to  lines  and  columns.   If
+       either  dimension  is  larger than its current value, ncurses fills the
+       expanded part of the window with the window's background  character  as
+       configured by wbkgdset(3x) (wide-character API: wbkgrndset(3x)).

                RETURN VALUE

                -       The  function  returns  the integer ERR upon failure and OK on success.
-       It will fail if either of the dimensions less than or equal to zero, or
-       if an error occurs while (re)allocating memory for the window.
+       wresize  returns  OK on success and ERR on failure.  It fails if either
+       lines or columns is less than or equal to zero, or if an  error  occurs
+       while (re)allocating memory for win.

                NOTES

                -       The  only  restriction placed on the dimensions is that they be greater
-       than zero.  The dimensions are not compared to curses screen dimensions
-       to  simplify  the logic of resizeterm.  The caller must ensure that the
-       window's dimensions fit within the actual screen dimensions.
+       The  only restriction placed on the values of lines and columns is that
+       they be greater than zero.  They are not compared to the dimensions  of
+       the  curses screen; this keeps the logic of resizeterm(3x) simple.  The
+       caller must ensure that  win's  dimensions  fit  within  those  of  the
+       screen.
+
+
+

                EXTENSIONS

                +       wresize  is  an ncurses(3x) extension, and is not found in SVr4 curses,
+       4.4BSD curses, or any other previous curses implementation.

                PORTABILITY

                -       It is not possible to resize windows with SVr4 curses.
+       Applications employing ncurses extensions should condition their use on
+       the visibility of the NCURSES_VERSION preprocessor macro.
 
-       This extension of ncurses was introduced in mid-1995.  It  was  adopted
-       in NetBSD curses (2001) and PDCurses (2003).
+       NetBSD  curses adopted wresize in 2001 (release 1.5.3), and PDCurses in
+       2004 (version 2.7).
 
+       It is not possible to resize windows with SVr4 curses.
 
-

                SEE ALSO

                -       resizeterm(3x).
+
+

                HISTORY

                +       Thomas Dickey developed wresize as an extension to BSD curses in  1988,
+       and brought it to ncurses in mid-1995.
 
 
-

                AUTHOR

                -       Thomas  Dickey  (from  an  equivalent  function written in 1988 for BSD
-       curses).
+

                AUTHORS

                +       Thomas Dickey
+
+
+

                SEE ALSO

                +       resizeterm(3x)
 
 
 
-                                                                   wresize(3x)
+ncurses 6.5                       2025-01-18                       wresize(3x)
                diff --git a/doc/html/ncurses-intro.html b/doc/html/ncurses-intro.html index 19485024..d07f6f25 100644 --- a/doc/html/ncurses-intro.html +++ b/doc/html/ncurses-intro.html @@ -1,7 +1,7 @@ /usr/local/ncurses/share/terminfo -----> /usr/share/terminfo -*-+-: 9term Plan9 terminal emulator for X -*---: Eterm Eterm with xterm-style color support (X Window System) -*-*-: Eterm-256color Eterm with xterm 256-colors -*-*-: Eterm-88color Eterm with 88 colors -*-+-: MtxOrb Generic Matrix Orbital LCD display -*-+-: MtxOrb162 16x2 Matrix Orbital LCD display -*-+-: MtxOrb204 20x4 Matrix Orbital LCD display -*-*-: NCR260VT300WPP NCR 2900_260 vt300 wide mode pc+ kybd -*-+-: aaa ann arbor ambassador/30 lines -*-+-: aaa+dec ann arbor ambassador in dec vt100 mode -*-+-: aaa+rv ann arbor ambassador in reverse video -\&.\ .\ . -.NE +reports the version of \fI\%ncurses\fP associated +with this program and exits with a successful status. .SH FILES -.TP 5 -\fB\*d/?/*\fP -Compiled terminal description database. +.TP +.I @TERMINFO@ +compiled terminal description database +.SH PORTABILITY +\fB\%@TOE@\fP is not provided by other implementations. +There is no applicable X/Open or POSIX standard for it. .SH HISTORY -This utility is not provided by other implementations. -There is no relevant X/Open or POSIX standard for \fB@TOE@\fP. +\fB\%@TOE@\fP replaces a \fB\-T\fP option that was briefly supported by +the \fI\%ncurses\fP \fB\%infocmp\fP utility in 1995. +.PP +The \fB\-a\fP and \fB\-s\fP options were added in 2006 and 2011, +respectively. .PP -The program name refers to a developer's pun: +The program's name originates with a developer's pun: .bP \fBtic\fP, .bP \fBtac\fP (now \fBtack\fP), .bP \fBtoe\fP. +.SH EXAMPLES +When not sorting with the \fB\-s\fP option, +the \fB\-a\fP option reports all of the names found in all of the +terminal database directories named in the \fI\%TERMINFO\fP and +\fI\%TERMINFO_DIRS\fP environment variables. +.RS 4 .PP -It replaced a \fB\-T\fP option which was briefly supported by -the ncurses \fBinfocmp\fP utility in 1995. +.\" toe -a | grep -E '^(xterm|vt)' +.ft \*(CW +.TS +L2 Lx. +xterm\-color generic color xterm +xterm\-xfree86 xterm terminal emulator (XFree86) +xterm\-vt220 xterm emulating vt220 +xterm\-256color xterm with 256 colors +xterm\-r6 xterm X11R6 version +xterm\-r5 xterm R5 version +xterm\-mono monochrome xterm +xterm T{ +.ad l +xterm terminal emulator (X Window System) +T} +vt220 dec vt220 +vt102 dec vt102 +vt100 dec vt100 (w/advanced video) +vt52 dec vt52 +.T& +L. +\&.\|.\|. +.TE +.ft +.RE .PP -The \fB\-a\fP and \fB\-s\fP options were added to -\fB@TOE@\fP several years later (2006 and 2011, respectively). -.SH SEE ALSO -\fB@CAPTOINFO@\fP(1M), -\fB@INFOCMP@\fP(1M), -\fB@INFOTOCAP@\fP(1M), -\fB@TIC@\fP(1M), -\fBcurses\fP(3X), -\fBterminfo\fP(\*n). +Use the \fB\-a\fP and \fB\-s\fP options together to show where each +terminal description was found. +.RS 4 .PP -This describes \fBncurses\fP -version @NCURSES_MAJOR@.@NCURSES_MINOR@ (patch @NCURSES_PATCH@). +.\" toe -as | grep -E '(^-+>|:.(xterm|vt))' +.ft \*(CW +.TS +Lx. +\-\-> /etc/terminfo +\-\-\-\-> /lib/terminfo +\-\-\-\-\-\-> /usr/share/terminfo +.TE +.TS +L1 L2 Lx. +\-\-*\-\-\-: vt100 dec vt100 (w/advanced video) +\-\-*\-\-\-: vt102 dec vt102 +\-\-*\-\-\-: vt220 dec vt220 +\-\-*\-\-\-: vt52 dec vt52 +\-\-*\-\-\-: xterm T{ +.ad l +xterm terminal emulator (X Window System) +T} +\-\-*\-\-\-: xterm\-256color xterm with 256 colors +\-\-*\-\-\-: xterm\-color generic color xterm +\-\-*\-\-\-: xterm\-mono monochrome xterm +\-\-*\-\-\-: xterm\-r5 xterm R5 version +\-\-*\-\-\-: xterm\-r6 xterm X11R6 version +\-\-*\-\-\-: xterm\-vt220 xterm emulating vt220 +\-\-*\-\-\-: xterm\-xfree86 T{ +.ad l +xterm terminal emulator (XFree86) +T} +.T& +L. +\&.\|.\|. +.TE +.ft +.RE +.SH SEE ALSO +\fB\%@CAPTOINFO@\fP(1M), +\fB\%@INFOCMP@\fP(1M), +\fB\%@INFOTOCAP@\fP(1M), +\fB\%@TIC@\fP(1M), +\fB\%curses\fP(3X), +\fB\%terminfo\fP(5) diff --git a/man/tput.1 b/man/tput.1 index 5d61230d..0e5a85bf 100644 --- a/man/tput.1 +++ b/man/tput.1 @@ -1,6 +1,6 @@ '\" t .\"*************************************************************************** -.\" Copyright 2018-2021,2022 Thomas E. Dickey * +.\" Copyright 2018-2024,2025 Thomas E. Dickey * .\" Copyright 1998-2016,2017 Free Software Foundation, Inc. * .\" * .\" Permission is hereby granted, free of charge, to any person obtaining a * @@ -28,593 +28,1051 @@ .\" authorization. * .\"*************************************************************************** .\" -.\" $Id: tput.1,v 1.76 2022/02/12 20:02:20 tom Exp $ -.TH @TPUT@ 1 "" -.ds d @TERMINFO@ -.ds n 1 -.ie \n(.g .ds `` \(lq -.el .ds `` `` -.ie \n(.g .ds '' \(rq -.el .ds '' '' +.\" $Id: tput.1,v 1.135 2025/03/01 21:45:34 tom Exp $ +.TH @TPUT@ 1 2025-03-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands" +.ie \n(.g \{\ +.ds `` \(lq +.ds '' \(rq +.\} +.el \{\ +.ie t .ds `` `` +.el .ds `` "" +.ie t .ds '' '' +.el .ds '' "" +.\} +. .de bP .ie n .IP \(bu 4 .el .IP \(bu 2 .. .SH NAME -\fB@TPUT@\fP, \fBreset\fP \- initialize a terminal or query terminfo database +\fB\%@TPUT@\fP \- +initialize a terminal, exercise its capabilities, or query \fI\%term\%info\fP database .SH SYNOPSIS -\fB@TPUT@\fR [\fB\-T\fItype\fR] \fIcapname\fR [\fIparameters\fR] -.br -\fB@TPUT@\fR [\fB\-T\fItype\fR] [\fB\-x\fR] \fBclear\fR -.br -\fB@TPUT@\fR [\fB\-T\fItype\fR] \fBinit\fR -.br -\fB@TPUT@\fR [\fB\-T\fItype\fR] \fBreset\fR -.br -\fB@TPUT@\fR [\fB\-T\fItype\fR] \fBlongname\fR -.br -\fB@TPUT@ \-S\fP \fB<<\fP -.br -\fB@TPUT@ \-V\fP -.br +\fB@TPUT@\fP [\fB\-v\fP] [\fB\-T\fP \fIterminal-type\fP] +{\fIcap-code\fP [\fIparameter\fP .\|.\|.\&]} .\|.\|. +.PP +\fB@TPUT@\fP [\fB\-v\fP] [\fB\-T\fP \fIterminal-type\fP] [\fB\-x\fP] \fBclear\fP +.PP +\fB@TPUT@\fP [\fB\-v\fP] [\fB\-T\fP \fIterminal-type\fP] \fBinit\fP +.PP +\fB@TPUT@\fP [\fB\-v\fP] [\fB\-T\fP \fIterminal-type\fP] \fB\%reset\fP +.PP +\fB@TPUT@\fP [\fB\-v\fP] [\fB\-T\fP \fIterminal-type\fP] \fB\%longname\fP +.PP +\fB@TPUT@\fP [\fB\-v\fP] \fB\-S\fP +.PP +\fB@TPUT@\fP [\fB\-v\fP] \fB\-V\fP .SH DESCRIPTION -The \fB@TPUT@\fP utility uses the \fBterminfo\fP database to make the -values of terminal-dependent capabilities and information available to -the shell (see \fBsh\fP(1)), to initialize or reset the terminal, or -return the long name of the requested terminal type. -The result depends upon the capability's type: -.RS 3 -.TP 5 +.B \%@TPUT@ +uses the +.I \%term\%info +library and database to make terminal-specific capabilities and +information available to the shell, +to initialize or reset the terminal, +or +to report a description of the current +(or specified) +terminal type. +Terminal capabilities are accessed by +.IR cap-code . +.PP +\fB\%terminfo\fP(5) discusses terminal capabilities at length +and presents a complete list of standard +.IR cap-codes . +.PP +When retrieving capability values, +the result depends upon the capability's type. +.TP 9 \" "Boolean" + 2n +Boolean +.B \%@TPUT@ +sets its exit status to +.B 0 +if the terminal possesses +.IR cap-code , +and +.B 1 +if it does not. +.TP +numeric +.B \%@TPUT@ +writes +.IR cap-code 's +decimal value to the standard output stream if defined +.RB ( \-1 +if it is not) +followed by a newline. +.TP string -\fB@TPUT@\fP writes the string to the standard output. -No trailing newline is supplied. -.TP -integer -\fB@TPUT@\fP writes the decimal value to the standard output, -with a trailing newline. -.TP -boolean -\fB@TPUT@\fP simply sets the exit code -(\fB0\fP for TRUE if the terminal has the capability, -\fB1\fP for FALSE if it does not), -and writes nothing to the standard output. -.RE +.B \%@TPUT@ +writes +.IR cap-code 's +value to the standard output stream if defined, +without a trailing newline. .PP Before using a value returned on the standard output, -the application should test the exit code -(e.g., \fB$?\fP, see \fBsh\fP(1)) to be sure it is \fB0\fP. -(See the \fBEXIT CODES\fP and \fBDIAGNOSTICS\fP sections.) -For a complete list of capabilities -and the \fIcapname\fP associated with each, see \fBterminfo\fP(5). -.SS Options -.TP -\fB\-S\fP -allows more than one capability per invocation of \fB@TPUT@\fP. The -capabilities must be passed to \fB@TPUT@\fP from the standard input -instead of from the command line (see example). -Only one \fIcapname\fP is allowed per line. -The \fB\-S\fP option changes the -meaning of the \fB0\fP and \fB1\fP boolean and string exit codes (see the -EXIT CODES section). +the application should test +.B \%@TPUT@ "'s" +exit status +to be sure it is 0; +see section \*(``EXIT STATUS\*('' below. +.SS Operands +Generally, +an operand is a +.IR cap-code , +a capability code from the terminal database, +or a parameter thereto. +Three others are specially recognized by +.BR \%@TPUT@ ":" +.BR init , +.BR \%reset , +and +.BR \%longname . +Although these resemble capability codes, +they in fact receive special handling; +we term them \*(``pseudo-capabilities\*(''. +.TP 11n \" "longname" + 2n + adjustment for PDF +.I cap-code +indicates a capability from the terminal database. .IP -Because some capabilities may use -\fIstring\fP parameters rather than \fInumbers\fP, -\fB@TPUT@\fP uses a table and the presence of parameters in its input -to decide whether to use \fBtparm\fP(3X), -and how to interpret the parameters. -.TP -\fB\-T\fItype\fR -indicates the \fItype\fP of terminal. -Normally this option is -unnecessary, because the default is taken from the environment -variable \fBTERM\fP. -If \fB\-T\fP is specified, then the shell -variables \fBLINES\fP and \fBCOLUMNS\fP will also be ignored. -.TP -\fB\-V\fP -reports the version of ncurses which was used in this program, and exits. -.TP -.B \-x -do not attempt to clear the terminal's scrollback buffer -using the extended \*(``E3\*('' capability. -.SS Commands -A few commands (\fBinit\fP, \fBreset\fP and \fBlongname\fP) are -special; they are defined by the \fB@TPUT@\fP program. -The others are the names of \fIcapabilities\fP from the terminal database -(see \fBterminfo\fP(5) for a list). -Although \fBinit\fP and \fBreset\fP resemble capability names, -\fB@TPUT@\fP uses several capabilities to perform these special functions. -.TP -\fIcapname\fP -indicates the capability from the terminal database. +If +.I cap-code +is of string type and takes parameters, +.B \%@TPUT@ +interprets arguments following +.I cap-code +as the parameters, +up to the (fixed) quantity the capability requires. .IP -If the capability is a string that takes parameters, the arguments -following the capability will be used as parameters for the string. -.IP -Most parameters are numbers. +Most parameters are numeric. Only a few terminal capabilities require string parameters; -\fB@TPUT@\fP uses a table to decide which to pass as strings. -Normally \fB@TPUT@\fP uses \fBtparm\fP(3X) to perform the substitution. +.B \%@TPUT@ +uses a table to decide which to pass as strings. +Normally +.B \%@TPUT@ +uses \fB\%tparm\fP(3X) to perform the +substitution. If no parameters are given for the capability, -\fB@TPUT@\fP writes the string without performing the substitution. +.B \%@TPUT@ +writes the string without performing the substitution. .TP -\fBinit\fP -If the terminal database is present and an entry for the user's -terminal exists (see \fB\-T\fItype\fR, above), the following will -occur: +.B init +initializes the terminal. +If the terminal database is present +and an entry for the user's terminal type exists, +the following occur. .RS .TP 5 (1) -first, \fB@TPUT@\fP retrieves the current terminal mode settings -for your terminal. -It does this by successively testing +.B \%@TPUT@ +retrieves the terminal's mode settings. +It successively tests the file descriptors corresponding to .RS .bP -the standard error, +the standard error stream, .bP -standard output, +the standard output stream, .bP -standard input and +the standard input stream, +and .bP -ultimately \*(``/dev/tty\*('' +.I \%/dev/tty .RE .IP to obtain terminal settings. -Having retrieved these settings, \fB@TPUT@\fP remembers which -file descriptor to use when updating settings. +Having retrieved them, +.B \%@TPUT@ +remembers which descriptor to use for further updates. .TP (2) -if the window size cannot be obtained from the operating system, -but the terminal description (or environment, e.g., \fBLINES\fP -and \fBCOLUMNS\fP variables specify this), -update the operating system's notion of the window size. +If the terminal dimensions cannot be obtained from the operating system, +but the environment or terminal type database entry describes them, +.B \%@TPUT@ +updates the operating system's notion of them. .TP (3) -the terminal modes will be updated: +.B \%@TPUT@ +updates the terminal modes. .RS .bP -any delays (e.g., newline) specified in the entry will -be set in the tty driver, +Any delays specified in the entry +(for example, +when a newline is sent) +are set in the terminal driver. .bP -tabs expansion will be turned on or off according to -the specification in the entry, and +Tab expansion is turned on or off per the specification in the entry, +and .bP if tabs are not expanded, -standard tabs will be set (every 8 spaces). +standard tabs +(every 8 spaces) +are set. .RE .TP (4) -if present, the terminal's initialization strings will be -output as detailed in the \fBterminfo\fP(5) section on -.IR "Tabs and Initialization" , +If initialization capabilities, +detailed in subsection \*(``Tabs and Initialization\*('' of +\fB\%terminfo\fP(5), +are present, +.B \%@TPUT@ +writes them to the standard output stream. .TP (5) -output is flushed. +.B \%@TPUT@ +flushes the standard output stream. .RE .IP -If an entry does not -contain the information needed for any of these activities, -that activity will silently be skipped. +If an entry lacks the information needed for an activity above, +that activity is silently skipped. .TP -\fBreset\fP -This is similar to \fBinit\fP, with two differences: +.B reset +re-initializes the terminal. +A reset differs from initialization in two ways. .RS .TP 5 (1) -before any other initialization, -the terminal modes will be reset to a \*(``sane\*('' state: +.B \%@TPUT@ +sets the terminal modes to a \*(``sane\*('' state, .RS .bP -set cooked and echo modes, +enabling canonical (\*(``cooked\*('') and echo modes, .bP -turn off cbreak and raw modes, +disabling cbreak and raw modes, .bP -turn on newline translation and +enabling newline translation, +and .bP -reset any unset special characters to their default values +setting any special input characters to their default values. .RE .TP 5 (2) -Instead of putting out \fIinitialization\fP strings, the terminal's -\fIreset\fP strings will be output if present -(\fBrs1\fP, \fBrs2\fP, \fBrs3\fP, \fBrf\fP). -If the \fIreset\fP strings are not present, but \fIinitialization\fP -strings are, the \fIinitialization\fP strings will be output. +If any reset capabilities are defined for the terminal type, +.B \%@TPUT@ +writes them to the output stream. +Otherwise, +.B \%@TPUT@ +uses any defined initialization capabilities. +Reset capabilities are detailed in subsection +\*(``Tabs and Initialization\*('' of \fB\%terminfo\fP(5). .RE +.TP +.B longname +A +.I \%term\%info +entry begins with one or more names by which an application +can refer to the entry, +before the list of terminal capabilities. +The names are separated by \*(``|\*('' characters. +X/Open Curses terms the last name the \*(``long name\*('', +and indicates that it may include blanks. .IP -Otherwise, \fBreset\fP acts identically to \fBinit\fP. -.TP -\fBlongname\fP -If the terminal database is present and an entry for the -user's terminal exists (see \fB\-T\fItype\fR above), then the long name -of the terminal will be put out. -The long name is the last -name in the first line of the terminal's description in the -\fBterminfo\fP database [see \fBterm\fP(5)]. -.SS Aliases -\fB@TPUT@\fP handles the \fBclear\fP, \fBinit\fP and \fBreset\fP -commands specially: -it allows for the possibility that it is invoked by a link with those names. -.PP -If \fB@TPUT@\fP is invoked by a link named \fBreset\fP, this has the -same effect as \fB@TPUT@ reset\fP. -The \fB@TSET@\fP(\*n) utility also treats a link named \fBreset\fP specially. -.PP -Before ncurses 6.1, the two utilities were different from each other: -.bP -\fB@TSET@\fP utility reset the terminal modes and special characters -(not done with \fB@TPUT@\fP). -.bP -On the other hand, \fB@TSET@\fP's repertoire of terminal capabilities for -resetting the terminal was more limited, -i.e., only \fBreset_1string\fP, \fBreset_2string\fP and \fBreset_file\fP -in contrast to the tab-stops and margins which are set by this utility. -.bP -The \fBreset\fP program is usually an alias for \fB@TSET@\fP, -because of this difference with resetting terminal modes and special characters. -.PP -With the changes made for ncurses 6.1, the \fIreset\fP feature of the -two programs is (mostly) the same. -A few differences remain: -.bP -The \fB@TSET@\fP program waits one second when resetting, -in case it happens to be a hardware terminal. -.bP -The two programs write the terminal initialization strings -to different streams (i.e., the standard error for \fB@TSET@\fP and the -standard output for \fB@TPUT@\fP). +\fB\%@TIC@\fP warns if the last name does not include blanks, +to accommodate old +.I \%term\%info +entries that treated the long name as an optional feature. +The long name is often referred to as the description field. .IP -\fBNote:\fP although these programs write to different streams, -redirecting their output to a file will capture only part of their actions. -The changes to the terminal modes are not affected by redirecting the output. +If the terminal database is present and an entry for the user's terminal +type exists, +.B \%@TPUT@ +reports its description to the standard output stream, +without a trailing newline. +See \fB\%terminfo\fP(5). .PP -If \fB@TPUT@\fP is invoked by a link named \fBinit\fP, this has the -same effect as \fB@TPUT@ init\fP. -Again, you are less likely to use that link because another program -named \fBinit\fP has a more well-established use. -.SS Terminal Size +.I Note: +Redirecting the output of +.RB \%\*(`` "@TPUT@ init" \*('' +or +.RB \%\*(`` "@TPUT@ reset" \*('' +to a file will capture only part of their actions. +Changes to the terminal modes are not affected by file descriptor +redirection, +since the terminal modes are altered via \fI\%ioctl\fP(2). +.SS Aliases +If +.B \%@TPUT@ +is invoked via link with any of the names +.BR clear , +.BR init , +or +.BR \%reset , +it operates as if run with the corresponding (pseudo-)capability +operand. +For example, +executing a link named +.B \%reset +that points to +.B \%@TPUT@ +has the same effect as +.RB \%\*(`` "@TPUT@ \%reset" \*(''. .PP -Besides the special commands (e.g., \fBclear\fP), -@TPUT@ treats certain terminfo capabilities specially: -\fBlines\fP and \fBcols\fP. -@TPUT@ calls \fBsetupterm\fP(3X) to obtain the terminal size: +This feature was introduced by +.I \%ncurses +5.2 in 2000. +It is rarely used. +.TP +.B \%clear +is a separate program, +which is both smaller and more frequently executed. +.TP +.B init +has the same name as another program in widespread use. +.TP +.B \%reset +is provided +by the \fB\%@TSET@\fP(1) utility (also via a link named +.BR \%reset ")." +.SS "Terminal Size" +Besides the pseudo-capabilities +(such as +.BR init ), +.B \%@TPUT@ +treats the +.B lines +and +.B cols +.I cap-codes +specially: +it may call \fB\%setupterm\fP(3X) to obtain the terminal size. .bP -first, it gets the size from the terminal database -(which generally is not provided for terminal emulators -which do not have a fixed window size) +First, +.B \%@TPUT@ +attempts to obtain these capabilities from the terminal +database. +This generally fails for terminal emulators, +which lack a fixed window size and thus omit the capabilities. .bP -then it asks the operating system for the terminal's size -(which generally works, unless connecting via a serial line which -does not support \fINAWS\fP: negotiations about window size). +It then asks the operating system for the terminal's size, +which generally works, +unless the connection is via a serial line that +does not support \*(``NAWS\*('': negotiations about window size. .bP -finally, it inspects the environment variables \fBLINES\fP and \fBCOLUMNS\fP +Finally, +it inspects the environment variables +.I LINES +and +.IR \%COLUMNS , which may override the terminal size. .PP -If the \fB\-T\fP option is given -@TPUT@ ignores the environment variables by calling \fBuse_tioctl(TRUE)\fP, -relying upon the operating system (or finally, the terminal database). -.SH EXAMPLES -.TP 5 -\fB@TPUT@ init\fP -Initialize the terminal according to the type of -terminal in the environmental variable \fBTERM\fP. This -command should be included in everyone's .profile after -the environmental variable \fBTERM\fP has been exported, as -illustrated on the \fBprofile\fP(5) manual page. -.TP 5 -\fB@TPUT@ \-T5620 reset\fP -Reset an AT&T 5620 terminal, overriding the type of -terminal in the environmental variable \fBTERM\fP. -.TP 5 -\fB@TPUT@ cup 0 0\fP -Send the sequence to move the cursor to row \fB0\fP, column \fB0\fP -(the upper left corner of the screen, usually known as the \*(``home\*('' -cursor position). -.TP 5 -\fB@TPUT@ clear\fP -Echo the clear-screen sequence for the current terminal. -.TP 5 -\fB@TPUT@ cols\fP -Print the number of columns for the current terminal. -.TP 5 -\fB@TPUT@ \-T450 cols\fP -Print the number of columns for the 450 terminal. -.TP 5 -\fBbold=`@TPUT@ smso` offbold=`@TPUT@ rmso`\fP -Set the shell variables \fBbold\fP, to begin stand-out mode -sequence, and \fBoffbold\fP, to end standout mode sequence, -for the current terminal. -This might be followed by a -prompt: \fBecho "${bold}Please type in your name: ${offbold}\\c"\fP -.TP 5 -\fB@TPUT@ hc\fP -Set exit code to indicate if the current terminal is a hard copy terminal. -.TP 5 -\fB@TPUT@ cup 23 4\fP -Send the sequence to move the cursor to row 23, column 4. -.TP 5 -\fB@TPUT@ cup\fP -Send the terminfo string for cursor-movement, with no parameters substituted. -.TP 5 -\fB@TPUT@ longname\fP -Print the long name from the \fBterminfo\fP database for the -type of terminal specified in the environmental -variable \fBTERM\fP. -.PP -.RS 5 -\fB@TPUT@ \-S < clear\fP -.br -\fB> cup 10 10\fP -.br -\fB> bold\fP -.br -\fB> !\fP -.RE -.TP 5 -\& -This example shows \fB@TPUT@\fP processing several capabilities -in one invocation. -It clears the screen, -moves the cursor to position 10, 10 -and turns on bold (extra bright) mode. -The list is terminated by an exclamation mark (\fB!\fP) on a line by itself. -.SH FILES +If the +.B \-T +option is given, +.B \%@TPUT@ +ignores the environment variables by calling +.BR \%use_tioctl(TRUE) , +relying upon the operating system +(or, +ultimately, +the terminal database). +.SH OPTIONS +.TP 9n \" "-T type" + 2n +.B \-S +retrieves more than one capability per invocation of +.BR \%@TPUT@ "." +The capabilities must be passed to +.B \%@TPUT@ +from the standard +input stream instead of from the command line +(see section \*(``EXAMPLES\*('' below). +Only one +.I cap-code +is allowed per line. +The +.B \-S +option changes the meanings of the +.B 0 +and +.B 1 +exit statuses +(see section \*(``EXIT STATUS\*('' below). +.IP +Some capabilities use string parameters rather than numeric ones. +.B \%@TPUT@ +employs a built-in table and the presence of parameters +in its input to decide how to interpret them, +and whether to use \fB\%tparm\fP(3X). .TP -\fB\*d\fP -compiled terminal description database +.BI \-T\ type +indicates the terminal's +.IR type . +Normally this option is unnecessary, +because a default is taken from the +.I TERM +environment variable. +If specified, +the environment variables +.I LINES +and +.I \%COLUMNS +are also ignored. .TP -\fB@DATADIR@/tabset/*\fP -tab settings for some terminals, in a format -appropriate to be output to the terminal (escape -sequences that set margins and tabs); for more -information, see the -.IR "Tabs and Initialization" , -section of \fBterminfo\fP(5) -.SH EXIT CODES -If the \fB\-S\fP option is used, -\fB@TPUT@\fP checks for errors from each line, -and if any errors are found, will set the exit code to 4 plus the -number of lines with errors. -If no errors are found, the exit code is \fB0\fP. -No indication of which line failed can be given so -exit code \fB1\fP will never appear. -Exit codes \fB2\fP, \fB3\fP, and -\fB4\fP retain their usual interpretation. -If the \fB\-S\fP option is not used, -the exit code depends on the type of \fIcapname\fP: -.RS 3 -.TP -.I boolean -a value of \fB0\fP is set for TRUE and \fB1\fP for FALSE. -.TP -.I string -a value of \fB0\fP is set if the -\fIcapname\fP is defined for this terminal \fItype\fP (the value of -\fIcapname\fP is returned on standard output); -a value of \fB1\fP is set if \fIcapname\fP -is not defined for this terminal \fItype\fP -(nothing is written to standard output). -.TP -.I integer -a value of \fB0\fP is always set, -whether or not \fIcapname\fP is defined for this terminal \fItype\fP. -To determine if \fIcapname\fP is defined for this terminal \fItype\fP, -the user must test the value written to standard output. -A value of \fB\-1\fP -means that \fIcapname\fP is not defined for this terminal \fItype\fP. -.TP -.I other -\fBreset\fP or \fBinit\fP may fail to find their respective files. -In that case, the exit code is set to 4 + \fBerrno\fP. -.RE -.PP -Any other exit code indicates an error; see the DIAGNOSTICS section. -.SH DIAGNOSTICS -\fB@TPUT@\fP prints the following error messages and sets the corresponding exit -codes. +.B \-v +causes +.B \%@TPUT@ +to operate verbosely, +reporting warnings. +.TP +.B \-V +reports the version of +.I \%ncurses +associated with +.BR \%@TPUT@ "," +and exits with a successful status. +.TP +.B \-x +prevents +.RB \%\*(`` "@TPUT@ clear" \*('' +from attempting to clear the scrollback buffer. +.SH EXIT STATUS +Normally, +one should interpret +.BR \%@TPUT@ "'s" +exit statuses as follows. .PP -.ne 15 +.if n .ne 3 +.if t .ne 2 .TS -l l. -exit code error message -= -\fB0\fP T{ -(\fIcapname\fP is a numeric variable that is not specified in the -\fBterminfo\fP(5) database for this terminal type, e.g. -\fB@TPUT@ \-T450 lines\fP and \fB@TPUT@ \-Thp2621 xmc\fP) -T} -\fB1\fP no error message is printed, see the \fBEXIT CODES\fP section. -\fB2\fP usage error -\fB3\fP unknown terminal \fItype\fP or no \fBterminfo\fP database -\fB4\fP unknown \fBterminfo\fP capability \fIcapname\fP -\fB>4\fP error occurred in \-S -= +Lb Lb +Lb Lx. +Status Meaning When \-S Not Specified +_ +0 Boolean or string capability present +1 Boolean or numeric capability absent +2 usage error or no terminal type specified +3 unrecognized terminal type +4 unrecognized capability code +>4 system error (4 + \fBerrno\fP) .TE -.SH HISTORY -The \fBtput\fP command was begun by Bill Joy in 1980. -The initial version only cleared the screen. -.PP -AT&T System V provided a different \fBtput\fP command: -.bP -SVr2 provided a rudimentary \fBtput\fP -which checked the parameter against each -predefined capability and returned the corresponding value. -This version of \fBtput\fP did not use \fBtparm\fP(3X) for -the capabilities which are parameterized. -.bP -SVr3 replaced that, a year later, by a more extensive program -whose \fBinit\fP and \fBreset\fP subcommands -(more than half the program) were incorporated from -the \fBreset\fP feature of BSD \fBtset\fP written by Eric Allman. -.bP -SVr4 added color initialization using the \fBorig_colors\fP and -\fBorig_pair\fP capabilities in the \fBinit\fP subcommand. -.PP -Keith Bostic replaced the BSD \fBtput\fP command in 1989 -with a new implementation -based on the AT&T System V program \fBtput\fP. -Like the AT&T program, Bostic's version -accepted some parameters named for \fIterminfo\fP capabilities -(\fBclear\fP, \fBinit\fP, \fBlongname\fP and \fBreset\fP). -However (because he had only \fItermcap\fP available), -it accepted \fItermcap\fP names for other capabilities. -Also, Bostic's BSD \fBtput\fP did not modify the terminal I/O modes -as the earlier BSD \fBtset\fP had done. -.PP -At the same time, Bostic added a shell script named \*(``clear\*('', -which used \fBtput\fP to clear the screen. .PP -Both of these appeared in 4.4BSD, -becoming the \*(``modern\*('' BSD implementation of \fBtput\fP. +When the +.B \-S +option is used, +some statuses change meanings. .PP -This implementation of \fBtput\fP began from a different source than -AT&T or BSD: Ross Ridge's \fImytinfo\fP package, published on -\fIcomp.sources.unix\fP in December 1992. -Ridge's program made more sophisticated use of the terminal capabilities -than the BSD program. -Eric Raymond used that \fBtput\fP program -(and other parts of \fImytinfo\fP) in ncurses in June 1995. -Using the portions dealing with terminal capabilities -almost without change, -Raymond made improvements to the way the command-line parameters -were handled. +.if n .ne 4 +.if t .ne 3 +.TS +Lb Lb +Lb Lx. +Status Meaning When \-S Specified +_ +0 all operands interpreted +1 unused +4 some operands not interpreted +.TE +.SH ENVIRONMENT +.B \%@TPUT@ +reads up to three environment variables +if the +.B \-T +option is not specified. +.TP 9n \" "COLUMNS" + 2n +.I COLUMNS +specifies the width of the screen in characters. +.TP +.I LINES +specifies the height of the screen in characters. +.TP +.I TERM +denotes the terminal type. +Each terminal type is distinct, +though many are similar. +.SH FILES +.TP +.I @DATADIR@/tabset +tab stop initialization database +.TP +.I @TERMINFO@ +compiled terminal description database .SH PORTABILITY -.PP -This implementation of \fBtput\fP differs from AT&T \fBtput\fP in -two important areas: +Over time +.I \%ncurses +.B \%@TPUT@ +has differed from that of System\ V in two important respects, +one now mostly historical. .bP -\fB@TPUT@\fP \fIcapname\fP writes to the standard output. -That need not be a regular terminal. -However, the subcommands which manipulate terminal modes -may not use the standard output. +.RB \%\*(`` @TPUT@ +.IR cap-code \*('' +writes to the standard output, +which need not be a terminal device. +However, +the operands that manipulate terminal modes might not use the standard +output. .IP -The AT&T implementation's \fBinit\fP and \fBreset\fP commands -use the BSD (4.1c) \fBtset\fP source, which manipulates terminal modes. -It successively tries standard output, standard error, standard input -before falling back to \*(``/dev/tty\*('' and finally just assumes -a 1200Bd terminal. -When updating terminal modes, it ignores errors. +System\ V +.IR tput 's +.B init +and +.B \%reset +operands use logic from 4.1cBSD +.IR tset , +manipulating terminal modes. +It checks the same file descriptors +(and +.IR \%/dev/tty ) +for association with a terminal device as +.I \%ncurses +now does, +and if none are, +finally assumes a 1200 baud terminal. +When updating terminal modes, +it ignores errors. .IP -Until changes made after ncurses 6.0, -\fB@TPUT@\fP did not modify terminal modes. -\fB@TPUT@\fP now uses a similar scheme, -using functions shared with \fB@TSET@\fP -(and ultimately based on the 4.4BSD \fBtset\fP). -If it is not able to open a terminal, e.g., when running in \fBcron\fP(1), -\fB@TPUT@\fP will return an error. -.bP -AT&T \fBtput\fP guesses the type of its \fIcapname\fP operands by seeing if -all of the characters are numeric, or not. +Until +.I \%ncurses +6.1 +(see section \*(``HISTORY\*('' below), +.B \%@TPUT@ +did not modify terminal modes. +It now employs a scheme similar to System\ V, +using functions shared with +.B \%@TSET@ +(and ultimately based on 4.4BSD +.IR tset ). +If it is not able to open a terminal +(for instance, +when run by \fIcron\fP(1)), +.B \%@TPUT@ +exits with an error status. +.bP +System\ V +.I tput +assumes that the type of a +.I cap-code +operand is numeric if all the characters of its value are decimal +numbers; +if they are not, +it treats +.I cap-code +as a string capability. .IP -Most implementations which provide support for \fIcapname\fP operands -use the \fBtparm\fP function to expand parameters in it. +Most implementations that provide support for +.I cap-code +operands use the \fB\%tparm\fP(3X) function to expand its parameters. That function expects a mixture of numeric and string parameters, -requiring \fB@TPUT@\fP to know which type to use. +requiring +.B \%@TPUT@ +to know which type to use. .IP -This implementation uses a table to determine the parameter types for -the standard \fIcapname\fP operands, and an internal library -function to analyze nonstandard \fIcapname\fP operands. +.I \%ncurses +.B \%@TPUT@ +uses a table to determine the parameter types for +the standard +.I cap-code +operands, +and an internal function to analyze nonstandard +.I cap-code +operands. .IP -Besides providing more reliable operation than AT&T's utility, -a portability problem is introduced by this analysis: -An OpenBSD developer adapted the internal library function from ncurses -to port NetBSD's termcap-based \fBtput\fP to terminfo. -That had been modified to interpret multiple commands on a line. +While more reliable than System\ V's utility, +a portability problem is introduced by this analysis. +An OpenBSD developer adapted the internal library function from +.I \%ncurses +to port NetBSD's +.IR termcap -based +.I tput +to +.IR \%term\%info , +and modified it to interpret multiple +.I cap-codes +(and parameters) +on the command line. Portable applications should not rely upon this feature; -ncurses provides it to support applications written -specifically for OpenBSD. +.I \%ncurses +offers it to support applications written specifically for OpenBSD. .PP -This implementation (unlike others) can accept both \fItermcap\fP -and \fIterminfo\fP names for the \fIcapname\fP feature, +This implementation, +unlike others, +accepts both +.I termcap +and +.I \%term\%info +.I cap-codes if -\fItermcap\fP support is compiled in. -However, the predefined \fItermcap\fP and \fIterminfo\fP names have two -ambiguities in this case (and the \fIterminfo\fP name is assumed): -.bP -The \fItermcap\fP name \fBdl\fP corresponds to -the \fIterminfo\fP name \fBdl1\fP (delete one line). -.br -The \fIterminfo\fP name \fBdl\fP corresponds to -the \fItermcap\fP name \fBDL\fP (delete a given number of lines). -.bP -The \fItermcap\fP name \fBed\fP corresponds to -the \fIterminfo\fP name \fBrmdc\fP (end delete mode). -.br -The \fIterminfo\fP name \fBed\fP corresponds to -the \fItermcap\fP name \fBcd\fP (clear to end of screen). +.I termcap +support is compiled in. +In that case, +however, +the predefined +.I termcap +and +.I \%term\%info +codes have two +ambiguities; +.I \%ncurses +assumes the +.I \%term\%info +code. +.bP +The +.I cap-code +.B dl +means +.B \%delete_line +to +.I termcap +but +.B \%parm_delete_line +to +.IR \%term\%info . +.I termcap +uses the code +.B DL +for +.BR \%parm_delete_line . +.I \%term\%info +uses the code +.B dl1 +for +.BR \%delete_line . +.bP +The +.I cap-code +.B ed +means +.B \%exit_delete_mode +to +.I termcap +but +.B \%clr_eos +to +.IR \%term\%info . +.I termcap +uses the code +.B cd +for +.BR \%clr_eos . +.I \%term\%info +uses the code +.B rmdc +for +.BR \%exit_delete_mode . .PP -The \fBlongname\fP and \fB\-S\fP options, and the parameter-substitution -features used in the \fBcup\fP example, -were not supported in BSD curses before 4.3reno (1989) or in -AT&T/USL curses before SVr4 (1988). +The +.B \%longname +operand, +.B \-S +option, +and the parameter-substitution features used in the +.B cup +example below, +were not supported in +AT&T/USL +.I curses +before SVr4 (1989). +Later, +4.3BSD-Reno (1990) added support for +.BR \%longname , +.\" longname was added in October 1989. +and in 1994, +NetBSD added support for the parameter-substitution features. .PP -IEEE Std 1003.1/The Open Group Base Specifications Issue 7 (POSIX.1-2008) -documents only the operands for \fBclear\fP, \fBinit\fP and \fBreset\fP. -There are a few interesting observations to make regarding that: -.bP -In this implementation, \fBclear\fP is part of the \fIcapname\fP support. -The others (\fBinit\fP and \fBlongname\fP) do not correspond to terminal -capabilities. -.bP -Other implementations of \fBtput\fP on -SVr4-based systems such as Solaris, IRIX64 and HPUX -as well as others such as AIX and Tru64 -provide support for \fIcapname\fP operands. -.bP -A few platforms such as FreeBSD recognize termcap names rather -than terminfo capability names in their respective \fBtput\fP commands. -Since 2010, NetBSD's \fBtput\fP uses terminfo names. -Before that, it (like FreeBSD) recognized termcap names. +IEEE Std 1003.1/The Open Group Base Specifications Issue\ 7 +(POSIX.1-2008) +documents only the +.BR clear , +.BR init , +and +.B \%reset +operands. +A few observations of interest arise from that selection. +.bP +.I \%ncurses +supports +.B clear +as it does any other standard +.IR cap-code . +The others +.RB ( init +and +.BR \%longname ) +do not correspond to terminal capabilities. +.bP +The +.I tput +on SVr4-based systems such as Solaris, +IRIX64, +and HP-UX, +as well as others such as AIX and Tru64, +also support standard +.I cap-code +operands. +.bP +A few platforms such as FreeBSD recognize +.I termcap +codes rather than +.I \%term\%info +capability codes in their respective +.I tput +commands. +Since 2010, +NetBSD's +.I tput +uses +.I \%term\%info +codes. +Before that, +it +(like FreeBSD) +recognized +.I termcap +codes. .IP -Beginning in 2021, FreeBSD uses the ncurses \fBtput\fP, -configured for both terminfo (tested first) and termcap (as a fallback). +Beginning in 2021, +FreeBSD uses +.I \%ncurses +.BR tput , +configured for both +.I \%term\%info +(tested first) +and +.I termcap +(as a fallback). .PP -Because (apparently) \fIall\fP of the certified Unix systems -support the full set of capability names, the reasoning for documenting -only a few may not be apparent. +Because (apparently) all +.I certified +Unix systems support the full set of capability codes, +the reason for documenting only a few may not be apparent. .bP -X/Open Curses Issue 7 documents \fBtput\fP differently, with \fIcapname\fP +X/Open Curses Issue\ 7 documents +.B tput +differently, +with +.I cap-code and the other features used in this implementation. .bP -That is, there are two standards for \fBtput\fP: +That is, +there are two standards for +.IR tput : POSIX (a subset) and X/Open Curses (the full implementation). -POSIX documents a subset to avoid the complication of including X/Open Curses -and the terminal capabilities database. +POSIX documents a subset to avoid the complication of including +X/Open Curses and the terminal capability database. .bP -While it is certainly possible to write a \fBtput\fP program -without using curses, -none of the systems which have a curses implementation provide -a \fBtput\fP utility which does not provide the \fIcapname\fP feature. +While it is certainly possible to write a +.I tput +program without using +.IR curses , +no system with a +.I curses +implementation provides a +.I tput +utility that does not also support standard +.IR cap-codes . .PP -X/Open Curses Issue 7 (2009) is the first version to document utilities. +X/Open Curses Issue\ 7 (2009) is the first version to document utilities. However that part of X/Open Curses does not follow existing practice -(i.e., Unix features documented in SVID 3): +(that is, +System\ V +.I curses +behavior). .bP -It assigns exit code 4 to \*(``invalid operand\*('', -which may be the same as \fIunknown capability\fP. -For instance, the source code for Solaris' xcurses uses the term -\*(``invalid\*('' in this case. +It assigns exit status 4 to \*(``invalid operand\*('', +which may have the same meaning as \*(``unknown capability\*(''. +For instance, +the source code for +Solaris +.I xcurses +uses the term \*(``invalid\*('' in this case. .bP -It assigns exit code 255 to a numeric variable that is not specified in -the terminfo database. +It assigns exit status 255 to a numeric variable that is not specified +in the +.I \%term\%info +database. That likely is a documentation error, -confusing the \fB\-1\fP written to the standard output for an absent -or cancelled numeric value versus an (unsigned) exit code. +mistaking the \*(``\-1\*('' written to the standard output to indicate +an absent or canceled numeric capability for an (unsigned) exit status. .PP -The various Unix systems (AIX, HPUX, Solaris) use the same exit-codes -as ncurses. +The various System\ V implementations +(AIX, +HP-UX, +Solaris) +use the same exit statuses as +.IR \%ncurses . .PP -NetBSD curses documents different exit codes which do not correspond -to either ncurses or X/Open. -.SH SEE ALSO -\fB@CLEAR@\fP(\*n), -\fBstty\fP(1), -\fB@TABS@\fP(\*n), -\fB@TSET@\fP(\*n), -\fBcurs_termcap\fP(3X), -\fBterminfo\fP(5). +NetBSD +.I curses +documents exit statuses that correspond to neither +.I \%ncurses +nor X/Open Curses. +.SH HISTORY +Bill Joy wrote a +.I tput +command during development of 4BSD in October 1980. +This initial version only cleared the screen, +and did not ship with official distributions. +.\" It also exited with backwards exit status (1 on success, 0 on +.\" failure), and was characterized by Bostic in 1988 as "pretty +.\" unreasonable". +.\" See Spinellis's "unix-history-repo" on GitHub. +.PP +System\ V developed a different +.I tput +command. +.bP +SVr2 (1984) provided a rudimentary +.I tput +that checked the parameter against each +predefined capability and returned the corresponding value. +This version of +.I tput +did not use \fB\%tparm\fP(3X) for parameterized capabilities. +.bP +SVr3 (1987) replaced that +.\" SVr3 released in 1987, not 1985. +.\" https://unix.org/what_is_unix/history_timeline.html +with a more extensive program +whose support for +.B init +and +.B \%reset +operands +(more than half the program) +incorporated the +.B \%reset +feature of BSD +.I tset +written by Eric Allman. +.bP +SVr4 (1989) added color initialization by using the +.B \%orig_colors +.RB ( oc ) +and +.B \%orig_pair +.RB ( op ) +capabilities in its +.B init +logic. +.PP +Keith Bostic refactored BSD +.I tput +for shipment in 4.3BSD-Reno (1990), +making it follow the interface of System\ V +.I tput +.\" https://minnie.tuhs.org/cgi-bin/utree.pl?file=4.3BSD-Reno/src/usr.bin/tput/tput.c +.\" https://minnie.tuhs.org/cgi-bin/utree.pl?file=Net2/usr/src/usr.bin/tput/tput.c +.\" https://minnie.tuhs.org/cgi-bin/utree.pl?file=4.4BSD/usr/src/usr.bin/tput/tput.c +by accepting some parameters named for +.I \%term\%info +(pseudo-)capabilities: +.BR clear , +.BR init , +.BR \%longname , +and +.BR \%reset . +However, +because he had only +.I termcap +available, +it accepted +.I termcap +codes for other capabilities. +Also, +Bostic's BSD +.I tput +did not modify the terminal modes as the earlier BSD +.I tset +had done. +At the same time, +Bostic added a shell script named \*(``clear\*('' that used +.I tput +to clear the screen. +.\" https://minnie.tuhs.org/cgi-bin/utree.pl?file=4.3BSD-Reno/src/usr.bin/tput/clear.sh +These became the \*(``modern\*('' BSD implementation of +.IR tput . +.PP +The origin of +.I \%ncurses +.B \%@TPUT@ +lies outside both System\ V and BSD, +in Ross Ridge's +.I \%mytinfo +package, +published on +.I comp.sources.unix +in December 1992. +Ridge's program made more sophisticated use of the terminal capabilities +than the BSD program. +Eric Raymond used that +.I tput +program +(and other parts of +.IR \%mytinfo ) +in +.I \%ncurses +in June 1995. +Incorporating the portions dealing with terminal capabilities +almost without change, +Raymond made improvements to the way command-line parameters +were handled. +.PP +Before +.I \%ncurses +6.1 (2018), +its +.B \%@TSET@ +and +.B \%@TPUT@ +utilities differed. +.bP +.B \%@TSET@ +was more effective, +resetting the terminal's modes and special input characters. +.bP +On the other hand, +.BR \%@TSET@ "'s" +repertoire of terminal capabilities for resetting the +terminal was more limited; +it had only equivalents of +.B \%reset_1string +.RB ( rs1 ), +.B \%reset_2string +.RB ( rs2 ), +and +.B \%reset_file +.RB ( rf ), +and not the tab stop and margin update features of +.BR \%@TPUT@ "." .PP -This describes \fBncurses\fP -version @NCURSES_MAJOR@.@NCURSES_MINOR@ (patch @NCURSES_PATCH@). +The +.I \%reset +program is traditionally an alias for +.B \%@TSET@ +due to its ability +to reset the terminal's modes and special input characters. +.PP +As of +.I \%ncurses +6.1, +the \*(``reset\*('' features of the two programs are (mostly) the same. +Two minor differences remain. +.bP +When issuing a reset, +the +.B \%@TSET@ +program +checks whether the device appears to be a pseudoterminal +(as might be used by a terminal emulator program), +and, +if it does not, +waits one second in case it is communicating with a hardware terminal. +.bP +The two programs write the terminal initialization strings +to different streams; +that is, +standard error for +.B \%@TSET@ +and +standard output for +.BR \%@TPUT@ "." +.SH EXAMPLES +.TP +.B "@TPUT@ init" +Initialize the terminal according to the type of +terminal in the +.I TERM +environment variable. +If the system does not reliably initialize the terminal upon login, +this command can be included in +.I \%$HOME/.profile +after exporting the +.I TERM +environment variable. +.TP +.B "@TPUT@ \-T5620 reset" +Reset an AT&T 5620 terminal, +overriding the terminal type in the +.I TERM +environment variable. +.TP +.B "@TPUT@ cnorm" +Set cursor to normal visibility. +.TP +.B "@TPUT@ home" +Move the cursor to line 0, +column 0: +the upper left corner of the screen, +usually known as the \*(``home\*('' cursor position. +.TP +.B "@TPUT@ clear" +Clear the screen: +write the +.B \%clear_screen +capability's value to the standard output stream. +.TP +.B "@TPUT@ cols" +Report the number of columns used by the current terminal type. +.TP +.B "@TPUT@ \-Tadm3a cols" +Report the number of columns used by an ADM-3A terminal. +.TP +.B "strong=\(ga@TPUT@ smso\(ga normal=\(ga@TPUT@ rmso\(ga" +Set shell variables to capability values: +.B strong +and +.BR normal , +to begin and end, +respectively, +stand-out mode for the terminal. +One might use these to present a prompt. +.IP +.EX +.RS 14 +printf "${strong}Username:${normal} " +.RE +.EE +.TP +.B "@TPUT@ hc" +Indicate via exit status whether the terminal is a hard copy device. +.TP +.B "@TPUT@ cup 23 4" +Move the cursor to line 23, +column 4. +.TP +.B "@TPUT@ cup" +Report the value of the +.B \%cursor_address +.RB ( cup ) +capability +(used for cursor movement), +with no parameters substituted. +.TP +.B "@TPUT@ longname" +Report the +.I \%term\%info +database's description of the terminal type specified in the +.I TERM +environment variable. +.TP +.B "@TPUT@ \-S" +Process multiple capabilities. +The +.B \-S +option can be profitably used with a shell \*(``here document\*(''. +.IP +.EX +.RB $\ "@TPUT@ \-S <\ clear +.RB >\ "cup 10 10" +.RB >\ bold +.RB >\ ! +.EE +.IP +The foregoing +clears the screen, +moves the cursor to position +(10, 10) +and turns on bold +(extra bright) +mode. +.TP +.B "@TPUT@ clear cup 10 10 bold" +Perform the same actions as the foregoing +.RB \%\*(`` "@TPUT@ \-S" \*('' +example. +.SH SEE ALSO +\fB\%@CLEAR@\fP(1), +\fB\%stty\fP(1), +\fB\%@TABS@\fP(1), +\fB\%@TSET@\fP(1), +\fB\%curs_termcap\fP(3X), +\fB\%terminfo\fP(5) diff --git a/man/tset.1 b/man/tset.1 index 860c0875..3e7b0fc1 100644 --- a/man/tset.1 +++ b/man/tset.1 @@ -1,5 +1,5 @@ .\"*************************************************************************** -.\" Copyright 2018-2021,2022 Thomas E. Dickey * +.\" Copyright 2018-2024,2025 Thomas E. Dickey * .\" Copyright 1998-2016,2017 Free Software Foundation, Inc. * .\" * .\" Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,24 +27,36 @@ .\" authorization. * .\"*************************************************************************** .\" -.\" $Id: tset.1,v 1.62 2022/02/12 20:02:20 tom Exp $ -.TH @TSET@ 1 "" -.ie \n(.g .ds `` \(lq -.el .ds `` `` -.ie \n(.g .ds '' \(rq -.el .ds '' '' +.\" $Id: tset.1,v 1.94 2025/01/19 00:51:54 tom Exp $ +.TH @TSET@ 1 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands" +.ie \n(.g \{\ +.ds `` \(lq +.ds '' \(rq +.ds ^ \(ha +.\} +.el \{\ +.ie t .ds `` `` +.el .ds `` "" +.ie t .ds '' '' +.el .ds '' "" +.ds ^ ^ +.\} +. .de bP .ie n .IP \(bu 4 .el .IP \(bu 2 .. +. .SH NAME -\fB@TSET@\fP, \fB@RESET@\fP \- terminal initialization +\fB\%@TSET@\fP, +\fB\%@RESET@\fP \- +initialize or reset terminal state .SH SYNOPSIS -\fB@TSET@\fP [\fB\-IQVcqrsw\fP] [\fB\-\fP] [\fB\-e\fP \fIch\fP] [\fB\-i\fP \fIch\fP] [\fB\-k\fP \fIch\fP] [\fB\-m\fP \fImapping\fP] [\fIterminal\fP] +\fB@TSET@\fP [\fB\-IQVcqrsw\fP] [\fB\-\fP] [\fB\-e\fP \fIch\fP] [\fB\-i\fP \fIch\fP] [\fB\-k\fP \fIch\fP] [\fB\-m\fP \fImapping\fP] [\fIterminal-type\fP] .br -\fB@RESET@\fP [\fB\-IQVcqrsw\fP] [\fB\-\fP] [\fB\-e\fP \fIch\fP] [\fB\-i\fP \fIch\fP] [\fB\-k\fP \fIch\fP] [\fB\-m\fP \fImapping\fP] [\fIterminal\fP] +\fB@RESET@\fP [\fB\-IQVcqrsw\fP] [\fB\-\fP] [\fB\-e\fP \fIch\fP] [\fB\-i\fP \fIch\fP] [\fB\-k\fP \fIch\fP] [\fB\-m\fP \fImapping\fP] [\fIterminal-type\fP] .SH DESCRIPTION -.SS tset - initialization +.SS "\fItset\fP \(em initialization" This program initializes terminals. .PP First, \fB@TSET@\fP retrieves the current terminal mode settings @@ -68,20 +80,20 @@ This determination is done as follows, using the first terminal type found. .PP 1. The \fBterminal\fP argument specified on the command line. .PP -2. The value of the \fBTERM\fP environmental variable. +2. The value of the \fITERM\fP environment variable. .PP 3. (BSD systems only.) The terminal type associated with the standard error output device in the \fI/etc/ttys\fP file. -(On System\-V-like UNIXes and systems using that convention, -\fBgetty\fP(1) does this job by setting -\fBTERM\fP according to the type passed to it by \fI/etc/inittab\fP.) +(On System\ V hosts and systems using that convention, +\fI\%getty\fP(8) does this job by setting +\fITERM\fP according to the type passed to it by \fI\%/etc/inittab\fP.) .PP -4. The default terminal type, \*(``unknown\*(''. +4. The default terminal type, \*(``unknown\*('', +is not suitable for curses applications. .PP If the terminal type was not specified on the command-line, the \fB\-m\fP -option mappings are then applied (see the section -.B TERMINAL TYPE MAPPING -for more information). +option mappings are then applied; +see subsection \*(``Terminal Type Mapping\*(''. Then, if the terminal type begins with a question mark (\*(``?\*(''), the user is prompted for confirmation of the terminal type. An empty @@ -98,8 +110,10 @@ if the \*(``\fB\-w\fP\*('' option is enabled, \fB@TSET@\fP may update the terminal's window size. .IP If the window size cannot be obtained from the operating system, -but the terminal description (or environment, e.g., \fBLINES\fP -and \fBCOLUMNS\fP variables specify this), +but the terminal description +(or environment, +e.g., +\fILINES\fP and \fI\%COLUMNS\fP variables specify this), use this to set the operating system's notion of the window size. .bP if the \*(``\fB\-c\fP\*('' option is enabled, @@ -109,23 +123,25 @@ the backspace, interrupt and line kill characters unless the \*(``\fB\-I\fP\*('' option is enabled, the terminal and tab \fIinitialization\fP strings are sent to the standard error output, -and \fB@TSET@\fP waits one second (in case a hardware reset was issued). +and, +if the terminal device does not appear to be a pseudoterminal +(as might be used by a terminal emulator program), +\fB@TSET@\fP waits one second in case a hardware reset was issued. .bP Finally, if the erase, interrupt and line kill characters have changed, or are not set to their default values, their values are displayed to the standard error output. -.SS reset - reinitialization -.PP +.SS "\fIreset\fP \(em reinitialization" When invoked as \fB@RESET@\fP, \fB@TSET@\fP sets the terminal modes to \*(``sane\*('' values: .bP -sets cooked and echo modes, +sets canonical (\*(``cooked\*('') and echo modes, .bP turns off cbreak and raw modes, .bP turns on newline translation and .bP -resets any unset special characters to their default values +resets special input characters to their default values .PP before doing the terminal initialization described above. @@ -143,87 +159,29 @@ you may have to type to work, as carriage-return may no longer work in the abnormal state. .bP Also, the terminal will often not echo the command. -.SH OPTIONS -.PP -The options are as follows: -.TP 5 -.B \-c -Set control characters and modes. -.TP 5 -.BI \-e\ ch -Set the erase character to \fIch\fP. -.TP -.B \-I -Do not send the terminal or tab initialization strings to the terminal. -.TP -.BI \-i\ ch -Set the interrupt character to \fIch\fP. -.TP -.BI \-k\ ch -Set the line kill character to \fIch\fP. -.TP -.BI \-m\ mapping -Specify a mapping from a port type to a terminal. -See the section -.B TERMINAL TYPE MAPPING -for more information. -.TP -.B \-Q -Do not display any values for the erase, interrupt and line kill characters. -Normally \fB@TSET@\fP displays the values for control characters which -differ from the system's default values. -.TP -.B \-q -The terminal type is displayed to the standard output, and the terminal is -not initialized in any way. -The option \*(``\-\*('' by itself is equivalent but archaic. -.TP -.B \-r -Print the terminal type to the standard error output. -.TP -.B \-s -Print the sequence of shell commands to initialize the environment variable -\fBTERM\fP to the standard output. -See the section -.B SETTING THE ENVIRONMENT -for details. -.TP -.B \-V -reports the version of ncurses which was used in this program, and exits. -.TP -.B \-w -Resize the window to match the size deduced via \fBsetupterm\fP(3X). -Normally this has no effect, -unless \fBsetupterm\fP is not able to detect the window size. -.PP -The arguments for the \fB\-e\fP, \fB\-i\fP, and \fB\-k\fP -options may either be entered as actual characters -or by using the \*(``hat\*('' -notation, i.e., control-h may be specified as \*(``^H\*('' or \*(``^h\*(''. -.PP -If neither \fB\-c\fP or \fB\-w\fP is given, both options are assumed. -. -.SH SETTING THE ENVIRONMENT +.SS "Setting the Environment" It is often desirable to enter the terminal type and information about the terminal's capabilities into the shell's environment. This is done using the \fB\-s\fP option. .PP When the \fB\-s\fP option is specified, the commands to enter the information into the shell's environment are written to the standard output. -If -the \fBSHELL\fP environmental variable ends in \*(``csh\*('', the commands -are for \fBcsh\fP, otherwise, they are for \fBsh\fP(1). -Note, the \fBcsh\fP commands set and unset the shell variable -\fBnoglob\fP, leaving it unset. +If the \fISHELL\fP environment variable ends in \*(``csh\*('', +the commands +are for \fIcsh\fP(1), +otherwise, +they are for \fIsh\fP(1). +The \fIcsh\fP commands set and unset the shell variable \fBnoglob\fP, +leaving it unset. The following line in the \fB.login\fP or \fB.profile\fP files will initialize the environment correctly: .sp - eval \`@TSET@ \-s options ... \` + eval \(ga@TSET@ \-s options ... \(ga . -.SH TERMINAL TYPE MAPPING +.SS "Terminal Type Mapping" When the terminal is not hardwired into the system (or the current system information is incorrect) the terminal type derived from the -\fI/etc/ttys\fP file or the \fBTERM\fP environmental variable is often +\fI/etc/ttys\fP file or the \fITERM\fP environment variable is often something generic like \fBnetwork\fP, \fBdialup\fP, or \fBunknown\fP. When \fB@TSET@\fP is used in a startup script it is often desirable to provide information about the type of terminal used on such ports. @@ -280,43 +238,92 @@ terminal. No whitespace characters are permitted in the \fB\-m\fP option argument. Also, to avoid problems with meta-characters, it is suggested that the entire \fB\-m\fP option argument be placed within single quote characters, -and that \fBcsh\fP users insert a backslash character (\*(``\e\*('') before -any exclamation marks (\*(``!\*(''). -.SH HISTORY -.PP -A \fBreset\fP command appeared in 1BSD (March 1978), written by Kurt Shoens. -This program set the \fIerase\fP and \fIkill\fP characters -to \fB^H\fP (backspace) and \fB@\fP respectively. -Mark Horton improved that in 3BSD (October 1979), adding -\fIintr\fP, \fIquit\fP, \fIstart\fP/\fIstop\fP and \fIeof\fP characters -as well as changing the program to avoid modifying any user settings. -That version of \fBreset\fP did not use the termcap database. -.PP -A separate \fBtset\fP command was provided in 1BSD by Eric Allman, -using the termcap database. -Allman's comments in the source code indicate -that he began work in October 1977, -continuing development over the next few years. -.PP -According to comments in the source code, -the \fBtset\fP program was modified in September 1980, -to use logic copied from the 3BSD \*(``reset\*('' -when it was invoked as \fBreset\fP. -This version appeared in 4.1cBSD, late in 1982. -.PP -Other developers (e.g., Keith Bostic and Jim Bloom) -continued to modify \fBtset\fP until 4.4BSD was released in 1993. +and that \fIcsh\fP users insert a backslash character (\*(``\e\*('') +before any exclamation marks (\*(``!\*(''). +.SH OPTIONS +The options are as follows: +.TP 5 +.B \-c +Set control characters and modes. +.TP 5 +.BI \-e\ ch +Set the erase character to \fIch\fP. +.TP +.B \-I +Do not send the terminal or tab initialization strings to the terminal. +.TP +.BI \-i\ ch +Set the interrupt character to \fIch\fP. +.TP +.BI \-k\ ch +Set the line kill character to \fIch\fP. +.TP +.BI \-m\ mapping +Specify a mapping from a port type to a terminal; +see subsection \*(``Terminal Type Mapping\*(''. +.TP +.B \-Q +Do not display any values for the erase, interrupt and line kill characters. +Normally \fB@TSET@\fP displays the values for control characters which +differ from the system's default values. +.TP +.B \-q +The terminal type is displayed to the standard output, and the terminal is +not initialized in any way. +The option \*(``\-\*('' by itself is equivalent but archaic. +.TP +.B \-r +Print the terminal type to the standard error output. +.TP +.B \-s +Print the sequence of shell commands to initialize the environment variable +\fITERM\fP to the standard output; +see subsection \*(``Setting the Environment\*(''. +.TP +.B \-V +reports the version of \fI\%ncurses\fP which was used in this program, +and exits. +.TP +.B \-w +Resize the window to match the size deduced via \fBsetupterm\fP(3X). +Normally this has no effect, +unless \fBsetupterm\fP is not able to detect the window size. .PP -The \fBncurses\fP implementation -was lightly adapted from the 4.4BSD sources for a terminfo environment by Eric -S. Raymond . -.SH COMPATIBILITY +The arguments for the \fB\-e\fP, \fB\-i\fP, and \fB\-k\fP +options may either be entered as actual characters +or by using the \*(``hat\*('' +notation, i.e., control-h may be specified as \*(``\*^H\*('' or \*(``\*^h\*(''. .PP -Neither IEEE Std 1003.1/The Open Group Base Specifications Issue 7 +If neither \fB\-c\fP or \fB\-w\fP is given, both options are assumed. +.SH ENVIRONMENT +The \fB@TSET@\fP command uses these environment variables: +.TP 5 +.I SHELL +tells \fB@TSET@\fP whether to initialize \fITERM\fP using \fIsh\fP(1) or +\fIcsh\fP(1) syntax. +.TP 5 +.I TERM +Denotes your terminal type. +Each terminal type is distinct, though many are similar. +.TP 5 +.I TERMCAP +may denote the location of a termcap database. +If it is not an absolute pathname, e.g., begins with a \*(``/\*('', +\fB@TSET@\fP removes the variable from the environment before looking +for the terminal description. +.SH FILES +.TP +.I /etc/ttys +system port name to terminal type mapping database (BSD versions only). +.TP +.I @TERMINFO@ +compiled terminal description database directory +.SH PORTABILITY +Neither IEEE Std 1003.1/The Open Group Base Specifications Issue\ 7 (POSIX.1-2008) nor -X/Open Curses Issue 7 documents \fB@TSET@\fP or \fB@RESET@\fP. +X/Open Curses Issue\ 7 documents \fB@TSET@\fP or \fB@RESET@\fP. .PP -The AT&T \fBtput\fP utility (AIX, HPUX, Solaris) +The AT&T \fBtput\fP utility (AIX, HP-UX, Solaris) incorporated the terminal-mode manipulation as well as termcap-based features such as resetting tabstops from \fBtset\fP in BSD (4.1c), presumably with the intention of making \fBtset\fP obsolete. @@ -324,21 +331,24 @@ However, each of those systems still provides \fBtset\fP. In fact, the commonly-used \fBreset\fP utility is always an alias for \fBtset\fP. .PP -The \fB@TSET@\fP utility provides for backward-compatibility with BSD -environments (under most modern UNIXes, \fB/etc/inittab\fP and \fBgetty\fP(1) -can set \fBTERM\fP appropriately for each dial-up line; this obviates what was -\fB@TSET@\fP's most important use). -This implementation behaves like 4.4BSD -\fBtset\fP, with a few exceptions specified here. +The \fB\%@TSET@\fP utility provides backward compatibility with BSD +environments; +under most modern Unices, +\fI\%/etc/inittab\fP and \fI\%getty\fP(8) can set \fITERM\fP +appropriately for each dial-up line, +obviating what was \fB\%@TSET@\fP's most important use. +This implementation behaves like 4.4BSD \fBtset\fP, +with a few exceptions we shall consider now. .PP A few options are different -because the \fBTERMCAP\fP variable -is no longer supported under terminfo-based \fBncurses\fP: +because the \fI\%TERMCAP\fP variable +is no longer supported under terminfo-based \fI\%ncurses\fP: .bP The \fB\-S\fP option of BSD \fBtset\fP no longer works; it prints an error message to the standard error and dies. .bP -The \fB\-s\fP option only sets \fBTERM\fP, not \fBTERMCAP\fP. +The \fB\-s\fP option only sets \fITERM\fP, +not \fI\%TERMCAP\fP. .PP There was an undocumented 4.4BSD feature that invoking \fBtset\fP via a link named @@ -382,57 +392,75 @@ In 4.4BSD, \fBtset\fP uses the window size from the termcap description to set the window size if \fBtset\fP is not able to obtain the window size from the operating system. .bP -In ncurses, \fB@TSET@\fP obtains the window size using -\fBsetupterm\fP, which may be from +In \fI\%ncurses\fP, \fB@TSET@\fP obtains the window size using +\fB\%setupterm\fP(3X), which may be from the operating system, -the \fBLINES\fP and \fBCOLUMNS\fP environment variables or +the \fILINES\fP and \fICOLUMNS\fP environment variables or the terminal description. .PP -Obtaining the window size from the terminal description is common to -both implementations, but considered obsolescent. +Obtaining the window size from a terminal's type description is common +to both implementations, +but considered obsolescent. Its only practical use is for hardware terminals. -Generally speaking, a window size would be unset only if there were -some problem obtaining the value from the operating system -(and \fBsetupterm\fP would still fail). -For that reason, the \fBLINES\fP and \fBCOLUMNS\fP environment variables -may be useful for working around window-size problems. -Those have the drawback that if the window is resized, -those variables must be recomputed and reassigned. -To do this more easily, use the \fBresize\fP(1) program. -.SH ENVIRONMENT -The \fB@TSET@\fP command uses these environment variables: -.TP 5 -SHELL -tells \fB@TSET@\fP whether to initialize \fBTERM\fP using \fBsh\fP(1) or -\fBcsh\fP(1) syntax. -.TP 5 -TERM -Denotes your terminal type. -Each terminal type is distinct, though many are similar. -.TP 5 -TERMCAP -may denote the location of a termcap database. -If it is not an absolute pathname, e.g., begins with a \*(``/\*('', -\fB@TSET@\fP removes the variable from the environment before looking -for the terminal description. -.SH FILES -.TP 5 -/etc/ttys -system port name to terminal type mapping database (BSD versions only). -.TP -@TERMINFO@ -terminal capability database +Generally, +the window size will remain uninitialized only if there were a problem +obtaining the value from the operating system +(and \fB\%setupterm\fP would still fail). +The \fILINES\fP and \fI\%COLUMNS\fP environment variables +may thus be useful for working around window-size problems, +but have the drawback that if the window is resized, +their values must be recomputed and reassigned. +The \fI\%resize\fP(1) program distributed with +\fI\%xterm\fP(1) assists this activity. +.SH HISTORY +A \fB\%reset\fP command written by Kurt Shoens appeared in 1BSD +(March 1978). +.\" https://minnie.tuhs.org/cgi-bin/utree.pl?file=1BSD/s6/reset.c +It set the \fIerase\fP and \fIkill\fP characters +to \fB\*^H\fP (backspace) and \fB@\fP respectively. +Mark Horton improved this \fB\%reset\fP in 3BSD +(October 1979), +adding \fIintr\fP, +\fIquit\fP, +\fIstart\fP/\fIstop\fP, +and \fIeof\fP +characters as well as changing the program to avoid modifying any user +settings. +.\" https://minnie.tuhs.org/cgi-bin/utree.pl?file=3BSD/usr/src/cmd/\ +.\" reset.c +That version of \fB\%reset\fP did not use \fI\%termcap\fP. +.PP +Eric Allman wrote a distinct \fBtset\fP command for 1BSD, +using a forerunner of \fI\%termcap\fP called \fI\%ttycap\fP. +.\" https://minnie.tuhs.org/cgi-bin/utree.pl?file=1BSD/s6/tset.c +.\" https://minnie.tuhs.org/cgi-bin/utree.pl?file=1BSD/man7/ttycap.7 +Allman's comments in the source code indicate +that he began work in October 1977, +continuing development over the next few years. +By late 1979, +it had migrated to \fI\%termcap\fP and handled the \fI\%TERMCAP\fP +variable. +.\" https://minnie.tuhs.org/cgi-bin/utree.pl?file=3BSD/usr/src/cmd/\ +.\" tset/tset.c +Later comments indicate that \fBtset\fP was modified in September 1980 +to use logic copied from the 3BSD \*(``reset\*('' program when it was +invoked as \fB\%reset\fP. +.\" https://minnie.tuhs.org/cgi-bin/utree.pl?file=2.9BSD/usr/src/ucb/\ +.\" tset/tset.c +This version appeared in 4.1cBSD, \" and backported to 2.9BSD +late in 1982. +Other developers such as Keith Bostic and Jim Bloom continued to modify +\fBtset\fP until 4.4BSD was released in 1993. +.PP +The \fI\%ncurses\fP implementation was lightly adapted from the 4.4BSD +sources to use the \fI\%terminfo\fP API by Eric S.\& Raymond +. .SH SEE ALSO -.hy 0 -\fBcsh\fP(1), -\fBsh\fP(1), -\fBstty\fP(1), -\fBcurs_terminfo\fP(3X), -\fBtty\fP(4), -\fBterminfo\fP(5), -\fBttys\fP(5), -\fBenviron\fP(7) -.hy -.PP -This describes \fBncurses\fP -version @NCURSES_MAJOR@.@NCURSES_MINOR@ (patch @NCURSES_PATCH@). +\fB\%csh\fP(1), +\fB\%sh\fP(1), +\fB\%stty\fP(1), +\fB\%curs_terminfo\fP(3X), +\fB\%tty\fP(4), +\fB\%terminfo\fP(5), +\fB\%ttys\fP(5), +\fB\%environ\fP(7) diff --git a/man/user_caps.5 b/man/user_caps.5 index b43e218f..cf5fa858 100644 --- a/man/user_caps.5 +++ b/man/user_caps.5 @@ -1,5 +1,6 @@ +'\" t .\"*************************************************************************** -.\" Copyright 2018-2021,2022 Thomas E. Dickey * +.\" Copyright 2018-2023,2024 Thomas E. Dickey * .\" Copyright 2017 Free Software Foundation, Inc. * .\" * .\" Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,45 +28,45 @@ .\" authorization. * .\"*************************************************************************** .\" -.\" $Id: user_caps.5,v 1.22 2022/07/03 20:01:04 tom Exp $ -.TH user_caps 5 -.ie \n(.g .ds `` \(lq -.el .ds `` `` -.ie \n(.g .ds '' \(rq -.el .ds '' '' -.de NS -.ie n .sp -.el .sp .5 -.ie n .in +4 -.el .in +2 -.nf -.ft C \" Courier -.. -.de NE -.fi -.ft R -.ie n .in -4 -.el .in -2 -.. +.\" $Id: user_caps.5,v 1.51 2024/06/08 21:01:53 tom Exp $ +.TH user_caps 5 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "File formats" +.ie \n(.g \{\ +.ds `` \(lq +.ds '' \(rq +.\} +.el \{\ +.ie t .ds `` `` +.el .ds `` "" +.ie t .ds '' '' +.el .ds '' "" +.\} +. .de bP .ie n .IP \(bu 4 .el .IP \(bu 2 .. .SH NAME -user_caps \- user-defined terminfo capabilities +user_caps \- +user-defined \fIterminfo\fR capability format .SH SYNOPSIS -.B @TIC@ -x, @INFOCMP@ -x +.B @INFOCMP@ \-x +.PP +.B @TIC@ \-x .SH DESCRIPTION .SS Background -.PP -Before ncurses 5.0, +Before \fI\%ncurses\fP 5.0, terminfo databases used a \fIfixed repertoire\fP of terminal capabilities designed for the SVr2 terminal database in 1984, and extended in stages through SVr4 (1989), -and standardized in the Single Unix Specification beginning in 1995. +and standardized in X/Open Curses starting in 1995. +.\" That date is a surmise based on the capability list appearing in +.\" Issue 4, Version 2 (1996). That list is not in man page format in +.\" the standard, so lacks a "HISTORY" section. However, `tigetstr()` +.\" and `tputs()` are identified in the same document as new to Issue 4, +.\" so GBR conjectures that the list came in at the same time. .PP Most of the \fIextensions\fP in this fixed repertoire were additions -to the tables of boolean, numeric and string capabilities. +to the tables of Boolean, numeric and string capabilities. Rather than change the meaning of an existing capability, a new name was added. The terminfo database uses a binary format; binary compatibility was ensured by using a header which gave the number of items in the @@ -92,22 +93,24 @@ Although they \fImay\fP provide all of the standard capability names, the position in the tables differs because some features were added as needed, while others were added (out of order) to comply with X/Open Curses. .IP -While ncurses' repertoire of predefined capabilities is closest to Solaris, +While \fI\%ncurses\fP' repertoire of predefined capabilities is closest +to Solaris, Solaris's terminfo database has a few differences from the list published by X/Open Curses. -For example, ncurses can be configured with tables which match the -terminal databases for AIX, HP-UX or OSF/1, +For example, +\fI\%ncurses\fP can be configured with tables which match the terminal +databases for AIX, HP-UX or OSF/1, rather than the default Solaris-like configuration. .bP -In SVr4 curses and ncurses, +In SVr4 curses and \fI\%ncurses\fP, the terminal database is defined at compile-time using a text file which lists the different terminal capabilities. .IP In principle, the text-file can be extended, but doing this requires recompiling and reinstalling the library. -The text-file used in ncurses for terminal capabilities includes +The text-file used in \fI\%ncurses\fP for terminal capabilities includes details for various systems past the documented X/Open Curses features. -For example, ncurses supports these capabilities in each configuration: +For example, \fI\%ncurses\fP supports these capabilities in each configuration: .RS 8 .TP 5 memory_lock @@ -142,16 +145,16 @@ it could represent larger numbers. Although termcap's extensibility was rarely used (it was never the \fIspeaker\fP who had actually used the feature), the criticism had a point. -ncurses 5.0 provided a way to detect nonstandard capabilities, +\fI\%ncurses\fP 5.0 provided a way to detect nonstandard capabilities, determine their type and optionally store and retrieve them in a way which did not interfere with other applications. These are referred to as \fIuser-defined capabilities\fP because no modifications to the toolset's predefined capability names are needed. .PP -The ncurses utilities \fB@TIC@\fP and \fB@INFOCMP@\fP have a command-line -option \*(``\-x\*('' to control whether the nonstandard capabilities -are stored or retrieved. +The \fI\%ncurses\fP utilities \fB@TIC@\fP and \fB@INFOCMP@\fP have a +command-line option \*(``\-x\*('' to control whether the nonstandard +capabilities are stored or retrieved. A library function \fBuse_extended_names\fP is provided for the same purpose. .PP @@ -159,7 +162,7 @@ When compiling a terminal database, if \*(``\-x\*('' is set, \fB@TIC@\fP will store a user-defined capability if the capability name is not one of the predefined names. .PP -Because ncurses provides a termcap library interface, +Because \fI\%ncurses\fP provides a termcap library interface, these user-defined capabilities may be visible to termcap applications: .bP The termcap interface (like all implementations of termcap) @@ -181,21 +184,20 @@ While terminfo and termcap have a set of 60 predefined function-key names, to which a series of keys can be assigned, that is insufficient for more than a dozen keys multiplied by more than a couple of modifier combinations. -The ncurses database uses a convention based on \fBxterm\fP(1) to -provide extended special-key names. +The \fI\%ncurses\fP database uses a convention based on \fBxterm\fP(1) +to provide extended special-key names. .IP Fitting that into termcap's limitation of 2-character names would be pointless. These extended keys are available only with terminfo. -.SS Recognized capabilities -.PP -The ncurses library uses the user-definable capabilities. +.SS "Recognized Capabilities" +The \fI\%ncurses\fP library uses the user-definable capabilities. While the terminfo database may have other extensions, -ncurses makes explicit checks for these: +\fI\%ncurses\fP makes explicit checks for these: .RS 3 .TP 3 AX -\fIboolean\fP, asserts that the terminal interprets SGR 39 and SGR 49 +\fIBoolean\fP, asserts that the terminal interprets SGR 39 and SGR 49 by resetting the foreground and background color, respectively, to the default. .IP This is a feature recognized by the \fBscreen\fP program as well. @@ -208,13 +210,15 @@ the terminal. The command \*(``\fBtput clear\fP\*('' does the same thing. .TP 3 NQ -used to suppress a consistency check in @TIC@ for the ncurses capabilities +\fIBoolean\fP, +used to suppress a consistency check in @TIC@ for the \fI\%ncurses\fP +capabilities in user6 through user9 (u6, u7, u8 and u9) which tell how to query the terminal's cursor position and its device attributes. .TP 3 RGB -\fIboolean\fP, \fInumber\fP \fBor\fP \fIstring\fP, +\fIBoolean\fP, \fInumber\fP \fBor\fP \fIstring\fP, used to assert that the \fBset_a_foreground\fP and \fBset_a_background\fP capabilities correspond to \fIdirect colors\fP, @@ -223,22 +227,24 @@ This capability allows the \fBcolor_content\fP function to return appropriate values without requiring the application to initialize colors using \fBinit_color\fP. .IP -The capability type determines the values which ncurses sees: +The capability type determines the values which \fI\%ncurses\fP sees: .RS 3 .TP 3 -\fIboolean\fP +\fIBoolean\fP implies that the number of bits for red, green and blue are the same. Using the maximum number of colors, -ncurses adds two, divides that sum by three, and assigns the result -to red, green and blue in that order. +\fI\%ncurses\fP adds two, +divides that sum by three, +and assigns the result to red, +green and blue in that order. .IP If the number of bits needed for the number of colors is not a multiple of three, the blue (and green) components lose in comparison to red. .TP 3 \fInumber\fP -tells ncurses what result to add to red, green and blue. -If ncurses runs out of bits, -blue (and green) lose just as in the \fIboolean\fP case. +tells \fI\%ncurses\fP what result to add to red, green and blue. +If \fI\%ncurses\fP runs out of bits, +blue (and green) lose just as in the \fIBoolean\fP case. .TP 3 \fIstring\fP explicitly list the number of bits used for red, green and blue components @@ -253,27 +259,29 @@ to represent the standard eight ANSI colors, i.e., one bit per color. .TP 3 U8 \fInumber\fP, -asserts that ncurses must use Unicode values for line-drawing characters, +asserts that \fI\%ncurses\fP must use Unicode values for line-drawing +characters, and that it should ignore the alternate character set capabilities when the locale uses UTF-8 encoding. For more information, see the discussion of -\fBNCURSES_NO_UTF8_ACS\fP in \fBncurses\fP(3X). +\fBNCURSES_NO_UTF8_ACS\fP in \fB\%ncurses\fP(3X). .IP Set this capability to a nonzero value to enable it. .TP 3 XM \fIstring\fP, -override ncurses's built-in string which +override \fI\%ncurses\fP's built-in string which enables/disables \fBxterm\fP(1) mouse mode. .IP -ncurses sends a character sequence to the terminal to initialize mouse mode, +\fI\%ncurses\fP sends a character sequence to the terminal to initialize mouse mode, and when the user clicks the mouse buttons or (in certain modes) moves the mouse, handles the characters sent back by the terminal to tell it what was done with the mouse. .IP The mouse protocol is enabled when the \fImask\fP passed in the \fBmousemask\fP function is nonzero. -By default, ncurses handles the responses for the X11 xterm mouse protocol. +By default, +\fI\%ncurses\fP handles the responses for the X11 xterm mouse protocol. It also knows about the \fISGR 1006\fP xterm mouse protocol, but must to be told to look for this specifically. It will not be able to guess which mode is used, @@ -282,7 +290,7 @@ because the responses are enough alike that only confusion would result. The \fBXM\fP capability has a single parameter. If nonzero, the mouse protocol should be enabled. If zero, the mouse protocol should be disabled. -ncurses inspects this capability if it is present, +\fI\%ncurses\fP inspects this capability if it is present, to see whether the 1006 protocol is used. If so, it expects the responses to use the \fISGR 1006\fP xterm mouse protocol. .IP @@ -330,22 +338,21 @@ xterm mouse protocols: .IP .nf xterm+x11mouse|X11 xterm mouse protocol, - kmous=\\E[M, XM=\\E[?1000%?%p1%{1}%=%th%el%;, - xm=\\E[M + kmous=\eE[M, XM=\eE[?1000%?%p1%{1}%=%th%el%;, + xm=\eE[M %?%p4%t%p3%e%{3}%;%'\ '%+%c %p2%'!'%+%c %p1%'!'%+%c, xterm+sm+1006|xterm SGR-mouse, - kmous=\\E[<, XM=\\E[?1006;1000%?%p1%{1}%=%th%el%;, - xm=\\E[<%i%p3%d; + kmous=\eE[<, XM=\eE[?1006;1000%?%p1%{1}%=%th%el%;, + xm=\eE[<%i%p3%d; %p1%d; %p2%d; %?%p4%tM%em%;, .fi . -.SS Extended key-definitions -.PP +.SS "Extended Key Definitions" Several terminals provide the ability to send distinct strings for combinations of modified special keys. There is no standard for what those keys can send. @@ -353,33 +360,52 @@ There is no standard for what those keys can send. Since 1999, \fBxterm\fP(1) has supported \fIshift\fP, \fIcontrol\fP, \fIalt\fP, and \fImeta\fP modifiers which produce distinct special-key strings. -In a terminal description, ncurses has no special knowledge of the -modifiers used. +In a terminal description, +\fI\%ncurses\fP has no special knowledge of the modifiers used. Applications can use the \fInaming convention\fP established for \fBxterm\fP to find these special keys in the terminal description. .PP -Starting with the curses convention that \fIkey names\fP begin with \*(``k\*('' -and that shifted special keys are an uppercase name, -ncurses' terminal database defines these names to which a suffix is added: +Starting with the +.I curses +convention that capability codes describing the input generated by a +terminal's key caps begin with \*(``k\*('', +and that shifted special keys use uppercase letters in their names, +.IR \%ncurses 's +terminal database defines the following names and codes to which a +suffix is added. +.PP .RS 5 .TS -tab(/) ; -l l . -\fBName\fP/\fBDescription\fP +Lb Lb +Lb Lx. +Code Description _ -kDC/special form of kdch1 (delete character) -kDN/special form of kcud1 (cursor down) -kEND/special form of kend (End) -kHOM/special form of khome (Home) -kLFT/special form of kcub1 (cursor-left or cursor-back) -kNXT/special form of knext (Next, or Page-Down) -kPRV/special form of kprev (Prev, or Page-Up) -kRIT/special form of kcuf1 (cursor-right, or cursor-forward) -kUP/special form of kcuu1 (cursor-up) +kDC shifted kdch1 (delete character) +.\" kDC is a standard capability; see X/Open Curses Issue 7, p. 345. +kDN shifted kcud1 (cursor down) +kEND shifted kend (end) +kHOM shifted khome (home) +kLFT shifted kcub1 (cursor back) +kNXT shifted knext (next) +kPRV shifted kprev (previous) +kRIT shifted kcuf1 (cursor forward) +kUP shifted kcuu1 (cursor up) .TE .RE .PP +Keycap nomenclature on the Unix systems for which +.I curses +was developed differs from today's ubiquitous descendants of the IBM +PC/AT keyboard layout. +In the foregoing, +interpret \*(``backward\*('' as \*(``left\*('', +\*(``forward\*('' as \*(``right\*('', +\*(``next\*('' as \*(``page down\*('', +and +\*(``prev(ious)\*('' as \*(``page up\*(''. +.PP These are the suffixes used to denote the modifiers: +.PP .RS 5 .TS tab(/) ; @@ -405,8 +431,9 @@ _ .RE .PP None of these are predefined; terminal descriptions can refer to \fInames\fP -which ncurses will allocate at runtime to \fIkey-codes\fP. -To use these keys in an ncurses program, an application could do this: +which \fI\%ncurses\fP will allocate at runtime to \fIkey-codes\fP. +To use these keys in an \fI\%ncurses\fP program, +an application could do this: .bP using a list of extended key \fInames\fP, ask \fBtigetstr\fP(3X) for their values, and @@ -414,32 +441,29 @@ ask \fBtigetstr\fP(3X) for their values, and given the list of values, ask \fBkey_defined\fP(3X) for the \fIkey-code\fP which would be returned for those keys by \fBwgetch\fP(3X). -.PP .\" .SH PORTABILITY -.PP The \*(``\-x\*('' extension feature of \fB@TIC@\fP and \fB@INFOCMP@\fP has been adopted in NetBSD curses. That implementation stores user-defined capabilities, but makes no use of these capabilities itself. .\" +.SH AUTHORS +Thomas E. Dickey +.br +beginning with \fI\%ncurses\fP 5.0 (1999) +.\" .SH SEE ALSO -.PP -\fB@INFOCMP@\fP(1M), -\fB@TIC@\fP(1M). +\fB\%@INFOCMP@\fP(1M), +\fB\%@TIC@\fP(1M) .PP The terminal database section .I "NCURSES USER-DEFINABLE CAPABILITIES" summarizes commonly-used user-defined capabilities which are used in the terminal descriptions. -Some of those features are mentioned in \fBscreen\fP(1) or \fBtmux\fP(1). +Some of those features are mentioned in \fB\%screen\fP(1) or +\fBtmux\fP(1). .PP .I "XTerm Control Sequences" -provides further information on the \fBxterm\fP(1) features -which are used in these extended capabilities. -.\" -.SH AUTHORS -.PP -Thomas E. Dickey -.br -beginning with ncurses 5.0 (1999) +provides further information on the \fB\%xterm\fP(1) features +that are used in these extended capabilities. diff --git a/man/wresize.3x b/man/wresize.3x index 1500913b..2e22d2fb 100644 --- a/man/wresize.3x +++ b/man/wresize.3x @@ -1,5 +1,5 @@ .\"*************************************************************************** -.\" Copyright 2018-2021,2022 Thomas E. Dickey * +.\" Copyright 2018-2024,2025 Thomas E. Dickey * .\" Copyright 1998-2010,2015 Free Software Foundation, Inc. * .\" * .\" Permission is hereby granted, free of charge, to any person obtaining a * @@ -29,38 +29,103 @@ .\" .\" Author: Thomas E. Dickey 1996 .\" -.\" $Id: wresize.3x,v 1.20 2022/02/12 20:07:29 tom Exp $ -.TH wresize 3X "" +.\" $Id: wresize.3x,v 1.47 2025/01/19 00:51:54 tom Exp $ +.TH wresize 3X 2025-01-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls" .SH NAME -\fBwresize\fP \- resize a curses window +\fB\%wresize\fP \- +resize a \fIcurses\fR window .SH SYNOPSIS -\fB#include \fP -.sp -\fBint wresize(WINDOW *\fIwin\fB, int \fIlines\fB, int \fIcolumns\fB);\fR +.nf +\fB#include +.PP +\fBint wresize(WINDOW * \fIwin\fP, int \fIlines\fP, int \fIcolumns\fP); +.fi .SH DESCRIPTION -This is an extension to the curses library. -It reallocates storage for an \fBncurses\fP -window to adjust its dimensions to the specified values. -If either dimension is larger than the current values, the -window's data is filled with blanks that have the current background rendition -(as set by \fBwbkgdset\fP) merged into them. +.BR \%wresize "," +an +.I \%ncurses +extension to the +.I curses +library, +reallocates storage for +.IR win , +adjusting its dimensions to +.I lines +and +.IR columns "." +If either dimension is larger than its current value, +.I \%ncurses +fills the expanded part of the window +with the window's background character as configured by +\fB\%wbkgdset\fP(3X) +(wide-character API: \fB\%wbkgrndset\fP(3X)). .SH RETURN VALUE -The function returns the integer \fBERR\fP upon failure and \fBOK\fP on success. -It will fail if either of the dimensions less than or equal to zero, -or if an error occurs while (re)allocating memory for the window. +.B \%wresize +returns +.B OK +on success and +.B ERR +on failure. +It fails if either +.I lines +or +.I columns +is less than or equal to zero, +or if an error occurs while (re)allocating memory for +.IR win "." .SH NOTES -The only restriction placed on the dimensions is that they be greater than zero. -The dimensions are not compared to \fBcurses\fP screen dimensions to -simplify the logic of \fBresizeterm\fP. -The caller must ensure that the window's dimensions fit within the -actual screen dimensions. +The only restriction placed on the values of +.I lines +and +.I columns +is that they be greater than zero. +They are +.I not +compared to the dimensions of the +.I curses +screen; +this keeps the logic of \fB\%resizeterm\fP(3X) simple. +The caller must ensure that +.IR win 's +dimensions fit within those of the screen. +.SH EXTENSIONS +.B \%wresize +is an \fB\%ncurses\fP(3X) extension, +and is not found in SVr4 +.IR curses "," +4.4BSD +.IR curses "," +or any other previous +.I curses +implementation. .SH PORTABILITY +Applications employing +.I \%ncurses +extensions should condition their use on the visibility of the +.B \%NCURSES_VERSION +preprocessor macro. .PP -It is not possible to resize windows with SVr4 curses. +NetBSD +.I curses +adopted +.I \%wresize +in 2001 (release 1.5.3), +and +.I \%PDCurses +in 2004 (version 2.7). .PP -This extension of ncurses was introduced in mid-1995. -It was adopted in NetBSD curses (2001) and PDCurses (2003). +It is not possible to resize windows with SVr4 +.IR curses "." +.SH HISTORY +Thomas Dickey developed +.I \%wresize +as an extension to BSD +.I curses +in 1988, +and brought it to +.I \%ncurses +in mid-1995. +.SH AUTHORS +Thomas Dickey .SH SEE ALSO -\fBresizeterm\fP(3X). -.SH AUTHOR -Thomas Dickey (from an equivalent function written in 1988 for BSD curses). +\fB\%resizeterm\fP(3X) diff --git a/menu/Makefile.in b/menu/Makefile.in index b623bf0e..a91eb400 100644 --- a/menu/Makefile.in +++ b/menu/Makefile.in @@ -1,6 +1,6 @@ -# $Id: Makefile.in,v 1.71 2021/07/03 15:45:33 tom Exp $ +# $Id: Makefile.in,v 1.72 2024/08/11 00:51:30 tom Exp $ ############################################################################## -# Copyright 2020,2021 Thomas E. Dickey # +# Copyright 2020-2021,2024 Thomas E. Dickey # # Copyright 1998-2015,2018 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # @@ -61,7 +61,9 @@ libdir = @libdir@ includedir = @includedir@ includesubdir = @includesubdir@ -INCLUDEDIR = $(DESTDIR)$(includedir)$(includesubdir) +INCLUDEDIR = $(DESTDIR)$(includedir@MERGE_PREFIX@)$(includesubdir) +BINDIR = $(DESTDIR)$(bindir@MERGE_PREFIX@) +LIBDIR = $(DESTDIR)$(libdir@MERGE_PREFIX@) PACKAGE = @PACKAGE@ @@ -155,8 +157,8 @@ install :: $(AUTO_SRC) $(LIBRARIES) sources : $(AUTO_SRC) -$(DESTDIR)$(bindir) \ -$(DESTDIR)$(libdir) : +$(BINDIR) \ +$(LIBDIR) : mkdir -p $@ # make copies to simplify include-paths while still keeping menu's include diff --git a/menu/m_driver.c b/menu/m_driver.c index cf2ef2fe..168eeede 100644 --- a/menu/m_driver.c +++ b/menu/m_driver.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020,2021 Thomas E. Dickey * + * Copyright 2020-2021,2024 Thomas E. Dickey * * Copyright 1998-2012,2016 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -38,7 +38,7 @@ #include "menu.priv.h" -MODULE_ID("$Id: m_driver.c,v 1.37 2021/03/27 23:46:29 tom Exp $") +MODULE_ID("$Id: m_driver.c,v 1.39 2024/12/07 22:01:57 tom Exp $") /* Macros */ @@ -307,7 +307,7 @@ menu_driver(MENU *menu, int c) else { my_top_row += rdiff; - while (rdiff-- > 0 && item != 0 && item->down != 0) + while (rdiff-- > 0 && item != NULL && item->down != NULL) item = item->down; } break; @@ -320,7 +320,7 @@ menu_driver(MENU *menu, int c) else { my_top_row -= rdiff; - while (rdiff-- > 0 && item != 0 && item->up != 0) + while (rdiff-- > 0 && item != NULL && item->up != NULL) item = item->up; } break; @@ -449,7 +449,7 @@ menu_driver(MENU *menu, int c) else if (KEY_MOUSE == c) { MEVENT event; - WINDOW *uwin = Get_Menu_UserWin(menu); + const WINDOW *uwin = Get_Menu_UserWin(menu); getmouse(&event); if ((event.bstate & (BUTTON1_CLICKED | @@ -459,7 +459,7 @@ menu_driver(MENU *menu, int c) { /* we react only if the click was in the userwin, that means * inside the menu display area or at the decoration window. */ - WINDOW *sub = Get_Menu_Window(menu); + const WINDOW *sub = Get_Menu_Window(menu); int ry = event.y, rx = event.x; /* screen coordinates */ result = E_REQUEST_DENIED; @@ -548,7 +548,7 @@ menu_driver(MENU *menu, int c) result = E_UNKNOWN_COMMAND; } - if (item == 0) + if (item == NULL) { result = E_BAD_STATE; } diff --git a/menu/m_global.c b/menu/m_global.c index 4ec08c52..f50b2c80 100644 --- a/menu/m_global.c +++ b/menu/m_global.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020,2021 Thomas E. Dickey * + * Copyright 2020-2023,2024 Thomas E. Dickey * * Copyright 1998-2012,2014 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -38,7 +38,7 @@ #include "menu.priv.h" -MODULE_ID("$Id: m_global.c,v 1.33 2021/03/27 23:46:29 tom Exp $") +MODULE_ID("$Id: m_global.c,v 1.35 2024/12/07 23:02:27 tom Exp $") static char mark[] = "-"; /* *INDENT-OFF* */ @@ -256,13 +256,13 @@ _nc_Calculate_Text_Width(const TEXT *item /*FIXME: limit length */ ) int result = item->length; T((T_CALLED("_nc_menu_text_width(%p)"), (const void *)item)); - if (result != 0 && item->str != 0) + if (result != 0 && item->str != NULL) { - int count = (int)mbstowcs(0, item->str, 0); - wchar_t *temp = 0; + int count = (int)mbstowcs(NULL, item->str, 0); + wchar_t *temp = NULL; if (count > 0 - && (temp = typeMalloc(wchar_t, 2 + count)) != 0) + && (temp = typeMalloc(wchar_t, 2 + count)) != NULL) { int n; @@ -296,7 +296,7 @@ calculate_actual_width(MENU *menu, bool name) assert(menu && menu->items); - if (menu->items != 0) + if (menu->items != NULL) { ITEM **items; @@ -568,7 +568,7 @@ _nc_New_TopRow_and_CurrentItem( cur_item = menu->curitem; assert(cur_item); menu->toprow = (short)(((menu->rows - menu->frows) >= 0) - ? min(menu->rows - menu->frows, new_toprow) + ? Min(menu->rows - menu->frows, new_toprow) : 0); menu->curitem = new_current_item; @@ -592,7 +592,7 @@ _nc_New_TopRow_and_CurrentItem( else { /* if we are not posted, this is quite simple */ menu->toprow = (short)(((menu->rows - menu->frows) >= 0) - ? min(menu->rows - menu->frows, new_toprow) + ? Min(menu->rows - menu->frows, new_toprow) : 0); menu->curitem = new_current_item; } diff --git a/menu/m_item_new.c b/menu/m_item_new.c index 28b71caf..1af18a2f 100644 --- a/menu/m_item_new.c +++ b/menu/m_item_new.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020-2021 Thomas E. Dickey * + * Copyright 2020-2021,2024 Thomas E. Dickey * * Copyright 1998-2010,2012 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -45,7 +45,7 @@ #endif #endif -MODULE_ID("$Id: m_item_new.c,v 1.38 2021/06/17 21:26:02 tom Exp $") +MODULE_ID("$Id: m_item_new.c,v 1.40 2024/12/07 22:01:57 tom Exp $") /*--------------------------------------------------------------------------- | Facility : libnmenu @@ -60,16 +60,16 @@ MODULE_ID("$Id: m_item_new.c,v 1.38 2021/06/17 21:26:02 tom Exp $") static bool Is_Printable_String(const char *s) { - int result = TRUE; + bool result = TRUE; #if USE_WIDEC_SUPPORT - int count = (int)mbstowcs(0, s, 0); - wchar_t *temp = 0; + int count = (int)mbstowcs(NULL, s, 0); + wchar_t *temp = NULL; assert(s); if (count > 0 - && (temp = typeCalloc(wchar_t, (2 + (unsigned)count))) != 0) + && (temp = typeCalloc(wchar_t, (2 + (unsigned)count))) != NULL) { int n; @@ -231,7 +231,7 @@ set_menu_mark(MENU *menu, const char *mark) else { menu->mark = old_mark; - menu->marklen = (short)((old_mark != 0) ? strlen(old_mark) : 0); + menu->marklen = (short)((old_mark != NULL) ? strlen(old_mark) : 0); RETURN(E_SYSTEM_ERROR); } } diff --git a/menu/m_item_vis.c b/menu/m_item_vis.c index 9ae4fdb0..5471cad9 100644 --- a/menu/m_item_vis.c +++ b/menu/m_item_vis.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020,2021 Thomas E. Dickey * + * Copyright 2020-2021,2024 Thomas E. Dickey * * Copyright 1998-2004,2010 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -38,7 +38,7 @@ #include "menu.priv.h" -MODULE_ID("$Id: m_item_vis.c,v 1.20 2021/06/17 21:20:30 tom Exp $") +MODULE_ID("$Id: m_item_vis.c,v 1.21 2024/07/27 18:14:09 tom Exp $") /*--------------------------------------------------------------------------- | Facility : libnmenu @@ -53,7 +53,7 @@ MODULE_ID("$Id: m_item_vis.c,v 1.20 2021/06/17 21:20:30 tom Exp $") MENU_EXPORT(bool) item_visible(const ITEM *item) { - MENU *menu; + const MENU *menu; T((T_CALLED("item_visible(%p)"), (const void *)item)); if (item && diff --git a/menu/m_pattern.c b/menu/m_pattern.c index 6fbef236..5eb6119f 100644 --- a/menu/m_pattern.c +++ b/menu/m_pattern.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020,2021 Thomas E. Dickey * + * Copyright 2020-2021,2024 Thomas E. Dickey * * Copyright 1998-2006,2010 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -38,7 +38,7 @@ #include "menu.priv.h" -MODULE_ID("$Id: m_pattern.c,v 1.20 2021/06/17 21:20:30 tom Exp $") +MODULE_ID("$Id: m_pattern.c,v 1.21 2024/12/07 23:00:37 tom Exp $") /*--------------------------------------------------------------------------- | Facility : libnmenu @@ -57,7 +57,7 @@ menu_pattern(const MENU *menu) static char empty[] = ""; T((T_CALLED("menu_pattern(%p)"), (const void *)menu)); - returnPtr(menu ? (menu->pattern ? menu->pattern : empty) : 0); + returnPtr(menu ? (menu->pattern ? menu->pattern : empty) : NULL); } /*--------------------------------------------------------------------------- diff --git a/menu/m_post.c b/menu/m_post.c index cb802304..1e4ce7cf 100644 --- a/menu/m_post.c +++ b/menu/m_post.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020-2021,2022 Thomas E. Dickey * + * Copyright 2020-2022,2024 Thomas E. Dickey * * Copyright 1998-2010,2012 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -38,7 +38,7 @@ #include "menu.priv.h" -MODULE_ID("$Id: m_post.c,v 1.38 2022/09/24 09:38:44 tom Exp $") +MODULE_ID("$Id: m_post.c,v 1.41 2024/07/27 18:08:59 tom Exp $") /*--------------------------------------------------------------------------- | Facility : libnmenu @@ -67,7 +67,7 @@ _nc_Post_Item(const MENU *menu, const ITEM *item) - it is a onevalued menu and it is the current item - or it has a selection value */ - wattron(menu->win, (int)menu->back); + wattr_on(menu->win, menu->back, NULL); if (item->value || (item == menu->curitem)) { if (menu->marklen) @@ -79,13 +79,13 @@ _nc_Post_Item(const MENU *menu, const ITEM *item) item. */ if (!(menu->opt & O_ONEVALUE) && item->value && item != menu->curitem) { - wattron(menu->win, (int)menu->fore); + wattr_on(menu->win, menu->fore, NULL); isfore = TRUE; } waddstr(menu->win, menu->mark); if (isfore) { - wattron(menu->win, (int)menu->fore); + wattr_on(menu->win, menu->fore, NULL); isfore = FALSE; } } @@ -93,7 +93,7 @@ _nc_Post_Item(const MENU *menu, const ITEM *item) else /* otherwise we have to wipe out the marker area */ for (ch = ' ', i = menu->marklen; i > 0; i--) waddch(menu->win, ch); - wattroff(menu->win, (int)menu->back); + wattr_off(menu->win, menu->back, NULL); count += menu->marklen; /* First we have to calculate the attribute depending on selectability @@ -101,19 +101,19 @@ _nc_Post_Item(const MENU *menu, const ITEM *item) */ if (!(item->opt & O_SELECTABLE)) { - wattron(menu->win, (int)menu->grey); + wattr_on(menu->win, menu->grey, NULL); isgrey = TRUE; } else { if (item->value || item == menu->curitem) { - wattron(menu->win, (int)menu->fore); + wattr_on(menu->win, menu->fore, NULL); isfore = TRUE; } else { - wattron(menu->win, (int)menu->back); + wattr_on(menu->win, menu->back, NULL); isback = TRUE; } } @@ -159,10 +159,10 @@ _nc_Post_Item(const MENU *menu, const ITEM *item) assert(cx >= 0 && cy >= 0); getyx(menu->win, ncy, ncx); if (isgrey) - wattroff(menu->win, (int)menu->grey); + wattr_off(menu->win, menu->grey, NULL); else if (isfore) - wattroff(menu->win, (int)menu->fore); - wattron(menu->win, (int)menu->back); + wattr_off(menu->win, menu->fore, NULL); + wattr_on(menu->win, menu->back, NULL); for (j = 1; j < menu->spc_rows; j++) { if ((item_y + j) < getmaxy(menu->win)) @@ -176,17 +176,17 @@ _nc_Post_Item(const MENU *menu, const ITEM *item) } wmove(menu->win, ncy, ncx); if (!isback) - wattroff(menu->win, (int)menu->back); + wattr_off(menu->win, menu->back, NULL); } } /* Remove attributes */ if (isfore) - wattroff(menu->win, (int)menu->fore); + wattr_off(menu->win, menu->fore, NULL); if (isback) - wattroff(menu->win, (int)menu->back); + wattr_off(menu->win, menu->back, NULL); if (isgrey) - wattroff(menu->win, (int)menu->grey); + wattr_off(menu->win, menu->grey, NULL); } /*--------------------------------------------------------------------------- @@ -201,7 +201,7 @@ MENU_EXPORT(void) _nc_Draw_Menu(const MENU *menu) { ITEM *item = menu->items[0]; - ITEM *lastvert; + const ITEM *lastvert; ITEM *hitem; chtype s_bkgd; @@ -220,7 +220,7 @@ _nc_Draw_Menu(const MENU *menu) do { - ITEM *lasthor; + const ITEM *lasthor; wmove(menu->win, y, 0); @@ -231,7 +231,7 @@ _nc_Draw_Menu(const MENU *menu) { _nc_Post_Item(menu, hitem); - wattron(menu->win, (int)menu->back); + wattr_on(menu->win, menu->back, NULL); if (((hitem = hitem->right) != lasthor) && hitem) { int i, j, cy, cx; @@ -250,7 +250,7 @@ _nc_Draw_Menu(const MENU *menu) } } while (hitem && (hitem != lasthor)); - wattroff(menu->win, (int)menu->back); + wattr_off(menu->win, menu->back, NULL); item = item->down; y += menu->spc_rows; @@ -291,7 +291,7 @@ post_menu(MENU *menu) { int h = 1 + menu->spc_rows * (menu->rows - 1); - WINDOW *win = Get_Menu_Window(menu); + const WINDOW *win = Get_Menu_Window(menu); int maxy = getmaxy(win); if ((menu->win = newpad(h, menu->width))) diff --git a/menu/m_req_name.c b/menu/m_req_name.c index c72116fa..d4af02d0 100644 --- a/menu/m_req_name.c +++ b/menu/m_req_name.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020,2021 Thomas E. Dickey * + * Copyright 2020-2021,2024 Thomas E. Dickey * * Copyright 1998-2012,2015 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -38,7 +38,7 @@ #include "menu.priv.h" -MODULE_ID("$Id: m_req_name.c,v 1.27 2021/06/17 21:11:08 tom Exp $") +MODULE_ID("$Id: m_req_name.c,v 1.28 2024/12/07 23:00:37 tom Exp $") #define DATA(s) { s } @@ -106,7 +106,7 @@ menu_request_by_name(const char *str) T((T_CALLED("menu_request_by_name(%s)"), _nc_visbuf(str))); - if (str != 0 && (i = strlen(str)) != 0) + if (str != NULL && (i = strlen(str)) != 0) { char buf[16]; diff --git a/menu/menu.priv.h b/menu/menu.priv.h index 0bc6147e..e464a7c9 100644 --- a/menu/menu.priv.h +++ b/menu/menu.priv.h @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020 Thomas E. Dickey * + * Copyright 2020,2024 Thomas E. Dickey * * Copyright 1998-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -31,7 +31,7 @@ * Author: Juergen Pfeifer, 1995,1997 * ****************************************************************************/ -/* $Id: menu.priv.h,v 1.29 2020/05/24 01:40:20 anonymous.maarten Exp $ */ +/* $Id: menu.priv.h,v 1.30 2024/08/03 15:41:22 tom Exp $ */ /*************************************************************************** * Module menu.priv.h * @@ -61,9 +61,6 @@ extern MENU_EXPORT_VAR(MENU) _nc_Default_Menu; /* Normalize menu to default if none was given */ #define Normalize_Menu( menu ) ((menu)=(menu)?(menu):&_nc_Default_Menu) -#define Get_Menu_Screen( menu ) (menu->userwin ? \ - _nc_screen_of(menu->userwin) : CURRENT_SCREEN) - /* Get the user defined (framing) window of the menu */ #define Get_Menu_UserWin(menu) ((menu)->userwin ? \ (menu)->userwin : CURRENT_SCREEN->_stdscr) diff --git a/menu/mf_common.h b/menu/mf_common.h index fcbd565c..c54e8cdf 100644 --- a/menu/mf_common.h +++ b/menu/mf_common.h @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020 Thomas E. Dickey * + * Copyright 2020,2024 Thomas E. Dickey * * Copyright 1998-2005,2012 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -31,7 +31,7 @@ * Author: Juergen Pfeifer, 1995,1997 * ****************************************************************************/ -/* $Id: mf_common.h,v 0.25 2020/02/02 23:34:34 tom Exp $ */ +/* $Id: mf_common.h,v 0.27 2024/12/07 22:01:18 tom Exp $ */ /* Common internal header for menu and form library */ @@ -64,7 +64,7 @@ extern int errno; #if USE_RCS_IDS #define MODULE_ID(id) static const char Ident[] = id; #else -#define MODULE_ID(id) /*nothing */ +#define MODULE_ID(id) /* nothing */ #endif /* Maximum regular 8-bit character code */ @@ -88,7 +88,7 @@ extern int errno; /* Call object hook */ #define Call_Hook( object, handler ) \ - if ( (object) != 0 && ((object)->handler) != (void *) 0 )\ + if ( (object) != NULL && ((object)->handler) != (void *) 0 )\ {\ SetStatus(object, _IN_DRIVER);\ (object)->handler(object);\ diff --git a/misc/Makefile.in b/misc/Makefile.in index 1539973f..1a382c2d 100644 --- a/misc/Makefile.in +++ b/misc/Makefile.in @@ -1,6 +1,6 @@ -# $Id: Makefile.in,v 1.79 2021/11/06 23:36:12 tom Exp $ +# $Id: Makefile.in,v 1.83 2024/08/10 18:06:18 tom Exp $ ############################################################################## -# Copyright 2018-2020,2021 Thomas E. Dickey # +# Copyright 2018-2021,2024 Thomas E. Dickey # # Copyright 1998-2016,2017 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # @@ -61,7 +61,7 @@ datarootdir = @datarootdir@ datadir = @datadir@ includesubdir = @includesubdir@ -INCLUDEDIR = $(DESTDIR)$(includedir)$(includesubdir) +INCLUDEDIR = $(DESTDIR)$(includedir@MERGE_PREFIX@)$(includesubdir) tabsetdir = $(datadir)/tabset ticdir = @TERMINFO@ @@ -75,6 +75,17 @@ INSTALL_DATA = @INSTALL_DATA@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +BINDIR = $(DESTDIR)$(bindir@MERGE_PREFIX@) +DATADIR = $(DESTDIR)$(datadir@MERGE_PREFIX@) + +@MAKE_DATABASE@INSTALL_PREFIX = $(DESTDIR)$(prefix@MERGE_PREFIX@) +@MAKE_DATABASE@LIBDIR = $(DESTDIR)$(libdir@MERGE_PREFIX@) +@MAKE_DATABASE@TICDIR = $(DESTDIR)$(ticdir@MERGE_PREFIX@) +@MAKE_DATABASE@TICFILE = $(DESTDIR)$(ticfile@MERGE_PREFIX@) +@MAKE_DATABASE@TABSETDIR = $(DESTDIR)$(tabsetdir@MERGE_PREFIX@) + +@MAKE_PC_FILES@INSTALL_CONFIG = $(DESTDIR)$(PKG_CONFIG_LIBDIR@MERGE_PREFIX@) + ################################################################################ @MAKE_PHONY@.PHONY : all @@ -103,25 +114,19 @@ sources :: @MAKE_DATABASE@install :: @MISC_INSTALL_DATA@ @MAKE_DATABASE@install.data :: terminfo.tmp \ -@MAKE_DATABASE@ $(DESTDIR)$(libdir) \ -@MAKE_DATABASE@ $(DESTDIR)$(datadir) \ -@MAKE_DATABASE@ $(DESTDIR)$(tabsetdir) -@MAKE_DATABASE@ DESTDIR=${DESTDIR} \ -@MAKE_DATABASE@ prefix=${prefix} \ -@MAKE_DATABASE@ exec_prefix=${exec_prefix} \ -@MAKE_DATABASE@ bindir=${bindir} \ -@MAKE_DATABASE@ top_srcdir=${top_srcdir} \ -@MAKE_DATABASE@ srcdir=${srcdir} \ -@MAKE_DATABASE@ datadir=${datadir} \ -@MAKE_DATABASE@ ticdir=${ticdir} \ -@MAKE_DATABASE@ source=terminfo.tmp \ -@MAKE_DATABASE@ cross_compiling=@cross_compiling@ \ +@MAKE_DATABASE@ $(LIBDIR) \ +@MAKE_DATABASE@ $(DATADIR) \ +@MAKE_DATABASE@ $(TABSETDIR) +@MAKE_DATABASE@ INSTALL_PREFIX=${INSTALL_PREFIX} \ +@MAKE_DATABASE@ TICDIR=${TICDIR} \ +@MAKE_DATABASE@ BINDIR=${BINDIR} \ +@MAKE_DATABASE@ tic_source=terminfo.tmp \ @MAKE_DATABASE@ $(SHELL) ./run_tic.sh @MAKE_DATABASE@ @( cd $(srcdir)/tabset && \ @MAKE_DATABASE@ $(SHELL) -c 'for i in * ; do \ @MAKE_DATABASE@ if test -f $$i ; then \ @MAKE_DATABASE@ echo installing $$i; \ -@MAKE_DATABASE@ $(INSTALL_DATA) $$i $(DESTDIR)$(tabsetdir)/$$i; \ +@MAKE_DATABASE@ $(INSTALL_DATA) $$i $(TABSETDIR)/$$i; \ @MAKE_DATABASE@ fi; done' ) install.data :: @echo "finished $@" @@ -129,8 +134,8 @@ install.data :: NCURSES_CONFIG = ncurses@DFT_ARG_SUFFIX@@cf_cv_abi_version@@cf_config_suffix@-config install \ -install.libs :: $(DESTDIR)$(bindir) ncurses-config - $(INSTALL_SCRIPT) ncurses-config $(DESTDIR)$(bindir)/$(NCURSES_CONFIG) +install.libs :: $(BINDIR) ncurses-config + $(INSTALL_SCRIPT) ncurses-config $(BINDIR)/$(NCURSES_CONFIG) # Make a list of the files that gen-pkgconfig might create: @MAKE_PC_FILES@PC_FILES = \ @@ -148,12 +153,12 @@ install.libs :: $(DESTDIR)$(bindir) ncurses-config @MAKE_PC_FILES@install \ @MAKE_PC_FILES@install.libs :: pc-files @MAKE_PC_FILES@ @$(SHELL) -c 'case "x$(PKG_CONFIG_LIBDIR)" in \ -@MAKE_PC_FILES@ x/*) \ -@MAKE_PC_FILES@ mkdir -p $(DESTDIR)$(PKG_CONFIG_LIBDIR); \ +@MAKE_PC_FILES@ x@GLOB_FULLPATH_POSIX@|x@GLOB_FULLPATH_OTHER@) \ +@MAKE_PC_FILES@ mkdir -p $(INSTALL_CONFIG); \ @MAKE_PC_FILES@ for name in $(PC_FILES); do \ @MAKE_PC_FILES@ test -f $$name || continue; \ @MAKE_PC_FILES@ echo installing $$name; \ -@MAKE_PC_FILES@ $(INSTALL_DATA) $$name $(DESTDIR)$(PKG_CONFIG_LIBDIR)/$$name; \ +@MAKE_PC_FILES@ $(INSTALL_DATA) $$name $(INSTALL_CONFIG)/$$name; \ @MAKE_PC_FILES@ done \ @MAKE_PC_FILES@ ;; \ @MAKE_PC_FILES@ *) \ @@ -177,27 +182,29 @@ run_tic.sed : datadir=${datadir} \ $(SHELL) $(srcdir)/gen_edit.sh >$@ -$(DESTDIR)$(bindir) \ -$(DESTDIR)$(libdir) \ -$(DESTDIR)$(datadir) \ -$(DESTDIR)$(tabsetdir) : +$(BINDIR) \ +$(DATADIR) : mkdir -p $@ +@MAKE_DATABASE@$(LIBDIR) \ +@MAKE_DATABASE@$(TABSETDIR) : +@MAKE_DATABASE@ mkdir -p $@ + uninstall : @MISC_UNINSTALL_DATA@ uninstall.libs uninstall.data : - -test -d $(DESTDIR)$(tabsetdir) && rm -rf $(DESTDIR)$(tabsetdir) - -test -d $(DESTDIR)$(ticdir) && rm -rf $(DESTDIR)$(ticdir) - -test -f $(DESTDIR)$(ticfile) && rm -f $(DESTDIR)$(ticfile) +@MAKE_DATABASE@ -test -d $(TABSETDIR) && rm -rf $(TABSETDIR) +@MAKE_DATABASE@ -test -d $(TICDIR) && rm -rf $(TICDIR) +@MAKE_DATABASE@ -test -f $(TICFILE) && rm -f $(TICFILE) uninstall.libs : - -rm -f $(DESTDIR)$(bindir)/$(NCURSES_CONFIG) -@MAKE_PC_FILES@ @$(SHELL) -c 'case x$(DESTDIR)$(PKG_CONFIG_LIBDIR) in \ -@MAKE_PC_FILES@ x/*) \ + -rm -f $(BINDIR)/$(NCURSES_CONFIG) +@MAKE_PC_FILES@ @$(SHELL) -c 'case x$(INSTALL_CONFIG) in \ +@MAKE_PC_FILES@ x@GLOB_FULLPATH_POSIX@|x@GLOB_FULLPATH_OTHER@) \ @MAKE_PC_FILES@ for name in $(PC_FILES); do \ @MAKE_PC_FILES@ test -f $$name || continue; \ @MAKE_PC_FILES@ echo uninstalling $$name; \ -@MAKE_PC_FILES@ rm -f $(DESTDIR)$(PKG_CONFIG_LIBDIR)/$$name; \ +@MAKE_PC_FILES@ rm -f $(INSTALL_CONFIG)/$$name; \ @MAKE_PC_FILES@ done \ @MAKE_PC_FILES@ ;; \ @MAKE_PC_FILES@ esac' diff --git a/misc/gen-pkgconfig.in b/misc/gen-pkgconfig.in index 89a5cd4a..c369dd26 100644 --- a/misc/gen-pkgconfig.in +++ b/misc/gen-pkgconfig.in @@ -1,7 +1,7 @@ #!@SHELL@ -# $Id: gen-pkgconfig.in,v 1.56 2022/10/08 16:45:20 tom Exp $ +# $Id: gen-pkgconfig.in,v 1.58 2024/09/28 20:21:23 tom Exp $ ############################################################################## -# Copyright 2018-2021,2022 Thomas E. Dickey # +# Copyright 2018-2022,2024 Thomas E. Dickey # # Copyright 2009-2015,2018 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # @@ -92,7 +92,7 @@ do -specs*) # ignore linker specs-files which were used to build library continue ;; - -Wl,-z,*) # ignore flags used to manipulate shared image + -Wl,-z*) # ignore flags used to manipulate shared image continue ;; -Wl,--dynamic-linker*) # ignore ELF interpreter @@ -112,7 +112,7 @@ do @LD_SEARCHPATH@) # skip standard libdir if [ "$lib_check" = "$libdir" ] then - lib_first=yes + lib_first=no IFS_save="$IFS" IFS='|' LIBDIRS="@LD_SEARCHPATH@" @@ -120,11 +120,11 @@ do do if [ -d "$lib_check" ] then - if [ "$lib_check" != "$libdir" ] + if [ "$lib_check" = "$libdir" ] then - lib_first=no + lib_first=yes + break fi - break fi done IFS="$IFS_save" diff --git a/misc/magic b/misc/magic index 0fab0049..314cb6d2 100644 --- a/misc/magic +++ b/misc/magic @@ -1,6 +1,6 @@ -# $Id: magic,v 1.3 2020/02/02 23:34:34 tom Exp $ +# $Id: magic,v 1.6 2025/02/15 15:23:23 tom Exp $ ############################################################################## -# Copyright 2020 Thomas E. Dickey # +# Copyright 2020-2023,2025 Thomas E. Dickey # # Copyright 2015,2018 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # @@ -59,9 +59,8 @@ >>12 regex \^[a-zA-Z0-9][a-zA-Z0-9.][^|]* Compiled 32-bit terminfo entry "%-s" !:mime application/x-terminfo2 # -# While the compiled terminfo uses little-endian format irregardless of -# platform, SystemV screen dumps do not. They came later, and that detail was -# overlooked. +# While the compiled terminfo uses little-endian format regardless of platform, +# System V screen dumps do not. They came later; that detail was overlooked. # # AIX and HPUX use the SVr4 big-endian format # Solaris uses the SVr3 formats (sparc and x86 differ endian-ness) diff --git a/misc/ncu2openbsd b/misc/ncu2openbsd index b066a105..0c3365d7 100755 --- a/misc/ncu2openbsd +++ b/misc/ncu2openbsd @@ -1,7 +1,7 @@ #!/usr/bin/env perl -# $Id: ncu2openbsd,v 1.65 2021/10/03 18:52:22 tom Exp $ +# $Id: ncu2openbsd,v 1.67 2023/09/09 15:59:17 tom Exp $ # ----------------------------------------------------------------------------- -# Copyright 2021 by Thomas E. Dickey +# Copyright 2021,2023 by Thomas E. Dickey # # All Rights Reserved # @@ -44,7 +44,7 @@ use File::Temp qw/ tempdir /; $| = 1; -our ( $opt_d, $opt_n, $opt_r, $opt_t, $opt_v, $opt_x ); +our ( $opt_d, $opt_n, $opt_r, $opt_t, $opt_v, $opt_x, $opt_6 ); our $source_dir; our $target_dir; our $update_dir; @@ -1177,12 +1177,12 @@ sub configure_tree() { my @search = ( "/usr/share/terminfo", "/usr/local/share/terminfo" ); my @prefix = ("./configure"); $prefix[ ++$#prefix ] = "--with-abi-version=5" - if ( &patchdate >= 20150502 ); + if ( &patchdate >= 20150502 && !$opt_6 ); my @options = ( - "--with-ospeed=int", # - "--with-shared", # - "--without-normal", # - "--without-debug", # + "--with-ospeed=int", # + "--with-shared", # + "--without-normal", # + "--without-debug", # "--with-terminfo-dirs=" . join( ':', @search ), # "--without-ada", # "--disable-hard-tabs", # @@ -1191,7 +1191,8 @@ sub configure_tree() { "--enable-bsdpad", # "--enable-signed-char", # "--enable-termcap", # - "--enable-widec" + "--enable-widec", # + "--disable-setuid-environ" ); $options[ ++$#options ] = "--with-trace" if ($opt_t); $options[ ++$#options ] = "--enable-string-hacks" @@ -1250,6 +1251,7 @@ sub usage() { Usage: ncu2openbsd [options] [sourcetree] Options: + -6 use ABI 6 rather than 5 if available -d DST specify destination (default: /usr/src) -n no-op, do not update destination -r remove update, restore sources from ".orig" @@ -1261,7 +1263,7 @@ EOF } $Getopt::Std::STANDARD_HELP_VERSION = 1; -&getopts('d:nrtvx') || &usage(); +&getopts('6d:nrtvx') || &usage(); $opt_d = "/usr/src" unless ($opt_d); &usage() unless ( $#ARGV <= 0 ); diff --git a/misc/ncurses-config.in b/misc/ncurses-config.in index c9f1cf80..c671407c 100644 --- a/misc/ncurses-config.in +++ b/misc/ncurses-config.in @@ -1,7 +1,7 @@ #!@SHELL@ -# $Id: ncurses-config.in,v 1.52 2022/07/26 21:36:28 tom Exp $ +# $Id: ncurses-config.in,v 1.57 2024/09/28 20:18:19 tom Exp $ ############################################################################## -# Copyright 2018-2021,2022 Thomas E. Dickey # +# Copyright 2018-2022,2024 Thomas E. Dickey # # Copyright 2006-2015,2017 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # @@ -50,8 +50,6 @@ THIS="@LIB_NAME@@USE_LIB_SUFFIX@" TINFO_LIB="@TINFO_ARG_SUFFIX@" RPATH_LIST="@RPATH_LIST@" -includesubdir="@includedir@/${THIS}" - # Ensure that RPATH_LIST contains only absolute pathnames, if it is nonempty. # We cannot filter it out within the build-process since the variable is used # in some special cases of installation using a relative path. @@ -80,11 +78,14 @@ fi # the headers to include like this: # if [ x@WITH_OVERWRITE@ = xno ]; then + includesubdir="@includedir@/${THIS}" case $includedir in $prefix/include/ncurses@LIB_SUFFIX@@EXTRA_SUFFIX@) includedir=`echo "$includedir" | sed -e 's,/[^/]*$,,'` ;; esac +else + includesubdir="@includedir@" fi LIBS="@LIBS@" @@ -94,6 +95,14 @@ else LIBS="-l${THIS} -l${TINFO_LIB} $LIBS" fi +CFLAGS="@PKG_CFLAGS@" +if [ "$includesubdir" != "/usr/include" ]; then + CFLAGS="$CFLAGS -I${includesubdir}" + if [ "$includedir" != "/usr/include" ]; then + [ x@WITH_OVERWRITE@ = xno ] && CFLAGS="$CFLAGS -I${includedir}" + fi +fi + # Ignore -L options which do not correspond to an actual directory, or which # are standard library directories (i.e., the linker is supposed to search # those directories). @@ -107,7 +116,7 @@ do -specs*) # ignore linker specs-files which were used to build library continue ;; - -Wl,-z,*) # ignore flags used to manipulate shared image + -Wl,-z*) # ignore flags used to manipulate shared image continue ;; -Wl,--dynamic-linker*) # ignore ELF interpreter @@ -123,7 +132,7 @@ do @LD_SEARCHPATH@) # skip standard libdir if [ "$lib_check" = "$libdir" ] then - lib_first=yes + lib_first=no IFS_save="$IFS" IFS='|' LIBDIRS="@LD_SEARCHPATH@" @@ -131,11 +140,11 @@ do do if [ -d "$lib_check" ] then - if [ "$lib_check" != "$libdir" ] + if [ "$lib_check" = "$libdir" ] then - lib_first=no + lib_first=yes + break fi - break fi done IFS="$IFS_save" @@ -186,16 +195,57 @@ while [ $# -gt 0 ]; do ;; # compile/link --cflags) - INCS="@PKG_CFLAGS@" - if [ "x@WITH_OVERWRITE@" = xno ]; then - INCS="$INCS -I${includesubdir}" - fi - if [ "${includedir}" != /usr/include ]; then - INCS="$INCS -I${includedir}" - fi - sed -e 's,^[ ]*,,' -e 's, [ ]*, ,g' -e 's,[ ]*$,,' <<-ENDECHO - $INCS -ENDECHO + OPTS= + for opt in $CFLAGS + do + case "x$opt" in + x-[fgOW]*) + opt= + ;; + esac + if [ -n "$opt" ] + then + [ -n "$OPTS" ] && OPTS="$OPTS " + OPTS="$OPTS$opt" + fi + done + printf "%s\n" "$OPTS" + ;; + --cflags-only-I) + OPTS= + for opt in $CFLAGS + do + case "x$opt" in + x-[I]*) + ;; + *) + opt= + ;; + esac + if [ -n "$opt" ] + then + [ -n "$OPTS" ] && OPTS="$OPTS " + OPTS="$OPTS$opt" + fi + done + printf "%s\n" "$OPTS" + ;; + --cflags-only-other) + OPTS= + for opt in $CFLAGS + do + case "x$opt" in + x-[I]*|x-[fgOW]*) + opt= + ;; + esac + if [ -n "$opt" ] + then + [ -n "$OPTS" ] && OPTS="$OPTS " + OPTS="$OPTS$opt" + fi + done + printf "%s\n" "$OPTS" ;; --libs) OPTS= @@ -294,30 +344,32 @@ ENDECHO Usage: `basename "$0"` [options] Options: - --prefix echos the package-prefix of ${THIS} - --exec-prefix echos the executable-prefix of ${THIS} + --prefix echos the package-prefix of ${THIS} + --exec-prefix echos the executable-prefix of ${THIS} - --cflags echos the C compiler flags needed to compile with ${THIS} - --libs echos the libraries needed to link with ${THIS} + --cflags echos the C compiler flags needed to compile for ${THIS} + --cflags-only-I echos only -I C compiler flags needed with ${THIS} + --cflags-only-other echos only C compiler flags other than -I for ${THIS} + --libs echos the libraries needed to link with ${THIS} - --libs-only-L echos -L linker options (search path) for ${THIS} - --libs-only-l echos -l linker options (libraries) for ${THIS} - --libs-only-other echos linker options other than -L/-l + --libs-only-L echos -L linker options (search path) for ${THIS} + --libs-only-l echos -l linker options (libraries) for ${THIS} + --libs-only-other echos linker options other than -L/-l - --version echos the release+patchdate version of ${THIS} - --abi-version echos the ABI version of ${THIS} - --mouse-version echos the mouse-interface version of ${THIS} + --version echos the release+patchdate version of ${THIS} + --abi-version echos the ABI version of ${THIS} + --mouse-version echos the mouse-interface version of ${THIS} - --bindir echos the directory containing ${THIS} programs - --datadir echos the directory containing ${THIS} data - --includedir echos the directory containing ${THIS} header files - --libdir echos the directory containing ${THIS} libraries - --mandir echos the directory containing ${THIS} manpages - --terminfo echos the \$TERMINFO terminfo database path - --terminfo-dirs echos the \$TERMINFO_DIRS directory list - --termpath echos the \$TERMPATH termcap list + --bindir echos the directory containing ${THIS} programs + --datadir echos the directory containing ${THIS} data + --includedir echos the directory containing ${THIS} header files + --libdir echos the directory containing ${THIS} libraries + --mandir echos the directory containing ${THIS} manpages + --terminfo echos the \$TERMINFO terminfo database path + --terminfo-dirs echos the \$TERMINFO_DIRS directory list + --termpath echos the \$TERMPATH termcap list - --help prints this message + --help prints this message ENDHELP ;; --error|*) diff --git a/misc/run_tic.in b/misc/run_tic.in index bd11c4c8..c4edb271 100644 --- a/misc/run_tic.in +++ b/misc/run_tic.in @@ -1,7 +1,7 @@ #!@SHELL@ -# $Id: run_tic.in,v 1.40 2022/07/16 19:37:03 tom Exp $ +# $Id: run_tic.in,v 1.41 2024/08/04 14:50:26 tom Exp $ ############################################################################## -# Copyright 2019-2020,2022 Thomas E. Dickey # +# Copyright 2019-2022,2024 Thomas E. Dickey # # Copyright 2000-2012,2017 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # @@ -42,22 +42,25 @@ echo "** Building terminfo database, please wait..." # The script is designed to be run from the misc/Makefile as # make install.data -: "${suffix:=@EXEEXT@}" -: "${DESTDIR:=@DESTDIR@}" +# Symbols which are not overridden by misc/Makefile: : "${prefix:=@prefix@}" : "${exec_prefix:=@exec_prefix@}" -: "${bindir:=@bindir@}" : "${top_srcdir:=@top_srcdir@}" : "${srcdir:=@srcdir@}" : "${datarootdir:=@datarootdir@}" : "${datadir:=@datadir@}" -: "${TIC_PATH:=@TIC@}" -: "${ticdir:=@TERMINFO@}" -: "${source:=@TERMINFO_SRC@}" -: "${cross_compiling:=no}" +: "${cross_compiling:=@cross_compiling@}" +: "${suffix:=@EXEEXT@}" + : "${ext_funcs:=@NCURSES_EXT_FUNCS@}" +: "${tic_path:=@TIC@}" +: "${ticdir:=@TERMINFO@}" +: "${tic_source:=@TERMINFO_SRC@}" -test -z "${DESTDIR}" && DESTDIR= +# Symbols which $DESTDIR and/or install-prefix may affect: +: "${INSTALL_PREFIX:=$prefix}" +: "${BINDIR:=@bindir@}" +: "${TICDIR:=$ticdir}" # Allow tic to run either from the install-path, or from the build-directory. # Do not do this if we appear to be cross-compiling. In that case, we rely @@ -68,21 +71,21 @@ then then case "$PATH" in \@PATH_SEPARATOR@*) - PATH="../progs@PATH_SEPARATOR@../lib@PATH_SEPARATOR@${DESTDIR}$bindir$PATH" + PATH="../progs@PATH_SEPARATOR@../lib@PATH_SEPARATOR@${BINDIR}$PATH" ;; *) - PATH="../progs@PATH_SEPARATOR@../lib@PATH_SEPARATOR@${DESTDIR}$bindir@PATH_SEPARATOR@$PATH" + PATH="../progs@PATH_SEPARATOR@../lib@PATH_SEPARATOR@${BINDIR}@PATH_SEPARATOR@$PATH" ;; esac export PATH if test @DFT_LWR_MODEL@ = shared then SHLIB="sh $srcdir/shlib" - TIC_PATH="$SHLIB tic" + tic_path="$SHLIB tic" else - TIC_PATH="tic" + tic_path="tic" fi - elif test "$TIC_PATH" = unknown + elif test "$tic_path" = unknown then echo "? no tic program found" exit 1 @@ -106,7 +109,7 @@ export SHLIB_HOST # don't use user's TERMINFO variable unset TERMINFO_DIRS -TERMINFO="${DESTDIR}$ticdir" ; export TERMINFO +TERMINFO="$TICDIR" ; export TERMINFO umask 022 # Construct the name of the old (obsolete) pathname, e.g., /usr/lib/terminfo. @@ -134,7 +137,7 @@ fi if test "$ext_funcs" = 1 ; then cat < cap. ecma+color|color control for ECMA-48-compatible terminals, AX, - colors#8, ncv#3, pairs#64, - op=\E[39;49m, setab=\E[4%p1%dm, setaf=\E[3%p1%dm, + op=\E[39;49m, use=klone+color, ecma+italics|ECMA-48 italics, ritm=\E[23m, sitm=\E[3m, @@ -492,13 +492,12 @@ ecma+index|ECMA-48 scroll up/down, # For more detail on this rather pathetic standard, see the comments # near the end of this file. ibcs2|Intel Binary Compatibility Standard prescriptions, - cbt=\E[Z, clear=\Ec, cub=\E[%p1%dD, cub1=\E[1D, - cud=\E[%p1%dB, cud1=\E[1B, cuf=\E[%p1%dC, cuf1=\E[1C, - cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[1A, - dch=\E[%p1%dP, dispc=\E=%p1%dg, ech=\E[%p1%dX, - hpa=\E[%i%p1%dG, hts=\EH, ich=\E[%p1%d@, ich1=\E[@, - il=\E[%p1%dL, rc=\E7, rmam=\E[?7l, sc=\E7, smam=\E[?7h, - tbc=\E[g, vpa=\E[%i%p1%dd, use=ecma+index, + cbt=\E[Z, clear=\Ec, cub1=\E[1D, cud1=\E[1B, cuf1=\E[1C, + cup=\E[%i%p1%d;%p2%dH, cuu1=\E[1A, dch=\E[%p1%dP, + dispc=\E=%p1%dg, ech=\E[%p1%dX, hpa=\E[%i%p1%dG, hts=\EH, + ich=\E[%p1%d@, ich1=\E[@, il=\E[%p1%dL, rc=\E7, + rmam=\E[?7l, sc=\E7, smam=\E[?7h, tbc=\E[g, + vpa=\E[%i%p1%dd, use=ansi+local, use=ecma+index, #### ANSI/ECMA-48 terminals and terminal emulators # @@ -560,14 +559,12 @@ ansi-mtabs|any ANSI terminal with pessimistic assumptions (relative addressing), ansi77|ANSI 3.64 standard 1977 version, OTbs, am, mir, cols#80, it#8, lines#24, - bel=^G, clear=\E[;H\E[2J, cr=\r, csr=\E[%i%p1%d;%p2%dr, - cub1=^H, cud1=\E[B, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, - cuu1=\E[A, dch1=\E[P, dl1=\E[M$<5*/>, ed=\E[J, el=\E[K, - home=\E[H, ht=^I, il1=\E[L$<5*/>, ind=\ED, kbs=^H, - kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf1=\EOP, - kf2=\EOR, kf4=\EOS, khome=\E[H, nel=\r\ED, rc=\E8, ri=\EM, - rmir=\E[4l, rmso=\E[m, rmul=\E[m, sc=\E7, smir=\E[4h, - smso=\E[7m, smul=\E[4m, + bel=^G, clear=\E[;H\E[2J, cr=\r, cub1=^H, + cup=\E[%i%p1%d;%p2%dH, dch1=\E[P, dl1=\E[M$<5*/>, + ed=\E[J, el=\E[K, home=\E[H, ht=^I, il1=\E[L$<5*/>, ind=\ED, + kf1=\EOP, kf2=\EOR, kf4=\EOS, nel=\r\ED, ri=\EM, rmir=\E[4l, + rmso=\E[m, rmul=\E[m, smir=\E[4h, smso=\E[7m, smul=\E[4m, + use=ansi+arrows, use=ansi+csr, use=ansi+local1, # Procomm and some other ANSI emulations don't recognize all of the ANSI- # standard capabilities. This entry deletes , , , , and @@ -581,13 +578,11 @@ ansi77|ANSI 3.64 standard 1977 version, # From: Eric S. Raymond Oct 30 1995 pcansi-m|pcansi-mono|ibm-pc terminal programs claiming to be ANSI (mono mode), OTbs, am, mir, msgr, - cols#80, it#8, lines#24, - bel=^G, cbt=\E[Z, clear=\E[H\E[J, cr=\r, cub1=\E[D, - cud1=\E[B, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, - dch1=\E[P, dl1=\E[M, ed=\E[J, el=\E[K, home=\E[H, ht=^I, - hts=\EH, il1=\E[L, ind=\n, kbs=^H, kcub1=\E[D, kcud1=\E[B, - kcuf1=\E[C, kcuu1=\E[A, khome=\E[H, tbc=\E[3g, - use=klone+sgr-dumb, + cols#80, lines#24, + bel=^G, cr=\r, dch1=\E[P, dl1=\E[M, il1=\E[L, ind=\n, + use=ansi+arrows, use=ansi+cup, use=ansi+erase, + use=ansi+inittabs, use=ansi+local1, use=klone+sgr-dumb, + pcansi-25-m|pcansi25m|ibm-pc terminal programs with 25 lines (mono mode), lines#25, use=pcansi-m, pcansi-33-m|pcansi33m|ibm-pc terminal programs with 33 lines (mono mode), @@ -610,14 +605,12 @@ pcansi-43|pcansi43|ibm-pc terminal programs with 43 lines, # From: Eric S. Raymond Nov 6 1995 ansi-m|ansi-mono|ANSI X3.64-1979 terminal with ANSI.SYS compatible attributes, mc5i, - cub=\E[%p1%dD, cud=\E[%p1%dB, cuf=\E[%p1%dC, - cuu=\E[%p1%dA, dch=\E[%p1%dP, dl=\E[%p1%dM, - ech=\E[%p1%dX, el1=\E[1K, hpa=\E[%i%p1%dG, ht=\E[I, - ich=\E[%p1%d@, il=\E[%p1%dL, kbs=^H, kcbt=\E[Z, kcub1=\E[D, - kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kich1=\E[L, mc4=\E[4i, - mc5=\E[5i, nel=\r\E[S, rep=%p1%c\E[%p2%{1}%-%db, - s0ds=\E(B, s1ds=\E)B, s2ds=\E*B, s3ds=\E+B, tbc=\E[3g, - vpa=\E[%i%p1%dd, use=ecma+index, use=pcansi-m, + dch=\E[%p1%dP, dl=\E[%p1%dM, ech=\E[%p1%dX, el1=\E[1K, + hpa=\E[%i%p1%dG, ht=\E[I, ich=\E[%p1%d@, il=\E[%p1%dL, + kcbt=\E[Z, kich1=\E[L, mc4=\E[4i, mc5=\E[5i, nel=\r\E[S, + rep=%p1%c\E[%p2%{1}%-%db, s0ds=\E(B, s1ds=\E)B, + s2ds=\E*B, s3ds=\E+B, vpa=\E[%i%p1%dd, use=ansi+local, + use=ecma+index, use=pcansi-m, # ECMA-48 addresses three of the four capabilities here: # @@ -642,7 +635,7 @@ ansi-m|ansi-mono|ANSI X3.64-1979 terminal with ANSI.SYS compatible attributes, # Parameter default value: Ps = 0 # With a parameter value not equal to 0, DA is used to identify the # device which sends the DA. The parameter value is a device type -# identification code according to a register which is to be established. +# identification code according to a register which is to be established. # If the parameter value is 0, DA is used to request an identifying DA # from a device. # @@ -693,12 +686,11 @@ ansi-generic|ansiterm|generic ANSI standard terminal, ansi.sys-old|ANSI.SYS under PC-DOS 2.0, OTbs, am, mir, msgr, xon, cols#80, lines#25, - clear=\E[2J, cub1=^H, cud1=\E[B, cuf1=\E[C, - cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, el=\E[k, home=\E[H, - is2=\E[m\E[?7h, kcub1=^H, kcud1=\n, kcuf1=^L, kcuu1=^K, - khome=^^, pfkey=\E[0;%p1%{58}%+%d;%p2"%s"p, rc=\E[u, - rmam=\E[?7l, sc=\E[s, smam=\E[?7h, use=ansi+cpr, - use=klone+color, use=klone+sgr8, + clear=\E[2J, cub1=^H, cup=\E[%i%p1%d;%p2%dH, el=\E[k, + home=\E[H, is2=\E[m\E[?7h, kcub1=^H, kcud1=\n, kcuf1=^L, + kcuu1=^K, khome=^^, pfkey=\E[0;%p1%{58}%+%d;%p2"%s"p, + rc=\E[u, rmam=\E[?7l, sc=\E[s, smam=\E[?7h, use=ansi+cpr, + use=ansi+local1, use=klone+color, use=klone+sgr8, # Keypad: Home=\0G Up=\0H PrPag=\0I # ka1,kh kcuu1 kpp,ka3 @@ -721,7 +713,7 @@ ansi.sys-old|ANSI.SYS under PC-DOS 2.0, # # capability for F1-F48 -TD ansi.sys|ANSI.SYS 3.1 and later versions, - el=\E[K, ka1=\0G, ka3=\0I, kb2=\0L, kbs=^H, kc1=\0O, kc3=\0Q, + el=\E[K, ka1=\0G, ka3=\0I, kb2=\0L, kc1=\0O, kc3=\0Q, kcbt=\0^O, kcub1=\0K, kcud1=\0P, kcuf1=\0M, kcuu1=\0H, kdch1=\0S, kend=\0O, kf1=\0;, kf10=\0D, kf11=\0\205, kf12=\0\206, kf13=\0T, kf14=\0U, kf15=\0V, kf16=\0W, @@ -736,7 +728,7 @@ ansi.sys|ANSI.SYS 3.1 and later versions, pfkey=\E[0;%?%p1%{11}%<%t%':'%e%p1%{13}%<%t%'z'%e%p1%{23}%< %t%'G'%e%p1%{25}%<%t%'p'%e%p1%'#'%<%t%'E'%e%p1%'%'%<%t %'f'%e%p1%'/'%<%t%'C'%e%{92}%;%p1%+%d;%p2"%s"p, - use=ansi.sys-old, + use=ansi+arrows, use=ansi.sys-old, # # Define IBM PC keypad keys for vi as per MS-Kermit while using ANSI.SYS. @@ -826,41 +818,33 @@ st52-color|at-color|atari-color|atari_st-color|Atari ST with color, use=st52, st52|st52-m|at|at-m|atari|atari-m|atari_st|atarist-m|Atari ST, am, eo, mir, npc, - cols#80, it#8, lines#24, - bel=^G, civis=\Ef, clear=\EE, cnorm=\Ee, cr=\r, cub1=\ED, - cud1=\EB, cuf1=\EC, cup=\EY%p1%{32}%+%c%p2%{32}%+%c, - cuu1=\EA, dl1=\EM, ed=\EJ, el=\EK, el1=\Eo, home=\EH, ht=^I, - il1=\EL, ind=\n, is2=\Ev\Eq\Ee, kLFT=\Ed, kRIT=\Ec, kbs=^H, - kcub1=\ED, kcud1=\EB, kcuf1=\EC, kcuu1=\EA, kdch1=^?, - kf1=\EP, kf10=\EY, kf11=\Ep, kf12=\Eq, kf13=\Er, kf14=\Es, - kf15=\Et, kf16=\Eu, kf17=\Ev, kf18=\Ew, kf19=\Ex, kf2=\EQ, - kf20=\Ey, kf3=\ER, kf4=\ES, kf5=\ET, kf6=\EU, kf7=\EV, kf8=\EW, - kf9=\EX, khlp=\EH, khome=\EE, kich1=\EI, knp=\Eb, kpp=\Ea, - kund=\EK, nel=\r\n, rc=\Ek, rev=\Ep, ri=\EI, rmso=\Eq, - rs2=\Ev\Eq\Ee, sc=\Ej, sgr0=\Eq, smso=\Ep, + civis=\Ef, clear=\EE, cnorm=\Ee, dl1=\EM, el1=\Eo, il1=\EL, + is2=\Ev\Eq\Ee, kLFT=\Ed, kRIT=\Ec, kdch1=^?, kf1=\EP, + kf10=\EY, kf11=\Ep, kf12=\Eq, kf13=\Er, kf14=\Es, kf15=\Et, + kf16=\Eu, kf17=\Ev, kf18=\Ew, kf19=\Ex, kf2=\EQ, kf20=\Ey, + kf3=\ER, kf4=\ES, kf5=\ET, kf6=\EU, kf7=\EV, kf8=\EW, kf9=\EX, + khlp=\EH, khome=\EE, kich1=\EI, knp=\Eb, kpp=\Ea, kund=\EK, + rc=\Ek, rev=\Ep, rmso=\Eq, rs2=\Ev\Eq\Ee, sc=\Ej, sgr0=\Eq, + smso=\Ep, use=vt52-basic, tw100|Toswin VT100 window manager, eo, mir, msgr, xon, colors#8, cols#80, it#8, lines#24, pairs#64, vt#3, acsc=++\,\,--..00II``aaffgghhjjkkllmmnnooppqqrrssttuuvvwwxxy yzz{{||}}~~, bel=^G, blink=\E[5m, bold=\E[1m, civis=\Ef, - clear=\E[2J\E[H, cnorm=\Ee, cr=\r, csr=\E[%i%p1%d;%p2%dr, - cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\EB, - cuf=\E[%p1%dC, cuf1=\EC, cup=\E[%i%p1%d;%p2%dH, - cuu=\E[%p1%dA, cuu1=\EA, dch1=\Ea, dim=\E[2m, dl=\E[%p1%dM, - dl1=\E[M, ed=\E[J, el=\E[K, el1=\E[1K, home=\E[H, ht=^I, - hts=\EH, ich=\E[%p1%d@, il1=\EL, ind=\n, is2=\E<\E)0, kbs=^H, - kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kdch1=^?, - kf1=\EOP, kf10=\EOY, kf11=\Ep, kf12=\Eq, kf13=\Er, kf14=\Es, - kf15=\Et, kf16=\Eu, kf17=\Ev, kf18=\Ew, kf19=\Ex, kf2=\EOQ, - kf20=\Ey, kf3=\EOR, kf4=\EOS, kf5=\EOT, kf6=\EOU, kf7=\EOV, - kf8=\EOW, kf9=\EOX, khlp=\EH, khome=\E\EE, kich1=\EI, - knp=\Eb, kpp=\E\Ea, kund=\EK, ll=\E[24H, nel=\EE, - oc=\E[30;47m, op=\E[30;47m, rc=\E8, rev=\E[7m, ri=\EM, - rmacs=^O, rmcup=\E[?7h, rmir=\Ei, rmkx=\E[?1l\E>, + clear=\E[2J\E[H, cnorm=\Ee, cr=\r, cub1=^H, cud1=\EB, + cuf1=\EC, cup=\E[%i%p1%d;%p2%dH, cuu1=\EA, dch1=\Ea, + dim=\E[2m, dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K, + el1=\E[1K, home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@, il1=\EL, + ind=\n, is2=\E<\E)0, kdch1=^?, kf1=\EOP, kf10=\EOY, kf11=\Ep, + kf12=\Eq, kf13=\Er, kf14=\Es, kf15=\Et, kf16=\Eu, kf17=\Ev, + kf18=\Ew, kf19=\Ex, kf2=\EOQ, kf20=\Ey, kf3=\EOR, kf4=\EOS, + kf5=\EOT, kf6=\EOU, kf7=\EOV, kf8=\EOW, kf9=\EOX, khlp=\EH, + khome=\E\EE, kich1=\EI, knp=\Eb, kpp=\E\Ea, kund=\EK, + ll=\E[24H, nel=\EE, oc=\E[30;47m, op=\E[30;47m, rev=\E[7m, + ri=\EM, rmacs=^O, rmcup=\E[?7h, rmir=\Ei, rmkx=\E[?1l\E>, rmso=\E[m, rmul=\E[m, rs1=\E<\E[20l\E[?3;6;9l\E[r\Eq\E(B\017\E)0\E>, - sc=\E7, setb=\E[4%p1%'0'%+%Pa%?%ga%'0'%=%t0%e%ga%'1'%=%t4%e%ga%'2'%= %t2%e%ga%'3'%=%t6%e%ga%'4'%=%t1%e%ga%'5'%=%t5%e%ga%'6' %=%t3%e7%;m, @@ -869,42 +853,38 @@ tw100|Toswin VT100 window manager, %=%t3%e7%;m, sgr0=\E[m, smacs=^N, smcup=\E[?7l, smir=\Eh, smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, tbc=\E[3g, + use=ansi+apparrows, use=ansi+csr, use=ansi+local, + # The entries for stv52 and stv52pc probably need a revision. stv52|MiNT virtual console, am, msgr, - cols#80, it#8, lines#30, - bel=^G, blink=\Er, bold=\EyA, civis=\Ef, clear=\EE, - cnorm=\E. \Ee, cr=\r, cub1=^H, cud1=\EB, cuf1=\EC, - cup=\EY%p1%{32}%+%c%p2%{32}%+%c, cuu1=\EA, cvvis=\E.", - dim=\Em, dl1=\EM, ed=\EJ, el=\EK, home=\EH, ht=^I, il1=\EL, - ind=\n$<2*/>, kbs=^H, kcub1=\ED, kcud1=\EB, kcuf1=\EC, - kcuu1=\EA, kdch1=^?, kf1=\EP, kf10=\EY, kf11=\Ep, kf12=\Eq, - kf13=\Er, kf14=\Es, kf15=\Et, kf16=\Eu, kf17=\Ev, kf18=\Ew, - kf19=\Ex, kf2=\EQ, kf20=\Ey, kf3=\ER, kf4=\ES, kf5=\ET, - kf6=\EU, kf7=\EV, kf8=\EW, kf9=\EX, khlp=\EH, khome=\EE, - kich1=\EI, knp=\Eb, kpp=\Ea, kund=\EK, nel=\r\n$<2*/>, - op=\Eb@\EcO, rev=\Ep, ri=\EI$<2*/>, rmcup=\Ev\E. \Ee\Ez_, - rmso=\Eq, rmul=\EzH, rs1=\Ez_\Eb@\EcA, sgr0=\Ez_, - smcup=\Ev\Ee\Ez_, smso=\Ep, smul=\EyH, + lines#30, + blink=\Er, bold=\EyA, civis=\Ef, clear=\EE, cnorm=\E. \Ee, + cub1=^H, cvvis=\E.", dim=\Em, dl1=\EM, il1=\EL, ind=\n$<2*/>, + kdch1=^?, kf1=\EP, kf10=\EY, kf11=\Ep, kf12=\Eq, kf13=\Er, + kf14=\Es, kf15=\Et, kf16=\Eu, kf17=\Ev, kf18=\Ew, kf19=\Ex, + kf2=\EQ, kf20=\Ey, kf3=\ER, kf4=\ES, kf5=\ET, kf6=\EU, kf7=\EV, + kf8=\EW, kf9=\EX, khlp=\EH, khome=\EE, kich1=\EI, knp=\Eb, + kpp=\Ea, kund=\EK, nel=\r\n$<2*/>, op=\Eb@\EcO, rev=\Ep, + ri=\EI$<2*/>, rmcup=\Ev\E. \Ee\Ez_, rmso=\Eq, rmul=\EzH, + rs1=\Ez_\Eb@\EcA, sgr0=\Ez_, smcup=\Ev\Ee\Ez_, smso=\Ep, + smul=\EyH, use=vt52-basic, stv52pc|MiNT virtual console with PC charset, am, msgr, - cols#80, it#8, lines#30, + lines#30, acsc=+\257\,\256-\^.v0\333I\374`\177a\260f\370g\361h\261j \331k\277l\332m\300n\305o\377p-q\304r-s_t+u+v+w+x\263y \363z\362{\343|\366}\234~\371, - bel=^G, blink=\Er, bold=\EyA, civis=\Ef, clear=\EE, - cnorm=\E. \Ee, cr=\r, cub1=^H, cud1=\EB, cuf1=\EC, - cup=\EY%p1%{32}%+%c%p2%{32}%+%c, cuu1=\EA, cvvis=\E.", - dim=\Em, dl1=\EM, ed=\EJ, el=\EK, home=\EH, ht=^I, il1=\EL, - ind=\n$<2*/>, kbs=^H, kcub1=\ED, kcud1=\EB, kcuf1=\EC, - kcuu1=\EA, kdch1=^?, kf1=\EP, kf10=\EY, kf11=\Ep, kf12=\Eq, - kf13=\Er, kf14=\Es, kf15=\Et, kf16=\Eu, kf17=\Ev, kf18=\Ew, - kf19=\Ex, kf2=\EQ, kf20=\Ey, kf3=\ER, kf4=\ES, kf5=\ET, - kf6=\EU, kf7=\EV, kf8=\EW, kf9=\EX, khlp=\EH, khome=\EE, - kich1=\EI, knp=\Eb, kpp=\Ea, kund=\EK, nel=\r\n$<2*/>, - rev=\Ep, ri=\EI$<2*/>, rmcup=\Ev\E. \Ee\Ez_, rmso=\Eq, - rmul=\EzH, rs1=\Ez_\Eb@\EcA, sgr0=\Ez_, smcup=\Ev\Ee\Ez_, - smso=\Ep, smul=\EyH, + blink=\Er, bold=\EyA, civis=\Ef, clear=\EE, cnorm=\E. \Ee, + cub1=^H, cvvis=\E.", dim=\Em, dl1=\EM, il1=\EL, ind=\n$<2*/>, + kdch1=^?, kf1=\EP, kf10=\EY, kf11=\Ep, kf12=\Eq, kf13=\Er, + kf14=\Es, kf15=\Et, kf16=\Eu, kf17=\Ev, kf18=\Ew, kf19=\Ex, + kf2=\EQ, kf20=\Ey, kf3=\ER, kf4=\ES, kf5=\ET, kf6=\EU, kf7=\EV, + kf8=\EW, kf9=\EX, khlp=\EH, khome=\EE, kich1=\EI, knp=\Eb, + kpp=\Ea, kund=\EK, nel=\r\n$<2*/>, rev=\Ep, ri=\EI$<2*/>, + rmcup=\Ev\E. \Ee\Ez_, rmso=\Eq, rmul=\EzH, + rs1=\Ez_\Eb@\EcA, sgr0=\Ez_, smcup=\Ev\Ee\Ez_, smso=\Ep, + smul=\EyH, use=vt52-basic, # From: Simson L. Garfinkel atari-old|Atari st, @@ -912,8 +892,8 @@ atari-old|Atari st, cols#80, it#8, lines#25, clear=\EH\EJ, cub1=\ED, cud1=\EB, cuf1=\EC, cup=\EY%p1%{32}%+%c%p2%{32}%+%c, cuu1=\EA, dl1=\EM, - ed=\EJ, el=\EK, ht=^I, il1=\EL, kcub1=\ED, kcud1=\EB, - kcuf1=\EC, kcuu1=\EA, ri=\EI, rmso=\Eq, sgr0=\Eq, smso=\Ep, + ed=\EJ, el=\EK, ht=^I, il1=\EL, ri=\EI, rmso=\Eq, sgr0=\Eq, + smso=\Ep, use=vt52+arrows, # UniTerm terminal program for the Atari ST: 49-line VT220 emulation mode # From: Paul M. Aoki uniterm|uniterm49|UniTerm VT220 emulator with 49 lines, @@ -943,26 +923,20 @@ st52-old|Atari ST with VT52 emulation, # BeOS entry for Terminal program Seems to be almost ANSI beterm|BeOS Terminal, am, eo, mir, msgr, xenl, xon, - colors#8, cols#80, it#8, lines#25, ncv#5, pairs#64, - bel=^G, bold=\E[1m, clear=\E[H\E[J, cr=\r, - csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H, - cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C, - cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, - dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M, - ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K, home=\E[H, - hpa=\E[%i%p1%dG, ht=^I, hts=\EH, ich=\E[%p1%d@, ich1=\E[@, - il=\E[%p1%dL, il1=\E[L, ind=\n, kbs=^H, kcub1=\E[D, - kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf1=\E[11~, - kf10=\E[20~, kf11=\E[21~, kf12=\E[22~, kf2=\E[12~, - kf3=\E[13~, kf4=\E[14~, kf5=\E[15~, kf6=\E[16~, kf7=\E[17~, - kf8=\E[18~, kf9=\E[19~, kspd=^Z, nel=\r\n, op=\E[m, rc=\E8, - rev=\E[7m, ri=\EM, rmir=\E[4l, rmkx=\E[?4l, rmso=\E[m, - rmul=\E[24m, rs1=\Ec, sc=\E7, setab=\E[4%p1%dm, - setaf=\E[3%p1%dm, setb=\E[%p1%{40}%+%cm, - setf=\E[%p1%{30}%+%cm, sgr0=\E[0;10m, smir=\E[4h, - smkx=\E[?4h, smso=\E[7m, smul=\E[4m, - u6=\E[%i%p1%d;%p2%dR, u7=\E[6n, vpa=\E[%i%p1%dd, - use=vt220+pcedit, + cols#80, it#8, lines#25, ncv#5, + bel=^G, bold=\E[1m, cr=\r, cub1=^H, cud1=\n, + cup=\E[%i%p1%d;%p2%dH, ech=\E[%p1%dX, el1=\E[1K, + home=\E[H, hpa=\E[%i%p1%dG, ht=^I, hts=\EH, ind=\n, + kf10=\E[20~, kf11=\E[21~, kf12=\E[22~, kf6=\E[16~, + kf7=\E[17~, kf8=\E[18~, kf9=\E[19~, khome=\E[1~, kspd=^Z, + nel=\r\n, op=\E[m, rev=\E[7m, ri=\EM, rmkx=\E[?4l, rmso=\E[m, + rmul=\E[24m, rs1=\Ec, setb=\E[%p1%{40}%+%cm, + setf=\E[%p1%{30}%+%cm, sgr0=\E[0;10m, smkx=\E[?4h, + smso=\E[7m, smul=\E[4m, u6=\E[%i%p1%d;%p2%dR, u7=\E[6n, + vpa=\E[%i%p1%dd, use=ansi+arrows, use=ansi+csr, + use=ansi+erase, use=ansi+idc, use=ansi+idl, + use=ansi+local, use=klone+color, use=vt220+pcedit, + use=xterm+r5+fkeys, #### Linux consoles # @@ -998,32 +972,32 @@ linux-basic|Linux console (basic), acsc=+\020\,\021-\030.^Y0\333`\004a\261f\370g\361h\260i \316j\331k\277l\332m\300n\305o~p\304q\304r\304s_t\303u \264v\301w\302x\263y\363z\362{\343|\330}\234~\376, - bel=^G, clear=\E[H\E[J, cr=\r, csr=\E[%i%p1%d;%p2%dr, - cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\n, - cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, - cuu=\E[%p1%dA, cuu1=\E[A, dch=\E[%p1%dP, dch1=\E[P, - dim=\E[2m, dl=\E[%p1%dM, dl1=\E[M, ech=\E[%p1%dX, ed=\E[J, - el=\E[K, el1=\E[1K, flash=\E[?5h$<200/>\E[?5l, home=\E[H, - hpa=\E[%i%p1%dG, ht=^I, hts=\EH, ich=\E[%p1%d@, ich1=\E[@, - il=\E[%p1%dL, il1=\E[L, ind=\n, kb2=\E[G, kbs=^?, kcbt=\E[Z, - kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf1=\E[[A, - kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf2=\E[[B, - kf3=\E[[C, kf4=\E[[D, kf5=\E[[E, kf6=\E[17~, kf7=\E[18~, - kf8=\E[19~, kf9=\E[20~, kmous=\E[M, kspd=^Z, nel=\r\n, - rc=\E8, rev=\E[7m, ri=\EM, rmam=\E[?7l, rmir=\E[4l, - rmso=\E[27m, rmul=\E[24m, rs1=\Ec\E]R, sc=\E7, + bel=^G, cr=\r, cub1=^H, cud1=\n, cup=\E[%i%p1%d;%p2%dH, + dim=\E[2m, ech=\E[%p1%dX, el1=\E[1K, + flash=\E[?5h$<200/>\E[?5l, home=\E[H, hpa=\E[%i%p1%dG, + ht=^I, hts=\EH, ind=\n, kb2=\E[G, kbs=^?, kcbt=\E[Z, + khome=\E[1~, kmous=\E[M, kspd=^Z, nel=\r\n, ri=\EM, + rmam=\E[?7l, rmso=\E[27m, rmul=\E[24m, rs1=\Ec\E]R, sgr=\E[0;10%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p5 %t;2%;%?%p6%t;1%;%?%p9%t;11%;m, - smam=\E[?7h, smir=\E[4h, smul=\E[4m, tbc=\E[3g, - vpa=\E[%i%p1%dd, use=vt220+pcedit, use=vt102+enq, - use=klone+sgr, use=ecma+color, use=linux+sfkeys, + smam=\E[?7h, tbc=\E[3g, vpa=\E[%i%p1%dd, use=ansi+arrows, + use=ansi+csr, use=ansi+erase, use=ansi+idc, use=ansi+idl, + use=ansi+local, use=vt220+pcedit, use=vt102+enq, + use=klone+sgr, use=ecma+color, use=linux+lockeys, + use=linux+sfkeys, use=vt220+ufkeys, + +# VT220 uses F1-F5 for "local" manipulation, normally not sending anything to +# the host. Rather than adapt the numbering scheme used by xterm, Linux used +# this arrangement which doubles the "[", making it inconsistent with most +# terminals having function-keys in the same format as control sequences -TD +linux+lockeys|Linux "local" keys in vt220 scheme, + kf1=\E[[A, kf2=\E[[B, kf3=\E[[C, kf4=\E[[D, kf5=\E[[E, linux+decid|ncurses extension for Linux console DECID, u8=\E[?6c, use=decid+cpr, linux+sfkeys|shifted function-keys for Linux console, - kf13=\E[25~, kf14=\E[26~, kf15=\E[28~, kf16=\E[29~, - kf17=\E[31~, kf18=\E[32~, kf19=\E[33~, kf20=\E[34~, + use=vt220+sfkeys, linux-m|Linux console no color, colors@, pairs@, @@ -1169,44 +1143,30 @@ linux-vt|Linux console using VT codes for graphics, # of the functionality), but does not recognize as many control sequences. # The program comes bundled with an old (circa 1998) copy of the Linux # console terminfo. It recognizes some non-ANSI/VT100 sequences such as -# \E* move cursor to home, as as \E[H +# \E* move cursor to home, as \E[H # \E,X same as \E(X # \EE move cursor to beginning of row # \E[y,xf same as \E[y,xH # # Note: The status-line support is buggy (dsl does not work). kon|kon2|Kanji ON Linux console, - am, bce, ccc, eo, eslok, hs, mir, msgr, xenl, xon, - colors#8, it#8, ncv#18, pairs#64, - acsc=+\020\,\021-\030.^Y0\333`\004a\261f\370g\361h\260j - \331k\277l\332m\300n\305o~p\304q\304r\304s_t\303u\264v - \301w\302x\263y\363z\362{\343|\330}\234~\376, - bel=^G, blink=\E[5m, bold=\E[1m, civis=\E[?25l, - clear=\E[H\E[J, cnorm=\E[?25h, cr=\r, - csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H, - cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C, - cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, - dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, dl=\E[%p1%dM, - dl1=\E[M, dsl=\E[?H\E[?E, ed=\E[J, el=\E[K, el1=\E[1K, - fsl=\E[?F, home=\E[H, hpa=\E[%i%p1%dG, ht=^I, hts=\EH, - ich=\E[%p1%d@, ich1=\E[@, il=\E[%p1%dL, il1=\E[L, ind=\n, - initc=\E]P%p1%x%p2%02x%p3%02x%p4%02x, invis=\E[8m, - kb2=\E[G, kbs=^?, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, - kcuu1=\E[A, kdch1=\E[3~, kend=\E[4~, kf1=\E[[A, - kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf13=\E[25~, - kf14=\E[26~, kf15=\E[28~, kf16=\E[29~, kf17=\E[31~, - kf18=\E[32~, kf19=\E[33~, kf2=\E[[B, kf20=\E[34~, - kf3=\E[[C, kf4=\E[[D, kf5=\E[[E, kf6=\E[17~, kf7=\E[18~, - kf8=\E[19~, kf9=\E[20~, khome=\E[1~, kich1=\E[2~, - knp=\E[6~, kpp=\E[5~, kspd=^Z, nel=\r\n, op=\E[37;40m, - rc=\E8, rev=\E[7m, ri=\EM, rmacs=\E[10m, rmir=\E[4l, - rmpch=\E[10m, rmso=\E[27m, rmul=\E[24m, rs1=\Ec, sc=\E7, - setab=\E[4%p1%dm, setaf=\E[3%p1%dm, + am, bce, ccc, eo, mir, msgr, xenl, xon, + it#8, ncv#18, + bel=^G, civis=\E[?25l, cnorm=\E[?25h, cr=\r, cub1=^H, + cud1=\n, dim=\E[2m, dsl=\E[?H\E[?E, el1=\E[1K, fsl=\E[?F, + ht=^I, hts=\EH, ind=\n, + initc=\E]P%p1%x%p2%02x%p3%02x%p4%02x, kb2=\E[G, kbs=^?, + khome=\E[1~, kspd=^Z, nel=\r\n, ri=\EM, rmso=\E[27m, + rmul=\E[24m, rs1=\Ec, sgr=\E[0;10%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p5 %t;2%;%?%p6%t;1%;%?%p7%t;8%;%?%p9%t;11%;m, - sgr0=\E[0;10m, smacs=\E[11m, smir=\E[4h, smpch=\E[11m, - smso=\E[7m, smul=\E[4m, tbc=\E[3g, tsl=\E[?T, u8=\E[?6c, - vpa=\E[%i%p1%dd, use=ansi+enq, + sgr0=\E[0;10m, tbc=\E[3g, tsl=\E[?T, u8=\E[?6c, + use=ansi+arrows, use=ansi+csr, use=ansi+cup, + use=ansi+enq, use=ansi+erase, use=ansi+idc, use=ansi+idl, + use=ansi+local, use=ansi+sgrbold, use=ansi+rca2, + use=dec+sl, use=ecma+sgr, use=klone+color, + use=linux+lockeys, use=linux+sfkeys, use=vt220+ufkeys, + use=vt220+pcedit, # release: 0.4.7 2005/05 # @@ -1278,16 +1238,12 @@ bterm|bogl virtual terminal, acsc=aajjkkllmmqqttuuxx, bold=\E[1m, clear=\E[H\E[2J, cr=\r, cub1=^H, cud1=\n, cup=\E[%i%p1%d;%p2%dH, ed=\E[J, el=\E[K, home=\E[H, ind=\n, kb2=\E[G, kbs=^?, kcbt=\E[Z, - kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf1=\E[[A, - kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf13=\E[25~, - kf14=\E[26~, kf15=\E[28~, kf16=\E[29~, kf17=\E[31~, - kf18=\E[32~, kf19=\E[33~, kf2=\E[[B, kf20=\E[34~, - kf3=\E[[C, kf4=\E[[D, kf5=\E[[E, kf6=\E[17~, kf7=\E[18~, - kf8=\E[19~, kf9=\E[20~, kmous=\E[M, kspd=^Z, nel=\r\n, + khome=\E[1~, kmous=\E[M, kspd=^Z, nel=\r\n, op=\E[49m\E[39m, rev=\E[7m, ri=\EM, rmacs=^O, rmso=\E[27m, rmul=\E[24m, setab=\E[4%p1%dm, setaf=\E[3%p1%dm, sgr0=\E[0m, smacs=^N, smso=\E[7m, smul=\E[4m, - use=vt220+pcedit, use=vt220+cvis, + use=ansi+arrows, use=linux+lockeys, use=linux+sfkeys, + use=vt220+pcedit, use=vt220+cvis, use=vt220+ufkeys, #### Mach # @@ -1296,17 +1252,15 @@ bterm|bogl virtual terminal, mach|Mach console, am, km, NQ, cols#80, it#8, lines#25, - bel=^G, blink=\E[5m, bold=\E[1m, clear=\Ec, cr=\r, - cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\n, - cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, - cuu=\E[%p1%dA, cuu1=\E[A, dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, - el=\E[K, home=\E[H, ht=^I, il=\E[%p1%dL, il1=\E[L, ind=\n, - kbs=^?, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, - kdch1=\E[9, kend=\E[Y, kf1=\EOP, kf10=\EOY, kf2=\EOQ, - kf3=\EOR, kf4=\EOS, kf5=\EOT, kf6=\EOU, kf7=\EOV, kf8=\EOW, - kf9=\EOX, khome=\E[H, kich1=\E[@, kll=\E[F, knp=\E[U, - kpp=\E[V, rev=\E[7m, rmso=\E[0m, rmul=\E[24m, sgr0=\E[0m, - smso=\E[7m, smul=\E[4m, + bel=^G, blink=\E[5m, bold=\E[1m, clear=\Ec, cr=\r, cub1=^H, + cud1=\n, cup=\E[%i%p1%d;%p2%dH, ed=\E[J, el=\E[K, + home=\E[H, ht=^I, ind=\n, kbs=^?, kdch1=\E[9, kend=\E[Y, + kf1=\EOP, kf10=\EOY, kf2=\EOQ, kf3=\EOR, kf4=\EOS, kf5=\EOT, + kf6=\EOU, kf7=\EOV, kf8=\EOW, kf9=\EOX, kich1=\E[@, kll=\E[F, + knp=\E[U, kpp=\E[V, rev=\E[7m, rmso=\E[0m, rmul=\E[24m, + sgr0=\E[0m, smso=\E[7m, smul=\E[4m, use=ansi+arrows, + use=ansi+idl, use=ansi+local, + mach-bold|Mach console with bold instead of underline, rmul=\E[0m, smul=\E[1m, use=mach, mach-color|Mach console with ANSI color, @@ -1364,32 +1318,24 @@ mach-gnu-color|GNU Mach console with ANSI color, # Reading the source, RIS resets cnorm, but not xmous. hurd|The GNU Hurd console server, am, bce, bw, eo, km, mir, msgr, xenl, xon, NQ, - colors#8, it#8, ncv#18, pairs#64, + it#8, ncv#18, acsc=++\,\,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxy yzz{{||}}~~, - bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, clear=\Ec, cr=\r, - csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H, - cud=\E[%p1%dB, cud1=\E[B, cuf=\E[%p1%dC, cuf1=\E[C, - cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, - cvvis=\E[34l, dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, - dl=\E[%p1%dM, dl1=\E[M, ech=\E[%p1%dX, ed=\E[J, el=\E[K, - el1=\E[1K, flash=\Eg, home=\E[H, hpa=\E[%i%p1%dG, ht=^I, - ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L, ind=\E[S, - invis=\E[8m, kb2=\E[G, kbs=^?, kcbt=\E[Z, kcub1=\EOD, - kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kf1=\EOP, kf10=\E[21~, - kf11=\E[23~, kf12=\E[24~, kf13=\E[25~, kf14=\E[26~, - kf15=\E[28~, kf16=\E[29~, kf17=\E[31~, kf18=\E[32~, - kf19=\E[33~, kf2=\EOQ, kf20=\E[34~, kf3=\EOR, kf4=\EOS, - kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, - kich1=\E[2~, kmous=\E[M, kspd=^Z, nel=\r\n, op=\E[39;49m, - rc=\E8, rev=\E[7m, ri=\E[T, rmacs=\E[10m, rmir=\E[4l, - rmso=\E[27m, rmul=\E[24m, rs1=\EM\E[?1000l, sc=\E7, - setab=\E[4%p1%dm, setaf=\E[3%p1%dm, + bel=^G, cbt=\E[Z, clear=\Ec, cr=\r, cub1=^H, cvvis=\E[34l, + dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, ech=\E[%p1%dX, + el1=\E[1K, flash=\Eg, ht=^I, ich=\E[%p1%d@, ind=\E[S, + kb2=\E[G, kbs=^?, kcbt=\E[Z, kf1=\EOP, kf2=\EOQ, kf3=\EOR, + kf4=\EOS, khome=\E[1~, kmous=\E[M, kspd=^Z, nel=\r\n, + op=\E[39;49m, ri=\E[T, rmir=\E[4l, rmso=\E[27m, + rmul=\E[24m, rs1=\EM\E[?1000l, sgr=\E[0%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p5%t; 2%;%?%p6%t;1%;%?%p7%t;8%;%?%p9%t;11%;m, - sgr0=\E[0m, smacs=\E[11m, smir=\E[4h, smso=\E[7m, - smul=\E[4m, vpa=\E[%i%p1%dd, grbom=\E[>1l, gsbom=\E[>1h, - use=vt220+pcedit, use=ecma+index, use=ecma+italics, + smir=\E[4h, grbom=\E[>1l, gsbom=\E[>1h, + use=ansi+apparrows, use=ansi+csr, use=ansi+cup, + use=ansi+erase, use=ansi+idl, use=ansi+local, + use=ansi+rca2, use=ansi+sgrbold, use=vt220+pcedit, + use=ecma+index, use=ecma+italics, use=klone+acs, + use=klone+color, use=linux+sfkeys, use=xterm+r5+fkeys, use=vt220+cvis, #### QNX @@ -1493,25 +1439,21 @@ qnxt2|QNX 2.15 serial terminal, # QNX ANSI terminal definition qansi-g|QNX ANSI, am, eslok, hs, xon, - colors#8, cols#80, it#8, lines#25, ncv#19, pairs#64, wsl#80, + colors#8, cols#80, lines#25, ncv#19, pairs#64, wsl#80, acsc=Oa``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, - bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, clear=\E[2J\E[H, - cr=\r, csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=\E[D, - cud=\E[%p1%dB, cud1=\E[B, cuf=\E[%p1%dC, cuf1=\E[C, - cup=\E[%i%p1%d;%p2%dH$<5>, cuu=\E[%p1%dA, cuu1=\E[A, - cvvis=\E[?12;25h, dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, - dl=\E[%p1%dM, dl1=\E[1M, dsl=\E[r, ech=\E[%p1%dX, ed=\E[J, - el=\E[K, el1=\E[1K\E[X, flash=\E[?5h$<200>\E[?5l, - fsl=\E[?6h\E8, home=\E[H, hpa=\E[%i%p1%dG, ht=^I, hts=\EH, - ich=\E[%p1%d@, ich1=\E[1@, il=\E[%p1%dL, il1=\E[1L, - ind=\E[S, invis=\E[9m, + bel=^G, clear=\E[2J\E[H, cr=\r, csr=\E[%i%p1%d;%p2%dr, + cup=\E[%i%p1%d;%p2%dH$<5>, cvvis=\E[?12;25h, + dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, dl=\E[%p1%dM, + dl1=\E[1M, dsl=\E[r, ech=\E[%p1%dX, ed=\E[J, el=\E[K, + el1=\E[1K\E[X, flash=\E[?5h$<200>\E[?5l, fsl=\E[?6h\E8, + home=\E[H, hpa=\E[%i%p1%dG, ich=\E[%p1%d@, ich1=\E[1@, + il=\E[%p1%dL, il1=\E[1L, ind=\E[S, invis=\E[9m, is2=\E>\E[?1l\E[?7h\E[0;10;39;49m, is3=\E(B\E)0, kBEG=\ENn, kCAN=\E[s, kCMD=\E[t, kCPY=\ENs, kCRT=\ENt, kDL=\ENv, kEXT=\ENw, kFND=\ENx, kHLP=\ENy, kHOM=\E[h, kLFT=\E[d, kNXT=\E[u, kOPT=\ENz, kPRV=\E[v, kRIT=\E[c, - kbs=^H, kcan=\E[S, kcbt=\E[Z, kclo=\ENc, kclr=\ENa, - kcmd=\E[G, kcpy=\E[g, kctab=\E[z, kcub1=\E[D, kcud1=\E[B, - kcuf1=\E[C, kcuu1=\E[A, kdch1=\E[P, kdl1=\E[p, kend=\E[Y, + kcan=\E[S, kcbt=\E[Z, kclo=\ENc, kclr=\ENa, kcmd=\E[G, + kcpy=\E[g, kctab=\E[z, kdch1=\E[P, kdl1=\E[p, kend=\E[Y, kext=\E[y, kf1=\EOP, kf10=\EOY, kf11=\EOZ, kf12=\EOA, kf13=\EOp, kf14=\EOq, kf15=\EOr, kf16=\EOs, kf17=\EOt, kf18=\EOu, kf19=\EOv, kf2=\EOQ, kf20=\EOw, kf21=\EOx, @@ -1523,13 +1465,13 @@ qansi-g|QNX ANSI, kf42=\E[22~, kf43=\E[23~, kf44=\E[24~, kf45=\E[25~, kf46=\E[26~, kf47=\E[27~, kf48=\E[28~, kf5=\EOT, kf6=\EOU, kf7=\EOV, kf8=\EOW, kf9=\EOX, kfnd=\ENf, khlp=\ENh, - khome=\E[H, khts=\ENb, kich1=\E[@, kil1=\E[`, kind=\E[a, - kmov=\ENi, kmrk=\ENm, kmsg=\ENe, knp=\E[U, kopn=\ENo, - kopt=\ENk, kpp=\E[V, kref=\ENl, kres=\ENp, krfr=\ENg, - kri=\E[b, krpl=\ENr, krst=\ENj, ksav=\ENq, kslt=\E[T, - ktbc=\ENd, kund=\ENu, ll=\E[99H, nel=\EE, op=\E[39;49m, - rev=\E[7m, ri=\E[T, rmacs=^O, rmam=\E[?7l, rmso=\E[27m, - rmul=\E[24m, rs1=\017\E[?7h\E[0;39;49m$<2>\E>\E[?1l, + khts=\ENb, kich1=\E[@, kil1=\E[`, kind=\E[a, kmov=\ENi, + kmrk=\ENm, kmsg=\ENe, knp=\E[U, kopn=\ENo, kopt=\ENk, + kpp=\E[V, kref=\ENl, kres=\ENp, krfr=\ENg, kri=\E[b, + krpl=\ENr, krst=\ENj, ksav=\ENq, kslt=\E[T, ktbc=\ENd, + kund=\ENu, ll=\E[99H, nel=\EE, op=\E[39;49m, ri=\E[T, + rmacs=^O, rmam=\E[?7l, rmso=\E[27m, rmul=\E[24m, + rs1=\017\E[?7h\E[0;39;49m$<2>\E>\E[?1l, rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, setb=\E[4%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6} %=%t3%e%p1%d%;m, @@ -1537,10 +1479,11 @@ qansi-g|QNX ANSI, %=%t3%e%p1%d%;m, sgr=\E[0%?%p6%t;1%;%?%p5%t;2%;%?%p2%t;4%;%?%p4%t;5%;%?%p3%p1 %|%t;7%;%?%p7%t;9%;m%?%p9%t\016%e\017%;, - sgr0=\E[m\017, smacs=^N, smam=\E[?7h, smso=\E[7m, - smul=\E[4m, tbc=\E[3g, - tsl=\E7\E1;24r\E[?6l\E[25;%i%p1%dH, use=decid+cpr, - use=ansi+rep, use=att610+cvis0, use=ecma+index, + sgr0=\E[m\017, smacs=^N, smam=\E[?7h, + tsl=\E7\E1;24r\E[?6l\E[25;%i%p1%dH, use=ansi+arrows, + use=ansi+local, use=ansi+rep, use=ansi+inittabs, + use=ansi+sgrbold, use=att610+cvis0, use=decid+cpr, + use=ecma+index, # qansi|QNX ANSI with console writes, daisy, xhpa, use=qansi-g, @@ -1596,29 +1539,27 @@ scoansi-old|SCO Extended ANSI standard crt (5.0.5), yszr{c}\034~\207, bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, civis=\E[=14;12C, clear=\E[H\E[2J, cnorm=\E[=10;12C, - cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\E[B, - cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, - cuu=\E[%p1%dA, cuu1=\E[A, cvvis=\E[=0;12C, dch=\E[%p1%dP, - dch1=\E[P, dispc=\E[=%p1%dg, dl=\E[%p1%dM, dl1=\E[M, - ed=\E[m\E[J, el=\E[m\E[K, el1=\E[1K, home=\E[H, ht=^I, - hts=\EH, ich=\E[%p1%d@, ich1=\E[@, il=\E[%p1%dL, il1=\E[L, - ind=\E[S, invis=\E[8m, kbeg=\E[E, kbs=^H, kcbt=\E[Z, - kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kdch1=^?, - kend=\E[F, kf1=\E[M, kf10=\E[V, kf11=\E[W, kf12=\E[X, - kf13=\E[Y, kf15=\E[a, kf16=\E[b, kf17=\E[c, kf18=\E[d, - kf19=\E[e, kf2=\E[N, kf20=\E[f, kf21=\E[g, kf22=\E[h, - kf23=\E[i, kf24=\E[j, kf25=\E[k, kf26=\E[l, kf27=\E[m, - kf28=\E[n, kf29=\E[o, kf3=\E[O, kf30=\E[p, kf31=\E[q, - kf32=\E[r, kf33=\E[s, kf34=\E[t, kf35=\E[u, kf36=\E[v, - kf37=\E[w, kf38=\E[x, kf39=\E[y, kf4=\E[P, kf40=\E[z, - kf41=\E[@, kf42=\E[[, kf43=\E[\\, kf44=\E[], kf45=\E[\^, - kf46=\E[_, kf47=\E[`, kf48=\E[{, kf5=\E[Q, kf6=\E[R, - kf7=\E[S, kf8=\E[T, kf9=\E[U, khome=\E[H, kich1=\E[L, + cub1=^H, cup=\E[%i%p1%d;%p2%dH, cvvis=\E[=0;12C, + dch=\E[%p1%dP, dch1=\E[P, dispc=\E[=%p1%dg, ed=\E[m\E[J, + el=\E[m\E[K, el1=\E[1K, home=\E[H, ht=^I, hts=\EH, + ich=\E[%p1%d@, ich1=\E[@, ind=\E[S, invis=\E[8m, kbeg=\E[E, + kcbt=\E[Z, kdch1=^?, kend=\E[F, kf1=\E[M, kf10=\E[V, + kf11=\E[W, kf12=\E[X, kf13=\E[Y, kf15=\E[a, kf16=\E[b, + kf17=\E[c, kf18=\E[d, kf19=\E[e, kf2=\E[N, kf20=\E[f, + kf21=\E[g, kf22=\E[h, kf23=\E[i, kf24=\E[j, kf25=\E[k, + kf26=\E[l, kf27=\E[m, kf28=\E[n, kf29=\E[o, kf3=\E[O, + kf30=\E[p, kf31=\E[q, kf32=\E[r, kf33=\E[s, kf34=\E[t, + kf35=\E[u, kf36=\E[v, kf37=\E[w, kf38=\E[x, kf39=\E[y, + kf4=\E[P, kf40=\E[z, kf41=\E[@, kf42=\E[[, kf43=\E[\\, + kf44=\E[], kf45=\E[\^, kf46=\E[_, kf47=\E[`, kf48=\E[{, + kf5=\E[Q, kf6=\E[R, kf7=\E[S, kf8=\E[T, kf9=\E[U, kich1=\E[L, knp=\E[G, kpp=\E[I, op=\E[0;37;40m, rc=\E8, rev=\E[7m, ri=\E[T, rmacs=\E[10m, rmam=\E[?7l, rmso=\E[m, rmul=\E[m, sc=\E7, setab=\E[4%p1%dm, setaf=\E[3%p1%dm, sgr0=\E[0;10m, smacs=\E[12m, smam=\E[?7h, smso=\E[7m, - smul=\E[4m, use=ecma+index, + smul=\E[4m, use=ansi+arrows, use=ansi+idl, + use=ansi+local, use=ecma+index, + scoansi-new|SCO Extended ANSI standard crt (5.0.6), km, civis=\E[=0c, cnorm=\E[=1c, csr=\E[%i%p1%d;%p2%dr, @@ -1675,36 +1616,33 @@ iris-ansi|iris-ansi-net|IRIS emulating 40 line ANSI terminal (almost VT100), am, cols#80, it#8, lines#40, bel=^G, bold=\E[1m, clear=\E[H\E[2J, - cnorm=\E[9/y\E[12/y\E[=6l, cr=\r, cub=\E[%p1%dD, - cub1=\E[D, cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, - cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, - cuu1=\E[A, cvvis=\E[10/y\E[=1h\E[=2l\E[=6h, - dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K, el1=\E[1K, - home=\E[H, ht=^I, hts=\EH, il=\E[%p1%dL, il1=\E[L, ind=\ED, + cnorm=\E[9/y\E[12/y\E[=6l, cr=\r, cud1=\n, + cup=\E[%i%p1%d;%p2%dH, + cvvis=\E[10/y\E[=1h\E[=2l\E[=6h, ed=\E[J, el=\E[K, + el1=\E[1K, home=\E[H, ht=^I, hts=\EH, ind=\ED, is2=\E[?1l\E>\E[?7h\E[100g\E[0m\E7\E[r\E8, kDC=\E[P, kEND=\E[147q, kHOM=\E[143q, kLFT=\E[158q, kPRT=\E[210q, - kRIT=\E[167q, kSPD=\E[218q, kbs=^H, kcbt=\E[Z, kcub1=\E[D, - kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kdch1=^?, kend=\E[146q, - kent=\r, kf1=\E[001q, kf10=\E[010q, kf11=\E[011q, - kf12=\E[012q, kf2=\E[002q, kf3=\E[003q, kf4=\E[004q, - kf5=\E[005q, kf6=\E[006q, kf7=\E[007q, kf8=\E[008q, - kf9=\E[009q, khome=\E[H, kich1=\E[139q, knp=\E[154q, + kRIT=\E[167q, kSPD=\E[218q, kcbt=\E[Z, kdch1=^?, + kend=\E[146q, kent=\r, kf1=\E[001q, kf10=\E[010q, + kf11=\E[011q, kf12=\E[012q, kf2=\E[002q, kf3=\E[003q, + kf4=\E[004q, kf5=\E[005q, kf6=\E[006q, kf7=\E[007q, + kf8=\E[008q, kf9=\E[009q, kich1=\E[139q, knp=\E[154q, kpp=\E[150q, kprt=\E[209q, krmir=\E[146q, kspd=\E[217q, nel=\EE, pfkey=\EP101;%p1%d.y%p2%s\E\\, rc=\E8, rev=\E[7m, ri=\EM, rmam=\E[?7l, rmso=\E[m, rmul=\E[m, sc=\E7, sgr0=\E[m, smam=\E[?7h, smso=\E[1;7m, smul=\E[4m, - tbc=\E[3g, + tbc=\E[3g, use=ansi+arrows, use=ansi+idl, use=ansi+local, + iris-ansi-ap|IRIS ANSI in application-keypad mode, - is2=\E[?1l\E=\E[?7h, kent=\EOM, kf10=\E[010q, - kf11=\E[011q, kf12=\E[012q, kf9=\E[009q, use=iris-ansi, + is2=\E[?1l\E=\E[?7h, kent=\EOM, use=iris-ansi, # From the man-page, this is a quasi-vt100 emulator that runs on SGI's IRIX # (T.Dickey 98/1/24) iris-color|xwsh|IRIX ANSI with color, ncv#33, csr=\E[%i%p1%d;%p2%dr, dch=\E[%p1%dP, dim=\E[2m, - ech=\E[%p1%dX, ich=\E[%p1%d@, rc=\E8, rmul=\E[24m, rs1=\Ec, - rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, sc=\E7, + ech=\E[%p1%dX, ich=\E[%p1%d@, rmul=\E[24m, rs1=\Ec, + rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, use=ecma+italics, use=vt100+enq, use=klone+color, use=iris-ansi-ap, @@ -1730,15 +1668,10 @@ iris-color|xwsh|IRIX ANSI with color, # CSI ? 5 h Reverse Video (DECSCNM). # pccon+keys|OpenBSD PC keyboard keys, - kbs=^?, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, - kdch1=\E[3~, kend=\E[8~, kent=\r, kf1=\E[11~, kf10=\E[21~, - kf11=\E[23~, kf12=\E[24~, kf13=\E[25~, kf14=\E[26~, - kf15=\E[28~, kf16=\E[29~, kf17=\E[31~, kf18=\E[32~, - kf19=\E[33~, kf2=\E[12~, kf20=\E[34~, kf21=\E[35~, - kf22=\E[36~, kf23=\E[37~, kf24=\E[38~, kf3=\E[13~, - kf4=\E[14~, kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, - kf9=\E[20~, khome=\E[7~, kich1=\E[2~, knp=\E[6~, kpp=\E[5~, - krfr=^R, + kbs=^?, kend=\E[8~, kent=\r, kf21=\E[35~, kf22=\E[36~, + kf23=\E[37~, kf24=\E[38~, khome=\E[7~, krfr=^R, + use=ansi+arrows, use=vt220+pcedit, use=vt220+sfkeys, + use=xterm+r5+fkeys, pccon+sgr+acs0|sgr and simple ASCII pseudographics for OpenBSD PC console, acsc=+>\,<-\^.v0#`+a:f\\h#i#j+k+l+m+n+o~p-q-r-s_t+u+v+w+x|y# z#{*|!}#~o, @@ -1754,8 +1687,8 @@ pccon+sgr+acs|sgr and default ASCII pseudographics for OpenBSD PC console, # underline renders as color pccon+colors|ANSI colors for OpenBSD PC console, bce, - colors#8, ncv#2, pairs#64, - op=\E[49;39m, setab=\E[4%p1%dm, setaf=\E[3%p1%dm, + ncv#2, + op=\E[49;39m, use=klone+color, # OpenBSD uses wscons, # + which does not implement DECSCNM or anything comparable, so it does not # support flash. @@ -1763,15 +1696,13 @@ pccon+colors|ANSI colors for OpenBSD PC console, pccon+base|base capabilities for OpenBSD PC console, am, km, mc5i, msgr, npc, nxon, xenl, xon, cols#80, it#8, lines#24, - bel=^G, clear=\E[H\E[J, cr=\r, csr=\E[%i%p1%d;%p2%dr, - cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\n, - cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, - cuu=\E[%p1%dA, cuu1=\E[A, dch=\E[%p1%dP, dch1=\E[P, - dl=\E[%p1%dM, dl1=\E[M, ech=\E[%p1%dX, ed=\E[J, el=\E[K, - el1=\E[1K, home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@, - il=\E[%p1%dL, il1=\E[L, ind=\ED, nel=\EE, rc=\E8, ri=\EM, - rmam=\E[?7l, rmul=\E[24m, rs2=\Ec, sc=\E7, smam=\E[?7h, - smul=\E[4m, tbc=\E[3g, use=ansi+cpr, + bel=^G, cr=\r, cub1=^H, cud1=\n, cup=\E[%i%p1%d;%p2%dH, + dch=\E[%p1%dP, dch1=\E[P, ech=\E[%p1%dX, el1=\E[1K, + home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@, ind=\ED, nel=\EE, + ri=\EM, rmam=\E[?7l, rmul=\E[24m, rs2=\Ec, smam=\E[?7h, + smul=\E[4m, tbc=\E[3g, use=ansi+cpr, use=ansi+csr, + use=ansi+erase, use=ansi+idl, use=ansi+local, + pccon0-m|OpenBSD PC console without colors & with simple ASCII pseudographics, use=pccon+sgr+acs0, use=pccon+base, use=pccon+keys, pccon0|OpenBSD PC console with simple ASCII pseudographics, @@ -1800,25 +1731,22 @@ pcvtXX|pcvt VT200 emulator (DEC VT220), it#8, vt#3, acsc=++\,\,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxy yzz~~, - bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[J, cr=\r, - csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H, - cud=\E[%p1%dB, cud1=\E[B, cuf=\E[%p1%dC, cuf1=\E[C, - cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, - dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, - el=\E[K, el1=\E[1K, home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@, - il=\E[%p1%dL, il1=\E[L, ind=\ED, + bel=^G, blink=\E[5m, bold=\E[1m, cr=\r, cub1=^H, + cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P, + el1=\E[1K, home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@, ind=\ED, is1=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, kbs=^?, - kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kdch1=\E[3~, kf1=\E[17~, kf2=\E[18~, kf3=\E[19~, kf4=\E[20~, kf5=\E[21~, kf6=\E[23~, kf7=\E[24~, kf8=\E[25~, khome=\E[1~, kich1=\E[2~, kll=\E[4~, knp=\E[6~, kpp=\E[5~, - nel=\EE, rc=\E8, rev=\E[7m, rf=/usr/share/tabset/vt100, - ri=\EM, rmacs=\E(B, rmam=\E[?7l, rmir=\E[4l, - rmkx=\E[?1l\E>, rmso=\E[27m, rmul=\E[24m, - rs1=\Ec\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, sc=\E7, - sgr0=\E[m, smacs=\E(0, smam=\E[?7h, smir=\E[4h, - smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, tbc=\E[3g, - use=decid+cpr, use=ecma+index, use=vt220+cvis, + nel=\EE, rev=\E[7m, rf=/usr/share/tabset/vt100, ri=\EM, + rmacs=\E(B, rmam=\E[?7l, rmir=\E[4l, rmkx=\E[?1l\E>, + rmso=\E[27m, rmul=\E[24m, + rs1=\Ec\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, sgr0=\E[m, + smacs=\E(0, smam=\E[?7h, smir=\E[4h, smkx=\E[?1h\E=, + smso=\E[7m, smul=\E[4m, tbc=\E[3g, use=ansi+apparrows, + use=ansi+csr, use=ansi+erase, use=ansi+idl, + use=ansi+local, use=decid+cpr, use=ecma+index, + use=vt220+cvis, # NetBSD/FreeBSD VT220 terminal emulator console (pc keyboard & monitor) # termcap entries for pure VT220-Emulation and 25, 28, 35, 40, 43 and @@ -1868,11 +1796,9 @@ pcvt50w|DEC VT220 emulation with 50 lines and 132 cols, pcvt25-color|DEC VT220 emulation with 25 lines and color, cols#80, lines#25, is2=\E[1;25r\E[25;1H, kf1=\EOP, kf10=\E[29~, kf11=\E[23~, - kf12=\E[24~, kf13=\E[25~, kf14=\E[26~, kf15=\E[28~, - kf16=\E[29~, kf17=\E[31~, kf18=\E[32~, kf19=\E[33~, - kf2=\EOQ, kf20=\E[34~, kf3=\EOR, kf4=\EOS, kf5=\E[17~, + kf12=\E[24~, kf2=\EOQ, kf3=\EOR, kf4=\EOS, kf5=\E[17~, kf6=\E[18~, kf7=\E[19~, kf8=\E[20~, kf9=\E[21~, use=pcvtXX, - use=ecma+color, + use=ecma+color, use=vt220+sfkeys, # Terminfo entries to enable the use of the ncurses library in colour on a # NetBSD-arm32 console (only tested on a RiscPC). @@ -1880,28 +1806,21 @@ pcvt25-color|DEC VT220 emulation with 25 lines and color, # modified codes for setf/setb to setaf/setab, then to klone+color, corrected # typo in invis - TD arm100|arm100-am|Arm(RiscPC) ncurses compatible (for 640x480), - am, bce, msgr, xenl, xon, - cols#80, it#8, lines#30, + bce, xenl, xon, + lines#30, acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, - bel=^G, blink=\E[5m$<2>, bold=\E[1m$<2>, - clear=\E[H\E[J$<50>, cr=\r, csr=\E[%i%p1%d;%p2%dr, - cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\n, - cuf=\E[%p1%dC, cuf1=\E[C$<2>, - cup=\E[%i%p1%d;%p2%dH$<5>, cuu=\E[%p1%dA, - cuu1=\E[A$<2>, ed=\E[J$<50>, el=\E[K$<3>, el1=\E[1K$<3>, - enacs=\E(B\E)0, home=\E[H, ht=^I, hts=\EH, ind=\n, - invis=\E[8m$<2>, ka1=\E[q, ka3=\E[s, kb2=\E[r, kbs=^H, - kc1=\E[p, kc3=\E[n, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, - kcuu1=\E[A, kent=\E[M, kf0=\E[y, kf1=\E[P, kf10=\E[x, - kf2=\E[Q, kf3=\E[R, kf4=\E[S, kf5=\E[t, kf6=\E[u, kf7=\E[v, - kf8=\E[l, kf9=\E[w, rc=\E8, rev=\E[7m$<2>, ri=\EM$<5>, + blink=\E[5m$<2>, bold=\E[1m$<2>, cub1=^H, cud1=\n, + cuf1=\E[C$<2>, cuu1=\E[A$<2>, invis=\E[8m$<2>, ka1=\E[q, + ka3=\E[s, kb2=\E[r, kc1=\E[p, kc3=\E[n, kent=\E[M, kf0=\E[y, + kf1=\E[P, kf10=\E[x, kf2=\E[Q, kf3=\E[R, kf4=\E[S, kf5=\E[t, + kf6=\E[u, kf7=\E[v, kf8=\E[l, kf9=\E[w, rev=\E[7m$<2>, rmacs=^O, rmam=\E[?7l, rmkx=\E[?1l\E>, rmso=\E[m$<2>, - rmul=\E[m$<2>, rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, - sc=\E7, + rmul=\E[m$<2>, sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5 %;%?%p7%t;8%;m%?%p9%t\016%e\017%;$<2>, sgr0=\E[m\017$<2>, smacs=^N, smam=\E[?7h, smkx=\E[?1h\E=, - smso=\E[7m$<2>, smul=\E[4m$<2>, tbc=\E[3g, use=ecma+sgr, + smso=\E[7m$<2>, smul=\E[4m$<2>, use=ansi+csr, + use=ansi+local, use=ecma+sgr, use=vt100+4bsd, use=klone+color, arm100-w|arm100-wam|Arm(RiscPC) ncurses compatible (for 1024x768), @@ -1912,7 +1831,7 @@ arm100-w|arm100-wam|Arm(RiscPC) ncurses compatible (for 1024x768), # From Minoura Makoto , 12 May 1996 x68k|x68k-ite|NetBSD/x68k ITE, cols#96, lines#32, - kclr=\E[9~, khlp=\E[28~, use=vt220-base, + kbs=^?, kclr=\E[9~, khlp=\E[28~, use=vt220-base, # : # Entry for the DNARD OpenFirmware console, close to ANSI but not quite. @@ -1938,8 +1857,9 @@ ofcons|DNARD OpenFirmware console, sgr0=\2330m, smso=\2337m, smul=\2334m, # NetBSD "wscons" emulator in VT220 mode. -# This entry is based on the NetBSD termcap entry, correcting the ncv value. -# The emulator renders underlined text in red. Colors are otherwise usable. +# This entry is based on the NetBSD termcap entry. The emulator renders +# underlined text in red. Colors are otherwise usable. NetBSD developers +# prefer to not specify the corresponding ncv value. # # Testing the emulator and reading the source code (NetBSD 2.0), it appears # that "vt220" is inaccurate. There are a few VT220-features, but most of the @@ -1950,13 +1870,11 @@ ofcons|DNARD OpenFirmware console, # the level of detail in a termcap, it is a passable emulator, since ECH does # work. Don't use it on a VMS system -TD wsvt25|NetBSD wscons in 25 line DEC VT220 mode, - bce, msgr, - colors#8, cols#80, it#8, lines#25, ncv#2, pairs#64, - is2=\E[r\E[25;1H, kdch1=\E[3~, kend=\E[8~, kf1=\E[11~, - kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf2=\E[12~, - kf3=\E[13~, kf4=\E[14~, kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, - kf8=\E[19~, kf9=\E[20~, khome=\E[7~, op=\E[m, rs1=\Ec, - setab=\E[4%p1%dm, setaf=\E[3%p1%dm, use=vt220, + bce, + colors#8, lines#25, pairs#64, + is2=\E[r\E[25;1H, kdch1=\E[3~, kend=\E[8~, khome=\E[7~, + op=\E[m, rs1=\Ec, setab=\E[4%p1%dm, setaf=\E[3%p1%dm, + use=xterm+r5+lockeys, use=vt220, wsvt25m|NetBSD wscons in 25 line DEC VT220 mode with Meta, km, use=wsvt25, @@ -2015,22 +1933,18 @@ rcons-color|BSD rasterconsole with ANSI color, mgterm|MGL/MGL2 MobileGear Graphic Library, OTbs, OTpt, am, bce, bw, eo, km, msgr, npc, colors#8, cols#80, it#8, lines#18, pairs#64, - bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, clear=\E[H\E[J, - cr=\r, csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H, - cud=\E[%p1%dB, cud1=\E[B, cuf=\E[%p1%dC, cuf1=\E[C, - cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, - dch=\E[%p1%dP, dch1=\E[P, dim=\E[30;1m, dl=\E[%p1%dM, - dl1=\E[M, ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K, - home=\E[H, hpa=\E[%i%p1%d`, ht=^I, ich=\E[%p1%d@, - ich1=\E[@, il=\E[%p1%dL, il1=\E[L, ind=\E[S, kb2=\E[E, - kbs=^H, kcbt=\E[Z, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, - kcuu1=\E[A, kdch1=^?, kend=\E[F, kf1=\E[M, kf10=\E[V, - kf11=\E[W, kf12=\E[X, kf2=\E[N, kf3=\E[O, kf4=\E[P, kf5=\E[Q, - kf6=\E[R, kf7=\E[S, kf8=\E[T, kf9=\E[U, khome=\E[H, - kich1=\E[L, knp=\E[G, kpp=\E[I, nel=\E[E, op=\E[x, rc=\E8, - rev=\E[7m, ri=\E[T, rmso=\E[m, rs2=\E[x\E[m\Ec, sc=\E7, - setb=\E[4%p1%dm, setf=\E[3%p1%dm, sgr0=\E[m, smso=\E[7m, - vpa=\E[%i%p1%dd, use=ecma+index, + bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, cr=\r, cub1=^H, + cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P, + dim=\E[30;1m, ech=\E[%p1%dX, el1=\E[1K, home=\E[H, + hpa=\E[%i%p1%d`, ht=^I, ich=\E[%p1%d@, ich1=\E[@, ind=\E[S, + kb2=\E[E, kcbt=\E[Z, kdch1=^?, kend=\E[F, kf1=\E[M, + kf10=\E[V, kf11=\E[W, kf12=\E[X, kf2=\E[N, kf3=\E[O, + kf4=\E[P, kf5=\E[Q, kf6=\E[R, kf7=\E[S, kf8=\E[T, kf9=\E[U, + kich1=\E[L, knp=\E[G, kpp=\E[I, nel=\E[E, op=\E[x, rev=\E[7m, + ri=\E[T, rmso=\E[m, rs2=\E[x\E[m\Ec, setb=\E[4%p1%dm, + setf=\E[3%p1%dm, sgr0=\E[m, smso=\E[7m, vpa=\E[%i%p1%dd, + use=ansi+arrows, use=ansi+csr, use=ansi+erase, + use=ansi+idl, use=ansi+local, use=ecma+index, #### FreeBSD console entries @@ -2066,33 +1980,30 @@ mgterm|MGL/MGL2 MobileGear Graphic Library, # F37-F48 are shift+control F1-F12 cons25w|ansiw|ansi80x25-raw|FreeBSD console (25-line raw mode), am, bce, bw, eo, msgr, npc, - colors#8, cols#80, it#8, lines#25, ncv#21, pairs#64, - bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, clear=\E[H\E[J, - cnorm=\E[=0C, cr=\r, cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, - cud1=\E[B, cuf=\E[%p1%dC, cuf1=\E[C, - cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, - cvvis=\E[=1C, dch=\E[%p1%dP, dch1=\E[P, dim=\E[30;1m, - dl=\E[%p1%dM, dl1=\E[M, ech=\E[%p1%dX, ed=\E[J, el=\E[K, + cols#80, it#8, lines#25, ncv#21, + bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, cnorm=\E[=0C, + cr=\r, cub1=^H, cup=\E[%i%p1%d;%p2%dH, cvvis=\E[=1C, + dch=\E[%p1%dP, dch1=\E[P, dim=\E[30;1m, ech=\E[%p1%dX, home=\E[H, hpa=\E[%i%p1%d`, ht=^I, ich=\E[%p1%d@, - ich1=\E[@, il=\E[%p1%dL, il1=\E[L, ind=\E[S, kb2=\E[E, - kbs=^H, kcbt=\E[Z, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, - kcuu1=\E[A, kdch1=^?, kend=\E[F, kf1=\E[M, kf10=\E[V, - kf11=\E[W, kf12=\E[X, kf13=\E[Y, kf14=\E[Z, kf15=\E[a, - kf16=\E[b, kf17=\E[c, kf18=\E[d, kf19=\E[e, kf2=\E[N, - kf20=\E[f, kf21=\E[g, kf22=\E[h, kf23=\E[i, kf24=\E[j, - kf25=\E[k, kf26=\E[l, kf27=\E[m, kf28=\E[n, kf29=\E[o, - kf3=\E[O, kf30=\E[p, kf31=\E[q, kf32=\E[r, kf33=\E[s, - kf34=\E[t, kf35=\E[u, kf36=\E[v, kf37=\E[w, kf38=\E[x, - kf39=\E[y, kf4=\E[P, kf40=\E[z, kf41=\E[@, kf42=\E[[, - kf43=\E[\\, kf44=\E[], kf45=\E[\^, kf46=\E[_, kf47=\E[`, - kf48=\E[{, kf5=\E[Q, kf6=\E[R, kf7=\E[S, kf8=\E[T, kf9=\E[U, - khome=\E[H, kich1=\E[L, knp=\E[G, kpp=\E[I, nel=\E[E, - op=\E[x, rc=\E8, rev=\E[7m, ri=\E[T, rmso=\E[m, - rs2=\E[x\E[m\Ec, sc=\E7, setab=\E[4%p1%dm, - setaf=\E[3%p1%dm, + ich1=\E[@, ind=\E[S, kb2=\E[E, kcbt=\E[Z, kdch1=^?, + kend=\E[F, kf1=\E[M, kf10=\E[V, kf11=\E[W, kf12=\E[X, + kf13=\E[Y, kf14=\E[Z, kf15=\E[a, kf16=\E[b, kf17=\E[c, + kf18=\E[d, kf19=\E[e, kf2=\E[N, kf20=\E[f, kf21=\E[g, + kf22=\E[h, kf23=\E[i, kf24=\E[j, kf25=\E[k, kf26=\E[l, + kf27=\E[m, kf28=\E[n, kf29=\E[o, kf3=\E[O, kf30=\E[p, + kf31=\E[q, kf32=\E[r, kf33=\E[s, kf34=\E[t, kf35=\E[u, + kf36=\E[v, kf37=\E[w, kf38=\E[x, kf39=\E[y, kf4=\E[P, + kf40=\E[z, kf41=\E[@, kf42=\E[[, kf43=\E[\\, kf44=\E[], + kf45=\E[\^, kf46=\E[_, kf47=\E[`, kf48=\E[{, kf5=\E[Q, + kf6=\E[R, kf7=\E[S, kf8=\E[T, kf9=\E[U, kich1=\E[L, knp=\E[G, + kpp=\E[I, nel=\E[E, op=\E[x, rc=\E8, rev=\E[7m, ri=\E[T, + rmso=\E[m, rs2=\E[x\E[m\Ec, sc=\E7, sgr=\E[0%?%p1%t;2;7%;%?%p3%t;7%;%?%p4%t;5%;%?%p5%t;30;1%;%? %p6%t;1%;m, - sgr0=\E[m, smso=\E[7m, vpa=\E[%i%p1%dd, use=ecma+index, + sgr0=\E[m, smso=\E[7m, vpa=\E[%i%p1%dd, use=ansi+arrows, + use=ansi+erase, use=ansi+idl, use=ansi+local, + use=ecma+index, use=klone+color, + cons25|ansis|ansi80x25|FreeBSD console (25-line ANSI mode), acsc=-\030.^Y0\333`\004a\260f\370g\361h\261i\025j\331k\277l \332m\300n\305q\304t\303u\264v\301w\302x\263y\363z\362~ @@ -2253,33 +2164,29 @@ teken-2018|teken as of 2018, bw@, mir, xenl, NQ, acsc=0\333a\260f\370g\361h\261j\331k\277l\332m\300n\305q \304t\303u\264v\301w\302x\263y\363z\362~\371, - cvvis@, hpa=\E[%i%p1%dG, hts=\EH, kcub1=\E[D, kcud1=\E[B, - kcuf1=\E[C, kcuu1=\E[A, kdch1=\E[3~, kend=\E[F, kent=\r, + cvvis@, hpa=\E[%i%p1%dG, hts=\EH, kdch1=\E[3~, kent=\r, kf1=\EOP, kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf2=\EOQ, kf3=\EOR, kf4=\EOS, kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, - kf8=\E[19~, kf9=\E[20~, khome=\E[H, kich1=\E[2~, knp=\E[6~, - kpp=\E[5~, rmir=\E[4l, smir=\E[4h, tbc=\E[3g, - vpa=\E[%i%p1%dd, use=vt220+cvis, use=cons25, + kf8=\E[19~, kf9=\E[20~, kich1=\E[2~, knp=\E[6~, kpp=\E[5~, + rmir=\E[4l, smir=\E[4h, tbc=\E[3g, use=vt220+cvis, + use=cons25, teken-2022|teken as of 2022, am, bce, eo, mir, msgr, npc, NQ, - colors#8, cols#80, it#8, lines#25, ncv#21, pairs#64, U8#1, + cols#80, it#8, lines#25, ncv#21, U8#1, bold=\E[1m, cr=\r, cub1=^H, dim=\E[30;1m, ech=\E[%p1%dX, - ind=\E[S, kbs=^H, kent=\r, nel=\E[E, op=\E[x, rev=\E[7m, - ri=\E[T, rmso=\E[27m, rs2=\E[x\E[m\Ec, setab=\E[4%p1%dm, - setaf=\E[3%p1%dm, + ind=\E[S, kent=\r, nel=\E[E, op=\E[x, rev=\E[7m, ri=\E[T, + rmso=\E[27m, rs2=\E[x\E[m\Ec, sgr=\E[0%?%p1%t;2;7%;%?%p3%t;7%;%?%p5%t;30;1%;%?%p6%t;1%;m, sgr0=\E[m, use=vt220+cvis, use=ecma+index, use=ansi+arrows, use=ansi+csr, use=ansi+cup, use=ansi+erase, use=ansi+idc, use=ansi+idl, use=ansi+local, use=ansi+rca2, use=ansi+sgrso, - use=ansi+tabs, + use=ansi+tabs, use=klone+color, teken-vt+fkeys|teken's xterm special keys, - kdch1=\E[3~, kend=\E[F, kf1=\EOP, kf10=\E[21~, kf11=\E[23~, - kf12=\E[24~, kf2=\EOQ, kf3=\EOR, kf4=\EOS, kf5=\E[15~, - kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, khome=\E[H, - kich1=\E[2~, knp=\E[6~, kpp=\E[5~, + kend=\E[F, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, + khome=\E[H, use=vt220+pcedit, use=xterm+r5+fkeys, teken-sc+fkeys|teken's syscons special keys, kdch1=^?, kend=\E[F, kf1=\E[M, kf10=\E[V, kf11=\E[W, @@ -2308,21 +2215,20 @@ origpc3|origibmpc3|IBM PC 386BSD console, cols#80, lines#25, acsc=j\331k\277l\332m\300n\305q\304t\303u\264v\301w\302x \263, - bold=\E[7m, clear=\Ec, cub1=^H, cud1=\E[B, cuf1=\E[C, - cup=\E[%i%p1%2d;%p2%2dH, cuu1=\E[A, ed=\E[J, el=\E[K, - home=\E[H, ind=\E[S, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, - kcuu1=\E[A, khome=\E[Y, ri=\E[T, rmso=\E[1;0x\E[2;7x, - rmul=\E[1;0x\E[2;7x, sgr0=\E[m\E[1;0x\E[2;7x, - smso=\E[1;7x\E[2;0x, smul=\E[1;7x\E[2;0x, + bold=\E[7m, clear=\Ec, cub1=^H, cup=\E[%i%p1%2d;%p2%2dH, + ed=\E[J, el=\E[K, home=\E[H, ind=\E[S, kcub1=\E[D, + kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, khome=\E[Y, ri=\E[T, + rmso=\E[1;0x\E[2;7x, rmul=\E[1;0x\E[2;7x, + sgr0=\E[m\E[1;0x\E[2;7x, smso=\E[1;7x\E[2;0x, + smul=\E[1;7x\E[2;0x, use=ansi+local1, # description of BSD/386 console emulator in version 1.0 (supplied by BSDI) oldpc3|oldibmpc3|old IBM PC BSD/386 console, OTbs, km, lines#25, bel=^G, bold=\E[=15F, cr=\r, cud1=\n, dim=\E[=8F, dl1=\E[M, - ht=^I, il1=\E[L, ind=\n, kbs=^H, kcub1=\E[D, kcud1=\E[B, - kcuf1=\E[C, kcuu1=\E[A, khome=\E[H, kich1=\E[L, kll=\E[F, - knp=\E[G, kpp=\E[I, nel=\r\n, sgr0=\E[=R, + ht=^I, il1=\E[L, ind=\n, kich1=\E[L, kll=\E[F, knp=\E[G, + kpp=\E[I, nel=\r\n, sgr0=\E[=R, use=ansi+arrows, # Description of BSD/OS console emulator in version 1.1, 2.0, 2.1 # Note, the emulator supports many of the additional console features @@ -2343,15 +2249,13 @@ bsdos-pc-nobold|BSD/OS PC console w/o bold, bsdos-pc-m|bsdos-pc-mono|BSD/OS PC console mono, OTbs, am, eo, km, xon, cols#80, it#8, lines#25, - bel=^G, clear=\Ec, cr=\r, cub=\E[%p1%dD, cub1=^H, - cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C, - cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, - dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K, home=\E[H, ht=^I, - il=\E[%p1%dL, il1=\E[L, ind=\n, kbs=^H, kcub1=\E[D, - kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, khome=\E[H, kich1=\E[L, - kll=\E[F, knp=\E[G, kpp=\E[I, nel=\r\n, rc=\E8, sc=\E7, + bel=^G, clear=\Ec, cr=\r, cub1=^H, cud1=\n, + cup=\E[%i%p1%d;%p2%dH, ed=\E[J, el=\E[K, home=\E[H, ht=^I, + ind=\n, kich1=\E[L, kll=\E[F, knp=\E[G, kpp=\E[I, nel=\r\n, + rc=\E8, sc=\E7, sgr=\E[0;10%?%p1%t;7%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1%;%?%p7 %t;8%;%?%p9%t;11%;m%?%p5%t\E[=8F%;, + use=ansi+arrows, use=ansi+idl, use=ansi+local, use=klone+sgr8, # Old names for BSD/OS PC console used in releases before 4.1. @@ -2388,11 +2292,9 @@ bsdos-ppc|PowerPC BSD/OS console, # that VT52 does not support line-drawing characters (the scan-X values refer # to a crude plotting feature) -TD vt52|DEC VT52, - OTbs, - it#8, lines#24, - acsc=+h.k0affggolpnqprrss, home=\EH, kbs=^H, nel=\r\n, - ri=\EI, rmacs=\EG, rmkx=\E>, smacs=\EF, smkx=\E=, u8=\E/[KL], - use=vt50h, + lines#24, + acsc=+h.k0affggolpnqprrss, rmacs=\EG, rmkx=\E>, + smacs=\EF, smkx=\E=, u8=\E/[KL], use=vt50h, use=vt52-basic, # This is more likely the "vt52" that you would see in emulation, i.e., no # keypad, no graphics. @@ -2400,8 +2302,11 @@ vt52-basic|VT52 for emulators, cols#80, it#8, lines#24, bel=^G, clear=\EH\EJ, cr=\r, cub1=\ED, cud1=\EB, cuf1=\EC, cup=\EY%p1%' '%+%c%p2%' '%+%c, cuu1=\EA, ed=\EJ, el=\EK, - home=\EH, ht=^I, ind=\n, kbs=^H, kcub1=\ED, kcud1=\EB, - kcuf1=\EC, kcuu1=\EA, nel=\r\n, ri=\EI, + home=\EH, ht=^I, ind=\n, kbs=^H, nel=\r\n, ri=\EI, + use=vt52+arrows, + +vt52+arrows|cursor keys for VT52, + kcub1=\ED, kcud1=\EB, kcuf1=\EC, kcuu1=\EA, #### DEC VT100 and compatibles # @@ -2545,9 +2450,8 @@ vt100+fnkeys|DEC VT100 numeric keypad (kf0-kf10), # |___________________|_________|_kent_@8_| # vt220+keypad|DEC VT220 numeric keypad, - ka1=\EOw, ka3=\EOy, kb2=\EOu, kc1=\EOq, kc3=\EOs, kent=\EOM, - kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, ka2=\EOx, kb1=\EOt, - kb3=\EOv, kc2=\EOr, + ka1=\EOw, ka3=\EOy, kb2=\EOu, kc1=\EOq, kc3=\EOs, ka2=\EOx, + kb1=\EOt, kb3=\EOv, kc2=\EOr, use=vt100+pfkeys, # vt100+enq|ncurses extension for VT100-style ENQ, u8=\E[?1;2c, use=ansi+enq, @@ -2589,25 +2493,24 @@ vt102+enq|ncurses extension for VT102-style ENQ, # # (vt100: I added / based on the init string, also . -- esr) vt100|vt100-am|DEC VT100 (w/advanced video), - OTbs, mc5i, xenl, xon, + OTbs, xenl, xon, vt#3, - csr=\E[%i%p1%d;%p2%dr, kcub1=\EOD, kcud1=\EOB, - kcuf1=\EOC, kcuu1=\EOA, lf1=pf1, lf2=pf2, lf3=pf3, lf4=pf4, - mc0=\E[0i, mc4=\E[4i, mc5=\E[5i, rc=\E8, rmam=\E[?7l, + kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, lf1=pf1, + lf2=pf2, lf3=pf3, lf4=pf4, mc0=\E[0i, rmam=\E[?7l, rmkx=\E[?1l\E>, rs2=\E<\E>\E[?3;4;5l\E[?7;8h\E[r, - sc=\E7, sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5 %;m%?%p9%t\016%e\017%;$<2>, smam=\E[?7h, smkx=\E[?1h\E=, smso=\E[7m$<2>, - use=decid+cpr, use=vt100+4bsd, use=vt100+fnkeys, + use=ansi+csr, use=ansi+pp, use=decid+cpr, use=vt100+4bsd, + use=vt100+fnkeys, + vt100+4bsd|DEC VT100 from 4.0BSD, am, msgr, cols#80, it#8, lines#24, acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, bel=^G, blink=\E[5m$<2>, bold=\E[1m$<2>, - clear=\E[H\E[J$<50>, cr=\r, cub=\E[%p1%dD, cub1=^H, - cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C$<2>, - cup=\E[%i%p1%d;%p2%dH$<5>, cuu=\E[%p1%dA, + clear=\E[H\E[J$<50>, cr=\r, cub1=^H, cud1=\n, + cuf1=\E[C$<2>, cup=\E[%i%p1%d;%p2%dH$<5>, cuu1=\E[A$<2>, ed=\E[J$<50>, el=\E[K$<3>, el1=\E[1K$<3>, enacs=\E(B\E)0, home=\E[H, ht=^I, hts=\EH, ind=\n, kbs=^H, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, @@ -2616,7 +2519,8 @@ vt100+4bsd|DEC VT100 from 4.0BSD, sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5 %;m%?%p9%t\016%e\017%;$<2>, sgr0=\E[m\017$<2>, smacs=^N, smso=\E[1;7m$<2>, - smul=\E[4m$<2>, tbc=\E[3g, + smul=\E[4m$<2>, tbc=\E[3g, use=ansi+local, + vt100nam|vt100-nam|VT100 no automargins, am@, xenl@, rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7l\E[?8h, use=vt100-am, @@ -2690,18 +2594,17 @@ vt131|DEC VT131, OTbs, am, xenl, cols#80, it#8, lines#24, vt#3, bel=^G, blink=\E[5m$<2/>, bold=\E[1m$<2/>, - clear=\E[;H\E[2J$<50/>, cr=\r, csr=\E[%i%p1%d;%p2%dr, - cub1=^H, cud1=\n, cuf1=\E[C$<2/>, - cup=\E[%i%p1%d;%p2%dH$<5/>, cuu1=\E[A$<2/>, - ed=\E[J$<50/>, el=\E[K$<3/>, home=\E[H, ht=^I, - is2=\E[1;24r\E[24;1H, kbs=^H, kcub1=\EOD, kcud1=\EOB, - kcuf1=\EOC, kcuu1=\EOA, kf1=\EOP, kf2=\EOQ, kf3=\EOR, - kf4=\EOS, nel=\r\n, rc=\E8, rev=\E[7m$<2/>, ri=\EM$<5/>, + clear=\E[;H\E[2J$<50/>, cr=\r, cub1=^H, cud1=\n, + cuf1=\E[C$<2/>, cup=\E[%i%p1%d;%p2%dH$<5/>, + cuu1=\E[A$<2/>, ed=\E[J$<50/>, el=\E[K$<3/>, home=\E[H, + ht=^I, is2=\E[1;24r\E[24;1H, kbs=^H, kcub1=\EOD, + kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kf1=\EOP, kf2=\EOQ, + kf3=\EOR, kf4=\EOS, nel=\r\n, rev=\E[7m$<2/>, ri=\EM$<5/>, rmam=\E[?7h, rmkx=\E[?1l\E>, rmso=\E[m$<2/>, rmul=\E[m$<2/>, - rs1=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, sc=\E7, + rs1=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, sgr0=\E[m$<2/>, smam=\E[?7h, smkx=\E[?1h\E=, - smso=\E[7m$<2/>, smul=\E[4m$<2/>, + smso=\E[7m$<2/>, smul=\E[4m$<2/>, use=ansi+csr, # vt132 - like vt100 but slower and has ins/del line and such. # I'm told that / are backwards in the terminal from the @@ -2726,23 +2629,23 @@ vt220-old|vt200-old|DEC VT220 in VT100 emulation mode, OTnl=\n, acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, bel=^G, blink=\E[5m$<2>, bold=\E[1m$<2>, - clear=\E[H\E[2J$<50>, cr=\r, csr=\E[%i%p1%d;%p2%dr, - cub1=^H, cud1=\E[B, cuf1=\E[C, - cup=\E[%i%p1%d;%p2%dH$<10>, cuu1=\E[A, dch1=\E[P, - dl1=\E[M, ed=\E[J$<50>, el=\E[K$<3>, home=\E[H, ht=^I, - if=/usr/share/tabset/vt100, il1=\E[L, ind=\ED$<20/>, - is2=\E[1;24r\E[24;1H, kbs=^H, kcub1=\E[D, kcud1=\E[B, - kcuf1=\E[C, kcuu1=\E[A, kf1=\EOP, kf10=\E[29~, kf2=\EOQ, + clear=\E[H\E[2J$<50>, cr=\r, cub1=^H, + cup=\E[%i%p1%d;%p2%dH$<10>, dch1=\E[P, ed=\E[J$<50>, + el=\E[K$<3>, home=\E[H, ht=^I, + if=/usr/share/tabset/vt100, ind=\ED$<20/>, + is2=\E[1;24r\E[24;1H, kf1=\EOP, kf10=\E[29~, kf2=\EOQ, kf3=\EOR, kf4=\EOS, kf5=\E[17~, kf6=\E[18~, kf7=\E[19~, - kf8=\E[20~, kf9=\E[21~, kich1=\E[2~, rc=\E8, rev=\E[7m$<2>, - rf=/usr/share/tabset/vt100, ri=\EM$<14/>, - rmacs=\E(B$<4>, rmam=\E[?7l, rmir=\E[4l, rmso=\E[27m, - rmul=\E[24m, rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, - sc=\E7, + kf8=\E[20~, kf9=\E[21~, khome=\E[1~, kich1=\E[2~, + rev=\E[7m$<2>, rf=/usr/share/tabset/vt100, + ri=\EM$<14/>, rmacs=\E(B$<4>, rmam=\E[?7l, rmir=\E[4l, + rmso=\E[27m, rmul=\E[24m, + rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%|%t;7%;m%? %p9%t\E(0%e\E(B%;$<2>, sgr0=\E[m$<2>, smacs=\E(0$<2>, smam=\E[?7h, smir=\E[4h, - smso=\E[7m, smul=\E[4m, use=vt220+pcedit, use=vt220+cvis, + smso=\E[7m, smul=\E[4m, use=ansi+arrows, use=ansi+csr, + use=ansi+idl1, use=ansi+local1, use=vt220+pcedit, + use=vt220+cvis, # Here's a picture of the Sun/PC editing keypad: # +--------+--------+--------+ @@ -2785,29 +2688,25 @@ vt220-base|DEC VT220 as emulated, OTbs, am, mir, msgr, xenl, xon, cols#80, it#8, lines#24, vt#3, acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, - bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[J, cr=\r, - csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H, - cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C, - cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, - dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M, - ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K, enacs=\E)0, - flash=\E[?5h$<200/>\E[?5l, home=\E[H, ht=^I, hts=\EH, - ich=\E[%p1%d@, if=/usr/share/tabset/vt100, - il=\E[%p1%dL, il1=\E[L, ind=\ED, + bel=^G, blink=\E[5m, bold=\E[1m, cr=\r, cub1=^H, cud1=\n, + dch=\E[%p1%dP, dch1=\E[P, ech=\E[%p1%dX, el1=\E[1K, + enacs=\E)0, flash=\E[?5h$<200/>\E[?5l, ht=^I, hts=\EH, + ich=\E[%p1%d@, if=/usr/share/tabset/vt100, ind=\ED, is2=\E[?7h\E[>\E[?1l\E F\E[?4l, kbs=^H, kcub1=\E[D, - kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kdch1=\E[3~, kf1=\EOP, - kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf13=\E[25~, + kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf1=\EOP, kf13=\E[25~, kf14=\E[26~, kf17=\E[31~, kf18=\E[32~, kf19=\E[33~, - kf2=\EOQ, kf20=\E[34~, kf3=\EOR, kf4=\EOS, kf6=\E[17~, - kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, khlp=\E[28~, + kf2=\EOQ, kf20=\E[34~, kf3=\EOR, kf4=\EOS, khlp=\E[28~, krdo=\E[29~, lf1=pf1, lf2=pf2, lf3=pf3, lf4=pf4, nel=\EE, - rc=\E8, rev=\E[7m, ri=\EM, rmacs=\E(B$<4>, rmam=\E[?7l, - rmir=\E[4l, rmso=\E[27m, rmul=\E[24m, rs1=\E[?3l, sc=\E7, + rev=\E[7m, ri=\EM, rmacs=\E(B$<4>, rmam=\E[?7l, rmir=\E[4l, + rmso=\E[27m, rmul=\E[24m, rs1=\E[?3l, sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%|%t;7%;m%? %p9%t\E(0%e\E(B%;$<2>, sgr0=\E[m\E(B, smacs=\E(0$<2>, smam=\E[?7h, smir=\E[4h, - smso=\E[7m, smul=\E[4m, tbc=\E[3g, use=vt220+vtedit, - use=ansi+pp, use=ansi+enq, + smso=\E[7m, smul=\E[4m, tbc=\E[3g, use=ansi+csr, + use=ansi+cup, use=ansi+pp, use=ansi+enq, use=ansi+erase, + use=ansi+idl, use=ansi+local, use=vt220+vtedit, + use=vt220+ufkeys, + vt220|vt200|DEC VT220, use=vt220+cvis, use=vt220-base, vt220-w|vt200-w|DEC VT220 in wide mode, @@ -2851,10 +2750,17 @@ vt220-8bit|vt220-8|vt200-8bit|vt200-8|DEC VT220/200 in 8-bit mode, # See vt220 for an alternate mapping. # vt220d|DEC VT220 in VT100 mode with DEC function key labeling, - kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf13=\E[25~, - kf14=\E[26~, kf15=\E[28~, kf16=\E[29~, kf17=\E[31~, - kf18=\E[32~, kf19=\E[33~, kf20=\E[34~, kf5@, kf6=\E[17~, - kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, use=vt220-old, + kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf5@, kf6=\E[17~, + kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, use=vt220+sfkeys, + use=vt220-old, + +# These are often mapped to unshifted/shifted keys on PC-keyboards -TD +vt220+ufkeys|first 8 function-keys for VT220, + kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf5@, kf6=\E[17~, + kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, +vt220+sfkeys|second 8 function-keys for VT220, + kf13=\E[25~, kf14=\E[26~, kf15=\E[28~, kf16=\E[29~, + kf17=\E[31~, kf18=\E[32~, kf19=\E[33~, kf20=\E[34~, vt220-nam|v200-nam|VT220 in VT100 mode with no auto margins, am@, @@ -2879,19 +2785,18 @@ vt220-nam|v200-nam|VT220 in VT100 mode with no auto margins, vt200-js|vt220-js|DEC VT200 series with jump scroll, am, msgr, cols#80, - bel=^G, clear=\E[H\E[J, cr=\r, csr=\E[%i%p1%d;%p2%dr, - cub1=^H, cud1=\n, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, - cuu1=\E[A, dch1=\E[P, dl1=\E[M, ed=\E[J, el=\E[K, home=\E[H, - ht=^I, il1=\E[L, ind=\ED, + bel=^G, cr=\r, cub1=^H, cud1=\n, cuf1=\E[C, + cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, dch1=\E[P, dl1=\E[M, + home=\E[H, ht=^I, il1=\E[L, ind=\ED, is2=\E[61"p\E[H\E[?3l\E[?4l\E[?1h\E[?5l\E[?6l\E[?7h\E[?8h\E[ ?25h\E>\E[m, kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, - kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, nel=\r\ED, rc=\E8, + kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, nel=\r\ED, rf=/usr/share/tabset/vt100, ri=\EM, rmdc=, rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[27m$<5/>, rmul=\E[24m, - rs1=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, sc=\E7, smdc=, + rs1=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, smdc=, smir=\E[4h, smkx=\E[?1h\E=, smso=\E[7m$<5/>, smul=\E[4m, - use=vt220+cvis, + use=ansi+csr, use=ansi+erase, use=vt220+cvis, # This was DEC's VT320. Use the purpose-built one below instead #vt320|DEC VT320 in VT100 emulation mode, @@ -2922,31 +2827,24 @@ vt320|vt300|DEC VT320 7 bit terminal, cols#80, lines#24, wsl#80, acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[2J, cr=\r, - csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H, - cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C, - cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, - dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M, - ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K, home=\E[H, ht=^I, - hts=\EH, ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L, ind=\ED, + cub1=^H, cud1=\n, dch=\E[%p1%dP, dch1=\E[P, ech=\E[%p1%dX, + el1=\E[1K, ht=^I, hts=\EH, ich=\E[%p1%d@, ind=\ED, is2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h\E[1;24r\E[24;1H, - kbs=^?, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, - kdch1=\E[3~, kel=\E[4~, kf10=\E[21~, kf11=\E[23~, - kf12=\E[24~, kf13=\E[25~, kf14=\E[26~, kf15=\E[28~, - kf16=\E[29~, kf17=\E[31~, kf18=\E[32~, kf19=\E[33~, - kf20=\E[34~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, - kf9=\E[20~, khome=\E[1~, kich1=\E[2~, knp=\E[6~, knxt=^I, - kpp=\E[5~, kprv=\E[Z, kslt=\E[4~, nel=\EE, rc=\E8, rev=\E[7m, + kbs=^?, kdch1=\E[3~, kel=\E[4~, kf12=\E[24~, khome=\E[1~, + kich1=\E[2~, knp=\E[6~, knxt=^I, kpp=\E[5~, kprv=\E[Z, + kslt=\E[4~, nel=\EE, rev=\E[7m, rf=/usr/share/tabset/vt300, ri=\EM, rmacs=\E(B, - rmam=\E[?7l, rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[m, - rmul=\E[m, + rmam=\E[?7l, rmir=\E[4l, rmkx=\E[?1l\E>, rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h\E[1;24r\E[24;1H, - sc=\E7, sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%|%t;7%;m%? %p9%t\E(0%e\E(B%;$<2>, sgr0=\E[m\E(B, smacs=\E(0, smam=\E[?7h, smir=\E[4h, - smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, tbc=\E[3g, - use=dec+pp, use=vt220+cvis, use=vt220+keypad, use=dec+sl, - use=ansi+enq, + smkx=\E[?1h\E=, tbc=\E[3g, use=ansi+apparrows, + use=ansi+csr, use=ansi+cup, use=ansi+enq, use=ansi+erase, + use=ansi+idl, use=ansi+local, use=ansi+sgrso, + use=ansi+sgrul, use=dec+pp, use=dec+sl, use=vt220+cvis, + use=vt220+keypad, use=vt220+sfkeys, use=vt220+ufkeys, + vt320-nam|vt300-nam|DEC VT320 7 bit terminal with no am to make SAS happy, am@, is2=\E>\E[?3l\E[?4l\E[?5l\E[?7l\E[?8h\E[1;24r\E[24;1H, @@ -2985,28 +2883,26 @@ vt340|dec-vt340|vt330|dec-vt330|DEC VT340 graphics terminal with 24 line page, am, eslok, hs, mir, msgr, xenl, xon, cols#80, it#8, lines#24, vt#3, acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, - blink=\E[5m, bold=\E[1m, clear=\E[H\E[J, cr=\r, - csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H, - cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C, - cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, - dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M, - dsl=\E[2$~\r\E[1$}\E[K\E[$}, ed=\E[J, el=\E[K, + blink=\E[5m, bold=\E[1m, cr=\r, cub1=^H, cud1=\n, + cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P, + dsl=\E[2$~\r\E[1$}\E[K\E[$}, flash=\E[?5h$<200/>\E[?5l, fsl=\E[$}, home=\E[H, ht=^I, - hts=\EH, ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L, ind=\ED, + hts=\EH, ich=\E[%p1%d@, ind=\ED, is2=\E<\E\sF\E>\E[?1h\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h\E[1;24r \E[24;1H, kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, lf1=pf1, lf2=pf2, - lf3=pf3, lf4=pf4, nel=\r\ED, rc=\E8, rev=\E[7m, + lf3=pf3, lf4=pf4, nel=\r\ED, rev=\E[7m, rf=/usr/share/tabset/vt300, ri=\EM, rmacs=\E(B, rmam=\E[?7l, rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[27m, - rmul=\E[24m, rs1=\E[?3l, sc=\E7, + rmul=\E[24m, rs1=\E[?3l, sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%|%t;7%;m%? %p9%t\E(0%e\E(B%;$<2>, sgr0=\E[m\E(B, smacs=\E(0, smam=\E[?7h, smir=\E[4h, smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, tbc=\E[3g, - tsl=\E[2$~\E[1$}\E[1;%dH, use=vt220+cvis, + tsl=\E[2$~\E[1$}\E[1;%dH, use=ansi+csr, use=ansi+erase, + use=ansi+idl, use=ansi+local, use=vt220+cvis, # Left/right margins are supported in xterm since patch #279 (2012/05/10) vt420+lrmm|VT420 left/right margins, @@ -3040,28 +2936,25 @@ vt400|vt400-24|dec-vt400|DEC VT400 24x80 column autowrap, cols#80, it#8, lines#24, vt#3, acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, blink=\E[5m, bold=\E[1m, clear=\E[H\E[J$<10/>, cr=\r, - csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H, - cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C, - cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, - dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M, - dsl=\E[2$~\r\E[1$}\E[K\E[$}, ed=\E[J$<10/>, - el=\E[K$<4/>, flash=\E[?5h$<200/>\E[?5l, fsl=\E[$}, - home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@, ich1=\E[@, - il=\E[%p1%dL, il1=\E[L, ind=\ED, + cub1=^H, cud1=\n, dsl=\E[2$~\r\E[1$}\E[K\E[$}, + ed=\E[J$<10/>, el=\E[K$<4/>, flash=\E[?5h$<200/>\E[?5l, + fsl=\E[$}, ht=^I, hts=\EH, ind=\ED, is2=\E<\E\sF\E>\E[?1h\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h\E[1;24r \E[24;1H, kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, lf1=pf1, lf2=pf2, - lf3=pf3, lf4=pf4, nel=\r\ED, rc=\E8, rev=\E[7m, + lf3=pf3, lf4=pf4, nel=\r\ED, rev=\E[7m, rf=/usr/share/tabset/vt300, ri=\EM, rmacs=\E(B, - rmam=\E[?7l, rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[27m, - rmul=\E[24m, rs1=\E<\E[?3l\E[!p\E[?7h, sc=\E7, + rmam=\E[?7l, rmkx=\E[?1l\E>, rmso=\E[27m, rmul=\E[24m, + rs1=\E<\E[?3l\E[!p\E[?7h, sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%|%t;7%;m%? %p9%t\E(0%e\E(B%;$<2>, - sgr0=\E[m\E(B, smacs=\E(0, smam=\E[?7h, smir=\E[4h, - smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, tbc=\E[3g, - tsl=\E[2$~\E[1$}\E[1;%dH, use=dec+sl, use=vt220+cvis, + sgr0=\E[m\E(B, smacs=\E(0, smam=\E[?7h, smkx=\E[?1h\E=, + smso=\E[7m, smul=\E[4m, tbc=\E[3g, + tsl=\E[2$~\E[1$}\E[1;%dH, use=ansi+csr, use=ansi+cup, + use=ansi+idc, use=ansi+idl, use=ansi+local, use=dec+sl, + use=vt220+cvis, # (vt420: I removed , it collided with . I also restored # a missing -- esr) @@ -3071,29 +2964,26 @@ vt420|DEC VT420, cols#80, it#8, lines#24, vt#3, acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, bel=^G, blink=\E[5m$<2>, bold=\E[1m$<2>, - clear=\E[H\E[2J$<50>, cr=\r, csr=\E[%i%p1%d;%p2%dr, - cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\n, - cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH$<10>, - cuu=\E[%p1%dA, cuu1=\E[A, dch=\E[%p1%dP, dch1=\E[P, - dl=\E[%p1%dM, dl1=\E[M, ech=\E[%p1%dX, ed=\E[J$<50>, - el=\E[K$<3>, el1=\E[1K, enacs=\E)0, - flash=\E[?5h$<200/>\E[?5l, home=\E[H, ht=^I, hts=\EH, - ich=\E[%p1%d@, if=/usr/share/tabset/vt300, - il=\E[%p1%dL, il1=\E[L, ind=\ED, is2=\E[1;24r\E[24;1H, - is3=\E[?67h\E[64;1"p, kbs=^H, kcub1=\E[D, kcud1=\E[B, - kcuf1=\E[C, kcuu1=\E[A, kf1=\EOP, kf10=\E[29~, kf2=\EOQ, - kf3=\EOR, kf4=\EOS, kf5=\E[17~, kf6=\E[18~, kf7=\E[19~, - kf8=\E[20~, kf9=\E[21~, nel=\EE, rc=\E8, rev=\E[7m$<2>, - rf=/usr/share/tabset/vt300, ri=\EM, rmacs=\E(B$<4>, - rmam=\E[?7l, rmir=\E[4l, rmkx=\E>, + clear=\E[H\E[2J$<50>, cr=\r, cub1=^H, cud1=\n, + cup=\E[%i%p1%d;%p2%dH$<10>, dch=\E[%p1%dP, dch1=\E[P, + ech=\E[%p1%dX, ed=\E[J$<50>, el=\E[K$<3>, el1=\E[1K, + enacs=\E)0, flash=\E[?5h$<200/>\E[?5l, home=\E[H, ht=^I, + hts=\EH, ich=\E[%p1%d@, if=/usr/share/tabset/vt300, + ind=\ED, is2=\E[1;24r\E[24;1H, is3=\E[?67h\E[64;1"p, + kbs=^H, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, + kf1=\EOP, kf10=\E[29~, kf2=\EOQ, kf3=\EOR, kf4=\EOS, + kf5=\E[17~, kf6=\E[18~, kf7=\E[19~, kf8=\E[20~, kf9=\E[21~, + nel=\EE, rev=\E[7m$<2>, rf=/usr/share/tabset/vt300, + ri=\EM, rmacs=\E(B$<4>, rmam=\E[?7l, rmir=\E[4l, rmkx=\E>, rmsc=\E[?0;0r\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, - rmso=\E[27m, rmul=\E[24m, rs3=\E[?67h\E[64;1"p, sc=\E7, + rmso=\E[27m, rmul=\E[24m, rs3=\E[?67h\E[64;1"p, sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%|%t;7%;m%? %p9%t\E(0%e\E(B%;$<2>, sgr0=\E[m\E(B$<2>, smacs=\E(0$<2>, smam=\E[?7h, smir=\E[4h, smkx=\E=, smso=\E[7m, smul=\E[4m, tbc=\E[3g, - use=vt220+vtedit, use=ansi+pp, use=dec+sl, use=ansi+enq, - use=vt220+cvis, use=vt420+lrmm, + use=ansi+csr, use=ansi+enq, use=ansi+idl, use=ansi+pp, + use=ansi+local, use=dec+sl, use=vt220+cvis, + use=vt420+lrmm, use=vt220+vtedit, # DEC VT220 and up support DECUDK (user-defined keys). DECUDK (i.e., pfx) # takes two parameters, the key and the string. Translating the key is @@ -3112,24 +3002,24 @@ vt420|DEC VT420, # application has to know it. # vt420pc|DEC VT420 w/PC keyboard, - kdch1=^?, kend=\E[4~, kf1=\E[11~, kf10=\E[21~, kf11=\E[23~, + kdch1=^?, kend=\E[4~, kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf13=\E[11;2~, kf14=\E[12;2~, kf15=\E[13;2~, kf16=\E[14;2~, kf17=\E[15;2~, kf18=\E[17;2~, - kf19=\E[18;2~, kf2=\E[12~, kf20=\E[19;2~, kf21=\E[20;2~, + kf19=\E[18;2~, kf20=\E[19;2~, kf21=\E[20;2~, kf22=\E[21;2~, kf23=\E[23;2~, kf24=\E[24;2~, kf25=\E[23~, kf26=\E[24~, kf27=\E[25~, kf28=\E[26~, kf29=\E[28~, - kf3=\E[13~, kf30=\E[29~, kf31=\E[31~, kf32=\E[32~, - kf33=\E[33~, kf34=\E[34~, kf35=\E[35~, kf36=\E[36~, - kf37=\E[23;2~, kf38=\E[24;2~, kf39=\E[25;2~, kf4=\E[14~, - kf40=\E[26;2~, kf41=\E[28;2~, kf42=\E[29;2~, - kf43=\E[31;2~, kf44=\E[32;2~, kf45=\E[33;2~, - kf46=\E[34;2~, kf47=\E[35;2~, kf48=\E[36;2~, kf5=\E[15~, - kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, khome=\E[H, + kf30=\E[29~, kf31=\E[31~, kf32=\E[32~, kf33=\E[33~, + kf34=\E[34~, kf35=\E[35~, kf36=\E[36~, kf37=\E[23;2~, + kf38=\E[24;2~, kf39=\E[25;2~, kf40=\E[26;2~, + kf41=\E[28;2~, kf42=\E[29;2~, kf43=\E[31;2~, + kf44=\E[32;2~, kf45=\E[33;2~, kf46=\E[34;2~, + kf47=\E[35;2~, kf48=\E[36;2~, kf6=\E[17~, kf7=\E[18~, + kf8=\E[19~, kf9=\E[20~, khome=\E[H, pctrm=USR_TERM:vt420pcdos:, pfx=\EP1;1|%?%{16}%p1%>%t%{0}%e%{21}%p1%>%t%{1}%e%{25}%p1%> %t%{2}%e%{27}%p1%>%t%{3}%e%{30}%p1%>%t%{4}%e%{5}%;%p1%+ %d/%p2%s\E\\, - use=vt420, + use=xterm+r5+lockeys, use=vt420, vt420pcdos|DEC VT420 w/PC for DOS Merge, lines#25, @@ -3140,12 +3030,8 @@ vt420pcdos|DEC VT420 w/PC for DOS Merge, sgr0=\E[m, smsc=\E[?1;2r\E[34h, use=vt420pc, vt420f|DEC VT420 with VT kbd; VT400 mode; F1-F5 used as Fkeys, - kdch1=^?, kf1=\E[11~, kf10=\E[21~, kf11=\E[23~, - kf12=\E[24~, kf13=\E[25~, kf14=\E[26~, kf15=\E[28~, - kf16=\E[29~, kf17=\E[31~, kf18=\E[32~, kf19=\E[33~, - kf2=\E[12~, kf20=\E[34~, kf3=\E[13~, kf4=\E[14~, - kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, - khome=\E[H, lf1=\EOP, lf2=\EOQ, lf3=\EOR, lf4=\EOS, + kdch1=^?, kf10=\E[21~, khome=\E[H, lf1=\EOP, lf2=\EOQ, + lf3=\EOR, lf4=\EOS, use=vt220+sfkeys, use=xterm+r5+fkeys, use=vt420, vt510|DEC VT510, @@ -3171,8 +3057,15 @@ vt510pcdos|DEC VT510 w/PC for DOS Merge, vt520|DEC VT520, use=ansi+rca, use=vt420, use=ansi+tabs, +vt520-w|DEC VT520 in wide mode, + cols#132, use=vt520, + vt525|DEC VT525, - use=vt520, + colors#8, pairs#64, + setab=\E[4%p1%dm, setaf=\E[3%p1%dm, use=vt520, + +vt525-w|DEC VT525 in wide mode, + cols#132, use=vt525, # I just got a brand new Boundless VT520 with that company's "ANSI 2011" # Keyboard, which replaces the old LK41R-AA keyboard. @@ -3323,7 +3216,7 @@ tt|tkterm|Don Libes' tk text widget terminal emulator, # my faulty memory, and the following online sources and references: # # [1] "Three Scotts and a Duane" by Simson L. Garfinkel -# http://www.nextcomputers.org/NeXTfiles/Articles/NeXTWORLD/93.8/93.8.Dec.Community1.html +# https://web.archive.org/web/20121019083801/http://www.nextcomputers.org/NeXTfiles/Articles/NeXTWORLD/93.8/93.8.Dec.Community1.html # # [2] NeXTSTEP entry from Wikipedia, the free encyclopedia # https://secure.wikimedia.org/wikipedia/en/wiki/Nextstep @@ -3438,36 +3331,29 @@ tt|tkterm|Don Libes' tk text widget terminal emulator, nsterm+7|AppKit Terminal.app v41+ basic capabilities w/ASCII charset, am, bw, msgr, xenl, xon, cols#80, it#8, lines#24, - bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[J, cr=\r, - csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H, - cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C, - cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, - dim=\E[2m, dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K, - el1=\E[1K, home=\E[H, ht=^I, hts=\EH, il=\E[%p1%dL, il1=\E[L, - ind=\n, invis=\E[8m, kbs=^?, kcub1=\EOD, kcud1=\EOB, - kcuf1=\EOC, kcuu1=\EOA, kent=\EOM, rc=\E8, rev=\E[7m, ri=\EM, - rmam=\E[?7l, rmkx=\E[?1l\E>, rmso=\E[m, rmul=\E[m, - rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, sc=\E7, + bel=^G, cr=\r, cub1=^H, cud1=\n, dim=\E[2m, el1=\E[1K, ht=^I, + hts=\EH, ind=\n, kbs=^?, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, + kcuu1=\EOA, kent=\EOM, ri=\EM, rmam=\E[?7l, rmkx=\E[?1l\E>, + rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%? %p5%t;2%;%?%p7%t;8%;m, - sgr0=\E[m, smam=\E[?7h, smkx=\E[?1h\E=, smso=\E[7m, - smul=\E[4m, tbc=\E[3g, use=vt100+enq, use=vt100+pfkeys, + sgr0=\E[m, smam=\E[?7h, smkx=\E[?1h\E=, tbc=\E[3g, + use=ansi+csr, use=ansi+cup, use=ansi+erase, use=ansi+idl, + use=ansi+local, use=ansi+sgrbold, use=vt100+enq, + use=vt100+pfkeys, nsterm+acs|AppKit Terminal.app v41+ basic capabilities w/VT100 alternate-charset, - acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, - enacs=\E(B\E)0, rmacs=^O, sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%? %p5%t;2%;%?%p7%t;8%;m%?%p9%t\016%e\017%;, - sgr0=\E[m\017, smacs=^N, use=nsterm+7, + sgr0=\E[m\017, use=nsterm+7, use=vt100+4bsd, nsterm+mac|AppKit Terminal.app v41+ basic capabilities w/MacRoman alternate-charset, acsc=+\335\,\334-\366.\3770#`\327a:f\241g\261h#i \360jjkkllmmnno\370p\370q\321rrssttuuvvwwxxy\262z\263{ \271|\255}\243~\245, - enacs=\E(B\E)0, rmacs=^O, sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%? %p5%t;2%;%?%p7%t;8%;m%?%p9%t\016%e\017%;, - sgr0=\E[m\017, smacs=^N, use=nsterm+7, + sgr0=\E[m\017, use=nsterm+7, use=vt100+4bsd, # compare with xterm+sl-twm nsterm+s|AppKit Terminal.app v41+ status-line (window titlebar) support, @@ -3477,8 +3363,8 @@ nsterm+c|AppKit Terminal.app v51+ full color support (including 16 colors), op=\E[0m, use=ibm+16color, nsterm+c41|AppKit Terminal.app v41 color support, - colors#8, ncv#37, pairs#64, - op=\E[0m, setab=\E[4%p1%dm, setaf=\E[3%p1%dm, + ncv#37, + op=\E[0m, use=klone+color, # These are different combinations of the building blocks @@ -3559,15 +3445,12 @@ nsterm-c-s|AppKit Terminal.app v51+ w/MacRoman charset (full color w/statusline) # vt52, vt100, vt102 and xterm. nsterm-16color|AppKit Terminal.app v240.2+ with Mac OS X version 10.5, bw@, mir, npc, - dch=\E[%p1%dP, dch1=\E[P, flash=\E[?5h$<200/>\E[?5l, - hpa=\E[%i%p1%dG, ich=\E[%p1%d@, ich1=\E[@, kdch1=\E[3~, - kend=\E[F, kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, - kf13=\E[25~, kf14=\E[26~, kf15=\E[28~, kf16=\E[29~, - kf17=\E[31~, kf18=\E[22~, kf19=\E[33~, kf20=\E[34~, - kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, - khome=\E[H, knp=\E[6~, kpp=\E[5~, rmir=\E[4l, smir=\E[4h, - vpa=\E[%i%p1%dd, kLFT5=\E[5D, kRIT5=\E[5C, - use=xterm+alt47, use=nsterm-c-s-acs, use=vt220+cvis, + flash=\E[?5h$<200/>\E[?5l, hpa=\E[%i%p1%dG, + kdch1=\E[3~, kend=\E[F, kf18=\E[22~, kf5=\E[15~, + khome=\E[H, knp=\E[6~, kpp=\E[5~, vpa=\E[%i%p1%dd, + kLFT5=\E[5D, kRIT5=\E[5C, use=ansi+idc, use=vt220+cvis, + use=vt220+sfkeys, use=vt220+ufkeys, use=xterm+alt47, + use=nsterm-c-s-acs, # The versions of Terminal.app in Mac OS X version 10.3.x seem to have # the background color erase feature. The newer version 240.2 in Mac OS X @@ -3735,42 +3618,83 @@ nsterm|nsterm-256color|Apple_Terminal|AppKit Terminal.app, # can display/alter xterm-256color cube # can display/alter xterm-88color cube iTerm.app|iterm|iTerm.app terminal emulator for Mac OS X, - am, bce, hs, mir, msgr, npc, xenl, xon, - cols#80, it#8, lines#24, wsl#50, - acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, - bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[J, cr=\r, - csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H, - cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C, - cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, - dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, - el=\E[K, el1=\E[1K, enacs=\E(B\E)0, - flash=\E[?5h$<200/>\E[?5l, home=\E[H, hpa=\E[%i%p1%dG, - ht=^I, hts=\EH, ich=\E[%p1%d@, ich1=\E[@, il=\E[%p1%dL, - il1=\E[L, ind=\n, kLFT=\E[1;2D, kRIT=\E[1;2C, kbs=^?, - kcbt=\E[Z, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, - kdch1=\E[3~, kend=\EOF, kent=\EOM, kf1=\EOP, kf10=\E[21~, - kf11=\E[23~, kf12=\E[24~, kf2=\EOQ, kf3=\EOR, kf4=\EOS, - kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, - khome=\EOH, knp=\E[6~, kpp=\E[5~, op=\E[0m, rc=\E8, - rev=\E[7m, ri=\EM, rmacs=^O, rmam=\E[?7l, rmir=\E[4l, - rmkx=\E[?1l\E>, rmso=\E[m, rmul=\E[m, - rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, sc=\E7, + bce, mir, npc, xenl, xon, + wsl#50, + blink=\E[5m, bold=\E[1m, cub1=^H, cud1=\n, + cup=\E[%i%p1%d;%p2%dH, el1=\E[1K, + flash=\E[?5h$<200/>\E[?5l, hpa=\E[%i%p1%dG, + kLFT=\E[1;2D, kRIT=\E[1;2C, kbs=^?, kcbt=\E[Z, kdch1=\E[3~, + kend=\EOF, knp=\E[6~, kpp=\E[5~, op=\E[0m, rev=\E[7m, ri=\EM, + rmam=\E[?7l, rmkx=\E[?1l\E>, rmso=\E[m, rmul=\E[m, sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m%? %p9%t\016%e\017%;, - sgr0=\E[m\017, smacs=^N, smam=\E[?7h, smir=\E[4h, - smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, tbc=\E[3g, - vpa=\E[%i%p1%dd, kEND5=\E[1;5F, kHOM5=\E[1;5H, - use=xterm+alt47, use=ansi+enq, use=xterm+sl-twm, - use=vt100+keypad, use=xterm+x11mouse, + sgr0=\E[m\017, smam=\E[?7h, smkx=\E[?1h\E=, smso=\E[7m, + smul=\E[4m, vpa=\E[%i%p1%dd, kEND5=\E[1;5F, + kHOM5=\E[1;5H, use=ansi+apparrows, use=ansi+csr, + use=ansi+enq, use=ansi+erase, use=ansi+idc, use=ansi+idl, + use=ansi+local, use=vt100+4bsd, use=vt100+keypad, + use=vt100+pfkeys, use=xterm+r5+fkeys, use=xterm+alt47, + use=xterm+sl-twm, use=xterm+x11mouse, use=xterm+256setaf, use=vt220+cvis, -# iTerm2 3.0.15 +# iTerm2 # # https://iterm2.com/ # https://github.com/gnachman/iTerm2 # ~/Library/Preferences/com.googlecode.iterm2.plist # "iTerm" stalled in 2009. A different set of developers began "iTerm2". # +# iTerm2 3.5.0 +# +# NOTES: +# with esctest: +# 365 tests passed, 196 known bugs, 2 tests fail intermittently +# the known bugs include several of the cursor-movement tests +# the ED, EL tests include those failing intermittently +# DECCOLM, DECERA, DECSED, DECSERA and SPA do not work +# most of the DECRPM, DECRQSS reports fail +# with vttest: +# reports primary DA as VT420 +# VT420 rectangular operations, as well as DECBI/DEVFI work with margins +# SRM does not work +# DECSED, and SPA do not work +# REP and SD work, SL/SR/SU do not work +# with tack: +# status-line does not work +# +# The default settings have blinking-text and keypad-application mode disabled. +# Enabling the latter make it half-working (numlock sends an escape character). +# About half of the modified function-keys are untestable due to preassigned +# features. +# +# iTerm2 3.5.0 comes with a 4-year-old copy of xterm's terminfo (June 2020), +# which is modified, using the ncurses TERMINFO_DIRS variable to substitute +# this locally: +# + xterm-nrc and xterm+pcfN are removed +# + the developer made changes to adapt it to the 16-year-old version of +# ncurses bundled with MacOS, i.e., changing the mouse protocol to the +# legacy X11 format and reducing the number of colors to 32k (in more than +# one place). In the former case, the developer was confused about why that +# was necessary. In the latter, the developer clearly misunderstood how the +# tools work. +# + vt420+lrmm is modified, removing smglr and corrupting mgc (again, developer +# confusion). +# + the developer added a couple of features, misnaming them as "xterm" blocks: +# + a copy of kitty+setal renamed to xterm+setulc (and Setulc) is added, but +# the feature is first mentioned in iTerm2 changes in May 2020, while +# it is first mention in kitty changes in December 2016. +# + Smulx is added +# +# iTerm2 3.4.0 +# +# NOTES: +# with esctest: +# 293 tests pass, 270 tests fail +# with tack: +# minor improvements which do not alter the terminfo +# +# iTerm2 3.0.15 +# # NOTES: # with vttest: # reports primary DA as VT100 with AVO: \E[?1;2c @@ -3798,27 +3722,28 @@ iTerm.app|iterm|iTerm.app terminal emulator for Mac OS X, # 2018/01/21: found xterm+sm+1006 did not work with version 3.1.5 # 2018/05/19: xterm+sm+1006 seems to work with 3.1.6beta -TD iTerm2.app|iterm2|terminal emulator for Mac OS X, - blink=\E[5m, cbt=\E[Z, dim=\E[2m, kEND=\E[1;2F, - kHOM=\E[1;2H, ka1@, ka3@, kb2@, kc1@, kc3@, kent@, kf13=\E[1;2P, - kf14=\E[1;2Q, kf15=\E[1;2R, kf16=\E[1;2S, kf17=\E[15;2~, - kf18=\E[17;2~, kf19=\E[18;2~, kf2=\EOQ, kf20=\E[19;2~, - kf21=\E[20;2~, kf22=\E[21;2~, kf23=\E[23;2~, - kf24=\E[24;2~, kind=\E[1;2B, kri=\E[1;2A, nel=\EE, - op=\E[39;49m, rmso=\E[27m, rmul=\E[24m, + cbt=\E[Z, dim=\E[2m, kEND=\E[1;2F, kHOM=\E[1;2H, ka1@, ka3@, + kb2@, kc1@, kc3@, kent@, kf13=\E[1;2P, kf14=\E[1;2Q, + kf15=\E[1;2R, kf16=\E[1;2S, kf17=\E[15;2~, kf18=\E[17;2~, + kf19=\E[18;2~, kf20=\E[19;2~, kf21=\E[20;2~, + kf22=\E[21;2~, kf23=\E[23;2~, kf24=\E[24;2~, + kind=\E[1;2B, kri=\E[1;2A, nel=\EE, op=\E[39;49m, + rmso=\E[27m, rmul=\E[24m, rs2=\E[!p\E[?3;4l\E[4l\E>\E[?1000l, sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%? %p5%t;2%;m%?%p9%t\016%e\017%;, - kDN3=\E\E[B, kDN4=\E[1;10B, kDN5=\E[1;5B, kDN6=\E[1;6B, - kEND3=\E[1;9F, kEND4=\E[1;10F, kEND6=\E[1;6F, - kEND7=\E[1;13F, kEND8=\E[1;14F, kHOM3=\E[1;9H, - kHOM4=\E[1;10H, kHOM6=\E[1;6H, kHOM7=\E[1;13H, - kHOM8=\E[1;14H, kLFT3=\E\E[D, kLFT4=\E[1;10D, - kLFT5=\E[1;5D, kLFT6=\E[1;6D, kNXT3=\E\E[6~, - kPRV3=\E\E[5~, kRIT3=\E\E[C, kRIT4=\E[1;10C, - kRIT5=\E[1;5C, kRIT6=\E[1;6C, kUP3=\E\E[A, kUP4=\E[1;10A, - kUP5=\E[1;5A, kUP6=\E[1;6A, use=ecma+index, - use=xterm+alt+title, use=ecma+italics, use=iterm, - use=bracketed+paste, + Smulx=\E[4:%p1%dm, kDN3=\E\E[B, kDN4=\E[1;10B, + kDN5=\E[1;5B, kDN6=\E[1;6B, kEND3=\E[1;9F, + kEND4=\E[1;10F, kEND6=\E[1;6F, kEND7=\E[1;13F, + kEND8=\E[1;14F, kHOM3=\E[1;9H, kHOM4=\E[1;10H, + kHOM6=\E[1;6H, kHOM7=\E[1;13H, kHOM8=\E[1;14H, + kLFT3=\E\E[D, kLFT4=\E[1;10D, kLFT5=\E[1;5D, + kLFT6=\E[1;6D, kNXT3=\E\E[6~, kPRV3=\E\E[5~, + kRIT3=\E\E[C, kRIT4=\E[1;10C, kRIT5=\E[1;5C, + kRIT6=\E[1;6C, kUP3=\E\E[A, kUP4=\E[1;10A, kUP5=\E[1;5A, + kUP6=\E[1;6A, use=ecma+index, use=xterm+alt+title, + use=ecma+italics, use=iterm, use=bracketed+paste, + use=kitty+setal, # xnuppc - Darwin PowerPC Console (a.k.a. "darwin") # @@ -3918,22 +3843,18 @@ iTerm2.app|iterm2|terminal emulator for Mac OS X, xnuppc+basic|Darwin PowerPC console basic capabilities, am, bce, mir, xenl, NQ, it#8, - bold=\E[1m, clear=\E[H\E[J, cr=\r, csr=\E[%i%p1%d;%p2%dr, - cub=\E[%p1%dD, cub1=\E[D, cud=\E[%p1%dB, cud1=\E[B, - cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, - cuu=\E[%p1%dA, cuu1=\E[A, dsl=\E]2;\007, ed=\E[J, el=\E[K, - el1=\E[1K, home=\E[H, ht=^I, hts=\EH, ind=\n, kbs=^?, - kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, rc=\E8, - rev=\E[7m, ri=\EM, rmam=\E[?7l, rmkx=\E[?1l\E>, rmso=\E[m, - rmul=\E[m, rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, - sc=\E7, + bold=\E[1m, cr=\r, dsl=\E]2;\007, el1=\E[1K, ht=^I, hts=\EH, + ind=\n, kbs=^?, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, + kcuu1=\EOA, rev=\E[7m, ri=\EM, rmam=\E[?7l, rmkx=\E[?1l\E>, + rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;m, - sgr0=\E[m, smam=\E[?7h, smkx=\E[?1h\E=, smso=\E[7m, - smul=\E[4m, tbc=\E[3g, use=vt100+keypad, + sgr0=\E[m, smam=\E[?7h, smkx=\E[?1h\E=, tbc=\E[3g, + use=ansi+csr, use=ansi+cup, use=ansi+erase, + use=ansi+local, use=ansi+sgrso, use=ansi+sgrul, + use=vt100+keypad, xnuppc+c|Darwin PowerPC console ANSI color support, - colors#8, ncv#32, pairs#64, - op=\E[37;40m, setab=\E[4%p1%dm, setaf=\E[3%p1%dm, + ncv#32, use=klone+color, xnuppc+b|Darwin PowerPC console color-bold support, ncv#32, @@ -4092,9 +4013,8 @@ xnuppc-256x96|darwin-256x96|Darwin PowerPC console (color) 256x96, ######## DOS/WINDOWS # CRT is shareware. It implements some xterm features, including mouse. crt|crt-vt220|CRT 2.3 emulating VT220, - bce, msgr, - ncv@, - hts=\EH, use=vt100+enq, use=vt220-base, use=ecma+color, + bce, + ncv@, use=vt100+enq, use=vt220-base, use=ecma+color, # SecureCRT 8.7.3.2279 # 8.7.3 was released 2020/08/11 @@ -4110,7 +4030,7 @@ crt|crt-vt220|CRT 2.3 emulating VT220, # TN3270, TVI910, TVI925, Wyse 50/60, and ANSI. # Changes: # Added ANSI sc/rc and REP in 2019/12/17 -# Added TVI910/ TVI925 in 2019/11/20 +# Added TVI910/ TVI925 in 2019/11/20 # # Default: # Emulate "Xterm", using "ANSI with 256color" @@ -4155,7 +4075,7 @@ crt|crt-vt220|CRT 2.3 emulating VT220, # resize.pl gets no reply, resize.sh needs fix for no reply. scrt|securecrt|SecureCRT emulating xterm-256color, bce@, km@, npc, - bel@, cvvis@, kcbt=\E[Z, kent=\EOM, use=vt220+pcedit, + bel@, cvvis@, kcbt=\E[Z, use=vt220+pcedit, use=xterm+256setaf, use=ecma+index, use=ansi+rep, use=xterm+keypad, use=xterm+pcfkeys, use=xterm-basic, @@ -4175,8 +4095,8 @@ scrt|securecrt|SecureCRT emulating xterm-256color, # TERM=xterm # # vttest: -# DA1: \E[?62;1;2;6;7;8;9;15;22c (VT200 with DRCS, UDK, NRCS) -# DA2: \E[>1;10;0c +# DA1: \E[?62;1;2;6;7;8;9;15;22c (VT200 with DRCS, UDK, NRCS) +# DA2: \E[>1;10;0c # However: # + NRCS tests do not work # + DECUDK test fails @@ -4205,15 +4125,23 @@ scrt|securecrt|SecureCRT emulating xterm-256color, # supports 256-colors, including changing palette (ncurses menu d works) # supports UTF-8, but honors VT100 line-drawing absolute|Absolute Telnet emulating xterm, - kcbt=\E[Z, use=ecma+index, use=ansi+rep, + kcbt=\E[Z, use=ecma+index, use=linux+kbs, use=ansi+rep, use=vt220+pcedit, use=xterm+keypad, use=xterm+app, use=xterm+pcf0, use=xterm+256color, use=xterm+x11mouse, use=xterm-basic, #### PuTTY -# PuTTY 0.74 (27 June 2020) # http://www.chiark.greenend.org.uk/~sgtatham/putty/ # +# PuTTY 0.78 (September 2020, tested 12 August 2023) +# Testing with tack: +# implements cross-out text (shortly after 0.74) +# restore kLFT as kLFT5, etc. (mentioned in October 2021) +# does not support direct-colors (mentioned in July 2021) +# +# PuTTY 0.74 (27 June 2020) +# (unchanged) +# # PuTTY 0.73 (September 2019) # Testing with tack: # does not implement italics @@ -4258,42 +4186,46 @@ absolute|Absolute Telnet emulating xterm, # http://stackoverflow.com/questions/24613237/terminal-retains-bg-color-after-closing-vim-using-color-scheme-and-putty-256co/37869114#37869114 putty|PuTTY terminal emulator, am, bce, bw, ccc, mir, msgr, xenl, xon, XT, - colors#8, it#8, ncv#22, pairs#64, U8#1, + it#8, ncv#22, U8#1, acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, - bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[J, cr=\r, - csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H, - cud=\E[%p1%dB, cud1=\ED, cuf=\E[%p1%dC, cuf1=\E[C, - cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\EM, - dch=\E[%p1%dP, dch1=\E[P, + bel=^G, cr=\r, cub1=^H, cud1=\ED, cup=\E[%i%p1%d;%p2%dH, + cuu1=\EM, dch=\E[%p1%dP, dch1=\E[P, dispc=%?%p1%{8}%=%t\E%%G\342\227\230\E%%@%e%p1%{10}%=%t\E%%G \342\227\231\E%%@%e%p1%{12}%=%t\E%%G\342\231\0\E%%@%e %p1%{13}%=%t\E%%G\342\231\252\E%%@%e%p1%{14}%=%t\E%%G \342\231\253\E%%@%e%p1%{15}%=%t\E%%G\342\230\274\E%%@ %e%p1%{27}%=%t\E%%G\342\206\220\E%%@%e%p1%{155}%=%t\E %%G\340\202\242\E%%@%e%p1%c%;, - dl=\E[%p1%dM, dl1=\E[M, ech=\E[%p1%dX, ed=\E[J, el=\E[K, - el1=\E[1K, enacs=\E(B\E)0, flash=\E[?5h$<100/>\E[?5l, - home=\E[H, hpa=\E[%i%p1%dG, il=\E[%p1%dL, il1=\E[L, ind=\n, + ech=\E[%p1%dX, el1=\E[1K, enacs=\E(B\E)0, + flash=\E[?5h$<100/>\E[?5l, home=\E[H, hpa=\E[%i%p1%dG, + ind=\n, initc=\E]P%p1%x%p2%{255}%*%{1000}%/%02x%p3%{255}%*%{1000}%/ %02x%p4%{255}%*%{1000}%/%02x, is2=\E7\E[r\E[m\E[?7h\E[?1;4;6l\E[4l\E8\E>\E]R, - kbs=^?, kcbt=\E[Z, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, - kcuu1=\EOA, kind=\E[B, kri=\E[A, kspd=^Z, nel=\r\n, oc=\E]R, - op=\E[39;49m, rc=\E8, rev=\E[7m, ri=\EM, rmacs=^O, - rmam=\E[?7l, rmir=\E[4l, rmkx=\E[?1l\E>, rmpch=\E[10m, - rmso=\E[27m, rmul=\E[24m, + kbs=^?, kcbt=\E[Z, khome=\E[1~, kind=\E[B, kri=\E[A, kspd=^Z, + nel=\r\n, oc=\E]R, op=\E[39;49m, ri=\EM, rmacs=^O, + rmam=\E[?7l, rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[27m, + rmul=\E[24m, rs2=\E<\E["p\E[50;6"p\Ec\E[?3l\E]R\E[?1000l, - s0ds=\E[10m, s1ds=\E[11m, s2ds=\E[12m, sc=\E7, - setab=\E[4%p1%dm, setaf=\E[3%p1%dm, + s0ds=\E[10m, s1ds=\E[11m, s2ds=\E[12m, sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5 %;m%?%p9%t\016%e\017%;, sgr0=\E[m\017, smacs=^N, smam=\E[?7h, smir=\E[4h, - smkx=\E[?1h\E=, smpch=\E[11m, smso=\E[7m, smul=\E[4m, - vpa=\E[%i%p1%dd, E3=\E[3J, use=vt220+pcedit, - use=ansi+tabs, use=ansi+rep, use=ecma+index, - use=xterm+alt1049, use=xterm+sm+1006, use=putty+fnkeys, - use=vt102+enq, use=xterm+sl, use=vt100+fnkeys, - use=putty+keypad, use=vt220+cvis, use=bracketed+paste, + smkx=\E[?1h\E=, vpa=\E[%i%p1%dd, E3=\E[3J, + use=ansi+apparrows, use=ansi+csr, use=ansi+erase, + use=ansi+idl, use=ansi+local, use=ansi+tabs, + use=ansi+rep, use=bracketed+paste, use=ecma+index, + use=ecma+strikeout, use=klone+color, use=klone+sgr, + use=putty+cursor, use=putty+fnkeys, use=vt220+pcedit, + use=xterm+alt1049, use=vt102+enq, use=xterm+sm+1006, + use=xterm+sl, use=vt100+fnkeys, use=putty+keypad, + use=vt220+cvis, + +# older versions (e.g., before 0.71) of PuTTY used a shift-modifier to toggle +# between normal- and application-mode for the cursor-keys. That was dropped, +# and a few years later (after 0.74) restored as the control-modifier. +putty+cursor|PuTTY modified cursor-keys, + kDN5=\E[B, kLFT5=\E[D, kRIT5=\E[C, kUP5=\E[A, putty+keypad|PuTTY numeric keypad, kp1=\EOq, kp2=\EOr, kp3=\EOs, kp4=\EOt, kp5=\EOu, kp6=\EOv, kp7=\EOw, kp8=\EOx, kp9=\EOy, kpADD=\EOl, kpDIV=\EOQ, @@ -4331,11 +4263,7 @@ putty+fnkeys|fn-keys for PuTTY, use=putty+fnkeys+esc, putty+fnkeys+esc|ESC[n~ fn-keys for PuTTY, - kf1=\E[11~, kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, - kf13=\E[25~, kf14=\E[26~, kf15=\E[28~, kf16=\E[29~, - kf17=\E[31~, kf18=\E[32~, kf19=\E[33~, kf2=\E[12~, - kf20=\E[34~, kf3=\E[13~, kf4=\E[14~, kf5=\E[15~, - kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, + use=vt220+sfkeys, use=xterm+r5+fkeys, putty+fnkeys+linux|Linux fn-keys for PuTTY, kf1=\E[[A, kf2=\E[[B, kf3=\E[[C, kf4=\E[[D, kf5=\E[[E, @@ -4417,11 +4345,11 @@ mintty+common|shared capabilities for mintty, rsupm=\E[75m, smm@, smpch=\E[11m, sshm=\E[1:2m, ssubm=\E[74m, ssupm=\E[73m, Rmol=\E[55m, Smol=\E[53m, Smulx=\E[4:%p1%dm, blink2=\E[6m, norm=\E[22m, - opaq=\E[28m, smul2=\E[21m, use=ansi+rep, + opaq=\E[28m, smul2=\E[21m, use=linux+kbs, use=ansi+rep, use=ecma+strikeout, use=ecma+index, use=vt420+lrmm, - use=xterm+sm+1006, use=xterm+pcfkeys, use=xterm+tmux, - use=ecma+italics, use=xterm-basic, use=bracketed+paste, - use=report+version, + use=xterm+focus, use=xterm+sm+1006, use=xterm+pcfkeys, + use=xterm+tmux, use=ecma+italics, use=xterm-basic, + use=bracketed+paste, use=report+version, # 2019-06-09: These capabilities are commented-out for compatibility with # existing releases 5.9-6.1, and may be considered for inclusion after the # release of ncurses 6.2: @@ -4489,18 +4417,15 @@ teraterm2.3|Tera Term Pro 2.3, \264v\301w\302x\263y\363z\362{\343|\330}\234~\376, blink=\E[5m, bold=\E[1m, clear=\E[H\E[J, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, dch=\E[%p1%dP, - dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M, ech=\E[%p1%dX, ed=\E[J, - el=\E[K, el1=\E[1K, flash=\E[?5h$<200/>\E[?5l, - hpa=\E[%i%p1%dG, il=\E[%p1%dL, il1=\E[L, kf1=\E[11~, - kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf13=\E[25~, - kf14=\E[26~, kf15=\E[28~, kf16=\E[29~, kf17=\E[31~, - kf18=\E[32~, kf19=\E[33~, kf2=\E[12~, kf20=\E[34~, - kf3=\E[13~, kf4=\E[14~, kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, - kf8=\E[19~, kf9=\E[20~, op=\E[100m, rev=\E[7m, ri=\EM, - rmso=\E[27m, rmul=\E[24m, sgr0=\E[0m\017, smso=\E[7m, - smul=\E[4m, vpa=\E[%i%p1%dd, use=vt220+vtedit, + dch1=\E[P, ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K, + flash=\E[?5h$<200/>\E[?5l, hpa=\E[%i%p1%dG, + kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf6=\E[17~, + kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, op=\E[100m, rev=\E[7m, + ri=\EM, rmso=\E[27m, rmul=\E[24m, sgr0=\E[0m\017, + smso=\E[7m, smul=\E[4m, vpa=\E[%i%p1%dd, + use=xterm+r5+lockeys, use=ansi+idl, use=vt220+vtedit, use=vt100+enq, use=klone+color, use=vt100, - use=vt220+cvis, + use=vt220+cvis, use=vt220+sfkeys, # Version 4.59 has regular VT100 line-drawing (so it is no longer necessary # to choose a Windows OEM font). @@ -4619,11 +4544,125 @@ ms-vt100+|vt100+|windows XP VT100+ (sic), ms-vt-utf8|vt-utf8|UTF-8 flavor of VT100+, use=ms-vt100+, -# Windows Terminal (Preview) +# VT-UTF-8 and VT100+ Protocols +# https://learn.microsoft.com/en-us/openspecs/windows_protocols/ms-vuvp/969416c0-ccd6-4a75-a9b3-597d7713845b +# +# This Microsoft "protocol" adapted the aixterm 16-color feature from xterm's +# documentation in 2015, as seen in successive revisions: +# +# 2013/07/22 has 8 colors +# 2015/10/16 has 16 colors using SGR 90-97, 100-107 as well as SGR 24 and 27, +# adds "informative" reference to xterm's ctlseqs +# +# The cnorm/civis definitions added in 2015 are unrelated to any standard. +ms-vt100-16color|VT-UTF-8 and VT100+, + civis=\E[?h, cnorm=\E[?l, rmso=\E[27m, rmul=\E[24m, + use=ibm+16color, use=ms-vt100+, + +# Based on +# https://docs.microsoft.com/en-us/windows/console/console-virtual-terminal-sequences +# We use this scheme to map function keys +# terminfo modifier code keys +# kf13-kf24 shift 2 F1 to F12 +# kf25-kf36 alt 3 F1 to F12 +# kf37-kf48 control 4 F1 to F12 +# kf49-kf60 ctrl-alt 7 F1 to F12 +# +# Unclear: smam and rmam implemented? +# Unclear: rmkx, smkx, rmir, smir - irrelevant? +# +# TD: +# + According to tack, tbc and cbt fail. +# + The line-drawing (acsc) does not work in telnet or ssh. I added the +# U8 extension to tell ncurses to use UTF-8 for line-drawing (when the +# locale uses UTF-8). That won't work for telnet (which uses ASCII), +# but seems to work for OpenSSH's ssh. I set the codepage to 65001, +# of course. +# + Function keys... do not work consistently in telnet and ssh. With +# telnet, kf1-kf4 are \EOP to \EOS, and kf5-kf12 match the terminfo. +# But with ssh, it's entirely different (reminds me of rxvt). +winconsole|Windows 10 new console, + am, km, mir, msgr, xenl, + ncv@, U8#1, + acsc=++\,\,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxy + yzz~~, + bel=^G, blink@, cr=\r, ech=\E[%p1%dX, el1=\E[0K, ich1@, ind=\n, + invis@, is1=\E[!p, kf13=\E[11;2~, kf14=\E[12;2~, + kf15=\E[13;2~, kf16=\E[14;2~, kf17=\E[15;2~, + kf18=\E[17;2~, kf19=\E[18;2~, kf20=\E[19;2~, + kf21=\E[20;2~, kf22=\E[21;2~, kf23=\E[24;2~, + kf24=\E[25;2~, kf25=\E[11;3~, kf26=\E[12;3~, + kf27=\E[13;3~, kf28=\E[14;3~, kf29=\E[15;3~, + kf30=\E[17;3~, kf31=\E[18;3~, kf32=\E[19;3~, + kf33=\E[20;3~, kf34=\E[21;3~, kf35=\E[24;3~, + kf36=\E[25;3~, kf37=\E[11;4~, kf38=\E[12;4~, + kf39=\E[13;4~, kf40=\E[14;4~, kf41=\E[15;4~, + kf42=\E[17;4~, kf43=\E[18;4~, kf44=\E[19;4~, + kf45=\E[20;4~, kf46=\E[21;4~, kf47=\E[24;4~, + kf48=\E[25;4~, kf49=\E[11;7~, kf50=\E[12;7~, + kf51=\E[13;7~, kf52=\E[14;7~, kf53=\E[15;7~, + kf54=\E[17;7~, kf55=\E[18;7~, kf56=\E[19;7~, + kf57=\E[20;7~, kf58=\E[21;7~, kf59=\E[24;7~, + kf60=\E[25;7~, khome=\E[1~, nel=\r\n, ri=\E[T, rmacs=\E(B, + rmir@, rmpch@, rs1=\E[!p, + sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;m%?%p9%t + \E(0%e\E(B%;, + sgr0=\E[0m\E(B, smacs=\E(0, smir@, smpch@, use=ansi+arrows, + use=ansi+csr, use=ansi+cup, use=ansi+erase, use=ansi+idc, + use=ansi+idl, use=ecma+index, use=ansi+inittabs, + use=ansi+local, use=ecma+sgr, use=ecma+color, + use=vt220+cvis, use=vt220+pcedit, use=xterm+nopcfkeys, + +# Windows Terminal # https://github.com/microsoft/terminal # +# Version 1.21.2911.0 +# 2024-10-17 +# +# - The "About" dialog has a pointer to the release notes, but that turns out +# to be for all branches. This particular version (unlike those previously +# tested) happens to be a non-preview version. +# - Windows Terminal #2958 has relevant discussion. +# +# tack: +# - keypad escapes still do not work +# - meta mode does not work +# - when running tests, the screen maximized and did not resume normal size +# +# vttest: +# - identifies as a VT100-level terminal supporting Greek and Turkish (not +# applicable to a VT100), horizontal scrolling () and DRCS (seems to work) +# - left/right margins work +# - DECSCUSR is okay except for mode 1 +# - SL/SR fail +# - does not support XTVERSION +# - some mouse controls work, but not highlight tracking and X10 compatibility +# - mouse focus events appear - but not in the test-screen (like VTE). +# - cursor position after alternate screen is correct for 1049, not otherwise +# - window reporting does not work +# +# wraptest: +# - DECRC does not restore wrap +# +# other: +# - change history says it supports bracketed paste +# - Greek and Turkish character sets work with GL, not GR +# - source code says it implements OSC 52, as well as 12, 112, but not 104. +# +# Windows 10 22H2 (also Windows 11) +# Version 1.16.10261.0 +# 2020-01-25 +# +# - Windows Terminal #1553: "Feature Request: Mouse/Touch/Pointer Bindings +# (like middle-click paste, right-click context menu, etc.)", compare to +# https://learn.microsoft.com/en-us/windows/console/mouse-event-record-str +# This appears to be related to a problem with its implementation of the +# Console API; the mouse does not work in a "Command Window" (e.g., as used +# in the ncurses MinGW driver), although escape sequences work. +# # Windows 10 21H1 # Version 1.9.1942.0 +# 2021-07-13 # # This has longstanding issues with CR/LF mapping, e.g., # - first reported by Juergen Pfeifer August 13, 2020, with workaround @@ -4673,6 +4712,7 @@ ms-vt-utf8|vt-utf8|UTF-8 flavor of VT100+, # # Windows 10 1903 # Version 0.2.1831.0 +# 2019-07-02 # # The task manager shows this as "OpenConsole.exe", which differs # from the "Windows Command Processor" used for the command-prompt. @@ -4709,13 +4749,18 @@ ms-vt-utf8|vt-utf8|UTF-8 flavor of VT100+, # - color palette can be altered, but OSC 104 for resetting does not work # - crashed with a script used for testing NRCS. # - does not recognize either xterm+direct or xterm+indirect escapes. -ms-terminal|Windows10 terminal, +ms-terminal|Windows terminal, + use=xterm+256color, use=ms+terminal, +ms-terminal-direct|Windows terminal with direct-colors, + use=xterm+direct, use=ms+terminal, +ms+terminal|building block for Windows terminal, npc, - cud1=\E[B, kcbt=\E[Z, rmkx=\E[?1l, rmm@, smkx=\E[?1h, smm@, - Cr@, Ms@, use=xterm+256color, use=xterm+pcfkeys, - use=ansi+rep, use=xterm+sm+1006, use=ecma+index, - use=ecma+italics, use=ecma+strikeout, use=xterm-basic, - use=xterm+tmux, + cud1=\E[B, kcbt=\E[Z, oc@, rmkx=\E[?1l, rmm@, smkx=\E[?1h, + smm@, rv=\E\\[>0;10;1c, use=linux+kbs, + use=bracketed+paste, use=xterm+pcfkeys, use=ansi+rep, + use=xterm+sm+1006, use=ecma+index, use=ecma+italics, + use=ecma+strikeout, use=vt420+lrmm, use=xterm-basic, + use=xterm+focus, use=xterm+tmux, #### Visual Studio # Visual Studio Code 1.45.0 uses xterm.js 12.8.1 (see https://xtermjs.org/). @@ -4764,9 +4809,10 @@ ms-terminal|Windows10 terminal, # - color-palette cannot be changed vscode|xterm.js|Visual Studio Code terminal using xterm.js, npc, - kcbt=\E[Z, rmkx=\E[?1l, smkx=\E[?1h, use=xterm+256setaf, - use=ecma+index, use=xterm+sm+1006, use=xterm+pcfkeys, - use=ecma+italics, use=xterm-basic, use=bracketed+paste, + kcbt=\E[Z, rmkx=\E[?1l, smkx=\E[?1h, use=linux+kbs, + use=xterm+256setaf, use=ecma+index, use=xterm+focus, + use=xterm+sm+1006, use=xterm+pcfkeys, use=ecma+italics, + use=xterm-basic, use=bracketed+paste, vscode-direct|Visual Studio Code with direct-colors, use=xterm+indirect, use=vscode, @@ -4793,14 +4839,14 @@ x10term|vs100-x10|xterm terminal emulator (X10 window system), cols#80, it#8, lines#65, bold=\E[1m, clear=\E[H\E[2J, csr=\E[%i%p1%d;%p2%dr, cub1=^H, cud1=\n, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, - cuu1=\E[A, dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, - dl1=\E[M, ed=\E[J, el=\E[K, home=\E[H, ht=^I, il=\E[%p1%dL, - il1=\E[L, ind=\n, is2=\E\E[m\E[?7h\E[?1;4l, kbs=^H, + cuu1=\E[A, dch=\E[%p1%dP, dch1=\E[P, ed=\E[J, el=\E[K, + home=\E[H, ht=^I, ind=\n, is2=\E\E[m\E[?7h\E[?1;4l, kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, rev=\E[7m, ri=\EM, rmam=\E[?7l, rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[m, rmul=\E[m, sgr0=\E[m, smam=\E[?7h, smir=\E[4h, smkx=\E[?1h\E=, - smso=\E[7m, smul=\E[4m, + smso=\E[7m, smul=\E[4m, use=ansi+idl, + # csl is extension which clears the status line x10term+sl|status-line for X10 xterm, eslok, hs, @@ -4814,26 +4860,26 @@ x10term+sl|status-line for X10 xterm, xterm-r5|xterm R5 version, OTbs, am, km, msgr, xenl, cols#80, it#8, lines#24, - bel=^G, bold=\E[1m, clear=\E[H\E[2J, cr=\r, - csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H, - cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C, - cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, - dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, - el=\E[K, home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@, ich1=\E[@, - il=\E[%p1%dL, il1=\E[L, ind=\n, kcub1=\EOD, kcud1=\EOB, - kcuf1=\EOC, kcuu1=\EOA, kdl1=\E[31~, kel=\E[8~, kf0=\EOq, - kf1=\E[11~, kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, - kf2=\E[12~, kf3=\E[13~, kf4=\E[14~, kf5=\E[15~, kf6=\E[17~, - kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, khome=\E[1~, - kil1=\E[30~, kmous=\E[M, rc=\E8, rev=\E[7m, ri=\EM, - rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[m, rmul=\E[m, + bel=^G, bold=\E[1m, clear=\E[H\E[2J, cr=\r, cub1=^H, cud1=\n, + cup=\E[%i%p1%d;%p2%dH, ed=\E[J, el=\E[K, home=\E[H, ht=^I, + hts=\EH, ind=\n, kdl1=\E[31~, kel=\E[8~, kf0=\EOq, + khome=\E[1~, kil1=\E[30~, kmous=\E[M, rev=\E[7m, ri=\EM, + rmkx=\E[?1l\E>, rmso=\E[m, rmul=\E[m, rs2=\E>\E[?1;3;4;5;6l\E[4l\E[?7h\E[m\E[r\E[2J\E[H, - sc=\E7, sgr=\E[%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1 %;m, - sgr0=\E[m, smir=\E[4h, smkx=\E[?1h\E=, smso=\E[7m, - smul=\E[4m, tbc=\E[3g, use=vt220+pcedit, use=vt100+enq, - use=xterm+kbs, + sgr0=\E[m, smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, + tbc=\E[3g, use=xterm+kbs, use=ansi+apparrows, + use=ansi+csr, use=ansi+idc, use=ansi+idl, use=ansi+local, + use=vt220+pcedit, use=vt100+enq, use=xterm+r5+fkeys, + +# X11R5 used function-keys based on, but different from VT220, assigning keys +# F1-R5 (unlike VT220), and limiting to F12 (perhaps influenced by other +# keyboards). +xterm+r5+fkeys|VT220-like function keys in X11R5 xterm, + use=xterm+r5+lockeys, use=vt220+ufkeys, +xterm+r5+lockeys|XTerm "local" keys in vt220 scheme, + kf1=\E[11~, kf2=\E[12~, kf3=\E[13~, kf4=\E[14~, kf5=\E[15~, # Compatible with the R6 xterm # (from XFree86 3.2 distribution, and added, removed) @@ -4844,26 +4890,20 @@ xterm-r6|xterm X11R6 version, OTbs, am, km, mir, msgr, xenl, cols#80, it#8, lines#24, acsc=``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, - bel=^G, bold=\E[1m, clear=\E[H\E[2J, cr=\r, - csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H, - cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C, - cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, - dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, - el=\E[K, enacs=\E)0, home=\E[H, ht=^I, hts=\EH, il=\E[%p1%dL, - il1=\E[L, ind=\n, + bel=^G, bold=\E[1m, clear=\E[H\E[2J, cr=\r, cub1=^H, cud1=\n, + dch=\E[%p1%dP, dch1=\E[P, enacs=\E)0, ht=^I, hts=\EH, ind=\n, is2=\E[m\E[?7h\E[4l\E>\E7\E[r\E[?1;3;4;6l\E8, - kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kf1=\E[11~, - kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf13=\E[25~, - kf14=\E[26~, kf15=\E[28~, kf16=\E[29~, kf17=\E[31~, - kf18=\E[32~, kf19=\E[33~, kf2=\E[12~, kf20=\E[34~, - kf3=\E[13~, kf4=\E[14~, kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, - kf8=\E[19~, kf9=\E[20~, kmous=\E[M, meml=\El, memu=\Em, - rc=\E8, rev=\E[7m, ri=\EM, rmacs=^O, rmir=\E[4l, - rmkx=\E[?1l\E>, rmso=\E[m, rmul=\E[m, - rs2=\E[m\E[?7h\E[4l\E>\E7\E[r\E[?1;3;4;6l\E8, sc=\E7, - sgr0=\E[m, smacs=^N, smir=\E[4h, smkx=\E[?1h\E=, - smso=\E[7m, smul=\E[4m, tbc=\E[3g, use=xterm+alt47, - use=vt220+vtedit, use=xterm+kbs, use=vt100+enq, + kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kmous=\E[M, + meml=\El, memu=\Em, rev=\E[7m, ri=\EM, rmacs=^O, rmir=\E[4l, + rmkx=\E[?1l\E>, + rs2=\E[m\E[?7h\E[4l\E>\E7\E[r\E[?1;3;4;6l\E8, + sgr0=\E[m, smacs=^N, smir=\E[4h, smkx=\E[?1h\E=, tbc=\E[3g, + use=xterm+alt47, use=ansi+csr, use=ansi+cup, + use=ansi+erase, use=ansi+idl, use=ansi+local, + use=ansi+sgrso, use=ansi+sgrul, use=vt220+vtedit, + use=xterm+kbs, use=vt100+enq, use=vt220+sfkeys, + use=xterm+r5+fkeys, + xterm-old|antique xterm version, use=xterm-r6, # The monochrome version began as a copy of "xtermm" (from Solaris), and was @@ -4879,40 +4919,31 @@ xterm-mono|monochrome xterm, # The name has been changed and some aliases have been removed. xterm-xf86-v32|xterm terminal emulator (XFree86 3.2 Window System), OTbs, am, bce, km, mir, msgr, xenl, XT, - cols#80, it#8, lines#24, ncv@, + cols#80, lines#24, ncv@, acsc=``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, - bel=^G, bold=\E[1m, cbt=\E[Z, clear=\E[H\E[2J, cr=\r, - csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H, - cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C, - cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, - dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M, - ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K, enacs=\E(B\E)0, - flash=\E[?5h$<100/>\E[?5l, home=\E[H, hpa=\E[%i%p1%dG, - ht=^I, hts=\EH, ich=\E[%p1%d@, ich1=\E[@, il=\E[%p1%dL, - il1=\E[L, ind=\n, + bel=^G, bold=\E[1m, clear=\E[H\E[2J, cr=\r, cub1=^H, cud1=\n, + cup=\E[%i%p1%d;%p2%dH, ech=\E[%p1%dX, ed=\E[J, el=\E[K, + el1=\E[1K, enacs=\E(B\E)0, flash=\E[?5h$<100/>\E[?5l, + home=\E[H, hpa=\E[%i%p1%dG, ind=\n, is2=\E7\E[r\E[m\E[?7h\E[?1;3;4;6l\E[4l\E8\E>, - kbeg=\EOE, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, - kdch1=^?, kend=\EOF, kf1=\E[11~, kf10=\E[21~, kf11=\E[23~, - kf12=\E[24~, kf13=\E[25~, kf14=\E[26~, kf15=\E[28~, - kf16=\E[29~, kf17=\E[31~, kf18=\E[32~, kf19=\E[33~, - kf2=\E[12~, kf20=\E[34~, kf3=\E[13~, kf4=\E[14~, - kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, - kfnd=\E[1~, khome=\EOH, kich1=\E[2~, kmous=\E[M, knp=\E[6~, - kpp=\E[5~, kslt=\E[4~, meml=\El, memu=\Em, rc=\E8, rev=\E[7m, - ri=\EM, rmacs=^O, rmam=\E[?7l, rmir=\E[4l, rmkx=\E[?1l\E>, - rmso=\E[27m, rmul=\E[24m, rs1=^O, - rs2=\E7\E[r\E8\E[m\E[?7h\E[?1;3;4;6l\E[4l\E>, sc=\E7, + kbeg=\EOE, kbs=^?, kdch1=^?, kend=\EOF, kfnd=\E[1~, + kmous=\E[M, kslt=\E[4~, meml=\El, memu=\Em, rev=\E[7m, + ri=\EM, rmacs=^O, rmam=\E[?7l, rmkx=\E[?1l\E>, rmso=\E[27m, + rmul=\E[24m, rs1=^O, + rs2=\E7\E[r\E8\E[m\E[?7h\E[?1;3;4;6l\E[4l\E>, setb=\E[4%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6} %=%t3%e%p1%d%;m, setf=\E[3%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6} %=%t3%e%p1%d%;m, sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5 %;m%?%p9%t\016%e\017%;, - sgr0=\E[m\017, smacs=^N, smam=\E[?7h, smir=\E[4h, - smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, tbc=\E[3g, - vpa=\E[%i%p1%dd, use=xterm+alt47, use=xterm+kbs, - use=vt100+enq, use=ecma+color, use=vt220+cvis, - use=vt220+keypad, + sgr0=\E[m\017, smacs=^N, smam=\E[?7h, smkx=\E[?1h\E=, + smso=\E[7m, smul=\E[4m, vpa=\E[%i%p1%dd, + use=ansi+apparrows, use=ansi+csr, use=ansi+idc, + use=ansi+idl, use=ansi+inittabs, use=ansi+local, + use=xterm+alt47, use=xterm+kbs, use=vt100+enq, + use=xterm+r5+fkeys, use=ecma+color, use=vt220+cvis, + use=vt220+keypad, use=vt220+pcedit, use=vt220+sfkeys, # This is the stock xterm entry supplied with XFree86 3.3, which uses VT100 # codes for F1-F4 except while in VT220 mode. @@ -4938,18 +4969,17 @@ xterm-xf86-v40|xterm terminal emulator (XFree86 4.0 Window System), npc, kDC=\E[3;5~, kEND=\EO5F, kHOM=\EO5H, kIC=\E[2;5~, kLFT=\EO5D, kNXT=\E[6;5~, kPRV=\E[5;5~, kRIT=\EO5C, ka1@, - ka3@, kb2=\EOE, kc1@, kc3@, kcbt=\E[Z, kdch1=\E[3~, kend=\EOF, - kf13=\EO2P, kf14=\EO2Q, kf15=\EO2R, kf16=\EO2S, - kf17=\E[15;2~, kf18=\E[17;2~, kf19=\E[18;2~, - kf20=\E[19;2~, kf21=\E[20;2~, kf22=\E[21;2~, - kf23=\E[23;2~, kf24=\E[24;2~, kf25=\EO5P, kf26=\EO5Q, - kf27=\EO5R, kf28=\EO5S, kf29=\E[15;5~, kf30=\E[17;5~, - kf31=\E[18;5~, kf32=\E[19;5~, kf33=\E[20;5~, - kf34=\E[21;5~, kf35=\E[23;5~, kf36=\E[24;5~, kf37=\EO6P, - kf38=\EO6Q, kf39=\EO6R, kf40=\EO6S, kf41=\E[15;6~, - kf42=\E[17;6~, kf43=\E[18;6~, kf44=\E[19;6~, - kf45=\E[20;6~, kf46=\E[21;6~, kf47=\E[23;6~, - kf48=\E[24;6~, khome=\EOH, + ka3@, kb2=\EOE, kc1@, kc3@, kcbt=\E[Z, kf13=\EO2P, kf14=\EO2Q, + kf15=\EO2R, kf16=\EO2S, kf17=\E[15;2~, kf18=\E[17;2~, + kf19=\E[18;2~, kf20=\E[19;2~, kf21=\E[20;2~, + kf22=\E[21;2~, kf23=\E[23;2~, kf24=\E[24;2~, kf25=\EO5P, + kf26=\EO5Q, kf27=\EO5R, kf28=\EO5S, kf29=\E[15;5~, + kf30=\E[17;5~, kf31=\E[18;5~, kf32=\E[19;5~, + kf33=\E[20;5~, kf34=\E[21;5~, kf35=\E[23;5~, + kf36=\E[24;5~, kf37=\EO6P, kf38=\EO6Q, kf39=\EO6R, + kf40=\EO6S, kf41=\E[15;6~, kf42=\E[17;6~, kf43=\E[18;6~, + kf44=\E[19;6~, kf45=\E[20;6~, kf46=\E[21;6~, + kf47=\E[23;6~, kf48=\E[24;6~, sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m%? %p9%t\016%e\017%;, use=xterm+alt1049, use=xterm-xf86-v333, @@ -4985,14 +5015,12 @@ xterm-xfree86|xterm terminal emulator (XFree86), xterm+nofkeys|building block for xterm fkey-variants, npc, - kcbt=\E[Z, kent=\EOM, nel=\EE, use=ecma+index, - use=ansi+rep, use=ecma+strikeout, use=vt420+lrmm, + kcbt=\E[Z, nel=\EE, use=ecma+index, use=ansi+rep, + use=ecma+strikeout, use=vt420+lrmm, use=xterm+focus, use=xterm+sm+1006, use=xterm+tmux, use=ecma+italics, use=xterm+keypad, use=xterm-basic, xterm-p370|xterm patch #370, - npc, - kcbt=\E[Z, kent=\EOM, nel=\EE, rv=\E\\[41;[1-6][0-9][0-9];0c, xr=\EP>\\|XTerm\\([1-9][0-9]+\\)\E\\\\, use=ecma+index, use=ansi+rep, use=ecma+strikeout, @@ -5008,9 +5036,15 @@ xterm-new|modern xterm terminal emulator, use=xterm-p370, # This fragment is for people who cannot agree on what the backspace key -# should send. +# should send. The ncurses configure script option "--with-xterm-kbs" can +# set it to BS (standard) or DEL (Linux's notion of "vt220"). xterm provides +# either, depending on how the pseudoterminals are configured. xterm+kbs|fragment for backspace key, kbs=^H, + +# Use this fragment for terminals that always use DEL for "backspace". +linux+kbs|fragment for "backspace" key, + kbs=^?, # # This fragment describes as much of XFree86 xterm's "pc-style" function # keys as will fit into terminfo's 60 function keys. @@ -5040,25 +5074,31 @@ xterm+pcfkeys|xterm fragment for PC-style fkeys, # kf21 control f1 = \E[42~ # kf31 shift control f1 = \E[52~ xterm+nopcfkeys|fragment without PC-style fkeys, - kf1=\E[11~, kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, - kf13=\E[25~, kf14=\E[26~, kf15=\E[28~, kf16=\E[29~, - kf17=\E[31~, kf18=\E[32~, kf19=\E[33~, kf2=\E[12~, - kf20=\E[34~, kf21=\E[42~, kf22=\E[43~, kf23=\E[44~, - kf24=\E[45~, kf25=\E[46~, kf26=\E[47~, kf27=\E[48~, - kf28=\E[49~, kf29=\E[50~, kf3=\E[13~, kf30=\E[51~, - kf31=\E[52~, kf32=\E[53~, kf33=\E[54~, kf34=\E[55~, - kf35=\E[56~, kf36=\E[57~, kf37=\E[58~, kf38=\E[59~, - kf39=\E[60~, kf4=\E[14~, kf40=\E[61~, kf41=\E[62~, - kf42=\E[63~, kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, - kf8=\E[19~, kf9=\E[20~, + kf21=\E[42~, kf22=\E[43~, kf23=\E[44~, kf24=\E[45~, + kf25=\E[46~, kf26=\E[47~, kf27=\E[48~, kf28=\E[49~, + kf29=\E[50~, kf30=\E[51~, kf31=\E[52~, kf32=\E[53~, + kf33=\E[54~, kf34=\E[55~, kf35=\E[56~, kf36=\E[57~, + kf37=\E[58~, kf38=\E[59~, kf39=\E[60~, kf40=\E[61~, + kf41=\E[62~, kf42=\E[63~, use=vt220+sfkeys, + use=xterm+r5+fkeys, + +vt100+noapp|fragment with cursor keys in normal mode, + kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, + use=vt100+noapp+pc, xterm+noapp|fragment with cursor keys in normal mode, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kend=\E[F, khome=\E[H, xterm+app|fragment with cursor keys in application mode, - kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kend=\EOF, - khome=\EOH, + kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, + use=xterm+app+pc, + +vt100+noapp+pc|fragment for noapp pc-style home/end, + kend=\E[F, khome=\E[H, + +xterm+app+pc|fragment for app pc-style home/end, + kend=\EOF, khome=\EOH, # # The "PC-style" modifier scheme was introduced in xterm patch #94 (1999/3/27) # and revised in xterm patch #167 (2002/8/24). Some other terminal emulators @@ -5131,8 +5171,7 @@ xterm+pcc0|fragment with modifyCursorKeys:0, # Here are corresponding fragments from xterm patch #216: # xterm+pcf0|fragment with modifyFunctionKeys:0, - kf1=\EOP, kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, - kf13=\EO2P, kf14=\EO2Q, kf15=\EO2R, kf16=\EO2S, + kf1=\EOP, kf13=\EO2P, kf14=\EO2Q, kf15=\EO2R, kf16=\EO2S, kf17=\E[15;2~, kf18=\E[17;2~, kf19=\E[18;2~, kf2=\EOQ, kf20=\E[19;2~, kf21=\E[20;2~, kf22=\E[21;2~, kf23=\E[23;2~, kf24=\E[24;2~, kf25=\EO5P, kf26=\EO5Q, @@ -5143,50 +5182,50 @@ xterm+pcf0|fragment with modifyFunctionKeys:0, kf4=\EOS, kf40=\EO6S, kf41=\E[15;6~, kf42=\E[17;6~, kf43=\E[18;6~, kf44=\E[19;6~, kf45=\E[20;6~, kf46=\E[21;6~, kf47=\E[23;6~, kf48=\E[24;6~, kf49=\EO3P, - kf5=\E[15~, kf50=\EO3Q, kf51=\EO3R, kf52=\EO3S, - kf53=\E[15;3~, kf54=\E[17;3~, kf55=\E[18;3~, - kf56=\E[19;3~, kf57=\E[20;3~, kf58=\E[21;3~, - kf59=\E[23;3~, kf6=\E[17~, kf60=\E[24;3~, kf61=\EO4P, - kf62=\EO4Q, kf63=\EO4R, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, + kf50=\EO3Q, kf51=\EO3R, kf52=\EO3S, kf53=\E[15;3~, + kf54=\E[17;3~, kf55=\E[18;3~, kf56=\E[19;3~, + kf57=\E[20;3~, kf58=\E[21;3~, kf59=\E[23;3~, + kf60=\E[24;3~, kf61=\EO4P, kf62=\EO4Q, kf63=\EO4R, + use=xterm+nopcfkeys, # xterm+pcf2|fragment with modifyFunctionKeys:2, - kf1=\EOP, kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, - kf13=\E[1;2P, kf14=\E[1;2Q, kf15=\E[1;2R, kf16=\E[1;2S, - kf17=\E[15;2~, kf18=\E[17;2~, kf19=\E[18;2~, kf2=\EOQ, - kf20=\E[19;2~, kf21=\E[20;2~, kf22=\E[21;2~, - kf23=\E[23;2~, kf24=\E[24;2~, kf25=\E[1;5P, kf26=\E[1;5Q, - kf27=\E[1;5R, kf28=\E[1;5S, kf29=\E[15;5~, kf3=\EOR, - kf30=\E[17;5~, kf31=\E[18;5~, kf32=\E[19;5~, - kf33=\E[20;5~, kf34=\E[21;5~, kf35=\E[23;5~, - kf36=\E[24;5~, kf37=\E[1;6P, kf38=\E[1;6Q, kf39=\E[1;6R, - kf4=\EOS, kf40=\E[1;6S, kf41=\E[15;6~, kf42=\E[17;6~, - kf43=\E[18;6~, kf44=\E[19;6~, kf45=\E[20;6~, - kf46=\E[21;6~, kf47=\E[23;6~, kf48=\E[24;6~, - kf49=\E[1;3P, kf5=\E[15~, kf50=\E[1;3Q, kf51=\E[1;3R, + kf1=\EOP, kf13=\E[1;2P, kf14=\E[1;2Q, kf15=\E[1;2R, + kf16=\E[1;2S, kf17=\E[15;2~, kf18=\E[17;2~, + kf19=\E[18;2~, kf2=\EOQ, kf20=\E[19;2~, kf21=\E[20;2~, + kf22=\E[21;2~, kf23=\E[23;2~, kf24=\E[24;2~, + kf25=\E[1;5P, kf26=\E[1;5Q, kf27=\E[1;5R, kf28=\E[1;5S, + kf29=\E[15;5~, kf3=\EOR, kf30=\E[17;5~, kf31=\E[18;5~, + kf32=\E[19;5~, kf33=\E[20;5~, kf34=\E[21;5~, + kf35=\E[23;5~, kf36=\E[24;5~, kf37=\E[1;6P, kf38=\E[1;6Q, + kf39=\E[1;6R, kf4=\EOS, kf40=\E[1;6S, kf41=\E[15;6~, + kf42=\E[17;6~, kf43=\E[18;6~, kf44=\E[19;6~, + kf45=\E[20;6~, kf46=\E[21;6~, kf47=\E[23;6~, + kf48=\E[24;6~, kf49=\E[1;3P, kf50=\E[1;3Q, kf51=\E[1;3R, kf52=\E[1;3S, kf53=\E[15;3~, kf54=\E[17;3~, kf55=\E[18;3~, kf56=\E[19;3~, kf57=\E[20;3~, - kf58=\E[21;3~, kf59=\E[23;3~, kf6=\E[17~, kf60=\E[24;3~, - kf61=\E[1;4P, kf62=\E[1;4Q, kf63=\E[1;4R, kf7=\E[18~, - kf8=\E[19~, kf9=\E[20~, + kf58=\E[21;3~, kf59=\E[23;3~, kf60=\E[24;3~, + kf61=\E[1;4P, kf62=\E[1;4Q, kf63=\E[1;4R, + use=xterm+nopcfkeys, # # Chunks from xterm #230: xterm+pce2|fragment with modifyCursorKeys:2 editing-keys, kDC=\E[3;2~, kEND=\E[1;2F, kHOM=\E[1;2H, kIC=\E[2;2~, - kNXT=\E[6;2~, kPRV=\E[5;2~, kich1=\E[2~, knp=\E[6~, - kpp=\E[5~, kDC3=\E[3;3~, kDC4=\E[3;4~, kDC5=\E[3;5~, - kDC6=\E[3;6~, kDC7=\E[3;7~, kEND3=\E[1;3F, kEND4=\E[1;4F, - kEND5=\E[1;5F, kEND6=\E[1;6F, kEND7=\E[1;7F, - kHOM3=\E[1;3H, kHOM4=\E[1;4H, kHOM5=\E[1;5H, - kHOM6=\E[1;6H, kHOM7=\E[1;7H, kIC3=\E[2;3~, kIC4=\E[2;4~, - kIC5=\E[2;5~, kIC6=\E[2;6~, kIC7=\E[2;7~, kNXT3=\E[6;3~, - kNXT4=\E[6;4~, kNXT5=\E[6;5~, kNXT6=\E[6;6~, - kNXT7=\E[6;7~, kPRV3=\E[5;3~, kPRV4=\E[5;4~, - kPRV5=\E[5;5~, kPRV6=\E[5;6~, kPRV7=\E[5;7~, - use=xterm+edit, + kNXT=\E[6;2~, kPRV=\E[5;2~, kDC3=\E[3;3~, kDC4=\E[3;4~, + kDC5=\E[3;5~, kDC6=\E[3;6~, kDC7=\E[3;7~, kEND3=\E[1;3F, + kEND4=\E[1;4F, kEND5=\E[1;5F, kEND6=\E[1;6F, + kEND7=\E[1;7F, kHOM3=\E[1;3H, kHOM4=\E[1;4H, + kHOM5=\E[1;5H, kHOM6=\E[1;6H, kHOM7=\E[1;7H, + kIC3=\E[2;3~, kIC4=\E[2;4~, kIC5=\E[2;5~, kIC6=\E[2;6~, + kIC7=\E[2;7~, kNXT3=\E[6;3~, kNXT4=\E[6;4~, + kNXT5=\E[6;5~, kNXT6=\E[6;6~, kNXT7=\E[6;7~, + kPRV3=\E[5;3~, kPRV4=\E[5;4~, kPRV5=\E[5;5~, + kPRV6=\E[5;6~, kPRV7=\E[5;7~, use=xterm+edit, xterm+edit|fragment for 6-key editing-keypad, - kdch1=\E[3~, kich1=\E[2~, knp=\E[6~, kpp=\E[5~, - use=xterm+pc+edit, + use=xterm+pc+edit, use=vt220+pcedit, + +xterm+decedit|fragment for vt220 6-key editing-keypad, + use=vt220+vtedit, use=xterm+vt+edit, xterm+pc+edit|fragment for pc-style editing keypad, kend=\E[4~, khome=\E[1~, @@ -5274,32 +5313,27 @@ xterm+acs|ISO-2022 alternate character-switching for xterm, # This chunk is used for building the VT220/Sun/PC keyboard variants. xterm-basic|modern xterm terminal emulator - common, OTbs, am, bce, mir, msgr, xenl, AX, XT, - colors#8, cols#80, it#8, lines#24, pairs#64, - acsc=``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, - bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, clear=\E[H\E[2J, - cr=\r, csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H, - cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C, - cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, - dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, dl=\E[%p1%dM, - dl1=\E[M, ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K, + colors#8, cols#80, lines#24, pairs#64, + bel=^G, clear=\E[H\E[2J, cr=\r, cub1=^H, cud1=\n, + cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P, + dim=\E[2m, ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K, flash=\E[?5h$<100/>\E[?5l, home=\E[H, hpa=\E[%i%p1%dG, - ht=^I, hts=\EH, ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L, - ind=\n, invis=\E[8m, is2=\E[!p\E[?3;4l\E[4l\E>, - kmous=\E[M, meml=\El, memu=\Em, op=\E[39;49m, rc=\E8, - rev=\E[7m, ri=\EM, rmacs=\E(B, rmam=\E[?7l, rmir=\E[4l, - rmkx=\E[?1l\E>, rmso=\E[27m, rmul=\E[24m, rs1=\Ec, - rs2=\E[!p\E[?3;4l\E[4l\E>, sc=\E7, setab=\E[4%p1%dm, - setaf=\E[3%p1%dm, + ich=\E[%p1%d@, ind=\n, is2=\E[!p\E[?3;4l\E[4l\E>, + kmous=\E[M, meml=\El, memu=\Em, op=\E[39;49m, ri=\EM, + rmam=\E[?7l, rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[27m, + rmul=\E[24m, rs1=\Ec, rs2=\E[!p\E[?3;4l\E[4l\E>, + setab=\E[4%p1%dm, setaf=\E[3%p1%dm, setb=\E[4%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6} %=%t3%e%p1%d%;m, setf=\E[3%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6} %=%t3%e%p1%d%;m, sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p5%t;2%;%?%p2%t;4%; %?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p7%t;8%;m, - sgr0=\E(B\E[m, smacs=\E(0, smam=\E[?7h, smir=\E[4h, - smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, tbc=\E[3g, - vpa=\E[%i%p1%dd, E3=\E[3J, use=ansi+pp, use=xterm+kbs, - use=xterm+alt+title, use=ansi+enq, use=att610+cvis, + sgr0=\E(B\E[m, smam=\E[?7h, smir=\E[4h, smkx=\E[?1h\E=, + vpa=\E[%i%p1%dd, E3=\E[3J, use=ansi+csr, use=ansi+enq, + use=ansi+idl, use=ansi+inittabs, use=ansi+local, + use=ansi+pp, use=ansi+sgrbold, use=xterm+kbs, + use=xterm+alt+title, use=att610+cvis, use=xterm+acs, use=xterm+meta, xterm+meta|meta mode for xterm, @@ -5551,7 +5585,6 @@ xterm+tmux2|advanced xterm features used in tmux, xterm-8bit|xterm terminal emulator 8-bit controls (X Window System), OTbs, am, bce, km, mc5i, mir, msgr, npc, xenl, AX, colors#8, cols#80, it#8, lines#24, pairs#64, - acsc=``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, bel=^G, blink=\2335m, bold=\2331m, cbt=\233Z, civis=\233?25l, clear=\233H\2332J, cnorm=\233?25l\233?25h, cr=\r, csr=\233%i%p1%d;%p2%dr, @@ -5576,9 +5609,8 @@ xterm-8bit|xterm terminal emulator 8-bit controls (X Window System), kf9=\23320~, khome=\2331~, kich1=\2332~, kmous=\233M, knp=\2336~, kpp=\2335~, mc0=\233i, mc4=\2334i, mc5=\2335i, meml=\El, memu=\Em, op=\23339;49m, rc=\E8, rev=\2337m, - ri=\215, rmacs=\E(B, rmam=\233?7l, rmcup=\233?1049l, - rmir=\2334l, rmkx=\233?1l\E>, rmso=\23327m, rmul=\23324m, - rs1=\Ec, + ri=\215, rmam=\233?7l, rmcup=\233?1049l, rmir=\2334l, + rmkx=\233?1l\E>, rmso=\23327m, rmul=\23324m, rs1=\Ec, rs2=\E[62"p\E\sG\233m\233?7h\E>\E7\233?1;3;4;6l\2334l\233r \E8, sc=\E7, setab=\2334%p1%dm, setaf=\2333%p1%dm, @@ -5588,11 +5620,11 @@ xterm-8bit|xterm terminal emulator 8-bit controls (X Window System), %{6}%=%t3%e%p1%d%;m, sgr=\2330%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%? %p7%t;8%;m%?%p9%t\E(0%e\E(B%;, - sgr0=\2330m\E(B, smacs=\E(0, smam=\233?7h, - smcup=\233?1049h, smir=\2334h, smkx=\233?1h\E=, - smso=\2337m, smul=\2334m, tbc=\2333g, u6=\233[%i%d;%dR, - u8=\233[?%[;0123456789]c, vpa=\233%i%p1%dd, - use=ansi+enq, use=xterm+kbs, + sgr0=\2330m\E(B, smam=\233?7h, smcup=\233?1049h, + smir=\2334h, smkx=\233?1h\E=, smso=\2337m, smul=\2334m, + tbc=\2333g, u6=\233[%i%d;%dR, u8=\233[?%[;0123456789]c, + vpa=\233%i%p1%dd, use=ansi+enq, use=xterm+acs, + use=xterm+kbs, # Note: normally xterm supports modified function-keys as described in # XTerm - "Other" modified keys @@ -5612,24 +5644,23 @@ xterm-8bit|xterm terminal emulator 8-bit controls (X Window System), # -e tack # e.g., "foo sun" if the script is named "foo" -TD xterm-hp|xterm with hpterm function keys, - kclr=\EJ, kcub1=\ED, kcud1=\EB, kcuf1=\EC, kcuu1=\EA, - kdch1=\EP, kend=\EF, khome=\Eh, kich1=\EQ, knp=\ES, kpp=\ET, - use=hp+pfk-cr, use=xterm+nofkeys, use=xterm+nopcfkeys, + kclr=\EJ, kdch1=\EP, kend=\EF, khome=\Eh, kich1=\EQ, knp=\ES, + kpp=\ET, use=hp+pfk-cr, use=vt52+arrows, + use=xterm+nofkeys, use=xterm+nopcfkeys, xterm-sco|xterm with SCO function keys, - kbeg=\E[E, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, - kdch1=^?, kend=\E[F, kf1=\E[M, kf10=\E[V, kf11=\E[W, - kf12=\E[X, kf13=\E[Y, kf14=\E[Z, kf15=\E[a, kf16=\E[b, - kf17=\E[c, kf18=\E[d, kf19=\E[e, kf2=\E[N, kf20=\E[f, - kf21=\E[g, kf22=\E[h, kf23=\E[i, kf24=\E[j, kf25=\E[k, - kf26=\E[l, kf27=\E[m, kf28=\E[n, kf29=\E[o, kf3=\E[O, - kf30=\E[p, kf31=\E[q, kf32=\E[r, kf33=\E[s, kf34=\E[t, - kf35=\E[u, kf36=\E[v, kf37=\E[w, kf38=\E[x, kf39=\E[y, - kf4=\E[P, kf40=\E[z, kf41=\E[@, kf42=\E[[, kf43=\E[\\, - kf44=\E[], kf45=\E[\^, kf46=\E[_, kf47=\E[`, kf48=\E[{, - kf5=\E[Q, kf6=\E[R, kf7=\E[S, kf8=\E[T, kf9=\E[U, khome=\E[H, + kbeg=\E[E, kbs=^?, kdch1=^?, kend=\E[F, kf1=\E[M, kf10=\E[V, + kf11=\E[W, kf12=\E[X, kf13=\E[Y, kf14=\E[Z, kf15=\E[a, + kf16=\E[b, kf17=\E[c, kf18=\E[d, kf19=\E[e, kf2=\E[N, + kf20=\E[f, kf21=\E[g, kf22=\E[h, kf23=\E[i, kf24=\E[j, + kf25=\E[k, kf26=\E[l, kf27=\E[m, kf28=\E[n, kf29=\E[o, + kf3=\E[O, kf30=\E[p, kf31=\E[q, kf32=\E[r, kf33=\E[s, + kf34=\E[t, kf35=\E[u, kf36=\E[v, kf37=\E[w, kf38=\E[x, + kf39=\E[y, kf4=\E[P, kf40=\E[z, kf41=\E[@, kf42=\E[[, + kf43=\E[\\, kf44=\E[], kf45=\E[\^, kf46=\E[_, kf47=\E[`, + kf48=\E[{, kf5=\E[Q, kf6=\E[R, kf7=\E[S, kf8=\E[T, kf9=\E[U, kich1=\E[L, kmous=\E[>M, knp=\E[G, kpp=\E[I, - use=xterm+nofkeys, + use=ansi+arrows, use=xterm+nofkeys, # The xterm-new description has all of the features, but is not completely # compatible with VT220. If you are using a Sun or PC keyboard, set the @@ -5642,26 +5673,17 @@ xterm-sco|xterm with SCO function keys, # xterm-vt220|xterm emulating VT220, npc, - kcbt=\E[Z, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, - kend=\E[4~, kent=\EOM, kf10=\E[21~, kf11=\E[23~, - kf12=\E[24~, kf13=\E[25~, kf14=\E[26~, kf15=\E[28~, - kf16=\E[29~, kf17=\E[31~, kf18=\E[32~, kf19=\E[33~, - kf20=\E[34~, kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, - kf8=\E[19~, kf9=\E[20~, khome=\E[1~, kich1=\E[2~, - kmous=\E[M, knp=\E[6~, kpp=\E[5~, nel=\EE, use=xterm+app, - use=xterm+edit, use=vt220+keypad, use=ecma+italics, - use=ecma+index, use=ansi+rep, use=ecma+strikeout, - use=xterm+sm+1006, use=xterm+tmux, use=xterm+keypad, - use=xterm-basic, + kcbt=\E[Z, kend=\E[4~, khome=\E[1~, kmous=\E[M, nel=\EE, + use=xterm+app, use=xterm+edit, use=vt220+keypad, + use=ecma+italics, use=ecma+index, use=ansi+rep, + use=ecma+strikeout, use=vt220+sfkeys, + use=xterm+r5+fkeys, use=xterm+focus, use=xterm+sm+1006, + use=xterm+tmux, use=xterm+keypad, use=xterm-basic, xterm-vt52|xterm emulating DEC VT52, - cols#80, it#8, lines#24, acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, - bel=^G, clear=\EH\EJ, cr=\r, cub1=\ED, cud1=\EB, cuf1=\EC, - cup=\EY%p1%' '%+%c%p2%' '%+%c, cuu1=\EA, ed=\EJ, el=\EK, - home=\EH, ht=^I, ind=\n, kcub1=\ED, kcud1=\EB, kcuf1=\EC, - kcuu1=\EA, nel=\r\n, ri=\EI, rmacs=\EG, smacs=\EF, - use=xterm+kbs, use=vt52+keypad, + clear=\EH\EJ, rmacs=\EG, smacs=\EF, use=xterm+kbs, + use=vt52+keypad, use=vt52-basic, xterm-noapp|xterm with cursor keys in normal mode, rmcup@, rmkx=\E>, smcup@, smkx=\E=, use=xterm+noapp, @@ -5691,7 +5713,7 @@ xterm-utf8|xterm with no VT100 line-drawing in UTF-8 mode, # c) fsl ends the escape sequence begun by tsl. Printable characters between # those (probably) will appear in the window title. Nonprintable characters # may cause the escape sequence to end with an error. -# d) the BEL (^G or \007) used in the original title-as-statusline came from +# d) the BEL (^G or \007) used in the original title-as-statusline came from # David J. MacKenzie's "pseudo-color" entry in 20 Apr 1995. At that time # xterm used BEL as the string-terminator rather than ST (\E\\). Either # BEL or ST has worked since xterm patch #28 in 1996, but most uses of @@ -5875,9 +5897,9 @@ xterm-x11hilite|X11 mouse with highlight, # "any-event" mouse mode. # # These building blocks incorporate later features as well: -# xterm patch #224 (2007/2/11 added private mode 1004, for enabling/disabling +# xterm patch #224 (2007/2/11) added private mode 1004, for enabling/disabling # focus in/out event reporting. -# xterm patch #277 (2012/01/07 added private mode 1006 +# xterm patch #277 (2012/01/07) added private mode 1006 xterm+sm+1002|xterm any-button mouse, kmous=\E[<, XM=\E[?1006;1004;1002%?%p1%{1}%=%th%el%;, @@ -5892,9 +5914,12 @@ xterm+sm+1003|xterm any-event mouse, xterm-1003|example of xterm any-event mouse, use=xterm+sm+1003, use=xterm, +# Some terminal emulators implement xterm focus in/out, but do it incorrectly, +# interfering with user applications. +# https://lists.gnu.org/archive/html/bug-ncurses/2023-10/msg00087.html xterm+focus|xterm focus-in/out event "keys", XF, - kxIN=\E[I, kxOUT=\E[O, + fd=\E[?1004l, fe=\E[?1004h, kxIN=\E[I, kxOUT=\E[O, # xterm patch #116 (1999/9/25) added Stephen P Wall's changes to support DEC # locator mode. @@ -5932,6 +5957,13 @@ xterm+sm+1006|xterm SGR-mouse (building block), xterm-1006|xterm SGR-mouse, use=xterm+sm+1006, use=xterm, +# Some terminal emulators implement xterm focus in/out, but do it incorrectly, +# interfering with user applications. +# https://lists.gnu.org/archive/html/bug-ncurses/2023-10/msg00087.html +oldxterm+sm+1006|xterm SGR-mouse (building block), + kmous=\E[<, XM=\E[?1006;1000%?%p1%{1}%=%th%el%;, + xm=\E[<%i%p3%d;%p1%d;%p2%d;%?%p4%tM%em%;, + #### KTERM # (kterm: this had extension capabilities ":KJ:TY=ascii:" -- esr) # (kterm should not invoke DEC Graphics as the alternate character set @@ -5942,9 +5974,8 @@ xterm-1006|xterm SGR-mouse, kterm|kterm kanji terminal emulator (X window system), XT, ncv@, - acsc=``aajjkkllmmnnooppqqrrssttuuvvwwxx~~, - csr=\E[%i%p1%d;%p2%dr, enacs=, kmous=\E[M, rc=\E8, - rmacs=\E(B, rmam=\E[?7l, sc=\E7, + acsc=``aajjkkllmmnnooppqqrrssttuuvvwwxx~~, enacs=, + rmacs=\E(B, rmam=\E[?7l, sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;m%?%p9%t\E(0%e \E(B%;, sgr0=\E[m\E(B, smacs=\E(0, smam=\E[?7h, use=x10term+sl, @@ -5961,34 +5992,31 @@ xtermm|xterm terminal emulator (monochrome), OTbs, am, km, mir, msgr, xenl, btns#3, cols#80, it#8, lines#24, acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, - bel=^G, blink@, bold=\E[1m, clear=\E[H\E[2J, cr=\r, - csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=\E[D, - cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C, - cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, - dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, - el=\E[K, el1=\E[1K$<3>, enacs=\E(B\E)0, getm=\E[%p1%dY, - home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@, ich1=\E[@, - il=\E[%p1%dL, il1=\E[L, ind=\n, kbs=^H, kcub1=\EOD, - kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kend=\E[Y, kf0=\EOy, - kf10=\EOY, kf11=\EOZ, kf12=\EOA, kf5=\EOT, kf6=\EOU, - kf7=\EOV, kf8=\EOW, kf9=\EOX, khome=\E[H, kmous=\E[^_, - knp=\E[U, kpp=\E[V, rc=\E8, reqmp=\E[492Z, rev=\E[7m, ri=\EM, - rmacs=^O, rmcup=\E@0\E[?4r, rmso=\E[m, + bel=^G, blink@, bold=\E[1m, clear=\E[H\E[2J, cr=\r, cud1=\n, + dch=\E[%p1%dP, dch1=\E[P, el1=\E[1K$<3>, enacs=\E(B\E)0, + getm=\E[%p1%dY, ht=^I, hts=\EH, ich=\E[%p1%d@, ich1=\E[@, + ind=\n, kend=\E[Y, kf0=\EOy, kf10=\EOY, kf11=\EOZ, kf12=\EOA, + kf5=\EOT, kf6=\EOU, kf7=\EOV, kf8=\EOW, kf9=\EOX, khome=\E[H, + kmous=\E[^_, knp=\E[U, kpp=\E[V, reqmp=\E[492Z, rev=\E[7m, + ri=\EM, rmacs=^O, rmcup=\E@0\E[?4r, rs1=\E>\E[1;3;4;5;6l\E[?7h\E[m\E[r\E[2J\E[H, - rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, sc=\E7, + rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5 %;m%?%p9%t\016%e\017%;, sgr0=\E[m\017, smacs=^N, smcup=\E@0\E[?4s\E[?4h\E@1, - smso=\E[7m, tbc=\E[3g, use=decid+cpr, use=vt100+fnkeys, + tbc=\E[3g, use=ansi+apparrows, use=ansi+csr, + use=ansi+cup, use=ansi+erase, use=ansi+idl, + use=ansi+local, use=ansi+sgrso, use=decid+cpr, + use=vt100+fnkeys, xtermc|xterm terminal emulator (color), - colors#8, ncv#7, pairs#64, - op=\E[100m, setab=\E[4%p1%dm, setaf=\E[3%p1%dm, + ncv#7, + op=\E[100m, setb=\E[4%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6} %=%t3%e%p1%d%;m, setf=\E[3%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6} %=%t3%e%p1%d%;m, - use=xtermm, + use=xtermm, use=klone+color, # From: David J. MacKenzie 20 Apr 1995 # Here's a termcap entry I've been using for xterm_color, which comes @@ -6002,6 +6030,23 @@ xterm-pcolor|xterm with color used for highlights and status line, %t;7;31%;%?%p3%t;7;34%;m, smso=\E[7;31m, smul=\E[4;42m, use=xterm+sl, use=xterm-r6, +# This was mentioned +# http://unix.stackexchange.com/questions/119/colors-in-man-pages +# pointing to +# http://nion.modprobe.de/blog/archives/569-colored-manpages.html +# (blog posting by Nico Golde, June 24 2007) +# archive: +# https://web.archive.org/web/20070921042430/http://nion.modprobe.de/mostlike.txt +# The comment hints where it started, but there are differences: +# Reconstructed via infocmp from file: /usr/share/terminfo/x/xterm-pcolor +mostlike|manpages with color looking like most, + OTbs@, + bold=\E[1m\E[31m, + is2=\E7\E[r\E[m\E[?7h\E[?1;3;4;6l\E[4l\E8\E>, kbs=^H, + meml@, memu@, rev=\E[7m\E[34m, + rs2=\E7\E[r\E8\E[m\E[?7h\E[?1;3;4;6l\E[4l\E>, sgr@, + smso=\E[1;30m\E[47m, smul=\E[32m, TS@, use=xterm-pcolor, + # This describes the capabilities of color_xterm, an xterm variant from # before ECMA-48 color support was folded into the main-line xterm release. # This entry is straight from color_xterm's maintainer. @@ -6012,29 +6057,22 @@ color_xterm|cx|cx100|color_xterm color terminal emulator for X, OTbs, am, km, mir, msgr, xenl, XT, cols#80, it#8, lines#65, ncv@, acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, - bel=^G, bold=\E[1m, clear=\E[H\E[2J, cr=\r, - csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H, - cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C, - cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, - dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, + bel=^G, bold=\E[1m, clear=\E[H\E[2J, cr=\r, cub1=^H, cud1=\n, + cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P, ed=\E[J, el=\E[K, el1=\E[1K, enacs=\E(B\E)0, home=\E[H, ht=^I, - ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L, ind=\n, - is1=\E[r\E[m\E[?7h\E[?4;6l\E[4l, kbs=^H, kcub1=\EOD, - kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kend=\E[8~, kf1=\E[11~, - kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf2=\E[12~, - kf3=\E[13~, kf4=\E[14~, kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, - kf8=\E[19~, kf9=\E[20~, khome=\E[7~, kich1=\E[2~, - kmous=\E[M, knp=\E[6~, kpp=\E[5~, rc=\E8, rev=\E[7m, ri=\EM, - rmacs=^O, rmam=\E[?7l, rmcup=\E>\E[?41;1r, rmir=\E[4l, - rmso=\E[27m, rmul=\E[24m, + ich=\E[%p1%d@, ind=\n, is1=\E[r\E[m\E[?7h\E[?4;6l\E[4l, + kend=\E[8~, khome=\E[7~, kich1=\E[2~, kmous=\E[M, + knp=\E[6~, kpp=\E[5~, rev=\E[7m, ri=\EM, rmacs=^O, + rmam=\E[?7l, rmcup=\E>\E[?41;1r, rmir=\E[4l, rmso=\E[27m, + rmul=\E[24m, rs1=\E(B\017\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l\E<, - sc=\E7, sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5 %;m%?%p9%t\016%e\017%;, sgr0=\E[0m\017, smacs=^N, smam=\E[?7h, smcup=\E[?1;41s\E[?1;41h\E=, smir=\E[4h, smso=\E[7m, - smul=\E[4m, use=decid+cpr, use=ecma+color, - use=vt220+keypad, + smul=\E[4m, use=xterm+r5+fkeys, use=ansi+apparrows, + use=ansi+csr, use=ansi+idl, use=ansi+local, + use=decid+cpr, use=ecma+color, use=vt220+keypad, # The IRAF source has a terminfo using "xterm-r5", but line-drawing does not # work in that case. This entry uses xterm+acs, to work around that problem. @@ -6058,7 +6096,11 @@ color_xterm|cx|cx100|color_xterm color terminal emulator for X, # does nothing with those, even after installing the app-defaults file which # was overlooked by the Debian packager. xgterm|graphic terminal for IRAF, - use=xterm+acs, use=xterm-r5, use=xterm+keypad, + enacs=\E(B\E)0, rmacs=^O, + sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;m%?%p9%t + \016%e\017%;, + sgr0=\E[m\017, smacs=^N, use=xterm+acs, use=xterm-r5, + use=xterm+keypad, # The 'nxterm' distributed with Redhat Linux 5.2 is a slight rehack of # xterm-sb_right-ansi-3d, which implements ANSI colors, but does not support @@ -6083,8 +6125,7 @@ xterm-color|nxterm|generic color xterm, # with their Sun keyboard labels instead. # From: Simon J. Gerraty 10 Jan 1996 xterm-sun|xterm with sunFunctionKeys true, - kb2=\E[218z, kcpy=\E[197z, kcub1=\EOD, kcud1=\EOB, - kcuf1=\EOC, kcuu1=\EOA, kdch1=\E[3z, kend=\E[220z, + kb2=\E[218z, kcpy=\E[197z, kdch1=\E[3z, kend=\E[220z, kent=\EOM, kf1=\E[224z, kf10=\E[233z, kf11=\E[192z, kf12=\E[193z, kf13=\E[194z, kf14=\E[195z, kf15=\E[196z, kf17=\E[198z, kf18=\E[199z, kf19=\E[200z, kf2=\E[225z, @@ -6095,16 +6136,18 @@ xterm-sun|xterm with sunFunctionKeys true, kf5=\E[228z, kf6=\E[229z, kf7=\E[230z, kf8=\E[231z, kf9=\E[232z, kfnd=\E[200z, khlp=\E[196z, khome=\E[214z, kich1=\E[2z, knp=\E[222z, kpp=\E[216z, kund=\E[195z, - use=xterm+nofkeys, use=xterm+nopcfkeys, + use=xterm+kbs, use=ansi+apparrows, use=xterm+nofkeys, + use=xterm+nopcfkeys, + xterms-sun|small (80x24) xterm with sunFunctionKeys true, - cols#80, lines#24, use=xterm-sun, + use=xterm-sun, #### GNOME (VTE) # this describes the alpha-version of GNOME terminal shipped with Redhat 6.0 gnome-rh62|GNOME terminal, bce, kdch1=^?, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, - use=xterm-color, + use=linux+kbs, use=xterm-color, # GNOME Terminal 1.4.0.4 (Redhat 7.2) # @@ -6126,12 +6169,11 @@ gnome-rh62|GNOME terminal, # it hangs in tack after running function-keys test. gnome-rh72|GNOME Terminal in RedHat 7, bce, km@, - kdch1=\E[3~, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, - rmam=\E[?7l, + kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, rmam=\E[?7l, sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;m%?%p9%t\016%e \017%;, sgr0=\E[0m\017, smam=\E[?7h, tbc@, use=vt220+cvis, - use=xterm-color, + use=linux+kbs, use=xterm-color, # GNOME Terminal 2.0.1 (Redhat 8.0) # @@ -6148,18 +6190,17 @@ gnome-rh72|GNOME Terminal in RedHat 7, # that it implements kcbt. gnome-rh80|GNOME Terminal in RedHat 8, bce@, msgr@, - ech=\E[%p1%dX, flash=\E[?5h$<100/>\E[?5l, kbs=^?, - kcbt=\E^I, op=\E[39;49m, use=gnome-rh72, + ech=\E[%p1%dX, flash=\E[?5h$<100/>\E[?5l, kcbt=\E^I, + op=\E[39;49m, use=gnome-rh72, # GNOME Terminal 2.2.1 (Redhat 9.0) # # bce and msgr are repaired. gnome-rh90|GNOME Terminal in RedHat 9, bce, msgr, XT, - hpa=\E[%i%p1%dG, kDC=\E[3;2~, kLFT=\EO2D, kRIT=\EO2C, - kb2=\E[E, kcbt=\E[Z, kend=\EOF, khome=\EOH, tbc=\E[3g, - vpa=\E[%i%p1%dd, use=xterm+pcf0, use=xterm+pcfkeys, - use=gnome-rh80, + hpa=\E[%i%p1%dG, kLFT=\EO2D, kRIT=\EO2C, kb2=\E[E, + kcbt=\E[Z, tbc=\E[3g, vpa=\E[%i%p1%dd, use=xterm+pcf0, + use=xterm+pcfkeys, use=gnome-rh80, # GNOME Terminal 2.14.2 (Fedora Core 5) # Ed Catmur notes that gnome-terminal has recognized soft-reset since May 2002. @@ -6228,10 +6269,9 @@ gnome-2012|GNOME Terminal 3.6.0, # The parameters with \EO (SS3) are technically an error, since SS3 should have # no parameters. This appears to be rote copying based on xterm+pcc0. vte+pcfkeys|VTE's variation on xterm+pcfkeys (building block), - kf1=\EOP, kf13=\EO1;2P, kf14=\EO1;2Q, kf15=\EO1;2R, - kf16=\EO1;2S, kf2=\EOQ, kf25=\EO1;5P, kf26=\EO1;5Q, - kf27=\EO1;5R, kf28=\EO1;5S, kf3=\EOR, kf37=\EO1;6P, - kf38=\EO1;6Q, kf39=\EO1;6R, kf4=\EOS, kf40=\EO1;6S, + kf13=\EO1;2P, kf14=\EO1;2Q, kf15=\EO1;2R, kf16=\EO1;2S, + kf25=\EO1;5P, kf26=\EO1;5Q, kf27=\EO1;5R, kf28=\EO1;5S, + kf37=\EO1;6P, kf38=\EO1;6Q, kf39=\EO1;6R, kf40=\EO1;6S, kf49=\EO1;3P, kf50=\EO1;3Q, kf51=\EO1;3R, kf52=\EO1;3S, kf61=\EO1;4P, kf62=\EO1;4Q, kf63=\EO1;4R, use=xterm+pcfkeys, @@ -6265,13 +6305,13 @@ vte-2014|VTE 0.35.1, ncv@, cbt=\E[Z, el1=\E[1K, flash=\E[?5h$<100/>\E[?5l, ich=\E[%p1%d@, kent=\EOM, use=ecma+index, - use=xterm+sm+1006, use=xterm+pcfkeys, use=vte-2012, + use=oldxterm+sm+1006, use=xterm+pcfkeys, use=vte-2012, use=bracketed+paste, # As of January 2018, this was the most recent release, # e.g., with gnome-terminal 3.26.2 vte-2017|VTE 0.50.2, - use=ecma+strikeout, use=vte-2014, + E3=\E[3J, use=ecma+strikeout, use=vte-2014, # VTE 0.51.2 and gnome-terminal 3.28.2 copied a feature from KovId's TTY # late in 2017 for changing the appearance of underlines, which was @@ -6326,10 +6366,11 @@ xfce|Xfce Terminal, hterm|Chromium hterm, npc, U8#1, - kcbt=\E[Z, kent=\EOM, nel=\EE, use=xterm+osc104, - use=ecma+index, use=ansi+rep, use=ecma+strikeout, - use=vt420+lrmm, use=xterm+sm+1006, use=xterm+tmux, - use=ecma+italics, use=xterm+pcfkeys, use=xterm-basic, + kcbt=\E[Z, kent=\EOM, nel=\EE, use=linux+kbs, + use=xterm+osc104, use=ecma+index, use=ansi+rep, + use=ecma+strikeout, use=vt420+lrmm, use=xterm+focus, + use=xterm+sm+1006, use=xterm+tmux, use=ecma+italics, + use=xterm+pcfkeys, use=xterm-basic, use=bracketed+paste, hterm-256color|Chromium hterm with xterm 256-colors, use=xterm+256color2, use=hterm, @@ -6355,29 +6396,27 @@ hterm-256color|Chromium hterm with xterm 256-colors, # trimmed to eliminate those. Also, since it is a slightly older version of # VTE, it lacks a few more features (again, trimmed). termite|VTE-based terminal, - am, ccc, km, mir, msgr, npc, xenl, - cols#80, it#8, lines#24, ncv@, + am, km, mir, msgr, npc, xenl, + cols#80, lines#24, ncv@, acsc=++\,\,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxy yzz{{||}}~~, - bel=^G, bold=\E[1m, cbt=\E[Z, clear=\E[H\E[2J, cr=\r, - csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H, - cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C, - cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, - dch=\E[%p1%dP, ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K, - flash=\E[?5h$<100/>\E[?5l, home=\E[H, hpa=\E[%i%p1%dG, - ht=^I, hts=\EH, ind=\n, invis=\E[8m, + bel=^G, bold=\E[1m, clear=\E[H\E[2J, cr=\r, cub1=^H, cud1=\n, + cup=\E[%i%p1%d;%p2%dH, ech=\E[%p1%dX, ed=\E[J, el=\E[K, + el1=\E[1K, flash=\E[?5h$<100/>\E[?5l, home=\E[H, + hpa=\E[%i%p1%dG, ind=\n, invis=\E[8m, is2=\E[!p\E[?3;4l\E[4l\E>, kb2=\EOE, kbs=^?, kcbt=\E[Z, - kent=\EOM, kmous=\E[M, rc=\E8, rev=\E[7m, ri=\EM, rmacs=\E(B, + kent=\EOM, kmous=\E[M, rev=\E[7m, ri=\EM, rmacs=\E(B, rmam=\E[?7l, rmkx=\E[?1l\E>, rmso=\E[27m, rmul=\E[24m, - rs1=\Ec, rs2=\E[!p\E[?3;4l\E[4l\E>, sc=\E7, + rs1=\Ec, rs2=\E[!p\E[?3;4l\E[4l\E>, sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%| %t;7%;%?%p7%t;8%;m, sgr0=\E(B\E[m, smacs=\E(0, smam=\E[?7h, smkx=\E[?1h\E=, - smso=\E[7m, smul=\E[4m, tbc=\E[3g, vpa=\E[%i%p1%dd, - use=xterm+alt1049, use=ecma+index, use=ansi+idc, - use=ansi+idl, use=ansi+enq, use=ecma+italics, - use=xterm+256color, use=ecma+color, use=vt220+cvis, - use=xterm+pcfkeys, use=xterm+sl-twm, + smso=\E[7m, smul=\E[4m, vpa=\E[%i%p1%dd, use=ansi+csr, + use=ansi+enq, use=ansi+idc, use=ansi+idl, + use=ansi+inittabs, use=ecma+index, use=ecma+italics, + use=ansi+local, use=xterm+alt1049, use=xterm+256color, + use=ecma+color, use=vt220+cvis, use=xterm+pcfkeys, + use=xterm+sl-twm, #### Other GNOME # Multi-GNOME-Terminal 1.6.2 @@ -6392,7 +6431,8 @@ mgt|Multi GNOME Terminal, # or not is debatable). kvt|KDE terminal, bce, km@, - kdch1=^?, kend=\E[F, khome=\E[H, use=xterm-color, + kdch1=^?, kend=\E[F, khome=\E[H, use=linux+kbs, + use=xterm-color, # Konsole 1.0.1 (2001/11/25) # (formerly known as kvt) @@ -6450,17 +6490,17 @@ kvt|KDE terminal, konsole-base|KDE console window (common), bce, km@, npc, XT, ncv@, - blink=\E[5m, dim=\E[2m, ech=\E[%p1%dX, - flash=\E[?5h$<100/>\E[?5l, hpa=\E[%i%p1%dG, - invis=\E[8m, kbs=^?, kdch1=\E[3~, kend=\E[4~, kf1@, kf10@, - kf11@, kf12@, kf13@, kf14@, kf15@, kf16@, kf17@, kf18@, kf19@, kf2@, - kf20@, kf3@, kf4@, kf5@, kf6@, kf7@, kf8@, kf9@, kfnd@, khome=\E[1~, - kslt@, rmam=\E[?7l, rmso=\E[27m, rmul=\E[24m, rs1=\Ec, + ech=\E[%p1%dX, flash=\E[?5h$<100/>\E[?5l, + hpa=\E[%i%p1%dG, kend=\E[4~, kf1@, kf10@, kf11@, kf12@, kf13@, + kf14@, kf15@, kf16@, kf17@, kf18@, kf19@, kf2@, kf20@, kf3@, kf4@, + kf5@, kf6@, kf7@, kf8@, kf9@, kfnd@, khome=\E[1~, kslt@, + rmam=\E[?7l, rmso=\E[27m, rmul=\E[24m, rs1=\Ec, rs2=\E7\E[r\E8\E[m\E[?7h\E[?1;3;4;6l\E[4l\E>\E[?1000l\E[?25h, sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%? %p5%t;2%;%?%p7%t;8%;m%?%p9%t\016%e\017%;, sgr0=\E[0m\017, smam=\E[?7h, vpa=\E[%i%p1%dd, - use=ecma+index, use=xterm+sm+1006, use=ecma+strikeout, + use=ansi+sgrdim, use=ecma+index, use=xterm+focus, + use=xterm+sm+1006, use=ecma+strikeout, use=ecma+italics, use=ecma+color, use=xterm-r6, use=vt220+cvis, use=bracketed+paste, use=report+version, @@ -6549,11 +6589,10 @@ konsole+pcfkeys|konsole subset of xterm+pcfkeys, # it is still useful for deriving the other entries, since the developer # provided function-keys based on xterm. konsole-vt100|KDE console window with VT100 (sic) keyboard, - kbs=^?, kdch1=\E[3~, kend=\E[F, kf1=\E[11~, kf10=\E[21~, - kf11=\E[23~, kf12=\E[24~, kf13@, kf14@, kf15@, kf16@, kf17@, - kf18@, kf19@, kf2=\E[12~, kf20@, kf3=\E[13~, kf4=\E[14~, - kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, - khome=\E[H, use=konsole-base, + kend=\E[F, kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf13@, + kf14@, kf15@, kf16@, kf17@, kf18@, kf19@, kf20@, kf6=\E[17~, + kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, khome=\E[H, + use=xterm+r5+lockeys, use=konsole-base, # Obsolete: vt420pc.keytab was added in June 2000, dropped from the install in # September 2008 and removed in June 2016. The developer who removed it stated @@ -6646,31 +6685,28 @@ mlterm3|multi lingual terminal emulator 3.x, # mlterm2|multi lingual terminal emulator 2.x, am, eslok, km, mc5i, mir, msgr, npc, xenl, XT, - colors#8, cols#80, it#8, lines#24, pairs#64, + colors#8, cols#80, lines#24, pairs#64, acsc=00``aaffgghhjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, - bel=^G, bold=\E[1m, cbt=\E[Z, clear=\E[H\E[2J, cr=\r, - csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H, - cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C, - cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, - dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M, + bel=^G, bold=\E[1m, clear=\E[H\E[2J, cr=\r, cub1=^H, cud1=\n, + cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P, ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K, enacs=, - home=\E[H, hpa=\E[%i%p1%dG, ht=^I, hts=\EH, ich=\E[%p1%d@, - il=\E[%p1%dL, il1=\E[L, ind=\n, + home=\E[H, hpa=\E[%i%p1%dG, ich=\E[%p1%d@, ind=\n, is2=\E7\E[r\E[m\E[?7h\E[?1;3;4;6l\E[4l\E8\E>, kbs=^?, - kcbt=\E[Z, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, - kend=\EOF, kent=\EOM, khome=\EOH, kind=\EO1;2B, kmous=\E[M, - kri=\EO1;2A, mc0=\E[i, nel=\EE, op=\E[39;49m, rc=\E8, - rev=\E[7m, ri=\EM, rmacs=\E(B, rmam=\E[?7l, rmir=\E[4l, + kcbt=\E[Z, kend=\EOF, kent=\EOM, kind=\EO1;2B, kmous=\E[M, + kri=\EO1;2A, mc0=\E[i, nel=\EE, op=\E[39;49m, rev=\E[7m, + ri=\EM, rmacs=\E(B, rmam=\E[?7l, rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[27m, rmul=\E[24m, rs1=\Ec, rs2=\E7\E[r\E8\E[m\E[?7h\E[?1;3;4;6l\E[4l\E>\E[?1000l, - sc=\E7, setab=\E[4%p1%dm, setaf=\E[3%p1%dm, + setab=\E[4%p1%dm, setaf=\E[3%p1%dm, sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;m%?%p9%t\E(0%e \E(B%;, sgr0=\E[m\E(B, smacs=\E(0, smam=\E[?7h, smir=\E[4h, - smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, tbc=\E[3g, - u8=\E[?1;2c, vpa=\E[%i%p1%dd, use=ansi+enq, - use=vt220+vtedit, use=xterm+alt1049, use=ecma+index, - use=mlterm+pcfkeys, use=vt220+cvis, use=xterm+r6f2, + smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, u8=\E[?1;2c, + vpa=\E[%i%p1%dd, use=ansi+apparrows, use=ansi+csr, + use=ansi+enq, use=ansi+idl, use=ansi+inittabs, + use=ansi+local, use=vt220+vtedit, use=xterm+alt1049, + use=ecma+index, use=mlterm+pcfkeys, use=vt220+cvis, + use=xterm+r6f2, # The insert/delete/home/end keys do not respond to modifiers because mlterm # looks in its termcap to decide which string to send. If it used terminfo @@ -6712,29 +6748,25 @@ mlterm-256color|mlterm 3.0 with xterm 256-colors, # removed dch/dch1 because they are inconsistent with bce/ech -TD # remove km as per tack test -TD rxvt-basic|rxvt terminal base (X Window System), - OTbs, am, bce, eo, mir, msgr, xenl, xon, XT, - cols#80, it#8, lines#24, - acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, - bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[2J, cr=\r, - csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H, - cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C, - cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, - dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K, el1=\E[1K, - enacs=\E(B\E)0, flash=\E[?5h$<100/>\E[?5l, home=\E[H, - ht=^I, hts=\EH, ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L, - ind=\n, is1=\E[?47l\E=\E[?1l, - is2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l, kbs=^H, - kcbt=\E[Z, kmous=\E[M, rc=\E8, rev=\E[7m, ri=\EM, rmacs=^O, - rmir=\E[4l, rmkx=\E>, rmso=\E[27m, rmul=\E[24m, + OTbs, bce, eo, mir, xenl, xon, XT, + blink=\E[5m, bold=\E[1m, clear=\E[H\E[2J, cub1=^H, cud1=\n, + cup=\E[%i%p1%d;%p2%dH, ed=\E[J, el=\E[K, el1=\E[1K, + flash=\E[?5h$<100/>\E[?5l, ich=\E[%p1%d@, + is1=\E[?47l\E=\E[?1l, + is2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l, + kcbt=\E[Z, kmous=\E[M, rev=\E[7m, ri=\EM, rmir=\E[4l, + rmkx=\E>, rmso=\E[27m, rmul=\E[24m, rs1=\E>\E[1;3;4;5;6l\E[?7h\E[m\E[r\E[2J\E[H, rs2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l\E>\E[?1000l\E[? 25h, - s0ds=\E(B, s1ds=\E(0, sc=\E7, + s0ds=\E(B, s1ds=\E(0, sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m%? %p9%t\016%e\017%;, - sgr0=\E[0m\017, smacs=^N, smir=\E[4h, smkx=\E=, smso=\E[7m, - smul=\E[4m, tbc=\E[3g, use=xterm+alt47, use=vt100+enq, + sgr0=\E[0m\017, smir=\E[4h, smkx=\E=, smso=\E[7m, + smul=\E[4m, use=ansi+csr, use=ansi+idl, use=ansi+local, + use=xterm+alt47, use=vt100+enq, use=vt100+4bsd, use=rxvt+pcfkeys, use=vt220+cvis, use=vt220+keypad, + # Key Codes from rxvt reference: # # Note: Shift + F1-F10 generates F11-F20 @@ -6818,26 +6850,21 @@ rxvt-basic|rxvt terminal base (X Window System), rxvt+pcfkeys|rxvt fragment for PC-style fkeys, kDC=\E[3$, kEND=\E[8$, kHOM=\E[7$, kIC=\E[2$, kLFT=\E[d, kNXT=\E[6$, kPRV=\E[5$, kRIT=\E[c, kcub1=\E[D, kcud1=\E[B, - kcuf1=\E[C, kcuu1=\E[A, kel=\E[8\^, kend=\E[8~, kf1=\E[11~, - kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf13=\E[25~, - kf14=\E[26~, kf15=\E[28~, kf16=\E[29~, kf17=\E[31~, - kf18=\E[32~, kf19=\E[33~, kf2=\E[12~, kf20=\E[34~, + kcuf1=\E[C, kcuu1=\E[A, kel=\E[8\^, kend=\E[8~, kf21=\E[23$, kf22=\E[24$, kf23=\E[11\^, kf24=\E[12\^, kf25=\E[13\^, kf26=\E[14\^, kf27=\E[15\^, kf28=\E[17\^, - kf29=\E[18\^, kf3=\E[13~, kf30=\E[19\^, kf31=\E[20\^, - kf32=\E[21\^, kf33=\E[23\^, kf34=\E[24\^, kf35=\E[25\^, - kf36=\E[26\^, kf37=\E[28\^, kf38=\E[29\^, kf39=\E[31\^, - kf4=\E[14~, kf40=\E[32\^, kf41=\E[33\^, kf42=\E[34\^, - kf43=\E[23@, kf44=\E[24@, kf5=\E[15~, kf6=\E[17~, - kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, khome=\E[7~, kind=\E[a, - kri=\E[b, kDC5=\E[3\^, kDC6=\E[3@, kDN=\E[b, kDN5=\EOb, - kEND5=\E[8\^, kEND6=\E[8@, kHOM5=\E[7\^, kHOM6=\E[7@, - kIC5=\E[2\^, kIC6=\E[2@, kLFT5=\EOd, kNXT5=\E[6\^, - kNXT6=\E[6@, kPRV5=\E[5\^, kPRV6=\E[5@, kRIT5=\EOc, - kUP=\E[a, kUP5=\EOa, use=vt220+vtedit, + kf29=\E[18\^, kf30=\E[19\^, kf31=\E[20\^, kf32=\E[21\^, + kf33=\E[23\^, kf34=\E[24\^, kf35=\E[25\^, kf36=\E[26\^, + kf37=\E[28\^, kf38=\E[29\^, kf39=\E[31\^, kf40=\E[32\^, + kf41=\E[33\^, kf42=\E[34\^, kf43=\E[23@, kf44=\E[24@, + khome=\E[7~, kind=\E[a, kri=\E[b, kDC5=\E[3\^, kDC6=\E[3@, + kDN=\E[b, kDN5=\EOb, kEND5=\E[8\^, kEND6=\E[8@, + kHOM5=\E[7\^, kHOM6=\E[7@, kIC5=\E[2\^, kIC6=\E[2@, + kLFT5=\EOd, kNXT5=\E[6\^, kNXT6=\E[6@, kPRV5=\E[5\^, + kPRV6=\E[5@, kRIT5=\EOc, kUP=\E[a, kUP5=\EOa, + use=vt220+vtedit, use=xterm+nopcfkeys, # rxvt was originally "xvt", first announced in April 1993: -# http://www.krsaborio.net/linux-desktops/research/1993/0416.html #------------------------------------------------------------------------------ # Article: 567 of comp.os.linux.announce # Path: pavo.csi.cam.ac.uk!warwick!uknet!pipex!uunet!zaphod.mps.ohio-state.edu! @@ -6934,7 +6961,6 @@ rxvt-16color|rxvt with 16 colors like aixterm, # (not in rxvt, but not documented by mrxvt) but not CSI 19 t. # + none of the "dynamic colors" (OSC colors) scripts work. mrxvt|multitabbed rxvt, - XT, kEND=\E[8;2~, kHOM=\E[7;2~, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kend=\E[8~, khome=\E[7~, kEND3=\E[8;3~, kEND4=\E[8;4~, kEND5=\E[8;5~, @@ -6958,32 +6984,27 @@ mrxvt-256color|multitabbed rxvt with 256 colors, # remove nonworking flash -TD # remove km as per tack test -TD Eterm|Eterm-color|Eterm with xterm-style color support (X Window System), - am, bce, bw, eo, mc5i, mir, msgr, xenl, xon, XT, - btns#5, cols#80, it#8, lines#24, lm#0, ncv@, - acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, - bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[2J, cr=\r, - csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H, - cud=\E[%p1%dB, cud1=\E[B, cuf=\E[%p1%dC, cuf1=\E[C, - cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, - dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M, + bce, bw, eo, mc5i, mir, xenl, xon, XT, + btns#5, lm#0, ncv@, + blink=\E[5m, bold=\E[1m, clear=\E[H\E[2J, cub1=^H, + cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P, ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K, enacs=\E)0, - home=\E[H, hpa=\E[%i%p1%dG, ht=^I, hts=\EH, ich=\E[%p1%d@, - il=\E[%p1%dL, il1=\E[L, ind=\n, is1=\E[?47l\E>\E[?1l, + hpa=\E[%i%p1%dG, ich=\E[%p1%d@, is1=\E[?47l\E>\E[?1l, is2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l, kNXT@, - kPRV@, ka1=\E[7~, ka3=\E[5~, kb2=\EOu, kbeg=\EOu, kbs=^H, - kc1=\E[8~, kc3=\E[6~, kent=\EOM, khlp=\E[28~, kmous=\E[M, - mc4=\E[4i, mc5=\E[5i, rc=\E8, rev=\E[7m, ri=\EM, rmacs=^O, - rmam=\E[?7l, rmir=\E[4l, rmkx=, rmso=\E[27m, rmul=\E[24m, + kPRV@, ka1=\E[7~, ka3=\E[5~, kb2=\EOu, kbeg=\EOu, kc1=\E[8~, + kc3=\E[6~, kent=\EOM, khlp=\E[28~, kmous=\E[M, mc4=\E[4i, + mc5=\E[5i, rev=\E[7m, ri=\EM, rmam=\E[?7l, rmir=\E[4l, rmkx=, + rmso=\E[27m, rmul=\E[24m, rs1=\E>\E[1;3;4;5;6l\E[?7h\E[m\E[r\E[2J\E[H, rs2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l\E>\E[?1000l\E[? 25h, - sc=\E7, sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5 %;m%?%p9%t\016%e\017%;, - sgr0=\E[m\017, smacs=^N, smam=\E[?7h, smir=\E[4h, smkx=, - smso=\E[7m, smul=\E[4m, tbc=\E[3g, vpa=\E[%i%p1%dd, - use=xterm+alt47, use=vt100+enq, use=rxvt+pcfkeys, - use=ecma+color, use=vt220+cvis, + sgr0=\E[m\017, smam=\E[?7h, smir=\E[4h, smkx=, smso=\E[7m, + smul=\E[4m, vpa=\E[%i%p1%dd, use=ansi+csr, use=ansi+idl, + use=ansi+local, use=xterm+alt47, use=vt100+enq, + use=rxvt+pcfkeys, use=ecma+color, use=vt100+4bsd, + use=vt220+cvis, Eterm-256color|Eterm with xterm 256-colors, use=xterm+256color, use=Eterm, @@ -7003,8 +7024,7 @@ aterm|AfterStep terminal, # vttest shows several problems with keyboard, cursor-movements. # see also https://invisible-island.net/xterm/xterm.faq.html#bug_xiterm xiterm|internationalized terminal emulator for X, - km@, - kbs=^?, kdch1=\E[3~, use=klone+color, use=xterm-r6, + km@, use=klone+color, use=xterm-r6, #### HPTERM @@ -7046,7 +7066,7 @@ hpterm-color|HP X11 terminal emulator with color, # This article does not cover the HP 46020A keyboard that is used by the Model # 217 and 237 computers. For information on this keyboard read the article, # "The Series 300 ITE as System Console" found in the manual, HP-UX Concepts -# and Tutorials, Vol. 7. +# and Tutorials, Vol. 7. # # Possibly: # http://bitsavers.trailing-edge.com/pdf/hp/9000_hpux/1986/97089-90042_198608_HP-UX_Concepts_and_Tutorials.pdf @@ -7130,28 +7150,27 @@ emu-220|Emu-220 (vt200-7bit mode), cols#80, it#8, lines#24, vt#200, acsc=aaffggjjkkllmmnnooqqssttuuvvwwxx~~, bel=^G, blink=\E[0;5m, bold=\E[0;1m, clear=\E[2J\E[H, cr=\r, - csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=\E[1D, - cud=\E[%p1%dB, cud1=\E[1B, cuf=\E[%p1%dC, cuf1=\E[1C, - cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[1A, - dch=\E[%p1%dP, dch1=\E[1P, dl=\E[%p1%dM, dl1=\E[1M, - ed=\E[0J, el=\E[0K, el1=\E[1K, enacs=\E)0, home=\E[H, ht=^I, - hts=\EH, if=/usr/share/tabset/vt300, il=\E[%p1%dL, - il1=\E[1L, ind=\ED, is2=\E>\E[?1l\E[?3l\E[4l\E[?7h, - kbs=^H, kcmd=\E[29~, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, + cub1=\E[1D, cud1=\E[1B, cuf1=\E[1C, + cup=\E[%i%p1%d;%p2%dH, cuu1=\E[1A, dch=\E[%p1%dP, + dch1=\E[1P, dl=\E[%p1%dM, dl1=\E[1M, ed=\E[0J, el=\E[0K, + el1=\E[1K, enacs=\E)0, home=\E[H, ht=^I, hts=\EH, + if=/usr/share/tabset/vt300, il=\E[%p1%dL, il1=\E[1L, + ind=\ED, is2=\E>\E[?1l\E[?3l\E[4l\E[?7h, kbs=^H, + kcmd=\E[29~, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kent=\EOM, kf0=\EOp, kf1=\EOq, kf10=\EOl, kf11=\EOm, kf12=\EOn, kf13=\EOP, kf14=\EOQ, kf15=\EOR, kf16=\EOS, kf2=\EOr, kf26=\E[17~, kf27=\E[18~, kf28=\E[19~, kf29=\E[20~, kf3=\EOs, kf30=\E[21~, kf34=\E[26~, kf37=\E[31~, kf38=\E[32~, kf39=\E[33~, kf4=\EOt, kf40=\E[34~, kf5=\EOu, kf6=\EOv, kf7=\EOw, kf8=\EOx, - kf9=\EOy, khlp=\E[28~, rc=\E8, rev=\E[0;7m, ri=\EM, rmacs=^O, + kf9=\EOy, khlp=\E[28~, rev=\E[0;7m, ri=\EM, rmacs=^O, rmcup=\E>, rmkx=\E>, rmso=\E[m, rmul=\E[m, - rs2=\E[4l\E[34l\E[?1l\E[?3l\E[?5l\E[?7h, sc=\E7, + rs2=\E[4l\E[34l\E[?1l\E[?3l\E[?5l\E[?7h, sgr=\E[0%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p5%t; 2%;%?%p6%t;1%;%?%p7%t;8%;m%?%p9%t\016%e\017%;, sgr0=\E[m\017, smacs=^N, smcup=\E[?1l\E=, smkx=\E=, - smso=\E[0;7m, smul=\E[0;4m, tbc=\E[3g, use=vt220+vtedit, - use=vt220+cvis, + smso=\E[0;7m, smul=\E[0;4m, tbc=\E[3g, use=ansi+csr, + use=ansi+local, use=vt220+vtedit, use=vt220+cvis, #### MVTERM # A commercial product, Reportedly a version of Xterm with an OPEN LOOK UI, @@ -7165,26 +7184,20 @@ emu-220|Emu-220 (vt200-7bit mode), # apparently implements alternate screen like xterm # does not use padding, of course. mvterm|vv100|SwitchTerm aka mvTERM, - am, km, mir, msgr, xenl, xon, - colors#8, cols#80, it#8, lines#24, pairs#64, - acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, - bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[2J, cr=\r, - csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H, - cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C, - cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, - dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, - el=\E[K, el1=\E[1K$<3>, enacs=\E(B\E)0, home=\E[H, ht=^I, - hts=\EH, ich=\E[%p1%d@, ich1=\E[@, il=\E[%p1%dL, il1=\E[L, - ind=\n, kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, - kcuu1=\EOA, kf0=\EOy, kf10=\EOx, kf5=\EOt, kf6=\EOu, - kf7=\EOv, kf8=\EOl, kf9=\EOw, op=\E[100m, rc=\E8, rev=\E[7m, - ri=\EM, rmacs=^O, rmkx=\E[?1l\E>, rmso=\E[m, rmul=\E[m, + km, mir, xenl, xon, + colors#8, pairs#64, + blink=\E[5m, bold=\E[1m, clear=\E[H\E[2J, cub1=^H, cud1=\n, + cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P, ed=\E[J, + el=\E[K, ich=\E[%p1%d@, ich1=\E[@, kcub1=\EOD, kcud1=\EOB, + kcuf1=\EOC, kcuu1=\EOA, op=\E[100m, rev=\E[7m, ri=\EM, + rmkx=\E[?1l\E>, rmso=\E[m, rmul=\E[m, rs2=\E>\E[1;3;4;5;6l\E[?7h\E[100m\E[m\E[r\E[2J\E[H, - sc=\E7, setab=\E[4%p1%dm, setaf=\E[3%p1%dm, + setab=\E[4%p1%dm, setaf=\E[3%p1%dm, sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5 %;m%?%p9%t\016%e\017%;, - sgr0=\E[m\017, smacs=^N, smkx=\E[?1h\E=, smso=\E[7m, - smul=\E[4m, tbc=\E[3g, use=xterm+alt47, use=vt100+fnkeys, + sgr0=\E[m\017, smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, + use=ansi+csr, use=ansi+idl, use=ansi+local, + use=xterm+alt47, use=vt100+fnkeys, use=vt100+4bsd, use=x10term+sl, #### MTERM @@ -7196,19 +7209,16 @@ mterm-ansi|ANSI emulation, am, bw, mir, msgr, it#8, acsc=``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, - bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[J, cr=\r, - cub=\E[%p1%dD, cub1=\E[D, cud=\E[%p1%dB, cud1=\E[B, - cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, - cuu=\E[%p1%dA, cuu1=\E[A, dch=\E[%p1%dP, dch1=\E[P, - dim=\E[2m, dl=\E[%p1%dM, dl1=\E[M, ech=\E[%p1%dX, ed=\E[J, - el=\E[K, home=\E[H, hpa=\E[%i%p1%d`, ht=^I, ich1=, - il=\E[%p1%dL, il1=\E[L, ind=\E[S, invis=\E[8m, - is2=\E)0\017, kbs=^H, nel=\EE, rev=\E[7m, ri=\E[T, rmacs=^O, - rmir=\E[4l, rmso=\E[27m, rmul=\E[24m, + bel=^G, cr=\r, cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, + dim=\E[2m, ech=\E[%p1%dX, home=\E[H, hpa=\E[%i%p1%d`, + ht=^I, ich1=, ind=\E[S, is2=\E)0\017, kbs=^H, nel=\EE, ri=\E[T, + rmacs=^O, rmso=\E[27m, rmul=\E[24m, sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%? %p5%t;2%;%?%p7%t;8%;m%?%p9%t\016%e\017%;, - sgr0=\E[m\017, smacs=^N, smir=\E[4h, smso=\E[7m, - smul=\E[4m, vpa=\E[%i%p1%dd, use=ecma+index, + sgr0=\E[m\017, smacs=^N, vpa=\E[%i%p1%dd, use=ansi+erase, + use=ansi+idc1, use=ansi+idl, use=ansi+local, + use=ansi+sgrbold, use=ecma+index, + # mterm normally sets $TERM to "mterm" mterm|mouse-sun|Der Mouse term, am, bw, mir, @@ -7224,29 +7234,21 @@ decansi|ANSI emulation with DEC compatibility hacks, am, mir, msgr, xenl, colors#8, it#8, pairs#64, acsc=``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, - bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[J, cr=\r, - csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=\E[D, - cud=\E[%p1%dB, cud1=\E[B, cuf=\E[%p1%dC, cuf1=\E[C, - cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, - dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, dl=\E[%p1%dM, - dl1=\E[M, ech=\E[%p1%dX, ed=\E[J, el=\E[K, enacs=\E(B\E)0, - home=\E[H, hpa=\E[%i%p1%d`, ht=^I, ich1=, il=\E[%p1%dL, - il1=\E[L, ind=\E[S, invis=\E[8m, is2=\E)0\E[r\017, kbs=^H, - kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kf1=\E[11~, - kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf13=\E[25~, - kf14=\E[26~, kf15=\E[28~, kf16=\E[29~, kf17=\E[31~, - kf18=\E[32~, kf19=\E[33~, kf2=\E[12~, kf20=\E[34~, - kf3=\E[13~, kf4=\E[14~, kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, - kf8=\E[19~, kf9=\E[20~, nel=\EE, op=\E[0m, rc=\E8, rev=\E[7m, - ri=\E[T, rmacs=^O, rmam=\E[?7l, rmir=\E[4l, rmkx=\E[?1l\E>, - rmso=\E[27m, rmul=\E[24m, sc=\E7, setab=\E[4%p1%dm, - setaf=\E[3%p1%dm, + bel=^G, cr=\r, cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, + dim=\E[2m, ech=\E[%p1%dX, enacs=\E(B\E)0, home=\E[H, + hpa=\E[%i%p1%d`, ht=^I, ich1=, ind=\E[S, is2=\E)0\E[r\017, + kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, + nel=\EE, op=\E[0m, ri=\E[T, rmacs=^O, rmam=\E[?7l, + rmkx=\E[?1l\E>, rmso=\E[27m, rmul=\E[24m, + setab=\E[4%p1%dm, setaf=\E[3%p1%dm, sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%? %p5%t;2%;%?%p7%t;8%;m%?%p9%t\016%e\017%;, - sgr0=\E[m\017, smacs=^N, smam=\E[?7h, smir=\E[4h, - smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, vpa=\E[%i%p1%dd, - use=ansi+cpr, use=vt220+vtedit, use=ecma+index, - use=vt220+cvis, + sgr0=\E[m\017, smacs=^N, smam=\E[?7h, smkx=\E[?1h\E=, + vpa=\E[%i%p1%dd, use=ansi+cpr, use=ansi+csr, + use=ansi+erase, use=ansi+idc1, use=ansi+idl, + use=ansi+local, use=ansi+sgrbold, use=vt220+vtedit, + use=ecma+index, use=vt220+cvis, use=vt220+sfkeys, + use=xterm+r5+fkeys, #### VWM # http://vwm.sourceforge.net/ @@ -7258,22 +7260,19 @@ vwmterm|VWM terminal, am, bce, ccc, mir, msgr, npc, xenl, xon, colors#8, pairs#64, acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, - bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[J, cr=\r, - cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\E[B, - cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, - cuu=\E[%p1%dA, cuu1=\E[A, cvvis=\E[?25h, dim=\E[2m, - ed=\E[J, el=\E[K, home=\E[H, il1=\E[L, ind=\n, invis=\E[8m, + bel=^G, bold=\E[1m, cr=\r, cub1=^H, cup=\E[%i%p1%d;%p2%dH, + cvvis=\E[?25h, dim=\E[2m, home=\E[H, il1=\E[L, ind=\n, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, - kdch1=\E[3~, kend=\E[4~, kf1=\E[[A, kf10=\E[21~, - kf11=\E[22~, kf12=\E[23~, kf2=\E[[B, kf3=\E[[C, kf4=\E[[D, - kf5=\E[[E, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, - khome=\E[1~, knp=\E[6~, kpp=\E[5~, rev=\E[7m, rmacs=\E[10m, + kdch1=\E[3~, kend=\E[4~, kf11=\E[22~, kf12=\E[23~, + khome=\E[1~, knp=\E[6~, kpp=\E[5~, rmacs=\E[10m, rmam=\E[?7l, rs1=\E[H\E[J\E[m\Ec, setab=\E[4%p1%dm, setaf=\E[3%p1%dm, sgr=\E[0;10%?%p1%t;3%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p5 %t;2%;%?%p6%t;1%;%?%p7%t;8%;%?%p9%t;11%;m, sgr0=\E[0;10m, smacs=\E[11m, smam=\E[?7h, smso=\E[3m, - smul=\E[4m, use=vt220+cvis, use=xterm+alt1049, + smul=\E[4m, use=ansi+erase, use=ansi+local, use=ansi+sgr, + use=linux+lockeys, use=vt220+cvis, use=vt220+ufkeys, + use=xterm+alt1049, #### MGR # @@ -7304,16 +7303,34 @@ mgr-sun|Mgr window with Sun keyboard, kopn=\E[198z, kpp=\E[216z, kund=\E[195z, use=mgr, mgr-linux|Mgr window with Linux keyboard, ka1=\E[H, ka3=\E[5~, kb2=\E[G, kc1=\E[Y, kc3=\E[6~, - kdch1=\E[3~, kend=\E[4~, kf0=\E[[J, kf1=\E[[A, kf10=\E[21~, - kf11=\E[23~, kf12=\E[24~, kf2=\E[[B, kf3=\E[[C, kf4=\E[[D, - kf5=\E[[E, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, - khome=\E[1~, knp=\E[6~, kpp=\E[5~, use=mgr, + kdch1=\E[3~, kend=\E[4~, kf0=\E[[J, khome=\E[1~, knp=\E[6~, + kpp=\E[5~, use=linux+lockeys, use=vt220+ufkeys, use=mgr, #### SIMPLETERM # st.suckless.org st|stterm|aka simpleterm, - use=st-0.8, + use=st-0.8.5, + +# Reviewed 0.9.2 (Debian testing package "stterm"): +# Inspected source, saw nothing to change in terminfo. +# +# Reviewed 0.8.5 (Debian stable package "stterm"): +# In tack, +# sends nothing for control- and alt-modifiers to function-keys +# does not support application-mode for numeric keypad +# In vttest, +# identifies as a VT102 +# SRM, DECTCEM and ECH work, but not DECSCA +# incomplete DECSCUSR, shapes work but no blinking cursor +# SD and SL work, but not SL or SR +# supports normal, button-event and any-event mouse +# focus events are unreliable +# Other: +# supports xterm OSC 12, but not 112, so Cs applies but not Cr +# OSC allows ST \E\\ in addition to \007 +st-0.8.5|simpleterm 0.8.5, + Cs=\E]12;%p1%s\007, use=ansi+rep, use=st-0.8, # Reviewed 0.8.2: # In tack, @@ -7328,14 +7345,12 @@ st|stterm|aka simpleterm, # This entry discards the ccc/initc capabilities from st-0.7 because they # belong in st-256color. st-0.8|simpleterm 0.8, - dim=\E[2m, kcbt@, kent@, oc=\E]104\007, - sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%| - %t;7%;%?%p4%t;5%;%?%p5%t;2%;%?%p7%t;8%;m, - Ms=\E]52;%p1%s;%p2%s\007, kDN3=\E[1;3B, kDN5=\E[1;5B, - kLFT3=\E[1;3D, kLFT5=\E[1;5D, kNXT3=\E[6;3~, - kNXT5=\E[6;5~, kPRV3=\E[5;3~, kPRV5=\E[5;5~, - kRIT3=\E[1;3C, kRIT5=\E[1;5C, kUP3=\E[1;3A, kUP5=\E[1;5A, - use=ecma+strikeout, use=st-0.6, + kcbt@, kent@, oc=\E]104\007, Ms=\E]52;%p1%s;%p2%s\007, + kDN3=\E[1;3B, kDN5=\E[1;5B, kLFT3=\E[1;3D, kLFT5=\E[1;5D, + kNXT3=\E[6;3~, kNXT5=\E[6;5~, kPRV3=\E[5;3~, + kPRV5=\E[5;5~, kRIT3=\E[1;3C, kRIT5=\E[1;5C, + kUP3=\E[1;3A, kUP5=\E[1;5A, use=ecma+strikeout, + use=st-0.6, # Reviewed 0.7: # dim is intermittent, sometimes works, sometimes does not @@ -7347,18 +7362,12 @@ st-0.8|simpleterm 0.8, # provided with the source is incorrect, since Se/Ss are mis-coded # as booleans rather than strings. st-0.7|simpleterm 0.7, - ccc, - dim=\E[2m, - initc=\E]4;%p1%d;rgb:%p2%{255}%*%{1000}%/%2.2X/%p3%{255}%* - %{1000}%/%2.2X/%p4%{255}%*%{1000}%/%2.2X\E\\, - kcbt@, kent@, oc=\E]104\007, - sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%| - %t;7%;%?%p4%t;5%;%?%p5%t;2%;%?%p7%t;8%;m, - Ms=\E]52;%p1%s;%p2%s\007, kDN3=\E[1;3B, kDN5=\E[1;5B, - kLFT3=\E[1;3D, kLFT5=\E[1;5D, kNXT3=\E[6;3~, - kNXT5=\E[6;5~, kPRV3=\E[5;3~, kPRV5=\E[5;5~, - kRIT3=\E[1;3C, kRIT5=\E[1;5C, kUP3=\E[1;3A, kUP5=\E[1;5A, - use=ecma+strikeout, use=st-0.6, + kcbt@, kent@, Ms=\E]52;%p1%s;%p2%s\007, kDN3=\E[1;3B, + kDN5=\E[1;5B, kLFT3=\E[1;3D, kLFT5=\E[1;5D, + kNXT3=\E[6;3~, kNXT5=\E[6;5~, kPRV3=\E[5;3~, + kPRV5=\E[5;5~, kRIT3=\E[1;3C, kRIT5=\E[1;5C, + kUP3=\E[1;3A, kUP5=\E[1;5A, use=ecma+strikeout, + use=st-0.6, use=xterm+256color, # st-0.4.1 # @@ -7389,60 +7398,40 @@ st-0.7|simpleterm 0.7, # still has no function keys past kf36 (no combinations of modifiers) # no application keypad mode, e.g, kent. st-0.6|simpleterm 0.6, - am, bce, hs, mir, msgr, npc, xenl, XT, - colors#8, cols#80, it#8, lines#24, pairs#64, + bce, mir, npc, xenl, XT, + colors#8, pairs#64, acsc=+C\,D-A.B0E``aaffgghFiGjjkkllmmnnooppqqrrssttuuvvwwxxyy zz{{||}}~~, - bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, clear=\E[H\E[2J, - cr=\r, csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H, - cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C, - cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, - dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, dl=\E[%p1%dM, - dl1=\E[M, ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K, - enacs=\E)0, flash=\E[?5h$<100/>\E[?5l, fsl=^G, home=\E[H, - hpa=\E[%i%p1%dG, ht=^I, hts=\EH, ich=\E[%p1%d@, - il=\E[%p1%dL, il1=\E[L, ind=\n, invis=\E[8m, - is2=\E[4l\E>\E[?1034l, kDC=\E[3;2~, kEND=\E[1;2F, - kHOM=\E[1;2H, kIC=\E[2;2~, kLFT=\E[1;2D, kNXT=\E[6;2~, - kPRV=\E[5;2~, kRIT=\E[1;2C, ka1=\E[1~, ka3=\E[5~, kb2=\EOu, - kbs=^?, kc1=\E[4~, kc3=\E[6~, kcbt=\E[Z, kclr=\E[3;5~, - kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, - kdl1=\E[3;2~, ked=\E[1;5F, kel=\E[1;2F, kent=\EOM, - kf1=\EOP, kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, - kf13=\E[1;2P, kf14=\E[1;2Q, kf15=\E[1;2R, kf16=\E[1;2S, - kf17=\E[15;2~, kf18=\E[17;2~, kf19=\E[18;2~, kf2=\EOQ, - kf20=\E[19;2~, kf21=\E[20;2~, kf22=\E[21;2~, - kf23=\E[23;2~, kf24=\E[24;2~, kf25=\E[1;5P, kf26=\E[1;5Q, - kf27=\E[1;5R, kf28=\E[1;5S, kf29=\E[15;5~, kf3=\EOR, - kf30=\E[17;5~, kf31=\E[18;5~, kf32=\E[19;5~, - kf33=\E[20;5~, kf34=\E[21;5~, kf35=\E[23;5~, - kf36=\E[24;5~, kf37=\E[1;6P, kf38=\E[1;6Q, kf39=\E[1;6R, - kf4=\EOS, kf40=\E[1;6S, kf41=\E[15;6~, kf42=\E[17;6~, - kf43=\E[18;6~, kf44=\E[19;6~, kf45=\E[20;6~, - kf46=\E[21;6~, kf47=\E[23;6~, kf48=\E[24;6~, - kf49=\E[1;3P, kf5=\E[15~, kf50=\E[1;3Q, kf51=\E[1;3R, - kf52=\E[1;3S, kf53=\E[15;3~, kf54=\E[17;3~, - kf55=\E[18;3~, kf56=\E[19;3~, kf57=\E[20;3~, - kf58=\E[21;3~, kf59=\E[23;3~, kf6=\E[17~, kf60=\E[24;3~, - kf61=\E[1;4P, kf62=\E[1;4Q, kf63=\E[1;4R, kf7=\E[18~, - kf8=\E[19~, kf9=\E[20~, khome=\E[1~, kil1=\E[2;5~, - kind=\E[1;2B, kmous=\E[M, kri=\E[1;2A, krmir=\E[2;2~, - mc0=\E[i, mc4=\E[4i, mc5=\E[5i, op=\E[39;49m, rc=\E8, - rev=\E[7m, ri=\EM, rmacs=\E(B, rmir=\E[4l, rmkx=\E[?1l\E>, - rmso=\E[27m, rmul=\E[24m, rs1=\Ec, rs2=\E[4l\E>\E[?1034l, - sc=\E7, setab=\E[4%p1%dm, setaf=\E[3%p1%dm, + clear=\E[H\E[2J, cub1=^H, cud1=\n, cup=\E[%i%p1%d;%p2%dH, + dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, ech=\E[%p1%dX, + ed=\E[J, el=\E[K, el1=\E[1K, enacs=\E)0, + flash=\E[?5h$<100/>\E[?5l, hpa=\E[%i%p1%dG, + ich=\E[%p1%d@, is2=\E[4l\E>\E[?1034l, kDC=\E[3;2~, + kEND=\E[1;2F, kHOM=\E[1;2H, kIC=\E[2;2~, kLFT=\E[1;2D, + kNXT=\E[6;2~, kPRV=\E[5;2~, kRIT=\E[1;2C, ka1=\E[1~, + ka3=\E[5~, kb2=\EOu, kbs=^?, kc1=\E[4~, kc3=\E[6~, kcbt=\E[Z, + kclr=\E[3;5~, kdl1=\E[3;2~, ked=\E[1;5F, kel=\E[1;2F, + khome=\E[1~, kil1=\E[2;5~, kind=\E[1;2B, kmous=\E[M, + kri=\E[1;2A, krmir=\E[2;2~, mc0=\E[i, mc4=\E[4i, mc5=\E[5i, + op=\E[39;49m, ri=\EM, rmacs=\E(B, rmir=\E[4l, + rmkx=\E[?1l\E>, rmso=\E[27m, rmul=\E[24m, rs1=\Ec, + rs2=\E[4l\E>\E[?1034l, setab=\E[4%p1%dm, + setaf=\E[3%p1%dm, setb=\E[4%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6} %=%t3%e%p1%d%;m, setf=\E[3%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6} %=%t3%e%p1%d%;m, sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%| %t;7%;%?%p4%t;5%;%?%p5%t;2%;%?%p7%t;8%;m, - sgr0=\E[0m, smacs=\E(0, smir=\E[4h, smkx=\E[?1h\E=, - smso=\E[7m, smul=\E[4m, tbc=\E[3g, u8=\E[?1;2c, - vpa=\E[%i%p1%dd, Se=\E[2 q, Ss=\E[%p1%d q, use=ansi+enq, + smacs=\E(0, smir=\E[4h, smkx=\E[?1h\E=, u8=\E[?1;2c, + vpa=\E[%i%p1%dd, Se=\E[2 q, Ss=\E[%p1%d q, + use=ansi+apparrows, use=ansi+csr, use=ansi+enq, + use=ansi+idl, use=ansi+inittabs, use=ansi+local, + use=ansi+sgrbold, use=vt100+4bsd, use=vt100+pfkeys, use=vt220+pcedit, use=ecma+index, use=xterm+alt1049, use=vt220+cvis, use=xterm+sl, use=ecma+italics, use=ecma+strikeout, use=bracketed+paste, + use=xterm+pcf2, # # st-0.1.1 # @@ -7464,25 +7453,22 @@ st-0.6|simpleterm 0.6, # Fixes: add eo and xenl per tack, remove nonworking cbt, hts and tbc, invis simpleterm|old-st|simpleterm 0.1.1, am, eo, mir, msgr, ul, xenl, - colors#8, cols#80, it#8, lines#24, ncv#3, pairs#64, - acsc=``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, - bel=^G, bold=\E[1m, clear=\E[H\E[2J, cr=\r, - csr=\E[%i%p1%d;%p2%dr, cub1=^H, cud=\E[%p1%dB, cud1=\n, - cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, - cuu=\E[%p1%dA, cuu1=\E[A, dch1=\E[P, dl=\E[%p1%dM, - dl1=\E[M, ed=\E[J, el=\E[K, home=\E[H, hpa=\E[%i%p1%dG, - ht=^I, ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L, ind=\n, kbs=^?, - kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, - kdch1=\E[3~, kend=\E[4~, kf1=\EOP, kf10=\E[21~, - kf11=\E[23~, kf12=\E[24~, kf2=\EOQ, kf3=\EOR, kf4=\EOS, - kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, - khome=\E[1~, knp=\E[6~, kpp=\E[5~, op=\E[37;40m, rc=\E8, - rev=\E[7m, rmacs=\E(B, rmso=\E[m, rmul=\E[m, sc=\E7, - setab=\E[4%p1%dm, setaf=\E[3%p1%dm, + cols#80, it#8, lines#24, + bel=^G, bold=\E[1m, clear=\E[H\E[2J, cr=\r, cub1=^H, + cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C, + cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, + dch1=\E[P, ed=\E[J, el=\E[K, home=\E[H, hpa=\E[%i%p1%dG, + ht=^I, ich=\E[%p1%d@, ind=\n, kbs=^?, kdch1=\E[3~, + kend=\E[4~, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, + khome=\E[1~, knp=\E[6~, kpp=\E[5~, rev=\E[7m, rmso=\E[m, + rmul=\E[m, sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%| %t;7%;m, - sgr0=\E[0m, smacs=\E(0, smso=\E[7m, smul=\E[4m, - use=vt220+cvis, use=ecma+index, + sgr0=\E[0m, smso=\E[7m, smul=\E[4m, use=ansi+arrows, + use=ansi+csr, use=ansi+idl, use=vt220+cvis, + use=ecma+index, use=klone+color, use=xterm+r5+fkeys, + use=xterm+acs, + st-16color|stterm-16color|simpleterm with 16-colors, use=ibm+16color, use=st, # Tested with st 0.8.2 @@ -7572,29 +7558,26 @@ terminator|Terminator no line wrap, bce, eo, mir, msgr, xenl, xon, cols#80, it#8, lines#24, lm#0, acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, - bold=\E[1m, clear=\E[H\E[2J, cr=\r, - csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H, - cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C, - cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, - dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, dl=\E[%p1%dM, - dl1=\E[M, ed=\E[J, el=\E[K, el1=\E[1K, enacs=\E(B\E)0, - flash=^G, home=\E[H, hpa=\E[%i%p1%dG, ht=^I, hts=\EH, - il=\E[%p1%dL, il1=\E[L, ind=\n, is1=\E[?47l\E=\E[?1l, + bold=\E[1m, clear=\E[H\E[2J, cr=\r, cub1=^H, cud1=\n, + cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P, + dim=\E[2m, ed=\E[J, el=\E[K, el1=\E[1K, enacs=\E(B\E)0, + flash=^G, home=\E[H, hpa=\E[%i%p1%dG, ht=^I, hts=\EH, ind=\n, + is1=\E[?47l\E=\E[?1l, is2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l, kbs=^?, - kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf1=\EOP, - kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf13=\E[25~, - kf14=\E[26~, kf15=\E[28~, kf16=\E[29~, kf2=\EOQ, kf3=\EOR, - kf4=\EOS, kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, - kf9=\E[20~, rc=\E8, rev=\E[7m, ri=\EM, rmacs=\E(B, - rmir=\E[4l, rmso=\E[27m, rmul=\E[24m, rs1=\Ec, - rs2=\E[!p\E[?3;4l\E[4l\E>, s0ds=\E(B, s1ds=\E(0, sc=\E7, + kf1=\EOP, kf13=\E[25~, kf14=\E[26~, kf15=\E[28~, + kf16=\E[29~, kf2=\EOQ, kf3=\EOR, kf4=\EOS, khome=\E[1~, + rev=\E[7m, ri=\EM, rmacs=\E(B, rmir=\E[4l, rmso=\E[27m, + rmul=\E[24m, rs1=\Ec, rs2=\E[!p\E[?3;4l\E[4l\E>, + s0ds=\E(B, s1ds=\E(0, sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p5%t;2%;%?%p1%p3%|%t;7 %;m%?%p9%t\E(0%e\E(B%;, sgr0=\E[m\E(B, smacs=\E(0, smir=\E[4h, smso=\E[7m, - smul=\E[4m, tbc=\E[3g, tsl=\E]2;, vpa=\E[%i%p1%dd, - use=ansi+enq, use=vt220+pcedit, use=ecma+italics, - use=ecma+index, use=xterm+256setaf, use=xterm+sl-twm, - use=xterm+alt1049, use=vt220+cvis, use=bracketed+paste, + smul=\E[4m, tbc=\E[3g, vpa=\E[%i%p1%dd, use=ansi+arrows, + use=ansi+csr, use=ansi+enq, use=ansi+idl, use=ansi+local, + use=bracketed+paste, use=ecma+italics, use=ecma+index, + use=vt220+cvis, use=vt220+pcedit, use=xterm+r5+fkeys, + use=xterm+256setaf, use=xterm+sl-twm, + use=xterm+alt1049, #### TERMINOLOGY # https://www.enlightenment.org/about-terminology @@ -7649,9 +7632,7 @@ terminator|Terminator no line wrap, terminology-0.6.1|EFL-based terminal emulator (0.6.1), mc5i@, blink@, ed@, el@, el1@, invis=\E[8m, kLFT=\E[1;2D, - kRIT=\E[1;2C, kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, - kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, - kind=\E[1;2B, kri=\E[1;2A, + kRIT=\E[1;2C, kind=\E[1;2B, kri=\E[1;2A, sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p7%t;8 %;m%?%p9%t\016%e\017%;$<2>, vpa=\E[%i%p1%dd, kDC3=\E[3;3~, kDC4=\E[3;4~, @@ -7695,7 +7676,7 @@ terminology-1.0.0|EFL-based terminal emulator (1.0.0), # italics and crossed-out text work # no meta mode # vttest - -# DA1 says this is a VT420 with with 132 columns, NRCS, horizontal scrolling +# DA1 says this is a VT420 with 132 columns, NRCS, horizontal scrolling # DA2 says this is a VT510, version 33.7 # NRCS does not work, program hangs in the locking shift test. # some of the VT420 rectangle operations work @@ -7705,10 +7686,11 @@ terminology-1.0.0|EFL-based terminal emulator (1.0.0), terminology-1.8.1|EFL-based terminal emulator (1.8.1), km@, cvvis@, flash@, initc@, kcbt=\E[Z, rmm@, smm@, Ms@, - use=ecma+index, use=xterm+256setaf, use=ansi+rep, - use=ecma+strikeout, use=xterm+sm+1006, - use=xterm+pcfkeys, use=xterm+tmux, use=vt220+cvis, - use=ecma+italics, use=xterm-basic, use=report+version, + use=linux+kbs, use=ecma+index, use=xterm+256setaf, + use=ansi+rep, use=ecma+strikeout, use=xterm+focus, + use=xterm+sm+1006, use=xterm+pcfkeys, use=xterm+tmux, + use=vt220+cvis, use=ecma+italics, use=xterm-basic, + use=report+version, terminology|EFL-based terminal emulator, use=terminology-1.8.1, @@ -7776,12 +7758,19 @@ alacritty-direct|alacritty with direct color indexing, # added xterm+sl-twm in 0.3.3 -TD alacritty+common|base fragment for alacritty, km@, npc, - kb2=\EOE, kbs=^?, kcbt=\E[Z, kent=\EOM, Se=\E[0 q, - Smulx=\E[4:%p1%dm, use=ecma+index, use=xterm+sm+1006, - use=xterm-basic, use=xterm+app, use=ansi+rep, - use=xterm+tmux, use=ecma+strikeout, use=xterm+sl-twm, - use=ecma+italics, use=xterm+pce2, use=xterm+pcc2, - use=xterm+pcf2, use=bracketed+paste, + kb2=\EOE, kcbt=\E[Z, kent=\EOM, Se=\E[0 q, + Smulx=\E[4:%p1%dm, use=ecma+index, use=xterm+focus, + use=xterm+sm+1006, use=xterm-basic, use=xterm+app, + use=ansi+rep, use=xterm+tmux, use=ecma+strikeout, + use=xterm+sl-twm, use=ecma+italics, use=xterm+pce2, + use=xterm+pcc2, use=xterm+pcf2, use=bracketed+paste, + +# https://github.com/raphamorim/rio +# derived from alacritty +rio|fork of alacritty, + use=alacritty, +rio-direct|fork of alacritty, + use=alacritty-direct, #### Kitty # https://github.com/kovidgoyal/kitty @@ -7901,40 +7890,25 @@ kitty-direct|KovId's TTY using direct colors, oc=\E]104\007, use=xterm+direct2, use=kitty+common, kitty+common|KovId's TTY common properties, am, mc5i, mir, msgr, npc, xenl, - cols#80, it#8, lines#24, + cols#80, lines#24, acsc=++\,\,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxy yzz{{||}}~~, - bel=^G, bold=\E[1m, cbt=\E[Z, clear=\E[H\E[2J, cr=\r, - csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H, - cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C, - cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, - dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, dl=\E[%p1%dM, - dl1=\E[M, ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K, + bel=^G, bold=\E[1m, clear=\E[H\E[2J, cr=\r, cub1=^H, cud1=\n, + cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P, + dim=\E[2m, ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K, flash=\E[?5h$<100/>\E[?5l, home=\E[H, hpa=\E[%i%p1%dG, - ht=^I, hts=\EH, ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L, - ind=\n, kBEG=\E[1;2E, kbeg=\EOE, kbs=^?, kcbt=\E[Z, - kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, - kdch1=\E[3~, kend=\EOF, kf1=\EOP, kf10=\E[21~, kf11=\E[23~, - kf12=\E[24~, kf13=\E[1;2P, kf14=\E[1;2Q, kf15=\E[1;2R, - kf16=\E[1;2S, kf17=\E[15;2~, kf18=\E[17;2~, - kf19=\E[18;2~, kf2=\EOQ, kf20=\E[19;2~, kf21=\E[20;2~, - kf22=\E[21;2~, kf23=\E[23;2~, kf24=\E[24;2~, - kf25=\E[1;5P, kf26=\E[1;5Q, kf27=\E[1;5R, kf28=\E[1;5S, - kf29=\E[15;5~, kf3=\EOR, kf30=\E[17;5~, kf31=\E[18;5~, - kf32=\E[19;5~, kf33=\E[20;5~, kf34=\E[21;5~, - kf35=\E[23;5~, kf36=\E[24;5~, kf4=\EOS, kf5=\E[15~, - kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, khome=\EOH, - kich1=\E[2~, kind=\E[1;2B, knp=\E[6~, kpp=\E[5~, - kri=\E[1;2A, op=\E[39;49m, rc=\E8, rev=\E[7m, ri=\EM, - rmacs=\E(B, rmam=\E[?7l, rmir=\E[4l, rmkx=\E[?1l, - rmso=\E[27m, rmul=\E[24m, rs1=\E]\E\\\Ec, sc=\E7, + ich=\E[%p1%d@, ind=\n, kBEG=\E[1;2E, kbeg=\EOE, kbs=^?, + kcbt=\E[Z, op=\E[39;49m, rev=\E[7m, ri=\EM, rmacs=\E(B, + rmam=\E[?7l, rmir=\E[4l, rmkx=\E[?1l, rmso=\E[27m, + rmul=\E[24m, rs1=\E]\E\\\Ec, sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p5%t;2%;%?%p2%t;4%; %?%p1%p3%|%t;7%;m, sgr0=\E(B\E[m, smacs=\E(0, smam=\E[?7h, smir=\E[4h, - smkx=\E[?1h, smso=\E[7m, smul=\E[4m, tbc=\E[3g, - vpa=\E[%i%p1%dd, Smulx=\E[4:%p1%dm, use=ansi+enq, - use=ansi+rep, use=xterm+sm+1006, use=ecma+index, - use=xterm+pcfkeys, use=xterm+sl-twm, + smkx=\E[?1h, smso=\E[7m, smul=\E[4m, vpa=\E[%i%p1%dd, + Smulx=\E[4:%p1%dm, use=ansi+csr, use=ansi+enq, + use=ansi+idl, use=ansi+inittabs, use=ansi+local, + use=ansi+rep, use=xterm+focus, use=xterm+sm+1006, + use=ecma+index, use=xterm+pcfkeys, use=xterm+sl-twm, use=ecma+strikeout, use=ecma+italics, use=xterm+alt1049, use=att610+cvis, use=xterm+tmux, use=bracketed+paste, use=report+version, @@ -7947,7 +7921,15 @@ kitty+setal|set underline colors (nonstandard), #### Foot # https://codeberg.org/dnkl/foot/ -# Version 1.8.2 +# Version 1.18.1 2024/08/17 +# +# vttest: +# device attributes list 28=rectangular editing +# supports rectangle operations, but problems with left/right margins +# reports window-size, but not icon or window label +# numeric keypad has no application-mode +# +# Version 1.8.2 2021/07/31 # # This identifies as a VT220 with 4=sixel and 22=color, however: # tack: @@ -7966,7 +7948,7 @@ kitty+setal|set underline colors (nonstandard), # otherwise few reports, except cursor-position and mouse and some dtterm # VT520 cursor-movement works, except for left/right margins # supports xterm/DECSCUSR, though default case in vttest does not blink -# Send: <27> [ 0 <32> q +# Send: <27> [ 0 <32> q # Text: The cursor should be a blinking rectangle # partial support for xterm mouse any-event mode and button-event mode: # + does not report focus-in/focus-out @@ -7979,27 +7961,30 @@ foot-direct|foot with direct color indexing, use=xterm+direct, use=foot+base, foot+base|foot base fragment, - am, bce, bw, hs, mir, msgr, npc, xenl, AX, XT, + am, bce, bw, mir, msgr, npc, xenl, AX, XT, cols#80, it#8, lines#24, - acsc=``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, - bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[2J, cr=\r, - cub1=^H, cud1=\n, dim=\E[2m, ech=\E[%p1%dX, ed=\E[J, el=\E[K, - el1=\E[1K, flash=\E]555\E\\, ind=\n, invis=\E[8m, - is2=\E[!p\E[?3;4l\E[4l\E>, kbs=^?, kcbt=\E[Z, - oc=\E]104\E\\, op=\E[39;49m, rev=\E[7m, ri=\EM, rmacs=\E(B, - rmam=\E[?7l, rmkx=\E[?1l\E>, rmso=\E[27m, rmul=\E[24m, - rs1=\Ec, rs2=\E[!p\E[?3;4l\E[4l\E>, + bel=^G, clear=\E[H\E[2J, cr=\r, cub1=^H, cud1=\n, dim=\E[2m, + ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K, + flash=\E]555\E\\, ind=\n, is2=\E[!p\E[4l\E>, kbs=^?, + kcbt=\E[Z, nel=\EE, oc=\E]104\E\\, op=\E[39;49m, ri=\EM, + rmam=\E[?7l, rmkx=\E[?1l\E>, rmm=\E[?1036h\E[?1034l, + rmso=\E[27m, rmul=\E[24m, rs1=\Ec, rs2=\E[!p\E[4l\E>, sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p5%t;2%;%?%p2%t;4%; %?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p7%t;8%;m, - sgr0=\E(B\E[m, smacs=\E(0, smam=\E[?7h, smkx=\E[?1h\E=, - smso=\E[7m, smul=\E[4m, E3=\E[3J, use=att610+cvis, - use=ansi+csr, use=ansi+cup, use=ansi+enq, use=ansi+local, - use=ansi+idc, use=ansi+idl, use=ansi+rca2, use=ansi+rep, - use=ansi+tabs, use=ecma+index, use=ecma+italics, - use=ecma+strikeout, use=xterm+alt+title, - use=xterm+pcfkeys, use=xterm+sm+1006, use=xterm+tmux2, - use=xterm+sl-alt, use=bracketed+paste, - use=report+version, + sgr0=\E(B\E[m, smam=\E[?7h, smkx=\E[?1h\E=, + smm=\E[?1036l\E[?1034h, E3=\E[3J, Smulx=\E[4:%p1%dm, + rv=\E\\[>1;[0-9][0-9][0-9][0-9][0-9][0-9];0c, + xr=\EP>\\|foot\\([0-9]+\\.[0-9]+\\.[0-9]+(-[0-9]+-g[a-f[0-9] + +)?\\)?\E\\\\, + use=att610+cvis, use=ansi+csr, use=ansi+cup, + use=ansi+enq, use=ansi+local, use=ansi+idc, use=ansi+idl, + use=ansi+rca2, use=ansi+rep, use=ansi+tabs, + use=ansi+sgrbold, use=ecma+index, use=ecma+italics, + use=ecma+strikeout, use=kitty+setal, use=xterm+acs, + use=xterm+alt+title, use=xterm+pcfkeys, + use=xterm+sm+1006, use=xterm+tmux2, use=xterm+sl-alt, + use=bracketed+paste, use=report+version, + use=xterm+focus, ######## WEB CLIENTS @@ -8015,6 +8000,30 @@ foot+base|foot base fragment, # it can connect to, and display in, a web browser, or as a standalone Qt # application. Either way, it displays in the current desktop session. # +# Testing AppImage for 3.2.0, on Fedora 40: +# + appears to implement erase-display by painting a double-line on the screen, +# doesn't use full screen for ded though it sort-of works for vi. +# + sets TERMINFO in its shell (imitating iTerm2), and TERM=domterm-xterm which +# doesn't work when doing sudo. According to the git log, that was April 1, +# 2023. The VTE developers copied the feature (i.e., a partially workable +# private terminal database) in February 2024. +# + the canonical name for the terminal description is still "domterm", and +# presumably the "domterm-xterm" alias is a workaround for hardcoded scripts +# that look for "xterm". +# + almost all of the differences between ncurses's "domterm" and DomTerm's +# are additions, but (read further) most are untestable due to breakage in +# the program. +# + DomTerm's updated terminal description says it implements italics, but +# + hangs in tack when doing blink (just before testing italics) +# + vttest, ncurses test-program also fare badly, e.g., due to improper line +# wrapping and/or inability to consistently clear the screen. +# +# The review of DomTerm 3.2.0 was prompted by noticing this page +# https://domterm.org/Wire-byte-protocol.html +# which goes on at length for extensions which collide with a commonly-used +# control for restoring a saved cursor position: +# CSI u Restore cursor (SCORC, also ANSI.SYS). +# # Testing current code (2019/07/06) with Fedora 30: # tack # no flash @@ -8053,10 +8062,350 @@ domterm|DomTerm web client, bel@, blink@, dim@, invis@, kcbt=\E[Z, ritm@, rmkx=\E[?1l, sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%| %t;7%;m, - sitm@, smkx=\E[?1h, use=xterm+256setaf, use=ecma+index, - use=xterm+sm+1006, use=xterm+pcfkeys, use=xterm-basic, + sitm@, smkx=\E[?1h, use=linux+kbs, use=xterm+256setaf, + use=ecma+index, use=xterm+focus, use=xterm+sm+1006, + use=xterm+pcfkeys, use=xterm-basic, use=bracketed+paste, +######## Miscellaneous + +#### WezTerm +# https://wezfurlong.org/wezterm/ +# https://github.com/wez/wezterm +# +# which says: +# "wezterm is a terminal emulator with support for modern features +# such as fonts with ligatures, hyperlinks, tabs and multiple windows." +# +# The documentation bears mention. It refers to the "ANSI" standard and +# https://wezfurlong.org/wezterm/what-is-a-terminal.html#ansi-and-ecma-48 +# X3.64 (withdrawn long ago). A related website +# https://github.com/wez/ecma48 +# states that ECMA-48 was issued in 1979 and not revised since. Actually that +# was the second revision; the fifth revision in 1991 is current. The source +# code refers to the second revision in a half-dozen places. Further, there +# are three times as many references to Wikipedia as to xterm's documentation. +# The git commit comments in several instances hint at an incomplete reading +# of the relevant standards. +# +# wezterm-20240203-110809-5046fc22 tested with MacOS +# General: +# + initial screensize is now 80x24 +# tack: +# + no change +# wraptest: +# + erasures (EL, ED, DCH, ICH, ESC) do not cancel wrap +# vttest: +# + some of the problems with debris have been fixed +# +# wezterm-20230712_072601_f4abf8fd-1.fedora38.x86_64 +# tested with MacOS and Fedora 38/39. +# +# General: +# + written in Rust. +# + initial screensize is odd, i.e., 81x24 +# provides no visual feedback on resize +# ignores "resize -s" +# manual resize and then running resize got off-by-one adjustment +# + leaves debris (unerased cells) when switching between normal/alternate +# screens. +# + sets TERM=xterm-256color +# tack: +# + misplaced message in "am" screen +# + fails xenl (should be false) +# + cvvis is same as cnorm, block +# + has blink and dim +# + in bce test, blue isn't really blue but some pale purple +# + modified keys mostly work, but its tab control interferes with some +# + rmm/smm don't work (always uses escape-prefix) +# wraptest: +# + poor (doesn't copy anyone, most of the results are wrong) +# vttest: +# + DA is VT5xx with sixel, selective erase, user windows, color +# + DA2 is VT220 version 277, perhaps a reference to xterm #277 +# + only the VT100 character set works, contrary to DA/DA2. +# + no NRCS, either +# + double-sized character work, with some debris +# + doesn't switch between 80/132 columns. +# + numeric keypad ANSI application mode escapes don't work. +# + numeric keypad ANSI mode misses "0", ".", "," +# + uses PC-style editing keypad \E[H and \E[F for Find and Select +# + no VT52 +# + DECSED selective erase doesn't work +# + SRM doesn't work +# + 8-bit controls don't work +# + DECNCSM doesn't work +# + most DECRQSS do not work (DECSCL, DECSTBM, DECSLRM respond) +# + DECRQM/DECRPM don't work (most reply permanently reset) +# + DECLRMM responds to DECRPM, but VT420 rectangle tests do not work. +# Some of the left/right margin tests work with the cursor-movement screen, +# but DECFI/DECBI do not work. The other cursor-movement tests are buggy. +# + implements ECMA-48 cursor movement, but not SL/SR or protected area +# + implements xterm normal, any-event and button-event mouse, none of the rest +# + reports window size, none of the other window reports +wezterm|Wez's Terminal Emulator, + am, bce, km, mir, msgr, npc, xenl, + bel=^G, bold=\E[1m, cr=\r, cub1=^H, cud1=\n, ech=\E[%p1%dX, + el1=\E[1K, flash=\E[?5h$<100/>\E[?5l, ind=\n, + is2=\E[!p\E[?3;4l\E[4l\E>, kbs=^?, kcbt=\E[Z, kend=\EOF, + op=\E[39;49m, ri=\EM, rmam=\E[?7l, rmkx=\E[?1l\E>, + rmso=\E[27m, rmul=\E[24m, rs1=\Ec\E]104\007, + rs2=\E[!p\E[?3;4l\E[4l\E>, + sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p5%t;2%;%?%p2%t;4%; + %?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p7%t;8%;m, + sgr0=\E(B\E[m, smam=\E[?7h, smkx=\E[?1h\E=, Smol=\E[53m, + Smulx=\E[4:%p1%dm, + xr=\EP>\\|WezTerm\\([1-9][0-9-]+\\)\E\\\\, + use=ansi+apparrows, use=ansi+csr, use=ansi+cup, + use=ansi+enq, use=ansi+erase, use=ansi+idc, use=ansi+idl, + use=ansi+inittabs, use=ansi+local, use=ansi+rca2, + use=ansi+rep, use=ansi+sgrdim, use=bracketed+paste, + use=ecma+index, use=ecma+italics, use=ecma+strikeout, + use=report+version, use=vt220+cvis, + use=xterm+256color2, use=xterm+acs, + use=xterm+alt+title, use=xterm+focus, use=xterm+pcc2, + use=xterm+pce2, use=xterm+pcf2, use=xterm+sl-alt, + use=xterm+sm+1006, use=xterm+tmux, + +#### Contour +# https://github.com/contour-terminal/contour +# +# "Modern C++ Terminal Emulator" +# Contour is a modern and actually fast, modal, virtual terminal emulator, +# for everyday use. It is aiming for power users with a modern feature mindset. +# +# That is three occurrences of "modern" too many -TD +# +# MacOS +# - cannot run, because the package is not signed. +# +# Fedora rawhide +# contour-terminal-0.3.12.262-6.fc39.x86_64 +# - dumps core, cannot test +# +# Fedora 39 +# contour-terminal-0.4.0.6245-1.fc38.x86_64 +# - starts but doesn't display +# +# Fedora 38 +# contour-terminal-0.4.0.6245-1.fc38.x86_64 +# - starts but doesn't display +# contour-terminal-0.3.12.262-1.fc38.x86_64 +# + testable (see below) +# + initial screensize 62x23, no visual feedback on resize, no "resize -s" +# +# Sets TERM=contour (which is preferable to xterm). +# +# tack: +# + cvvis is same as cnorm, "|" +# + sitm/ritm don't work +# + rmm/smm don't work (always uses escape, but terminfo defines km) +# + initp interchanges red/blue (bug in tack?) +# + modified F1-F4 are wrong, sending SS3 with modifier numbers +# + shifted editing-keypad doesn't send anything +# + meta key doesn't work +# + status-line works (based on xterm, including window-resizing) +# + dots don't line up for home test +# +# wraptest: +# + poor 7/25 differences from xterm (perhaps copying iTerm2) +# +# vttest: +# + hangs in menu 1, etc., when it tries to resize +# +# infocmp vs xterm-256color +# + missing XM/xm +# + rmcup/smcup doesn't use title-stack (but is implemented) +# + doesn't use SGR mouse (but is implemented) +# + sgr doesn't define dim, but dim capability is in terminfo (implemented) +# +# Developer's terminfo (compiled-in) uses some extensions. +contour|contour-latest|Contour Terminal Emulator, + am, bce, eslok, hs, km, mc5i, mir, msgr, npc, xenl, xvpa, + cols#80, lines#24, pairs#0x7fff, + bel=^G, bold=\E[1m, clear=\E[H\E[2J, cr=\r, cub1=^H, cud1=\n, + dim=\E[2m, dsl=\E[$~, ech=\E[%p1%dX, el1=\E[1K, + flash=\E[?5h$<100/>\E[?5l, fsl=\E[$}, hpa=\E[%i%p1%dG, + ind=\n, indn=\E[%p1%dS, invis=\E[8m, ka1=, ka3=, kbs=^?, kc1=, + kc3=, kcbt=\E[Z, kend=\EOF, khlp=, kmous=\E[M, kund=, + oc=\E]104\E\\, op=\E[39;49m, rev=\E[7m, ri=\EM, + rin=\E[%p1%dT, rmam=\E[?7l, rmkx=\E[?1l, rmso=\E[27m, + rmul=\E[24m, rs1=\E]\E\\\Ec, + sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%| + %t;7%;%?%p4%t;5%;%?%p7%t;8%;m, + sgr0=\E(B\E[m, smam=\E[?7h, smkx=\E[?1h, smso=\E[7m, + smul=\E[4m, tsl=\E[2$~\E[1$}\E[H\E[2J, vpa=\E[%i%p1%dd, + Cs=\E]12;%p1%s\E\\, E3=\E[3J, Rmol=\E[55m, Se=\E[ q, + Smol=\E[53m, Smulx=\E[4:%p1%dm, Ss=\E[%p1%d q, + use=ansi+apparrows, use=ansi+cup, use=ansi+csr, + use=ansi+erase, use=ansi+idc, use=ansi+idl, + use=ansi+inittabs, use=ansi+local, use=ansi+rep, + use=att610+cvis, use=ecma+italics, use=ecma+strikeout, + use=xterm+256color, use=xterm+acs, use=xterm+alt1049, + use=xterm+pcc2, use=xterm+pce2, use=xterm+pcf2, + +contour-direct|Contour terminal with direct colors, + use=xterm+direct, use=contour, + +#### Ghostty +# https://github.com/ghostty-org/ghostty +# +# Its readme and manpage begin with a lot of hype, concluding with +# +# While aiming for this ambitious goal, our first step is to make Ghostty +# one of the best fully standards compliant terminal emulator, remaining +# compatible with all existing shells and software while supporting all +# of the latest terminal innovations in the ecosystem. You can use +# Ghostty as a drop-in replacement for your existing terminal emulator. +# +# However, it uses xterm as a standard: +# +# We believe Ghostty is one of the most compliant terminal emulators +# available. Terminal behavior is partially a de jure standard (i.e. +# [ECMA-48](https://ecma-international.org/publications-and-standards/stand> +# but mostly a de facto standard as defined by popular terminal emulators +# worldwide. Ghostty takes the approach that our behavior is defined by +# (1) standards, if available, (2) xterm, if the feature exists, (3) +# other popular terminals, in that order. This defines what the Ghostty +# project views as a "standard." +# +# while xterm uses ECMA-48 and DEC 070 along with related documentation such as +# the DEC terminal reference manuals. xterm's documentation does not attempt +# to duplicate those sources of information, so that developers should rely +# upon both xterm's documentation and the published standards. +# +# Comments in ghostty's source code and commits demonstrate that the developers +# study xterm's source code closer than xterm's documentation. The quote above +# is the only mention of ECMA-48. +# +# ghostty 1.1.0 tested with Arch Linux: +# ------------- +# The issue with vttest is repaired. Other issues remain. The reader may not +# have noticed, but the ghostty developers disallow direct bug reports. +# Quoting the developers: +# +# https://github.com/ghostty-org/ghostty/issues/3558 +# Users are not allowed to create Issues directly in this repository - we +# ask that you create a Discussion first. +# ... +# Any Discussion which clearly identifies a problem in Ghostty and can be +# confirmed or reproduced will be converted to an Issue by a maintainer, +# so as a user finding a valid problem you don't do any extra work +# anyway. Thank you. +# +# As a direct consequence, details and attribution in those "Discussion" notes +# may be omitted, as in this instance. +# +# https://web.archive.org/web/20250124124041/https://github.com/ghostty-org/ghostty/issues/2542 +# ghostty #2542 Publish ghostty terminfo to ncurses terminal database +# Opened October 30, 2024, this terminal description is mentioned December 31. +# +# https://web.archive.org/web/20250115170223/https://github.com/ghostty-org/ghostty/issues/4523 +# ghostty #4523 Renderers (Metal and OpenGL) should clip terminal if terminal +# grid size mismatches physical window +# Opened January 3, 2025, with a note +# The only known way to trigger this is DECCOLM, so it's low priority +# since almost nothing uses this. But notably vtetest uses this and it +# makes it appear like we perform much worse than we do. +# +# Issue #4523 does not mention the bug report (nor, as in some other instances +# refer obliquely to a discussion on "Discord"). vttest sends a DECCOLM to +# ensure that the screen is not in 132-column mode. That is the case for the +# testing reported. If ghostty were implementing DECCOLM correctly, it would +# not have decided that the screensize changed. The fix in #4523 is a +# workaround masking other potential issues. +# +# By the way, that should be "vttest" (there is no such program as "vtetest"). +# +# ghostty 1.0.0 tested with Arch Linux: +# ------------- +# tack: +# - does not implement blinking text +# - does not implement meta mode (kmm). +# - implements VT100-style alternate character set +# - testing video-attributes unexpectedly clears the display before acsc +# - italics and strike-out work +# - function-keys mostly match; however because this client (unlike X11 +# clients) does not work with a remote display, some (such as control/alt key +# combinations, and the shifted editing keys) are untestable because +# - numeric keypad does not send VT100-style escapes +# wraptest: +# - matches xterm +# vttest: +# - ghostty hangs in more than one menu, making it impossible to test more than +# a small part of the program. In particular, these are untestable: +# 1. Test of cursor movements +# 2. Test of screen features +# 4. Test of double-sized characters +# - ghostty has tabs (imitating gnome-terminal); when closing a tab with a +# running process (e.g., a hung vttest), ghostty does not prompt about the +# process to be killed. +# - identifies as a "VT220 with color": +# <27> [ ? 6 2 ; 2 2 c +# - although claiming to be a VT220, it does not support NRCS. Actually, it +# fails the VT100 character set test as well. This is a complete failure: +# 3. Test of character sets +# - it does not hang in this menu entry: +# 8. Test of VT102 features (Insert/Delete Char/Line) +# although because it does not implement double-sized characters, most of +# that test counts as a failure. +# - implements VT220 DECTCEM and ECH, but not SRM or DECSCA +# - implements VT420 left/right margins +# - does not implement VT420 rectangle operations +# - does not implement 8-bit controls +# - does implement ISO-6429 cursor-movement +# - supports BCE partially: ED/EL work, but not ECH and indexing. +# - does not support blinking text +# - responds to XTVERSION +# - responds to DECRPM controls, though many are "unknown" +# - does not respond to most DECRQSS except for SGR, DECSCUSR, DECSTBM +# - implements most of xterm mouse protocol except for +# - Mouse Highlight Tracking +# - DEC Locator Events +# - some window reporting works: +# 14 - size of text area in pixels +# 16 - size of character in pixels +# 18 - size of window in chars +# 21 - report window label +# - window-modifying does not work +# - cursor position is incorrect after switching to/from alternate screen +# +# The developers set "Tc" in their terminal description to hint that it +# supports direct-colors, but the feature did not work with this version -TD +ghostty|Ghostty terminal emulator, + am, bce, km, mc5i, mir, msgr, npc, xenl, AX, XT, + cols#80, lines#24, pairs#0x7fff, + acsc=++\,\,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxy + yzz{{||}}~~, + bel=^G, bold=\E[1m, clear=\E[H\E[2J, + cnorm=\E[?12l\E[?25h, cr=\r, cub1=^H, cud1=\n, + cvvis=\E[?12;25h, dim=\E[2m, ech=\E[%p1%dX, el1=\E[1K, + flash=\E[?5h$<100/>\E[?5l, ind=\n, invis=\E[8m, kbs=^?, + kcbt=\E[Z, kend=\EOF, kent=\EOM, op=\E[39;49m, rev=\E[7m, + ri=\EM, rmam=\E[?7l, rmcup=\E[?1049l, rmkx=\E[?1l\E>, + rmso=\E[27m, rmul=\E[24m, rs1=\E]\E\\\Ec, + setab=\E[%?%p1%{8}%<%t4%p1%d%e%p1%{16}%<%t10%p1%{8}%-%d%e48; + 5;%p1%d%;m, + setaf=\E[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5 + ;%p1%d%;m, + sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%| + %t;7%;%?%p5%t;2%;%?%p7%t;8%;m, + sgr0=\E(B\E[m, smam=\E[?7h, smcup=\E[?1049h, + smkx=\E[?1h\E=, E3=\E[3J, Ms=\E]52;%p1%s;%p2%s\007, + Se=\E[2 q, Smulx=\E[4:%p1%dm, Ss=\E[%p1%d q, + xr=\EP>\\|ghostty [!-z]+\E\\, use=ansi+apparrows, + use=ansi+csr, use=ansi+cup, use=ansi+enq, use=ansi+erase, + use=ansi+idc, use=ansi+idl, use=ansi+inittabs, + use=ansi+local, use=ansi+local1, use=ansi+rca2, + use=ansi+rep, use=ansi+sgrso, use=ansi+sgrul, + use=ansi+tabs, use=ecma+index, use=ecma+italics, + use=ecma+strikeout, use=report+version, use=vt220+cvis, + use=xterm+256color2, use=xterm+acs, + use=xterm+alt+title, use=bracketed+paste, + use=kitty+setal, use=vt420+lrmm, use=xterm+focus, + use=xterm+pce2, use=xterm+pcc2, use=xterm+pcf2, + use=xterm+sm+1006, use=xterm+sl-twm, + ######## UNIX VIRTUAL TERMINALS, VIRTUAL CONSOLES, AND TELNET CLIENTS # @@ -8068,9 +8417,8 @@ cbunix|cb unix virtual terminal, cols#80, lines#24, lm#0, bel=^G, clear=\EL, cr=\r, cub1=^H, cud1=\n, cuf1=\EC, cup=\EG%p2%c%p1%c, cuu1=\EA, dch1=\EM, dl1=\EN, ed=\EL, - el=\EK, ich1=\EO, il1=\EP, ind=\n, kcub1=\ED, kcud1=\EB, - kcuf1=\EC, kcuu1=\EA, khome=\EE, rmso=\Eb^D, rmul=\Eb^A, - smso=\Ea^D, smul=\Ea^A, + el=\EK, ich1=\EO, il1=\EP, ind=\n, khome=\EE, rmso=\Eb^D, + rmul=\Eb^A, smso=\Ea^D, smul=\Ea^A, use=vt52+arrows, # (vremote: removed obsolete ":nl@:" -- esr) vremote|virtual remote terminal, am@, @@ -8089,28 +8437,25 @@ pty|4bsd pseudo teletype, eterm|GNU Emacs term.el terminal emulation, am, mir, xenl, cols#80, lines#24, - bel=^G, bold=\E[1m, clear=\E[H\E[J, cr=\r, - csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H, - cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C, - cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, - dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, - el=\E[K, el1=\E[1K, home=\E[H, ht=^I, ich=\E[%p1%d@, - il=\E[%p1%dL, il1=\E[L, ind=\n, rev=\E[7m, rmir=\E[4l, - rmso=\E[m, rmul=\E[m, sgr0=\E[m, smir=\E[4h, smso=\E[7m, - smul=\E[4m, use=xterm+alt47, use=ansi+cpr, + bel=^G, bold=\E[1m, cr=\r, csr=\E[%i%p1%d;%p2%dr, cub1=^H, + cud1=\n, cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P, + el1=\E[1K, home=\E[H, ht=^I, ich=\E[%p1%d@, ind=\n, + rev=\E[7m, rmir=\E[4l, rmso=\E[m, rmul=\E[m, sgr0=\E[m, + smir=\E[4h, smso=\E[7m, smul=\E[4m, use=ansi+cpr, + use=ansi+erase, use=ansi+idl, use=ansi+local, + use=xterm+alt47, # The codes supported by the term.el terminal emulation in GNU Emacs 22.2 eterm-color|Emacs term.el terminal emulator term-protocol-version 0.96, msgr, colors#8, pairs#64, - blink=\E[5m, il=\E[%p1%dL, il1=\E[L, ind=\n, invis=\E[8m, - kbs=^?, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, - op=\E[39;49m, rc=\E8, ri=\EM, rmso=\E[27m, rmul=\E[24m, - rs1=\Ec, sc=\E7, setab=\E[%p1%'('%+%dm, + kbs=^?, khome=\E[1~, op=\E[39;49m, ri=\EM, rmso=\E[27m, + rmul=\E[24m, rs1=\Ec, setab=\E[%p1%'('%+%dm, setaf=\E[%p1%{30}%+%dm, sgr=\E[0%?%p1%p3%|%t;7%;%?%p2%t;4%;%?%p4%t;5%;%?%p6%t;1%;%? %p7%t;8%;m, - sgr0=\E[m, use=vt220+pcedit, use=eterm, + sgr0=\E[m, use=ansi+apparrows, use=ansi+csr, + use=ansi+sgr, use=vt220+pcedit, use=eterm, # shell.el can "do" color, though not nearly as well. # @@ -8127,10 +8472,10 @@ eterm-color|Emacs term.el terminal emulator term-protocol-version 0.96, # italics but does not lose the color information -TD 2017/01/28. dumb-emacs-ansi|Emacs dumb terminal with ANSI color codes, am, hc, - colors#8, it#8, ncv#13, pairs#64, + it#8, ncv#13, bold=\E[1m, cud1=\n, ht=^I, ind=\n, op=\E[39;49m, - rmul=\E[24m, setab=\E[4%p1%dm, setaf=\E[3%p1%dm, - sgr0=\E[m, smul=\E[4m, use=ecma+italics, + rmul=\E[24m, sgr0=\E[m, smul=\E[4m, use=ecma+italics, + use=klone+color, #### Screen @@ -8205,32 +8550,28 @@ dumb-emacs-ansi|Emacs dumb terminal with ANSI color codes, # the (Siemens Nixdorf) 97801 terminal. It was not shown in the termcap or # terminfo entries (which list about 60% of the control sequences). screen-base|VT 100/ANSI X3.64 virtual terminal (base), - OTbs, OTpt, am, km, mir, msgr, xenl, G0, - colors#8, cols#80, it#8, lines#24, ncv@, pairs#64, U8#1, + OTbs, OTpt, km, mir, xenl, G0, + ncv@, U8#1, acsc=++\,\,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxy yzz{{||}}~~, - bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, civis=\E[?25l, - clear=\E[H\E[J, cnorm=\E[34h\E[?25h, cr=\r, - csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H, - cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C, - cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\EM, - cvvis=\E[34l, dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, - dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K, el1=\E[1K, - enacs=\E(B\E)0, flash=\Eg, home=\E[H, hpa=\E[%i%p1%dG, - ht=^I, hts=\EH, ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L, - ind=\n, indn=\E[%p1%dS, is2=\E)0, kcbt=\E[Z, kcub1=\EOD, - kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kf1=\EOP, kf10=\E[21~, - kf11=\E[23~, kf12=\E[24~, kf2=\EOQ, kf3=\EOR, kf4=\EOS, - kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, - kmous=\E[M, nel=\EE, rc=\E8, rev=\E[7m, ri=\EM, rmacs=^O, + blink=\E[5m, bold=\E[1m, civis=\E[?25l, + cnorm=\E[34h\E[?25h, cub1=^H, cud1=\n, + cup=\E[%i%p1%d;%p2%dH, cuu1=\EM, cvvis=\E[34l, + dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, el1=\E[1K, flash=\Eg, + hpa=\E[%i%p1%dG, ich=\E[%p1%d@, indn=\E[%p1%dS, is2=\E)0, + kbs=^?, kcbt=\E[Z, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, + khome=\E[1~, kmous=\E[M, nel=\EE, rev=\E[7m, ri=\EM, rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[23m, rmul=\E[24m, - rs2=\Ec\E[?1000l\E[?25h, sc=\E7, + rs2=\Ec\E[?1000l\E[?25h, sgr=\E[0%?%p6%t;1%;%?%p1%t;3%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t; 5%;%?%p5%t;2%;m%?%p9%t\016%e\017%;, - sgr0=\E[m\017, smacs=^N, smir=\E[4h, smkx=\E[?1h\E=, - smso=\E[3m, smul=\E[4m, tbc=\E[3g, vpa=\E[%i%p1%dd, - E0=\E(B, S0=\E(%p1%c, use=xterm+kbs, use=vt220+pcedit, - use=xterm+alt1049, use=ecma+color, use=vt100+enq, + sgr0=\E[m\017, smir=\E[4h, smkx=\E[?1h\E=, smso=\E[3m, + smul=\E[4m, vpa=\E[%i%p1%dd, E0=\E(B, S0=\E(%p1%c, + use=ansi+apparrows, use=ansi+csr, use=ansi+erase, + use=ansi+idl, use=ansi+inittabs, use=ansi+local, + use=xterm+kbs, use=vt220+pcedit, use=xterm+alt1049, + use=ecma+color, use=vt100+enq, use=vt100+4bsd, + use=xterm+r5+fkeys, screen|VT 100/ANSI X3.64 virtual terminal, use=screen4, @@ -8276,7 +8617,7 @@ screen-256color-s|GNU Screen with 256 colors and status line, use=xterm+256setaf, use=screen-s, screen-256color-bce|GNU Screen with 256 colors and BCE, - bce, use=xterm+256setaf, use=screen-bce, + use=xterm+256setaf, use=screen-bce, screen-256color-bce-s|GNU Screen with 256 colors using BCE and status line, bce, use=xterm+256setaf, use=screen-s, @@ -8338,9 +8679,8 @@ screen+italics|screen cannot support italics, # since the default translations override the built-in keycode # translation. They are suppressed here to show what is tested by tack. screen.xterm-xfree86|screen.xterm-new|screen customized for modern xterm, - bce@, bw, npc, - invis@, kIC@, kNXT@, kPRV@, kcbt=\E[Z, kent=\EOM, meml@, memu@, - nel=\EE, rep@, + bce@, bw, + invis@, kIC@, kNXT@, kPRV@, meml@, memu@, rep@, sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%| %t;7%;%?%p4%t;5%;%?%p5%t;2%;m, E3@, use=screen+italics, use=screen+fkeys, @@ -8387,7 +8727,7 @@ screen.konsole|screen in KDE console window, # fix the backspace key screen.linux|screen.linux-s|screen in Linux console, bw, - kbs=^?, kcbt@, use=linux+sfkeys, use=xterm+x11mouse, + kcbt@, use=linux+sfkeys, use=xterm+x11mouse, use=screen+fkeys, use=screen, screen.mlterm|screen in mlterm, XR@, use=xterm+x11mouse, use=screen+fkeys, @@ -8422,10 +8762,8 @@ screen-bce.mrxvt|screen optimized for mrxvt, bce, ech@, use=screen.mrxvt, screen-bce.gnome|screen optimized for GNOME-Terminal, - bce, ech@, use=screen+italics, use=screen.gnome, screen-bce.konsole|screen optimized for KDE console window, - bce, ech@, use=screen+italics, use=screen.konsole, screen-bce.linux|screen optimized for Linux console, bce, @@ -8435,34 +8773,28 @@ screen-w|VT 100/ANSI X3.64 virtual terminal with 132 cols, cols#132, use=screen, screen2|VT 100/ANSI X3.64 virtual terminal (old 2.x), - cols#80, it#8, lines#24, - cbt=\E[Z, clear=\E[2J\E[H, cr=\r, cub=\E[%p1%dD, cub1=^H, - cud=\E[%p1%dB, cud1=\E[B, cuf=\E[%p1%dC, cuf1=\E[C, - cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, - dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, - el=\E[K, ht=^I, hts=\EH, ich=\E[%p1%d@, ich1=, il=\E[%p1%dL, - il1=\E[L, ind=\n, kbs=^H, kcub1=\ED, kcud1=\EB, kcuf1=\EC, - kcuu1=\EA, kf0=\E~, kf1=\ES, kf2=\ET, kf3=\EU, kf4=\EV, - kf5=\EW, kf6=\EP, kf7=\EQ, kf8=\ER, kf9=\E0I, khome=\EH, - nel=\r\n, rc=\E8, ri=\EM, rmir=\E[4l, rmso=\E[23m, - rmul=\E[24m, rs1=\Ec, sc=\E7, sgr0=\E[m, smir=\E[4h, - smso=\E[3m, smul=\E[4m, tbc=\E[3g, + cols#80, lines#24, + clear=\E[2J\E[H, cr=\r, cub1=^H, cup=\E[%i%p1%d;%p2%dH, + ed=\E[J, el=\E[K, ich1=, ind=\n, kbs=^H, kf0=\E~, kf1=\ES, + kf2=\ET, kf3=\EU, kf4=\EV, kf5=\EW, kf6=\EP, kf7=\EQ, kf8=\ER, + kf9=\E0I, khome=\EH, nel=\r\n, rc=\E8, ri=\EM, rmso=\E[23m, + rmul=\E[24m, rs1=\Ec, sc=\E7, sgr0=\E[m, smso=\E[3m, + smul=\E[4m, use=ansi+idc, use=ansi+idl, + use=ansi+inittabs, use=ansi+local, use=vt52+arrows, + # (screen3: removed unknown ":xv:LP:G0:" -- esr) screen3|VT 100/ANSI X3.64 virtual terminal (old 3.x), km, mir, msgr, - cols#80, it#8, lines#24, - bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, clear=\E[H\E[J, - cr=\r, csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H, - cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C, - cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\EM, - dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, - el=\E[K, home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@, - il=\E[%p1%dL, il1=\E[L, ind=\n, is2=\E)0, kbs=^H, kcub1=\EOD, - kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kf1=\EOP, kf2=\EOQ, - kf3=\EOR, kf4=\EOS, nel=\EE, rc=\E8, rev=\E[7m, ri=\EM, - rmir=\E[4l, rmkx=\E>, rmso=\E[23m, rmul=\E[24m, rs1=\Ec, - sc=\E7, sgr0=\E[m, smir=\E[4h, smkx=\E=, smso=\E[3m, - smul=\E[4m, tbc=\E[3g, + cols#80, lines#24, + bel=^G, blink=\E[5m, bold=\E[1m, cr=\r, cub1=^H, cud1=\n, + cup=\E[%i%p1%d;%p2%dH, cuu1=\EM, dch=\E[%p1%dP, + dch1=\E[P, home=\E[H, ich=\E[%p1%d@, ind=\n, is2=\E)0, + kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, + kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, nel=\EE, rev=\E[7m, + ri=\EM, rmir=\E[4l, rmkx=\E>, rmso=\E[23m, rmul=\E[24m, + rs1=\Ec, sgr0=\E[m, smir=\E[4h, smkx=\E=, smso=\E[3m, + smul=\E[4m, use=ansi+csr, use=ansi+erase, use=ansi+idl, + use=ansi+inittabs, use=ansi+local, # screen 4.0 was released 2003-07-21, and as of March 2019, its terminfo file # was last updated in 2009 to include 256-color support. The most recent @@ -8500,7 +8832,7 @@ screen5|VT 100/ANSI X3.64 virtual terminal (someday), # various entries such as screen.xterm-new provide a way to more closely # match the terminal. tmux|tmux terminal multiplexer, - invis=\E[8m, kbs=^?, rmso=\E[27m, + invis=\E[8m, rmso=\E[27m, sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%? %p5%t;2%;%?%p7%t;8%;m%?%p9%t\016%e\017%;, smso=\E[7m, E3=\E[3J, Smulx=\E[4:%p1%dm, @@ -8556,7 +8888,7 @@ mosh|mobile shell, %t;7%;%?%p4%t;5%;%?%p7%t;8%;m, sgr0=\E(B\E[m, use=ansi+enq, use=xterm+meta, use=ecma+italics, use=ecma+index, use=xterm+acs, - use=xterm+sm+1006, use=xterm+pcfkeys, + use=xterm+focus, use=xterm+sm+1006, use=xterm+pcfkeys, use=xterm-xfree86, use=bracketed+paste, mosh-256color|mosh using 256-colors, @@ -8584,41 +8916,31 @@ mosh-256color|mosh using 256-colors, # + Most of the mode-settings in the initialization/reset strings are not # implemented; dvtm copies its description from rxvt. dvtm|dynamic virtual terminal manager, - am, eo, mir, msgr, xenl, AX, - colors#8, cols#80, it#8, lines#24, ncv@, pairs#64, - acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, - bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[2J, cr=\r, - csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H, - cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C, - cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, - dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K, el1=\E[1K, - enacs=\E(B\E)0, home=\E[H, hpa=\E[%i%p1%dG, ht=^I, hts=\EH, - ich=\E[%p1%d@, ich1=\E[@, il=\E[%p1%dL, il1=\E[L, ind=\n, + eo, mir, xenl, + ncv@, + blink=\E[5m, bold=\E[1m, clear=\E[H\E[2J, cub1=^H, cud1=\n, + cup=\E[%i%p1%d;%p2%dH, ed=\E[J, el=\E[K, el1=\E[1K, + hpa=\E[%i%p1%dG, ich=\E[%p1%d@, ich1=\E[@, is1=\E[?47l\E=\E[?1l, is2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l, kDC=\E[3$, kEND=\E[8$, kHOM=\E[7$, kIC=\E[2$, kLFT=\E[d, kNXT=\E[6$, kPRV=\E[5$, kRIT=\E[c, ka1=\EOw, ka3=\EOy, - kb2=\EOu, kbs=^?, kc1=\EOq, kc3=\EOs, kcbt=\E[Z, kcub1=\E[D, - kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kel=\E[8\^, kend=\E[8~, - kent=\EOM, kf0=\E[21~, kf1=\E[11~, kf10=\E[21~, - kf11=\E[23~, kf12=\E[24~, kf13=\E[25~, kf14=\E[26~, - kf15=\E[28~, kf16=\E[29~, kf17=\E[31~, kf18=\E[32~, - kf19=\E[33~, kf2=\E[12~, kf20=\E[34~, kf21=\E[23$, - kf22=\E[24$, kf3=\E[13~, kf4=\E[14~, kf5=\E[15~, - kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, - khome=\E[7~, kind=\E[a, kmous=\E[M, kri=\E[b, op=\E[39;49m, - rc=\E8, rev=\E[7m, ri=\EM, rmacs=^O, rmir=\E[4l, rmso=\E[27m, - rmul=\E[24m, + kb2=\EOu, kbs=^?, kc1=\EOq, kc3=\EOs, kcbt=\E[Z, kel=\E[8\^, + kend=\E[8~, kent=\EOM, kf0=\E[21~, kf21=\E[23$, + kf22=\E[24$, khome=\E[7~, kind=\E[a, kmous=\E[M, kri=\E[b, + rev=\E[7m, ri=\EM, rmir=\E[4l, rmso=\E[27m, rmul=\E[24m, rs1=\E>\E[1;3;4;5;6l\E[?7h\E[m\E[r\E[2J\E[H, rs2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l\E>\E[?1000l\E[? 25h, - s0ds=\E(B, s1ds=\E(0, sc=\E7, setab=\E[4%p1%dm, - setaf=\E[3%p1%dm, + s0ds=\E(B, s1ds=\E(0, sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m%? %p9%t\016%e\017%;, - sgr0=\E[m\017, smacs=^N, smir=\E[4h, smso=\E[7m, - smul=\E[4m, tbc=\E[3g, vpa=\E[%i%p1%dd, use=xterm+alt47, - use=vt220+vtedit, use=vt220+cvis, use=ecma+italics, + sgr0=\E[m\017, smir=\E[4h, smso=\E[7m, smul=\E[4m, + vpa=\E[%i%p1%dd, use=ansi+arrows, use=ansi+csr, + use=ansi+idl, use=ansi+local, use=xterm+alt47, + use=vt220+vtedit, use=vt220+cvis, use=ecma+color, + use=ecma+italics, use=vt100+4bsd, use=vt220+sfkeys, + use=xterm+r5+fkeys, dvtm-256color|dynamic virtual terminal manager with 256 colors, colors#0x100, pairs#0x10000, @@ -8666,33 +8988,30 @@ dvtm-256color|dynamic virtual terminal manager with 256 colors, # pairs, since the latter ends the string that is loaded to the window-title. ncsa-m|ncsa-vt220-8|NCSA Telnet 2.6 for Macintosh in VT220-8 mode, am, km, mir, msgr, xenl, - acsc=``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[2J, cr=\r, - csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H, - cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C, - cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, - dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, - el=\E[K, el1=\E[1K, enacs=\E)0, + cub1=^H, cud1=\n, cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, + dch1=\E[P, ed=\E[J, el=\E[K, el1=\E[1K, enacs=\E)0, flash=\E[?5h$<100/>\E[?5l, home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@, if=/usr/share/tabset/vt100, - il=\E[%p1%dL, il1=\E[L, ind=\n$<150*>, - is2=\E7\E[r\E[m\E[?7h\E[?1;4;6l\E[4l\E8\E>, kbs=^H, - kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, + ind=\n$<150*>, + is2=\E7\E[r\E[m\E[?7h\E[?1;4;6l\E[4l\E8\E>, kdch1=\E[4~, kend=\E[5~, kf1=\E[17~, kf10=\E[28~, kf11=\E[29~, kf12=\E[31~, kf13=\E[32~, kf14=\E[33~, kf15=\E[34~, kf2=\E[18, kf3=\E[19~, kf4=\E[20~, kf5=\E[21~, kf6=\E[23~, kf7=\E[24~, kf8=\E[25~, kf9=\E[26~, khlp=\E[1~, khome=\E[2~, knp=\E[6~, kpp=\E[3~, mc4=\E[4i, mc5=\E[5i, - rc=\E8, rev=\E[7m, rf=/usr/share/tabset/vt100, ri=\EM, - rmacs=\E(B, rmam=\E[?7l, rmcup=\E[2J\E8, rmir=\E[4l, - rmso=\E[27m, rmul=\E[24m, - rs2=\E7\E[r\E8\E[m\E[?7h\E[?1;4;6l\E[4l\E>, sc=\E7, + rev=\E[7m, rf=/usr/share/tabset/vt100, ri=\EM, + rmam=\E[?7l, rmcup=\E[2J\E8, rmir=\E[4l, rmso=\E[27m, + rmul=\E[24m, + rs2=\E7\E[r\E8\E[m\E[?7h\E[?1;4;6l\E[4l\E>, sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%|%t;7%;m%? %p9%t\E(0%e\E(B%;, - sgr0=\E[m\E(B, smacs=\E(0, smam=\E[?7h, smcup=\E7, - smir=\E[4h, smso=\E[7m, smul=\E[4m, tbc=\E[3g, - u8=\E[?62;1;6c, use=vt220+cvis, use=xterm+sl, - use=ansi+enq, + sgr0=\E[m\E(B, smam=\E[?7h, smcup=\E7, smir=\E[4h, + smso=\E[7m, smul=\E[4m, tbc=\E[3g, u8=\E[?62;1;6c, + use=ansi+arrows, use=ansi+csr, use=ansi+idl, + use=ansi+local, use=vt220+cvis, use=xterm+acs, + use=xterm+sl, use=ansi+enq, + ncsa|NCSA Telnet 2.7 for Macintosh in VT220-8 mode (color), use=ncsa-m, use=klone+color, ncsa-ns|NCSA Telnet 2.7 for Macintosh in VT220-8 mode (color w/o status line), @@ -8709,10 +9028,9 @@ ncsa-m-ns|NCSA Telnet 2.6 for Macintosh in VT220-8 mode (no status line), # ncsa-vt220|NCSA Telnet using VT220-compatible function keys, kf1=\EOP, kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, - kf13=\E[25~, kf14=\E[26~, kf15=\E[28~, kf16=\E[29~, - kf17=\E[31~, kf18=\E[32~, kf19=\E[33~, kf2=\EOQ, - kf20=\E[34~, kf3=\EOR, kf4=\EOS, kf6=\E[17~, kf7=\E[18~, - kf8=\E[19~, kf9=\E[20~, use=ncsa, + kf13=\E[25~, kf14=\E[26~, kf15=\E[28~, kf2=\EOQ, kf3=\EOR, + kf4=\EOS, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, + use=ncsa, use=vt220+sfkeys, #### Pilot Pro Palm-Top # @@ -8749,9 +9067,8 @@ elks-vt52|ELKS VT52 console, home=\EH, use=elks-glasstty, elks-ansi|ELKS ANSI console, - clear=\E[H\E[2J, cub1=\E[D, cud1=\E[B, cuf1=\E[C, - cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, el=\E[K, home=\E[H, - rmso=\E[m, smso=\E[7m, use=elks-glasstty, + clear=\E[H\E[2J, el=\E[K, use=ansi+cup, use=ansi+local1, + use=ansi+sgrso, use=elks-glasstty, # As a matter of fact, ELKS 0.0.83 on PCs defaults to ANSI emulation # instead of VT52, but the "elks" entry still refers to the latter. @@ -8777,9 +9094,9 @@ pccons|pcconsole|ANSI (mostly) Alpha PC console terminal emulation, cols#80, lines#25, bel=^G, clear=\E[H\E[2J, cr=\r, cub1=^H, cud1=\n, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, dch1=\E[P, dl1=\E[M, - el=\E[K, home=\E[H, ht=^I, ich1=\E[@, il1=\E[L, kbs=^H, - kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, khome=\E[H, - nel=\r\n, rev=\E[7m, rmso=\E[m, sgr0=\E[m, smso=\E[7m, + el=\E[K, home=\E[H, ht=^I, ich1=\E[@, il1=\E[L, nel=\r\n, + rev=\E[7m, rmso=\E[m, sgr0=\E[m, smso=\E[7m, + use=ansi+arrows, #### Sun consoles # @@ -8788,13 +9105,13 @@ pccons|pcconsole|ANSI (mostly) Alpha PC console terminal emulation, oldsun|Sun Microsystems Workstation console, OTbs, am, km, mir, msgr, cols#80, it#8, lines#34, - bel=^G, clear=^L, cr=\r, cub1=^H, cud1=\E[B, cuf1=\E[C, - cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, dch=\E[%p1%dP, - dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K, ht=^I, - ich=\E[%p1%d@, ich1=\E[@, il=\E[%p1%dL, il1=\E[L, ind=\n, - is1=\E[1r, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, - kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, khome=\E[H, - rmso=\E[m, sgr0=\E[m, smso=\E[7m, + bel=^G, clear=^L, cr=\r, cub1=^H, cup=\E[%i%p1%d;%p2%dH, + dch=\E[%p1%dP, dch1=\E[P, ed=\E[J, el=\E[K, ht=^I, + ich=\E[%p1%d@, ich1=\E[@, ind=\n, is1=\E[1r, kcub1=\E[D, + kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf1=\EOP, kf2=\EOQ, + kf3=\EOR, kf4=\EOS, khome=\E[H, rmso=\E[m, sgr0=\E[m, + smso=\E[7m, use=ansi+idl, use=ansi+local1, + # From: Alexander Lukyanov , 14 Nov 1995 # capability later corrected by J.T. Conklin # SGR 1, 4 aren't supported - removed bold/underline (T.Dickey 17 Jan 1998) @@ -8803,17 +9120,17 @@ sun-il|Sun Microsystems console with working insert-line, cols#80, lines#34, bel=^G, clear=^L, cr=\r, cub1=^H, cud1=\n, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, dch=\E[%p1%dP, - dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K, ht=^I, - ich=\E[%p1%d@, ich1=\E[@, il=\E[%p1%dL, il1=\E[L, ind=\n, - kb2=\E[218z, kbs=^H, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, - kcuu1=\E[A, kdch1=^?, kend=\E[220z, kf1=\E[224z, + dch1=\E[P, ed=\E[J, el=\E[K, ht=^I, ich=\E[%p1%d@, ich1=\E[@, + ind=\n, kb2=\E[218z, kdch1=^?, kend=\E[220z, kf1=\E[224z, kf10=\E[233z, kf11=\E[234z, kf12=\E[235z, kf2=\E[225z, kf3=\E[226z, kf4=\E[227z, kf5=\E[228z, kf6=\E[229z, kf7=\E[230z, kf8=\E[231z, kf9=\E[232z, khome=\E[214z, kich1=\E[247z, knp=\E[222z, kopt=\E[194z, kpp=\E[216z, kres=\E[193z, kund=\E[195z, rev=\E[7m, rmso=\E[m, rmul@, rs2=\E[s, sgr=\E[0%?%p1%p3%|%t;7%;m, sgr0=\E[m, - smso=\E[7m, u8=\E[1t, u9=\E[11t, + smso=\E[7m, u8=\E[1t, u9=\E[11t, use=ansi+arrows, + use=ansi+idl, + # On some versions of CGSIX framebuffer firmware (SparcStation 5), / # flake out on the last line. Unfortunately, without them the terminal has no # way to scroll. @@ -8831,8 +9148,8 @@ sun-cgsix|sun-ss5|Sun SparcStation 5 console, # incomplete manual page. Presumably the intent was to document features of # shelltool not in wscons: # -# https://manpages.ubuntu.com/manpages/bionic/en/man1/shelltool.1.html -# https://manpages.ubuntu.com/manpages/bionic/en/man1/cmdtool.1.html +# https://web.archive.org/web/20230608051050/manpages.ubuntu.com/manpages/bionic/en/man1/shelltool.1.html +# https://web.archive.org/web/20220520165933/manpages.ubuntu.com/manpages/bionic/en/man1/cmdtool.1.html # # The wscons manual page and the XView source show that it had no feature that # could be used in ncurses u6/u7/u8/u9 extensions. Interesting, the XView @@ -8855,7 +9172,7 @@ sun-e-s|sun-s-e|Sun Microsystems Workstation with status hacked for emacs, sun-48|Sun 48-line window, cols#80, lines#48, use=sun, sun-34|Sun 34-line window, - cols#80, lines#34, use=sun, + use=sun, sun-24|Sun 24-line window, cols#80, lines#24, use=sun, sun-17|Sun 17-line window, @@ -8863,9 +9180,8 @@ sun-17|Sun 17-line window, sun-12|Sun 12-line window, cols#80, lines#12, use=sun, sun-1|Sun 1-line window for sysline, - eslok, hs, - cols#80, lines#1, - dsl=^L, fsl=\E[K, tsl=\r, use=sun, + lines#1, + dsl=^L, fsl=\E[K, tsl=\r, use=sun, use=dec+sl, sun-e|sun-nic|sune|Sun Microsystems Workstation without insert character, ich1@, rmir@, smir@, use=sun, sun-c|sun-cmd|Sun Microsystems Workstation console with scrollable history, @@ -8897,16 +9213,13 @@ sun-type4|Sun Workstation console with type 4 keyboard, # blink=\E[5m # It supports bold, but not underline -TD (2009-09-19) sun-color|Sun Microsystems Workstation console with color support (IA systems), - colors#8, ncv#3, pairs#64, - bold=\E[1m, cub=\E[%p1%dD, cud=\E[%p1%dB, cuf=\E[%p1%dC, - cuu=\E[%p1%dA, home=\E[H, op=\E[0m, rs2=\E[s, - setab=\E[4%p1%dm, setaf=\E[3%p1%dm, + bold=\E[1m, cub1=^H, cud1=\n, home=\E[H, op=\E[0m, setb=\E[4%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6} %=%t3%e%p1%d%;m, setf=\E[3%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6} %=%t3%e%p1%d%;m, - sgr=\E[0%?%p6%t;1%;%?%p1%p3%|%t;7%;m, sgr0=\E[m, - smso=\E[7m, use=sun, + sgr=\E[0%?%p6%t;1%;%?%p1%p3%|%t;7%;m, use=ansi+local, + use=sun, use=klone+color, #### Iris consoles # @@ -8924,11 +9237,10 @@ wsiris|iris40|IRIS emulating a 40 line Visual 50 (approximately), cuf1=\EC, cup=\EY%p1%{32}%+%c%p2%{32}%+%c, cuu1=\EA, cvvis=\E;, dim=\E7F2, dl1=\EM, ed=\EJ, el=\EK, flash=\E7F4\E7B1\013\E7F7\E7B0, home=\EH, ht=^I, il1=\EL, - ind=\n, is2=\E7B0\E7F7\E7C2\E7R3, kcub1=\ED, kcud1=\EB, - kcuf1=\EC, kcuu1=\EA, kf0=\E0, kf1=\E1, kf2=\E2, kf3=\E3, - kf4=\E4, kf5=\E5, kf6=\E6, kf7=\E7, kf8=\E8, kf9=\E9, ri=\EI, - rmso=\E0@, rmul=\E7R3\E0@, sgr0=\E7F7, smso=\E9P, - smul=\E7R2\E9P, + ind=\n, is2=\E7B0\E7F7\E7C2\E7R3, kf0=\E0, kf1=\E1, + kf2=\E2, kf3=\E3, kf4=\E4, kf5=\E5, kf6=\E6, kf7=\E7, kf8=\E8, + kf9=\E9, ri=\EI, rmso=\E0@, rmul=\E7R3\E0@, sgr0=\E7F7, + smso=\E9P, smul=\E7R2\E9P, use=vt52+arrows, #### NeWS consoles # @@ -8997,17 +9309,17 @@ news-unk|Sony NEWS VT100 emulator common entry, OTbs, OTpt, am, xenl, cols#80, OTnl=\n, bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[2J, - cr=\r, csr=\E[%i%p1%d;%p2%dr, cub1=^H, cud1=\n, cuf1=\E[C, - cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, dl=\E[%p1%dM, dl1=\E[M, - ed=\E[J, el=\E[K, home=\E[H, ht=^I, - if=/usr/share/tabset/vt100, il=\E[%p1%dL, il1=\E[L, + cr=\r, cub1=^H, cud1=\n, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, + cuu1=\E[A, ed=\E[J, el=\E[K, home=\E[H, ht=^I, + if=/usr/share/tabset/vt100, is2=\E[?7h\E[?1h\E[?3l\E7\E8, kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kf0=\EOY, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, kf5=\EOT, kf6=\EOU, kf7=\EOV, - kf8=\EOW, kf9=\EOX, rc=\E8, rev=\E[7m, ri=\EM, - rmkx=\E[?1l\E>, rmso=\E[m, rmul=\E[m, - rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h\E[r, sc=\E7, - sgr0=\E[m, smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, + kf8=\EOW, kf9=\EOX, rev=\E[7m, ri=\EM, rmkx=\E[?1l\E>, + rmso=\E[m, rmul=\E[m, + rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h\E[r, sgr0=\E[m, + smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, use=ansi+csr, + use=ansi+idl, # # (news-29: this had :TY=ascii: --esr) news-29|Sony NEWS VT100 emulator with 29 lines, @@ -9046,14 +9358,14 @@ news-old-unk|old Sony NEWS VT100 emulator common entry, OTbs, OTpt, am, xenl, cols#80, vt#3, OTnl=\n, bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[;H\E[2J, - cr=\r, csr=\E[%i%p1%d;%p2%dr, cub1=^H, cud1=\n, cuf1=\E[C, - cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, ed=\E[J, el=\E[K, - home=\E[H, ht=^I, if=/usr/share/tabset/vt100, kbs=^H, - kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf1=\EOP, - kf2=\EOQ, kf3=\EOR, kf4=\EOS, rc=\E8, rev=\E[7m, ri=\EM, - rmkx=\E[?1l\E>, rmso=\E[m, rmul=\E[m, - rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, sc=\E7, - sgr0=\E[m, smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, + cr=\r, cub1=^H, cud1=\n, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, + cuu1=\E[A, ed=\E[J, el=\E[K, home=\E[H, ht=^I, + if=/usr/share/tabset/vt100, kbs=^H, kcub1=\E[D, + kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf1=\EOP, kf2=\EOQ, + kf3=\EOR, kf4=\EOS, rev=\E[7m, ri=\EM, rmkx=\E[?1l\E>, + rmso=\E[m, rmul=\E[m, + rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, sgr0=\E[m, + smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, use=ansi+csr, # # (nwp512: this had :DE=^H:, which I think means --esr) nwp512|news|nwp514|news40|vt100-bm|nwp512-o|nwp514-o|news-o|news40-o|vt100-bm-o|old Sony VT100 emulator 40 lines, @@ -9105,31 +9417,28 @@ news29|news28-a|old Sony VT100 emulator 29 lines, nwp511|nwp-511|nwp-511 VT100, OTbs, OTpt, am, xenl, cols#80, lines#24, - clear=\E[;H\E[2J$<20/>, cub1=\E[D, cud1=\E[B, cuf1=\E[C, - cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A$<2/>, dl1=\E[M, - ed=\E[J$<30/>, el=\E[K$<3/>, + clear=\E[;H\E[2J$<20/>, cup=\E[%i%p1%d;%p2%dH, + cuu1=\E[A$<2/>, dl1=\E[M, ed=\E[J$<30/>, el=\E[K$<3/>, flash=\E[?5h\0\0\0\0\0\0\0\0\0\0\0\0\0\E[?5l, il1=\E[L, is2=\E[?5l\E[?1l\E>\E[?7h\E[?8h, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, kf5=\EOT, kf6=\E#W, khome=\E[H, ri=\EM$<5/>, rmso=\E[m$<2/>, rmul=\E[m$<2/>, rs2=\E7\E[r\E8\E[?5l\E[?1l\E>\E[?7h\E[?8h, - smso=\E[7m$<2/>, smul=\E[4m$<2/>, + smso=\E[7m$<2/>, smul=\E[4m$<2/>, use=ansi+local1, # (news517: this had :TY=sjis:. --esr) nwp517|nwp-517|nwp-517 VT200 80 cols 30 rows, - eslok, hs, cols#80, lines#30, - OTi2=\E[2$~\n, dsl=\E[1$~, fsl=\E[0$}, + OTi2=\E[2$~\n, dsl=\E[1$~, is2=\E7\E[r\E8\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, - tsl=\E[1$}\E[;%df, use=vt220-base, + tsl=\E[1$}\E[;%df, use=dec+sl, use=vt220-base, # (news517-w: this had :TY=sjis:. --esr) nwp517-w|nwp-517-w|nwp-517 VT200 132 cols 50 rows, - eslok, hs, cols#132, lines#50, - OTi2=\E[2$~\n, dsl=\E[1$~, fsl=\E[0$}, + OTi2=\E[2$~\n, dsl=\E[1$~, is2=\E7\E[r\E8\E>\E[?3h\E[?4l\E[?5l\E[?7h\E[?8h, rs2=\E>\E[?3h\E[?4l\E[?5l\E[?7h\E[?8h, - tsl=\E[1$}\E[;%df, use=vt220-base, + tsl=\E[1$}\E[;%df, use=dec+sl, use=vt220-base, #### Common Desktop Environment # @@ -9140,29 +9449,22 @@ dtterm|CDE desktop terminal, am, mir, msgr, xenl, xon, cols#80, it#8, lines#24, lm#0, ncv@, acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, - bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[J, cr=\r, - csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H, - cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C, - cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, - dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, dl=\E[%p1%dM, - dl1=\E[M, ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K, - enacs=\E(B\E)0, flash=\E[?5h$<200>\E[?5l, home=\E[H, - ht=^I, hts=\EH, ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L, - ind=\ED, invis=\E[8m, is2=\E F\E>\E[?1l\E[?7h\E[?45l, + bel=^G, bold=\E[1m, cr=\r, cub1=^H, cud1=\n, + cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P, + dim=\E[2m, ech=\E[%p1%dX, el1=\E[1K, enacs=\E(B\E)0, + flash=\E[?5h$<200>\E[?5l, home=\E[H, ht=^I, hts=\EH, + ich=\E[%p1%d@, ind=\ED, is2=\E F\E>\E[?1l\E[?7h\E[?45l, kbs=^H, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, - kf1=\E[11~, kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, - kf13=\E[25~, kf14=\E[26~, kf15=\E[28~, kf16=\E[29~, - kf17=\E[31~, kf18=\E[32~, kf19=\E[33~, kf2=\E[12~, - kf20=\E[34~, kf3=\E[13~, kf4=\E[14~, kf5=\E[15~, - kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, - khlp=\E[28~, nel=\EE, rc=\E8, rev=\E[7m, ri=\EM, rmacs=^O, - rmam=\E[?7l, rmir=\E[4l, rmso=\E[22;27m, rmul=\E[24m, - sc=\E7, + khlp=\E[28~, nel=\EE, ri=\EM, rmacs=^O, rmam=\E[?7l, + rmir=\E[4l, rmso=\E[22;27m, rmul=\E[24m, sgr=\E[0%?%p1%t;2;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p5 %t;2%;%?%p6%t;1%;%?%p7%t;8%;m%?%p9%t\016%e\017%;, sgr0=\E[m\017, smacs=^N, smam=\E[?7h, smir=\E[4h, - smso=\E[2;7m, smul=\E[4m, tbc=\E[3g, use=decid+cpr, - use=vt220+vtedit, use=vt220+cvis, use=ecma+color, + smso=\E[2;7m, smul=\E[4m, tbc=\E[3g, use=ansi+csr, + use=ansi+erase, use=ansi+idl, use=ansi+local, + use=ansi+sgr, use=decid+cpr, use=ecma+color, + use=vt220+cvis, use=vt220+sfkeys, use=vt220+vtedit, + use=xterm+r5+fkeys, ######## Non-Unix Consoles # @@ -9183,43 +9485,34 @@ emx-base|DOS special keys, # # Removed: rmacs=\E[10m, smacs=\E[11m, because OS/2 does not implement acs. ansi-emx|ANSI.SYS color, - am, bce, eo, mir, msgr, xon, - colors#8, cols#80, it#8, lines#25, pairs#64, - bel=^G, blink=\E[5m, bold=\E[1m, - clear=\E[1;33;44m\E[H\E[J, cr=\r, cub1=^H, cud1=\n, - cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, - dch=\E[%p1%dp, ed=\E[J, el=\E[K, - flash=\E[?5h$<100/>\E[?5l, home=\E[H, ht=^I, hts=\EH, - ich=\E[%p1%d@, ich1=\E[@, ind=\n, kb2=\E[G, kbs=^H, kf0=\0D, - kll=\0O, kspd=^Z, nel=\r\n, rev=\E[5;37;41m, rmir=\E[4l, - rmpch=\E[10m, rmso=\E[0;44m\E[1;33m, - rmul=\E[0;44m\E[1;33m, rs1=\Ec, setab=\E[4%p1%dm, - setaf=\E[3%p1%dm, sgr0=\E[0m\E[1;33;44m, smir=\E[4h, - smpch=\E[11m, smso=\E[0;31;47m, smul=\E[1;31;44m, - tbc=\E[3g, u8=\E[?6c, u9=\E[c, use=vt220+cvis, - use=emx-base, + eo, + clear=\E[1;33;44m\E[H\E[J, cr=\r, cud1=\n, dch=\E[%p1%dp, + ed=\E[J, flash=\E[?5h$<100/>\E[?5l, ht=^I, hts=\EH, + ich=\E[%p1%d@, ich1=\E[@, ind=\n, kb2=\E[G, kf0=\0D, kll=\0O, + kspd=^Z, nel=\r\n, rev=\E[5;37;41m, rmir=\E[4l, + rmso=\E[0;44m\E[1;33m, rmul=\E[0;44m\E[1;33m, rs1=\Ec, + sgr0=\E[0m\E[1;33;44m, smir=\E[4h, smso=\E[0;31;47m, + smul=\E[1;31;44m, tbc=\E[3g, u8=\E[?6c, u9=\E[c, + use=vt220+cvis, use=emx-base, # nice colors for Emacs (white on blue, mode line white on cyan) ansi-color-2-emx|ANSI.SYS color 2, clear=\E[0;37;44m\E[H\E[J, rev=\E[1;37;46m, - rmso=\E[0;37;44m, rmul=\E[0;37;44m, rs1=\Ec, - setaf=\E[3%p1%dm, sgr0=\E[0;37;44m, smso=\E[1;37;46m, - smul=\E[1;36;44m, use=ansi-emx, + rmso=\E[0;37;44m, rmul=\E[0;37;44m, sgr0=\E[0;37;44m, + smso=\E[1;37;46m, smul=\E[1;36;44m, use=ansi-emx, # nice colors for Emacs (white on black, mode line black on cyan) ansi-color-3-emx|ANSI.SYS color 3, clear=\E[0;37;40m\E[H\E[J, rev=\E[1;37;46m, - rmso=\E[0;37;40m, rmul=\E[0;37;40m, rs1=\Ec, - setaf=\E[3%p1%dm, sgr0=\E[0;10m, smso=\E[1;37;46m, - smul=\E[0;36;40m, use=ansi-emx, + rmso=\E[0;37;40m, rmul=\E[0;37;40m, sgr0=\E[0;10m, + smso=\E[1;37;46m, smul=\E[0;36;40m, use=ansi-emx, mono-emx|stupid monochrome ANSI terminal with only one kind of emphasis, am, cols#80, it#8, lines#24, - clear=\E[H\E[2J$<50>, cub1=\E[D, cud1=\E[B, cuf1=\E[C, - cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, el=\E[K, home=\E[H, - ht=^I, kb2=\E[G, kbs=^H, kcub1=\0K, kcud1=\0P, kcuf1=\0M, - kcuu1=\0H, kf0=\0D, kf1=\0;, kf2=\0<, kf3=\0=, kf4=\0>, - kf5=\0?, kf6=\0@, kf7=\0A, kf8=\0B, kf9=\0C, khome=\0G, - kich1=\0R, kll=\0O, knp=\0Q, kpp=\0I, nel=\r\n, rev=\E[7m, - sgr0=\E[0m, + clear=\E[H\E[2J$<50>, cup=\E[%i%p1%d;%p2%dH, el=\E[K, + home=\E[H, ht=^I, kb2=\E[G, kbs=^H, kcub1=\0K, kcud1=\0P, + kcuf1=\0M, kcuu1=\0H, kf0=\0D, kf1=\0;, kf2=\0<, kf3=\0=, + kf4=\0>, kf5=\0?, kf6=\0@, kf7=\0A, kf8=\0B, kf9=\0C, + khome=\0G, kich1=\0R, kll=\0O, knp=\0Q, kpp=\0I, nel=\r\n, + rev=\E[7m, sgr0=\E[0m, use=ansi+local1, #### Cygwin @@ -9289,30 +9582,19 @@ cygwinB19|ANSI emulation for cygwin32, cygwin|ANSI emulation for Cygwin, am, hs, mir, msgr, xon, colors#8, it#8, pairs#64, - acsc=+\020\,\021-\030.^Y0\333`\004a\261f\370g\361h\260j - \331k\277l\332m\300n\305o~p\304q\304r\304s_t\303u\264v - \301w\302x\263y\363z\362{\343|\330}\234~\376, - bel=^G, bold=\E[1m, clear=\E[H\E[J, cr=\r, cub=\E[%p1%dD, - cub1=^H, cud=\E[%p1%dB, cud1=\E[B, cuf=\E[%p1%dC, - cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, - cuu1=\E[A, dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, - dl1=\E[M, ed=\E[J, el=\E[K, el1=\E[1K, fsl=^G, home=\E[H, - hpa=\E[%i%p1%dG, ht=^I, ich=\E[%p1%d@, ich1=\E[@, - il=\E[%p1%dL, il1=\E[L, ind=\n, invis=\E[8m, kb2=\E[G, - kbs=^H, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, - kf1=\E[[A, kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, - kf13=\E[25~, kf14=\E[26~, kf15=\E[28~, kf16=\E[29~, - kf17=\E[31~, kf18=\E[32~, kf19=\E[33~, kf2=\E[[B, - kf20=\E[34~, kf3=\E[[C, kf4=\E[[D, kf5=\E[[E, kf6=\E[17~, - kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, kspd=^Z, nel=\r\n, - op=\E[39;49m, rc=\E8, rev=\E[7m, ri=\EM, rmacs=\E[10m, - rmir=\E[4l, rmpch=\E[10m, rmso=\E[27m, rmul=\E[24m, - rs1=\Ec\E]R, sc=\E7, setab=\E[4%p1%dm, setaf=\E[3%p1%dm, + bel=^G, bold=\E[1m, cr=\r, cub1=^H, el1=\E[1K, fsl=^G, ht=^I, + ind=\n, invis=\E[8m, kb2=\E[G, khome=\E[1~, kspd=^Z, + nel=\r\n, op=\E[39;49m, rc=\E8, rev=\E[7m, ri=\EM, + rmpch=\E[10m, rmso=\E[27m, rmul=\E[24m, rs1=\Ec\E]R, + sc=\E7, setab=\E[4%p1%dm, setaf=\E[3%p1%dm, sgr=\E[0;10%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p6%t;1%;%?%p7 %t;8%;%?%p9%t;11%;m, - sgr0=\E[0;10m, smacs=\E[11m, smir=\E[4h, smpch=\E[11m, - smso=\E[7m, smul=\E[4m, tsl=\E];, vpa=\E[%i%p1%dd, - use=xterm+alt47, use=vt220+pcedit, use=vt102+enq, + sgr0=\E[0;10m, smpch=\E[11m, smso=\E[7m, smul=\E[4m, + tsl=\E];, use=ansi+arrows, use=ansi+cup, use=ansi+erase, + use=ansi+idc, use=ansi+idl, use=ansi+local, + use=ansi+rca2, use=vt220+pcedit, use=vt102+enq, + use=klone+acs, use=linux+lockeys, use=vt220+sfkeys, + use=vt220+ufkeys, use=xterm+alt47, # I've supplied this so that you can help test new values and add other # features. Cheers, earnie_boyd@yahoo.com. @@ -9322,32 +9604,20 @@ cygwin|ANSI emulation for Cygwin, # this list, but DOES cause problems so it has been removed cygwinDBG|Debug Version for Cygwin, am, eo, mir, msgr, xon, - colors#8, cols#80, it#8, lines#24, ncv#3, pairs#64, - acsc=+\020\,\021-\030.^Y0\333`\004a\261f\370g\361h\260j - \331k\277l\332m\300n\305o~p\304q\304r\304s_t\303u\264v - \301w\302x\263y\363z\362{\343|\330}\234~\376, - bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, clear=\E[H\E[J, - cr=\r, cub=\E[%p1%dD, cub1=\E[D, cud=\E[%p1%dB, cud1=\E[B, - cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, - cuu=\E[%p1%dA, cuu1=\E[A, dch=\E[%p1%dP, dch1=\E[P, - dim=\E[2m, dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K, - el1=\E[1K, flash=\E[?5h$<200/>\E[?5l, home=\E[H, - hpa=\E[%i%p1%dG, ht=^I, hts=\EH, ich=\E[%p1%d@, ich1=\E[@, - il=\E[%p1%dL, il1=\E[L, ind=\n, invis=\E[8m, kNXT=\E[6$, - kPRV=\E[5$, kb2=\E[G, kbs=^H, kcbt=\E[Z, kcub1=\E[D, - kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf1=\E[[A, kf10=\E[21~, - kf11=\E[23~, kf12=\E[24~, kf13=\E[25~, kf14=\E[26~, - kf15=\E[28~, kf16=\E[29~, kf17=\E[31~, kf18=\E[32~, - kf19=\E[33~, kf2=\E[[B, kf20=\E[34~, kf3=\E[[C, kf4=\E[[D, - kf5=\E[[E, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, - kspd=^Z, nel=\r\n, op=\E[39;49m, rc=\E8, rev=\E[7m, ri=\EM, - rmacs=\E[10m, rmir=\E[4l, rmso=\E[m, rmul=\E[m, - rs1=\Ec\E]R, sc=\E7, setab=\E[4%p1%dm, setaf=\E[3%p1%dm, + cols#80, lines#24, + bel=^G, cr=\r, dim=\E[2m, el1=\E[1K, + flash=\E[?5h$<200/>\E[?5l, hpa=\E[%i%p1%dG, ind=\n, + kNXT=\E[6$, kPRV=\E[5$, kb2=\E[G, kcbt=\E[Z, khome=\E[1~, + kspd=^Z, nel=\r\n, op=\E[39;49m, rc=\E8, ri=\EM, rs1=\Ec\E]R, + sc=\E7, sgr=\E[0;10%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p5 %t;2%;%?%p6%t;1%;%?%p7%t;8%;%?%p9%t;12%;m, - sgr0=\E[0;10m, smacs=\E[11m, smir=\E[4h, smso=\E[7m, - smul=\E[4m, tbc=\E[3g, vpa=\E[%i%p1%dd, use=vt220+pcedit, - use=vt220+cvis, use=vt102+enq, + sgr0=\E[0;10m, vpa=\E[%i%p1%dd, use=ansi+arrows, + use=ansi+cup, use=ansi+erase, use=ansi+idc, use=ansi+idl, + use=ansi+inittabs, use=ansi+local, use=ansi+sgrbold, + use=klone+acs, use=klone+color, use=linux+lockeys, + use=vt102+enq, use=vt220+pcedit, use=vt220+cvis, + use=vt220+sfkeys, use=vt220+ufkeys, #### DJGPP @@ -9357,6 +9627,7 @@ cygwinDBG|Debug Version for Cygwin, # Oddly enough, while several combinations of modifiers are tabulated, there is # none for shifted cursor keys. # +# kf1-kf12: # F1 \E[[A # F2 \E[[B # F3 \E[[C @@ -9381,6 +9652,7 @@ cygwinDBG|Debug Version for Cygwin, # Right Arrow \E[C # Up Arrow \E[A # +# kf13-kf24: # Shift-F1 \E[25~ # Shift-F2 \E[26~ # Shift-F3 \E[27~ @@ -9394,6 +9666,7 @@ cygwinDBG|Debug Version for Cygwin, # Shift-F11 \E[35~ # Shift-F12 \E[36~ # +# kf25-kf36: # Ctrl-F1 \E[47~ # Ctrl-F2 \E[48~ # Ctrl-F3 \E[49~ @@ -9418,6 +9691,7 @@ cygwinDBG|Debug Version for Cygwin, # Ctrl-Right Arrow \E[40~ # Ctrl-Up Arrow \E[37~ # +# kf37-kf48: # Alt-F1 \E[59~ # Alt-F2 \E[60~ # Alt-F3 \E[61~ @@ -9431,6 +9705,7 @@ cygwinDBG|Debug Version for Cygwin, # Alt-F11 \E[79~ # Alt-F12 \E[80~ # +# ignore (conflicting): # Alt-Delete \E[65~ # Alt-Down Arrow \E[60~ # Alt-End \E[66~ @@ -9469,30 +9744,42 @@ cygwinDBG|Debug Version for Cygwin, # Alt-X \E[104~ # Alt-Y \E[105~ # Alt-Z \E[106~ -djgpp|ANSI emulation for DJGPP alpha, +djgpp|ANSI emulation for DJGPP 2.05, am, bce, msgr, xhp, xon, xt, colors#8, it#8, pairs#64, acsc=+\020\,\021-\030.^Y0\333`\004a\261f\370g\361h\260j \331k\277l\332m\300n\305o~p\304q\304r\304s_t\303u\264v \301w\302x\263y\363z\362{\343|\330}\234~\376, - bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, civis=\E[1v, - clear=\E[H\E[J, cnorm=\E[v, cr=\r, cub=\E[%p1%dD, cub1=^H, - cud=\E[%p1%dB, cud1=\E[B, cuf=\E[%p1%dC, cuf1=\E[C, - cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, - cvvis=\E[2v, dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, - dl1=\E[M, ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K, - home=\E[H, hpa=\E[%i%p1%dG, ht=^I, ich=\E[%p1%d@, - ich1=\E[@, il=\E[%p1%dL, il1=\E[L, ind=\E[S, invis=\E[8m, - kbs=^H, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, - kf1=\E[[A, kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, - kf2=\E[[B, kf3=\E[[C, kf4=\E[[D, kf5=\E[[E, kf6=\E[17~, - kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, nel=\r\n, op=\E[37;40m, - rev=\E[7m, ri=\E[T, rmso=\E[m, setab=\E[4%p1%dm, - setaf=\E[3%p1%dm, + bel=^G, bold=\E[1m, cbt=\E[Z, civis=\E[1v, cnorm=\E[v, cr=\r, + cub1=^H, cvvis=\E[2v, dch=\E[%p1%dP, dch1=\E[P, + ech=\E[%p1%dX, el1=\E[1K, ht=^I, ich=\E[%p1%d@, ich1=\E[@, + ind=\E[S, kf13=\E[25~, kf14=\E[26~, kf15=\E[27~, + kf16=\E[28~, kf17=\E[29~, kf18=\E[30~, kf19=\E[31~, + kf20=\E[32~, kf21=\E[33~, kf22=\E[34~, kf23=\E[35~, + kf24=\E[36~, kf25=\E[47~, kf26=\E[48~, kf27=\E[49~, + kf28=\E[50~, kf29=\E[51~, kf30=\E[52~, kf31=\E[53~, + kf32=\E[54~, kf33=\E[55~, kf34=\E[56~, kf35=\E[57~, + kf36=\E[58~, kf37=\E[59~, kf38=\E[60~, kf39=\E[61~, + kf40=\E[62~, kf41=\E[63~, kf42=\E[64~, kf43=\E[65~, + kf44=\E[66~, kf45=\E[67~, kf46=\E[68~, kf48=\E[80~, + kf6=\E[17~, khome=\E[1~, nel=\r\n, op=\E[37;40m, ri=\E[T, + setab=\E[4%p1%dm, setaf=\E[3%p1%dm, sgr=\E[0%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%e;25%;%? %p6%t;1%;%?%p7%t;8%;m, - sgr0=\E[m, smso=\E[7m, smul=\E[4m, vpa=\E[%i%p1%dd, - use=vt220+pcedit, use=ecma+index, + sgr0=\E[m, smul=\E[4m, alt_A=\E[82~, alt_B=\E[82~, + alt_C=\E[83~, alt_D=\E[84~, alt_E=\E[85~, alt_F=\E[86~, + alt_G=\E[87~, alt_H=\E[88~, alt_I=\E[89~, alt_J=\E[90~, + alt_K=\E[91~, alt_L=\E[92~, alt_M=\E[93~, alt_N=\E[94~, + alt_O=\E[95~, alt_P=\E[96~, alt_Q=\E[97~, alt_R=\E[98~, + alt_S=\E[99~, alt_T=\E[100~, alt_U=\E[101~, + alt_V=\E[102~, alt_W=\E[103~, alt_X=\E[104~, + alt_Y=\E[105~, alt_Z=\E[106~, kDC5=\E[43~, kDN5=\E[38~, + kEND5=\E[44~, kHOM5=\E[41~, kIC5=\E[42~, kLFT5=\E[39~, + kNXT5=\E[46~, kPRV5=\E[45~, kRIT5=\E[40~, kUP5=\E[37~, + use=ansi+arrows, use=ansi+cup, use=ansi+erase, + use=ansi+idl, use=ansi+local, use=ansi+rca2, + use=ansi+sgr, use=ansi+sgrso, use=ecma+index, + use=linux+lockeys, use=vt220+pcedit, use=vt220+ufkeys, djgpp203|entry for DJGPP 2.03, OTbs, am, @@ -9504,19 +9791,16 @@ djgpp204|entry for DJGPP 2.04, OTbs, am, AX, colors#8, cols#80, it#8, lines#25, ncv#3, pairs#64, bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, civis=\E[1v, - clear=\E[H\E[2J, cnorm=\E[v, cr=\r, cub=\E[%p1%dD, - cub1=\E[D, cud=\E[%p1%dB, cud1=\E[B, cuf=\E[%p1%dC, - cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, - cuu1=\E[A, cvvis=\E[2v, dch=\E[%p1%dP, dch1=\E[P, - dl=\E[%p1%dM, dl1=\E[M, ech=\E[%p1%dX, ed=\E[J, el=\E[K, - home=\E[H, ht=^I, ich=\E[%p1%d@, ich1=\E[@, il=\E[%p1%dL, - il1=\E[L, ind=\E[S, invis=\E[8m, kbs=^H, kcub1=\E[D, - kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf0=\E[21~, kf1=\E[[A, - kf10=\E[21~, kf2=\E[[B, kf3=\E[[C, kf4=\E[[D, kf5=\E[[E, - kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, kll=\E[4~, - nel=\r\n, rev=\E[7m, ri=\E[T, rmso=\E[m, setab=\E[4%p1%dm, + clear=\E[H\E[2J, cnorm=\E[v, cr=\r, + cup=\E[%i%p1%d;%p2%dH, cvvis=\E[2v, dch=\E[%p1%dP, + dch1=\E[P, ech=\E[%p1%dX, ed=\E[J, el=\E[K, home=\E[H, ht=^I, + ich=\E[%p1%d@, ich1=\E[@, ind=\E[S, invis=\E[8m, + kf0=\E[21~, kf10=\E[21~, kf6=\E[17~, kf7=\E[18~, + kf8=\E[19~, kf9=\E[20~, khome=\E[1~, kll=\E[4~, nel=\r\n, + rev=\E[7m, ri=\E[T, rmso=\E[m, setab=\E[4%p1%dm, setaf=\E[3%p1%dm, sgr0=\E[m, smso=\E[7m, smul=\E[4m, - use=vt220+pcedit, use=ecma+index, + use=ansi+arrows, use=ansi+idl, use=ansi+local, + use=linux+lockeys, use=vt220+pcedit, use=ecma+index, #### U/Win @@ -9525,24 +9809,22 @@ djgpp204|entry for DJGPP 2.04, # set (the emulator spits out error messages). Compare with att6386 -TD uwin|U/Win 3.2 console, am, eo, in, msgr, xenl, xon, - colors#8, it#8, ncv#58, pairs#64, + it#8, ncv#58, acsc=+\020\,\021-\030.^Y0\333`\004a\261f\370g\361h\260i \316j\331k\277l\332m\300n\305o~p\304q\304r\304s_t\303u \264v\301w\302x\263y\363z\362{\343|\330}\234~\376, - bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[J, cr=\r, - cub1=^H, cud1=\n, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, - cuu1=\E[A, dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, - ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K, home=\E[H, ht=^I, - hts=\EH, ich=\E[%p1%d@, ich1=\E[@, kbs=^H, kcub1=\E[D, - kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kdch1=^?, kend=\E[Y, - kf1=\EOP, kf10=\EOY, kf11=\EOZ, kf12=\EOA, kf2=\EOQ, - kf3=\EOR, kf4=\EOS, kf5=\EOT, kf6=\EOU, kf7=\EOV, kf8=\EOW, - kf9=\EOX, khome=\E[H, kich1=\E[@, nel=\r\n, op=\E[39;49m, - rc=\E8, rev=\E[7m, rmacs=\E[10m, rmir=\E[4l, rmpch=\E[10m, - rmso=\E[27m, rmul=\E[m, rs1=\Ec\E]R, sc=\E7, - setab=\E[4%p1%dm, setaf=\E[3%p1%dm, sgr0=\E[0;10m, - smacs=\E[11m, smir=\E[4h, smpch=\E[11m, smso=\E[7m, - smul=\E[4m, tbc=\E[3g, use=ansi+cpr, use=vt220+cvis, + bel=^G, blink=\E[5m, bold=\E[1m, cr=\r, cub1=^H, cud1=\n, + cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, dim=\E[2m, + ech=\E[%p1%dX, el1=\E[1K, home=\E[H, ht=^I, hts=\EH, + kdch1=^?, kend=\E[Y, kf1=\EOP, kf10=\EOY, kf11=\EOZ, + kf12=\EOA, kf2=\EOQ, kf3=\EOR, kf4=\EOS, kf5=\EOT, kf6=\EOU, + kf7=\EOV, kf8=\EOW, kf9=\EOX, kich1=\E[@, nel=\r\n, + op=\E[39;49m, rc=\E8, rev=\E[7m, rmacs=\E[10m, + rmpch=\E[10m, rmso=\E[27m, rmul=\E[m, rs1=\Ec\E]R, sc=\E7, + sgr0=\E[0;10m, smacs=\E[11m, smpch=\E[11m, smso=\E[7m, + smul=\E[4m, tbc=\E[3g, use=ansi+arrows, use=ansi+cpr, + use=ansi+erase, use=ansi+idc, use=klone+color, + use=vt220+cvis, #### Microsoft (miscellaneous) @@ -9633,30 +9915,28 @@ interix|opennt|opennt-25|ntconsole|ntconsole-25|OpenNT-term compatible with colo acsc=+\020\,\021-\030.^Y0\333`\004a\261f\370g\361h\260j \331k\277l\332m\300n\305o~p\304q\304r\304s_t\303u\264v \301w\302x\263y\363z\362{\343|\330}\234~\376, - bel=^G, bold=\E[1m, clear=\E[2J, cr=\r, cub=\E[%p1%dD, - cub1=\E[D, cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, - cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, - cuu1=\E[A, dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K, - home=\E[H, ht=^I, il=\E[%p1%dL, il1=\E[L, ind=\E[S, - kLFT=\EF\^, kRIT=\EF$, kbs=^H, kcbt=\E[Z, kcub1=\E[D, - kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kdch1=^?, kend=\E[U, - kf0=\EFA, kf1=\EF1, kf10=\EFA, kf11=\EFB, kf12=\EFC, - kf13=\EFD, kf14=\EFE, kf15=\EFF, kf16=\EFG, kf17=\EFH, - kf18=\EFI, kf19=\EFJ, kf2=\EF2, kf20=\EFK, kf21=\EFL, - kf22=\EFM, kf23=\EFN, kf24=\EFO, kf25=\EFP, kf26=\EFQ, - kf27=\EFR, kf28=\EFS, kf29=\EFT, kf3=\EF3, kf30=\EFU, - kf31=\EFV, kf32=\EFW, kf33=\EFX, kf34=\EFY, kf35=\EFZ, - kf36=\EFa, kf37=\EFb, kf38=\EFc, kf39=\EFd, kf4=\EF4, - kf40=\EFe, kf41=\EFf, kf42=\EFg, kf43=\EFh, kf44=\EFi, - kf45=\EFj, kf46=\EFk, kf47=\EFm, kf48=\EFn, kf49=\EFo, - kf5=\EF5, kf50=\EFp, kf51=\EFq, kf52=\EFr, kf53=\EFs, - kf54=\EFt, kf55=\EFu, kf56=\EFv, kf57=\EFw, kf58=\EFx, - kf59=\EFy, kf6=\EF6, kf60=\EFz, kf7=\EF7, kf8=\EF8, kf9=\EF9, - khome=\E[H, kich1=\E[L, kind=\EF+, kll=\E[U, knp=\E[T, - kpp=\E[S, kri=\EF-, ll=\E[U, nel=\r\n, op=\E[m, rc=\E[u, - rev=\E[7m, ri=\E[T, rmcup=\E[2b\E[u\r\E[K, rmso=\E[m, - rmul=\E[m, rs1=\Ec, sc=\E[s, sgr0=\E[0m, smcup=\E[s\E[1b, - smso=\E[7m, smul=\E[4m, use=ecma+index, use=klone+color, + bel=^G, bold=\E[1m, clear=\E[2J, cr=\r, cud1=\n, + cup=\E[%i%p1%d;%p2%dH, ed=\E[J, el=\E[K, home=\E[H, ht=^I, + ind=\E[S, kLFT=\EF\^, kRIT=\EF$, kcbt=\E[Z, kdch1=^?, + kend=\E[U, kf0=\EFA, kf1=\EF1, kf10=\EFA, kf11=\EFB, + kf12=\EFC, kf13=\EFD, kf14=\EFE, kf15=\EFF, kf16=\EFG, + kf17=\EFH, kf18=\EFI, kf19=\EFJ, kf2=\EF2, kf20=\EFK, + kf21=\EFL, kf22=\EFM, kf23=\EFN, kf24=\EFO, kf25=\EFP, + kf26=\EFQ, kf27=\EFR, kf28=\EFS, kf29=\EFT, kf3=\EF3, + kf30=\EFU, kf31=\EFV, kf32=\EFW, kf33=\EFX, kf34=\EFY, + kf35=\EFZ, kf36=\EFa, kf37=\EFb, kf38=\EFc, kf39=\EFd, + kf4=\EF4, kf40=\EFe, kf41=\EFf, kf42=\EFg, kf43=\EFh, + kf44=\EFi, kf45=\EFj, kf46=\EFk, kf47=\EFm, kf48=\EFn, + kf49=\EFo, kf5=\EF5, kf50=\EFp, kf51=\EFq, kf52=\EFr, + kf53=\EFs, kf54=\EFt, kf55=\EFu, kf56=\EFv, kf57=\EFw, + kf58=\EFx, kf59=\EFy, kf6=\EF6, kf60=\EFz, kf7=\EF7, + kf8=\EF8, kf9=\EF9, kich1=\E[L, kind=\EF+, kll=\E[U, + knp=\E[T, kpp=\E[S, kri=\EF-, ll=\E[U, nel=\r\n, op=\E[m, + rc=\E[u, rev=\E[7m, ri=\E[T, rmcup=\E[2b\E[u\r\E[K, + rmso=\E[m, rmul=\E[m, rs1=\Ec, sc=\E[s, sgr0=\E[0m, + smcup=\E[s\E[1b, smso=\E[7m, smul=\E[4m, use=ansi+arrows, + use=ansi+idl, use=ansi+local, use=ecma+index, + use=klone+color, opennt-35|ntconsole-35|OpenNT-term35 compatible with color, lines#35, use=opennt, @@ -9738,15 +10018,15 @@ altos2|alt2|altos-2|Altos II, ed=\E[J, el=\E[K, home=\E[H, ht=^I, ich1=\E[@, if=/usr/share/tabset/vt100, il1=\E[L, ind=\n, is2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, kDL=^Am\r, - kEOL=^An\r, kbs=^H, kcbt=^AK\r, kclr=^AL\r, kcub1=\E[D, - kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kdch1=^AM\r, kel=^AN\r, + kEOL=^An\r, kcbt=^AK\r, kclr=^AL\r, kdch1=^AM\r, kel=^AN\r, kf0=^AI\r, kf1=^A@\r, kf2=^AA\r, kf3=^AB\r, kf32=^A`\r, kf33=^Aa\r, kf34=^Ab\r, kf35=^Ac\r, kf36=^Ad\r, kf37=^Ae\r, kf38=^Af\r, kf39=^Ag\r, kf4=^AC\r, kf40=^Ah\r, kf41=^Ai\r, kf42=^Aj\r, kf43=^Ak\r, kf5=^AD\r, kf6=^AE\r, kf7=^AF\r, kf8=^AG\r, kf9=^AH\r, khome=\E[f, kil1=^AJ\r, kind=^AO\r, nel=\r\n, rmam=\E[?7l, rmso=\E[m, rmul=\E[m, sgr0=\E[m, - smam=\E[?7h, smso=\E[7m, smul=\E[4m, + smam=\E[?7h, smso=\E[7m, smul=\E[4m, use=ansi+arrows, + # (altos3: had extension capabilities # :c0=^A`\r:c1=^Aa\r:c2=^Ab\r:c3=^Ac\r:\ # :c4=^Ad\r:c5=^Ae\r:c6=^Af\r:c7=^Ag\r:\ @@ -9837,27 +10117,27 @@ hp+pfk+arrows|HP alternate arrow definitions, kll=\Eq\r, kri=\Es\r, hp+arrows|HP arrow definitions, - kcub1=\ED, kcud1=\EB, kcuf1=\EC, kcuu1=\EA, khome=\Eh, - kind=\ES, kll=\EF, kri=\ET, + khome=\Eh, kind=\ES, kll=\EF, kri=\ET, use=vt52+arrows, # Generic stuff from the HP 262x series # hp262x|HP 262x terminals, xhp, blink=\E&dA, dch1=\EP$<2>, ed=\EJ, ht=\011$<2>, ind=\ES, - invis=\E&dS, ip=$<2>, kcub1=\ED, kcud1=\EB, kcuf1=\EC, - kcuu1=\EA, kdch1=\EP, kdl1=\EM, ked=\EJ, kel=\EK, khome=\Eh, - kich1=\EQ, kil1=\EL, kind=\ES, knp=\EU, kpp=\EV, kri=\ET, - krmir=\ER, rev=\E&dB, rmkx=\E&s0A, rmso=\E&d@, rmul=\E&d@, + invis=\E&dS, ip=$<2>, kdch1=\EP, kdl1=\EM, ked=\EJ, kel=\EK, + khome=\Eh, kich1=\EQ, kil1=\EL, kind=\ES, knp=\EU, kpp=\EV, + kri=\ET, krmir=\ER, rev=\E&dB, rmkx=\E&s0A, rmso=\E&d@, + rmul=\E&d@, sgr=\E&d%{64}%?%p1%t%{66}%|%;%?%p2%t%{68}%|%;%?%p3%t%{66}%| %;%?%p4%t%{65}%|%;%c, sgr0=\E&d@, smkx=\E&s1A, smso=\E&dB, smul=\E&dD, + use=vt52+arrows, # Note: no on HPs since that homes to top of memory, not screen. # Due to severe 2621 braindamage, the only way to get the arrow keys to # transmit anything at all is to turn on the function key labels # with , and even then the user has to hold down shift! -# The default 2621 turns off the labels except when it has to to +# The default 2621 turns off the labels except when it has to, to # enable the function keys. If your installation prefers labels # on all the time, or off all the time (at the "expense" of the # function keys), use 2621-nl or 2621-wl. @@ -9881,8 +10161,7 @@ hp2621-fl|HP 2621, xhp@, xon, pb#19200, cbt=\Ei, cup=\E&a%p2%dc%p1%dY, dch1=\EP$<2>, ht=\011$<2>, - ip=$<2>, is2=\E&j@\r, rmkx=\E&j@, rmso=\E&d@, rmul=\E&d@, - sgr0=\E&d@, smkx=\E&jB, smso=\E&dD, smul=\E&dD, + ip=$<2>, is2=\E&j@\r, rmkx=\E&j@, smkx=\E&jB, smso=\E&dD, use=hp+pfk+cr, use=hpgeneric, # To use hp2621p printer, setenv TERM=2621p, PRINTER=2612p @@ -9894,8 +10173,8 @@ hp2621p-a|HP 2621p with fn as arrows, # hp2621 with k45 keyboard hp2621-k45|hp2621k45|k45|HP 2621 with 45 keyboard, - kbs=^H, kcub1=\ED, kcud1=\EB, kcuf1=\EC, kcuu1=\EA, - khome=\Eh, rmkx=\E&s0A, smkx=\E&s1A, use=hp2621, + kbs=^H, khome=\Eh, rmkx=\E&s0A, smkx=\E&s1A, use=hp2621, + use=vt52+arrows, # 2621 using all 48 lines of memory, only 24 visible at any time. hp2621-48|HP 48 line 2621, @@ -10009,21 +10288,20 @@ hp2626-12-s|Hewlett-Packard 2626 11 lines plus status, # hp2627 color tubes from University of Wisconsin # hp2627a-rev|HP 2627 with reverse video colors, - cr=\r, cud1=\n, ht=^I, ind=\n, + ht=^I, is2=\E&v0m1a0b0c1x1y1z1i0a0b1c1x1y1z0i0S\E&j@\r\E3 \r, - kbs=^H, kcub1=^H, kcud1=\n, nel=\r\n, rmul=\E&v0S\E&d@, + kcub1=^H, kcud1=\n, nel=\r\n, rmul=\E&v0S\E&d@, smul=\E&dD\E&v1S, use=hp2621-nl, hp2627a|HP 2627 color terminal with no labels, - cr=\r, cud1=\n, ht=^I, ind=\n, + ht=^I, is2=\E&v0m1a1b0c1i0a1b1c2i1a0b0c0i0S\E&j@\r\E3\r, - kbs=^H, kcub1=^H, kcud1=\n, nel=\r\n, rmso=\E&v0S, + kcub1=^H, kcud1=\n, nel=\r\n, rmso=\E&v0S, rmul=\E&v0S\E&d@, smso=\E&v2S, smul=\E&dD\E&v1S, use=hp2621-nl, hp2627c|HP 2627 color (cyan) terminal with no labels, - cr=\r, cud1=\n, ht=^I, ind=\n, is2=\E&v0m1a0b0c2i1a1b0c1i0a1b1c0i0S\E&j@\r\E3\r, - kbs=^H, kcub1=^H, kcud1=\n, nel=\r\n, use=hp2627a, + use=hp2627a, # hp2640a doesn't have the Y cursor addressing feature, and C is # memory relative instead of screen relative, as we need. @@ -10052,14 +10330,13 @@ hp2641a|hp2645a|hp2647a|HP 264?A series BRL entry, # software to support it. hp2645|hp45|HP 2645 series, pb#9600, - blink=\E&dA, cr=\r$<20>, dim=\E&dH, kctab=\E2, kcub1=\ED, - kcud1=\EB, kcuf1=\EC, kcuu1=\EA, kdch1=\EP, kdl1=\EM, - ked=\EJ, kel=\EK, khome=\Eh, khts=\E1, kich1=\EQ, kil1=\EL, - kind=\ES, knp=\EU, kpp=\EV, kri=\ET, krmir=\ER, rev=\E&dB, - rmkx=\E&s0A, + blink=\E&dA, cr=\r$<20>, dim=\E&dH, kctab=\E2, kdch1=\EP, + kdl1=\EM, ked=\EJ, kel=\EK, khome=\Eh, khts=\E1, kich1=\EQ, + kil1=\EL, kind=\ES, knp=\EU, kpp=\EV, kri=\ET, krmir=\ER, + rev=\E&dB, rmkx=\E&s0A, sgr=\E&d%{64}%?%p1%t%{66}%|%;%?%p2%t%{68}%|%;%?%p3%t%{66}%| %;%?%p4%t%{65}%|%;%?%p5%t%{72}%|%;%?%p6%t%{66}%|%;%c, - sgr0=\E&d@, smkx=\E&s1A, smul=\E&dD, use=hpgeneric, + sgr0=\E&d@, smkx=\E&s1A, use=hpgeneric, use=vt52+arrows, # You should use this terminal at 4800 baud or less. hp2648|hp2648a|HP 2648a graphics terminal, clear=\EH\EJ$<50>, cup=\E&a%p2%dc%p1%dY$<20>, @@ -10093,11 +10370,10 @@ hp2621-a|hp2621a-a|hp2621 with fn as arrows, # newer hewlett packard terminals newhpkeyboard|generic entry for HP extended keyboard, - kbs=^H, kcbt=\Ei, kclr=\EJ, kcub1=\ED, kcud1=\EB, kcuf1=\EC, - kcuu1=\EA, kdch1=\EP, kdl1=\EM, ked=\EJ, kel=\EK, khome=\Eh, - kich1=\EQ, kil1=\EL, kind=\ET, kll=\EF, knp=\EU, kpp=\EV, - kri=\ES, krmir=\ER, rmkx=\E&s0A, smkx=\E&s1A, - use=hp+pfk-cr, + kbs=^H, kcbt=\Ei, kclr=\EJ, kdch1=\EP, kdl1=\EM, ked=\EJ, + kel=\EK, khome=\Eh, kich1=\EQ, kil1=\EL, kind=\ET, kll=\EF, + knp=\EU, kpp=\EV, kri=\ES, krmir=\ER, rmkx=\E&s0A, + smkx=\E&s1A, use=hp+pfk-cr, use=vt52+arrows, newhp|generic entry for new Hewlett Packard terminals, am, bw, mir, xhp, xon, @@ -10151,11 +10427,10 @@ hp+printer|"standard" printer info for HP ttys, # length label, the following character is eaten! hp2621b|HP 2621b with old style keyboard, lh#1, lm#48, lw#8, nlab#8, - kcub1=\ED, kcud1=\EB, kcuf1=\EC, kcuu1=\EA, khome=\Eh, - kind=\ET, kll=\EF, kri=\ES, + khome=\Eh, kind=\ET, kll=\EF, kri=\ES, pln=\E&f0a%p1%dk%p2%l%Pa%?%ga%t%ga%d%e1%;d3L%?%ga%!%t%{32}%c %;%p2%s\E%{111}%p1%+%c\r, - smln=\E&jB, use=hp2621, + smln=\E&jB, use=hp2621, use=vt52+arrows, hp2621b-p|HP 2621b with printer, use=hp+printer, use=hp2621b, @@ -10234,29 +10509,25 @@ hpansi|hp700|Hewlett Packard 700/44 in HP-PCterm mode, cols#80, lines#25, acsc=j\331k\277l\332m\300n\305q\304t\303u\264v\301w\302x \263, - bel=^G, cbt=\E[Z, clear=\E[2J\E[H, cr=\r, cub1=\E[D, - cud1=\E[B, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, - dch1=\E[P, dl1=\E[M, ed=\E[J, el=\E[K, home=\E[H, ht=^I, - ich1=\E[@, il1=\E[L, ind=\n, + bel=^G, cbt=\E[Z, clear=\E[2J\E[H, cr=\r, + cup=\E[%i%p1%d;%p2%dH, dch1=\E[P, dl1=\E[M, ed=\E[J, + el=\E[K, home=\E[H, ht=^I, ich1=\E[@, il1=\E[L, ind=\n, is2=\E[44"p\E[?7h\E[>10h\E[>12h\EP1;1|3/7F\E\\, - kbs=^H, kcbt=\E[Z, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, - kcuu1=\E[A, kend=\E[4~, kf1=\E[17~, kf10=\E[28~, - kf2=\E[18~, kf3=\E[19~, kf4=\E[20~, kf5=\E[21~, kf6=\E[23~, - kf7=\E[24~, kf8=\E[25~, kf9=\E[26~, khome=\E[1~, knp=\E[6~, - kpp=\E[5~, rmam=\E[?7l, - rmsc=\E[>11l\EP1**x0/11;1/13\E[m\E\\, rmso=\E[m, - rmul=\E[m, sgr0=\E[m, smam=\E[?7h, + kcbt=\E[Z, kend=\E[4~, kf1=\E[17~, kf10=\E[28~, kf2=\E[18~, + kf3=\E[19~, kf4=\E[20~, kf5=\E[21~, kf6=\E[23~, kf7=\E[24~, + kf8=\E[25~, kf9=\E[26~, khome=\E[1~, knp=\E[6~, kpp=\E[5~, + rmam=\E[?7l, rmsc=\E[>11l\EP1**x0/11;1/13\E[m\E\\, + rmso=\E[m, rmul=\E[m, sgr0=\E[m, smam=\E[?7h, smsc=\E[>11h\EPO**x0/65;1/67\E\\$<250>, smso=\E[7m, - smul=\E[4m, xoffc=g, xonc=e, use=vt220+cvis, + smul=\E[4m, xoffc=g, xonc=e, use=ansi+arrows, + use=ansi+local1, use=vt220+cvis, # # (hp2392: copied here from hpex -- esr) hp2392|239x series, cols#80, - cbt=\Ei, cup=\E&a%p1%dy%p2%dC, kf1=\Ep\r, kf2=\Eq\r, - kf3=\Er\r, kf4=\Es\r, kf5=\Et\r, kf6=\Eu\r, kf7=\Ev\r, - kf8=\Ew\r, khome=\Eh, kind=\EU, knp=\Eu, kpp=\Ev, kri=\EV, - rmir=\ER, rmul=\E&d@, smir=\EQ, smul=\E&dD, vpa=\E&a%p1%dY, - use=hpsub, + cbt=\Ei, cup=\E&a%p1%dy%p2%dC, khome=\Eh, kind=\EU, + knp=\Eu, kpp=\Ev, kri=\EV, rmir=\ER, rmul=\E&d@, smir=\EQ, + smul=\E&dD, vpa=\E&a%p1%dY, use=hpsub, use=hp+pfk+cr, hpsub|HP terminals -- capability subset, am, da, db, mir, xhp, xon, @@ -10264,9 +10535,9 @@ hpsub|HP terminals -- capability subset, bel=^G, clear=\EH\EJ, cr=\r, cub1=^H, cud1=\EB, cuf1=\EC, cuu1=\EA, dch1=\EP, dl1=\EM, ed=\EJ, el=\EK, hpa=\E&a%p1%dC, ht=^I, if=/usr/share/tabset/stdcrt, il1=\EL, ind=\n, - is2=\E&s1A\E<\E&k0\\, kbs=^H, kcub1=\ED, kcud1=\EB, - kcuf1=\EC, kcuu1=\EA, khome=\Eh, rmkx=\E&s0A, rmso=\E&d@, - sgr0=\E&d@, smkx=\E&s1A, smso=\E&dB, + is2=\E&s1A\E<\E&k0\\, kbs=^H, khome=\Eh, rmkx=\E&s0A, + rmso=\E&d@, sgr0=\E&d@, smkx=\E&s1A, smso=\E&dB, + use=vt52+arrows, # hpex: # May be used for most 24 x 80 hp terminals, @@ -10279,9 +10550,9 @@ hpsub|HP terminals -- capability subset, # (hpex: removed memory-lock capabilities ":ml=\El:mu=\Em:", # moved here from hpsub -- esr) hpex|HP extended capabilities, - cr=\r, cud1=\n, cup=\E&a%p1%dy%p2%dC, ht=^I, ind=\n, kbs=^H, - kcub1=^H, kcud1=\n, nel=\r\n, rmir=\ER, rmul=\E&d@, smir=\EQ, - smul=\E&dD, vpa=\E&a%p1%dY, use=hpsub, + cud1=\n, cup=\E&a%p1%dy%p2%dC, kcub1=^H, kcud1=\n, + nel=\r\n, rmir=\ER, rmul=\E&d@, smir=\EQ, smul=\E&dD, + vpa=\E&a%p1%dY, use=hpsub, # From: Ville Sulko , 05 Aug 1996 hp2|hpex2|Hewlett-Packard extended capabilities newer version, @@ -10323,10 +10594,9 @@ hp300h|HP Catseye console, cuf1=\EC, cup=\E&a%p1%dy%p2%dC, cuu1=\EA, dch1=\EP, dl1=\EM, ed=\EJ, el=\EK, hpa=\E&a%p1%dC, ht=^I, if=/usr/share/tabset/stdcrt, il1=\EL, ind=\n, kbs=^H, - kcub1=\ED, kcud1=\EB, kcuf1=\EC, kcuu1=\EA, khome=\Eh, - rmir=\ER, rmkx=\E&s0A, rmso=\E&d@, rmul=\E&d@, sgr0=\E&d@, - smir=\EQ, smkx=\E&s1A, smso=\E&dB, smul=\E&dD, tbc=\E3, - vpa=\E&a%p1%dY, + khome=\Eh, rmir=\ER, rmkx=\E&s0A, rmso=\E&d@, rmul=\E&d@, + sgr0=\E&d@, smir=\EQ, smkx=\E&s1A, smso=\E&dB, smul=\E&dD, + tbc=\E3, vpa=\E&a%p1%dY, use=vt52+arrows, # From: Greg Couch hp9837|hp98720|hp98721|HP 9000/300 workstations, OTbs, am, da, db, mir, xhp, @@ -10334,12 +10604,11 @@ hp9837|hp98720|hp98721|HP 9000/300 workstations, bel=^G, cbt=\Ei, clear=\E&a0y0C\EJ, cub1=^H, cud1=\EB, cuf1=\EC, cup=\E&a%p1%dy%p2%dC, cuu1=\EA, dch1=\EP, dl1=\EM, ed=\EJ, el=\EK, hpa=\E&a%p1%dC, ht=^I, hts=\E1, - il1=\EL, ind=\n, is2=\E&v0m1b0i&j@, kbs=^H, kcub1=\ED, - kcud1=\EB, kcuf1=\EC, kcuu1=\EA, kdch1=\EP, kdl1=\EM, - ked=\EJ, kel=\EK, khome=\Eh, kich1=\EQ, kil1=\EL, knp=\EU, - kpp=\EV, rmir=\ER, rmkx=\E&s0A, rmso=\E&v0S, rmul=\E&d@, - sgr0=\E&d@, smir=\EQ, smkx=\E&s1A, smso=\E&v5S, smul=\E&dD, - tbc=\E3, vpa=\E&a%p1%dY, + il1=\EL, ind=\n, is2=\E&v0m1b0i&j@, kbs=^H, kdch1=\EP, + kdl1=\EM, ked=\EJ, kel=\EK, khome=\Eh, kich1=\EQ, kil1=\EL, + knp=\EU, kpp=\EV, rmir=\ER, rmkx=\E&s0A, rmso=\E&v0S, + rmul=\E&d@, sgr0=\E&d@, smir=\EQ, smkx=\E&s1A, smso=\E&v5S, + smul=\E&dD, tbc=\E3, vpa=\E&a%p1%dY, use=vt52+arrows, # HP 9845 desktop computer from BRL # (hp9845: removed unknown capability :gu: -- esr) hp9845|HP 9845, @@ -10354,30 +10623,31 @@ hp9845|HP 9845, # added empty to avoid warnings re / --esr) hp98550|hp98550a|HP 9000 Series 300 color console, OTbs, am, da, db, mir, xhp, - cols#128, it#8, lines#49, lm#0, + cols#128, lines#49, lm#0, acsc=, bel=^G, blink=\E&dA, bold=\E&dJ, cbt=\Ei, civis=\E*dR, clear=\EH\EJ, cnorm=\E*dQ, cr=\r, cub1=^H, cud1=\n, cuf1=\EC, cup=\E&a%p1%dy%p2%dC, cuu1=\EA, dch1=\EP, dim=\E&dH, - dl1=\EM, ed=\EJ, el=\EK, hpa=\E&a%p1%dC, ht=^I, hts=\E1, + dl1=\EM, ed=\EJ, el=\EK, hpa=\E&a%p1%dC, hts=\E1, if=/usr/share/tabset/std, il1=\EL, ind=\n, invis=\E&ds, kbs=^H, kclr=\EJ, kctab=\E2, kdch1=\EP, kdl1=\EM, ked=\EJ, kel=\EK, khts=\E1, kich1=\EQ, kil1=\EL, kll=\EF, knp=\EU, kpp=\EV, krmir=\ER, ktbc=\E3, rev=\E&dJ, rmacs=^O, rmir=\ER, rmkx=\E&s0A, rmso=\E&d@, rmul=\E&d@, sgr0=\E&d@, smacs=^N, smir=\EQ, smkx=\E&s1A, smso=\E&dJ, smul=\E&dD, tbc=\E3, - vpa=\E&a%p1%dY, use=hp+pfk-cr, use=hp+arrows, + vpa=\E&a%p1%dY, use=hp+pfk-cr, use=ansi+inittabs, + use=hp+arrows, # From: Martin Trusler hp98550-color|hp98550a-color|HP 9000 Series 300 color console (Trusler), OTbs, am, ccc, da, db, km, mir, xhp, - colors#8, cols#128, it#8, lh#2, lines#49, lm#0, lw#8, nlab#8, - pairs#8, xmc#0, + colors#8, cols#128, lh#2, lines#49, lm#0, lw#8, nlab#8, pairs#8, + xmc#0, acsc=+>\,<-\^.v0\374``a\374f\372g\376h\374j+k+l+m+n+o-q-s-t+ u+v+w+x|y{*|!}\273~\362, bel=^G, bold=\E&dD, cbt=\Ei, clear=\EH\EJ, cr=\r, cub1=^H, cud1=\EB, cuf1=\EC, cup=\E&a%p1%dy%p2%dC, cuu1=\EA, dch1=\EP, dl1=\EM, ed=\EJ, el=\EK, home=\E&a0y0C, - hpa=\E&a%p1%dC, ht=^I, hts=\E1, il1=\EL, ind=\ES, + hpa=\E&a%p1%dC, hts=\E1, il1=\EL, ind=\ES, initp=\E&v0m%?%p2%{1000}%=%t1%e.%p2%d%;a%?%p3%{1000}%=%t1%e. %p3%d%;b%?%p4%{1000}%=%t1%e.%p4%d%;c%?%p5%{1000}%=%t1 %e.%p5%d%;x%?%p6%{1000}%=%t1%e.%p6%d%;y%?%p7%{1000}%= @@ -10400,7 +10670,7 @@ hp98550-color|hp98550a-color|HP 9000 Series 300 color console (Trusler), smir=\EQ, smkx=\E&s1A, smln=\E&jB, smm=\E&k1I, smso=\E&dB, smul=\E&dD, tbc=\E3, u6=\Ea%dc%dR\r, u7=\Ea, u8=\E%[0123456789/], u9=\E*s1\^, vpa=\E&a%p1%dY, - use=hp+pfk-cr, use=hp+arrows, + use=hp+pfk-cr, use=ansi+inittabs, use=hp+arrows, # From: Victor Duchovni # (hp700-wy: removed obsolete ":nl=^J:"; @@ -10439,23 +10709,24 @@ bobcat|sbobcat|HP 9000 model 300 console, cbt=\Ei, clear=\EH\EJ, cr=\r, cub1=^H, cud1=\EB, cuf1=\EC, cup=\E&a%p1%dy%p2%dC$<6/>, cuu1=\EA, dch1=\EP, dl1=\EM$<10*/>, ed=\EJ, el=\EK, hpa=\E&a%p1%dC$<6/>, ht=^I, - il1=\EL$<10*/>, ind=\n, kbs=^H, kcub1=\ED, kcud1=\EB, - kcuf1=\EC, kcuu1=\EA, khome=\Eh, nel=\r\n, rmir=\ER, - rmkx=\E&s0A, rmso=\E&d@, rmul=\E&d@, sgr0=\E&d@, smir=\EQ, - smkx=\E&s1A, smso=\E&dB, smul=\E&dD, vpa=\E&a%p1%dY$<6/>, + il1=\EL$<10*/>, ind=\n, kbs=^H, khome=\Eh, nel=\r\n, + rmir=\ER, rmkx=\E&s0A, rmso=\E&d@, rmul=\E&d@, sgr0=\E&d@, + smir=\EQ, smkx=\E&s1A, smso=\E&dB, smul=\E&dD, + vpa=\E&a%p1%dY$<6/>, use=vt52+arrows, gator-t|HP 9000 model 237 emulating extra-tall AAA, lines#94, use=gator, gator|HP 9000 model 237 emulating AAA, bw, km, mir, ul, cols#128, it#8, lines#47, - bel=^G, cbt=\E[Z, clear=\E[H\E[J, cr=\r, cub1=^H, cud1=\n, - cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, cuu1=\EM, - dch=\E[%p1%dP$<4/>, dch1=\E[P, dl=\E[%p1%dM$<1*/>, - dl1=\E[M, ed=\E[J, el=\E[K, home=\E[H, hpa=\E[%i%p1%d`, - ht=^I, ich=\E[%p1%d@$<4/>, ich1=\E[@, il=\E[%p1%dL$<1*/>, - il1=\E[L, kbs=^H, kcub1=^H, kcud1=\n, nel=\r\n, - rep=%p1%c\E[%p2%db$<1*/>, rev=\E[7m, rmso=\E[m, + bel=^G, cbt=\E[Z, cr=\r, cub1=^H, cud1=\n, cuf1=\E[C, + cup=\E[%i%p1%d;%p2%dH, cuu1=\EM, dch=\E[%p1%dP$<4/>, + dch1=\E[P, dl=\E[%p1%dM$<1*/>, dl1=\E[M, home=\E[H, + hpa=\E[%i%p1%d`, ht=^I, ich=\E[%p1%d@$<4/>, ich1=\E[@, + il=\E[%p1%dL$<1*/>, il1=\E[L, kbs=^H, kcub1=^H, kcud1=\n, + nel=\r\n, rep=%p1%c\E[%p2%db$<1*/>, rev=\E[7m, rmso=\E[m, rmul=\E[m, sgr0=\E[m, smso=\E[7m, smul=\E[4m, + use=ansi+erase, + gator-52|HP 9000 model 237 emulating VT52, cols#128, lines#47, use=vt52-basic, gator-52t|HP 9000 model 237 emulating extra-tall VT52, @@ -10539,8 +10810,7 @@ adm3a+|adm3a plus, # (adm5: removed obsolete ":ma=^Hh^Jj^Kk^Ll^^H:" & duplicate ":do=^J:" -- esr) adm5|LSI adm5, xmc#1, - bel=^G, cr=\r, cud1=\n, ed=\EY, el=\ET, kbs=^H, khome=^^, - rmso=\EG, smso=\EG, use=adm3a+, + ed=\EY, el=\ET, khome=^^, rmso=\EG, smso=\EG, use=adm3a+, # A lot of terminals other than adm11s use these. Wherever you see # use=adm+sgr with some of its capabilities disabled, try the # disabled ones. They may well work but not have been documented or @@ -10634,10 +10904,9 @@ adm20|Lear Siegler adm20, sgr0=\E(, smso=\E), adm21|Lear Siegler adm21, xmc#1, - bel=^G, cr=\r, cud1=\n, dch1=\EW, dl1=\ER$<30*>, ed=\EY, - el=\ET, ich1=\EQ, il1=\EE$<30*>, ind=\n, invis@, kbs=^H, - kcub1=^H, kcud1=\n, kcuf1=^L, kcuu1=^K, khome=^^, - use=adm+sgr, use=adm3a, + dch1=\EW, dl1=\ER$<30*>, ed=\EY, el=\ET, ich1=\EQ, + il1=\EE$<30*>, invis@, kbs=^H, khome=^^, use=adm+sgr, + use=adm3a, # (adm22: ":em=:" was an obvious typo for ":ei=:"; also, # removed obsolete ":kn#7:ma=j^Jk^P^K^Pl ^R^L^L :"; # removed bogus-looking \200 from before . -- esr) @@ -10863,18 +11132,17 @@ adm1178|1178|LSI adm1178, pt100|pt200|wren|fenix|Prime pt100/pt200, am, bw, mir, msgr, cols#80, it#8, lines#24, - cbt=\E[Z, clear=\E?, cr=\r, cub=\E[%p1%dD, cub1=^H, - cud=\E[%p1%dB, cud1=\ED, cuf=\E[%p1%dC, cuf1=\E[C, - cup=\E0%p1%{33}%+%c%p2%{33}%+%c, cuu=\E[%p1%dA, - cuu1=\EM, dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, dl1=\E[M, - ed=\E[J\E[r, el=\E[K\E[t, flash=\E$$<200/>\E$P, - home=\E$B, ht=^I, il1=\E[L\E[t, ind=\n, kbs=^H, kcub1=\E[D, - kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, khome=\E$A, nel=\r\n, - rmcup=, rmir=\E[4l, rmkx=\E[>13l, rmso=\E[m, rmul=\E[m, - sgr0=\E[m, + cbt=\E[Z, clear=\E?, cr=\r, cub1=^H, cud1=\ED, + cup=\E0%p1%{33}%+%c%p2%{33}%+%c, cuu1=\EM, + dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, dl1=\E[M, ed=\E[J\E[r, + el=\E[K\E[t, flash=\E$$<200/>\E$P, home=\E$B, ht=^I, + il1=\E[L\E[t, ind=\n, khome=\E$A, nel=\r\n, rmcup=, + rmir=\E[4l, rmkx=\E[>13l, rmso=\E[m, rmul=\E[m, sgr0=\E[m, smcup=\E[>1l\E[>2l\E[>16l\E[4l\E[>9l\E[20l\E[>3l\E[>7h\E[>12 l\E[1Q, smir=\E[4h, smkx=\E[>13h, smso=\E[2;7m, smul=\E[4m, + use=ansi+arrows, use=ansi+local, + pt100w|pt200w|wrenw|fenixw|Prime pt100/pt200 in 132-column mode, cols#132, cup=\E[%i%p1%d;%p2%dH, use=pt100, @@ -10949,20 +11217,20 @@ qvt103|Qume qvt 103, am, xenl, xon, cols#80, it#8, lines#24, vt#3, bel=^G, blink=\E[5m$<2>, bold=\E[1m$<2>, - clear=\E[H\E[2J$<50>, cr=\r, csr=\E[%i%p1%d;%p2%dr, - cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\n, - cuf=\E[%p1%dC, cuf1=\E[C$<2>, - cup=\E[%i%p1%d;%p2%dH$<5>, cuu=\E[%p1%dA, + clear=\E[H\E[2J$<50>, cr=\r, cub1=^H, cud1=\n, + cuf1=\E[C$<2>, cup=\E[%i%p1%d;%p2%dH$<5>, cuu1=\E[A$<2>, ed=\E[J$<50>, el=\E[K$<3>, home=\E[H, ht=^I, hts=\EH, ind=\n, kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, - kcuu1=\EOA, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, rc=\E8, + kcuu1=\EOA, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, rev=\E[7m$<2>, ri=\EM$<5>, rmam=\E[?7l, rmkx=\E[?1l\E>, rmso=\E[m$<2>, rmul=\E[m$<2>, - rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, sc=\E7, + rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, sgr=\E[%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1 %;m$<2>, sgr0=\E[m$<2>, smam=\E[?7h, smkx=\E[?1h\E=, - smso=\E[7m$<2>, smul=\E[4m$<2>, tbc=\E[3g, + smso=\E[7m$<2>, smul=\E[4m$<2>, tbc=\E[3g, use=ansi+csr, + use=ansi+local, + qvt103-w|Qume qvt103 132 cols, cols#132, lines#24, rs2=\E>\E[?3h\E[?4l\E[?5l\E[?8h, use=qvt103, @@ -11776,7 +12044,7 @@ tvi925|TeleVideo 925, # to avoid "magic cookie" standout glitch: tvi925-hi|TeleVideo Model 925 with half intensity standout mode, xmc@, - kbs=^H, kcub1=^H, kcud1=\n, rmso=\E(, smso=\E), use=tvi925, + kcud1=\n, rmso=\E(, smso=\E), use=tvi925, # From: Todd Litwin 28 May 1993 # Originally Tim Curry, Univ. of Central Fla., 5/21/82 @@ -11974,8 +12242,8 @@ tvi950-rv-4p|TeleVideo 950 rev video w/4 pages, # If the BSD termcap file was right, would # also work. tvi955|TeleVideo 955, - OTbs, mc5i, msgr@, - it#8, xmc@, + mc5i, msgr@, + xmc@, acsc=0_`RjHkGlFmEnIoPqKsQtMuLvOwNxJ, blink=\EG2, civis=\E.0, cnorm=\E.2, cud1=^V, cup=\E[%i%p1%d;%p2%dH, cvvis=\E.1, dim=\E[=5h, ind@, invis=\EG1, @@ -11984,8 +12252,7 @@ tvi955|TeleVideo 955, rmam=\E[=7l, rmxon=^N, rs1=\EDF\EC\Eg\Er\EO\E'\E(\Ew\EX\Ee\s\017\E0P\E6\0\E0p\E4\0 \Ef\r, - sgr0=\EG0\E[=5l, smacs=\E$, smam=\E[=7h, smxon=^O, - use=tvi950, + sgr0=\EG0\E[=5l, smam=\E[=7h, smxon=^O, use=tvi950, tvi955-w|955-w|TeleVideo 955 w/132 cols, cols#132, is2=\E[=3h\EF1\Ed\EG0\E[=5l\E%\El, use=tvi955, @@ -12008,13 +12275,13 @@ tvi970|TeleVideo 970, ed=\E[J, el=\E[K, flash=\E[5m$<200/>\E[m, home=\E[H, hpa=\E[%i%p1%dG, ht=^I, il1=\E[L, is2=\E<\E[?21l\E[19h\E[1Q\E[10l\E[7l\E[H\E[2J, - kbs=^H, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf1=\E?a, kf2=\E?b, kf3=\E?c, kf4=\E?d, kf5=\E?e, kf6=\E?f, - kf7=\E?g, kf8=\E?h, kf9=\E?i, khome=\E[H, ri=\EM, rmacs=\E(B, + kf7=\E?g, kf8=\E?h, kf9=\E?i, ri=\EM, rmacs=\E(B, rmam=\E[?7h, rmcup=, rmir=\E[4l, rmso=\E[m, rmul=\E[m, sgr0=\E[m, smacs=\E(B, smam=\E[?7l, smcup=\E[?20l\E[?7h\E[1Q, smir=\E[4h, smso=\E[7m, - smul=\E[4m, vpa=\E[%i%p1%dd, + smul=\E[4m, vpa=\E[%i%p1%dd, use=ansi+arrows, + tvi970-vb|TeleVideo 970 with visual bell, flash=\E[?5h\0\0\0\0\0\0\0\0\0\0\0\0\0\E[?5l, use=tvi970, @@ -12046,10 +12313,9 @@ tvi9065|TeleVideo 9065, wnum#0, wsl#30, acsc='r0_jhkglfmeniopqksqtmulvownxj, bel=^G, blink=\EG2, bold=\EG\,, cbt=\EI, civis=\E.0, clear=^Z, - cnorm=\E.3, cr=\r, csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, - cub1=^H, cud=\E[%p1%dB, cud1=^V, cuf=\E[%p1%dC, cuf1=^L, - cup=\E=%p1%{32}%+%c%p2%{32}%+%c, cuu=\E[%p1%dA, - cuu1=^K, cvvis=\E.2, dch=\E[%p1%dP, dch1=\EW, dim=\EGp, + cnorm=\E.3, cr=\r, csr=\E[%i%p1%d;%p2%dr, cub1=^H, cud1=^V, + cuf1=^L, cup=\E=%p1%{32}%+%c%p2%{32}%+%c, cuu1=^K, + cvvis=\E.2, dch=\E[%p1%dP, dch1=\EW, dim=\EGp, dl=\E[%p1%dM, dl1=\ER, dsl=\E_30\r, ech=\E[%p1%d@, ed=\EY, el=\ET, flash=\Eb$<15>\Ed, fsl=\r, home=^^, ht=^I, hts=\E1, ich=\E[%p1%d@, if=/usr/share/tabset/stdcrt, @@ -12081,7 +12347,8 @@ tvi9065|TeleVideo 9065, %p9%t\E$%e\E%%%;, sgr0=\EG0\E%, smacs=\E$, smam=\E=7h, smcup=\E.2, smdc=\Er, smir=\Eq, smln=\E[4;2v, smso=\EGt, smul=\EG8, smxon=^O, - tbc=\E3, tsl=\E[4;1v\E_30, uc=\EG8\EG0, use=ecma+index, + tbc=\E3, tsl=\E[4;1v\E_30, uc=\EG8\EG0, use=ansi+local, + use=ecma+index, #### Visual (vi) # @@ -12108,14 +12375,10 @@ tvi9065|TeleVideo 9065, # disguise; - are really l1-l3. vi50|Visual 50, OTbs, OTpt, am, da, db, msgr, - cols#80, it#8, lines#24, - OTnl=\n, bel=^G, cbt=\Ez$<4/>, clear=\EH\EJ, cr=\r, cub1=^H, - cud1=\EB, cuf1=\EC, cup=\EY%p1%{32}%+%c%p2%{32}%+%c, - cuu1=\EA, dl1=\EM$<3*/>, ed=\EJ, el=\EK$<16/>, home=\EH, - ht=^I, il1=\EL, ind=\n, kbs=^H, kcub1=\ED, kcud1=\EB, - kcuf1=\EC, kcuu1=\EA, kf1=\EP, kf2=\EQ, kf3=\ER, kf4=\EV, + OTnl=\n, cbt=\Ez$<4/>, cub1=^H, dl1=\EM$<3*/>, + el=\EK$<16/>, il1=\EL, kf1=\EP, kf2=\EQ, kf3=\ER, kf4=\EV, kf5=\EE, kf6=\E], kf7=\EL, kf8=\Ev, kf9=\EM, khome=\EH, - nel=\r\n, ri=\EI, rmso=\ET, rmul=\EW, smso=\EU, smul=\ES, + rmso=\ET, rmul=\EW, smso=\EU, smul=\ES, use=vt52-basic, # this one was BSD & SCO's vi50 vi50adm|Visual 50 in adm3a mode, am, msgr, @@ -12123,8 +12386,7 @@ vi50adm|Visual 50 in adm3a mode, bel=^G, clear=^Z, cr=\r, cub1=^H, cud1=\n, cuf1=^L, cup=\E=%p1%{32}%+%c%p2%{32}%+%c, cuu1=^K, dl1=\EM, ed=\Ek, el=\EK, home=\EH, ht=^I, il1=\EL, ind=\n, kbs=^H, - kcub1=\ED, kcud1=\EB, kcuf1=\EC, kcuu1=\EA, khome=\EH, - rmso=\ET, smso=\EU, + khome=\EH, rmso=\ET, smso=\EU, use=vt52+arrows, # From: Jeff Siegal vi55|Visual 55, OTbs, am, mir, msgr, @@ -12132,9 +12394,8 @@ vi55|Visual 55, clear=\Ev, csr=\E_%p1%{65}%+%c%p2%{65}%+%c, cub1=^H, cud1=\n, cuf1=\EC, cup=\EY%p1%{32}%+%c%p2%{32}%+%c, cuu1=\EA, dch1=\Ew, dl1=\EM, ed=\EJ, el=\EK, home=\EH, ht=^I, - il1=\EL, is2=\Ev\E_AX\Eb\EW\E9P\ET, kbs=^H, kcub1=\ED, - kcud1=\EB, kcuf1=\EC, kcuu1=\EA, ri=\EI, rmir=\Eb, rmso=\ET, - smir=\Ea, smso=\EU, + il1=\EL, is2=\Ev\E_AX\Eb\EW\E9P\ET, kbs=^H, ri=\EI, + rmir=\Eb, rmso=\ET, smir=\Ea, smso=\EU, use=vt52+arrows, # Visual 200 from BRL # The following switch settings are assumed for normal operation: @@ -12154,24 +12415,21 @@ vi200|Visual 200, cup=\EY%p1%{32}%+%c%p2%{32}%+%c, cuu1=\EA, cvvis=\Ed, dch1=\EO, dim=\E4, dl1=\EM, ed=\Ey, el=\Ex, home=\EH, ht=^I, hts=\E1, il1=\EL, ind=\n, invis=\Ea, kbs=^H, kclr=\Ev, - kctab=\E2, kcub1=\ED, kcud1=\EB, kcuf1=\EC, kcuu1=\EA, - kdch1=\EO, kdl1=\EM, ked=\EJ, kel=\Et, kf0=\E?p, kf1=\E?q, - kf2=\E?r, kf3=\E?s, kf4=\E?t, kf5=\E?u, kf6=\E?v, kf7=\E?w, - kf8=\E?x, kf9=\E?y, khome=\EH, khts=\E1, kich1=\Ei, kil1=\EL, - krmir=\Ej, mc0=\EH\E], mc4=\EX, mc5=\EW, ri=\EI, rmacs=\EG, - rmkx=\E>, rmso=\E3, rs1=\E3\Eb\Ej\E\El\EG\Ec\Ek\EX, - sgr0=\E3\Eb, smacs=\EF, smkx=\E=, smso=\E4, tbc=\Eg, + kctab=\E2, kdch1=\EO, kdl1=\EM, ked=\EJ, kel=\Et, kf0=\E?p, + kf1=\E?q, kf2=\E?r, kf3=\E?s, kf4=\E?t, kf5=\E?u, kf6=\E?v, + kf7=\E?w, kf8=\E?x, kf9=\E?y, khome=\EH, khts=\E1, kich1=\Ei, + kil1=\EL, krmir=\Ej, mc0=\EH\E], mc4=\EX, mc5=\EW, ri=\EI, + rmacs=\EG, rmkx=\E>, rmso=\E3, + rs1=\E3\Eb\Ej\E\El\EG\Ec\Ek\EX, sgr0=\E3\Eb, smacs=\EF, + smkx=\E=, smso=\E4, tbc=\Eg, use=vt52+arrows, # The older Visuals didn't come with function keys. This entry uses # and so that the keypad keys can be used as function keys. # If your version of vi doesn't support function keys you may want # to use vi200-f. vi200-f|Visual 200 no function keys, - is2=\E3\Eb\Ej\E\\\El\EG\Ed\Ek, kf0=\E?p, kf1=\E?q, - kf2=\E?r, kf3=\E?s, kf4=\E?t, kf5=\E?u, kf6=\E?v, kf7=\E?w, - kf8=\E?x, kf9=\E?y, rmkx=\E>, rmso@, smkx=\E=, smso@, - use=vi200, + is2=\E3\Eb\Ej\E\\\El\EG\Ed\Ek, rmso@, smso@, use=vi200, vi200-rv|Visual 200 reverse video, - cnorm@, cvvis@, ri@, rmso=\E3, smso=\E4, use=vi200, + cnorm@, cvvis@, ri@, use=vi200, # the function keys are programmable but we don't reprogram them to their # default values with because programming them is very verbose. maybe @@ -12181,17 +12439,17 @@ vi200-rv|Visual 200 reverse video, vi300|Visual 300 ANSI x3.64, am, bw, mir, xenl, cols#80, lines#24, - bel=^G, cbt=\E[Z, clear=\E[H\E[2J, cr=\r, cub1=^H, cud1=\E[B, - cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, - dch1=\E[P$<40>, dl1=\E[M, ed=\E[J, el=\E[K, home=\E[H, ht=^I, - il1=\E[L, ind=\n, + bel=^G, cbt=\E[Z, clear=\E[H\E[2J, cr=\r, cub1=^H, + cup=\E[%i%p1%d;%p2%dH, dch1=\E[P$<40>, dl1=\E[M, ed=\E[J, + el=\E[K, home=\E[H, ht=^I, il1=\E[L, ind=\n, is2=\E[7s\E[2;3;4;20;?5;?6l\E[12;?7h\E[1Q\E[0;1(D\E[8s, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf1=\E_A\E\\, kf2=\E_B\E\\, kf3=\E_C\E\\, kf4=\E_D\E\\, kf5=\E_E\E\\, kf6=\E_F\E\\, kf7=\E_G\E\\, kf8=\E_H\E\\, kf9=\E_I\E\\, khome=\E[H, ri=\EM, rmam=\E[?7l, rmir=\E[4l, rmso=\E[m, rmul=\E[m, sgr0=\E[m, smam=\E[?7h, smir=\E[4h, - smso=\E[1m, smul=\E[4m, + smso=\E[1m, smul=\E[4m, use=ansi+local1, + # some of the vi300s have older firmware that has the command # sequence for setting editing extent reversed. vi300-old|Visual 300 with old firmware (set edit extent reversed), @@ -12216,9 +12474,9 @@ vi500|Visual 500, el=\Ex$<16/>, home=\EH, ht=\011$<8/>, il1=\EL\Ex$<3*/>, ind=\n, is2=\E3\E\001\E\007\E\003\Ek\EG\Ed\EX\El\E>\Eb\E\\, - kbs=^H, kcub1=\ED, kcud1=\EB, kcuf1=\EC, kcuu1=\EA, - khome=\EH, nel=\r\n, rmacs=^O, rmir=\Ej, rmso=\E^G, + kbs=^H, khome=\EH, nel=\r\n, rmacs=^O, rmir=\Ej, rmso=\E^G, rmul=\E^C, smacs=^N, smir=\Ei, smso=\E^H, smul=\E^D, + use=vt52+arrows, # The visual 550 is a visual 300 with Tektronix graphics, # and with 33 lines. clear screen is modified here to @@ -12229,14 +12487,14 @@ vi550|Visual 550 ANSI x3.64, vi603|visual603|Visual 603, hs, mir, - bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[J, + blink=\E[5m, bold=\E[1m, clear=\E[H\E[J, csr=\E[%i%p1%d;%p2%dr, cuf1=\E[C, - cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, dch1=\E[P, dl1=\E[M, - dsl=\EP2;1~\E\\, ed=\E[J, el=\E[K, fsl=\E\\, il1=\E[L, - ind=\ED, is1=\E>\E[?3l\E[?4l\E[?7h\E[?8h\E[1;24r, - rev=\E[7m, ri=\EM, rmir=\E[4l, rmso=\E[27m, rmul=\E[24m, + cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, dch1=\E[P, + dsl=\EP2;1~\E\\, ed=\E[J, el=\E[K, fsl=\E\\, ind=\ED, + is1=\E>\E[?3l\E[?4l\E[?7h\E[?8h\E[1;24r, rev=\E[7m, + ri=\EM, rmir=\E[4l, rmso=\E[27m, rmul=\E[24m, sgr0=\E[m\017$<2>, smir=\E[4h, smso=\E[7m, smul=\E[4m, - tsl=\EP2~, use=decid+cpr, use=vt100+4bsd, + tsl=\EP2~, use=ansi+idl1, use=decid+cpr, use=vt100+4bsd, #### Wyse (wy) # @@ -12606,9 +12864,9 @@ wy60-42|wyse60-42|Wyse 60 80-column 42-lines, ri=\Ej$<10>, rs3=\Ee*$<150>, use=wy60, wy60-42-w|wyse60-42-w|Wyse 60 132-column 42-lines, cols#132, lw#7, nlab#16, wsl#97, - clear=\E+$<260>, cup=\Ea%i%p1%dR%p2%dC$<2>, - dch1=\EW$<19>, ed=\Ey$<260>, home=\036$<2>, ip=$<6>, - nel=\r\n$<11>, rs2=\EeF$<150>\E`;$<150>, use=wy60-42, + cup=\Ea%i%p1%dR%p2%dC$<2>, dch1=\EW$<19>, + home=\036$<2>, ip=$<6>, nel=\r\n$<11>, + rs2=\EeF$<150>\E`;$<150>, use=wy60-42, # wy60-43|wyse60-43|Wyse 60 80-column 43-lines, lh@, lines#43, lw@, nlab@, @@ -12640,8 +12898,7 @@ wy60-w-vb|wy60-wvb|wyse60-wvb|Wyse 60 132-column visible bell, wy99gt|wyse99gt|Wyse 99gt, msgr@, clear=\E+$<130>, dch1=\EW$<7>, dl1=\ER$<4>, ed=\Ey$<130>, - el=\Et$<5>, flash=\E`8$<100/>\E`9, ht=\011$<1>, - il1=\EE$<4>, ind=\n$<4>, ip=$<2>, is3=\Ew0$<20>, nel@, + el=\Et$<5>, ind=\n$<4>, ip=$<2>, is3=\Ew0$<20>, nel@, ri=\Ej$<3>, rmcup=\Ew0, rs2=\E`:$<150>, smcup=\Ew1, u0=\E~>\E8, u1=\E[42h, use=wy60, # @@ -12653,7 +12910,7 @@ wy99gt-w|wyse99gt-w|Wyse 99gt 132-column, # wy99gt-25|wyse99gt-25|Wyse 99gt 80-column 25-lines, lh@, lines#25, lw@, nlab@, - pln@, rs2=\E`:$<150>, rs3=\EwG\Ee)$<200>, use=wy99gt, + pln@, rs3=\EwG\Ee)$<200>, use=wy99gt, # wy99gt-25-w|wyse99gt-25-w|Wyse 99gt 132-column 25-lines, lh@, lines#25, lw@, nlab@, @@ -12680,39 +12937,35 @@ wy99gt-w-vb|wy99gt-wvb|wyse99gt-wvb|Wyse 99gt 132-column visible bell, # not, so smir and rmir are commented out as well. # From: Francesco Potorti` , 24 Aug 1998 wy99-ansi|Wyse WY-99GT in ANSI mode (int'l PC keyboard), - am, km, mc5i, mir, msgr, xenl, + am, km, mir, msgr, xenl, cols#80, it#8, lines#25, vt#3, acsc=``aaffggjjkkllmmnnooqqssttuuvvwwxx{{||}}~~, - bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, civis=\E[?25l, - clear=\E[H\E[J$<200>, cnorm=\E[34h\E[?25h, cr=\r, - csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD$<1>, + bel=^G, cbt=\E[Z, civis=\E[?25l, clear=\E[H\E[J$<200>, + cnorm=\E[34h\E[?25h, cr=\r, cub=\E[%p1%dD$<1>, cub1=\010$<1>, cud=\E[%p1%dB, cud1=\ED, cuf=\E[%p1%dC$<1>, cuf1=\E[C$<1>, cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\EM, - cvvis=\E[34l\E[?25h, dim=\E[2m, dl=\E[%p1%dM, dl1=\E[M, - ech=\E[%p1%dX, ed=\E[J$<8*>, el=\E[K$<1>, el1=\E[1K$<1>, - enacs=\E)0, flash=\E[?5h$<30/>\E[?5l, home=\E[H, - hpa=\E[%i%p1%dG, ht=^I, ich=\E[%p1%d@, il=\E[%p1%dL, - il1=\E[L, ind=\n$<1>, invis=\E[8m, + cvvis=\E[34l\E[?25h, dim=\E[2m, ech=\E[%p1%dX, + ed=\E[J$<8*>, el=\E[K$<1>, el1=\E[1K$<1>, enacs=\E)0, + flash=\E[?5h$<30/>\E[?5l, home=\E[H, hpa=\E[%i%p1%dG, + ht=^I, ich=\E[%p1%d@, ind=\n$<1>, is2=\E7\E[1r\E8\E[2;3;4;13;20;34;39;36l\E[12;16;34h\E[?1;3;4 ;5;10;18l\E[?7;8;25h\E>\E[?5W\E(B\017\E[4i, kbs=^H, kcbt=\E[z, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, - kcuu1=\EOA, kf1=\EOP, kf10=\E[21~, kf11=\E[23~, - kf12=\E[24~, kf17=\E[K, kf18=\E[31~, kf19=\E[32~, kf2=\EOQ, - kf20=\E[33~, kf21=\E[34~, kf22=\E[35~, kf23=\E[1~, - kf24=\E[2~, kf3=\EOR, kf4=\EOS, kf5=\E[M, kf6=\E[17~, - kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, ll=\E[24E, mc0=\E[?19h, - mc4=\E[4i, mc5=\E[5i, nel=\EE, prot=\E[1"q, rc=\E8, - rev=\E[7m, ri=\EM, rmacs=^O, rmam=\E[?7l, rmir=\E[4l, - rmkx=\E[?1l, rmso=\E[27m, rmul=\E[24m, + kcuu1=\EOA, kf1=\EOP, kf17=\E[K, kf18=\E[31~, kf19=\E[32~, + kf2=\EOQ, kf20=\E[33~, kf21=\E[34~, kf22=\E[35~, + kf23=\E[1~, kf24=\E[2~, kf3=\EOR, kf4=\EOS, kf5=\E[M, + ll=\E[24E, mc0=\E[?19h, nel=\EE, prot=\E[1"q, ri=\EM, + rmacs=^O, rmam=\E[?7l, rmir=\E[4l, rmkx=\E[?1l, + rmso=\E[27m, rmul=\E[24m, rs2=\E[61"p\E[40h\E[?6l\E[1r\E[2;3;4;13;20;34;39;36l\E[12;16 ;34h\E[?1;3;4;5;10;18l\E[?7;8;25h\E>\E[?5W\E(B\017\E[24E \E[4i, - sc=\E7, sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%O%t;7%;%?%p4%t;5%;%? %p5%t;2%;%?%p7%t;8%;m\E[%?%p8%t1%;"q%?%p9%t\016%e\017%;, sgr0=\E[m\017\E["q, smacs=^N, smam=\E[?7h, smir=\E[4h, - smkx=\E[?1h, smso=\E[7m, smul=\E[4m, vpa=\E[%i%p1%dd, + smkx=\E[?1h, vpa=\E[%i%p1%dd, use=ansi+csr, use=ansi+idl, + use=ansi+pp, use=ansi+sgrbold, use=vt220+ufkeys, # This is the american terminal. Here tabs work fine. # From: Francesco Potorti` , 24 Aug 1998 @@ -12865,32 +13118,25 @@ wy160-w-vb|wy160-wvb|wyse160-wvb|Wyse 160 132-column visible bell, # to correctly handle multiple attributes on a screen. # wy75|wyse75|Wyse 75, - am, hs, mc5i, mir, msgr, xenl, xon, + am, hs, mir, msgr, xenl, xon, cols#80, lines#24, ma#1, pb#1201, wsl#78, - acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, - bel=^G, cbt=\E[Z, clear=\E[H\E[J$<30>, cr=\r, - csr=\E[%i%p1%d;%p2%dr$<2>, cub=\E[%p1%dD, cub1=^H, - cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C, - cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, - dch=\E[%p1%dP$<3*>, dch1=\E[P$<3>, dim=\E[0t\E[2m, - dl=\E[%p1%dM$<1*>, dl1=\E[M, - dsl=\E[>\,\001\001\E[>-\001\001, ech=\E[%p1%dX, - ed=\E[J$<30>, el=\E[K$<3>, el1=\E[1K$<3>, enacs=\E)0, - flash=\E[30h\E\,$<250/>\E[30l, fsl=^A, home=\E[H, - hpa=\E[%i%p1%dG, ht=^I, hts=\EH, ich=\E[%p1%d@$<1*>, + acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, + bel=^G, clear=\E[H\E[J$<30>, cr=\r, + csr=\E[%i%p1%d;%p2%dr$<2>, cub1=^H, cud1=\n, + cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP$<3*>, + dch1=\E[P$<3>, dim=\E[0t\E[2m, dl=\E[%p1%dM$<1*>, + dl1=\E[M, dsl=\E[>\,\001\001\E[>-\001\001, + ech=\E[%p1%dX, ed=\E[J$<30>, el=\E[K$<3>, el1=\E[1K$<3>, + enacs=\E)0, flash=\E[30h\E\,$<250/>\E[30l, fsl=^A, + home=\E[H, hpa=\E[%i%p1%dG, ich=\E[%p1%d@$<1*>, il=\E[%p1%dL$<2*>, il1=\E[L$<2>, ind=\n$<2>, ip=$<1>, is1=\E[2;4;20;30l\E[?1;10l\E[12h\E[?7;8;25h, - is2=\E>\E(B\E)0\017, is3=\E[m, kbs=^H, kcub1=\E[D, - kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kdl1=\E[M, kel=\E[K, - kf1=\E[?5i, kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, - kf13=\E[25~, kf14=\E[26~, kf15=\E[28~, kf16=\E[29~, - kf17=\E[31~, kf18=\E[32~, kf19=\E[33~, kf2=\E[?3i, - kf20=\E[34~, kf21=\E[35~, kf3=\E[2i, kf4=\E[@, kf5=\E[M, - kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, kfnd=\E[1~, - khlp=\E[28~, khome=\E[H, kich1=\E[@, kil1=\E[L, knp=\E[6~, - kpp=\E[5~, kprt=\E[?5i, kslt=\E[4~, mc0=\E[0i, mc4=\E[4i, - mc5=\E[5i, rc=\E8, rev=\E[1t\E[7m, ri=\EM$<2>, rmacs=^O, - rmam=\E[?7l, rmir=\E[4l, rmkx=\E>, rmso=\E[m, rmul=\E[m, + is2=\E>\E(B\E)0\017, is3=\E[m, kdl1=\E[M, kel=\E[K, + kf1=\E[?5i, kf2=\E[?3i, kf21=\E[35~, kf3=\E[2i, kf4=\E[@, + kf5=\E[M, kfnd=\E[1~, khlp=\E[28~, kich1=\E[@, kil1=\E[L, + knp=\E[6~, kpp=\E[5~, kprt=\E[?5i, kslt=\E[4~, mc0=\E[0i, + rc=\E8, rev=\E[1t\E[7m, ri=\EM$<2>, rmacs=^O, rmam=\E[?7l, + rmir=\E[4l, rmkx=\E>, rmso=\E[m, rmul=\E[m, rs1=\E[13l\E[3l\E!p, rs2=\E[35h\E[?3l$<80>, rs3=\E[?5l, sc=\E7, sgr=%?%p5%t\E[0t%;%?%p3%p1%|%t\E[1t%;%?%p2%t\E[2t%;%?%p4%t @@ -12898,8 +13144,10 @@ wy75|wyse75|Wyse 75, \016%e\017%;, sgr0=\E[m\017, smacs=^N, smam=\E[?7h, smir=\E[4h, smkx=\E[?1l\E[?7h\E=, smso=\E[1t\E[7m, smul=\E[2t\E[4m, - tbc=\E[3g, tsl=\E[>\,\001, use=decid+cpr, use=vt220+cvis, - use=vt220+keypad, + tsl=\E[>\,\001, use=ansi+arrows, use=ansi+local, + use=ansi+pp, use=ansi+tabs, use=decid+cpr, + use=vt220+cvis, use=vt220+keypad, use=vt220+sfkeys, + use=vt220+ufkeys, # # This terminal description uses the non-hidden attribute mode # (with magic cookie). @@ -12937,38 +13185,29 @@ wy75-wvb|wyse75-wvb|Wyse 75 with visible bell 132 columns, # leave trash on the screen when used without XON/XOFF. # wy85|wyse85|Wyse 85, - am, hs, mc5i, mir, msgr, xenl, xon, - cols#80, it#8, lines#24, wsl#80, - acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, - bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, - clear=\E[H\E[J$<110>, cr=\r, csr=\E[%i%p1%d;%p2%dr, - cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\n, - cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH$<1>, - cuu=\E[%p1%dA, cuu1=\E[A, dch=\E[%p1%dP$<3*>, + hs, mir, xenl, xon, + wsl#80, + clear=\E[H\E[J$<110>, cub1=^H, cud1=\n, + cup=\E[%i%p1%d;%p2%dH$<1>, dch=\E[%p1%dP$<3*>, dch1=\E[P$<3>, dim=\E[2m, dl=\E[%p1%dM$<3*>, dl1=\E[M$<3>, dsl=\E[40l, ech=\E[%p1%dX, ed=\E[J$<110>, el=\E[K$<1>, el1=\E[1K, enacs=\E)0, flash=\E[30h\E\,$<300/>\E[30l, fsl=\E[1;24r\E8, - home=\E[H, ht=\011$<1>, hts=\EH, ich=\E[%p1%d@$<4*>, - il=\E[%p1%dL$<5*>, il1=\E[L$<5>, ind=\n$<3>, invis=\E[8m, - ip=$<3>, is1=\E[62;1"p\E[?5W, + ht=\011$<1>, ich=\E[%p1%d@$<4*>, il=\E[%p1%dL$<5*>, + il1=\E[L$<5>, ind=\n$<3>, ip=$<3>, is1=\E[62;1"p\E[?5W, is2=\E[2;4;20;30l\E[?1;4;10;16l\E[12h\E[?7;8;25h$<16>, - is3=\E>\E(B\E)0\017\E[m, kbs=^H, kcub1=\E[D, kcud1=\E[B, - kcuf1=\E[C, kcuu1=\E[A, kf10=\E[21~, kf11=\E[23~, - kf12=\E[24~, kf13=\E[25~, kf14=\E[26~, kf15=\E[28~, - kf16=\E[29~, kf17=\E[31~, kf18=\E[32~, kf19=\E[33~, - kf20=\E[34~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, - kf9=\E[20~, khlp=\E[28~, khome=\E[26~, lf1=PF1, lf2=PF2, - lf3=PF3, lf4=PF4, mc0=\E[0i, mc4=\E[4i, mc5=\E[5i, rc=\E8, - rev=\E[7m, ri=\EM$<3>, rmacs=^O, rmam=\E[?7l, rmir=\E[4l, - rmkx=\E>, rmso=\E[m, rmul=\E[m, rs1=\E[13l\E[3l\E!p, - rs2=\E[35h\E[?3l$<70>, rs3=\E[?5l, sc=\E7, + is3=\E>\E(B\E)0\017\E[m, khlp=\E[28~, khome=\E[26~, + lf1=PF1, lf2=PF2, lf3=PF3, lf4=PF4, mc0=\E[0i, ri=\EM$<3>, + rmam=\E[?7l, rmir=\E[4l, rmkx=\E>, rs1=\E[13l\E[3l\E!p, + rs2=\E[35h\E[?3l$<70>, rs3=\E[?5l, sgr=\E[0%?%p2%t;4%;%?%p3%p1%|%t;7%;%?%p4%t;5%;%?%p5%t;2%;%? %p6%t;1%;%?%p7%t;8%;m%?%p9%t\016%e\017%;, - sgr0=\E[m\017, smacs=^N, smam=\E[?7h, smir=\E[4h, - smkx=\E[?1l\E=, smso=\E[7m, smul=\E[4m, tbc=\E[3g, - tsl=\E[40h\E7\E[25;%i%p1%dH, use=decid+cpr, - use=vt220+vtedit, use=vt220+cvis, use=vt220+keypad, + sgr0=\E[m\017, smam=\E[?7h, smir=\E[4h, smkx=\E[?1l\E=, + tsl=\E[40h\E7\E[25;%i%p1%dH, use=ansi+arrows, + use=ansi+csr, use=ansi+inittabs, use=ansi+local, + use=ansi+pp, use=ansi+sgrbold, use=decid+cpr, + use=vt100+4bsd, use=vt220+vtedit, use=vt220+cvis, + use=vt220+keypad, use=vt220+sfkeys, use=vt220+ufkeys, # # Wyse 85 with visual bell. wy85-vb|wyse85-vb|Wyse 85 with visible bell, @@ -12994,42 +13233,35 @@ wy85-wvb|wyse85-wvb|Wyse 85 with visible bell 132-columns, # terminfo should reflect the manufacturer's intended behaviour of the terminal # or the actual." wy85-8bit|wyse85-8bit|Wyse 85 in 8-bit mode, - am, hs, mc5i, mir, msgr, xenl, xon, - cols#80, it#8, lines#24, wsl#80, - acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, - bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, - clear=\E[H\E[J$<110>, cr=\r, csr=\E[%i%p1%d;%p2%dr, - cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\n, - cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH$<1>, - cuu=\E[%p1%dA, cuu1=\E[A, dch=\E[%p1%dP$<3*>, + hs, mir, xenl, xon, + wsl#80, + clear=\E[H\E[J$<110>, cub1=^H, cud1=\n, + cup=\E[%i%p1%d;%p2%dH$<1>, dch=\E[%p1%dP$<3*>, dch1=\E[P$<3>, dim=\E[2m, dl=\E[%p1%dM$<3*>, dl1=\E[M$<3>, dsl=\E[40l, ech=\E[%p1%dX, ed=\E[J$<110>, el=\E[K$<1>, el1=\E[1K, enacs=\E)0, flash=\E[30h\E\,$<300/>\E[30l, fsl=\E[1;24r\E8, - home=\E[H, ht=\011$<1>, hts=\EH, ich=\E[%p1%d@$<4*>, - il=\E[%p1%dL$<5*>, il1=\E[L$<5>, ind=\n$<3>, invis=\E[8m, - ip=$<3>, is1=\E[62;1"p\E[?5W, + ht=\011$<1>, ich=\E[%p1%d@$<4*>, il=\E[%p1%dL$<5*>, + il1=\E[L$<5>, ind=\n$<3>, ip=$<3>, is1=\E[62;1"p\E[?5W, is2=\E[2;4;20;30l\E[?1;4;10;16l\E[12h\E[?7;8;25h$<16>, is3=\E>\E(B\E)0\017\E[m, ka1=\EOw, ka3=\EOy, kb2=\EOu, - kbs=^H, kc1=\EOq, kc3=\EOs, kcub1=\233D, kcud1=\233B, - kcuf1=\233C, kcuu1=\233A, kdch1=\2333~, kent=\EOM, - kf1=\EOP, kf10=\23321~, kf11=\23323~, kf12=\23324~, - kf13=\23325~, kf14=\23326~, kf15=\23328~, kf16=\23329~, - kf17=\23331~, kf18=\23332~, kf19=\23333~, kf2=\EOQ, - kf20=\23334~, kf3=\EOR, kf4=\EOS, kf6=\23317~, kf7=\23318~, - kf8=\23319~, kf9=\23320~, kfnd=\2331~, khlp=\23328~, - khome=\23326~, kich1=\2332~, knp=\2336~, kpp=\2335~, - kslt=\2334~, lf1=PF1, lf2=PF2, lf3=PF3, lf4=PF4, mc0=\E[0i, - mc4=\E[4i, mc5=\E[5i, rc=\E8, rev=\E[7m, ri=\EM$<3>, - rmacs=^O, rmam=\E[?7l, rmir=\E[4l, rmkx=\E>, rmso=\E[m, - rmul=\E[m, rs1=\E[13l\E[3l\E!p, rs2=\E[35h\E[?3l$<70>, - rs3=\E[?5l, sc=\E7, + kc1=\EOq, kc3=\EOs, kcub1=\233D, kcud1=\233B, kcuf1=\233C, + kcuu1=\233A, kdch1=\2333~, kf10=\23321~, kf11=\23323~, + kf12=\23324~, kf13=\23325~, kf14=\23326~, kf15=\23328~, + kf16=\23329~, kf17=\23331~, kf18=\23332~, kf19=\23333~, + kf20=\23334~, kf6=\23317~, kf7=\23318~, kf8=\23319~, + kf9=\23320~, kfnd=\2331~, khlp=\23328~, khome=\23326~, + kich1=\2332~, knp=\2336~, kpp=\2335~, kslt=\2334~, lf1=PF1, + lf2=PF2, lf3=PF3, lf4=PF4, mc0=\E[0i, ri=\EM$<3>, + rmam=\E[?7l, rmir=\E[4l, rmkx=\E>, rs1=\E[13l\E[3l\E!p, + rs2=\E[35h\E[?3l$<70>, rs3=\E[?5l, sgr=\E[0%?%p2%t;4%;%?%p3%p1%|%t;7%;%?%p4%t;5%;%?%p5%t;2%;%? %p6%t;1%;%?%p7%t;8%;+m%?%p9%t\016%e\017%;, - sgr0=\E[m\017, smacs=^N, smam=\E[?7h, smir=\E[4h, - smkx=\E[?1l\E=, smso=\E[7m, smul=\E[4m, tbc=\E[3g, - tsl=\E[40h\E7\E[25;%i%p1%dH, use=decid+cpr, - use=vt220+cvis, + sgr0=\E[m\017, smam=\E[?7h, smir=\E[4h, smkx=\E[?1l\E=, + tsl=\E[40h\E7\E[25;%i%p1%dH, use=ansi+csr, + use=ansi+inittabs, use=ansi+local, use=ansi+pp, + use=ansi+sgrbold, use=decid+cpr, use=vt100+4bsd, + use=vt100+pfkeys, use=vt220+cvis, # # Wyse 185 emulating a VT320 7 bit mode. # @@ -13042,41 +13274,33 @@ wy85-8bit|wyse85-8bit|Wyse 85 in 8-bit mode, # by set-up. # wy185|wyse185|Wyse 185, - am, hs, km, mc5i, mir, msgr, xenl, xon, - cols#80, it#8, lines#24, wsl#80, - acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, - bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, civis=\E[?25l, - clear=\E[H\E[J$<40>, cnorm=\E[34h\E[?25h, cr=\r, - csr=\E[%i%p1%d;%p2%dr$<20>, cub=\E[%p1%dD, cub1=^H, - cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C, - cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, + hs, km, mir, xenl, xon, + wsl#80, + civis=\E[?25l, clear=\E[H\E[J$<40>, + cnorm=\E[34h\E[?25h, csr=\E[%i%p1%d;%p2%dr$<20>, + cub1=^H, cud1=\n, cup=\E[%i%p1%d;%p2%dH, cvvis=\E[?25h\E[34l, dch=\E[%p1%dP$<3>, dch1=\E[P$<3>, dim=\E[2m, dl=\E[%p1%dM$<2*>, dl1=\E[M$<2>, dsl=\E7\E[99;0H\E[K\E8, ech=\E[%p1%dX, ed=\E[J$<40>, el=\E[K, el1=\E[1K, enacs=\E)0, flash=\E[30h\E\,$<100/>\E[30l, fsl=\E[1;24r\E8, - home=\E[H, hpa=\E[%i%p1%d`, ht=^I, hts=\EH, - ich=\E[%p1%d@$<2>, il=\E[%p1%dL$<3*>, il1=\E[L$<3>, - ind=\n$<2>, invis=\E[8m, ip=$<4>, is1=\E[?5W, + hpa=\E[%i%p1%d`, ich=\E[%p1%d@$<2>, il=\E[%p1%dL$<3*>, + il1=\E[L$<3>, ind=\n$<2>, ip=$<4>, is1=\E[?5W, is2=\E[2;4;20;30l\E[?1;4;10;16l\E[12h\E[?7;8;25h, - is3=\E>\E(B\E)0\017\E[m, kbs=^H, kcbt=\E[Z, kcub1=\E[D, - kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf1=\EOP, kf10=\E[21~, - kf11=\E[23~, kf12=\E[24~, kf13=\E[25~, kf14=\E[26~, - kf15=\E[28~, kf16=\E[29~, kf17=\E[31~, kf18=\E[32~, - kf19=\E[33~, kf2=\EOQ, kf20=\E[34~, kf3=\EOR, kf4=\EOS, - kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, - khlp=\E[28~, khome=\E[26~, lf1=PF1, lf2=PF2, lf3=PF3, - lf4=PF4, mc0=\E[0i, mc4=\E[4i, mc5=\E[5i, rc=\E8, rev=\E[7m, - ri=\EM$<2>, rmacs=^O, rmam=\E[?7l, rmcup=\E[ R, rmir=\E[4l, + is3=\E>\E(B\E)0\017\E[m, kcbt=\E[Z, khlp=\E[28~, + khome=\E[26~, lf1=PF1, lf2=PF2, lf3=PF3, lf4=PF4, mc0=\E[0i, + rc=\E8, ri=\EM$<2>, rmam=\E[?7l, rmcup=\E[ R, rmir=\E[4l, rmkx=\E>, rmso=\E[27m, rmul=\E[24m, rs1=\E[13l\E[3l\E\\\E[63;1"p\E[!p, rs2=\E[35h\E[?3l, rs3=\E[?5l\E[47h\E[40l\E[r, sc=\E7, sgr=\E[0%?%p2%t;4%;%?%p3%p1%|%t;7%;%?%p4%t;5%;%?%p5%t;2%;%? %p6%t;1%;%?%p7%t;8%;m%?%p9%t\016%e\017%;, - sgr0=\E[m\017, smacs=^N, smam=\E[?7h, smcup=\E[ Q, - smir=\E[4h, smkx=\E[?1l\E=, smso=\E[7m, smul=\E[4m, - tbc=\E[3g, tsl=\E7\E[99;%i%p1%dH, vpa=\E[%i%p1%dd, - use=decid+cpr, use=vt220+vtedit, use=vt220+keypad, + sgr0=\E[m\017, smam=\E[?7h, smcup=\E[ Q, smir=\E[4h, + smkx=\E[?1l\E=, tsl=\E7\E[99;%i%p1%dH, vpa=\E[%i%p1%dd, + use=ansi+arrows, use=ansi+inittabs, use=ansi+local, + use=ansi+pp, use=ansi+sgrbold, use=decid+cpr, + use=vt100+4bsd, use=vt220+vtedit, use=vt220+keypad, + use=vt220+sfkeys, use=vt220+ufkeys, # # Wyse 185 with 24 data lines and top status (terminal status) wy185-24|wyse185-24|Wyse 185 with 24 data lines, @@ -13221,20 +13445,18 @@ wy325-43w-vb|wy325-43wvb|Wyse-325 43 lines wide mode visual bell, # # Bug: The capability resets attributes. wy370-nk|Wyse 370 without function keys, - am, ccc, hs, mc5i, mir, msgr, xenl, xon, - colors#64, cols#80, it#8, lines#24, ncv#48, pairs#64, wsl#80, + am, ccc, hs, mir, msgr, xenl, xon, + colors#64, cols#80, lines#24, ncv#48, pairs#64, wsl#80, acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, - bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, civis=\E[?25l, - clear=\E[H\E[J$<40>, cnorm=\E[34h\E[?25h, cr=\r, - csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H, - cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C, - cup=\E[%i%p1%d;%p2%dH$<1>, cuu=\E[%p1%dA, cuu1=\E[A, - cvvis=\E[?25h\E[34l, dch=\E[%p1%dP$<1*>, dch1=\E[P$<1>, - dclk=\E[31h, dim=\E[2m, dl=\E[%p1%dM$<2*>, dl1=\E[M$<2>, - dsl=\E[40l, ech=\E[%p1%dX$<.1*>, ed=\E[J$<40>, - el=\E[K$<10>, el1=\E[1K$<12>, enacs=\E)0, + bel=^G, civis=\E[?25l, clear=\E[H\E[J$<40>, + cnorm=\E[34h\E[?25h, cr=\r, cub1=^H, cud1=\n, + cup=\E[%i%p1%d;%p2%dH$<1>, cvvis=\E[?25h\E[34l, + dch=\E[%p1%dP$<1*>, dch1=\E[P$<1>, dclk=\E[31h, + dim=\E[2m, dl=\E[%p1%dM$<2*>, dl1=\E[M$<2>, dsl=\E[40l, + ech=\E[%p1%dX$<.1*>, ed=\E[J$<40>, el=\E[K$<10>, + el1=\E[1K$<12>, enacs=\E)0, flash=\E[30h\E\,$<300/>\E[30l, fsl=\E[1;24r\E8, - home=\E[H, hpa=\E[%i%p1%d`, ht=\011$<1>, hts=\EH, + home=\E[H, hpa=\E[%i%p1%d`, ht=\011$<1>, ich=\E[%p1%d@$<1*>, il=\E[%p1%dL$<2*>, il1=\E[L$<2>, ind=\n$<2>, initc=\E[66;%p1%d;%?%p2%{250}%<%t%{0}%e%p2%{500}%<%t%{16}%e @@ -13242,58 +13464,51 @@ wy370-nk|Wyse 370 without function keys, %{500}%<%t%{4}%e%p3%{750}%<%t%{8}%e%{12}%;%?%p4%{250} %<%t%{0}%e%p4%{500}%<%t%{1}%e%p4%{750}%<%t%{2}%e%{3}%; %{1}%+%+%+%dw, - invis=\E[8m, ip=$<1>, is1=\E[90;1"p\E[?5W$<6>, + ip=$<1>, is1=\E[90;1"p\E[?5W$<6>, is2=\E[2;4;20;30;40l\E[?1;10;16l\E[12h\E[?7;8;25h, - is3=\E>\017\E)0\E(B\E[63;0w\E[m, mc0=\E[0i, mc4=\E[4i, - mc5=\E[5i, + is3=\E>\017\E)0\E(B\E[63;0w\E[m, mc0=\E[0i, oc=\E[60w\E[63;0w\E[66;1;4w\E[66;2;13w\E[66;3;16w\E[66;4;49w \E[66;5;51w\E[66;6;61w\E[66;7;64w, - op=\E[m, rc=\E8, rev=\E[7m, ri=\EM$<2>, rmacs=^O, - rmam=\E[?7l, rmclk=\E[31l, rmcup=\E[ R, rmir=\E[4l, - rmkx=\E>, rmso=\E[27m, rmul=\E[24m, - rs1=\E[13l\E[3l\E!p\E[?4i, rs2=\E[35h\E[?3l$<8>, - rs3=\E[?5l, sc=\E7, setb=\E[62;%p1%dw, setf=\E[61;%p1%dw, + op=\E[m, ri=\EM$<2>, rmacs=^O, rmam=\E[?7l, rmclk=\E[31l, + rmcup=\E[ R, rmir=\E[4l, rmkx=\E>, rmso=\E[27m, + rmul=\E[24m, rs1=\E[13l\E[3l\E!p\E[?4i, + rs2=\E[35h\E[?3l$<8>, rs3=\E[?5l, setb=\E[62;%p1%dw, + setf=\E[61;%p1%dw, sgr=\E[0%?%p2%t;4%;%?%p3%p1%|%t;7%;%?%p4%t;5%;%?%p5%t;2%;%? %p6%t;1%;%?%p7%t;8%;m%?%p9%t\016%e\017%;, sgr0=\E[m\017, smacs=^N, smam=\E[?7h, smcup=\E[ Q, - smir=\E[4h, smkx=\E[?1l\E=, smso=\E[7m, smul=\E[4m, - tbc=\E[3g, tsl=\E[40l\E[40h\E7\E[99;%i%p1%dH, - u0=\E[?38h\E8, u1=\E[?38l\E)0, u2=\E[92;52"p, u3=\E~B, - u4=\E[92;76"p, u5=\E%!1\E[90;1"p, vpa=\E[%i%p1%dd, - use=decid+cpr, + smir=\E[4h, smkx=\E[?1l\E=, + tsl=\E[40l\E[40h\E7\E[99;%i%p1%dH, u0=\E[?38h\E8, + u1=\E[?38l\E)0, u2=\E[92;52"p, u3=\E~B, u4=\E[92;76"p, + u5=\E%!1\E[90;1"p, vpa=\E[%i%p1%dd, use=ansi+csr, + use=ansi+inittabs, use=ansi+local, use=ansi+pp, + use=ansi+sgrbold, use=decid+cpr, # # Function key set for the ASCII (wy-50 compatible) keyboard # This is the default 370. # wy370|wyse370|wy370-101k|Wyse 370 with 101 key keyboard, - kbs=^H, kcbt=\E[Z, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, - kcuu1=\E[A, kdch1=\EOQ, kdl1=\EOQ, kent=\EOM, kf1=\E[?4i, - kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf13=\E[25~, - kf14=\E[26~, kf15=\E[28~, kf16=\E[29~, kf2=\E[?3i, - kf3=\E[2i, kf4=\E[@, kf5=\E[M, kf6=\E[17~, kf7=\E[18~, - kf8=\E[19~, kf9=\E[20~, khome=\E[H, kich1=\EOP, kil1=\EOP, - knp=\E[U, kpp=\E[V, use=wy370-nk, + kcbt=\E[Z, kdch1=\EOQ, kdl1=\EOQ, kent=\EOM, kf1=\E[?4i, + kf13=\E[25~, kf14=\E[26~, kf15=\E[28~, kf16=\E[29~, + kf2=\E[?3i, kf3=\E[2i, kf4=\E[@, kf5=\E[M, kich1=\EOP, + kil1=\EOP, knp=\E[U, kpp=\E[V, use=ansi+arrows, + use=vt220+ufkeys, use=wy370-nk, # # Function key set for the VT-320 (and wy85) compatible keyboard # wy370-105k|Wyse 370 with 105 key keyboard, - kbs=^H, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, - kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf13=\E[25~, - kf14=\E[26~, kf15=\E[28~, kf16=\E[29~, kf17=\E[31~, - kf18=\E[32~, kf19=\E[33~, kf20=\E[34~, kf6=\E[17~, - kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, kfnd=\E[1~, - khlp=\E[28~, khome=\E[26~, lf1=PF1, lf2=PF2, lf3=PF3, - lf4=PF4, use=vt220+vtedit, use=wy370-nk, - use=vt220+keypad, + kfnd=\E[1~, khlp=\E[28~, khome=\E[26~, lf1=PF1, lf2=PF2, + lf3=PF3, lf4=PF4, use=ansi+arrows, use=vt220+vtedit, + use=wy370-nk, use=vt220+keypad, use=vt220+sfkeys, + use=vt220+ufkeys, # # Function key set for the PC compatible keyboard # wy370-EPC|Wyse 370 with 102 key keyboard, - kbs=^H, kcbt=\E[Z, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, - kcuu1=\E[A, kend=\E[1~, kent=\EOM, kf1=\EOP, kf10=\E[21~, - kf11=\E[23~, kf12=\E[24~, kf2=\EOQ, kf3=\EOR, kf4=\EOS, - kf5=\E[M, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, - khome=\E[H, kich1=\E[2~, knp=\E[U, kpp=\E[V, use=wy370-nk, + kcbt=\E[Z, kend=\E[1~, kent=\EOM, kf1=\EOP, kf2=\EOQ, + kf3=\EOR, kf4=\EOS, kf5=\E[M, kich1=\E[2~, knp=\E[U, + kpp=\E[V, use=ansi+arrows, use=vt220+ufkeys, + use=wy370-nk, # # Wyse 370 with visual bell. wy370-vb|Wyse 370 with visible bell, @@ -13385,40 +13600,34 @@ wy370-tek|Wyse 370 Tektronix 4010/4014 emulator, # with SCO applications. # wy520|wyse520|Wyse 520, - am, hs, km, mc5i, mir, xenl, xon, + am, hs, km, mir, xenl, xon, cols#80, it#8, lines#24, wsl#80, acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, - bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, civis=\E[?25l, - clear=\E[H\E[J$<40>, cnorm=\E[34h\E[?25h, cr=\r, - csr=\E[%i%p1%d;%p2%dr$<20>, cub=\E[%p1%dD, cub1=^H, - cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C, - cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, + bel=^G, civis=\E[?25l, clear=\E[H\E[J$<40>, + cnorm=\E[34h\E[?25h, cr=\r, csr=\E[%i%p1%d;%p2%dr$<20>, + cub1=^H, cud1=\n, cup=\E[%i%p1%d;%p2%dH, cvvis=\E[?25h\E[34l, dch=\E[%p1%dP$<3>, dch1=\E[P$<30>, dim=\E[2m, dl=\E[%p1%dM$<2*>, dl1=\E[M$<2>, dsl=\E[0$~, ech=\E[%p1%dX, ed=\E[J$<40>, el=\E[K, el1=\E[1K, - enacs=\E)0, fsl=\E[0$}, home=\E[H, hpa=\E[%i%p1%d`, ht=^I, - hts=\EH, ich=\E[%p1%d@$<2>, il=\E[%p1%dL$<3*>, - il1=\E[L$<3>, ind=\n$<2>, invis=\E[8m, ip=$<4>, is1=\E[?5W, + enacs=\E)0, fsl=\E[0$}, home=\E[H, hpa=\E[%i%p1%d`, + ich=\E[%p1%d@$<2>, il=\E[%p1%dL$<3*>, il1=\E[L$<3>, + ind=\n$<2>, ip=$<4>, is1=\E[?5W, is2=\E[2;4;20;30l\E[?1;4;10;16l\E[12h\E[?7;8;25;67h, - is3=\E>\E(B\E)0\017\E[m, kbs=^H, kcbt=\E[Z, kcub1=\E[D, - kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, ked=\E[1~, kel=\E[4~, - kent=\EOM, kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, - kf13=\E[25~, kf14=\E[26~, kf15=\E[28~, kf16=\E[29~, - kf17=\E[31~, kf18=\E[32~, kf19=\E[33~, kf20=\E[34~, - kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, + is3=\E>\E(B\E)0\017\E[m, kcbt=\E[Z, ked=\E[1~, kel=\E[4~, khlp=\E[28~, khome=\E[26~, lf1=PF1, lf2=PF2, lf3=PF3, - lf4=PF4, mc0=\E[0i, mc4=\E[4i, mc5=\E[5i, rc=\E8, rev=\E[7m, - ri=\EM$<2>, rmacs=^O, rmam=\E[?7l, rmcup=\E[ R, rmir=\E[4l, - rmso=\E[m, rmul=\E[24m, + lf4=PF4, mc0=\E[0i, ri=\EM$<2>, rmacs=^O, rmam=\E[?7l, + rmcup=\E[ R, rmir=\E[4l, rmul=\E[24m, rs1=\E[13l\E[3l\E\\\E[63;1"p\E[!p, rs2=\E[35h\E[?3l, - rs3=\E[?5l\E[47h\E[40l\E[r, sc=\E7, + rs3=\E[?5l\E[47h\E[40l\E[r, sgr=\E[0%?%p2%t;4%;%?%p3%p1%|%t;7%;%?%p4%t;5%;%?%p5%t;2%;%? %p6%t;1%;%?%p7%t;8%;m%?%p9%t\016%e\017%;, sgr0=\E[m\017, smacs=^N, smam=\E[?7h, - smcup=\E[ Q\E[?67;8h, smir=\E[4h, smso=\E[7m, smul=\E[4m, - tbc=\E[3g, tsl=\E[2$~\E[1$}\E[%i%p1%d`, - vpa=\E[%i%p1%dd, use=decid+cpr, use=vt220+vtedit, - use=vt220+keypad, + smcup=\E[ Q\E[?67;8h, smir=\E[4h, + tsl=\E[2$~\E[1$}\E[%i%p1%d`, vpa=\E[%i%p1%dd, + use=ansi+arrows, use=ansi+csr, use=ansi+local, + use=ansi+pp, use=ansi+sgrbold, use=ansi+tabs, + use=decid+cpr, use=vt220+vtedit, use=vt220+keypad, + use=vt220+sfkeys, use=vt220+ufkeys, # # Wyse 520 with 24 data lines and status (terminal status) wy520-24|wyse520-24|Wyse 520 with 24 data lines, @@ -13451,9 +13660,8 @@ wy520-wvb|wyse520-wvb|Wyse 520 with visible bell 132-columns, # to CTRL-C: stty intr '^c') for it to work since the # Delete key sends 7FH. wy520-epc|wyse520-epc|Wyse 520 with EPC keyboard, - kdch1=^?, kel=\E[4~, kend=\E[4~, kf0=\E[21~, kf1=\E[11~, - kf2=\E[12~, kf3=\E[13~, kf4=\E[14~, kf5=\E[15~, khome=\E[H, - use=wy520, + kdch1=^?, kel=\E[4~, kend=\E[4~, kf0=\E[21~, khome=\E[H, + use=xterm+r5+fkeys, use=wy520, # # Wyse 520 with 24 data lines and status (terminal status) # with EPC keyboard. @@ -13601,9 +13809,8 @@ pckermit|pckermit12|UCB IBMPC Kermit 1.2, # Does not use :am: because autowrap is lost when kermit dropped and restarted. # From: greg small 12-19-84 pckermit120|UCB IBMPC Kermit 1.20, - it#8, lines#24, - cud1=\EB, cvvis=\EO\Eq\EEK3, dch1=\EN, dl1=\EM, ht=^I, - il1=\EL, + it#8, + cvvis=\EO\Eq\EEK3, dch1=\EN, dl1=\EM, ht=^I, il1=\EL, is2=\EO\Eq\EJ\EY7\sK3\sUCB\sIBMPC\sKermit\s1.20\s\s12-19-84 \n, rmir@, rmso=\Eq, smir@, smso=\Ep, use=kermit, @@ -13652,31 +13859,30 @@ msk22714|mskermit22714|UCB MS-DOS Kermit 2.27 UCB 227.14 IBM PC, # Please send changes with explanations to bug-gnu-emacs@prep.ai.mit.edu. # (vt320-k3: I added / based on the init string -- esr) vt320-k3|MS-Kermit 3.00's VT320 emulation, - am, eslok, hs, km, mir, msgr, xenl, + am, km, mir, msgr, xenl, cols#80, it#8, lines#49, pb#9600, vt#3, acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, - bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[J, cmdch=\E, - cr=\r, csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H, - cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C, - cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, - dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M, - dsl=\E[0$~, ech=\E[%p1%dX, ed=\E[J, el=\E[K, + bel=^G, blink=\E[5m, bold=\E[1m, cmdch=\E, cr=\r, cub1=^H, + cud1=\n, cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P, + ech=\E[%p1%dX, flash=\E[?5h$<100/>\E[?5l\E[?5h$<100/>\E[?5l\E[?5h$<100/>\E[ ?5l, - fsl=\E[0$}, home=\E[H, hpa=\E[%i%p1%dG, ht=^I, hts=\EH, - ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L, ind=\n, - is2=\E>\E F\E[?1h\E[?7h\E[r\E[2$~, kbs=^H, kcub1=\EOD, - kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kdl1=\E[3~, kf0=\E[21~, - kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, kf6=\E[17~, - kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, kich1=\E[2~, knp=\E[6~, - kpp=\E[5~, mc0=\E[0i, mc4=\E[4i, mc5=\E[5i, nel=\r\n, rc=\E8, - rev=\E[7m, ri=\EM, rin=\E[%p1%dL, rmacs=\E(B, rmam=\E[?7l, - rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[27m, rmul=\E[24m, + home=\E[H, hpa=\E[%i%p1%dG, ht=^I, hts=\EH, ich=\E[%p1%d@, + ind=\n, is2=\E>\E F\E[?1h\E[?7h\E[r\E[2$~, kbs=^H, + kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kdl1=\E[3~, + kf0=\E[21~, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, + kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, + kich1=\E[2~, knp=\E[6~, kpp=\E[5~, mc0=\E[0i, mc4=\E[4i, + mc5=\E[5i, nel=\r\n, rev=\E[7m, ri=\EM, rin=\E[%p1%dL, + rmacs=\E(B, rmam=\E[?7l, rmir=\E[4l, rmkx=\E[?1l\E>, + rmso=\E[27m, rmul=\E[24m, rs1=\E(B\E)B\E>\E\sF\E[4;20l\E[12h\E[?1;5;6;38;42l\E[?7;25h \E[4i\E[?4i\E[m\E[r\E[2$~, - sc=\E7, sgr0=\E[m, smacs=\E(0, smam=\E[?7h, smir=\E[4h, + sgr0=\E[m, smacs=\E(0, smam=\E[?7h, smir=\E[4h, smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, tbc=\E[3g, - tsl=\E[1$}\r\E[K, vpa=\E[%i%p1%dd, use=vt220+cvis, + tsl=\E[1$}\r\E[K, vpa=\E[%i%p1%dd, use=ansi+csr, + use=ansi+erase, use=ansi+idl, use=ansi+local, use=dec+sl, + use=vt220+cvis, # From: Joseph Gil 13 Dec 1991 # ACS capabilities from Philippe De Muyter 30 May 1996 @@ -13686,25 +13892,21 @@ vt320-k311|DEC VT320 series as defined by kermit 3.11, cols#80, it#8, lines#24, vt#3, acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[;H\E[2J, cr=\r, - csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H, - cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C, - cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, - dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M, - dsl=\E[2$~\r\E[1$}\E[K\E[$}, ed=\E[J, el=\E[K, + cub1=^H, cud1=\n, cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, + dch1=\E[P, dsl=\E[2$~\r\E[1$}\E[K\E[$}, ed=\E[J, el=\E[K, flash=\E[?5h$<100/>\E[?5l, fsl=\E[$}, home=\E[H, ht=^I, - hts=\EH, ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L$<3/>, - ind=\ED, + hts=\EH, ich=\E[%p1%d@, il1=\E[L$<3/>, ind=\ED, is2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h\E[1;24r\E[24;1H, kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, lf1=pf1, lf2=pf2, - lf3=pf3, lf4=pf4, nel=\r\ED, rc=\E8, rev=\E[7m, + lf3=pf3, lf4=pf4, nel=\r\ED, rev=\E[7m, rf=/usr/share/tabset/vt100, ri=\EM, rmacs=^O, rmam=\E[?7l, rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[27m, - rmul=\E[24m, rs1=\E[?3l, sc=\E7, sgr0=\E[m, smacs=^N, - smam=\E[?7h, smir=\E[4h, smkx=\E[?1h\E=, smso=\E[7m, - smul=\E[4m, tbc=\E[3g, tsl=\E[2$~\E[1$}\E[1;%dH, - use=vt220+cvis, + rmul=\E[24m, rs1=\E[?3l, sgr0=\E[m, smacs=^N, smam=\E[?7h, + smir=\E[4h, smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, + tbc=\E[3g, tsl=\E[2$~\E[1$}\E[1;%dH, use=ansi+csr, + use=ansi+idl, use=ansi+local, use=vt220+cvis, ######## NON-ANSI TERMINAL EMULATIONS # @@ -13799,27 +14001,28 @@ rbcomm|IBM PC with RBcomm and EMACS keybindings, am, bw, mir, msgr, xenl, cols#80, it#8, lines#25, bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, clear=^L, cr=\r, - csr=\E[%i%p1%d;%p2%dr, cub1=^H, cud1=^C, cuf1=^B, + cub1=^H, cud1=^C, cuf1=^B, cup=\037%p2%{32}%+%c%p1%{32}%+%c, cuu1=^^, dch1=^W, dl=\E[%p1%dM, dl1=^Z, ech=\E[%p1%dX, ed=^F5, el=^P^P, ht=^I, il=\E[%p1%dL, il1=^K, ind=\ED, invis=\E[8m, is2=\017\035\E(B\E)0\E[?7h\E[?3l\E[>8g, kbs=^H, kcub1=^B, kcud1=^N, kcuf1=^F, kcuu1=^P, khome=^A, nel=\r\ED, - rc=\E8, rep=\030%p1%c%p2%c, rev=^R, ri=\EM, rmcup=, rmdc=, - rmir=^], rmkx=\E>, rmso=^U, rmul=^U, - rs1=\017\E(B\E)0\025\E[?3l\E[>8g, sc=\E7, sgr0=\E[m, - smcup=, smdc=, smir=^\, smkx=\E=, smso=^R, smul=^T, + rep=\030%p1%c%p2%c, rev=^R, ri=\EM, rmcup=, rmdc=, rmir=^], + rmkx=\E>, rmso=^U, rmul=^U, + rs1=\017\E(B\E)0\025\E[?3l\E[>8g, sgr0=\E[m, smcup=, + smdc=, smir=^\, smkx=\E=, smso=^R, smul=^T, use=ansi+csr, use=vt220+cvis, + rbcomm-nam|IBM PC with RBcomm without autowrap, am@, - bel=^G, cr=\r, cud1=\n, ht=^I, ind=\n, - is2=\017\035\E(B\E)0\E[?7l\E[?3l\E[>8g, kbs=^H, - kcub1=^H, kcud1=\n, nel=\r\n, use=rbcomm, + cud1=\n, ind=\n, + is2=\017\035\E(B\E)0\E[?7l\E[?3l\E[>8g, kcub1=^H, + kcud1=\n, nel=\r\n, use=rbcomm, rbcomm-w|IBM PC with RBcomm in 132 column mode, cols#132, - bel=^G, cr=\r, cud1=\n, ht=^I, ind=\n, - is2=\017\035\E(B\E)0\E[?7h\E[?3h\E[>8g, kbs=^H, - kcub1=^H, kcud1=\n, nel=\r\n, use=rbcomm, + cud1=\n, ind=\n, + is2=\017\035\E(B\E)0\E[?7h\E[?3h\E[>8g, kcub1=^H, + kcud1=\n, nel=\r\n, use=rbcomm, ######## LCD DISPLAYS # @@ -13878,20 +14081,18 @@ MtxOrb162|16x2 Matrix Orbital LCD display, att2300|sv80|AT&T 2300 Video Information Terminal 80 column mode, am, eo, mir, msgr, xon, cols#80, it#8, lines#24, - bel=^G, clear=\E[H\E[J, cr=\r, cub=\E[%p1%dD, cub1=^H, - cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C, - cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, - dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, - el=\E[K, el1=\E[1K, home=\E[H, ht=^I, ich=\E[%p1%d@, - il=\E[%p1%dL, il1=\E[L, ind=\n, kbs=^H, kcbt=\E[Z, kclr=\E[J, - kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kdch1=\E[P, + bel=^G, cr=\r, cub1=^H, cud1=\n, cup=\E[%i%p1%d;%p2%dH, + dch=\E[%p1%dP, dch1=\E[P, el1=\E[1K, home=\E[H, ht=^I, + ich=\E[%p1%d@, ind=\n, kcbt=\E[Z, kclr=\E[J, kdch1=\E[P, kdl1=\E[M, kf1=\E[1r, kf10=\E[10r, kf11=\E[11r, kf12=\E[12r, kf13=\E[13r, kf14=\E[14r, kf15=\E[15r, kf16=\E[16r, kf2=\E[2r, kf3=\E[3r, kf4=\E[4r, kf5=\E[5r, - kf6=\E[6r, kf7=\E[7r, kf8=\E[8r, kf9=\E[9r, khome=\E[H, - kich1=\E[@, kil1=\E[L, mc0=\E[0i, mc4=\E[4i, mc5=\E[5i, - rev=\E[7m, rmir=\E[4l, rmso=\E[m, sgr0=\E[m, smir=\E[4h, - smso=\E[7m, use=ansi+cpr, + kf6=\E[6r, kf7=\E[7r, kf8=\E[8r, kf9=\E[9r, kich1=\E[@, + kil1=\E[L, mc0=\E[0i, mc4=\E[4i, mc5=\E[5i, rev=\E[7m, + rmir=\E[4l, rmso=\E[m, sgr0=\E[m, smir=\E[4h, smso=\E[7m, + use=ansi+arrows, use=ansi+cpr, use=ansi+erase, + use=ansi+idl, use=ansi+local, + att2350|AT&T 2350 Video Information Terminal 80 column mode, mc0@, mc4@, mc5@, use=att2300, @@ -13911,11 +14112,9 @@ att5410v1|att4410v1|tty5410v1|AT&T 4410/5410 80 columns - version 1, cols#80, it#8, lh#2, lines#24, lw#8, nlab#8, wsl#80, acsc=++\,\,--..00``aaffgghhjjkkllmmnnooppqqrrssttuuvvwwxxyyz z{{||}}~~, - bel=^G, blink=\E[5m, bold=\E[2;7m, clear=\E[H\E[J, cr=\r, - csr=\E[%i%p1%d;%p2%dr, cub1=^H, cud1=\E[B, cuf1=\E[C, - cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, dch1=\E[P, dim=\E[2m, - dl1=\E[M, ed=\E[J, el=\E[K, fsl=\E8, home=\E[H, ht=^I, - ich1=\E[@, il1=\E[L, ind=\n, invis=\E[8m, is1=\E[?3l\E)0, + bel=^G, bold=\E[2;7m, cr=\r, cub1=^H, dch1=\E[P, dim=\E[2m, + dl1=\E[M, fsl=\E8, ht=^I, ich1=\E[@, il1=\E[L, ind=\n, + is1=\E[?3l\E)0, is3=\E[1;03q\s\s\sf1\s\s\s\s\s\s\s\s\s\s\s\EOP\E[2;03q\s\s \sf2\s\s\s\s\s\s\s\s\s\s\s\EOQ\E[3;03q\s\s\sf3\s\s\s\s \s\s\s\s\s\s\s\EOR\E[4;03q\s\s\sf4\s\s\s\s\s\s\s\s\s\s @@ -13923,19 +14122,18 @@ att5410v1|att4410v1|tty5410v1|AT&T 4410/5410 80 columns - version 1, \s\s\sf6\s\s\s\s\s\s\s\s\s\s\s\EOU\E[7;03q\s\s\sf7\s\s \s\s\s\s\s\s\s\s\s\EOV\E[8;03q\s\s\sf8\s\s\s\s\s\s\s\s \s\s\s\EOW, - kbs=^H, kclr=\E[2J, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, - kcuu1=\E[A, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, kf5=\EOT, - kf6=\EOU, kf7=\EOV, kf8=\EOW, khome=\E[H, kll=\E[24;1H, - ll=\E[24H, nel=\r\n, + kclr=\E[2J, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, kf5=\EOT, + kf6=\EOU, kf7=\EOV, kf8=\EOW, kll=\E[24;1H, ll=\E[24H, + nel=\r\n, pfx=\E[%p1%1d;%p2%l%2.2dq\s\s\sf%p1%1d\s\s\s\s\s\s\s\s\s\s \s%p2%s, - pln=\E[%p1%d;00q%p2%:-16s, rc=\E8, rev=\E[7m, ri=\EM, - rmacs=^O, rmso=\E[m, rmul=\E[m, rs2=\Ec\E[?3l\E[2;0y, - sc=\E7, + pln=\E[%p1%d;00q%p2%:-16s, ri=\EM, rmacs=^O, + rs2=\Ec\E[?3l\E[2;0y, sgr=\E[0%?%p1%p5%|%p6%|%t;2%;%?%p2%t;4%;%?%p4%t;5%;%?%p3%p1 %|%p6%|%t;7%;%?%p7%t;8%;m%?%p9%t\016%e\017%;, - sgr0=\E[m\017, smacs=^N, smso=\E[7m, smul=\E[4m, - tsl=\E7\E[25;%p1%{1}%+%dH, + sgr0=\E[m\017, smacs=^N, tsl=\E7\E[25;%p1%{1}%+%dH, + use=ansi+arrows, use=ansi+csr, use=ansi+cup, + use=ansi+erase, use=ansi+local1, use=ansi+sgrbold, att4410v1-w|att5410v1-w|tty5410v1-w|AT&T 4410/5410 132 columns - version 1, cols#132, wsl#132, @@ -13957,21 +14155,20 @@ v5410|att5410 in terms of a VT100, cols#80, it#8, lines#24, vt#3, acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, bel=^G, blink=\E[5m$<2>, bold=\E[1m$<2>, - clear=\E[H\E[J$<50>, cr=\r, csr=\E[%i%p1%d;%p2%dr, - cub1=^H, cud1=\n, cuf1=\E[C$<2>, - cup=\E[%i%p1%d;%p2%dH$<5>, cuu1=\E[A$<2>, dch1=\E[P, - dl1=\E[M, ed=\E[J$<50>, el=\E[K$<3>, el1=\E[1K$<3>, - enacs=\E(B\E)0, home=\E[H, ht=^I, hts=\EH, ich1=\E[@, - il1=\E[L, ind=\n, kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, - kcuu1=\EOA, rc=\E8, rev=\E[7m$<2>, ri=\EM$<5>, rmacs=^O, - rmam=\E[?7l, rmkx=\E[?1l\E>, rmso=\E[m$<2>, - rmul=\E[m$<2>, rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, - sc=\E7, + clear=\E[H\E[J$<50>, cr=\r, cub1=^H, cud1=\n, + cuf1=\E[C$<2>, cup=\E[%i%p1%d;%p2%dH$<5>, + cuu1=\E[A$<2>, dch1=\E[P, dl1=\E[M, ed=\E[J$<50>, + el=\E[K$<3>, el1=\E[1K$<3>, enacs=\E(B\E)0, home=\E[H, + ht=^I, hts=\EH, ich1=\E[@, il1=\E[L, ind=\n, kbs=^H, + kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, + rev=\E[7m$<2>, ri=\EM$<5>, rmacs=^O, rmam=\E[?7l, + rmkx=\E[?1l\E>, rmso=\E[m$<2>, rmul=\E[m$<2>, + rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5 %;m%?%p9%t\016%e\017%;$<2>, sgr0=\E[m\017$<2>, smacs=^N, smam=\E[?7h, smkx=\E[?1h\E=, smso=\E[1;7m$<2>, smul=\E[4m$<2>, tbc=\E[3g, - use=decid+cpr, use=vt100+fnkeys, + use=ansi+csr, use=decid+cpr, use=vt100+fnkeys, # # Teletype Model 5420 -- A souped up 5410, with multiple windows, @@ -14011,15 +14208,12 @@ v5410|att5410 in terms of a VT100, # when pressed in SYS PF mode. # (att4415: I added / based on the init string -- esr) att4415|tty5420|att5420|AT&T 4415/5420 80 cols, - OTbs, db, mir, xon, - lh#2, lm#78, lw#8, nlab#8, wsl#55, - cbt=\E[Z, clear=\E[x\E[J, cnorm=\E[11;0j, cub=\E[%p1%dD, - cud=\E[%p1%dB, cuf=\E[%p1%dC, cup=\E[%i%p1%d;%p2%dx, - cuu=\E[%p1%dA, cvvis=\E[11;1j, dch=\E[%p1%dP, - dl=\E[%p1%dM, ech=\E[%p1%ds\E[%p1%dD, - flash=\E[?5h$<200>\E[?5l, home=\E[x, - hpa=\E[%p1%{1}%+%dG, hts=\EH, ich=\E[%p1%d@, ich1@, - il=\E[%p1%dL, indn=\E[%p1%dE, is1=\E[?3l$<100>, + db, + lm#78, wsl#55, + clear=\E[x\E[J, cnorm=\E[11;0j, cub1=^H, + cup=\E[%i%p1%d;%p2%dx, cvvis=\E[11;1j, + ech=\E[%p1%ds\E[%p1%dD, flash=\E[?5h$<200>\E[?5l, + home=\E[x, ich1@, indn=\E[%p1%dE, is1=\E[?3l$<100>, is2=\E[m\017\E[1;2;3;4;6l\E[12;13;14;20l\E[?6;97;99l\E[?7h \E[4i\Ex\E[21;1j\212, is3=\E[?5l, kbeg=\Et, kcbt=\E[Z, kdch1=\E[P, kdl1=\E[M, @@ -14031,14 +14225,14 @@ att4415|tty5420|att5420|AT&T 4415/5420 80 cols, mc5=\E[?4i, mrcup=\E[%i%p1%d;%p2%dt, pfx=\E[%p1%d;%p2%l%02dq F%p1%d %p2%s, pln=\E[%p1%d;0;0;0q%p2%:-16.16s, prot=\EV, - rin=\E[%p1%dF, rmam=\E[?7l, rmir=\E[4l, - rmkx=\E[19;0j\E[21;1j\212, rmln=\E|, + rin=\E[%p1%dF, rmam=\E[?7l, rmkx=\E[19;0j\E[21;1j\212, + rmln=\E|, sgr=\E[0%?%p1%p5%|%p6%|%t;2%;%?%p2%t;4%;%?%p4%t;5%;%?%p3%p1 %|%p6%|%t;7%;%?%p7%t;8%;m%?%p8%t\EV%;%?%p9%t\016%e\017%;, - sgr0=\E[m\017, smam=\E[?7h, smir=\E[4h, - smkx=\E[19;1j\E[21;4j\Eent, smln=\E~, tbc=\E[3g, - tsl=\E7\E[25;%p1%{8}%+%dH, vpa=\E[%p1%{1}%+%dd, - use=att4410, + sgr0=\E[m\017, smam=\E[?7h, smkx=\E[19;1j\E[21;4j\Eent, + smln=\E~, tsl=\E7\E[25;%p1%{8}%+%dH, use=ansi+idc, + use=ansi+idl, use=ansi+inittabs, use=ansi+local, + use=ansi+rca, use=att4410, att4415-w|tty5420-w|att5420-w|AT&T 4415/5420 132 cols, cols#132, lm#54, wsl#97, @@ -14079,41 +14273,38 @@ att4415-w-rv-n|tty5420-w-rv-n|att5420-w-rv-n|AT&T 4415/5420 132 cols reverse wit att5420_2|AT&T 5420 model 2 80 cols, am, db, hs, mir, msgr, xon, - cols#80, it#8, lh#2, lines#24, lm#78, lw#8, nlab#8, wsl#55, + cols#80, lh#2, lines#24, lm#78, lw#8, nlab#8, wsl#55, acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, - blink=\E[5m, cbt=\E[1Z, clear=\EH\EJ, cnorm=\E[11;0j, - cr=\EG, csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H, - cud=\E[%p1%dB, cud1=\E[1B, cuf=\E[%p1%dC, cuf1=\E[1C, - cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[1A, - cvvis=\E[11;1j, dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, - dl=\E[%p1%dM, dl1=\E[M, ech=\E[%p1%ds\E[%p1%dD, ed=\E[0J, - el=\E[0K, el1=\E[1K, flash=\E[?5h$<200>\E[?5l, fsl=\E8, - home=\E[H, hpa=\E[%p1%{1}%+%dG, ht=^I, hts=\EH, - ich=\E[%p1%d@, ich1=\E[@, il=\E[%p1%dL, il1=\E[L, ind=\n, - indn=\E[%p1%dE, invis=\E[8m, + cbt=\E[1Z, clear=\EH\EJ, cnorm=\E[11;0j, cr=\EG, cub1=^H, + cud1=\E[1B, cuf1=\E[1C, cup=\E[%i%p1%d;%p2%dH, + cuu1=\E[1A, cvvis=\E[11;1j, dch=\E[%p1%dP, dch1=\E[P, + ech=\E[%p1%ds\E[%p1%dD, ed=\E[0J, el=\E[0K, el1=\E[1K, + flash=\E[?5h$<200>\E[?5l, fsl=\E8, home=\E[H, + hpa=\E[%p1%{1}%+%dG, ich=\E[%p1%d@, ich1=\E[@, ind=\n, + indn=\E[%p1%dE, is1=\E[0;23r\Ex\Ey\E[2;0j\E[3;3j\E[4;0j\E[5;0j\E[6;0j\E[7;0j \E[8;0j\E[9;1j\E[10;0j\E[15;0j\E[16;1j\E[19;0j\E[20;1j \E[29;0j\E[1;24r, - kbeg=\Et, kbs=^H, kcbt=\E[Z, kclr=\E[2J, kcub1=\E[D, - kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kdch1=\E[P, kdl1=\E[M, + kbeg=\Et, kcbt=\E[Z, kclr=\E[2J, kdch1=\E[P, kdl1=\E[M, kel=\E[2K, kend=\Ez, kent=\n, kf1=\EOc, kf2=\EOd, kf3=\EOe, - kf4=\EOf, kf5=\EOg, kf6=\EOh, kf7=\EOi, kf8=\EOj, khome=\E[H, + kf4=\EOf, kf5=\EOg, kf6=\EOh, kf7=\EOi, kf8=\EOj, kich1=\E[4h, kil1=\E[L, kind=\E[T, kll=\Eu, knp=\E[U, kpp=\E[V, kri=\E[S, lf1=F1, lf2=F2, lf3=F3, lf4=F4, lf5=F5, lf6=F6, lf7=F7, lf8=F8, ll=\Ew, mc0=\E[?;2i, mc4=\E[4i, mc5=\E[5i, mrcup=\E[%i%p1%d;%p2%dt, nel=\r\n, pfx=\E[%p1%d;%p2%l%02dq\s\s\sF%p1%d\s\s\s\s\s\s\s\s\s\s\s%p2 %s\E~, - pln=\E[%p1%d;0;0;0q%p2%:-16.16s\E~, prot=\EV, rc=\E8, - rev=\E[7m, ri=\EM, rin=\E[%p1%dF, rmacs=^O, rmkx=\E[19;0j, - rmln=\E|, rmso=\E[m, rmul=\E[m, rs2=\Ec\E[?3l\E[2;0y, - sc=\E7, + pln=\E[%p1%d;0;0;0q%p2%:-16.16s\E~, prot=\EV, ri=\EM, + rin=\E[%p1%dF, rmacs=^O, rmkx=\E[19;0j, rmln=\E|, + rs2=\Ec\E[?3l\E[2;0y, sgr=\E[0%?%p1%p5%|%t;2%;%?%p2%p6%|%t;4%;%?%p4%t;5%;%?%p3%p1 %|%p6%|%t;7%;%?%p7%t;8%;m%?%p9%t\016%e\017%;%?%p8%t\EV%;, sgr0=\E[m\017, smacs=^N, smkx=\E[19;1j, smln=\E~, - smso=\E[7m, smul=\E[4m, tbc=\E[3g, tsl=\E7\E[25;%p1%{8}%+%dH, vpa=\E[%p1%{1}%+%dd, + use=ansi+arrows, use=ansi+csr, use=ansi+idl, + use=ansi+inittabs, use=ansi+local, use=ansi+sgrdim, use=decid+cpr, + att5420_2-w|AT&T 5420 model 2 in 132 column mode, cols#132, is1=\E[0;23r\Ex\Ey\E[2;0j\E[3;3j\E[4;0j\E[5;1j\E[6;0j\E[7;0j @@ -14125,20 +14316,20 @@ att4418|att5418|AT&T 5418 80 cols, am, xon, cols#80, lines#24, acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, - bel=^G, blink=\E[5m, clear=\E[H\E[2J, cr=\r, cub=\E[%p1%dD, - cub1=\E[D, cud=\E[%p1%dB, cud1=\E[B, cuf=\E[%p1%dC, - cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, - cuu1=\E[A, dch=\E[%p1%dP, dch1=\E[1P, dim=\E[2m, - dl=\E[%p1%dM, dl1=\E[M, ed=\E[0J, el=\E[0K, home=\E[H, - ich=\E[%p1%d@, ich1=\E[1@, il=\E[%p1%dL, il1=\E[1L, ind=\n, - is1=\E[?3l, is2=\E)0\E?6l\E?5l, kclr=\E[%%, kcub1=\E@, - kcud1=\EU, kcuf1=\EA, kcuu1=\ES, kent=\E[, kf1=\E[h, - kf10=\E[m, kf11=\E[n, kf12=\E[o, kf13=\E[H, kf14=\E[I, - kf15=\E[J, kf18=\E[K, kf19=\E[L, kf2=\E[i, kf20=\E[E, - kf21=\E[_, kf22=\E[M, kf23=\E[N, kf24=\E[O, kf3=\E[j, - kf6=\E[k, kf7=\E[l, kf8=\E[f, kf9=\E[w, khome=\Ec, rc=\E8, - rev=\E[7m, rmacs=^O, rmso=\E[m, rmul=\E[m, sc=\E7, - sgr0=\E[m\017, smacs=^N, smso=\E[7m, smul=\E[4m, + bel=^G, blink=\E[5m, clear=\E[H\E[2J, cr=\r, + cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[1P, + dim=\E[2m, ed=\E[0J, el=\E[0K, home=\E[H, ich=\E[%p1%d@, + ich1=\E[1@, il1=\E[1L, ind=\n, is1=\E[?3l, + is2=\E)0\E?6l\E?5l, kclr=\E[%%, kcub1=\E@, kcud1=\EU, + kcuf1=\EA, kcuu1=\ES, kent=\E[, kf1=\E[h, kf10=\E[m, + kf11=\E[n, kf12=\E[o, kf13=\E[H, kf14=\E[I, kf15=\E[J, + kf18=\E[K, kf19=\E[L, kf2=\E[i, kf20=\E[E, kf21=\E[_, + kf22=\E[M, kf23=\E[N, kf24=\E[O, kf3=\E[j, kf6=\E[k, + kf7=\E[l, kf8=\E[f, kf9=\E[w, khome=\Ec, rc=\E8, rev=\E[7m, + rmacs=^O, rmso=\E[m, rmul=\E[m, sc=\E7, sgr0=\E[m\017, + smacs=^N, smso=\E[7m, smul=\E[4m, use=ansi+idl, + use=ansi+local, + att4418-w|att5418-w|AT&T 5418 132 cols, cols#132, is1=\E[?3h, use=att5418, @@ -14149,11 +14340,10 @@ att4420|tty4420|Teletype 4420, bel=^G, clear=\EH\EJ, cr=\EG, cub1=\ED, cud1=\EB, cuf1=\EC, cup=\EY%p1%{32}%+%c%p2%{32}%+%c, cuu1=\EA, dch1=\EP, dl1=\EM, ed=\EJ, el=\Ez, home=\EH, il1=\EL, ind=\EH\EM\EY7\s, - kcbt=\EO, kclr=\EJ, kcub1=^H, kcud1=\EB, kcuf1=\EC, - kcuu1=\EA, kdch1=\EP, kdl1=\EM, kf0=\EU, kf3=\E@, khome=\EH, - kich1=\E\^, kil1=\EL, kind=\ES, kri=\ET, + kcbt=\EO, kclr=\EJ, kcub1=^H, kdch1=\EP, kdl1=\EM, kf0=\EU, + kf3=\E@, khome=\EH, kich1=\E\^, kil1=\EL, kind=\ES, kri=\ET, lf0=segment advance, lf3=cursor tab, rmdc@, rmso=\E~, - rmul=\EZ, smdc@, smso=\E}, smul=\E\\, + rmul=\EZ, smdc@, smso=\E}, smul=\E\\, use=vt52+arrows, # The following is a terminfo entry for the Teletype 4424 # asynchronous keyboard-display terminal. It supports @@ -14175,20 +14365,17 @@ att4424|tty4424|Teletype 4424, cols#80, lines#24, acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, bel=^G, blink=\E3, bold=\E3, cbt=\EO, clear=\E[H\E[2J, cr=\r, - csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H, - cud=\E[%p1%dB, cud1=\EB, cuf=\E[%p1%dC, cuf1=\EC, - cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\EA, - dch=\E[%p1%dP, dch1=\EP, dim=\EW, dl=\E[%p1%dM, dl1=\EM, - ed=\EJ, el=\Ez, home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@, - ich1=\E\^, il=\E[%p1%dL, il1=\EL, ind=\n, is2=\E[20l\E[?7h, - kbs=^H, kclr=\EJ, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, - kcuu1=\E[A, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, - khome=\E[H, nel=\EE, rev=\E}, ri=\ET, rmacs=\E(B, rmso=\E~, - rmul=\EZ, + csr=\E[%i%p1%d;%p2%dr, cub1=^H, cud1=\EB, cuf1=\EC, + cup=\E[%i%p1%d;%p2%dH, cuu1=\EA, dch=\E[%p1%dP, dch1=\EP, + dim=\EW, dl=\E[%p1%dM, dl1=\EM, ed=\EJ, el=\Ez, home=\E[H, + ht=^I, hts=\EH, ich=\E[%p1%d@, ich1=\E\^, il=\E[%p1%dL, + il1=\EL, ind=\n, is2=\E[20l\E[?7h, kclr=\EJ, kf1=\EOP, + kf2=\EOQ, kf3=\EOR, kf4=\EOS, nel=\EE, rev=\E}, ri=\ET, + rmacs=\E(B, rmso=\E~, rmul=\EZ, sgr=\EX\E~\EZ\E4\E(B%?%p1%p3%|%t\E}%;%?%p2%t\E\\%;%?%p4%p6%| %t\E3%;%?%p5%t\EW%;%?%p9%t\E(0%;, sgr0=\EX\E~\EZ\E4\E(B, smacs=\E(0, smso=\E}, smul=\E\\, - tbc=\EF, + tbc=\EF, use=ansi+arrows, use=ansi+local, att4424-1|tty4424-1|Teletype 4424 in display function group I, kclr@, kcub1=\ED, kcud1=\EB, kcuf1=\EC, kcuu1=\EA, khome@, @@ -14206,10 +14393,9 @@ att4424m|tty4424m|Teletype 4424M, bel=^G, clear=\E[2;H\E[J, cr=\r, cub1=^H, cud1=\n, cuf1=\E[C, cup=\E[%i%p1%2d;%p2%2dH\E[B, cuu1=\E[A, dch1=\EP, dl1=\EM, el=\E[K, ht=^I, ich1=\E\^, il1=\EL, ind=\n, ip=$<2/>, - is2=\E[m\E[2;24r, kbs=^H, kcub1=\E[D, kcud1=\E[B, - kcuf1=\E[C, kcuu1=\E[A, kf1=\EOP, kf2=\EOQ, kf3=\EOR, - kf4=\EOS, khome=\E[H, nel=\r\n, ri=\ET, rmso=\E[m, rmul=\E[m, - sgr0=\E[m, smso=\E[7m, smul=\E[4m, + is2=\E[m\E[2;24r, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, + nel=\r\n, ri=\ET, rmso=\E[m, rmul=\E[m, sgr0=\E[m, + smso=\E[7m, smul=\E[4m, use=ansi+arrows, # The Teletype 5425 is really version 2 of the Teletype 5420. It # is quite similar, except for some minor differences. No page @@ -14221,41 +14407,33 @@ att4424m|tty4424m|Teletype 4424M, # # (att5425: added / based on the init string -- esr) att5425|tty5425|att4425|AT&T 4425/5425, - am, da, db, hs, mir, msgr, xenl, xon, - cols#80, it#8, lh#2, lines#24, lm#78, lw#8, nlab#8, wsl#55, - acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, - bel=^G, blink=\E[5m, bold=\E[2;7m, cbt=\E[Z, - clear=\E[H\E[J, cnorm=\E[12;0j, cr=\r, - csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H, - cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C, - cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, - cvvis=\E[12;1j, dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, - dl=\E[%p1%dM, dl1=\E[M, ech=\E[%p1%ds\E[%p1%dD, ed=\E[J, - el=\E[K, el1=\E[1K, enacs=\E(B\E)0, - flash=\E[?5h$<200>\E[?5l, fsl=\E8, home=\E[H, - hpa=\E[%p1%{1}%+%dG, ht=^I, hts=\EH, ich=\E[%p1%d@, - il=\E[%p1%dL, il1=\E[L, ind=\n, indn=\E[%p1%dE, - invis=\E[8m, is1=\E<\E[?3l$<100>, + da, db, hs, mir, xenl, xon, + lh#2, lm#78, lw#8, nlab#8, wsl#55, + bold=\E[2;7m, cnorm=\E[12;0j, cub1=^H, cud1=\n, + cup=\E[%i%p1%d;%p2%dH, cvvis=\E[12;1j, dch=\E[%p1%dP, + dch1=\E[P, dim=\E[2m, ech=\E[%p1%ds\E[%p1%dD, el1=\E[1K, + flash=\E[?5h$<200>\E[?5l, fsl=\E8, hpa=\E[%p1%{1}%+%dG, + ich=\E[%p1%d@, indn=\E[%p1%dE, is1=\E<\E[?3l$<100>, is2=\E[m\017\E[1;2;3;4;6l\E[12;13;14;20l\E[?6;97;99l\E[?7h \E[4i\Ex\E[25;1j\212, - is3=\E[?5l, kbeg=\Et, kbs=^H, kcbt=\E[Z, kclr=\E[J, - kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kdch1=\E[P, + is3=\E[?5l, kbeg=\Et, kcbt=\E[Z, kclr=\E[J, kdch1=\E[P, kdl1=\E[M, kel=\E[2K, kend=\Ez, kent=\Eent, kf1=\EOc, kf2=\EOd, kf3=\EOe, kf4=\EOf, kf5=\EOg, kf6=\EOh, kf7=\EOi, - kf8=\EOj, khome=\E[H, kich1=\E[4h, kil1=\E[L, kind=\E[T, - kri=\E[S, ll=\E[24H, mc0=\E[?2i, mc4=\E[?9i, mc5=\E[?4i, - nel=\r\n, + kf8=\EOj, kich1=\E[4h, kil1=\E[L, kind=\E[T, kri=\E[S, + ll=\E[24H, mc0=\E[?2i, mc4=\E[?9i, mc5=\E[?4i, nel=\r\n, pfx=\E[%p1%d;%p2%l%02dq F%p1%1d %p2%s, - pln=\E[%p1%d;0;0;0q%p2%:-16.16s, prot=\EV, rc=\E8, - rev=\E[7m, ri=\EM, rin=\E[%p1%dF, rmacs=^O, rmam=\E[?7l, - rmir=\E[4l, rmkx=\E[21;0j\E[25;1j\212, rmln=\E|, - rmso=\E[m, rmul=\E[m, rs2=\Ec\E[?3l\E[2;0y, sc=\E7, + pln=\E[%p1%d;0;0;0q%p2%:-16.16s, prot=\EV, ri=\EM, + rin=\E[%p1%dF, rmam=\E[?7l, rmir=\E[4l, + rmkx=\E[21;0j\E[25;1j\212, rmln=\E|, + rs2=\Ec\E[?3l\E[2;0y, sgr=\E[0%?%p5%p6%|%t;2%;%?%p2%t;4%;%?%p4%t;5%;%?%p3%p1%|%p6 %|%t;7%;%?%p7%t;8%;m%?%p8%t\EV%;%?%p9%t\016%e\017%;, - sgr0=\E[m\017, smacs=^N, smam=\E[?7h, smir=\E[4h, - smkx=\E[21;1j\E[25;4j\Eent\E~, smln=\E~, smso=\E[7m, - smul=\E[4m, tbc=\E[3g, tsl=\E7\E[25;%p1%{8}%+%dH, - vpa=\E[%p1%{1}%+%dd, use=decid+cpr, + sgr0=\E[m\017, smam=\E[?7h, smir=\E[4h, + smkx=\E[21;1j\E[25;4j\Eent\E~, smln=\E~, + tsl=\E7\E[25;%p1%{8}%+%dH, vpa=\E[%p1%{1}%+%dd, + use=ansi+arrows, use=ansi+csr, use=ansi+erase, + use=ansi+idl, use=ansi+inittabs, use=ansi+local, + use=ansi+sgrbold, use=decid+cpr, use=vt100+4bsd, att5425-nl|tty5425-nl|att4425-nl|AT&T 4425/5425 80 columns no labels, smkx=\E[21;1j\E[25;4j\Eent, use=att4425, @@ -14271,20 +14449,17 @@ att4426|tty4426|Teletype 4426S, cols#80, lines#24, lm#48, acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, bel=^G, bold=\E[5m, clear=\E[H\E[2J\E[1U\E[H\E[2J\E[1V, - cr=\r, cub=\E[%p1%dD, cub1=\E[D, cud=\E[%p1%dB, cud1=\E[B, - cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, - cuu=\E[%p1%dA, cuu1=\E[A, dch=\E[%p1%dP, dch1=\EP, - dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[0K, home=\E[H, - hpa=\E[%p1%dG, ht=^I, hts=\E1, ich=\E[%p1%d@, ich1=\E\^, - il=\E[%p1%dL, il1=\EL, ind=\n, is1=\Ec\E[?7h, - is2=\E[m\E[1;24r, kbs=^H, kcbt=\EO, kclr=\E[2J, kcub1=\ED, - kcud1=\EB, kcuf1=\EC, kcuu1=\EA, kf1=\EOP, kf2=\EOQ, - kf3=\EOR, kf4=\EOS, kf5=\EOT, kf6=\EOU, kf7=\EOV, kf8=\EOW, - khome=\E[H, kll=\E[24;1H, ll=\E[24H, nel=\r\n, rc=\E8, - rev=\E[7m, ri=\ET, rmacs=\E(B, rmam=\E[?7l, rmso=\E[m, - rmul=\E[m, rs2=\Ec\E[?3l\E[2;0y, sc=\E7, sgr0=\E[m\E(B, - smacs=\E(0, smam=\E[?7h, smso=\E[5m, smul=\E[4m, tbc=\E[3g, - vpa=\E[%p1%dd, use=ecma+index, + cr=\r, cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\EP, + ed=\E[J, el=\E[0K, home=\E[H, hpa=\E[%p1%dG, ht=^I, hts=\E1, + ich=\E[%p1%d@, ich1=\E\^, il1=\EL, ind=\n, is1=\Ec\E[?7h, + is2=\E[m\E[1;24r, kbs=^H, kcbt=\EO, kclr=\E[2J, kf1=\EOP, + kf2=\EOQ, kf3=\EOR, kf4=\EOS, kf5=\EOT, kf6=\EOU, kf7=\EOV, + kf8=\EOW, khome=\E[H, kll=\E[24;1H, ll=\E[24H, nel=\r\n, + rc=\E8, rev=\E[7m, ri=\ET, rmacs=\E(B, rmam=\E[?7l, + rmso=\E[m, rmul=\E[m, rs2=\Ec\E[?3l\E[2;0y, sc=\E7, + sgr0=\E[m\E(B, smacs=\E(0, smam=\E[?7h, smso=\E[5m, + smul=\E[4m, tbc=\E[3g, vpa=\E[%p1%dd, use=ansi+idl, + use=ansi+local, use=ecma+index, use=vt52+arrows, # Terminfo entry for the AT&T 510 A Personal Terminal # Function keys 9 - 16 are available only after the @@ -14298,26 +14473,25 @@ att510a|bct510a|AT&T 510A Personal Terminal, am, mir, msgr, xenl, xon, cols#80, lh#2, lines#24, lw#7, nlab#8, acsc=+g\,h-f.e`bhrisjjkkllmmnnqqttuuvvwwxx{{||}}~~, - bel=^G, blink=\E[5m, bold=\E[2;7m, cbt=\E[Z, - civis=\E[11;0|, clear=\E[H\E[J, cnorm=\E[11;3|, cr=\r, - cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\E[B, - cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, - cuu=\E[%p1%dA, cuu1=\E[A, cvvis=\E[11;2|, dch=\E[%p1%dP, - dch1=\E[P, dim=\E[2m, dl=\E[%p1%dM, dl1=\E[M, ed=\E[0J, - el=\E[0K, el1=\E[1K, enacs=\E(B\E)1, ff=^L, home=\E[H, ht=^I, - hts=\EH, il=\E[%p1%dL, il1=\E[L, ind=\n, is1=\E(B\E)1\E[2l, - is3=\E[21;1|\212, kLFT=\E[u, kRIT=\E[v, kbs=^H, kcbt=\E[Z, - kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf1=\EOm, - kf10=\EOd, kf11=\EOe, kf12=\EOf, kf13=\EOg, kf14=\EOh, - kf15=\EOi, kf16=\EOj, kf2=\EOV, kf3=\EOu, kf4=\ENj, kf5=\ENe, - kf6=\ENf, kf7=\ENh, kf8=\E[H, kf9=\EOc, kind=\E[S, kri=\E[T, - mc0=\E[0i, mc4=\E[?8i, mc5=\E[?4i, nel=\EE, - pln=\E[%p1%dp%p2%:-16s, rc=\E8, rev=\E[7m, ri=\EM, - rmacs=^O, rmkx=\E[19;0|, rmso=\E[m, rmul=\E[m, sc=\E7, + bel=^G, blink=\E[5m, bold=\E[2;7m, civis=\E[11;0|, + clear=\E[H\E[J, cnorm=\E[11;3|, cr=\r, cub1=^H, + cup=\E[%i%p1%d;%p2%dH, cvvis=\E[11;2|, dch=\E[%p1%dP, + dch1=\E[P, dim=\E[2m, ed=\E[0J, el=\E[0K, el1=\E[1K, + enacs=\E(B\E)1, ff=^L, home=\E[H, ind=\n, + is1=\E(B\E)1\E[2l, is3=\E[21;1|\212, kLFT=\E[u, + kRIT=\E[v, kbs=^H, kcbt=\E[Z, kcub1=\E[D, kcud1=\E[B, + kcuf1=\E[C, kcuu1=\E[A, kf1=\EOm, kf10=\EOd, kf11=\EOe, + kf12=\EOf, kf13=\EOg, kf14=\EOh, kf15=\EOi, kf16=\EOj, + kf2=\EOV, kf3=\EOu, kf4=\ENj, kf5=\ENe, kf6=\ENf, kf7=\ENh, + kf8=\E[H, kf9=\EOc, kind=\E[S, kri=\E[T, mc0=\E[0i, + mc4=\E[?8i, mc5=\E[?4i, nel=\EE, pln=\E[%p1%dp%p2%:-16s, + rc=\E8, rev=\E[7m, ri=\EM, rmacs=^O, rmkx=\E[19;0|, + rmso=\E[m, rmul=\E[m, sc=\E7, sgr=\E[0%?%p5%p6%|%t;2%;%?%p2%t;4%;%?%p4%t;5%;%?%p3%p1%|%p6 %|%t;7%;m%?%p9%t\016%e\017%;, sgr0=\E[m\017, smacs=^N, smkx=\E[19;1|, smso=\E[7m, - smul=\E[4m, tbc=\E[3g, use=ansi+cpr, + smul=\E[4m, use=ansi+cpr, use=ansi+idl, use=ansi+local, + use=ansi+tabs, # Terminfo entry for the AT&T 510 D Personal Terminal # Function keys 9 through 16 are accessed by bringing up the @@ -14332,15 +14506,11 @@ att510d|bct510d|AT&T 510D Personal Terminal, am, da, db, mir, msgr, xenl, xon, cols#80, lh#2, lines#24, lm#48, lw#7, nlab#8, acsc=+g\,h-f.e`bhrisjjkkllmmnnqqttuuvvwwxx{{||}}~~, - bel=^G, blink=\E[5m, bold=\E[2;7m, cbt=\E[Z, - clear=\E[H\E[J, cnorm=\E[11;3|, cr=\r, cub=\E[%p1%dD, - cub1=^H, cud=\E[%p1%dB, cud1=\E[B, cuf=\E[%p1%dC, - cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, - cuu1=\E[A, cvvis=\E[11;2|, dch=\E[%p1%dP, dch1=\E[P, - dim=\E[2m, dl=\E[%p1%dM, dl1=\E[M, ed=\E[0J, el=\E[0K, + bel=^G, bold=\E[2;7m, clear=\E[H\E[J, cnorm=\E[11;3|, + cr=\r, cub1=^H, cup=\E[%i%p1%d;%p2%dH, cvvis=\E[11;2|, + dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, ed=\E[0J, el=\E[0K, el1=\E[1K, enacs=\E(B\E)1, ff=^L, home=\E[H, - hpa=\E[%p1%{1}%+%dG, ht=^I, hts=\EH, ich=\E[%p1%d@, - il=\E[%p1%dL, il1=\E[L, ind=\n, invis=\E[8m, + hpa=\E[%p1%{1}%+%dG, ich=\E[%p1%d@, ind=\n, is1=\E(B\E)1\E[5;0|, is3=\E[21;1|\212, kLFT=\E[u, kRIT=\E[v, kbs=^H, kcbt=\E[Z, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf1=\EOm, kf10=\EOd, kf11=\EOe, @@ -14348,44 +14518,40 @@ att510d|bct510d|AT&T 510D Personal Terminal, kf2=\EOV, kf3=\EOu, kf4=\ENj, kf5=\ENe, kf6=\ENf, kf7=\ENh, kf8=\E[H, kf9=\EOc, kind=\E[S, kri=\E[T, ll=\E#2, mc0=\E[0i, mc4=\E[?8i, mc5=\E[?4i, mgc=\E:, nel=\EE, - pln=\E[%p1%dp%p2%:-16s, rc=\E8, rev=\E[7m, ri=\EM, - rmacs=^O, rmir=\E[4l, rmkx=\E[19;0|, rmln=\E<, rmso=\E[m, - rmul=\E[m, rmxon=\E[29;1|, rs2=\E[5;0|, sc=\E7, + pln=\E[%p1%dp%p2%:-16s, rc=\E8, ri=\EM, rmacs=^O, + rmir=\E[4l, rmkx=\E[19;0|, rmln=\E<, rmxon=\E[29;1|, + rs2=\E[5;0|, sc=\E7, sgr=\E[0%?%p5%p6%|%t;2%;%?%p2%t;4%;%?%p4%t;5%;%?%p3%p1%|%p6 %|%t;7%;%?%p7%t;8%;m%?%p9%t\016%e\017%;, sgr0=\E[m\017, smacs=^N, smgl=\E4, smgr=\E5, smir=\E[4h, - smkx=\E[19;1|, smln=\E?, smso=\E[7m, smul=\E[4m, - smxon=\E[29;0|, tbc=\E[3g, vpa=\E[%p1%{1}%+%dd, - use=ansi+cpr, use=ansi+rep, use=ecma+index, + smkx=\E[19;1|, smln=\E?, smxon=\E[29;0|, + vpa=\E[%p1%{1}%+%dd, use=ansi+cpr, use=ansi+idl, + use=ansi+local, use=ansi+rep, use=ansi+sgrbold, + use=ansi+tabs, use=ecma+index, # (att500: I merged this with the att513 entry, att500 just used att513 -- esr) att500|att513|AT&T 513 using page mode, am, chts, mir, msgr, xenl, xon, cols#80, lh#2, lines#24, lw#8, nlab#8, acsc=+g\,h-f.e`bhrisjjkkllmmnnqqttuuvvwwxx{{||}}~~, - bel=^G, blink=\E[5m, bold=\E[2;7m, cbt=\E[Z, - clear=\E[H\E[J, cnorm=\E[11;0|, cr=\r, - csr=%i\E[%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H, - cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C, - cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, - cvvis=\E[11;1|, dch=\E[%p1%dP, dch1=\E[P$<1>, dim=\E[2m, - dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K, el1=\E[1K, - enacs=\E(B\E)1, home=\E[H, hpa=\E[%p1%{1}%+%dG, ht=^I, - hts=\EH, ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L, ind=\n, - indn=\E[%p1%dE, invis=\E[8m, + bel=^G, bold=\E[2;7m, cnorm=\E[11;0|, cr=\r, + csr=%i\E[%p1%d;%p2%dr, cub1=^H, cud1=\n, + cup=\E[%i%p1%d;%p2%dH, cvvis=\E[11;1|, dch=\E[%p1%dP, + dch1=\E[P$<1>, dim=\E[2m, el1=\E[1K, enacs=\E(B\E)1, + home=\E[H, hpa=\E[%p1%{1}%+%dG, ich=\E[%p1%d@, ind=\n, + indn=\E[%p1%dE, is1=\E?\E[3;3|\E[10;0|\E[21;1|\212\E[6;1|\E[1{\E[?99l, kBEG=\ENB, kCAN=\EOW, kCMD=\EOU, kCPY=\END, kCRT=\EON, kDC=\ENF, kDL=\ENE, kEND=\ENN, kEOL=\EOA, kEXT=\EOK, kFND=\EOX, kHLP=\EOM, kHOM=\ENM, kIC=\ENJ, kLFT=\ENK, kMOV=\ENC, kMSG=\EOL, kNXT=\ENH, kOPT=\EOR, kPRT=\EOZ, kPRV=\ENG, kRDO=\EOT, kRES=\EOQ, kRIT=\ENL, kRPL=\EOY, - kSAV=\EOO, kSPD=\EOP, kUND=\EOS, kbeg=\E9, kbs=^H, kcan=\EOw, + kSAV=\EOO, kSPD=\EOP, kUND=\EOS, kbeg=\E9, kcan=\EOw, kcbt=\E[Z, kclo=\EOV, kclr=\E[J, kcmd=\EOu, kcpy=\ENd, - kcrt=\EOn, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, - kdch1=\ENf, kdl1=\ENe, kel=\EOa, kend=\E0, kent=\Eent, - kext=\EOk, kf1=\EOc, kf2=\EOd, kf3=\EOe, kf4=\EOf, kf5=\EOg, - kf6=\EOh, kf7=\EOi, kf8=\EOj, kfnd=\EOx, khlp=\EOm, - khome=\E[H, kich1=\ENj, kind=\E[S, kmov=\ENc, kmrk=\ENi, + kcrt=\EOn, kdch1=\ENf, kdl1=\ENe, kel=\EOa, kend=\E0, + kent=\Eent, kext=\EOk, kf1=\EOc, kf2=\EOd, kf3=\EOe, + kf4=\EOf, kf5=\EOg, kf6=\EOh, kf7=\EOi, kf8=\EOj, kfnd=\EOx, + khlp=\EOm, kich1=\ENj, kind=\E[S, kmov=\ENc, kmrk=\ENi, kmsg=\EOl, knp=\E[U, knxt=\ENh, kopn=\EOv, kopt=\EOr, kpp=\E[V, kprt=\EOz, kprv=\ENg, krdo=\EOt, kref=\EOb, kres=\EOq, krfr=\ENa, kri=\E[T, krpl=\EOy, krst=\EOB, @@ -14397,19 +14563,19 @@ att500|att513|AT&T 513 using page mode, pfloc=\E[%p1%d;%p2%l%d;2;0p\s\s\sF%p1%d\s\s\s\s\s\s\s\s\s\s \s%p2%s, pfx=\E[%p1%d;%p2%l%d;1;0p F%p1%d %p2%s, - pln=\E[%p1%dp%p2%:-16s, rc=\E8, rev=\E[7m, ri=\EM, - rin=\E[%p1%dF, rmacs=^O, rmir=\E[4l, - rmkx=\E[19;0|\E[21;1|\212, rmln=\E<, rmso=\E[m, - rmul=\E[m, + pln=\E[%p1%dp%p2%:-16s, rc=\E8, ri=\EM, rin=\E[%p1%dF, + rmacs=^O, rmir=\E[4l, rmkx=\E[19;0|\E[21;1|\212, + rmln=\E<, rs1=\E?\E[3;3|\E[10;0|\E[21;1|\212\E[6;1|\E[1{\E[?99l\E[2;0| \E[6;1|\E[8;0|\E[19;0|\E[1{\E[?99l, rs2=\E[5;0|, sc=\E7, sgr=\E[0%?%p1%p5%|%p6%|%t;2%;%?%p2%t;4%;%?%p4%t;5%;%?%p3%p1 %|%p6%|%t;7%;%?%p7%t;8%;m%?%p9%t\016%e\017%;, sgr0=\E[m\017, smacs=^N, smir=\E[4h, - smkx=\E[19;1|\E[21;4|\Eent, smln=\E?, smso=\E[7m, - smul=\E[4m, tbc=\E[3g, vpa=\E[%p1%{1}%+%dd, - use=decid+cpr, use=ansi+rep, + smkx=\E[19;1|\E[21;4|\Eent, smln=\E?, + vpa=\E[%p1%{1}%+%dd, use=ansi+arrows, use=ansi+erase, + use=ansi+idl, use=ansi+local, use=ansi+rep, + use=ansi+sgrbold, use=ansi+tabs, use=decid+cpr, # 01-07-88: # printer must be set to EMUL ANSI to accept ESC codes @@ -14459,13 +14625,12 @@ att5310|att5320|AT&T Model 53210 or 5320 matrix printer, att5620-1|tty5620-1|dmd1|Teletype 5620 with old ROMs, am, xon, cols#88, it#8, lines#70, vt#3, - bel=^G, clear=\E[H\E[J, cr=\r, cub1=^H, cud1=\n, cuf1=\E[C, - cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, dch=\E[%p1%dP, - dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K, - home=\E[H, ht=^I, ich=\E[%p1%d@, ich1=\E[@, il=\E[%p1%dL, - il1=\E[L, ind=\n, kbs=^H, kclr=\E[2J, kcub1=\E[D, kcud1=\E[B, - kcuf1=\E[C, kcuu1=\E[A, khome=\E[H, kll=\E[70;1H, nel=\r\n, - rc=\E8, ri=\E[T, rs1=\Ec, sc=\E7, use=ecma+index, + bel=^G, cr=\r, cub1=^H, cud1=\n, cup=\E[%i%p1%d;%p2%dH, + dch=\E[%p1%dP, dch1=\E[P, home=\E[H, ht=^I, ich=\E[%p1%d@, + ich1=\E[@, ind=\n, kclr=\E[2J, kll=\E[70;1H, nel=\r\n, + rc=\E8, ri=\E[T, rs1=\Ec, sc=\E7, use=ansi+arrows, + use=ansi+erase, use=ansi+idl, use=ansi+local1, + use=ecma+index, # 5620 terminfo (2.0 or later ROMS with char attributes) # The following SET-UP modes are assumed for normal operation: @@ -14482,16 +14647,15 @@ att5620-1|tty5620-1|dmd1|Teletype 5620 with old ROMs, att5620|dmd|tty5620|ttydmd|5620|AT&T 5620 terminal 88 columns, OTbs, am, msgr, npc, xon, cols#88, it#8, lines#70, - bel=^G, bold=\E[2m, clear=\E[H\E[J, cr=\r, cub1=^H, - cud1=\E[B, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, - dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, dl=\E[%p1%dM, - dl1=\E[M, ed=\E[J, el=\E[K, home=\E[H, ht=^I, ich=\E[%p1%d@, - ich1=\E[@, il=\E[%p1%dL, il1=\E[L, ind=\E[S, kbs=^H, - kclr=\E[2J, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, - khome=\E[H, kll=\E[70;1H, nel=\n, - pfx=\E[%p1%d;%p2%l%dq%p2%s, rc=\E8, rev=\E[7m, ri=\E[T, - rmso=\E[0m, rmul=\E[0m, rs1=\Ec, sc=\E7, sgr0=\E[0m, - smso=\E[7m, smul=\E[4m, use=ecma+index, + bel=^G, bold=\E[2m, cr=\r, cub1=^H, cup=\E[%i%p1%d;%p2%dH, + dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, home=\E[H, ht=^I, + ich=\E[%p1%d@, ich1=\E[@, ind=\E[S, kclr=\E[2J, + kll=\E[70;1H, nel=\n, pfx=\E[%p1%d;%p2%l%dq%p2%s, rc=\E8, + rev=\E[7m, ri=\E[T, rmso=\E[0m, rmul=\E[0m, rs1=\Ec, sc=\E7, + sgr0=\E[0m, smso=\E[7m, smul=\E[4m, use=ansi+arrows, + use=ansi+erase, use=ansi+idl, use=ansi+local1, + use=ecma+index, + att5620-24|tty5620-24|dmd-24|Teletype dmd 5620 in a 24x80 layer, lines#24, use=att5620, att5620-34|tty5620-34|dmd-34|Teletype dmd 5620 in a 34x80 layer, @@ -14502,9 +14666,8 @@ att5620-s|tty5620-s|layer|vitty|AT&T 5620 S layer, cols#80, it#8, lines#72, bel=^G, clear=^L, cr=\r, cub1=^H, cud1=\n, cup=\EY%p2%{32}%+%c%p1%{32}%+%c, cuu1=^K, dl1=\ED, - el=\EK, flash=\E^G, ht=^I, il1=\EI, ind=\n, kbs=^H, kclr=\E[2J, - kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, khome=\E[H, - kll=\E[70;1H, + el=\EK, flash=\E^G, ht=^I, il1=\EI, ind=\n, kclr=\E[2J, + khome=\E[H, kll=\E[70;1H, use=ansi+arrows, # Entries for thru refer to the shifted system pf keys. # @@ -14514,15 +14677,11 @@ att605|AT&T 605 80 column 102key keyboard, am, eo, xon, cols#80, lines#24, lw#8, nlab#8, wsl#80, acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, - bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, clear=\E[H\E[J, - cr=\r, cub1=^H, cud1=\E[B, cuf1=\E[C, - cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, dch=\E[%p1%dP, - dch1=\E[P, dim=\E[2m, dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, - el=\E[K, el1=\E[1K, fsl=\E8, ht=^I, ich=\E[%p1%d@, ich1=\E[@, - il1=\E[L, ind=\n, invis=\E[8m, + bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, cr=\r, cub1=^H, + cup=\E[%i%p1%d;%p2%dH, dim=\E[2m, dl=\E[%p1%dM, dl1=\E[M, + el1=\E[1K, fsl=\E8, ht=^I, il1=\E[L, ind=\n, invis=\E[8m, is1=\E[8;0|\E[?\E[13;20l\E[?\E[12h, is2=\E[m\017, - kLFT=\E[ A, kRIT=\E[ @, kbs=^H, kcbt=\E[Z, kclr=\E[2J, - kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kdch1=\E[P, + kLFT=\E[ A, kRIT=\E[ @, kcbt=\E[Z, kclr=\E[2J, kdch1=\E[P, kdl1=\E[M, kend=\E[24;1H, kf1=\EOc, kf10=\ENp, kf11=\ENq, kf12=\ENr, kf13=\ENs, kf14=\ENt, kf15=\EOC, kf16=\EOD, kf17=\EOE, kf18=\EOF, kf19=\EOG, kf2=\EOd, kf20=\EOH, @@ -14532,26 +14691,24 @@ att605|AT&T 605 80 column 102key keyboard, kf35=\EOy, kf36=\EOm, kf37=\EOt, kf38=\EOu, kf39=\EOv, kf4=\EOf, kf40=\EOl, kf41=\EOq, kf42=\EOr, kf43=\EOs, kf44=\EOp, kf45=\EOn, kf46=\EOM, kf5=\EOg, kf6=\EOh, - kf7=\EOi, kf8=\EOj, kf9=\ENo, khome=\E[H, kich1=\E[@, - kil1=\E[L, kind=\E[S, knp=\E[U, kpp=\E[V, ll=\E[24H, - mc4=\E[?4i, mc5=\E[?5i, nel=\EE, + kf7=\EOi, kf8=\EOj, kf9=\ENo, kich1=\E[@, kil1=\E[L, + kind=\E[S, knp=\E[U, kpp=\E[V, ll=\E[24H, mc4=\E[?4i, + mc5=\E[?5i, nel=\EE, pfx=\E[%p1%d;%p2%l%02dq F%p1%1d %p2%s, pln=\E[%p1%d;0;0;0q%p2%:-16.16s, rc=\E8, rev=\E[7m, - rmacs=^O, rmir=\E[4l, rmln=\E[2p, rmso=\E[m, rmul=\E[m, - rs2=\Ec\E[?3l, sc=\E7, sgr0=\E[m\017, smacs=\E)0\016, - smir=\E[4h, smln=\E[p, smso=\E[7m, smul=\E[4m, - tsl=\E7\E[25;%i%p1%dx, use=ansi+cpr, + rmacs=^O, rmln=\E[2p, rmso=\E[m, rmul=\E[m, rs2=\Ec\E[?3l, + sc=\E7, sgr0=\E[m\017, smacs=\E)0\016, smln=\E[p, + smso=\E[7m, smul=\E[4m, tsl=\E7\E[25;%i%p1%dx, + use=ansi+arrows, use=ansi+cpr, use=ansi+erase, + use=ansi+idc, use=ansi+local1, + att605-pc|AT&T 605 in pc term mode, acsc=j\331k\277l\332m\300n\305q\304t\303u\264v\301w\302x \263, - cbt=\E[Z, cub1=\E[D, cud1=\E[B, cuf1=\E[C, cuu1=\E[A, - dch1=\E[P, dl1=\E[M, ich1=\E[@, il1=\E[L, kcbt=\E[Z, - kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kdch1=\E[P, - kdl1=\E[M, kend=\E[F, kf1=\E[M, kf10=\E[V, kf2=\E[N, + cub1=\E[D, kend=\E[F, kf1=\E[M, kf10=\E[V, kf2=\E[N, kf3=\E[O, kf4=\E[P, kf5=\E[Q, kf6=\E[R, kf7=\E[S, kf8=\E[T, - kf9=\E[U, khome=\E[H, kich1=\E[@, knp=\E[G, kpp=\E[I, - rmsc=\E[50;0|$<400>, smsc=\E[?11l\E[50;1|$<250>, - xoffc=g, xonc=e, use=att605, + kf9=\E[U, knp=\E[G, kpp=\E[I, rmsc=\E[50;0|$<400>, + smsc=\E[?11l\E[50;1|$<250>, xoffc=g, xonc=e, use=att605, att605-w|AT&T 605-w 132 column 102 key keyboard, cols#132, wsl#132, is1=\E[8;0|\E[?4;5;13;15l\E[13;20l\E[?3;7h\E[12h\E(B\E)0, use=att605, @@ -14563,32 +14720,28 @@ att610|AT&T 610; 80 column; 98key keyboard, am, eslok, hs, mir, msgr, xenl, xon, cols#80, it#8, lh#2, lines#24, lw#8, nlab#8, wsl#80, acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, - bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, clear=\E[H\E[J, - cr=\r, csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H, - cud=\E[%p1%dB, cud1=\E[B, cuf=\E[%p1%dC, cuf1=\E[C, - cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, - cvvis=\E[?12;25h, dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, - dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K, el1=\E[1K, - flash=\E[?5h$<200>\E[?5l, fsl=\E8, home=\E[H, ht=^I, - ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L, ind=\ED, - invis=\E[8m, + bel=^G, cbt=\E[Z, cr=\r, cub1=^H, cvvis=\E[?12;25h, + dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, el1=\E[1K, + flash=\E[?5h$<200>\E[?5l, fsl=\E8, ht=^I, ich=\E[%p1%d@, + ind=\ED, is1=\E[8;0|\E[?3;4;5;13;15l\E[13;20l\E[?7h\E[12h\E(B\E)0, - is2=\E[m\017, is3=\E(B\E)0, kLFT=\E[ @, kRIT=\E[ A, kbs=^H, - kcbt=\E[Z, kclr=\E[2J, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, - kcuu1=\E[A, kf1=\EOc, kf10=\ENp, kf11=\ENq, kf12=\ENr, - kf13=\ENs, kf14=\ENt, kf2=\EOd, kf3=\EOe, kf4=\EOf, kf5=\EOg, - kf6=\EOh, kf7=\EOi, kf8=\EOj, kf9=\ENo, khome=\E[H, + is2=\E[m\017, is3=\E(B\E)0, kLFT=\E[ @, kRIT=\E[ A, + kcbt=\E[Z, kclr=\E[2J, kf1=\EOc, kf10=\ENp, kf11=\ENq, + kf12=\ENr, kf13=\ENs, kf14=\ENt, kf2=\EOd, kf3=\EOe, + kf4=\EOf, kf5=\EOg, kf6=\EOh, kf7=\EOi, kf8=\EOj, kf9=\ENo, kind=\E[S, kri=\E[T, ll=\E[24H, mc4=\E[?4i, mc5=\E[?5i, nel=\EE, pfx=\E[%p1%d;%p2%l%02dq F%p1%1d %p2%s, - pln=\E[%p1%d;0;0;0q%p2%:-16.16s, rc=\E8, rev=\E[7m, - ri=\EM, rmacs=^O, rmam=\E[?7l, rmir=\E[4l, rmln=\E[2p, - rmso=\E[m, rmul=\E[m, rs2=\Ec\E[?3l, sc=\E7, + pln=\E[%p1%d;0;0;0q%p2%:-16.16s, ri=\EM, rmacs=^O, + rmam=\E[?7l, rmir=\E[4l, rmln=\E[2p, rs2=\Ec\E[?3l, sgr=\E[0%?%p6%t;1%;%?%p5%t;2%;%?%p2%t;4%;%?%p4%t;5%;%?%p3%p1 %|%t;7%;%?%p7%t;8%;m%?%p9%t\016%e\017%;, sgr0=\E[m\017, smacs=^N, smam=\E[?7h, smir=\E[4h, - smln=\E[p, smso=\E[7m, smul=\E[4m, tsl=\E7\E[25;%i%p1%dx, - use=decid+cpr, use=ecma+index, use=att610+cvis, + smln=\E[p, tsl=\E7\E[25;%i%p1%dx, use=ansi+arrows, + use=ansi+csr, use=ansi+cup, use=ansi+erase, use=ansi+idl, + use=ansi+local, use=ansi+sgrbold, use=decid+cpr, + use=ecma+index, use=att610+cvis, + att610-w|AT&T 610; 132 column; 98key keyboard, cols#132, wsl#132, is1=\E[8;0|\E[?4;5;13;15l\E[13;20l\E[?3;7h\E[12h, @@ -14638,39 +14791,36 @@ att620|AT&T 620; 80 column; 98key keyboard, am, eslok, hs, mir, msgr, xenl, xon, cols#80, it#8, lh#2, lines#24, lw#8, nlab#8, wsl#80, acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, - bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, clear=\E[H\E[J, - cr=\r, csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H, - cud=\E[%p1%dB, cud1=\E[B, cuf=\E[%p1%dC, cuf1=\E[C, - cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, - cvvis=\E[?12;25h, dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, - dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K, el1=\E[1K, - flash=\E[?5h$<200>\E[?5l, fsl=\E8, home=\E[H, ht=^I, - ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L, ind=\ED, - invis=\E[8m, + bel=^G, cbt=\E[Z, cr=\r, cub1=^H, cvvis=\E[?12;25h, + dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, el1=\E[1K, + flash=\E[?5h$<200>\E[?5l, fsl=\E8, ht=^I, ich=\E[%p1%d@, + ind=\ED, is1=\E[8;0|\E[?3;4;5;13;15l\E[13;20l\E[?7h\E[12h, - is2=\E[m\017, is3=\E(B\E)0, kLFT=\E[ A, kRIT=\E[ @, kbs=^H, - kcbt=\E[Z, kclr=\E[2J, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, - kcuu1=\E[A, kf1=\EOc, kf10=\ENp, kf11=\ENq, kf12=\ENr, - kf13=\ENs, kf14=\ENt, kf15=\EOC, kf16=\EOD, kf17=\EOE, - kf18=\EOF, kf19=\EOG, kf2=\EOd, kf20=\EOH, kf21=\EOI, - kf22=\EOJ, kf23=\ENO, kf24=\ENP, kf25=\ENQ, kf26=\ENR, - kf27=\ENS, kf28=\ENT, kf29=\EOP, kf3=\EOe, kf30=\EOQ, - kf31=\EOR, kf32=\EOS, kf33=\EOw, kf34=\EOx, kf35=\EOy, - kf36=\EOm, kf37=\EOt, kf38=\EOu, kf39=\EOv, kf4=\EOf, - kf40=\EOl, kf41=\EOq, kf42=\EOr, kf43=\EOs, kf44=\EOp, - kf45=\EOn, kf46=\EOM, kf5=\EOg, kf6=\EOh, kf7=\EOi, kf8=\EOj, - kf9=\ENo, khome=\E[H, kind=\E[S, kri=\E[T, ll=\E[24H, + is2=\E[m\017, is3=\E(B\E)0, kLFT=\E[ A, kRIT=\E[ @, + kcbt=\E[Z, kclr=\E[2J, kf1=\EOc, kf10=\ENp, kf11=\ENq, + kf12=\ENr, kf13=\ENs, kf14=\ENt, kf15=\EOC, kf16=\EOD, + kf17=\EOE, kf18=\EOF, kf19=\EOG, kf2=\EOd, kf20=\EOH, + kf21=\EOI, kf22=\EOJ, kf23=\ENO, kf24=\ENP, kf25=\ENQ, + kf26=\ENR, kf27=\ENS, kf28=\ENT, kf29=\EOP, kf3=\EOe, + kf30=\EOQ, kf31=\EOR, kf32=\EOS, kf33=\EOw, kf34=\EOx, + kf35=\EOy, kf36=\EOm, kf37=\EOt, kf38=\EOu, kf39=\EOv, + kf4=\EOf, kf40=\EOl, kf41=\EOq, kf42=\EOr, kf43=\EOs, + kf44=\EOp, kf45=\EOn, kf46=\EOM, kf5=\EOg, kf6=\EOh, + kf7=\EOi, kf8=\EOj, kf9=\ENo, kind=\E[S, kri=\E[T, ll=\E[24H, mc4=\E[?4i, mc5=\E[?5i, nel=\EE, pfx=\E[%p1%d;%p2%l%02dq F%p1%1d %p2%s, - pln=\E[%p1%d;0;0;0q%p2%:-16.16s, rc=\E8, rev=\E[7m, - ri=\EM, rmacs=\E(B\017, rmam=\E[?7l, rmir=\E[4l, - rmln=\E[2p, rmso=\E[m, rmul=\E[m, rs2=\Ec\E[?3l, sc=\E7, + pln=\E[%p1%d;0;0;0q%p2%:-16.16s, ri=\EM, + rmacs=\E(B\017, rmam=\E[?7l, rmir=\E[4l, rmln=\E[2p, + rs2=\Ec\E[?3l, sgr=\E[0%?%p6%t;1%;%?%p5%t;2%;%?%p2%t;4%;%?%p4%t;5%;%?%p3%p1 %|%t;7%;%?%p7%t;8%;m%?%p9%t\E)0\016%e\E(B\017%;, sgr0=\E[m\E(B\017, smacs=\E)0\016, smam=\E[?7h, - smir=\E[4h, smln=\E[p, smso=\E[7m, smul=\E[4m, - tsl=\E7\E[25;%i%p1%dx, use=decid+cpr, use=ecma+index, + smir=\E[4h, smln=\E[p, tsl=\E7\E[25;%i%p1%dx, + use=ansi+arrows, use=ansi+csr, use=ansi+cup, + use=ansi+erase, use=ansi+idl, use=ansi+local, + use=ansi+sgrbold, use=decid+cpr, use=ecma+index, use=att610+cvis, + att620-w|AT&T 620; 132 column; 98key keyboard, cols#132, wsl#132, is1=\E[8;0|\E[?4;5;13;15l\E[13;20l\E[?3;7h\E[12h, @@ -14711,25 +14861,22 @@ att620-103k-w|AT&T 620; 132 column; 103key keyboard, att630|AT&T 630 windowing terminal, OTbs, am, da, db, mir, msgr, npc, xon, cols#80, it#8, lines#60, lm#0, - bel=^G, blink=\E[5m, cbt=\E[Z, clear=\E[H\E[J, cr=\r, - cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\E[B, - cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, - cuu=\E[%p1%dA, cuu1=\E[A, dch=\E[%p1%dP, dch1=\E[P, - dim=\E[2m, dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K, - el1=\E[1K, home=\E[H, ht=^I, ich=\E[%p1%d@, ich1=\E[@, - il=\E[%p1%dL, il1=\E[L, ind=\ED, is2=\E[m, kbs=^H, kcbt=\E[Z, - kclr=\E[2J, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, - kdch1=\E[P, kdl1=\E[M, kent=\r, kf10=\ENp, kf11=\ENq, - kf12=\ENr, kf13=\ENs, kf14=\ENt, kf15=\ENu, kf16=\ENv, - kf17=\ENw, kf18=\ENx, kf19=\ENy, kf20=\ENz, kf21=\EN{, - kf22=\EN|, kf23=\EN}, kf24=\EN~, kf9=\ENo, khome=\E[H, - kich1=\E[@, kil1=\E[L, mc4=\E[?4i, mc5=\E[?5i, nel=\r\n, + bel=^G, blink=\E[5m, cbt=\E[Z, cr=\r, cub1=^H, + cup=\E[%i%p1%d;%p2%dH, dim=\E[2m, el1=\E[1K, home=\E[H, + ht=^I, ind=\ED, is2=\E[m, kcbt=\E[Z, kclr=\E[2J, kdch1=\E[P, + kdl1=\E[M, kent=\r, kf10=\ENp, kf11=\ENq, kf12=\ENr, + kf13=\ENs, kf14=\ENt, kf15=\ENu, kf16=\ENv, kf17=\ENw, + kf18=\ENx, kf19=\ENy, kf20=\ENz, kf21=\EN{, kf22=\EN|, + kf23=\EN}, kf24=\EN~, kf9=\ENo, kich1=\E[@, kil1=\E[L, + mc4=\E[?4i, mc5=\E[?5i, nel=\r\n, pfx=\E[%p1%d;%p2%l%dq%p2%s, rc=\E8, rev=\E[7m, ri=\EM, - rmir=\E[4l, rmso=\E[m, rmul=\E[m, rs2=\Ec, sc=\E7, + rmso=\E[m, rmul=\E[m, rs2=\Ec, sc=\E7, sgr=\E[0%?%p5%t;2%;%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%|%p4%|%t;7 %;m, - sgr0=\E[m, smir=\E[4h, smso=\E[7m, smul=\E[4m, - use=ansi+cpr, use=ecma+index, + sgr0=\E[m, smso=\E[7m, smul=\E[4m, use=ansi+arrows, + use=ansi+cpr, use=ansi+erase, use=ansi+idc, use=ansi+idl, + use=ansi+local, use=ecma+index, + att630-24|5630-24|5630DMD-24|630MTG-24|AT&T 630 windowing terminal 24 lines, lines#24, use=att630, @@ -14812,44 +14959,38 @@ att630-24|5630-24|5630DMD-24|630MTG-24|AT&T 630 windowing terminal 24 lines, # att700|AT&T 700 24x80 column display w/102key keyboard, am, eslok, hs, mir, msgr, xenl, xon, - cols#80, it#8, lh#2, lines#24, lw#8, nlab#8, wsl#80, + cols#80, lh#2, lines#24, lw#8, nlab#8, wsl#80, acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, - bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, clear=\E[H\E[J, - cr=\r, csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H, - cud=\E[%p1%dB, cud1=\E[B, cuf=\E[%p1%dC, cuf1=\E[C, - cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, + bel=^G, cr=\r, cub1=^H, cup=\E[%i%p1%d;%p2%dH, cvvis=\E[?12;25h, dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, - dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K, el1=\E[1K, - enacs=\E(B\E)0, flash=\E[?5h$<200>\E[?5l, fln=4\,4, - fsl=\E8, home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@, - il=\E[%p1%dL, il1=\E[L, ind=\ED, invis=\E[8m, + el1=\E[1K, enacs=\E(B\E)0, flash=\E[?5h$<200>\E[?5l, + fln=4\,4, fsl=\E8, home=\E[H, ich=\E[%p1%d@, ind=\ED, is2=\E[50;4|\E[53;0|\E[8;0|\E[?4;13;15l\E[13;20l\E[?7h\E[12h \E(B\E)0\E[?31l\E[0m\017, - is3=\E(B\E)0, kLFT=\E[ A, kRIT=\E[ @, kbs=^H, kcbt=\E[Z, - kclr=\E[2J, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, - kdch1=\E[P, kdl1=\E[M, kend=\E[24;1H, kf1=\EOc, kf10=\ENp, - kf11=\ENq, kf12=\ENr, kf13=\ENs, kf14=\ENt, kf15=\EOC, - kf16=\EOD, kf17=\EOE, kf18=\EOF, kf19=\EOG, kf2=\EOd, - kf20=\EOH, kf21=\EOI, kf22=\EOJ, kf23=\ENO, kf24=\ENP, - kf25=\ENQ, kf26=\ENR, kf27=\ENS, kf28=\ENT, kf29=\EOq, - kf3=\EOe, kf30=\EOr, kf31=\EOs, kf32=\EOt, kf33=\EOu, - kf34=\EOv, kf35=\EOw, kf36=\EOx, kf37=\EOy, kf38=\EOu, - kf39=\EOv, kf4=\EOf, kf40=\EOl, kf41=\EOq, kf42=\EOr, - kf43=\EOs, kf44=\EOp, kf45=\EOn, kf46=\EOM, kf5=\EOg, - kf6=\EOh, kf7=\EOi, kf8=\EOj, kf9=\ENo, khome=\E[H, - kich1=\E[@, kil1=\E[L, knp=\E[U, kpp=\E[V, ll=\E[24H, - mc0=\E[i, mc4=\E[?4i, mc5=\E[?5i, nel=\EE, + is3=\E(B\E)0, kLFT=\E[ A, kRIT=\E[ @, kcbt=\E[Z, + kclr=\E[2J, kdch1=\E[P, kdl1=\E[M, kend=\E[24;1H, kf1=\EOc, + kf10=\ENp, kf11=\ENq, kf12=\ENr, kf13=\ENs, kf14=\ENt, + kf15=\EOC, kf16=\EOD, kf17=\EOE, kf18=\EOF, kf19=\EOG, + kf2=\EOd, kf20=\EOH, kf21=\EOI, kf22=\EOJ, kf23=\ENO, + kf24=\ENP, kf25=\ENQ, kf26=\ENR, kf27=\ENS, kf28=\ENT, + kf29=\EOq, kf3=\EOe, kf30=\EOr, kf31=\EOs, kf32=\EOt, + kf33=\EOu, kf34=\EOv, kf35=\EOw, kf36=\EOx, kf37=\EOy, + kf38=\EOu, kf39=\EOv, kf4=\EOf, kf40=\EOl, kf41=\EOq, + kf42=\EOr, kf43=\EOs, kf44=\EOp, kf45=\EOn, kf46=\EOM, + kf5=\EOg, kf6=\EOh, kf7=\EOi, kf8=\EOj, kf9=\ENo, kich1=\E[@, + kil1=\E[L, knp=\E[U, kpp=\E[V, ll=\E[24H, nel=\EE, pfx=\E[%p1%d;%p2%l%02dq%?%p1%{9}%<%t\s\s\sF%p1%1d\s\s\s\s\s \s\s\s\s\s\s%;%p2%s, - pln=\E[%p1%d;0;0;0q%p2%:-16.16s, rc=\E8, rev=\E[7m, - ri=\EM, rmacs=^O, rmir=\E[4l, rmln=\E[2p, rmso=\E[27m, - rmul=\E[24m, rmxon=\E[53;3|, rs1=\Ec\E[?3;5l\E[56;0|, - sc=\E7, + pln=\E[%p1%d;0;0;0q%p2%:-16.16s, ri=\EM, rmacs=^O, + rmir=\E[4l, rmln=\E[2p, rmso=\E[27m, rmul=\E[24m, + rmxon=\E[53;3|, rs1=\Ec\E[?3;5l\E[56;0|, sgr=\E[0%?%p6%t;1%;%?%p5%t;2%;%?%p2%t;4%;%?%p4%t;5%;%?%p3%p1 %|%t;7%;%?%p7%t;8%;m%?%p9%t\016%e\017%;, - sgr0=\E[m\017, smacs=^N, smir=\E[4h, smln=\E[p, smso=\E[7m, - smul=\E[4m, smxon=\E[53;0|, tbc=\E[3g, - tsl=\E7\E[99;%i%p1%dx, use=decid+cpr, use=ansi+rep, + sgr0=\E[m\017, smacs=^N, smir=\E[4h, smln=\E[p, + smxon=\E[53;0|, tsl=\E7\E[99;%i%p1%dx, use=ansi+arrows, + use=ansi+csr, use=ansi+erase, use=ansi+idl, + use=ansi+inittabs, use=ansi+local, use=ansi+rep, + use=ansi+sgrbold, use=decid+cpr, use=dec+pp, use=att610+cvis0, # This entry was modified 3/13/90 by JWE. @@ -14869,43 +15010,38 @@ att730|AT&T 730 windowing terminal, am, da, db, eslok, hs, mir, msgr, npc, xenl, xon, cols#80, it#8, lh#2, lines#60, lm#0, lw#8, nlab#24, wsl#80, acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, - bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, clear=\E[H\E[J, - cr=\r, csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H, - cud=\E[%p1%dB, cud1=\E[B, cuf=\E[%p1%dC, cuf1=\E[C, - cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, - cvvis=\E[?12;25h, dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, - dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K, el1=\E[1K, - enacs=\E(B\E)0, flash=\E[?5h$<200>\E[?5l, fsl=\E8, - home=\E[H, ht=^I, ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L, - ind=\ED, invis=\E[8m, + bel=^G, cbt=\E[Z, cr=\r, cub1=^H, dch=\E[%p1%dP, dch1=\E[P, + dim=\E[2m, el1=\E[1K, enacs=\E(B\E)0, + flash=\E[?5h$<200>\E[?5l, fsl=\E8, ht=^I, ich=\E[%p1%d@, + ind=\ED, is1=\E[8;0|\E[?3;4;5;13;15l\E[13;20l\E[?7h\E[12h\E(B\E)B, - is2=\E[m\017, is3=\E(B\E)0, kLFT=\E[ @, kRIT=\E[ A, kbs=^H, - kcbt=\E[Z, kclr=\E[2J, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, - kcuu1=\E[A, kf1=\EOc, kf10=\ENp, kf11=\ENq, kf12=\ENr, - kf13=\ENs, kf14=\ENt, kf15=\ENu, kf16=\ENv, kf17=\ENw, - kf18=\ENx, kf19=\ENy, kf2=\EOd, kf20=\ENz, kf21=\EN{, - kf22=\EN|, kf23=\EN}, kf24=\EN~, kf25=\EOC, kf26=\EOD, - kf27=\EOE, kf28=\EOF, kf29=\EOG, kf3=\EOe, kf30=\EOH, - kf31=\EOI, kf32=\EOJ, kf33=\ENO, kf34=\ENP, kf35=\ENQ, - kf36=\ENR, kf37=\ENS, kf38=\ENT, kf39=\EOU, kf4=\EOf, - kf40=\EOV, kf41=\EOW, kf42=\EOX, kf43=\EOY, kf44=\EOZ, - kf45=\EO[, kf46=\EO\s, kf47=\EO], kf48=\EO\^, kf5=\EOg, - kf6=\EOh, kf7=\EOi, kf8=\EOj, kf9=\ENo, khome=\E[H, - kich1=\E[@, kil1=\E[L, kind=\E[S, kri=\E[T, - mc0=\E[?19h\E[0i, mc4=\E[?4i, mc5=\E[?5i, nel=\EE, + is2=\E[m\017, is3=\E(B\E)0, kLFT=\E[ @, kRIT=\E[ A, + kcbt=\E[Z, kclr=\E[2J, kf1=\EOc, kf10=\ENp, kf11=\ENq, + kf12=\ENr, kf13=\ENs, kf14=\ENt, kf15=\ENu, kf16=\ENv, + kf17=\ENw, kf18=\ENx, kf19=\ENy, kf2=\EOd, kf20=\ENz, + kf21=\EN{, kf22=\EN|, kf23=\EN}, kf24=\EN~, kf25=\EOC, + kf26=\EOD, kf27=\EOE, kf28=\EOF, kf29=\EOG, kf3=\EOe, + kf30=\EOH, kf31=\EOI, kf32=\EOJ, kf33=\ENO, kf34=\ENP, + kf35=\ENQ, kf36=\ENR, kf37=\ENS, kf38=\ENT, kf39=\EOU, + kf4=\EOf, kf40=\EOV, kf41=\EOW, kf42=\EOX, kf43=\EOY, + kf44=\EOZ, kf45=\EO[, kf46=\EO\s, kf47=\EO], kf48=\EO\^, + kf5=\EOg, kf6=\EOh, kf7=\EOi, kf8=\EOj, kf9=\ENo, kich1=\E[@, + kil1=\E[L, kind=\E[S, kri=\E[T, mc0=\E[?19h\E[0i, nel=\EE, pfx=\E[%?%p1%{25}%<%t%p1%e%p1%{24}%-%;%d;%p2%l%02d%?%p1%{25} %<%tq\s\s\sSYS\s\s\s\s\sF%p1%:-2d\s\s%e;0;3q%;%p2%s, pfxl=\E[%p1%d;%p2%l%02d;0;0q%p3%:-16.16s%p2%s, - pln=\E[%p1%d;0;0;0q%p2%:-16.16s, rc=\E8, rev=\E[7m, - ri=\EM, rmacs=^O, rmam=\E[?7l, rmir=\E[4l, rmln=\E[?13h, - rmso=\E[27m, rmul=\E[24m, rmxon=\E[?21l, rs2=\Ec\E[?3l, - sc=\E7, + pln=\E[%p1%d;0;0;0q%p2%:-16.16s, ri=\EM, rmacs=^O, + rmam=\E[?7l, rmir=\E[4l, rmln=\E[?13h, rmso=\E[27m, + rmul=\E[24m, rmxon=\E[?21l, rs2=\Ec\E[?3l, sgr=\E[0%?%p6%t;1%;%?%p5%t;2%;%?%p2%t;4%;%?%p4%t;5%;%?%p3%p1 %|%t;7%;%?%p7%t;8%;m%?%p9%t\016%e\017%;, sgr0=\E[m\017, smacs=^N, smam=\E[?7h, smir=\E[4h, - smln=\E[?13l, smso=\E[7m, smul=\E[4m, smxon=\E[?21h, - swidm=\E#6, tsl=\E7\E[;%i%p1%dx, use=decid+cpr, - use=ansi+rep, use=att610+cvis, + smln=\E[?13l, smxon=\E[?21h, swidm=\E#6, + tsl=\E7\E[;%i%p1%dx, use=ansi+arrows, use=ansi+csr, + use=ansi+cup, use=ansi+erase, use=ansi+idl, + use=ansi+local, use=ansi+rep, use=ansi+sgrbold, + use=decid+cpr, use=dec+pp, use=att610+cvis, + # "MGT" is "Multi-Tasking Graphics Terminal" att730-41|730MTG-41|AT&T 730-41 windowing terminal, lines#41, use=att730, @@ -15086,12 +15222,9 @@ att505|pt505|att5430|gs5430|AT&T Personal Terminal 505 or 5430 GETSET terminal, cols#80, it#8, lines#24, acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[2J\E[H, - cnorm=\E[>l, cr=\r, cub=\E[%p1%dD, cub1=\E[D, - cud=\E[%p1%dB, cud1=\E[B, cuf=\E[%p1%dC, cuf1=\E[C, - cup=\E[%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, - cvvis=\E[>h, dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, - dl1=\E[M, ed=\E[0J, el=\E[0K, el1=\E[2K, home=\E[H, ht=^I, - il=\E[%p1%dL, il1=\E[L, ind=\n, + cnorm=\E[>l, cr=\r, cup=\E[%p1%d;%p2%dH, cvvis=\E[>h, + dch=\E[%p1%dP, dch1=\E[P, ed=\E[0J, el=\E[0K, el1=\E[2K, + home=\E[H, ht=^I, ind=\n, is1=\EPr\\E[0u\E[2J\E[0;0H\E[m\E[3l\E[l\E[=l\E[?l, kbs=^H, kcmd=\E!, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf0=\E[00s, kf1=\E[01s, kf18=\E[18s, @@ -15102,7 +15235,7 @@ att505|pt505|att5430|gs5430|AT&T Personal Terminal 505 or 5430 GETSET terminal, rmacs=\E[10m, rmam=\E[11;1j, rmir=\E[4l, rmso=\E[m, rmul=\E[m, rs1=\Ec, sc=\E7, sgr0=\E[m, smacs=\E[11m, smam=\E[11;0j, smir=\E[4h, smso=\E[1m, smul=\E[4m, - use=ansi+cpr, + use=ansi+cpr, use=ansi+idl, use=ansi+local, # The following Terminfo entry describes functions which are supported by # the AT&T 5430/pt505 terminal software version 1. @@ -15188,9 +15321,9 @@ ampex219|ampex-219|amp219|Ampex with automargins, rmso=\E[m$<2>, rmul=\E[m$<2>, sgr0=\E[m$<2>, smam=\E[?7h, smkx=\E=, smso=\E[7m$<2>, smul=\E[4m$<2>, ampex219w|ampex-219w|amp219w|Ampex 132 cols, - cols#132, lines#24, - bel=^G, cr=\r, cud1=\n, ind=\n, - is2=\E>\E[?3h\E[?4l\E[?5l\E[?7h\E[?8h, use=ampex219, + cols#132, + cud1=\n, is2=\E>\E[?3h\E[?4l\E[?5l\E[?7h\E[?8h, + use=ampex219, # (ampex232: removed , no file and no --esr) ampex232|ampex-232|Ampex Model 232, am, @@ -15205,7 +15338,7 @@ ampex232|ampex-232|Ampex Model 232, kf9=^AI\r, khome=^^, use=adm+sgr, # (ampex: removed , no file and no -- esr) ampex232w|Ampex Model 232 / 132 columns, - cols#132, lines#24, + cols#132, is2=\E\034Eg\El, use=ampex232, #### Ann Arbor (aa) @@ -15364,34 +15497,27 @@ aas1901|Ann Arbor K4080 w/S1901 mod, # The generic Ann Arbor entry is the only one that uses this. aaa+unk|aaa-unk|Ann Arbor Ambassador (internal - don't use this directly), OTbs, am, km, mc5i, mir, xon, - cols#80, it#8, - bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, - clear=\E[H\E[J$<156>, cr=\r, cub=\E[%p1%dD, cub1=^H, - cud=\E[%p1%dB, cud1=^K, cuf=\E[%p1%dC, cuf1=\E[C, - cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, - dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, - el=\E[K$<5>, home=\E[H, hpa=\E[%p1%{1}%+%dG, ht=^I, - hts=\EH, ich=\E[%p1%d@$<4*>, ich1=\E[@$<4>, il=\E[%p1%dL, - il1=\E[L$<3>, ind=^K, invis=\E[8m, is1=\E[m\E7\E[H\E9\E8, - is3=\E[1Q\E[>20;30l\EP`+x~M\E\\, kbs=^H, kcbt=\E[Z, - kclr=\E[J, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, + cols#80, + bel=^G, clear=\E[H\E[J$<156>, cr=\r, cub1=^H, cud1=^K, + dch=\E[%p1%dP, dch1=\E[P, ed=\E[J, el=\E[K$<5>, + hpa=\E[%p1%{1}%+%dG, ich=\E[%p1%d@$<4*>, ich1=\E[@$<4>, + il1=\E[L$<3>, ind=^K, is1=\E[m\E7\E[H\E9\E8, + is3=\E[1Q\E[>20;30l\EP`+x~M\E\\, kcbt=\E[Z, kclr=\E[J, kdch1=\E[P, kdl1=\E[M, kf1=\EOA, kf10=\EOJ, kf11=\EOK, kf12=\EOL, kf13=\EOM, kf14=\EON, kf15=\EOO, kf16=\EOP, kf17=\EOQ, kf18=\EOR, kf19=\EOS, kf2=\EOB, kf20=\EOT, kf21=\EOU, kf22=\EOV, kf23=\EOW, kf24=\EOX, kf3=\EOC, kf4=\EOD, kf5=\EOE, kf6=\EOF, kf7=\EOG, kf8=\EOH, kf9=\EOI, - khome=\E[H, kich1=\E[@, kil1=\E[L, krmir=\E6, mc0=\E[0i, - mc4=^C, mc5=\E[v, mc5p=\E[%p1%dv, rc=\E8, rev=\E[7m, + kich1=\E[@, kil1=\E[L, krmir=\E6, mc0=\E[0i, mc4=^C, + mc5=\E[v, mc5p=\E[%p1%dv, rc=\E8, rmkx=\EP`>y~[[J`8xy~[[A`4xy~[[D`6xy~[[C`2xy~[[B\E \\, - rmm=\E[>52l, rmso=\E[m, rmul=\E[m, sc=\E7, - sgr=\E[%?%p1%t7;%;%?%p2%t4;%;%?%p3%t7;%;%?%p4%t5;%;%?%p6%t1; - %;%?%p7%t8;%;m, - sgr0=\E[m, + rmm=\E[>52l, sc=\E7, sgr0=\E[m, smkx=\EP`>z~[[J`8xz~[[A`4xz~[[D`6xz~[[C`2xz~[[B\E \\, - smm=\E[>52h, smso=\E[7m, smul=\E[4m, tbc=\E[3g, - vpa=\E[%p1%{1}%+%dd, use=ansi+rep, + smm=\E[>52h, vpa=\E[%p1%{1}%+%dd, use=ansi+arrows, + use=ansi+cup, use=ansi+idl, use=ansi+inittabs, + use=ansi+local, use=ansi+rep, use=ansi+sgrbold, aaa+rv|Ann Arbor Ambassador in reverse video, blink=\E[5;7m, bold=\E[1;7m, invis=\E[7;8m, @@ -15442,13 +15568,12 @@ aaa-28|Ann Arbor Ambassador/28 lines, rmcup=\E[60;0;0;28p\E[28;1H\E[K, smcup=\E[H\E[J$<156>\E[28;0;0;28p, use=aaa+unk, aaa-30-s|aaa-s|Ann Arbor Ambassador/30 lines w/status, - eslok, hs, lines#29, dsl=\E7\E[60;0;0;30p\E[1;1H\E[K\E[H\E8\r\n\E[K, - fsl=\E[>51l, is2=\r\n\E[A\E7\E[60;1;0;30p\E8, + is2=\r\n\E[A\E7\E[60;1;0;30p\E8, rmcup=\E[60;1;0;30p\E[29;1H\E[K, smcup=\E[H\E[J$<156>\E[30;1;0;30p\E[30;1H\E[K, - tsl=\E[>51h\E[1;%p1%dH\E[2K, use=aaa+unk, + use=aaa+unk, use=guru+s, aaa-30-s-rv|aaa-s-rv|Ann Arbor Ambassador/30 lines+status+reverse video, use=aaa+rv, use=aaa-30-s, aaa-s-ctxt|aaa-30-s-ctxt|Ann Arbor Ambassador/30 lines+status+save context, @@ -15769,24 +15894,26 @@ adds980|a980|ADDS Consul 980, cit80|cit-80|citoh 80, OTbs, am, cols#80, lines#24, - clear=\E[H\EJ, cr=\r, cub1=^H, cud1=\E[B, cuf1=\E[C, - cup=\E[%i%p1%2d;%p2%2dH, cuu1=\E[A, ed=\EJ, el=\EK, ff=^L, - ind=\n, is2=\E>, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, - kcuu1=\EOA, rmkx=\E[?1l\E>, smkx=\E[?1h\E=, + clear=\E[H\EJ, cr=\r, cub1=^H, cup=\E[%i%p1%2d;%p2%2dH, + ed=\EJ, el=\EK, ff=^L, ind=\n, is2=\E>, kcub1=\EOD, kcud1=\EOB, + kcuf1=\EOC, kcuu1=\EOA, rmkx=\E[?1l\E>, smkx=\E[?1h\E=, + use=ansi+local1, + # From: Tim Wood Fri Sep 27 09:39:12 PDT 1985 # (cit101: added / based on init string, merged this with c101 -- esr) cit101|citc|C. Itoh fast VT100, OTbs, am, xenl, cols#80, lines#24, - bel=^G, clear=\E[H\E[2J, cnorm=\E[V\E8, cub1=^H, cud1=\E[B, - cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, - cvvis=\E7\E[U, dch1=\E[P, dl1=\E[M, ed=\E[J, el=\E[K, - flash=\E[?5h$<200/>\E[?5l, ich1=\E[@, il1=\E[L, + bel=^G, clear=\E[H\E[2J, cnorm=\E[V\E8, cub1=^H, + cup=\E[%i%p1%d;%p2%dH, cvvis=\E7\E[U, dch1=\E[P, + dl1=\E[M, ed=\E[J, el=\E[K, flash=\E[?5h$<200/>\E[?5l, + ich1=\E[@, il1=\E[L, is2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h\E[3g\E[>5g, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, rmam=\E[?7l, rmkx=\E[?1l\E>, rmso=\E[m, rmul=\E[m, sgr0=\E[m, smam=\E[?7h, smkx=\E[?1h\E=, smso=\E[7m, - smul=\E[4m, + smul=\E[4m, use=ansi+local1, + # CIE Terminals CIT-101e from Geoff Kuenning via BRL # The following termcap entry was created from the Callan cd100 entry. The # last two lines (with the capabilities in caps) are used by RM-cobol to allow @@ -15797,15 +15924,16 @@ cit101|citc|C. Itoh fast VT100, cit101e|C. Itoh CIT-101e, OTbs, OTpt, am, mir, msgr, cols#80, it#8, lines#24, - acsc=, clear=\E[H\E[J, cnorm=, csr=\E[%i%p1%2d;%p2%2dr, - cub1=\E[D, cud1=\E[B, cuf1=\E[C, cup=\E[%i%p1%2d;%p2%2dH, - cuu1=\E[A, cvvis=\E[?1l\E[?4l\E[?7h, dch1=\E[P, dl1=\E[M, - ed=\E[J, el=\E[K, if=/usr/share/tabset/vt100, il1=\E[L, - kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf0=\EOT, - kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, kf5=\EOm, kf6=\EOl, - kf7=\EOM, kf8=\EOn, rc=\E8, ri=\EM, rmacs=^O, rmir=\E[4l, - rmkx=\E>, rmso=\E[m, rmul=\E[m, sc=\E7, smacs=^N, smir=\E[4h, - smkx=\E=, smso=\E[7m, smul=\E[4m, + acsc=, cnorm=, csr=\E[%i%p1%2d;%p2%2dr, + cup=\E[%i%p1%2d;%p2%2dH, cvvis=\E[?1l\E[?4l\E[?7h, + dch1=\E[P, dl1=\E[M, if=/usr/share/tabset/vt100, + il1=\E[L, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, + kf0=\EOT, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, kf5=\EOm, + kf6=\EOl, kf7=\EOM, kf8=\EOn, rc=\E8, ri=\EM, rmacs=^O, + rmir=\E[4l, rmkx=\E>, rmso=\E[m, rmul=\E[m, sc=\E7, smacs=^N, + smir=\E[4h, smkx=\E=, smso=\E[7m, smul=\E[4m, + use=ansi+erase, use=ansi+local1, + # From: David S. Lawyer, June 1997: # The CIT 101-e was made in Japan in 1983-4 and imported by CIE # Terminals in Irvine, CA. It was part of CITOH Electronics. In the @@ -15825,25 +15953,22 @@ cit101e|C. Itoh CIT-101e, # (cit101e-rv: added empty to suppress a tic warning. --esr) cit101e-rv|C. Itoh CIT-101e (sets reverse video), am, eo, mir, msgr, xenl, xon, - cols#80, it#8, lines#24, - OTnl=\EM, bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, - civis=\E[1v, clear=\E[H\E[J, cnorm=\E[0;3;4v, cr=\r, - csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H, - cud=\E[%p1%dB, cud1=\E[B, cuf=\E[%p1%dC, cuf1=\E[C, - cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, - cvvis=\E[3;5v, dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, - dl1=\E[M, ed=\E[J, el=\E[K, flash=\E[?5l$<200/>\E[?5h, - home=\E[H, hpa=\E[%i%p1%dG, ht=^I, hts=\EH, ich=\E[%p1%d@, - ich1=\E[@, il=\E[%p1%dL, il1=\E[L, ind=\n, + cols#80, lines#24, + OTnl=\EM, bel=^G, blink=\E[5m, bold=\E[1m, civis=\E[1v, + cnorm=\E[0;3;4v, cr=\r, cub1=^H, cup=\E[%i%p1%d;%p2%dH, + cvvis=\E[3;5v, flash=\E[?5l$<200/>\E[?5h, home=\E[H, + hpa=\E[%i%p1%dG, ind=\n, is2=\E<\E>\E[?1l\E[?3l\E[?4l\E[?5h\E[?7h\E[?8h\E[3g\E[>5g\E( B\E[m\E[20l\E[1;24r\E[24;1H, kbs=^?, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, - kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, nel=\EE, rc=\E8, - rev=\E[7m, ri=\EM, rmcup=, rmir=\E[4l, rmso=\E[m, rmul=\E[m, - rs1=\Ec\E[?7h\E[>5g, sc=\E7, sgr0=\E[m, - smcup=\E[>5g\E[?7h\E[?5h, smir=\E[4h, smso=\E[7m, - smul=\E[4m, tbc=\E[3g, u6=\E[%i%p1%d;%p2%dR, u8=\E[?6c, - use=ansi+enq, use=ecma+index, + kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, nel=\EE, rev=\E[7m, + ri=\EM, rmcup=, rmso=\E[m, rmul=\E[m, rs1=\Ec\E[?7h\E[>5g, + sgr0=\E[m, smcup=\E[>5g\E[?7h\E[?5h, smso=\E[7m, + smul=\E[4m, u6=\E[%i%p1%d;%p2%dR, u8=\E[?6c, + use=ansi+enq, use=ansi+csr, use=ansi+erase, use=ansi+idc, + use=ansi+idl, use=ansi+inittabs, use=ansi+local, + use=ecma+index, + cit101e-n|CIT-101e w/o am, am@, cvvis=\E[?1l\E[?4l\E[?7l, kbs=^H, kcub1=^H, kcud1=\n, @@ -15869,25 +15994,22 @@ cit101e-n132|CIT-101e with 132 cols w/o am, # (cit500: I added / based on the init string -- esr) cit500|CIE Terminals CIT-500, OTbs, OTpt, mir, msgr, xon, - OTkn#10, cols#80, it#8, lines#64, vt#3, - acsc=, bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, - clear=\E[H\E[J, cr=\r, csr=\E[%i%p1%d;%p2%dr, - cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\n, - cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, - cuu=\E[%p1%dA, cuu1=\EM, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M, - ed=\EJ, el=\EK, home=\E[H, ht=^I, hts=\EH, il=\E[%p1%dL, - il1=\E[L, ind=\n, is2=\E<\E)0, kbs=^H, kcbt=\E[Z, kcub1=\EOD, - kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kdch1=\E[P, kdl1=\E[M, - ked=\EJ, kel=\EK, kf0=\EOP, kf1=\EOQ, kf2=\EOR, kf3=\EOS, - kf4=\EOU, kf5=\EOV, kf6=\EOW, kf7=\EOX, kf8=\EOY, kf9=\EOZ, - khome=\E[H, kich1=\E[4h, kil1=\E[L, krmir=\E[4l, lf0=PF1, - lf1=PF2, lf2=PF3, lf3=PF4, lf4=F15, lf5=F16, lf6=F17, lf7=F18, - lf8=F19, lf9=F20, ll=\E[64H, nel=\EE, rc=\E8, rev=\E[7m, - ri=\EM, rmacs=^O, rmam=\E[?7l, rmir=\E[4l, rmkx=\E[?1l\E>, - rmso=\E[m, rmul=\E[m, + OTkn#10, cols#80, lines#64, vt#3, + acsc=, bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[J, + cr=\r, cub1=^H, cud1=\n, cup=\E[%i%p1%d;%p2%dH, cuu1=\EM, + dch1=\E[P, ed=\EJ, el=\EK, home=\E[H, ind=\n, is2=\E<\E)0, + kcbt=\E[Z, kdch1=\E[P, kdl1=\E[M, ked=\EJ, kel=\EK, kf0=\EOP, + kf1=\EOQ, kf2=\EOR, kf3=\EOS, kf4=\EOU, kf5=\EOV, kf6=\EOW, + kf7=\EOX, kf8=\EOY, kf9=\EOZ, khome=\E[H, kich1=\E[4h, + kil1=\E[L, krmir=\E[4l, lf0=PF1, lf1=PF2, lf2=PF3, lf3=PF4, + lf4=F15, lf5=F16, lf6=F17, lf7=F18, lf8=F19, lf9=F20, + ll=\E[64H, nel=\EE, rev=\E[7m, ri=\EM, rmacs=^O, rmam=\E[?7l, + rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[m, rmul=\E[m, rs1=\E<\E2\E[20l\E[?6l\E[r\E[m\E[q\E(B\017\E)0\E>, - sc=\E7, sgr0=\E[m, smacs=^N, smam=\E[?7h, smir=\E[4h, - smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, tbc=\E[3g, + sgr0=\E[m, smacs=^N, smam=\E[?7h, smir=\E[4h, + smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, + use=ansi+apparrows, use=ansi+csr, use=ansi+idl, + use=ansi+inittabs, use=ansi+local, # C. Itoh printers begin here citoh|ci8510|8510|C. Itoh 8510a, @@ -15975,7 +16097,7 @@ cdc756|CDC 756, # of the tab key to send an ESC. The real ESC key is positioned way out # in right field. # -# The termcap won't work in 132 column mode due to the way it it moves the +# The termcap won't work in 132 column mode due to the way it moves the # cursor. Termcap doesn't have the capability (as far as I could tell) to # handle the 721 in 132 column mode. # @@ -16025,26 +16147,23 @@ visa50|Geveke VISA 50 terminal in ANSI 80 character mode, cols#80, lines#25, acsc=0_aaffggh jjkkllmmnnooqqssttuuvvwwxx, bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, clear=\E[H\E[2J, cr=\r, - csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=\E[D, - cud=\E[%p1%dB, cud1=\E[B, cuf=\E[%p1%dC, cuf1=\E[C, - cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, - dch=\E[%p1%dX, dch1=\E[X, dim=\E[2m, dl=\E[%p1%dM, - dl1=\E[M, ed=\E[J, el=\E[K, flash=\E[?5h$<100/>\E[?5l, - home=\E[H, hpa=\E[%i%p1%dG, ht=^I, ich=\E[%p1%d@, - ich1=\E[@, il=\E[%p1%dL, il1=\E[L, ind=\n, invis=\E[8m, + csr=\E[%i%p1%d;%p2%dr, cup=\E[%i%p1%d;%p2%dH, + dch=\E[%p1%dX, dch1=\E[X, dim=\E[2m, ed=\E[J, el=\E[K, + flash=\E[?5h$<100/>\E[?5l, home=\E[H, hpa=\E[%i%p1%dG, + ht=^I, ind=\n, invis=\E[8m, is2=\E0;2m\E[1;25r\E[25;1H\E[?3l\E[?7h\E[?8h, - ka1=\E[f, ka3=\EOQ, kb2=\EOP, kbs=^H, kc1=\EOR, kc3=\EOS, - kcub1=\E[D, kcud1=\E[A, kcuf1=\E[C, kcuu1=\E[A, kdch1=^?, + ka1=\E[f, ka3=\EOQ, kb2=\EOP, kc1=\EOR, kc3=\EOS, kdch1=^?, kdl1=\EOS, kf0=\E010, kf1=\E001, kf10=\E011, kf2=\E002, kf3=\E003, kf4=\E004, kf5=\E005, kf6=\E006, kf7=\E007, kf8=\E008, kf9=\E009, khome=\E[f, lf2=A delete char, lf3=A insert line, lf4=A delete line, lf5=A clear, lf6=A ce of/cf gn, lf7=A print, lf8=A on-line, lf9=A funcl0=A send, nel=\r\n, rev=\E[7m, rmacs=\E[3l, - rmam=\E[?7l, rmir=\E[4l, rmkx=\E>, rmso=\E[0;2m, - rmul=\E[0m, sgr0=\E[0;2m, smacs=\E3h, smam=\E?7h, - smir=\E[4h, smkx=\E=, smso=\E[2;7m, smul=\E[4m, tbc=\E[3g, - vpa=\E[%i%p1%dd, + rmam=\E[?7l, rmkx=\E>, rmso=\E[0;2m, rmul=\E[0m, + sgr0=\E[0;2m, smacs=\E3h, smam=\E?7h, smkx=\E=, + smso=\E[2;7m, smul=\E[4m, tbc=\E[3g, vpa=\E[%i%p1%dd, + use=ansi+arrows, use=ansi+idc, use=ansi+idl, + use=ansi+local, #### Human Designed Systems (Concept) # @@ -16099,13 +16218,13 @@ c108|concept108|c108-8p|concept108-8p|Concept 108 w/8 pages, \Ep\n, rmcup=\Ev \001\177p\Ep\r\n, use=c108-4p, c108-4p|concept108-4p|Concept 108 w/4 pages, - OTbs, eslok, hs, xon, + eslok, hs, xon, pb@, acsc=jEkTl\\mMqLxU, cnorm=\Ew, cr=\r, cup=\Ea%p1%?%p1%{95}%>%t\001%{96}%-%;%{32}%+%c%p2%?%p2%{95} %>%t\001%{96}%-%;%{32}%+%c, cvvis=\EW, dch1=\E 1$<16*>, dsl=\E ;\177, fsl=\Ee\E z\s, - ind=\n, is1=\EK\E!\E F, + is1=\EK\E!\E F, is3=\EU\E z"\Ev\177 !p\E ;"\E z \Ev \001 p\Ep\n, rmacs=\Ej\s, rmcup=\Ev \001 p\Ep\r\n, smacs=\Ej!, smcup=\EU\Ev 8p\Ep\r\E\025, @@ -16431,26 +16550,19 @@ oc100|oconcept|c100-1p|old 1-page Concept 100, hds200|Human Designed Systems HDS200, am, bw, eslok, hs, km, mir, msgr, xenl, xon, NQ, - cols#80, it#8, lines#24, lm#0, + cols#80, lines#24, lm#0, acsc=``aaffggjjkkllmmnnooqqssttuuvvwwxx~~, bel=^G, - blink=\E[0;5m, bold=\E[0;1m, cbt=\E[Z, civis=\E[6+{, - clear=\E[H\E[J, cnorm=\E[+{, cr=\r, - csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=\E[D, - cud=\E[%p1%dB, cud1=\E[B, cuf=\E[%p1%dC, cuf1=\E[C, - cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, - dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M, - dsl=\E[2!w\r\n\E[!w, ed=\E[J, el=\E[K, el1=\E[1K, - fsl=\E[!w, home=\E[H, hpa=\E[%i%p1%dG, ht=^I, hts=\EH, - ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L, ind=\ED, - invis=\E[0;8m, + blink=\E[0;5m, bold=\E[0;1m, civis=\E[6+{, cnorm=\E[+{, + cr=\r, cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P, + dsl=\E[2!w\r\n\E[!w, el1=\E[1K, fsl=\E[!w, home=\E[H, + hpa=\E[%i%p1%dG, ich=\E[%p1%d@, ind=\ED, invis=\E[0;8m, is2=\E)0\017\E[m\E[=107;207h\E[90;3u\E[92;3u\E[43;1u\177\E$P \177\E[44;1u\177\E$Q\177\E[45;1u\177\E$R\177\E[46;1u \177\E$S\177\E[200;1u\177\E$A\177\E[201;1u\177\E$B\177 \E[202;1u\177\E$C\177\E[203;1u\177\E$D\177\E[204;1u\177 \E$H\177\E[212;1u\177\E$I\177\E[213;1u\177\E$\010\177\E[ 214;1u"\E$\177"\E[2!w\E[25;25w\E[!w\E[2*w\E[2+x\E[;3+}, - kDC=\E$^?, kHOM=\E$H, kLFT=\E$D, kRIT=\E$C, kbs=^H, - kcbt=\E$I, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, + kDC=\E$^?, kHOM=\E$H, kLFT=\E$D, kRIT=\E$C, kcbt=\E$I, kdch1=^?, kent=\r, kf1=^\001\r, kf10=^\010\r, kf11=^\011\r, kf12=^\012\r, kf13=\EOP, kf14=\EOQ, kf15=\EOR, kf16=\EOS, kf17=^\017\r, kf18=^\018\r, kf19=^\019\r, kf2=^\002\r, @@ -16462,49 +16574,48 @@ hds200|Human Designed Systems HDS200, kf45=\E$R, kf46=\E$S, kf47=^\047\r, kf48=^\048\r, kf49=^\049\r, kf5=^\005\r, kf50=^\050\r, kf51=^\051\r, kf52=^\052\r, kf53=^\053\r, kf6=^\006\r, kf7=^\007\r, - kf8=^\008\r, kf9=^\009\r, khome=\E[H, kind=\E[T, knp=\E[U, - kpp=\E[V, kri=\E[S, ll=\E[H\E[A, nel=\E[E, rc=\E8, - rev=\E[0;7m, ri=\EM, rmacs=^O, rmir=\E[4l, rmso=\E[m\017, - rmul=\E[m\017, sc=\E7, + kf8=^\008\r, kf9=^\009\r, kind=\E[T, knp=\E[U, kpp=\E[V, + kri=\E[S, ll=\E[H\E[A, nel=\E[E, rev=\E[0;7m, ri=\EM, + rmacs=^O, rmir=\E[4l, rmso=\E[m\017, rmul=\E[m\017, sgr=\E[0%?%p1%p6%O%t;1%;%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%O%t;7 %;%?%p7%t;8%;m%?%p9%t\016%e\017%;, sgr0=\E[m\017, smacs=^N, smir=\E[4h, smso=\E[0;1;7m, - smul=\E[0;4m, tbc=\E[3g, tsl=\E[2!w\E[%i%p1%dG, - vpa=\E[%i%p1%dd, use=ansi+pp, + smul=\E[0;4m, tsl=\E[2!w\E[%i%p1%dG, vpa=\E[%i%p1%dd, + use=ansi+arrows, use=ansi+csr, use=ansi+erase, + use=ansi+idl, use=ansi+inittabs, use=ansi+local, + use=ansi+pp, # through included to specify padding needed in raw mode. # (avt-ns: added empty to suppress a tic warning --esr) avt-ns|Concept AVT no status line, OTbs, am, eo, mir, ul, xenl, xon, - cols#80, it#8, lines#24, lm#192, - acsc=, bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, - clear=\E[H\E[J$<38>, cnorm=\E[=119l, cr=\r, - csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H, - cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C, - cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, - cvvis=\E[=119h, dch1=\E[P, dim=\E[1!{, dl=\E[%p1%dM$<4*>, - dl1=\E[M$<4>, ed=\E[J$<96>, el=\E[K$<6>, home=\E[H, - hpa=\E[%p1%{1}%+%dG, ht=\011$<4>, hts=\EH, ich=\E[%p1%d@, - ich1=\E[@, il=\E[%p1%dL$<4*>, il1=\E[L$<4>, ind=\n$<8>, - invis=\E[8m, ip=$<4>, is1=\E[=103l\E[=205l, + cols#80, lines#24, lm#192, + acsc=, bel=^G, clear=\E[H\E[J$<38>, cnorm=\E[=119l, cr=\r, + cub1=^H, cud1=\n, cup=\E[%i%p1%d;%p2%dH, cvvis=\E[=119h, + dim=\E[1!{, dl=\E[%p1%dM$<4*>, dl1=\E[M$<4>, + ed=\E[J$<96>, el=\E[K$<6>, home=\E[H, + hpa=\E[%p1%{1}%+%dG, ht=\011$<4>, ich=\E[%p1%d@, + il=\E[%p1%dL$<4*>, il1=\E[L$<4>, ind=\n$<8>, ip=$<4>, + is1=\E[=103l\E[=205l, is2=\E[1*q\E[2!t\E[7!t\E[=4;101;119;122l\E[=107;118;207h\E)1 \E[1Q\EW\E[!y\E[!z\E>\E[0:0:32!r\E[0*w\E[w\E2\r\n\E[2;27 !t, - kbs=^H, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kdch1=\E\002\r, ked=\E\004\r, kf1=\EOP, kf2=\EOQ, kf3=\EOR, - kf4=\EOS, khome=\E[H, kich1=\E\001\r, kil1=\E\003\r, - ll=\E[24H, mc0=\E[0i, mc4=\E[4i, mc5=\E[5i, + kf4=\EOS, kich1=\E\001\r, kil1=\E\003\r, ll=\E[24H, + mc0=\E[0i, mc4=\E[4i, mc5=\E[5i, pfloc=\E[%p1%d;0u#%p2%s#, pfx=\E[%p1%d;1u#%p2%s#, - prot=\E[99m, rc=\E8, rev=\E[7m, ri=\EM$<4>, rmacs=\016$<1>, - rmcup=\E[w\E2\r\n, rmir=\E[4l, rmkx=\E[!z\E[0;2u, - rmso=\E[7!{, rmul=\E[4!{, sc=\E7, + prot=\E[99m, ri=\EM$<4>, rmacs=\016$<1>, + rmcup=\E[w\E2\r\n, rmkx=\E[!z\E[0;2u, rmso=\E[7!{, + rmul=\E[4!{, sgr=\E[%?%p1%t7;%;%?%p2%t4;%;%?%p3%t7;%;%?%p4%t5;%;%?%p6%t1; %;%?%p7%t8;%;%?%p8%t99;%;m%?%p5%t\E[1!{%;%?%p9%t\017%e \016%;$<1>, sgr0=\E[m\016$<1>, smacs=\017$<1>, - smcup=\E[=4l\E[1;24w\E2\r, smir=\E[4h, - smkx=\E[1!z\E[0;3u, smso=\E[7m, smul=\E[4m, tbc=\E[3g, - vpa=\E[%p1%{1}%+%dd, use=ansi+rep, + smcup=\E[=4l\E[1;24w\E2\r, smkx=\E[1!z\E[0;3u, + vpa=\E[%p1%{1}%+%dd, use=ansi+arrows, use=ansi+csr, + use=ansi+idc1, use=ansi+inittabs, use=ansi+local, + use=ansi+rep, use=ansi+sgrbold, + avt-rv-ns|Concept AVT in reverse video mode/no status line, flash=\E[=205l$<200>\E[=205h, is1=\E[=103l\E[=205h, use=avt-ns, @@ -16667,14 +16778,7 @@ dgkeys+15|Private entry describing 15 DG mode special keys, # u8=^^F}20^^Fi^^F}21, # dgunix+fixed|Fixed color info for DG D430C terminals in DG-UNIX mode, - bce, - colors#16, ncv#53, pairs#0x100, - op=\036Ad\036Bd, - setab=\036B%p1%?%p1%{8}%<%t%{2}%&%?%p1%{1}%&%t%{4}%|%;%?%p1 - %{4}%&%t%{1}%|%;%;%{48}%+%c, - setaf=\036A%p1%?%p1%{8}%<%t%{2}%&%?%p1%{1}%&%t%{4}%|%;%?%p1 - %{4}%&%t%{1}%|%;%;%{48}%+%c, - setb=\036B%p1%{48}%+%c, setf=\036A%p1%{48}%+%c, + ncv#53, use=dgmode+color, dg+fixed|Fixed color info for DG D430C terminals in DG mode, use=dgunix+fixed, @@ -16710,14 +16814,13 @@ dg+color|Color info for Data General D470C terminals in ANSI mode, use=dg+color8, dgmode+color8|Color info for Data General D220/D230C terminals in DG mode, - bce, - colors#8, ncv#16, pairs#64, op=\036Ad\036Bd, setab=\036B%p1%{2}%&%?%p1%{1}%&%t%{4}%|%;%?%p1%{4}%&%t%{1}%| %;%{48}%+%c, setaf=\036A%p1%{2}%&%?%p1%{1}%&%t%{4}%|%;%?%p1%{4}%&%t%{1}%| %;%{48}%+%c, setb=\036B%p1%{48}%+%c, setf=\036A%p1%{48}%+%c, + use=dg+color8, dgmode+color|Color info for Data General D470C terminals in DG mode, colors#16, pairs#0x100, @@ -16728,8 +16831,6 @@ dgmode+color|Color info for Data General D470C terminals in DG mode, use=dgmode+color8, dgunix+ccc|Configurable color info for DG D430C terminals in DG-UNIX mode, - bce, ccc, - colors#52, ncv#53, pairs#26, initp=\036RG0%p1%02X%p2%{255}%*%{1000}%/%02X%p3%{255}%* %{1000}%/%02X%p4%{255}%*%{1000}%/%02X%p5%{255}%* %{1000}%/%02X%p6%{255}%*%{1000}%/%02X%p7%{255}%* @@ -16737,7 +16838,7 @@ dgunix+ccc|Configurable color info for DG D430C terminals in DG-UNIX mode, oc=\036RG01A00FF00000000\036RG01B00000000FF00 \036RG01C007F00000000\036RG01D000000007F00, op=\036RF4831A\036RF2E31B\036RF1D31C\036RF3F31D, - scp=\036RG2%p1%02X, + scp=\036RG2%p1%02X, use=dg+ccc, # Colors are in the order: normal, reverse, dim, dim + reverse. dg+ccc|Configurable color info for DG D430C terminals in DG mode, @@ -16787,11 +16888,11 @@ dg200|Data General DASHER 200, dg210|dg-ansi|Data General 210/211, am, cols#80, lines#24, - OTnl=\E[B, clear=\E[2J, cub1=\E[D, cud1=\E[B, cuf1=\E[C, - cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, ed=\E[J, el=\E[K, - home=\E[H, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, - khome=\E[H, nel=\r\E[H\E[A\n, rmso=\E[0;m, rmul=\E[0;m, - smso=\E[7;m, smul=\E[4;m, + OTnl=\E[B, clear=\E[2J, cup=\E[%i%p1%d;%p2%dH, ed=\E[J, + el=\E[K, home=\E[H, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, + kcuu1=\E[A, khome=\E[H, nel=\r\E[H\E[A\n, rmso=\E[0;m, + rmul=\E[0;m, smso=\E[7;m, smul=\E[4;m, use=ansi+local1, + # From: Peter N. Wan # courtesy of Carlos Rucalde of Vantage Software, Inc. # (dg211: this had ., which was an ancient termcap hangover. @@ -16817,20 +16918,19 @@ dg450|dg6134|Data General 6134, dg460-ansi|Data General Dasher 460 in ANSI-mode, OTbs, am, msgr, ul, cols#80, it#8, lines#24, - OTnl=\ED, blink=\E[5m, clear=\E[2J, cub1=^H, cud1=\E[B, - cuf1=\E[C, cup=\E[%i%p1%2d;%p2%2dH, cuu1=\E[A, dch1=\E[P, - dim=\E[2m, dl1=\E[M, ed=\E[J, el=\E[K, home=\E[H, ht=^I, - ich1=\E[@, il1=\E[L, ind=\E[S, is2=^^F@, kbs=\E[D, - kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, - kf0=\E[001z, kf1=\E[002z, kf2=\E[003z, kf3=\E[004z, - kf4=\E[005z, kf5=\E[006z, kf6=\E[007z, kf7=\E[008z, - kf8=\E[009z, kf9=\E[00:z, khome=\E[H, lf0=f1, lf1=f2, lf2=f3, - lf3=f4, lf4=f5, lf5=f6, lf6=f7, lf7=f8, lf9=f10, mc0=\E[i, - rev=\E[7m, ri=\E[T, rmso=\E[m, rmul=\E[05, + OTnl=\ED, blink=\E[5m, clear=\E[2J, cub1=^H, + cup=\E[%i%p1%2d;%p2%2dH, dch1=\E[P, dim=\E[2m, dl1=\E[M, + ed=\E[J, el=\E[K, home=\E[H, ht=^I, ich1=\E[@, il1=\E[L, + ind=\E[S, is2=^^F@, kbs=\E[D, kf0=\E[001z, kf1=\E[002z, + kf2=\E[003z, kf3=\E[004z, kf4=\E[005z, kf5=\E[006z, + kf6=\E[007z, kf7=\E[008z, kf8=\E[009z, kf9=\E[00:z, lf0=f1, + lf1=f2, lf2=f3, lf3=f4, lf4=f5, lf5=f6, lf6=f7, lf7=f8, lf9=f10, + mc0=\E[i, rev=\E[7m, ri=\E[T, rmso=\E[m, rmul=\E[05, sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p5%t;2%;%?%p2%t;4%;%?%p4%t;5%; %?%p1%p3%|%t;7%;m, sgr0=\E(B\E[m, smso=\E[7m, smul=\E[4m, u8=\E[5n, u9=\E[0n, - use=ansi+cpr, + use=ansi+arrows, use=ansi+cpr, use=ansi+local1, + # From: Wayne Throop (not official) # Data General 605x # Ought to work for a Model 6242, Type D210 as well as a 605x. @@ -16872,14 +16972,13 @@ d210|d214|Data General DASHER D210 series, am, bw, msgr, xon, cols#80, lines#24, bel=^G, blink=\E[5m, bold=\E[4;7m, clear=\E[2J, cr=\r, - cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\E[B, - cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, - cuu=\E[%p1%dA, cuu1=\E[A, dim=\E[2m, ed=\E[J, el=\E[K, - el1=\E[1K, home=\E[H, ind=\n, is1=\E[<0;<1;<4l, + cub1=^H, cup=\E[%i%p1%d;%p2%dH, dim=\E[2m, ed=\E[J, + el=\E[K, el1=\E[1K, home=\E[H, ind=\n, is1=\E[<0;<1;<4l, ll=\E[H\E[A, nel=\n, rev=\E[7m, rmso=\E[m, rmul=\E[m, sgr=\E[%?%p4%t5;%;%?%p2%p6%|%t4;%;%?%p1%p5%|%t2;%;%?%p1%p3%| %p6%|%t7;%;m, - sgr0=\E[m, smso=\E[2;7m, smul=\E[4m, use=dgkeys+7b, + sgr0=\E[m, smso=\E[2;7m, smul=\E[4m, use=ansi+local, + use=dgkeys+7b, # DASHER D210 series terminals in DG mode. # Like D200, but adds clear to end-of-screen and needs XON/XOFF. @@ -17077,17 +17176,17 @@ d400|d400-dg|d450|d450-dg|Data General DASHER D400/D450 series, # \E)4 - default secondary character set (international) # d410|d411|d460|d461|Data General DASHER D410/D460 series, - mc5i, acsc=j$k"l!m#n)q+t'u&v(w%x*, civis=\E[3;0v, - cnorm=\E[3;2v, dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, - dl1=\E[M, ich=\E[%p1%d@, ich1=\E[@, il=\E[%p1%dL, il1=\E[L, + cnorm=\E[3;2v, dch=\E[%p1%dP, dch1=\E[P, ich=\E[%p1%d@, + ich1=\E[@, is1=\E[<0;<1;<2;<4l\E[5;0v\E[1;1;80w\E[1;6;<2h, - is2=\E[3;2;2;1;1;1v\E(B\E)4\017, mc4=\E[4i, mc5=\E[5i, - ri=\EM, rmacs=\E)4\017, rs1=\Ec\E[<2h, + is2=\E[3;2;2;1;1;1v\E(B\E)4\017, ri=\EM, + rmacs=\E)4\017, rs1=\Ec\E[<2h, rs2=\E[4;0;2;1;1;1v\E(B\E)4, sgr=\E[%?%p1%t2;7%;%?%p3%t7;%;%?%p4%t5;%;%?%p2%t4;%;%?%p1%p5 %|%t2;%;%?%p6%t4;7;%;m\E)%?%p9%t6\016%e4\017%;, sgr0=\E[m\E)4\017, smacs=\E)6\016, use=d211, + use=ansi+idl, use=ansi+pp, # Initialization string 2 sets: # \E[3;2;2;0;1;0v @@ -17350,11 +17449,12 @@ d578-7b|Data General DASHER D578 in 7-bit mode, cs10|colorscan|Datamedia Color Scan 10, msgr, cols#80, lines#24, - bel=^G, clear=\E[H\E[J, cr=\r, cub1=^H, cud1=\n, cuf1=\E[C, - cup=\E[%i%p1%02d;%p2%02dH, cuu1=\E[A, ed=\E[J, el=\E[K, - ind=\n, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, - kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, rmso=\E[m, rmul=\E[m, - sgr0=\E[m, smso=\E[7m, smul=\E[4m, + bel=^G, cr=\r, cub1=^H, cud1=\n, cuf1=\E[C, + cup=\E[%i%p1%02d;%p2%02dH, cuu1=\E[A, ind=\n, kcub1=\E[D, + kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf1=\EOP, kf2=\EOQ, + kf3=\EOR, kf4=\EOS, rmso=\E[m, rmul=\E[m, sgr0=\E[m, + smso=\E[7m, smul=\E[4m, use=ansi+erase, + cs10-w|Datamedia Color Scan 10 with 132 columns, cols#132, cup=\E[%i%p1%02d;%p2%03dH, use=cs10, @@ -17399,12 +17499,10 @@ dm3025|Datamedia 3025a, is2=\EQ\EU\EV, rmdc=\EQ, rmir=\EQ, rmso=\EO0, smdc=\EP, smir=\EP, smso=\EO1, dm3045|Datamedia 3045a, - OTbs, am, eo, km@, ul, xenl, + am, eo, km@, ul, xenl, dch1=\EB$<6>, dl1@, il1@, is2=\EU\EV, kcuf1=\EC, kcuu1=\EA, - kf0=\Ey\r, kf1=\Ep\r, kf2=\Eq\r, kf3=\Er\r, kf4=\Es\r, - kf5=\Et\r, kf6=\Eu\r, kf7=\Ev\r, kf8=\Ew\r, kf9=\Ex\r, - khome=\EH, pad=^?, rmdc@, rmir=\EP, rmso@, smdc@, smso@, - use=dm3025, + kf0=\Ey\r, kf9=\Ex\r, khome=\EH, pad=^?, rmdc@, rmir=\EP, + rmso@, smdc@, smso@, use=dm3025, use=hp+pfk+cr, # Datamedia DT80 soft switches: # 1 0=Jump 1=Smooth # Autorepeat 0=off 1=on @@ -17437,11 +17535,10 @@ dm3045|Datamedia 3045a, # CRT Saver 0=Off 1=On # dm80/1 is a VT100 lookalike, but it doesn't seem to need any padding. dm80|dmdt80|dt80|Datamedia dt80/1, - clear=\E[2J\E[H, cud1=\n, cuf1=\E[C, - cup=%i\E[%p1%d;%p2%dH, cuu1=\E[A, ed=\E[J, el=\E[K, - home=\E[H, mc0=\E[0i, mc4=\E[4i, mc5=\E[5i, ri=\EM, - rmso=\E[m, rmul=\E[m, sgr0=\E[m\017$<2>, smso=\E[7m, - smul=\E[4m, use=vt100+4bsd, + clear=\E[2J\E[H, cuf1=\E[C, cup=%i\E[%p1%d;%p2%dH, + cuu1=\E[A, ed=\E[J, el=\E[K, mc0=\E[0i, mc4=\E[4i, mc5=\E[5i, + ri=\EM, rmso=\E[m, rmul=\E[m, sgr0=\E[m\017$<2>, + smso=\E[7m, smul=\E[4m, use=vt100+4bsd, # except in 132 column mode, where it needs a little padding. # This is still less padding than the VT100, and you can always turn on # the ^S/^Q handshaking, so you can use VT100 flavors for things like @@ -17515,35 +17612,26 @@ falco|ts1|ts-1|Falco ts-1, falco-p|ts1p|ts-1p|Falco ts-1 with paging option, OTbs, am, da, db, mir, msgr, ul, cols#80, it#8, lines#24, - bel=^G, cbt=\EI, clear=\E*, cr=\r, cub1=^H, cud1=\E[B, - cuf1=\E[C, cup=\E=%p1%{32}%+%c%p2%{32}%+%c, cuu1=\E[A, - dch1=\EW, dl1=\ER, ed=\EY, el=\ET\EG0\010\Eg0, ht=^I, - il1=\EE, ind=\n, is2=\EZ\E3\E_c, kcub1=\E[D, kcud1=\E[B, - kcuf1=\E[C, kcuu1=\E[A, khome=\E[H, rmcup=\E_b, rmir=\Er, - rmso=\Eg0, rmul=\Eg0, sgr0=\Eg0, smcup=\E_d, smir=\Eq, - smso=\Eg4, smul=\Eg1, + bel=^G, cbt=\EI, clear=\E*, cr=\r, cub1=^H, + cup=\E=%p1%{32}%+%c%p2%{32}%+%c, dch1=\EW, dl1=\ER, + ed=\EY, el=\ET\EG0\010\Eg0, ht=^I, il1=\EE, ind=\n, + is2=\EZ\E3\E_c, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, + kcuu1=\E[A, khome=\E[H, rmcup=\E_b, rmir=\Er, rmso=\Eg0, + rmul=\Eg0, sgr0=\Eg0, smcup=\E_d, smir=\Eq, smso=\Eg4, + smul=\Eg1, use=ansi+local1, + # (ts100: I added / based on the init string -- esr) ts100|ts100-sp|Falco ts100-sp, - am, mir, msgr, xenl, xon, - cols#80, it#8, lines#24, vt#3, - acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, - bel=^G, blink=\E[5m$<2>, bold=\E[1m$<2>, - clear=\E[H\E[J$<50>, cr=\r, csr=\E[%i%p1%d;%p2%dr, - cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\n, - cuf=\E[%p1%dC, cuf1=\E[C$<2>, - cup=\E[%i%p1%d;%p2%dH$<5>, cuu=\E[%p1%dA, - cuu1=\E[A$<2>, dch1=\E~W, dl1=\E~R, ed=\E[J$<50>, - el=\E[K$<3>, el1=\E[1K$<3>, enacs=\E(B\E)0, home=\E[H, - ht=^I, hts=\EH, ich1=\E~Q, il1=\E~E, ind=\n, is1=\E~)\E~ea, - kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, - rc=\E8, rev=\E[7m$<2>, ri=\EM$<5>, rmacs=^O, rmam=\E[?7l, - rmkx=\E[?1l\E>, rmso=\E[m$<2>, rmul=\E[m$<2>, - rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, sc=\E7, - sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5 - %;m%?%p9%t\016%e\017%;$<2>, - sgr0=\E[m\017$<2>, smacs=^N, smam=\E[?7h, smkx=\E[?1h\E=, - smso=\E[1;7m$<2>, smul=\E[4m$<2>, tbc=\E[3g, - use=decid+cpr, use=vt100+fnkeys, + mir, xenl, xon, + vt#3, + cub1=^H, cud1=\n, cuf1=\E[C$<2>, cuu1=\E[A$<2>, dch1=\E~W, + dl1=\E~R, ich1=\E~Q, il1=\E~E, is1=\E~)\E~ea, kcub1=\EOD, + kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, rmam=\E[?7l, + rmkx=\E[?1l\E>, + rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, smam=\E[?7h, + smkx=\E[?1h\E=, use=ansi+csr, use=ansi+local, + use=decid+cpr, use=vt100+4bsd, use=vt100+fnkeys, + ts100-ctxt|Falco ts-100 saving context, rmcup=\E~_b, smcup=\E~_d\E[2J, use=ts100, @@ -17580,11 +17668,11 @@ beacon|FCG Beacon System, f1720|f1720a|fluke 1720A, xt, cols#80, lines#16, xmc#1, - bel=^G, clear=\E[H\E[2J, cr=\r, cub1=^H, cud1=\E[B, - cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, ed=\E[J, - el=\E[K, ind=\ED, is2=\E[H\E[2J, kcub1=^_, kcud1=^], - kcuf1=^^, kcuu1=^\, ri=\EM, rmso=\E[m, rmul=\E[m, sgr0=\E[m, - smso=\E[7m, smul=\E[4m, + bel=^G, clear=\E[H\E[2J, cr=\r, cub1=^H, + cup=\E[%i%p1%d;%p2%dH, ed=\E[J, el=\E[K, ind=\ED, + is2=\E[H\E[2J, kcub1=^_, kcud1=^], kcuf1=^^, kcuu1=^\, + ri=\EM, rmso=\E[m, rmul=\E[m, sgr0=\E[m, smso=\E[7m, + smul=\E[4m, use=ansi+local1, #### Liberty Electronics (Freedom) # @@ -17618,7 +17706,7 @@ f100-rv|freedom-rv|Liberty Freedom 100 in reverse video, # code for the down cursor key. When kcud1 is defined in terminfo # as ^V, the Control Character Quoting capability (^V in insert mode) # is lost! It cannot be remapped in vi because it is necessary to enter -# a ^V to to quote the ^V that is being remapped!!! +# a ^V to, to quote the ^V that is being remapped!!! # # f110/f200 users will have to decide whether # to lose the down cursor key or the quoting capability. We will opt @@ -17686,8 +17774,8 @@ f200vi-w|Liberty Freedom 200 - 132 cols for vi, go140|graphon go-140, OTbs, cols#80, it#8, lines#24, - clear=\E[H\E[2J$<10/>, cub1=^H, cud1=\E[B, cuf1=\E[C, - cup=\E[%i%p1%2d;%p2%2dH, cuu1=\E[A, dch1=\E[P, dl1=\E[M, + clear=\E[H\E[2J$<10/>, cub1=^H, + cup=\E[%i%p1%2d;%p2%2dH, dch1=\E[P, dl1=\E[M, ed=\E[J$<10/>, el=\E[K, ht=^I, if=/usr/share/tabset/vt100, il1=\E[L, is2=\E<\E=\E[?3l\E[?7l\E(B\E[J\E7\E[;r\E8\E[m\E[q, @@ -17695,7 +17783,8 @@ go140|graphon go-140, kf2=\EOQ, kf3=\EOR, kf4=\EOS, khome=\E[H, ri=\EM, rmam=\E[?7l, rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[m, rmul=\E[m, sgr0=\E[m, smam=\E[?7h, smir=\E[4h, - smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, + smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, use=ansi+local1, + go140w|graphon go-140 in 132 column mode, am, cols#132, @@ -17707,18 +17796,17 @@ go140w|graphon go-140 in 132 column mode, go225|go-225|Graphon 225, OTbs, am, mir, xenl, cols#80, it#8, lines#25, vt#3, - blink=\E[5m, bold=\E[1m, clear=\E[H\E[J, - csr=\E[%i%p1%d;%p2%dr, cub1=^H, cud1=\n, cuf1=\E[C, + blink=\E[5m, bold=\E[1m, cub1=^H, cud1=\n, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, dch1=\E[P, dl1=\E[M, - ed=\E[J, el=\E[K, home=\E[H, ht=^I, il1=\E[L, ind=\ED, - is2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, kbs=^H, - kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf1=\EOP, - kf2=\EOQ, kf3=\EOR, kf4=\EOS, khome=\E[H, rc=\E8, rev=\E[7m, + home=\E[H, ht=^I, il1=\E[L, ind=\ED, + is2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, kf1=\EOP, + kf2=\EOQ, kf3=\EOR, kf4=\EOS, rev=\E[7m, rf=/usr/share/tabset/vt100, ri=\EM, rmam=\E[?7l, rmcup=\E[!p\E[?7h\E[2;1;1#w, rmir=\E[4l, rmkx=\E>, rmso=\E[27m, rmul=\E[24m, rs1=\E[!p\E[?7h\E[2;1;1#w, - sc=\E7, sgr0=\E[m, smam=\E[?7h, smcup=\E[2;0#w\E[1;25r, + sgr0=\E[m, smam=\E[?7h, smcup=\E[2;0#w\E[1;25r, smir=\E[4h, smkx=\E=, smso=\E[7m, smul=\E[4m, + use=ansi+arrows, use=ansi+csr, use=ansi+erase, #### Harris (Beehive) # @@ -17796,12 +17884,12 @@ sb1|Beehive SuperBee, \s\s\s\s\s\s\s\s\s\s\s\s\s\s\s\s\s\s\s\s\s\s\s\s\s\s\s \s\s\s\s\s\s\s\s\s\s\s\s\s\s\s\s\s\s\s\s\s\s\s\s\s\s\s \s\s\s\s\s\EP$<3>\s\EO\ER\EA$<3>, - ind=\n, is2=\EE$<3>\EX\EZ\EO\Eb\Eg\ER, kbs=^_, kcub1=\ED, - kcud1=\EB, kcuf1=\EC, kcuu1=\EA, kdl1=\EM, ked=\EJ, kel=\EK, - kf0=\E2, kf9=\E1, khome=\EH, kich1=\EQ\EO, krmir=\ER, - lf0=TAB CLEAR, lf9=TAB SET, rmcup=, rmir=\ER, rmso=\E_3, - rmul=\E_3, sgr0=\E_3, smcup=\EO, smir=\EQ\EO, smso=\E_1, - smul=\E_0, tbc=\E3, use=hp+pfk-cr, + ind=\n, is2=\EE$<3>\EX\EZ\EO\Eb\Eg\ER, kbs=^_, kdl1=\EM, + ked=\EJ, kel=\EK, kf0=\E2, kf9=\E1, khome=\EH, kich1=\EQ\EO, + krmir=\ER, lf0=TAB CLEAR, lf9=TAB SET, rmcup=, rmir=\ER, + rmso=\E_3, rmul=\E_3, sgr0=\E_3, smcup=\EO, smir=\EQ\EO, + smso=\E_1, smul=\E_0, tbc=\E3, use=hp+pfk-cr, + use=vt52+arrows, sbi|superbee|Beehive SuperBee at Indiana U., xsb, cr=\r$<1>, il1=\EN$<1>\EL$<9>\EQ \EP$<9> \EO\ER\EA, @@ -17824,8 +17912,8 @@ superbee-xsb|Beehive SuperBee (improved), dch1=\EP$<3>, dl1=\EM$<100>, ed=\EJ$<3>, el=\EK$<3>, home=\EH, ht=^I, hts=\E1, ind=\n\0\0\0\n\0\0\0\EA\EK\0\0\0\ET\ET, is2=\EH\EJ, - kcub1=\ED, kcud1=\EB, kcuf1=\EC, kcuu1=\EA, khome=\EH, - rmso=\E_3, sgr0=\E_3, smso=\E_1, tbc=\E3, use=hp+pfk-cr, + khome=\EH, rmso=\E_3, sgr0=\E_3, smso=\E_1, tbc=\E3, + use=hp+pfk-cr, use=vt52+arrows, # This loses on lines > 80 chars long, use at your own risk superbeeic|SuperBee with insert char, ich1=, rmir=\ER, smir=\EQ, use=superbee-xsb, @@ -17852,10 +17940,9 @@ beehive|bee|Harris Beehive, cbt=\E>, clear=\EE, cub1=^H, cud1=\EB, cuf1=\EC, cup=\EF%p1%{32}%+%c%p2%{32}%+%c, cuu1=\EA, dch1=\EP, dl1=\EM, ed=\EJ, el=\EK, home=\EH, il1=\EL, kbs=^H, kcbt=\E>, - kclr=\EE, kcub1=\ED, kcud1=\EB, kcuf1=\EC, kcuu1=\EA, - kdch1=\EP, kdl1=\EM, kel=\EK, khome=\EH, kich1=\EQ, kil1=\EL, - krmir=\E@, rmir=\E@, rmso=\Ed@, rmul=\Ed@, sgr0=\Ed@, - smir=\EQ, smso=\EdP, smul=\Ed`, + kclr=\EE, kdch1=\EP, kdl1=\EM, kel=\EK, khome=\EH, kich1=\EQ, + kil1=\EL, krmir=\E@, rmir=\E@, rmso=\Ed@, rmul=\Ed@, + sgr0=\Ed@, smir=\EQ, smso=\EdP, smul=\Ed`, use=vt52+arrows, # set tab is ^F, clear (one) tab is ^V, no way to clear all tabs. # good grief - does this entry make :sg:/:ug: when it doesn't have to? # look at those spaces in /. Seems strange to me... @@ -17880,9 +17967,9 @@ microb|microbee|Micro Bee series, cols#80, it#8, lines#24, bel=^G, clear=\EE, cr=\r, cub1=^H, cud1=\n, cuf1=\EC, cup=\EF%p1%{32}%+%c%p2%{32}%+%c, cuu1=\EA, ed=\EJ, - el=\EK, ht=^I, ind=\n, kcub1=\ED, kcud1=\EB, kcuf1=\EC, - kcuu1=\EA, kf9=\Ex, khome=\EH, rmso=\Ed@, rmul=\Ed@, - sgr0=\Ed@, smso=\s\EdP, smul=\Ed`, use=hp+pfk-cr, + el=\EK, ht=^I, ind=\n, kf9=\Ex, khome=\EH, rmso=\Ed@, + rmul=\Ed@, sgr0=\Ed@, smso=\s\EdP, smul=\Ed`, + use=hp+pfk-cr, use=vt52+arrows, # 8675, 8686, and bee from Cyrus Rahman # (8675: changed k10, k11...k16 to k;, F1...F6 -- esr) @@ -17924,7 +18011,7 @@ ha8686|Harris 8686, # # They're now (1998) a subsidiary of General Electric, operating under the # marque "GEC-Marconi Hazeltine" and doing military avionics. Web page -# at . +# at . # # Since is blank, when you want to erase something you @@ -18045,18 +18132,17 @@ hazel|exec80|h80|he80|Hazeltine Executive 80, OTbs, OTpt, am, cols#80, it#8, lines#24, vt#3, OTnl=\n, bel=^G, blink=\E[5m$<2/>, bold=\E[1m$<2/>, - clear=\E[;H\E[2J$<50/>, cr=\r, csr=\E[%i%p1%d;%p2%dr, - cub1=^H, cud1=\n, cuf1=\E[C$<2/>, - cup=\E[%i%p1%d;%p2%dH$<5/>, cuu1=\E[A$<2/>, - ed=\E[J$<50/>, el=\E[K$<3/>, home=\E[H, ht=^I, - is2=\E[1;24r\E[24;1H, kbs=^H, kcub1=\EOD, kcud1=\EOB, - kcuf1=\EOC, kcuu1=\EOA, kf1=\EOP, kf2=\EOQ, kf3=\EOR, - kf4=\EOS, rc=\E8, rev=\E[7m$<2/>, + clear=\E[;H\E[2J$<50/>, cr=\r, cub1=^H, cud1=\n, + cuf1=\E[C$<2/>, cup=\E[%i%p1%d;%p2%dH$<5/>, + cuu1=\E[A$<2/>, ed=\E[J$<50/>, el=\E[K$<3/>, home=\E[H, + ht=^I, is2=\E[1;24r\E[24;1H, kbs=^H, kcub1=\EOD, + kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kf1=\EOP, kf2=\EOQ, + kf3=\EOR, kf4=\EOS, rev=\E[7m$<2/>, rf=/usr/share/tabset/vt100, ri=\EM$<5/>, rmkx=\E[?1l\E>, rmso=\E[m$<2/>, rmul=\E[m$<2/>, - rs1=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, sc=\E7, + rs1=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, sgr0=\E[m$<2/>, smkx=\E[?1h\E=, smso=\E[7m$<2/>, - smul=\E[4m$<2/>, + smul=\E[4m$<2/>, use=ansi+csr, #### IBM # @@ -18070,14 +18156,14 @@ ibm3101|i3101|IBM 3101-10, cols#80, lines#24, bel=^G, clear=\EK, cr=\r, cub1=^H, cud1=\n, cuf1=\EC, cup=\EY%p1%{32}%+%c%p2%{32}%+%c, cuu1=\EA, ed=\EJ, - el=\EI, home=\EH, hts=\E0, ind=\n, kcub1=\ED, kcud1=\EB, - kcuf1=\EC, kcuu1=\EA, nel=\r\n, tbc=\EH, + el=\EI, home=\EH, hts=\E0, ind=\n, nel=\r\n, tbc=\EH, + use=vt52+arrows, ibm3151|IBM 3151 display, - is2=\E S, rmacs=\E>B, rmcup=\E>B, rs2=\E S, s0ds=\E>B, + is2=\E S, rmacs=\E>B, rs2=\E S, sgr=\E4%{64}%?%p1%t%{65}%|%;%?%p2%t%{66}%|%;%?%p3%t%{65}%|%; %?%p4%t%{68}%|%;%?%p5%t%{64}%|%;%?%p6%t%{72}%|%;%?%p7%t %{80}%|%;%c%?%p9%t\E>A%e\E>B%;, - sgr0=\E4@\E>B, smacs=\E>A, smcup=\E>B, use=ibm3162, + sgr0=\E4@\E>B, smacs=\E>A, use=ibm3162, # From: Mark Easter 29 Oct 1992 # removed kend, knp, kpp -TD # @@ -18095,9 +18181,8 @@ ibm3161|ibm3163|wy60-316X|wyse60-316X|IBM 3161/3163 display, cud1=\EB, cuf1=\EC, cup=\EY%p1%{32}%+%c%p2%{32}%+%c, cuu1=\EA, dch1=\EQ, dl1=\EO, ed=\EJ, el=\EI, home=\EH, ich1=\EP \010, il1=\EN, ind=\n, invis=\E4P, kbs=^H, kcbt=\E2, - kclr=\EL\r, kctab=\E1, kcub1=\ED, kcud1=\EB, kcuf1=\EC, - kcuu1=\EA, kdch1=\EQ, kdl1=\EO, ked=\EJ, kel=\EI, kf1=\Ea\r, - kf10=\Ej\r, kf11=\Ek\r, kf12=\El\r, kf13=\E!a\r, + kclr=\EL\r, kctab=\E1, kdch1=\EQ, kdl1=\EO, ked=\EJ, kel=\EI, + kf1=\Ea\r, kf10=\Ej\r, kf11=\Ek\r, kf12=\El\r, kf13=\E!a\r, kf14=\E!b\r, kf15=\E!c\r, kf16=\E!d\r, kf17=\E!e\r, kf18=\E!f\r, kf19=\E!g\r, kf2=\Eb\r, kf20=\E!h\r, kf21=\E!i\r, kf22=\E!j\r, kf23=\E!k\r, kf24=\E!l\r, @@ -18109,6 +18194,7 @@ ibm3161|ibm3163|wy60-316X|wyse60-316X|IBM 3161/3163 display, %?%p4%t%{68}%|%;%?%p5%t%{64}%|%;%?%p6%t%{72}%|%;%?%p7%t %{80}%|%;%c%?%p9%t\E>A%e\E<@%;, sgr0=\E4@\E<@, smcup=\E>A, smso=\E4A, smul=\E4B, + use=vt52+arrows, ibm3161-C|IBM 3161-C NLS terminal using cartridge, rmcup=\E>B, s0ds=\E>B, s1ds=\E>A, smcup=\E>B, use=ibm3161, @@ -18137,14 +18223,9 @@ ibm5151|wy60-AT|wyse60-AT|IBM 5151 Monochrome display, cols#80, it#8, lines#25, acsc=j\331k\277l\332m\300n\305q\304t\303u\264v\301w\302x \263, - bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[J, cr=\r, - cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\n, - cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, - cuu=\E[%p1%dA, cuu1=\E[A, dch1=\E[P, dl=\E[%p1%dM, - dl1=\E[M, ech=\E[%p1%dX, ed=\E[J, el=\E[K, home=\E[H, - hpa=\E[%i%p1%dG, il=\E[%p1%dL, il1=\E[L, ind=\E[S, - invis=\E[8m, is2=\Ec, kbs=^H, kcbt=\E[Z, kclr=\E[144q, - kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kdch1=\E[P, + bel=^G, cr=\r, cub1=^H, cud1=\n, cup=\E[%i%p1%d;%p2%dH, + dch1=\E[P, ech=\E[%p1%dX, home=\E[H, hpa=\E[%i%p1%dG, + ind=\E[S, is2=\Ec, kcbt=\E[Z, kclr=\E[144q, kdch1=\E[P, ked=\E[148q, kel=\E[142q, kend=\E[146q, kf1=\E[001q, kf10=\E[010q, kf11=\E[011q, kf12=\E[012q, kf13=\E[013q, kf14=\E[014q, kf15=\E[015q, kf16=\E[016q, kf17=\E[017q, @@ -18154,13 +18235,13 @@ ibm5151|wy60-AT|wyse60-AT|IBM 5151 Monochrome display, kf29=\E[029q, kf3=\E[003q, kf30=\E[030q, kf31=\E[031q, kf32=\E[032q, kf33=\E[033q, kf34=\E[034q, kf35=\E[035q, kf36=\E[036q, kf4=\E[004q, kf5=\E[005q, kf6=\E[006q, - kf7=\E[007q, kf8=\E[008q, kf9=\E[009q, khome=\E[H, - kich1=\E[139q, kil1=\E[140q, kind=\E[151q, knp=\E[154q, - kpp=\E[150q, kri=\E[155q, krmir=\E[4l, rev=\E[7m, ri=\E[T, - rmir=\E[4l, rmso=\E[m, rmul=\E[m, rs2=\Ec, + kf7=\E[007q, kf8=\E[008q, kf9=\E[009q, kich1=\E[139q, + kil1=\E[140q, kind=\E[151q, knp=\E[154q, kpp=\E[150q, + kri=\E[155q, krmir=\E[4l, ri=\E[T, rmir=\E[4l, rs2=\Ec, sgr=\E[%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1 %;%?%p7%t;8%;m, - sgr0=\E[0m, smir=\E[4h, smso=\E[7m, smul=\E[4m, + smir=\E[4h, use=ansi+arrows, use=ansi+erase, + use=ansi+idl, use=ansi+local, use=ansi+sgrbold, use=ecma+index, ibmaed|IBM Experimental display, @@ -18169,8 +18250,8 @@ ibmaed|IBM Experimental display, clear=\EH\EK, cub1=^H, cud1=\EB, cuf1=\EC, cup=\EY%p1%{32}%+%c%p2%{32}%+%c, cuu1=\EA, dch1=\EQ, dl1=\EO, ed=\EJ, el=\EI, flash=\EG, home=\EH, ht=^I, ich1=\EP, - il1=\EN, kbs=^H, kcub1=\ED, kcud1=\EB, kcuf1=\EC, kcuu1=\EA, - rmso=\E0, sgr0=\E0, smso=\E0, + il1=\EN, kbs=^H, rmso=\E0, sgr0=\E0, smso=\E0, + use=vt52+arrows, ibm-apl|apl|IBM apl terminal simulator, lines#25, use=dm1520, # (ibmmono: this had an unknown `sb' boolean, I changed it to `bs'. @@ -18185,8 +18266,7 @@ ibmmono|IBM workstation monochrome, sgr0=\Ew\Eq\Ez\EB, smso=\EZ, smul=\EW, tsl=\Ej\EY8%+ \Eo, use=ibm3101, ibmega|IBM Enhanced Color Display, - cr=\r, cud1=\n, ht=^I, ind=\n, kbs=^H, kcub1=^H, kcud1=\n, - nel=\r\n, use=ibmmono, + ht=^I, kcub1=^H, kcud1=\n, use=ibmmono, # This color scheme is assumed in some recent IBM terminal descriptions # (green on black, emulated on a 16-color terminal). ibm+color|IBM color definitions, @@ -18207,18 +18287,16 @@ ibm+16color|IBM aixterm color definitions, setf=%p1%{8}%/%{6}%*%{3}%+\E[%d%p1%{8}%m%Pa%?%ga%{1}%=%t4%e %ga%{3}%=%t6%e%ga%{4}%=%t1%e%ga%{6}%=%t3%e%ga%d%;m, ibm5154|IBM 5154 Color display, - colors#8, ncv@, pairs#64, + ncv@, bold@, setab=\E[4%p1%dm, setaf=\E[3%p1%dm, use=ibm5151, use=ibm+color, ibmega-c|ibm5154-c|IBM Enhanced Color Display with standout and underline, rmso=\EB, rmul=\EB, smso=\EF\Ef3;, smul=\EF\Ef2;, use=ibmmono, ibmvga-c|IBM VGA display color termcap, - cr=\r, cud1=\n, ht=^I, ind=\n, kbs=^H, kcub1=^H, kcud1=\n, - nel=\r\n, use=ibmega-c, + ht=^I, kcub1=^H, kcud1=\n, use=ibmega-c, ibmvga|IBM VGA display, - cr=\r, cud1=\n, ht=^I, ind=\n, kbs=^H, kcub1=^H, kcud1=\n, - nel=\r\n, use=ibmega, + use=ibmega, # ibmapa* and ibmmono entries come from ACIS 4.3 distribution rtpc|ibmapa16|IBM 6155 Extended Monochrome Graphics Display, lines#32, @@ -18247,46 +18325,34 @@ ibm6153-90|IBM 6153 Black & White display (36-line), cols#90, lines#36, blink@, bold@, use=ibm5151, ibm6153-40|IBM 6153 Black & White display (12-line), - cols#40, lines#12, use=ibm6153-90, -ibm8512|ibm8513|IBM color VGA Terminal, - am, mir, msgr, - cols#80, it#8, lines#25, - acsc=jjkkllmmnnqqttuuvvwwxx, blink=\E[5m, bold=\E[1m, - clear=\E[H\E[J, cub1=\E[D, cud1=\n, cuf1=\E[C, - cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, dl=\E[%p1%dM, dl1=\E[M, - ech=\E[%p1%dX, ed=\E[J, el=\E[K, home=\E[H, il=\E[%p1%dL, - il1=\E[L, is2=\Eb\E[m\017\E[?7h, kcud1=\E[B, kcuu1=\E[A, - kf0=\E[010q, kf1=\E[001q, kf2=\E[002q, kf3=\E[003q, - kf4=\E[004q, kf5=\E[005q, kf6=\E[006q, kf7=\E[007q, - kf8=\E[008q, kf9=\E[009q, khome=\E[H, rc=\E[u, rev=\E[7m, + cols#40, lines#12, use=ibm6153-90, +ibm8512|ibm8513|IBM color VGA Terminal, + mir, + cub1=\E[D, is2=\Eb\E[m\017\E[?7h, kf0=\E[010q, rc=\E[u, rmacs=^O, rmam=\E[?7l, rmcup=\E[20h, rmdc=\E[4l, - rmir=\E[4l, rmso=\E[m, rmul=\E[m, rs1=\Eb\E[m\017\E[?7h\E[H\E[J, sc=\E[s, sgr0=\E[m, smacs=^N, smam=\E[?7h, smcup=\E[20;4l\E[?7h\Eb, - smdc=\E[4h, smir=\E[4h, smso=\E[7m, smul=\E[4m, - use=ibm8503, + smdc=\E[4h, use=ibm8503, hft-c|HFT with Color, - colors#8, pairs#64, acsc=jjkkllmmnnqqttuuvvwwxx, s0ds=\E(B, s1ds=\E(0, setab=\E[4%p1%dm, setaf=\E[3%p1%dm, sgr0=\E[0m\E(B, use=ibm5151, use=ibm+color, hft-c-old|HFT with Color PC850, - colors#8, pairs#64, setab=\E[4%p1%dm, setaf=\E[3%p1%dm, use=ibm5151, use=ibm+color, hft-old|AIWS High Function Terminal, am, xon, cols#80, lines#25, - bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[J, cr=\r, - cub1=^H, cud1=\n, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, - cuu1=\E[A, dch1=\E[P, dl1=\E[M, ed=\E[J, el=\E[K, home=\E[H, - ht=^I, ich1=\E[@, il1=\E[L, ind=\n, invis=\E[8m, kbs=^H, - kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, - kf1=\E[001q, kf2=\E[002q, kf3=\E[003q, kf4=\E[004q, - kf5=\E[005q, kf6=\E[006q, kf7=\E[007q, kf8=\E[008q, - kf9=\E[009q, khome=\E[H, knp=\E[153q, kpp=\E[159q, + bel=^G, blink=\E[5m, bold=\E[1m, cr=\r, cub1=^H, cud1=\n, + cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, dch1=\E[P, + dl1=\E[M, home=\E[H, ht=^I, ich1=\E[@, il1=\E[L, ind=\n, + invis=\E[8m, kf1=\E[001q, kf2=\E[002q, kf3=\E[003q, + kf4=\E[004q, kf5=\E[005q, kf6=\E[006q, kf7=\E[007q, + kf8=\E[008q, kf9=\E[009q, knp=\E[153q, kpp=\E[159q, ktbc=\E[010q, rev=\E[7m, rmir=\E6, rmso=\E[m, rmul=\E[m, - sgr0=\E[m, smir=\E6, smso=\E[7m, smul=\E[4m, use=ibm+color, + sgr0=\E[m, smir=\E6, smso=\E[7m, smul=\E[4m, + use=ansi+arrows, use=ansi+erase, use=ibm+color, + ibm-system1|system1|IBM system/1 computer, am, xt, cols#80, lines#24, @@ -18302,53 +18368,47 @@ lft|lft-pc850|LFT-PC850|IBM LFT PC850 Device, cols#80, it#8, lines#25, acsc=j\331k\277l\332m\300n\305q\304t\303u\264v\301w\302x \263, - bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, clear=\E[H\E[J, - cr=\r, cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\n, - cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, - cuu=\E[%p1%dA, cuu1=\E[A, dch=\E[%p1%dP, dch1=\E[P, - dl=\E[%p1%dM, dl1=\E[M, ech=\E[%p1%dX, ed=\E[2J, el=\E[0K, - home=\E[H, hpa=\E[%i%p1%dG, ich=\E[%p1%d@, il=\E[%p1%dL, - il1=\E[L, ind=\ED, invis=\E[8m, is2=\Ec, kbs=^H, kcbt=\E[Z, - kclr=\E[144q, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, - kcuu1=\E[A, kdch1=\E[P, ked=\E[148q, kel=\E[142q, - kend=\E[146q, kf1=\E[001q, kf10=\E[010q, kf11=\E[011q, - kf12=\E[012q, kf13=\E[013q, kf14=\E[014q, kf15=\E[015q, - kf16=\E[016q, kf17=\E[017q, kf18=\E[018q, kf19=\E[019q, - kf2=\E[002q, kf20=\E[020q, kf21=\E[021q, kf22=\E[022q, - kf23=\E[023q, kf24=\E[024q, kf25=\E[025q, kf26=\E[026q, - kf27=\E[027q, kf28=\E[028q, kf29=\E[029q, kf3=\E[003q, - kf30=\E[030q, kf31=\E[031q, kf32=\E[032q, kf33=\E[033q, - kf34=\E[034q, kf35=\E[035q, kf36=\E[036q, kf4=\E[004q, - kf5=\E[005q, kf6=\E[006q, kf7=\E[007q, kf8=\E[008q, - kf9=\E[009q, khome=\E[H, kich1=\E[139q, kil1=\E[140q, + bel=^G, cbt=\E[Z, clear=\E[H\E[J, cr=\r, cub1=^H, cud1=\n, + cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P, + ech=\E[%p1%dX, ed=\E[2J, el=\E[0K, home=\E[H, + hpa=\E[%i%p1%dG, ich=\E[%p1%d@, ind=\ED, is2=\Ec, + kcbt=\E[Z, kclr=\E[144q, kdch1=\E[P, ked=\E[148q, + kel=\E[142q, kend=\E[146q, kf1=\E[001q, kf10=\E[010q, + kf11=\E[011q, kf12=\E[012q, kf13=\E[013q, kf14=\E[014q, + kf15=\E[015q, kf16=\E[016q, kf17=\E[017q, kf18=\E[018q, + kf19=\E[019q, kf2=\E[002q, kf20=\E[020q, kf21=\E[021q, + kf22=\E[022q, kf23=\E[023q, kf24=\E[024q, kf25=\E[025q, + kf26=\E[026q, kf27=\E[027q, kf28=\E[028q, kf29=\E[029q, + kf3=\E[003q, kf30=\E[030q, kf31=\E[031q, kf32=\E[032q, + kf33=\E[033q, kf34=\E[034q, kf35=\E[035q, kf36=\E[036q, + kf4=\E[004q, kf5=\E[005q, kf6=\E[006q, kf7=\E[007q, + kf8=\E[008q, kf9=\E[009q, kich1=\E[139q, kil1=\E[140q, kind=\E[151q, knp=\E[154q, kpp=\E[150q, kri=\E[155q, - krmir=\E[4l, rev=\E[7m, ri=\EL, rmacs=\E(B, rmir=\E[4l, - rmso=\E[0m, rmul=\E[0m, rs2=\Ec, + krmir=\E[4l, ri=\EL, rmacs=\E(B, rmir=\E[4l, rmso=\E[0m, + rmul=\E[0m, rs2=\Ec, sgr=\E[%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1 %;%?%p7%t;8%;m%?%p9%t\E(0%e\E(B%;, - sgr0=\E[0m, smacs=\E(0, smir=\E[4h, smso=\E[7m, smul=\E[4m, - tbc=\E[3g, use=ecma+index, + smacs=\E(0, smir=\E[4h, tbc=\E[3g, use=ansi+arrows, + use=ansi+idl, use=ansi+local, use=ansi+sgrbold, + use=ecma+index, + # "Megapel" refers to the display adapter, which was used with the IBM RT # aka IBM 6150. ibm5081|hft|IBM Megapel Color display, acsc=jjkkllmmnnqqttuuvvwwxx, blink@, bold@, s0ds=\E(B, s1ds=\E(0, sgr0=\E[0m\E(B, use=ibm5154, ibm5081-c|ibmmpel-c|IBM 5081 1024x1024 256/4096 Megapel enhanced color display, - eslok, hs, lines#33, - dsl=\Ej\EYA \EI\Ek, fsl=\Ek, tsl=\Ej\EYA%+ \Eo, - use=ibmega-c, + dsl=\Ej\EYA \EI\Ek, tsl=\Ej\EYA%+ \Eo, use=ibmega-c, ibm8503|ibm8507|ibm8604|IBM 8503 B & W VGA display, use=hft-c, ibm8514|IBM 8514/a color VGA display, eslok, hs, dsl=\Ej\EYI \EI\Ek, fsl=\Ek, tsl=\Ej\EYI%+ \Eo, use=hft, ibm8514-c|IBM 8514 color display with standout and underline, - eslok, hs, lines#41, - cr=\r, cud1=\n, dsl=\Ej\EYI \EI\Ek, fsl=\Ek, ht=^I, ind=\n, - kbs=^H, kcub1=^H, kcud1=\n, nel=\r\n, tsl=\Ej\EYI%+ \Eo, - use=ibmega-c, + dsl=\Ej\EYI \EI\Ek, ht=^I, kcub1=^H, kcud1=\n, + tsl=\Ej\EYI%+ \Eo, use=ibmega-c, # # AIX entries. IBM ships these with AIX 3.2.5. @@ -18734,9 +18794,9 @@ intext|Interactive Systems Corporation modified owl 1200, intext2|intextii|INTERACTIVE modified owl 1251, am, bw, ul, cols#80, lines#24, xmc#0, - bel=^G, cbt=\E[Z, clear=\E[H\E[2J, cr=\r, cub1=\E[D, - cud1=\E[B, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, - dch1=\E[P, dl1=\E[M, ed=\E[J, el=\E[K, + bel=^G, cbt=\E[Z, clear=\E[H\E[2J, cr=\r, + cup=\E[%i%p1%d;%p2%dH, dch1=\E[P, dl1=\E[M, ed=\E[J, + el=\E[K, flash=\E[;;;;;;;;;2;;u$<200/>\E[;;;;;;;;;1;;u, hpa=\E[%p1%{1}%+%dG, ht=^I, ich1=\E[@, il1=\E[L, ind=\E[S, kbs=^H, kcub1=\ED\r, kcud1=\EB\r, kcuf1=\EC\r, kcuu1=\EA\r, @@ -18745,7 +18805,7 @@ intext2|intextii|INTERACTIVE modified owl 1251, khome=\ER\r, lf0=REFRSH, lf1=DEL CH, lf2=TABSET, lf3=GOTO, lf4=+PAGE, lf5=+SRCH, lf6=-PAGE, lf7=-SRCH, lf8=LEFT, lf9=RIGHT, ri=\E[T, rmso=\E[2 D, rmul=\E[2 D, smso=\E[6 D, - smul=\E[18 D, + smul=\E[18 D, use=ansi+local1, #### Kimtron (abm, kt) # @@ -18847,13 +18907,13 @@ kt7ix|kimtron model kt-7 or 70 in IX mode, cuf1=^L, cup=\E=%p1%{32}%+%c%p2%{32}%+%c, cuu1=^K, dch1=\EW, dim=\EG@, dl1=\ER, dsl=\Ef\r, ed=\EY, el=\ET, fsl=\r, home=^^, ht=^I, ich1=\EQ, il1=\EE, ind=\n, - is2=\EG0\E s\017\E~, kbs=^H, kcbt=\EI, kclr=\E*, - kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kdl1=\ER, - ked=\EY, kel=\ET, kend=\EY, kf0=^AI\r, kf1=^A@\r, kf2=^AA\r, + is2=\EG0\E s\017\E~, kcbt=\EI, kclr=\E*, kdl1=\ER, ked=\EY, + kel=\ET, kend=\EY, kf0=^AI\r, kf1=^A@\r, kf2=^AA\r, kf3=^AB\r, kf4=^AC\r, kf5=^AD\r, kf6=^AE\r, kf7=^AF\r, kf8=^AG\r, kf9=^AH\r, khome=^^, kich1=\EQ, kil1=\EE, knp=\EJ, nel=\r\n, pulse=\EK, rmacs=\E%%, rmir=, rmso=\EG0, rmul=\EG0, sgr0=\EG0, smacs=\E$, smir=, smso=\EG4, smul=\EG8, tsl=\Ef, + use=ansi+arrows, #### Microdata/MDIS # @@ -19030,32 +19090,25 @@ prism8-w|p8-w|P8-W|MDC Prism-8 in 132 column mode, # prism9|p9|P9|MDC Prism-9 in ANSI mode, am, bw, hs, msgr, xenl, xon, - cols#80, it#8, lines#24, vt#3, wsl#72, - bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, civis=\E[<4l, - clear=^L, cnorm=\E[<4h, cr=\r, csr=\E[%i%p1%d;%p2%d%%v, - cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\n, - cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, - cuu=\E[%p1%dA, cuu1=\E[A, dch=\E[%p1%dP, dch1=\E[P, - dl=\E[%p1%dM, dl1=\E[M, dsl=\E[%}\024, ech=\E[%p1%dX, - ed=\E[J$<10>, el=\E[K, fsl=^T, home=\E[H, hpa=\E[%i%p1%d`, - ht=^I, hts=\EH, il=\E[%p1%dL, il1=\E[L, ind=\n, - is2=\E[&p\E[<12l\E F, kbs=^H, kclr=^L, kcub1=\E[D, - kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf1=\E[11~, - kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf13=\E[25~, - kf14=\E[26~, kf15=\E[28~, kf16=\E[29~, kf17=\E[31~, - kf18=\E[32~, kf2=\E[12~, kf3=\E[13~, kf4=\E[14~, - kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, - khome=\E[H, nel=\r\n, prot=\E[32%{, rc=\E[%z, - rep=\E[%p2%db%p1%c, rev=\E[7m, ri=\E[L, rmir=\E[4l, - rmso=\E[27m, rmul=\E[24m, + cols#80, lines#24, vt#3, wsl#72, + bel=^G, blink=\E[5m, bold=\E[1m, civis=\E[<4l, clear=^L, + cnorm=\E[<4h, cr=\r, csr=\E[%i%p1%d;%p2%d%%v, cub1=^H, + cud1=\n, cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P, + dsl=\E[%}\024, ech=\E[%p1%dX, ed=\E[J$<10>, el=\E[K, + fsl=^T, home=\E[H, hpa=\E[%i%p1%d`, ind=\n, + is2=\E[&p\E[<12l\E F, kclr=^L, kf13=\E[25~, kf14=\E[26~, + kf15=\E[28~, kf16=\E[29~, kf17=\E[31~, kf18=\E[32~, + nel=\r\n, prot=\E[32%{, rc=\E[%z, rep=\E[%p2%db%p1%c, + rev=\E[7m, ri=\E[L, rmir=\E[4l, rmso=\E[27m, rmul=\E[24m, rs2=\E[&p\E[<12l\E\sF\E[3g\E[9;17;25;33;41;49;57;65;73 \sN, sc=\E[%y, sgr=\E[0%?%p1%p3%|%t;7%;%?%p2%t;4%;%?%p4%t;5%;%?%p6%t;1%;m%? %p8%t\E[32%%{%;%?%p9%t\016%e\017%;, sgr0=\E[0m\017, smir=\E[4h, smso=\E[7m, smul=\E[4m, - tbc=\E[3g, tsl=\E[%i%p1%d%%}, vpa=\E[%i%p1%dd, - use=ansi+pp, + tsl=\E[%i%p1%d%%}, vpa=\E[%i%p1%dd, use=ansi+arrows, + use=ansi+idl, use=ansi+inittabs, use=ansi+local, + use=ansi+pp, use=xterm+r5+fkeys, # p9-w: Prism-9 in 132 column mode # -------------------------------- @@ -19075,8 +19128,8 @@ prism9-w|p9-w|P9-W|MDC Prism-9 in 132 column mode, # Insertion and deletion operations possible. # prism9-8|p9-8|P9-8|MDC Prism-9 in P8 mode, - dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M, - ich=\E[%p1%d@, ich1=\E[@, il=\E[%p1%dL, il1=\E[L, use=p8, + dch=\E[%p1%dP, dch1=\E[P, ich=\E[%p1%d@, ich1=\E[@, + use=ansi+idl, use=p8, # p9-8-w: Prism-9 in P8 and 132 column modes # ------------------------------------------ @@ -19084,8 +19137,8 @@ prism9-8|p9-8|P9-8|MDC Prism-9 in P8 mode, # P9 terminal in P8 emulation mode and 132 column mode. # prism9-8-w|p9-8-w|P9-8-W|MDC Prism-9 in Prism 8 emulation and 132 column mode, - dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M, - ich=\E[%p1%d@, ich1=\E[@, il=\E[%p1%dL, il1=\E[L, use=p8-w, + dch=\E[%p1%dP, dch1=\E[P, ich=\E[%p1%d@, ich1=\E[@, + use=ansi+idl, use=p8-w, # p12: Prism-12 in ANSI mode # --------------------------- @@ -19198,8 +19251,7 @@ act4|microterm|microterm act iv, # The act 5 has hardware tabs, but they are in columns 8, 16, 24, 32, 41 (!)... # (microterm5: removed obsolete ":ma==^Z^P^Xl^Kj:" -- esr) act5|microterm5|microterm act v, - kcub1=^H, kcud1=^K, kcuf1=^X, kcuu1=^Z, ri=\EH$<3>, uc=^H\EA, - use=act4, + ri=\EH$<3>, uc=^H\EA, use=act4, # Mimes using brightness for standout. Half bright is really dim unless # you turn up the brightness so far that lines show up on the screen. mime-fb|full bright mime1, @@ -19235,13 +19287,13 @@ mime2a|mime2a-v|microterm mime2a (emulating an enhanced VT52), bel=^G, clear=\EL, cr=\r, cub1=^H, cud1=\n, cuf1=\EC, cup=\EY%p1%{32}%+%c%p2%{32}%+%c, cuu1=\EA, dch1=^N, dl1=\027$<20*>, ed=\EQ$<20*>, el=\EP, home=\EH, ht=^I, - il1=\001$<20*>, ind=\n, ip=$<2>, is2=^Y, kcub1=\ED, - kcud1=\EB, kcuf1=\EC, kcuu1=\EA, ri=\EA, rmir=^Z, rmso=\E9, - rmul=\E5, smir=^O, smso=\E8, smul=\E4, + il1=\001$<20*>, ind=\n, ip=$<2>, is2=^Y, ri=\EA, rmir=^Z, + rmso=\E9, rmul=\E5, smir=^O, smso=\E8, smul=\E4, + use=vt52+arrows, # (mime3a: removed obsolete ":ma=^X ^K^J^Z^P:" -- esr) mime3a|mime1 emulating 3a, am@, - kcub1=^H, kcud1=^K, kcuf1=^X, kcuu1=^Z, use=adm3a, + kcud1=^K, kcuf1=^X, kcuu1=^Z, use=adm3a, mime3ax|mime-3ax|mime1 emulating enhanced 3a, it#8, dl1=\027$<80>, ed=^_, el=^X, ht=\011$<3>, il1=\001$<80>, @@ -19274,23 +19326,19 @@ mm340|mime340|mime 340, mt4520-rv|micro-term 4520 reverse video, am, hs, msgr, xenl, xon, cols#80, it#8, lines#24, wsl#80, - bel=^G, clear=\E[H\E[J, cnorm=\E[0V\E8, cr=\r, - csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=\E[D, - cud=\E[%p1%dB, cud1=\E[B, cuf=\E[%p1%dC, cuf1=\E[C, - cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, - cvvis=\E7\E[0U, dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, - dl1=\E[M, ed=\E[J, el=\E[K, flash=\E[?5l$<200/>\E[?5h, - fsl=\E[?5l\E[?5h, home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@, - ich1=\E[@, il=\E[%p1%dL, il1=\E[L, ind=\ED, + bel=^G, cnorm=\E[0V\E8, cr=\r, cup=\E[%i%p1%d;%p2%dH, + cvvis=\E7\E[0U, dch=\E[%p1%dP, dch1=\E[P, + flash=\E[?5l$<200/>\E[?5h, fsl=\E[?5l\E[?5h, home=\E[H, + ht=^I, hts=\EH, ich=\E[%p1%d@, ich1=\E[@, ind=\ED, is2=\E(B\E[2l\E>\E[20l\E[?3l\E[?5h\E[?7h\E[1;24r\E[24;1H\E[H \E[J, - kbs=^H, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, - kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, khome=\E[H, - ll=\E[24;1H, nel=\EE, rc=\E8, rf=/usr/share/tabset/vt100, - ri=\EM, rmam=\E[?7l, rmso=\E[0m, rmul=\E[24m, + kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, ll=\E[24;1H, nel=\EE, + rf=/usr/share/tabset/vt100, ri=\EM, rmam=\E[?7l, + rmso=\E[0m, rmul=\E[24m, rs1=\E(B\E[2l\E>\E[20l\E[?3l\E[?5h\E[?7h\E[H\E[J, - sc=\E7, sgr0=\E[m, smam=\E[?7h, smso=\E[7m, smul=\E[4m, - tbc=\E[g, tsl=\E[25;1H, + sgr0=\E[m, smam=\E[?7h, smso=\E[7m, smul=\E[4m, tbc=\E[g, + tsl=\E[25;1H, use=ansi+arrows, use=ansi+csr, + use=ansi+erase, use=ansi+idl, use=ansi+local, # Fri Aug 5 08:11:57 1983 # This entry works for the ergo 4000 with the following setups: @@ -19304,17 +19352,17 @@ mt4520-rv|micro-term 4520 reverse video, ergo4000|microterm ergo 4000, da, db, msgr, cols#80, lines#66, - bel=^G, clear=\E[H\E[2J$<80>, cr=\r, cub1=^H, cud1=\E[B, - cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, - dch1=\E[1P$<80>, dl1=\E[1M$<5*>, ed=\E[0J$<15>, - el=\E[0K$<13>, ht=^I, il1=\E[1L$<5*>, ind=\ED$<20*>, + bel=^G, clear=\E[H\E[2J$<80>, cr=\r, cub1=^H, + cup=\E[%i%p1%d;%p2%dH, dch1=\E[1P$<80>, dl1=\E[1M$<5*>, + ed=\E[0J$<15>, el=\E[0K$<13>, ht=^I, il1=\E[1L$<5*>, + ind=\ED$<20*>, is2=\E<\E=\E[?1l\E[?4l\E[?5l\E[?7h\E[?8h$<300>, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, lf1=pf1, lf2=pf2, lf3=pf3, lf4=pf4, ri=\EM$<20*>, rmam=\E[?7l, rmir=\E[4l, rmkx=\E=$<4>, rmso=\E[m$<20>, sgr0=\E[m$<20>, smam=\E[?7m, smir=\E[4h$<6>, smkx=\E=$<4>, - smso=\E[7m$<20>, + smso=\E[7m$<20>, use=ansi+local1, #### NCR # @@ -19409,8 +19457,7 @@ ncr260vt100an|NCR 2900/260 VT100 with ANSI keyboard, am, mir, msgr, xenl, xon, cols#80, lines#24, nlab#32, acsc=``aaffggjjkkllmmnnooqqssttuuvvwwxx~~, bel=^G, - blink=\E[5m, bold=\E[1m, clear=\E[2J\E[1;1H$<20>, - cr=\r$<1>, csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD$<5>, + clear=\E[2J\E[1;1H$<20>, cr=\r$<1>, cub=\E[%p1%dD$<5>, cub1=\E[D$<5>, cud=\E[%p1%dB$<5>, cud1=\E[B$<5>, cuf=\E[%p1%dC$<5>, cuf1=\E[C$<5>, cup=\E[%i%p1%d;%p2%dH$<10>, cuu=\E[%p1%dA$<5>, @@ -19419,22 +19466,23 @@ ncr260vt100an|NCR 2900/260 VT100 with ANSI keyboard, ed=\E[0J$<5>, el=\E[0K$<3>, el1=\E[1K$<3>, home=\E[H$<1>, hpa=\E[%p1%dG$<40>, ht=^I, hts=\EH, ich=\E[%p1%d@$<5>, il=\E[%p1%dL$<5>, il1=\E[L$<5>, ind=\ED$<5>, - indn=\E[%p1%dE$<5>, invis=\E[8m, + indn=\E[%p1%dE$<5>, is2=\E[!p\E[?7;19;67h\E[?1;3;4l\E(B\E)0\017\E[2J\E[1;1H\E>$< 200>, kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, - khlp=\E[28~, kich1=\E[2~, krdo=\E[29~, nel=\EE$<5>, rc=\E8, - rev=\E[7m, ri=\EM$<5>, rmacs=^O, rmir=\E[4l, - rmkx=\E[?1l\E>, rmso=\E[0m, rmul=\E[0m, + khlp=\E[28~, kich1=\E[2~, krdo=\E[29~, nel=\EE$<5>, + ri=\EM$<5>, rmacs=^O, rmir=\E[4l, rmkx=\E[?1l\E>, + rmso=\E[0m, rmul=\E[0m, rs2=\E[!p\E[?7;19;67h\E[?1;3;4l\E(B\E)0\017\E[2J\E[1;1H\E>$< 200>, - sc=\E7, sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5 %;%?%p7%t;8%;m%?%p9%t\016%e\017%;$<20>, sgr0=\E[0m\017$<20>, smacs=^N, smir=\E[4h, - smkx=\E[?1h\E=, smso=\E[1;7m, smul=\E[4m, tbc=\E[3g, - vpa=\E[%p1%dd$<40>, use=decid+cpr, use=vt220+vtedit, - use=vt220+cvis, use=vt220+keypad, use=ncr260vt+sl, + smkx=\E[?1h\E=, smso=\E[1;7m, tbc=\E[3g, + vpa=\E[%p1%dd$<40>, use=ansi+csr, use=ansi+sgrbold, + use=decid+cpr, use=vt220+vtedit, use=vt220+cvis, + use=vt220+keypad, use=ncr260vt+sl, + ncr260vt+sl|NCR 2900/260 VT100 status line, hs, dsl=\E[0$~\E[1$~, fsl=\E[0$}, tsl=\E[2$~\E[1$}, @@ -19447,15 +19495,11 @@ ncr260vt100wan|NCR 2900/260 VT100 wide mode ANSI keyboard, 200>, use=ncr260vt100an, ncr260vt100pp|NCR 2900/260 VT100 with PC+ keyboard, - is2=\E[!p\E[?7;19;67h\E[?1;3;4l\E(B\E)0\017\E[2J\E[1;1H\E>$< - 200>, ka1=\E[H, ka3=\EOu, kb2=\E[V, kc3=\E[U, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kdch1=\E[4~, - kend=\E[5~, khome=\E[2~, kich1=\E[1~, knp=\E[6~, kpp=\E[3~, - lf1=pf1, lf2=pf2, lf3=pf3, lf4=pf4, rmkx=\E>, - rs2=\E[!p\E[?7;19;67h\E[?1;3;4l\E(B\E)0\017\E[2J\E[1;1H\E>$< - 200>, - smkx=\E=, use=ncr260vt100an, + kend=\E[5~, khome=\E[2~, kich1=\E[1~, kpp=\E[3~, lf1=pf1, + lf2=pf2, lf3=pf3, lf4=pf4, rmkx=\E>, smkx=\E=, + use=ncr260vt100an, ncr260vt100wpp|NCR 2900/260 VT100 wide mode PC+ keyboard, cols#132, cup=\E[%i%p1%d;%p2%dH$<30>, @@ -19468,42 +19512,38 @@ ncr260vt200an|NCR 2900/260 VT200 with ANSI keyboard, am, mir, msgr, xenl, xon, cols#80, lines#24, nlab#32, acsc=``aaffggjjkkllmmnnooqqssttuuvvwwxx~~, bel=^G, - blink=\E[5m, bold=\E[1m, clear=\E[2J\E[1;1H$<20>, - cr=\r$<1>, csr=\E[%i%p1%d;%p2%dr$<5>, - cub=\E[%p1%dD$<5>, cub1=\E[D$<5>, cud=\E[%p1%dB$<5>, - cud1=\E[B$<5>, cuf=\E[%p1%dC$<5>, cuf1=\E[C$<5>, + clear=\E[2J\E[1;1H$<20>, cr=\r$<1>, + csr=\E[%i%p1%d;%p2%dr$<5>, cub=\E[%p1%dD$<5>, + cub1=\E[D$<5>, cud=\E[%p1%dB$<5>, cud1=\E[B$<5>, + cuf=\E[%p1%dC$<5>, cuf1=\E[C$<5>, cup=\E[%i%p1%d;%p2%dH$<10>, cuu=\E[%p1%dA$<5>, cuu1=\E[A$<5>, dch=\E[%p1%dP$<5>, dch1=\E[1P$<5>, dl=\E[%p1%dM$<5>, dl1=\E[M$<5>, ech=\E[%p1%dX$<5>, ed=\E[0J, el=\E[0K$<5>, el1=\E[1K$<5>, home=\E[H, hpa=\E[%p1%dG$<40>, ht=^I, hts=\EH, ich=\E[%p1%d@$<5>, il=\E[%p1%dL$<5>, il1=\E[L$<5>, ind=\ED$<5>, - indn=\E[%p1%dE$<5>, invis=\E[8m, + indn=\E[%p1%dE$<5>, is2=\E[!p\E[?7;19;67h\E[?1;3;4l\E(B\E)0\017\E[2J\E[1;1H\E>$< 200>, kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, - kf0=\EOy, kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, - kf13=\E[25~, kf14=\E[26~, kf15=\E[28~, kf16=\E[29~, - kf17=\E[31~, kf18=\E[32~, kf19=\E[33~, kf2=\EOQ, - kf20=\E[34~, kf21=\E[31~, kf22=\E[32~, kf23=\E[33~, + kf0=\EOy, kf21=\E[31~, kf22=\E[32~, kf23=\E[33~, kf24=\E[34~, kf25=\E[35~, kf26=\E[1~, kf27=\E[2~, - kf28=\E[3~, kf29=\E[4~, kf3=\EOR, kf30=\E[5~, kf31=\E[6~, - kf32=\E[7~, kf33=\E[8~, kf34=\E[9~, kf35=\E[10~, kf4=\EOS, - kf5=\E[M, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, - khlp=\E[28~, krdo=\E[29~, mc0=\E[i, mc4=\E[4i, mc5=\E[5i, - nel=\EE, rc=\E8, rev=\E[7m, ri=\EM$<5>, rmacs=\017$<20>, - rmam=\E[?7l, rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[27m, - rmul=\E[24m, + kf28=\E[3~, kf29=\E[4~, kf30=\E[5~, kf31=\E[6~, kf32=\E[7~, + kf33=\E[8~, kf34=\E[9~, kf35=\E[10~, kf5=\E[M, khlp=\E[28~, + krdo=\E[29~, mc0=\E[i, mc4=\E[4i, mc5=\E[5i, nel=\EE, rc=\E8, + ri=\EM$<5>, rmacs=\017$<20>, rmam=\E[?7l, rmir=\E[4l, + rmkx=\E[?1l\E>, rmso=\E[27m, rmul=\E[24m, rs2=\E[!p\E[?7;19;67h\E[?1;3;4l\E(B\E)0\017\E[2J\E[1;1H\E>$< 200>, sc=\E7, sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5 %;%?%p7%t;8%;m%?%p9%t\016%e\017%;$<20>, sgr0=\E[0m\017$<20>, smacs=\016$<20>, smam=\E[?7h, - smir=\E[4h, smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, - tbc=\E[3g, vpa=\E[%p1%dd$<40>, use=decid+cpr, + smir=\E[4h, smkx=\E[?1h\E=, tbc=\E[3g, + vpa=\E[%p1%dd$<40>, use=ansi+sgrbold, use=decid+cpr, use=vt220+vtedit, use=vt220+cvis, use=vt220+keypad, - use=ncr260vt+sl, + use=ncr260vt+sl, use=vt220+sfkeys, use=vt220+ufkeys, + ncr260vt200wan|NCR 2900/260 VT200 wide mode ANSI keyboard, cols#132, cup=\E[%i%p1%d;%p2%dH$<30>, @@ -19512,9 +19552,8 @@ ncr260vt200wan|NCR 2900/260 VT200 wide mode ANSI keyboard, ncr260vt200pp|NCR 2900/260 VT200 with PC+ keyboard, ka1=\E[H, ka3=\EOu, kb2=\E[V, kc3=\E[U, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kdch1=\E[4~, - kend=\E[1~, khome=\E[H, kich1=\E[2~, knp=\E[6~, kpp=\E[5~, - lf1=pf1, lf2=pf2, lf3=pf3, lf4=pf4, rmkx=\E>, smkx=\E=, - use=ncr260vt200an, + kend=\E[1~, khome=\E[H, lf1=pf1, lf2=pf2, lf3=pf3, lf4=pf4, + rmkx=\E>, smkx=\E=, use=ncr260vt200an, ncr260vt200wpp|NCR 2900/260 VT200 wide mode PC+ keyboard, cols#132, cup=\E[%i%p1%d;%p2%dH$<30>, @@ -19527,41 +19566,38 @@ ncr260vt300an|NCR 2900/260 VT300 with ANSI keyboard, am, mir, msgr, xenl, xon, cols#80, lines#24, nlab#32, acsc=``aaffggjjkkllmmnnooqqssttuuvvwwxx~~, bel=^G, - blink=\E[5m, bold=\E[1m, clear=\E[2J\E[1;1H$<20>, - cr=\r$<1>, csr=\E[%i%p1%d;%p2%dr$<5>, - cub=\E[%p1%dD$<5>, cub1=\E[D$<5>, cud=\E[%p1%dB$<5>, - cud1=\E[B$<5>, cuf=\E[%p1%dC$<5>, cuf1=\E[C$<5>, + clear=\E[2J\E[1;1H$<20>, cr=\r$<1>, + csr=\E[%i%p1%d;%p2%dr$<5>, cub=\E[%p1%dD$<5>, + cub1=\E[D$<5>, cud=\E[%p1%dB$<5>, cud1=\E[B$<5>, + cuf=\E[%p1%dC$<5>, cuf1=\E[C$<5>, cup=\E[%i%p1%d;%p2%dH$<10>, cuu=\E[%p1%dA$<5>, cuu1=\E[A$<5>, dch=\E[%p1%dP$<5>, dch1=\E[1P$<5>, dl=\E[%p1%dM$<5>, dl1=\E[M$<5>, ech=\E[%p1%dX$<5>, ed=\E[0J, el=\E[0K$<5>, el1=\E[1K$<5>, home=\E[H, hpa=\E[%p1%dG$<40>, ht=^I, hts=\EH, ich=\E[%p1%d@$<5>, il=\E[%p1%dL$<5>, il1=\E[L$<5>, ind=\ED$<5>, - indn=\E[%p1%dE$<5>, invis=\E[8m, + indn=\E[%p1%dE$<5>, is2=\E[!p\E[?7;19;67h\E[?1;3;4l\E[1;0%w\E(B\E)0\017\E[2J\E[1 ;1H\E>$<200>, kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, - kf0=\EOy, kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, - kf13=\E[25~, kf14=\E[26~, kf15=\E[28~, kf16=\E[29~, - kf17=\E[31~, kf18=\E[32~, kf19=\E[33~, kf20=\E[34~, - kf21=\E[31~, kf22=\E[32~, kf23=\E[33~, kf24=\E[34~, - kf25=\E[35~, kf26=\E[1~, kf27=\E[2~, kf28=\E[3~, - kf29=\E[4~, kf30=\E[5~, kf31=\E[6~, kf32=\E[7~, kf33=\E[8~, - kf34=\E[9~, kf35=\E[10~, kf5=\E[M, kf6=\E[17~, kf7=\E[18~, - kf8=\E[19~, kf9=\E[20~, khlp=\E[28~, krdo=\E[29~, mc0=\E[i, - mc4=\E[4i, mc5=\E[5i, nel=\EE, rc=\E8, rev=\E[7m, ri=\EM$<5>, - rmacs=\017$<20>, rmam=\E[?7l, rmir=\E[4l, rmkx=\E[?1l\E>, - rmso=\E[27m, rmul=\E[24m, + kf0=\EOy, kf21=\E[31~, kf22=\E[32~, kf23=\E[33~, + kf24=\E[34~, kf25=\E[35~, kf26=\E[1~, kf27=\E[2~, + kf28=\E[3~, kf29=\E[4~, kf30=\E[5~, kf31=\E[6~, kf32=\E[7~, + kf33=\E[8~, kf34=\E[9~, kf35=\E[10~, kf5=\E[M, khlp=\E[28~, + krdo=\E[29~, mc0=\E[i, mc4=\E[4i, mc5=\E[5i, nel=\EE, rc=\E8, + ri=\EM$<5>, rmacs=\017$<20>, rmam=\E[?7l, rmir=\E[4l, + rmkx=\E[?1l\E>, rmso=\E[27m, rmul=\E[24m, rs2=\E[!p\E[?7;19;67h\E[?1;3;4l\E[1;0%w\E(B\E)0\017\E[2J\E[1 ;1H\E>$<200>, sc=\E7, sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5 %;%?%p7%t;8%;m%?%p9%t\016%e\017%;$<20>, sgr0=\E[0m\017$<20>, smacs=\016$<20>, smam=\E[?7h, - smir=\E[4h, smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, - tbc=\E[3g, vpa=\E[%p1%dd$<40>, use=decid+cpr, + smir=\E[4h, smkx=\E[?1h\E=, tbc=\E[3g, + vpa=\E[%p1%dd$<40>, use=ansi+sgrbold, use=decid+cpr, use=vt220+vtedit, use=vt220+cvis, use=vt220+keypad, - use=ncr260vt+sl, + use=ncr260vt+sl, use=vt220+sfkeys, use=vt220+ufkeys, + ncr260vt300wan|NCR 2900/260 VT300 wide mode ANSI keyboard, cols#132, cup=\E[%i%p1%d;%p2%dH$<30>, @@ -19573,9 +19609,8 @@ ncr260vt300wan|NCR 2900/260 VT300 wide mode ANSI keyboard, ncr260vt300pp|NCR 2900/260 VT300 with PC+ keyboard, ka1=\E[H, ka3=\EOu, kb2=\E[V, kc3=\E[U, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kdch1=\E[4~, - kend=\E[1~, khome=\E[H, kich1=\E[2~, knp=\E[6~, kpp=\E[5~, - lf1=pf1, lf2=pf2, lf3=pf3, lf4=pf4, rmkx=\E>, smkx=\E=, - use=ncr260vt300an, + kend=\E[1~, khome=\E[H, lf1=pf1, lf2=pf2, lf3=pf3, lf4=pf4, + rmkx=\E>, smkx=\E=, use=ncr260vt300an, ncr260vt300wpp|NCR260VT300WPP|NCR 2900/260 VT300 wide mode PC+ keyboard, cols#132, cup=\E[%i%p1%d;%p2%dH$<30>, @@ -19661,31 +19696,14 @@ ncr260wy325wpp|NCR 2900/260 Wyse 325 wide mode, # have it included, Un-comment it and recompile (using 'tic'). # ncr260wy350pp|NCR 2900/260 Wyse 350, - am, bw, km, mc5i, mir, msgr, xon, - colors#16, cols#80, lines#24, ncv#33, nlab#32, pairs#16, xmc#1, - acsc=07a?h;j5k3l2m1n8q:t4u9v=w0x6, bel=^G, blink=\EG2, - cbt=\EI, civis=\E`0, clear=\E+$<20>, cnorm=\E`1, cr=\r, - cub1=\010$<5>, cud1=\n$<5>, cuf1=\014$<5>, - cup=\E=%p1%{32}%+%c%p2%{32}%+%c$<40>, cuu1=\013$<5>, - cvvis=\E`5, dch1=\EW$<50>, dim=\EGp, dl1=\ER$<5>, - ed=\Ey$<5>, el=\Et$<5>, home=\036$<10>, ht=^I, hts=\E1, - il1=\EE$<5>, ind=\n$<5>, invis=\EG1, + colors#16, ncv#33, pairs#16, + acsc=07a?h;j5k3l2m1n8q:t4u9v=w0x6, cbt=\EI, + cup=\E=%p1%{32}%+%c%p2%{32}%+%c$<40>, ed=\Ey$<5>, + el=\Et$<5>, ht=^I, hts=\E1, is2=\Ee6\Ed/\Ee1\Ed*\Er\EO\E`1\E`:\E`@\E~!\E"\Ee4\Ex@\E`9 \Ee7$<100>, - kDC=\ER, kEND=\EY, kHOM=\E{, kPRT=\E7, kRIT=^L, ka1=^^, kbs=^H, - kc1=\ET, kc3=\EK, kcbt=\EI, kcub1=^H, kcud1=\n, kcuf1=^L, - kcuu1=^K, kdch1=\EW, kend=\ET, kf1=^A@\r, kf10=^AI\r, - kf11=^AJ\r, kf12=^AK\r, kf13=^AL\r, kf14=^AM\r, kf15=^AN\r, - kf16=^AO\r, kf17=^A`\r, kf18=^Aa\r, kf19=^Ab\r, kf2=^AA\r, - kf20=^Ac\r, kf21=^Ad\r, kf22=^Ae\r, kf23=^Af\r, kf24=^Ag\r, - kf25=^Ah\r, kf26=^Ai\r, kf27=^Aj\r, kf28=^Ak\r, kf29=^Al\r, - kf3=^AB\r, kf30=^Am\r, kf31=^An\r, kf32=^Ao\r, kf4=^AC\r, - kf5=^AD\r, kf6=^AE\r, kf7=^AF\r, kf8=^AG\r, kf9=^AH\r, - khome=^^, kich1=\Eq, knp=\EK, kpp=\EJ, kprt=\EP, - mc0=\EP$<10>, mc4=^T, mc5=^R, mrcup=\Ew@%p1%{48}%+%c%p2%{32}%+%c%p3%{32}%+%c$<20>, - nel=\037$<5>, rev=\EG4, ri=\Ej$<5>, rmacs=\EH\003\EcB0, - rmam=\Ed., rmir=\Er, rmso=\EG0, rmul=\EG0, rmxon=\Ec20, + rmacs=\EH\003\EcB0, rs2=\Ee6\Ed/\Ee1\Ed*\Er\EO\E`1\E`:\E`@\E~!\E"\Ee4\Ex@\E`9 \Ee7$<100>, setb=\s, @@ -19695,9 +19713,8 @@ ncr260wy350pp|NCR 2900/260 Wyse 350, %e%p1%{9}%=%t%{98}%e%p1%{10}%=%t%{99}%e%p1%{11}%=%t %{101}%e%p1%{12}%=%t%{106}%e%p1%{13}%=%t%{110}%e%p1 %{14}%=%t%{111}%e%p1%{15}%=%t%{56}%;\Em0%c$<100>, - sgr0=\EG0\EH\003\EcD, smacs=\EH\002\EcB1, smam=\Ed/, - smir=\Eq, smso=\EGt, smul=\EG8, smxon=\Ec21, tbc=\E0, - use=ncr260vp+sl, + sgr0=\EG0\EH\003\EcD, smacs=\EH\002\EcB1, tbc=\E0, + use=ncr260vp+sl, use=ncr160wy50+pp, ncr260wy350wpp|NCR 2900/260 Wyse 350 wide mode, cols#132, cup=\Ea%i%p1%dR%p2%dC$<30>, @@ -19831,26 +19848,24 @@ ncr160wy60pp|NCR 2900/160 Wyse 60, ncr160wy60wpp|NCR 2900/160 Wyse 60 wide mode, use=ncr260wy60wpp, ncrvt100an|ncrvt100pp|NCR VT100 for the 2900 terminal, - am, hs, mc5i, mir, msgr, xon, - cols#80, it#8, lines#24, nlab#32, + hs, mc5i, mir, xon, + nlab#32, acsc=``aaffgghhiijjkkllmmnnqqttuuvvwwxxyyzz~~, - bel=^G, blink=\E[5m$<30>, bold=\E[1m$<30>, - clear=\E[2J\E[1;1H$<300>, cr=\r, + blink=\E[5m$<30>, bold=\E[1m$<30>, + clear=\E[2J\E[1;1H$<300>, csr=\E[%i%p1%d;%p2%dr$<100>, cub=\E[%p1%dD$<30>, cub1=\E[D$<2>, cud=\E[%p1%dB$<30>, cud1=\E[B$<2>, - cuf=\E[%p1%dC$<30>, cuf1=\E[C$<2>, - cup=\E[%i%p1%d;%p2%dH$<100>, cuu=\E[%p1%dA$<30>, - cuu1=\E[A$<2>, dch=\E[%p1%dP$<40>, dch1=\E[1P$<10>, - dl=\E[%p1%dM$<70>, dl1=\E[M$<40>, dsl=\E[31l$<25>, - ed=\E[0J$<300>, el=\E[0K$<30>, el1=\E[1K$<30>, - enacs=\E(B\E)0$<40>, fsl=1$<10>, home=\E[H$<2>$<80>, - ht=^I, hts=\EH, il=\E[%p1%dL$<80>, il1=\E[B\E[L$<80>, - ind=\ED, + cuf=\E[%p1%dC$<30>, cup=\E[%i%p1%d;%p2%dH$<100>, + cuu=\E[%p1%dA$<30>, dch=\E[%p1%dP$<40>, + dch1=\E[1P$<10>, dl=\E[%p1%dM$<70>, dl1=\E[M$<40>, + dsl=\E[31l$<25>, ed=\E[0J$<300>, el=\E[0K$<30>, + el1=\E[1K$<30>, enacs=\E(B\E)0$<40>, fsl=1$<10>, + home=\E[H$<2>$<80>, il=\E[%p1%dL$<80>, + il1=\E[B\E[L$<80>, ind=\ED, is2=\E[12h\E[?10l\E%/0n\E[P\031\E[?3l\E(B\E)0$<200>, - kLFT=\E[D, kRIT=\E[C, ka1=\E[H, kbs=^H, kcub1=\E[D, - kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kent=\r, kf1=\EOP, - kf2=\EOQ, kf3=\EOR, kf4=\EOS, mc0=\E[i$<100>, nel=\EE, - rc=\E8, rev=\E[7m$<30>, ri=\EM$<50>, rmacs=\017$<90>, + kLFT=\E[D, kRIT=\E[C, ka1=\E[H, kent=\r, kf1=\EOP, kf2=\EOQ, + kf3=\EOR, kf4=\EOS, mc0=\E[i$<100>, nel=\EE, rc=\E8, + rev=\E[7m$<30>, ri=\EM$<50>, rmacs=\017$<90>, rmir=\E[4l$<80>, rmso=\E[0m$<30>, rmul=\E[0m$<30>, rs2=\Ec\E[12;31h\E[?3;4;5;10l\E[?6;7;19;25h\E[33;34l\E[0m\E( B\E)0\E%/0n\E[P\031$<200>, @@ -19859,7 +19874,7 @@ ncrvt100an|ncrvt100pp|NCR VT100 for the 2900 terminal, %p3%|%t;7%;%?%p4%t;5%;m$<120>, sgr0=\017\E[0m$<120>, smacs=\016$<90>, smir=\E[4h$<80>, smso=\E[7m$<30>, smul=\E[4m$<30>, tbc=\E[3g$<40>, - tsl=\E[>+1$<70>, use=decid+cpr, + tsl=\E[>+1$<70>, use=decid+cpr, use=vt100+4bsd, ncrvt100wan|NCRVT100WPP|ncrvt100wpp|NCR VT100 emulation of the 2900 terminal, cols#132, is2=\E[12h\E[?10l\E%/0n\E[P\031\E[?3h\E(B\E)0$<200>, @@ -19939,10 +19954,9 @@ ncr7900iv|NCR 7900 model 4, bel=^G, clear=^L, cr=\r, cub1=^H, cud1=\n, cup=\013%p1%{64}%+%c\E\005%p2%02d, dl1=\E^O, dsl=\Ey1, fsl=\Ek\Ey5, home=\013@\E^E00, il1=\E^N, ind=\n, kbs=^H, - kcub1=\ED, kcud1=\EB, kcuf1=\EC, kcuu1=\EA, kf1=\ES, kf2=\ET, - kf3=\EU, kf4=\EV, kf5=\EW, kf6=\EP, kf7=\EQ, kf8=\ER, - khome=\EH, lf6=blue, lf7=red, lf8=white, nel=\r\n, - tsl=\Ej\Ex5\Ex1\EY8%p1%{32}%+%c\Eo, + kf1=\ES, kf2=\ET, kf3=\EU, kf4=\EV, kf5=\EW, kf6=\EP, kf7=\EQ, + kf8=\ER, khome=\EH, lf6=blue, lf7=red, lf8=white, nel=\r\n, + tsl=\Ej\Ex5\Ex1\EY8%p1%{32}%+%c\Eo, use=vt52+arrows, # Warning: This terminal will lock out the keyboard when it receives a CTRL-D. # The user can enter a CTRL-B to get out of this locked state. # In , we want to output the character given by the formula: @@ -20026,7 +20040,7 @@ ndr9500-mc|NDR 9500 with magic cookies (enables underline inverse video invisibl blink=\EG2, invis=\EG1, rev=\EG4, rmso=\EG0, rmul=\EG0, sgr=\E%%\E(%?%p5%p8%|%t\E)%;%?%p9%t\E$%;\EG%{48}%?%p7%t%{1} %+%;%?%p4%t%{2}%+%;%?%p3%p1%|%t%{4}%+%;%?%p2%t%{8}%+%;%c, - sgr0=\EG0\E%%\E(, smso=\EG4, smul=\EG8, use=ndr9500, + smso=\EG4, smul=\EG8, use=ndr9500, ndr9500-25-mc|NDR 500 with 25 lines and magic cookies, lines#25, use=ndr9500-mc, @@ -20109,18 +20123,16 @@ uts30|Sperry UTS30 with cp/m@1R1, acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, bel=^G, blink=\E[5m, bold=\E[1m, civis=\ER, clear=^L, cnorm=\ES, cr=\r, csr=\EU%p1%{32}%+%c%p2%{32}%+%c, - cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\E[B, - cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, - cuu=\E[%p1%dA, cuu1=\E[A, dch=\E[%p1%dP, dch1=\EM, - dl=\E[%p1%dM, dl1=\EL, ed=\E[J, el=\E[K, fsl=\r, home=\E[H, - ht=^I, ich=\E[%p1%d@, ich1=\EO, il=\E[%p1%dL, il1=\EN, - ind=\n, indn=\E[%p1%dB, is2=\E[U 7\E[24;1H, kbs=^H, - kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, khome=\E[H, - rc=\EX, rev=\E[7m, rf=/usr/share/tabset/vt100, ri=\EI, - rin=\E[%p1%dA, rmacs=\Ed, rmam=\E[?7l, rmso=\E[m, - rmul=\E[m, rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, - sc=\EW, sgr0=\E[m, smacs=\EF, smam=\E[?7m, smso=\E[7m, - smul=\E[4m, tsl=\E], uc=\EPB, + cub1=^H, dch=\E[%p1%dP, dch1=\EM, dl=\E[%p1%dM, dl1=\EL, + fsl=\r, ht=^I, ich=\E[%p1%d@, ich1=\EO, il=\E[%p1%dL, + il1=\EN, ind=\n, indn=\E[%p1%dB, is2=\E[U 7\E[24;1H, + khome=\E[H, rc=\EX, rev=\E[7m, + rf=/usr/share/tabset/vt100, ri=\EI, rin=\E[%p1%dA, + rmacs=\Ed, rmam=\E[?7l, + rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, sc=\EW, + sgr0=\E[m, smacs=\EF, smam=\E[?7m, tsl=\E], uc=\EPB, + use=ansi+apparrows, use=ansi+cup, use=ansi+erase, + use=ansi+local, use=ansi+sgrso, use=ansi+sgrul, #### Tandem # @@ -20157,44 +20169,42 @@ dmterm|deskmate terminal, bel=^G, civis=\EG5, clear=\Ej, cnorm=\EG6, cr=\r, cub1=^H, cud1=\EB, cuf1=\EC, cup=\EY%p1%{32}%+%c%p2%{32}%+%c, cuu1=\EA, dch1=\ES, dl1=\ER, ed=\EJ, el=\EK, home=\EH, ht=^I, - ich1=\EQ, il1=\EP, ind=\EX, invis@, kcub1=\ED, kcud1=\EB, - kcuf1=\EC, kcuu1=\EA, kf0=\E1, kf1=\E2, kf2=\E3, kf3=\E4, - kf4=\E5, kf5=\E6, kf6=\E7, kf7=\E8, kf8=\E9, kf9=\E0, + ich1=\EQ, il1=\EP, ind=\EX, invis@, kf0=\E1, kf1=\E2, kf2=\E3, + kf3=\E4, kf4=\E5, kf5=\E6, kf6=\E7, kf7=\E8, kf8=\E9, kf9=\E0, khome=\EH, lf0=f1, lf1=f2, lf2=f3, lf3=f4, lf4=f5, lf5=f6, lf6=f7, lf7=f8, lf8=f9, lf9=f10, ll=\EE, rmul@, smul@, - use=adm+sgr, + use=adm+sgr, use=vt52+arrows, dt100|dt-100|Tandy DT-100 terminal, xon, cols#80, lines#24, xmc#1, acsc=jjkkllmmnnqqttuuvvwwxx, bel=^G, clear=\E[H\E[2J, - cr=\r, csr=\E[%p1%2d;%p2%2dr, cub1=^H, cud1=\E[B, - cuf1=\E[C, cup=\010\E[%i%p1%d;%p2%dH, cuu1=\E[A, - dch1=\E[P, dl1=\E[M, ed=\E[J, el=\E[K, home=\E[H, ht=^I, - ich1=\E[@, il1=\E[L, ind=\n, is2=\E[?3l\E)0\E(B, - kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf1=\E[?3i, - kf10=\E[?5i, kf2=\E[2i, kf3=\E[@, kf4=\E[M, kf5=\E[17~, - kf6=\E[18~, kf7=\E[19~, kf8=\E[20~, kf9=\E[21~, khome=\E[H, - knp=\E[29~, kpp=\E[28~, lf1=f1, lf2=f2, lf3=f3, lf4=f4, lf5=f5, - lf6=f6, lf7=f7, lf8=f8, ri=\EM, rmacs=^O, rmso=\E[m, rmul=\E[m, - sgr0=\E[m, smacs=^N, smso=\E[7m, smul=\E[4m, - use=vt220+cvis, + cr=\r, csr=\E[%p1%2d;%p2%2dr, cub1=^H, + cup=\010\E[%i%p1%d;%p2%dH, dch1=\E[P, dl1=\E[M, ed=\E[J, + el=\E[K, home=\E[H, ht=^I, ich1=\E[@, il1=\E[L, ind=\n, + is2=\E[?3l\E)0\E(B, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, + kcuu1=\E[A, kf1=\E[?3i, kf10=\E[?5i, kf2=\E[2i, kf3=\E[@, + kf4=\E[M, kf5=\E[17~, kf6=\E[18~, kf7=\E[19~, kf8=\E[20~, + kf9=\E[21~, khome=\E[H, knp=\E[29~, kpp=\E[28~, lf1=f1, + lf2=f2, lf3=f3, lf4=f4, lf5=f5, lf6=f6, lf7=f7, lf8=f8, ri=\EM, + rmacs=^O, rmso=\E[m, rmul=\E[m, sgr0=\E[m, smacs=^N, + smso=\E[7m, smul=\E[4m, use=ansi+local1, use=vt220+cvis, dt100w|dt-100w|Tandy DT-100 terminal (wide mode), cols#132, use=dt100, dt110|Tandy DT-110 emulating ANSI, xon, cols#80, lines#24, acsc=jjkkllmmnnqqttuuvvwwxx, bel=^G, clear=\E[H\E[2J, - cr=\r, csr=\E[%i%p1%d;%p2%dr, cub1=^H, cud1=\E[B, - cuf1=\E[C, cup=\010\E[%i%p1%d;%p2%dH, cuu1=\E[A, - dch1=\E[0P, dl1=\E[0M, ed=\E[0J, el=\E[0K, enacs=\E(B\E)0, - home=\E[H, ht=^I, ich1=\E[0@, il1=\E[0L, ind=\n, - is2=\E[?3l\E)0\E(B, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, - kcuu1=\E[A, kend=\E[K, kf1=\E[1~, kf10=\E[10~, kf2=\E[2~, - kf3=\E[3~, kf4=\E[4~, kf5=\E[5~, kf6=\E[6~, kf7=\E[7~, - kf8=\E[8~, kf9=\E[9~, khome=\E[G, kich1=\E[@, knp=\E[26~, - kpp=\E[25~, lf0=f1, lf1=f2, lf2=f3, lf3=f4, lf4=f5, lf5=f6, - lf6=f7, lf7=f8, lf8=f9, lf9=f10, ri=\EM, rmacs=^O, rmso=\E[m, - rmul=\E[m, sgr0=\E[m, smacs=^N, smso=\E[7m, smul=\E[4m, + cr=\r, csr=\E[%i%p1%d;%p2%dr, cub1=^H, + cup=\010\E[%i%p1%d;%p2%dH, dch1=\E[0P, dl1=\E[0M, + ed=\E[0J, el=\E[0K, enacs=\E(B\E)0, home=\E[H, ht=^I, + ich1=\E[0@, il1=\E[0L, ind=\n, is2=\E[?3l\E)0\E(B, + kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kend=\E[K, + kf1=\E[1~, kf10=\E[10~, kf2=\E[2~, kf3=\E[3~, kf4=\E[4~, + kf5=\E[5~, kf6=\E[6~, kf7=\E[7~, kf8=\E[8~, kf9=\E[9~, + khome=\E[G, kich1=\E[@, knp=\E[26~, kpp=\E[25~, lf0=f1, + lf1=f2, lf2=f3, lf3=f4, lf4=f5, lf5=f6, lf6=f7, lf7=f8, lf8=f9, + lf9=f10, ri=\EM, rmacs=^O, rmso=\E[m, rmul=\E[m, sgr0=\E[m, + smacs=^N, smso=\E[7m, smul=\E[4m, use=ansi+local1, use=vt220+cvis, pt210|TRS-80 PT-210 printing terminal, hc, os, @@ -20357,25 +20367,13 @@ tek4105|Tektronix 4105, # (tek4105-30: I added / based on the init string -- esr) tek4105-30|Tektronix 4015 emulating 30 line VT100, - am, mir, msgr, xenl, xon, - cols#80, it#8, lines#30, vt#3, - acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, - bel=^G, blink=\E[5m$<2>, bold=\E[1m$<2>, - clear=\E[H\E[J$<50>, cr=\r, csr=\E[%i%p1%d;%p2%dr, - cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\n, - cuf=\E[%p1%dC, cuf1=\E[C$<2>, - cup=\E[%i%p1%d;%p2%dH$<5>, cuu=\E[%p1%dA, - cuu1=\E[A$<2>, ed=\E[J$<50>, el=\E[K$<3>, el1=\E[1K$<3>, - enacs=\E(B\E)0, home=\E[H, ht=^I, hts=\EH, ind=\n, kbs=^H, - kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, rc=\E8, - rev=\E[7m$<2>, ri=\EM$<5>, rmacs=^O, rmam=\E[?7l, - rmkx=\E[?1l\E>, rmso=\E[m$<2>, rmul=\E[m$<2>, - rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, sc=\E7, - sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5 - %;m%?%p9%t\016%e\017%;$<2>, - sgr0=\E[m\017$<2>, smacs=^N, smam=\E[?7h, smkx=\E[?1h\E=, - smso=\E[1;7m$<2>, smul=\E[4m$<2>, tbc=\E[3g, - use=vt100+fnkeys, + mir, xenl, xon, + lines#30, vt#3, + cub1=^H, cud1=\n, cuf1=\E[C$<2>, cuu1=\E[A$<2>, kcub1=\EOD, + kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, rmam=\E[?7l, + rmkx=\E[?1l\E>, rmso=\E[m$<2>, smam=\E[?7h, + smkx=\E[?1h\E=, use=ansi+csr, use=ansi+local, + use=vt100+4bsd, use=vt100+fnkeys, # Tektronix 4105 from BRL # The following setup modes are assumed for normal operation: @@ -20400,30 +20398,26 @@ tek4105-30|Tektronix 4015 emulating 30 line VT100, # "tek4105a" is just a guess: tek4105a|Tektronix 4105 (BRL), OTbs, OTpt, msgr, xon, - OTkn#8, cols#80, it#8, lines#30, vt#3, - acsc=, bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, - civis=\E%!0\ETD00\E%!1, clear=\E[H\E[J, - cnorm=\E%!0\ETD10\E%!1, cr=\r, csr=\E[%i%p1%d;%p2%dr, - cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\n, - cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, - cuu=\E[%p1%dA, cuu1=\EM, cvvis=\E%!0\ETD70\E%!1, - dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M, - ech=\E[%p1%dX, ed=\E[J, el=\E[K, home=\E[H, ht=^I, hts=\EH, - il=\E[%p1%dL, il1=\E[L, ind=\n, is2=\E%!1, kbs=^H, + OTkn#8, cols#80, lines#30, vt#3, + acsc=, bel=^G, blink=\E[5m, bold=\E[1m, + civis=\E%!0\ETD00\E%!1, cnorm=\E%!0\ETD10\E%!1, cr=\r, + cub1=^H, cud1=\n, cup=\E[%i%p1%d;%p2%dH, cuu1=\EM, + cvvis=\E%!0\ETD70\E%!1, dch=\E[%p1%dP, dch1=\E[P, + ech=\E[%p1%dX, home=\E[H, ind=\n, is2=\E%!1, kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kf0=\EOA, kf1=\EOB, kf2=\EOC, kf3=\EOD, kf4=\EOP, kf5=\EOQ, kf6=\EOR, kf7=\EOS, lf0=F1, lf1=F2, lf2=F3, lf3=F4, lf4=F5, lf5=F6, lf6=F8, - ll=\E[30;H, nel=\EE, rc=\E8, rev=\E[7m, ri=\EM, rmacs=^O, + ll=\E[30;H, nel=\EE, rev=\E[7m, ri=\EM, rmacs=^O, rmcup=\E%!0\ELBH=\E%!1, rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[m, rmul=\E[m, rs2=\030\E%!0\EKC\E\014\EKR0\EKF0\ENM0\ELBH=\ETF8000010F40 \ELI100\ELLA>\ELM0\EKE0\ENF1\EKS0\END0\E%!1\Ec\E[?3;5l \E[?7;8h\E[r\E[m\E>, - sc=\E7, sgr0=\E[m, smacs=^N, smcup=\E[?6l, smir=\E[4h, - smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, tbc=\E[3g, - use=ecma+index, + sgr0=\E[m, smacs=^N, smcup=\E[?6l, smir=\E[4h, + smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, use=ansi+csr, + use=ansi+erase, use=ansi+idl, use=ansi+inittabs, + use=ansi+local, use=ecma+index, -# # Tektronix 4106/4107/4109 from BRL # The following setup modes are assumed for normal operation: # CODE ansi COLUMNMODE 80 CRLF no @@ -20447,28 +20441,25 @@ tek4105a|Tektronix 4105 (BRL), # "IC" cannot be used in combination with "im" & "ei". tek4106brl|tek4107brl|tek4109brl|Tektronix 4106 4107 or 4109, msgr, xon, - cols#80, it#8, lines#32, vt#3, - acsc=, bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, - civis=\E%!0\ETD00\E%!1, clear=\E[H\E[J, - cnorm=\E%!0\ETD10\E%!1, cr=\r, csr=\E[%i%p1%d;%p2%dr, - cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\n, - cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, - cuu=\E[%p1%dA, cuu1=\EM, cvvis=\E%!0\ETD70\E%!1, - dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M, - ech=\E[%p1%dX, ed=\E[J, el=\E[K, home=\E[H, ht=^I, hts=\EH, - il=\E[%p1%dL, il1=\E[L, ind=\n, is2=\E%!1, kbs=^H, + cols#80, lines#32, vt#3, + acsc=, bel=^G, blink=\E[5m, bold=\E[1m, + civis=\E%!0\ETD00\E%!1, cnorm=\E%!0\ETD10\E%!1, cr=\r, + cub1=^H, cud1=\n, cup=\E[%i%p1%d;%p2%dH, cuu1=\EM, + cvvis=\E%!0\ETD70\E%!1, dch=\E[%p1%dP, dch1=\E[P, + ech=\E[%p1%dX, home=\E[H, ind=\n, is2=\E%!1, kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kf0=\EOA, kf1=\EOB, kf2=\EOC, kf3=\EOD, kf4=\EOP, kf5=\EOQ, kf6=\EOR, kf7=\EOS, lf0=F1, lf1=F2, lf2=F3, lf3=F4, lf4=F5, lf5=F6, lf6=F8, - ll=\E[32;H, nel=\EE, rc=\E8, rev=\E[7m, ri=\EM, rmacs=^O, + ll=\E[32;H, nel=\EE, rev=\E[7m, ri=\EM, rmacs=^O, rmcup=\E%!0\ELBH=\E%!1, rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[m, rmul=\E[m, rs1=\030\E%!0\EKC\E\014\EKR0\EKF0\ENM0\ELBH=\ETF8000010F40 \ELI100\ELLB0\ELM0\EKE0\ENF1\EKS0\END0\ERE0\E%!1\Ec\E[?3 ;5l\E[?7;8h\E[r\E[m\E>, - sc=\E7, sgr0=\E[m, smacs=^N, smcup=\E[?6l, smir=\E[4h, - smkx=\E[?1h\E=, smso=\E[7;42m, smul=\E[4m, tbc=\E[3g, - use=ecma+index, + sgr0=\E[m, smacs=^N, smcup=\E[?6l, smir=\E[4h, + smkx=\E[?1h\E=, smso=\E[7;42m, smul=\E[4m, use=ansi+csr, + use=ansi+erase, use=ansi+idl, use=ansi+inittabs, + use=ansi+local, use=ecma+index, # Refer to: # TEK Programmer's Reference @@ -20496,13 +20487,12 @@ tek4107|tek4109|Tektronix terminals 4107 4109, cub1=^H, cud1=\n, cuf1=\EC, cup=\EY%p1%{32}%+%c%p2%{32}%+%c, cuu1=\EA, cvvis=\E%!3, dim=\E%!1\E[<0m$<2>\E%!0, ed=\EJ, el=\EK, ht=^I, ind=\n, - kbs=^H, kcub1=\ED, kcud1=\EB, kcuf1=\EC, kcuu1=\EA, - rev=\E%!1\E[7m$<2>\E%!0, ri=\EI, + kbs=^H, rev=\E%!1\E[7m$<2>\E%!0, ri=\EI, rmso=\E%!1\E[m$<2>\E%!0, rmul=\E%!1\E[m$<2>\E%!0, sgr=\E%%!1\E[%?%p1%t;7;5%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%; %?%p5%t<0%;%?%p6%t;1%;m$<2>\E%%!0, sgr0=\E%!1\E[m$<2>\E%!0, smso=\E%!1\E[7;5m$<2>\E%!0, - smul=\E%!1\E[4m$<2>\E%!0, + smul=\E%!1\E[4m$<2>\E%!0, use=vt52+arrows, # Tektronix 4207 with sysline. In the ancestral termcap file this was 4107-s; # see the note attached to tek4207. tek4207-s|Tektronix 4207 with sysline but no memory, @@ -20579,34 +20569,27 @@ otek4115|Tektronix 4115 (old), OTbs, am, da, db, eo, cols#80, it#8, lines#34, cbt=\E[Z, clear=\E[H\E[2J, - cnorm=\E%!0\ELBG8\E%!1\E[34;1H, cub1=\E[D, cud1=\E[B, - cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, - cvvis=\E%!0\ELBB2\E%!1, dch1=\E[P, dl1=\E[M, ed=\E[J, - el=\E[K, home=\E[H, ht=^I, if=/usr/share/tabset/vt100, - il1=\E[L, + cnorm=\E%!0\ELBG8\E%!1\E[34;1H, + cup=\E[%i%p1%d;%p2%dH, cvvis=\E%!0\ELBB2\E%!1, + dch1=\E[P, dl1=\E[M, ed=\E[J, el=\E[K, home=\E[H, ht=^I, + if=/usr/share/tabset/vt100, il1=\E[L, is2=\E%!0\E%\014\ELV0\EKA1\ELBB2\ENU@=\ELLB2\ELM0\ELV1\EKYA? \E%!1\E[<1l\E[?7h\E[?8h\E[34;1H\E[34B\E[m, kbs=^H, ri=\EM, rmam=\E[?7l, rmcup=\E%!0\ELBG8\E%!1\E[34;1H\E[J, rmir=\E[4l, rmkx=\E>, rmso=\E[m, rmul=\E[m, sgr0=\E[m, smam=\E[?7h, smcup=\E%!0\ELBB2\E%!1, smir=\E[4h, smkx=\E=, smso=\E[7m, - smul=\E[4m, + smul=\E[4m, use=ansi+local1, tek4115|Tektronix 4115 entry with more ANSI capabilities (new), am, xon, cols#80, lines#34, - bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, clear=\E[H\E[J, - cr=\r, cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\n, - cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, - cuu=\E[%p1%dA, cuu1=\E[A, dch1=\E[P, dl=\E[%p1%dM, - dl1=\E[M, ed=\E[J, el=\E[K, home=\E[H, hpa=\E[%p1%{1}%+%dG, - ht=^I, hts=\EH, ich=\E[%p1%d@, ich1=\E[@, il=\E[%p1%dL, - il1=\E[L, ind=\n, invis=\E[8m, kbs=^H, kcub1=\E[D, - kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, khome=\E[H, rev=\E[7m, - rmam=\E[?7l, rmso=\E[m, rmul=\E[m, - sgr=\E[%?%p1%t7;%;%?%p2%t4;%;%?%p3%t7;%;%?%p4%t5;%;%?%p6%t1; - %;%?%p7%t8;%;m, - sgr0=\E[m, smam=\E[?7h, smso=\E[7m, smul=\E[4m, tbc=\E[3g, - vpa=\E[%p1%{1}%+%dd, use=ansi+rep, + bel=^G, cr=\r, cub1=^H, cud1=\n, dch1=\E[P, ich=\E[%p1%d@, + ich1=\E[@, ind=\n, kcuu1=\E[A, rmam=\E[?7l, sgr0=\E[m, + smam=\E[?7h, use=ansi+arrows, use=ansi+cup, + use=ansi+erase, use=ansi+idl, use=ansi+local, + use=ansi+rep, use=ansi+rca, use=ansi+sgrbold, + use=ansi+tabs, + # The tek4125 emulates a VT100 incorrectly - the scrolling region # command is ignored. The following entry replaces with the needed # , , and ; removes some cursor pad commands that the tek4125 @@ -20650,15 +20633,15 @@ tek4207|Tektronix 4207 graphics terminal with memory, tek4404|Tektronix 4404, OTbs, cols#80, it#8, lines#32, - blink=\E[5m, bold=\E[1m, clear=\E[H\E[2J, - csr=\E[%i%p1%d;%p2%dr, cub1=^H, cud1=\n, cuf1=\E[C, - cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, dch1=\E[P, dl1=\E[1M, - ed=\E[J, el=\E[K, home=\E[H, ht=^I, hts=\E[2I, il1=\E[1L, - kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, rc=\E8, + blink=\E[5m, bold=\E[1m, clear=\E[H\E[2J, cub1=^H, cud1=\n, + cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, dch1=\E[P, + dl1=\E[1M, ed=\E[J, el=\E[K, home=\E[H, ht=^I, hts=\E[2I, + il1=\E[1L, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, rmcup=\E[1;1H\E[0J\E[?6h\E[?1l, rmir=\E[4l, - rmkx=\E[?1h, rmso=\E[27m, rmul=\E[m, sc=\E7, sgr0=\E[m, + rmkx=\E[?1h, rmso=\E[27m, rmul=\E[m, sgr0=\E[m, smcup=\E%\E!1\E[1;32r\E[?6l\E>, smir=\E[4h, - smkx=\E[?1l, smso=\E[7m, smul=\E[4m, + smkx=\E[?1l, smso=\E[7m, smul=\E[4m, use=ansi+csr, + # Some unknown person wrote: # I added the is string - straight Unix has ESC ; in the login # string which sets a ct8500 into monitor mode (aka 4025 snoopy @@ -20691,9 +20674,7 @@ tek4205|Tektronix 4205, colors#8, cols#80, it#8, lines#30, ncv#49, pairs#63, acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, bel=^G, blink=\E[5m, bold=\E[=7;<4m, cbt=\E[Z, - clear=\E[2J\E[H, cr=\r, cub=\E[%p1%dD, cub1=\E[D, - cud=\E[%p1%dB, cud1=\E[B, cuf=\E[%p1%dC, cuf1=\E[C, - cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, + clear=\E[2J\E[H, cr=\r, cup=\E[%i%p1%d;%p2%dH, dch1=\E[1P, dim=\E[=1;<6m, dl=\E[%p1%dM, dl1=\E[1M, ech=\E%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K, enacs=\E)0, home=\E[H, ht=^I, ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[1L, @@ -20724,7 +20705,7 @@ tek4205|Tektronix 4205, %e1m%;, sgr0=\E[=0;<1m\E[24;25;27m\017, smacs=^N, smcup=\E%%!1\E[?6l\E[2J, smir=\E[4h, smso=\E[=2;<3m, - smul=\E[4m, tbc=\E[1g, + smul=\E[4m, tbc=\E[1g, use=ansi+local, #### Teletype (tty) # @@ -20781,9 +20762,9 @@ scanset|sc410|sc415|Tymshare Scan Set, cols#80, lines#24, acsc=j%k4l, sc=^B, smacs=^N, + use=vt52+arrows, #### Volker-Craig (vc) # @@ -20871,21 +20852,16 @@ ibmpc|wy60-PC|wyse60-PC|IBM PC/XT running PC/IX, cols#80, it#8, lines#24, acsc=j\331k\277l\332m\300n\305q\304t\303u\264v\301w\302x \263, - bel=^G, blink=\E[5m, bold=\E[1m, clear=\Ec, cr=\r, - cub=\E[%p1%dD, cub1=\E[D, cud=\E[%p1%dB, cud1=\E[B, - cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, - cuu=\E[%p1%dA, cuu1=\E[A, ech=\E[%p1%dX, ed=\E[J, el=\E[K, - home=\E[H, hpa=\E[%i%p1%dG, ind=\E[S\E[B, - indn=\E[%p1%dS\E[%p1%dB, invis=\E[30;40m, kbs=^H, - kcbt=^], kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, - kdch1=^?, kend=\E[Y, kf1=\240, kf10=\251, kf2=\241, kf3=\242, - kf4=\243, kf5=\244, kf6=\245, kf7=\246, kf8=\247, kf9=\250, - khome=\E[H, kich1=\E[^H, knp=\E[U, kpp=\E[V, ll=\E[24;1H, - nel=\r, rev=\E[7m, ri=\E[T\E[A, rin=\E[%p1%dT\E[%p1%dA, - rmso=\E[m, rmul=\E[m, + bel=^G, clear=\Ec, cr=\r, ech=\E[%p1%dX, hpa=\E[%i%p1%dG, + ind=\E[S\E[B, indn=\E[%p1%dS\E[%p1%dB, invis=\E[30;40m, + kcbt=^], kdch1=^?, kend=\E[Y, kf1=\240, kf10=\251, kf2=\241, + kf3=\242, kf4=\243, kf5=\244, kf6=\245, kf7=\246, kf8=\247, + kf9=\250, kich1=\E[^H, knp=\E[U, kpp=\E[V, ll=\E[24;1H, + nel=\r, ri=\E[T\E[A, rin=\E[%p1%dT\E[%p1%dA, sgr=\E[%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1 %;%?%p7%t30;40%;m, - sgr0=\E[m, smso=\E[7m, smul=\E[4m, + sgr0=\E[m, use=ansi+arrows, use=ansi+cup, use=ansi+erase, + use=ansi+local, use=ansi+sgrbold, #### Apple II # @@ -20926,8 +20902,7 @@ apple2e|Apple //e, # mcvax!vu44!vu45!wilcke uses the "ap" entry together with Ascii Express Pro # 4.20, with incoming and outgoing terminals both on 0, emulation On. apple2e-p|Apple //e via Pascal, - cup=\036%p2%{32}%+%c%p1%{32}%+%c, kbs=^H, kcub1=^H, - kcud1=\n, use=apple2e, + cup=\036%p2%{32}%+%c%p1%{32}%+%c, use=apple2e, # (ASCII Express) MouseTalk "Standard Apple //" emulation from BRL # Enable DC3/DC1 flow control with "stty ixon -ixany". apple-ae|ASCII Express, @@ -21032,9 +21007,9 @@ apple-videx3|vapple|Apple II with 80 col card, cols#80, lines#24, clear=\Ev, cub1=\ED, cud1=\EB, cuf1=\EC, cup=\EY%p1%{32}%+%c%p2%{32}%+%c, cuu1=\EA, el=\Ex, - home=\EH, kcub1=\ED, kcud1=\EB, kcuf1=\EC, kcuu1=\EA, - kf0=\EP, kf1=\EQ, kf2=\ER, kf3=\E\s, kf4=\E!, kf5=\E", kf6=\E#, - kf7=\E$, kf8=\E%%, kf9=\E&, khome=\EH, + home=\EH, kf0=\EP, kf1=\EQ, kf2=\ER, kf3=\E\s, kf4=\E!, + kf5=\E", kf6=\E#, kf7=\E$, kf8=\E%%, kf9=\E&, khome=\EH, + use=vt52+arrows, #From: decvax!cbosgd!cbdkc1!mww Mike Warren via BRL aepro|Apple II+ running ASCII Express Pro--vt52, OTbs, @@ -21058,12 +21033,12 @@ lisa|Apple Lisa console display (black on white), OTbs, am, eo, msgr, cols#88, it#8, lines#32, acsc=jdkclfmenbqattuvvuwsx`, civis=\E[5h, clear=^L, - cnorm=\E[5l, cub1=^H, cud1=\E[B, cuf1=\E[C, - cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, dch1=\E[P, dl1=\E[M, - ed=\E[J, el=\E[K, home=\E[H, ht=^I, ich1=\E[@, il1=\E[L, - is2=\E>\E[m\014, kbs=^H, kcub1=\E[D, kcud1=\E[B, + cnorm=\E[5l, cub1=^H, cup=\E[%i%p1%d;%p2%dH, dch1=\E[P, + dl1=\E[M, ed=\E[J, el=\E[K, home=\E[H, ht=^I, ich1=\E[@, + il1=\E[L, is2=\E>\E[m\014, kbs=^H, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, rmacs=\E[10m, rmso=\E[m, rmul=\E[m, sgr0=\E[m, smacs=\E[11m, smso=\E[7m, smul=\E[4m, + use=ansi+local1, liswb|Apple Lisa console display (white on black), is2=\E>\E[0;7m\014, rmso=\E[0;7m, rmul=\E[0;7m, smso=\E[m, smul=\E[4m, use=lisa, @@ -21083,16 +21058,15 @@ lisaterm|Apple Lisa or Lisa/2 running LisaTerm VT100 emulation, OTbs, OTpt, am, xenl, xon, OTkn#4, cols#80, it#8, lines#24, vt#3, bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[2J, cr=\r, - csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H, - cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C, - cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, ed=\E[J, - el=\E[K, home=\E[H, ht=^I, hts=\EH, ind=\n, kbs=^H, kcub1=\EOD, + cub1=^H, cud1=\n, cup=\E[%i%p1%d;%p2%dH, ed=\E[J, el=\E[K, + home=\E[H, ht=^I, hts=\EH, ind=\n, kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kf0=\EOP, kf1=\EOQ, - kf2=\EOR, kf3=\EOS, lf0=F1, lf1=F2, lf2=F3, lf3=F4, rc=\E8, - rev=\E[7m, ri=\EM, rmkx=\E[?1l\E>, rmso=\E[m, rmul=\E[m, + kf2=\EOR, kf3=\EOS, lf0=F1, lf1=F2, lf2=F3, lf3=F4, rev=\E[7m, + ri=\EM, rmkx=\E[?1l\E>, rmso=\E[m, rmul=\E[m, rs1=\E>\E[?1l\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h\E[1;24r, - sc=\E7, sgr0=\E[m, smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, - tbc=\E[3g, + sgr0=\E[m, smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, + tbc=\E[3g, use=ansi+csr, use=ansi+local, + # Lisaterm in 132 column ("wide") mode. lisaterm-w|Apple Lisa with Lisaterm in 132 column mode, cols#132, @@ -21146,11 +21120,11 @@ trs16|trs-80 model 16 console, cnorm=\ERC, cr=\r, cub1=^H, cud1=\EB, cuf1=\EC, cup=\EY%p1%{32}%+%c%p2%{32}%+%c, cuu1=\EA, dch1=\EQ, dl1=\EM, ed=\EJ, el=\EK, home=\EH, ht=^I, ich1=\EP, il1=\EL, - ind=\n, kbs=^H, kcub1=\ED, kcud1=\EB, kcuf1=\EC, kcuu1=\EA, - kf0=^A, kf1=^B, kf2=^D, kf3=^L, kf4=^U, kf5=^P, kf6=^N, kf7=^S, - khome=^W, lf0=f1, lf1=f2, lf2=f3, lf3=f4, lf4=f5, lf5=f6, lf6=f7, - lf7=f8, mc4=\E]+, mc5=\E]=, rmacs=\ERg, rmso=\ER@, sgr0=\ER@, - smacs=\ERG, smso=\ERD, + ind=\n, kbs=^H, kf0=^A, kf1=^B, kf2=^D, kf3=^L, kf4=^U, kf5=^P, + kf6=^N, kf7=^S, khome=^W, lf0=f1, lf1=f2, lf2=f3, lf3=f4, lf4=f5, + lf5=f6, lf6=f7, lf7=f8, mc4=\E]+, mc5=\E]=, rmacs=\ERg, + rmso=\ER@, sgr0=\ER@, smacs=\ERG, smso=\ERD, + use=vt52+arrows, #### Commodore Business Machines # @@ -21183,18 +21157,16 @@ amiga|Amiga ANSI, OTbs, am, bw, xenl, cols#80, lines#24, acsc=, bel=^G, blink=\E[7;2m, bold=\E[1m, cbt=\E[Z, - civis=\E[0 p, clear=\E[H\E[J, cnorm=\E[ p, cub=\E[%p1%dD, - cub1=\E[D, cud=\E[%p1%dB, cud1=\E[B, cuf=\E[%p1%dC, - cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, - cuu1=\E[A, dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, - dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K, home=\E[H, - ich=\E[%p1%d@, ich1=\E[@, il=\E[%p1%dL, il1=\E[L, ind=\E[S, - invis=\E[8m, is2=\E[20l, kbs=^H, kcub1=\E[D, kcud1=\E[B, - kcuf1=\E[C, kcuu1=\E[A, kf0=\E[9~, kf1=\E[0~, kf2=\E[1~, - kf3=\E[2~, kf4=\E[3~, kf5=\E[4~, kf6=\E[5~, kf7=\E[6~, - kf8=\E[7~, kf9=\E[8~, rev=\E[7m, ri=\E[T, rmacs=^O, - rmso=\E[m, rmul=\E[m, rs1=\Ec, sgr0=\E[m, smacs=^N, - smso=\E[7m, smul=\E[4m, use=ecma+index, + civis=\E[0 p, cnorm=\E[ p, cup=\E[%i%p1%d;%p2%dH, + dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, home=\E[H, + ich=\E[%p1%d@, ich1=\E[@, ind=\E[S, invis=\E[8m, + is2=\E[20l, kbs=^H, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, + kcuu1=\E[A, kf0=\E[9~, kf1=\E[0~, kf2=\E[1~, kf3=\E[2~, + kf4=\E[3~, kf5=\E[4~, kf6=\E[5~, kf7=\E[6~, kf8=\E[7~, + kf9=\E[8~, rev=\E[7m, ri=\E[T, rmacs=^O, rmso=\E[m, + rmul=\E[m, rs1=\Ec, sgr0=\E[m, smacs=^N, smso=\E[7m, + smul=\E[4m, use=ansi+erase, use=ansi+idl, use=ansi+local, + use=ecma+index, # From: Hans Verkuil , 4 Dec 1995 # (amiga: added empty to suppress a warning. @@ -21237,17 +21209,13 @@ amiga-vnc|Amiga using VNC console (black on light gray), am, da, db, msgr, ndscr, btns#1, colors#16, cols#80, lines#24, lm#0, ncv#0, pairs#0x100, bel=^G, blink=\E[7;2m, bold=\E[1m, civis=\E[0p, - clear=\E[H\E[J, cnorm=\E[p\E[>?6l, cr=\r, - csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=\E[D, - cud=\E[%p1%dB, cud1=\E[B, cuf=\E[%p1%dC, cuf1=\E[C, - cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, - cvvis=\E[>?6h, dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, - dl=\E[%p1%dM, dl1=\E[1M, ed=\E[J, el=\E[K, flash=^G, + cnorm=\E[p\E[>?6l, cr=\r, csr=\E[%i%p1%d;%p2%dr, + cup=\E[%i%p1%d;%p2%dH, cvvis=\E[>?6h, dch=\E[%p1%dP, + dch1=\E[P, dim=\E[2m, dl=\E[%p1%dM, dl1=\E[1M, flash=^G, ich=\E[%p1%d@, ich1=\E[@, il=\E[%p1%dL, il1=\E[1L, ind=\ED, invis=\E8m, is2=\E[>?2;18l\E[>?26;?6;20;>?15;?7;>?22;>?8h, - kbs=^H, kcbt=\233Z, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, - kcuu1=\E[A, kdch1=^?, kf0=\E[9~, kf1=\E[0~, kf2=\E[1~, + kcbt=\233Z, kdch1=^?, kf0=\E[9~, kf1=\E[0~, kf2=\E[1~, kf3=\E[2~, kf4=\E[3~, kf5=\E[4~, kf6=\E[5~, kf7=\E[6~, kf8=\E[7~, kf9=\E[8~, khlp=\E[?~, khome=\E[44~, kll=\E[45~, kmous=\E[M, knp=\E[42~, kpp=\E[41~, nel=\EE, oc=\E[0m, @@ -21257,7 +21225,8 @@ amiga-vnc|Amiga using VNC console (black on light gray), setab=\E[%?%p1%{8}%>%t%'F'%p1%+%d%e4%p1%d%;m, setaf=\E[%?%p1%{8}%>%t%'2'%p1%+%d%e3%p1%d%;m, sgr0=\E[0m\017\E[30;85;>15m, smcup=\E[?7h, smkx=\E[?1h, - smso=\E[1m, smul=\E[4m, use=ecma+index, + smso=\E[1m, smul=\E[4m, use=ansi+arrows, use=ansi+erase, + use=ansi+local, use=ecma+index, # MorphOS on Genesi Pegasos # By Pavel Fedin @@ -21362,24 +21331,22 @@ osexec|Osborne executive, # See # https://web.archive.org/web/20120703021949/http://www.minix3.org/manpages/html4/console.html minix|minix console (v3), - NQ, acsc=+\020\,\021-\030.^Y0\333`\004a\261f\370g\361h\260j \331k\277l\332m\300n\305o~p\304q\304r\304s_t\303u\264v \301w\302x\263y\363z\362{\343|\330}\234~\376, - kdch1=^?, kend=\E[Y, kf0=\E[21~, kf1=\E[11~, kf10=\E[21~, + kdch1=^?, kend=\E[Y, kf0=\E[21~, kf10=\E[21~, kf11=\E[11;2~, kf12=\E[12;2~, kf13=\E[13;2~, kf14=\E[14;2~, kf15=\E[15;2~, kf16=\E[17;2~, - kf17=\E[18;2~, kf18=\E[19;2~, kf19=\E[20;2~, kf2=\E[12~, + kf17=\E[18;2~, kf18=\E[19;2~, kf19=\E[20;2~, kf20=\E[21;2~, kf21=\E[11;5~, kf22=\E[12;5~, kf23=\E[13;5~, kf24=\E[14;5~, kf25=\E[15;5~, kf26=\E[17;5~, kf27=\E[18;5~, kf28=\E[19;5~, - kf29=\E[20;5~, kf3=\E[13~, kf30=\E[21;5~, kf31=\E[11;6~, + kf29=\E[20;5~, kf30=\E[21;5~, kf31=\E[11;6~, kf32=\E[12;6~, kf33=\E[13;6~, kf34=\E[14;6~, kf35=\E[15;6~, kf36=\E[17;6~, kf37=\E[18;6~, - kf38=\E[19;6~, kf39=\E[20;6~, kf4=\E[14~, kf40=\E[21;6~, - kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, - kich1=\E[@, knp=\E[U, kpp=\E[V, lf0@, lf1@, lf2@, lf3@, lf4@, lf5@, - use=minix-3.0, + kf38=\E[19;6~, kf39=\E[20;6~, kf40=\E[21;6~, kich1=\E[@, + knp=\E[U, kpp=\E[V, lf0@, lf1@, lf2@, lf3@, lf4@, lf5@, + use=xterm+r5+fkeys, use=minix-3.0, minix-3.0|minix console (v3.0), use=ecma+color, use=minix-1.7, @@ -21396,15 +21363,13 @@ minix-old|minix-1.5|minix console (v1.5), xon, NQ, cols#80, it#8, lines#25, bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[0J, cr=\r, - cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\E[B, - cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, - cuu=\E[%p1%dA, cuu1=\E[A, dch=\E[%p1%dP, dch1=\E[P, - dl=\E[%p1%dM, dl1=\E[M, ed=\E[0J, el=\E[K, home=\E[H, ht=^I, - ich=\E[%p1%d@, ich1=\E[@, il=\E[%p1%dL, il1=\E[L, ind=\n, - kbs=^H, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, - kf0=\E[Y, kf1=\E[V, kf2=\E[U, kf3=\E[T, kf4=\E[S, kf5=\E[G, - khome=\E[H, nel=\r\n, rev=\E[7m, ri=\EM, rmso=\E[0m, + cub1=^H, cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P, + ed=\E[0J, el=\E[K, home=\E[H, ht=^I, ich=\E[%p1%d@, + ich1=\E[@, ind=\n, kf0=\E[Y, kf1=\E[V, kf2=\E[U, kf3=\E[T, + kf4=\E[S, kf5=\E[G, nel=\r\n, rev=\E[7m, ri=\EM, rmso=\E[0m, rmul=\E[0m, sgr0=\E[0m, smso=\E[7m, smul=\E[4m, + use=ansi+arrows, use=ansi+idl, use=ansi+local, + # The linewrap option can be specified by editing /usr/include/minix/config.h # before recompiling the minix 1.5 kernel. minix-old-am|minix console with linewrap, @@ -21422,9 +21387,9 @@ pc-coherent|pcz19|coherent|IBM PC console running Coherent, cols#80, it#8, lines#25, bel=^G, clear=\EE, cr=\r, cub1=^H, cud1=\EB, cuf1=\EC, cup=\EY%p1%{32}%+%c%p2%{32}%+%c, cuu1=\EA, dch1=\EN, - ed=\EJ, el=\EK, home=\EH, ht=^I, ind=\n, kbs=^H, kcub1=\ED, - kcud1=\EB, kcuf1=\EC, kcuu1=\EA, khome=\EH, ri=\EI, rmir=\EO, - rmso=\Eq, sgr0=\Eq, smir=\E@, smso=\Ep, + ed=\EJ, el=\EK, home=\EH, ht=^I, ind=\n, kbs=^H, khome=\EH, + ri=\EI, rmir=\EO, rmso=\Eq, sgr0=\Eq, smir=\E@, smso=\Ep, + use=vt52+arrows, # According to the Venix 1.1 manual, the PC console is similar # to a DEC VT52. Differences seem to be (1) arrow keys send @@ -21456,16 +21421,17 @@ mai|basic4|MAI Basic Four in ANSI mode, am, da, db, mir, msgr, cols#82, it#8, lines#25, bel=^G, blink=\E[5m, bold=\E[1m, clear=^]^_, cnorm=\E[?7h, - cr=\r, csr=\E[%i%p1%d;%p2%dr, cub1=^H, cud1=\n, cuf1=^X, - cup=\E[%i%p1%d;%p2%dH, cuu1=^Z, cvvis=\E[?7l, dch1=\E[1P, - dl1=\E[M, ed=^_, el=^^, home=^], ht=^I, - if=/usr/share/tabset/vt100, il1=\E[L, ind=\ED, + cr=\r, cub1=^H, cud1=\n, cuf1=^X, cup=\E[%i%p1%d;%p2%dH, + cuu1=^Z, cvvis=\E[?7l, dch1=\E[1P, dl1=\E[M, ed=^_, el=^^, + home=^], ht=^I, if=/usr/share/tabset/vt100, il1=\E[L, + ind=\ED, is2=\E>\E[?1h\E[?7h\E[?5l\017\E(B\E[m\E[20l\E[1;24r\E[24;1H, kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, kf5=\EOT, kf6=\EOU, - kf7=\EOV, kf8=\EOW, nel=\r\ED, rc=\E8, rev=\E[7m, ri=\E[T, - rmir=\E[4l, rmso=\E[m, rmul=\E[m, sc=\E7, sgr0=\E[m, - smir=\E[4h, smso=\E[7m, smul=\E[4m, + kf7=\EOV, kf8=\EOW, nel=\r\ED, rev=\E[7m, ri=\E[T, + rmir=\E[4l, rmso=\E[m, rmul=\E[m, sgr0=\E[m, smir=\E[4h, + smso=\E[7m, smul=\E[4m, use=ansi+csr, + # basis from Peter Harrison, Computer Graphics Lab, San Francisco # ucbvax!ucsfmis!harrison ...uucp / ucbvax!ucsfmis!harrison@BERKELEY ...ARPA # @@ -21484,8 +21450,7 @@ mai|basic4|MAI Basic Four in ANSI mode, # (basis: removed obsolete ":ma=^K^P^R^L^L :nl=5000*^J:" -- esr) basis|BASIS108 computer with terminal translation table active, clear=\E*$<300/>, cud1=\n$<5000/>, ed=\EY, el=\ET, kbs=^H, - kcub1=^H, kcud1=\n, kcuf1=^L, kcuu1=^K, rmso=\E), sgr0=\E), - smso=\E(, use=adm3a, + rmso=\E), sgr0=\E), smso=\E(, use=adm3a, # luna's BMC terminal emulator luna|luna68k|LUNA68K Bitmap console, cols#88, lines#46, use=ansi-mini, @@ -21516,24 +21481,20 @@ m2-nam|minitel|minitel-2|minitel-2-nam|France Telecom Minitel 2 mode te'le'infor OTbs, eslok, hs, xenl, cols#80, it#8, lines#24, wsl#72, xmc#0, acsc=aaffggjjkkllmmnnooqqssttuuvvwwxx, bel=^G, - blink=\E[5m, bold=\E[1m, civis=\E[<1h, clear=\E[H\E[J, - cnorm=\E[<1l, cr=\r, csr=\E[%i%p1%d;%p2%dr, - cub=\E[%p1%dD, cub1=\E[D, cud=\E[%p1%dB, cud1=\E[B, - cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, - cuu=\E[%p1%dA, cuu1=\E[A, dch=\E[%p1%dP, dch1=\E[P, - dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K, flash=^G, fsl=\n, - home=\E[H, ht=^I, il=\E[%p1%dL, il1=\E[L, ind=\n, ip=$<7/>, + blink=\E[5m, bold=\E[1m, civis=\E[<1h, cnorm=\E[<1l, cr=\r, + cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P, + flash=^G, fsl=\n, home=\E[H, ht=^I, ind=\n, ip=$<7/>, is1=\E:1}\Ec\E[?4l\E[12h, is2=\Ec\E[12h\E)0, - is3=\E[?3l, kbs=^H, kclr=\E[2J, kcub1=\E[D, kcud1=\E[B, - kcuf1=\E[C, kcuu1=\E[A, kdch1=\E[P, kdl1=\E[M, kf0=\EOp, + is3=\E[?3l, kclr=\E[2J, kdch1=\E[P, kdl1=\E[M, kf0=\EOp, kf1=\EOq, kf10=\EOp, kf2=\EOr, kf3=\EOs, kf4=\EOt, kf5=\EOu, - kf6=\EOv, kf7=\EOw, kf8=\EOx, kf9=\EOy, khome=\E[H, - kich1=\E[4h, kil1=\E[4l, knp=\EOn, kpp=\EOR, ll=\E[24;80H, - mc0=\E[i, nel=\r\n, rc=\E8, rev=\E[7m, ri=\EM, rmacs=^O, - rmir=\E[4l, rmso=\E[27m, rmul=\E[24m, - rs1=\Ec\E[?4l\E[12h, rs2=\Ec\E)0, sc=\E7, sgr0=\E[m, - smacs=^N, smir=\E[4h, smso=\E[7m, smul=\E[4m, tsl=^_@A, - use=ansi+cpr, + kf6=\EOv, kf7=\EOw, kf8=\EOx, kf9=\EOy, kich1=\E[4h, + kil1=\E[4l, knp=\EOn, kpp=\EOR, ll=\E[24;80H, mc0=\E[i, + nel=\r\n, rev=\E[7m, ri=\EM, rmacs=^O, rmir=\E[4l, + rmso=\E[27m, rmul=\E[24m, rs1=\Ec\E[?4l\E[12h, + rs2=\Ec\E)0, sgr0=\E[m, smacs=^N, smir=\E[4h, smso=\E[7m, + smul=\E[4m, tsl=^_@A, use=ansi+arrows, use=ansi+cpr, + use=ansi+csr, use=ansi+erase, use=ansi+idl, + use=ansi+local, # From: Alexandre Montaron , 18 Jun 1998, updated 19 Sep 2016 # @@ -21579,27 +21540,26 @@ minitel1|minitel 1, \177\,--, minitel1b|minitel 1-bistandard (in 40cols mode), mir, - cub=\E[%p1%dD, cud=\E[%p1%dB, cuf=\E[%p1%dC, - cuu=\E[%p1%dA, dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, - dl1=\E[M, ed=\E[J, el1=\E[1K, il=\E[%p1%dL, il1=\E[L, - is1=\E;iYA\E;jYC, kbs@, kcan@, kclr=\E[2J, kctab=^I, - kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kdch1=\E[P, - kdl1=\E[M, kent@, kf1=^SD, kf10=^Y0, kf11=^Y1, kf12=^Y/, - kf13=^Y{1, kf14=^Y{2, kf15=^Y{3, kf16=^Y{4, kf17=^Y{5, - kf18=^Y{6, kf19=^Y{7, kf2=^SC, kf20=^Y{8, kf21=^Y{9, - kf22=^Y{0, kf23=^Y{*, kf24=^Y{#, kf3=^SF, kf4=^SA, kf5=^SG, - kf6=^SE, kf7=^Y8, kf8=^Y\,, kf9=^Y., khlp@, khome=\E[H, - kich1=\E[4h, kil1=\E[L, krfr@, lf1=Guide, lf2=Repetition, - lf3=Sommaire, lf4=Envoi, lf5=Correction, lf6=Annulation, - rmir=\E[4l, smir=\E[4h, + cub1=^H, cud1=\n, cuf1=^I, cuu1=^K, dch=\E[%p1%dP, dch1=\E[P, + ed=\E[J, el1=\E[1K, is1=\E;iYA\E;jYC, kbs@, kcan@, + kclr=\E[2J, kctab=^I, kdch1=\E[P, kdl1=\E[M, kent@, kf1=^SD, + kf10=^Y0, kf11=^Y1, kf12=^Y/, kf13=^Y{1, kf14=^Y{2, + kf15=^Y{3, kf16=^Y{4, kf17=^Y{5, kf18=^Y{6, kf19=^Y{7, + kf2=^SC, kf20=^Y{8, kf21=^Y{9, kf22=^Y{0, kf23=^Y{*, + kf24=^Y{#, kf3=^SF, kf4=^SA, kf5=^SG, kf6=^SE, kf7=^Y8, + kf8=^Y\,, kf9=^Y., khlp@, kich1=\E[4h, kil1=\E[L, krfr@, + lf1=Guide, lf2=Repetition, lf3=Sommaire, lf4=Envoi, + lf5=Correction, lf6=Annulation, rmir=\E[4l, smir=\E[4h, u8=\001%[ABCPtuvwxyz0123456789:;<=>?]\004, .ich=\E[%p1%d@, .ich1=\E[@, .kLFT=\E[P, .kRIT=\E[4h, .kb2=^Y{g, .kcbt=^Y{i, .kel=^X, .mc0=\E:|k, .rmkx=\E;jYA, .rs1=\E[4l\E[2l, .smkx=\E;iYA\E;jYC, .u8=^ACu<^D, + use=ansi+arrows, use=ansi+idl, use=ansi+local, use=minitel1, + # rmkx posait des problemes (logout en sortant de vi). minitel1b-80|minitel 1-bistandard (standard teleinformatique), - am@, bw@, eslok@, hz@, msgr, G0, + am@, bw@, eslok@, hz@, msgr, colors@, cols#80, it#8, pairs@, acsc@, blink=\E[5m, bold=\E[1m, civis=\037@A\024\n, clear=\E[H\E[J, cnorm=\037@A\021\n, cuf1=\E[C, @@ -21630,7 +21590,6 @@ minitel1b-80|minitel 1-bistandard (standard teleinformatique), .sgr=\E[%?%p1%t7;%;%?%p2%t4;%;%?%p3%t7;%;%?%p4%t5;%;%?%p6%t1 ;%;m, .smacs=^N, C0=}#f[j+k+l+m+n+o~q=s_t+u+v+w+x!0\032, - E0=^O, S0=^N, XC=B\016%\017\,\243#\,\247]\,\260[\,\340@\,\347\\\\\,\351{\, \350}\,\371|\,\300A\,\301A\,\302A\,\303A\,\304A\,\305A\, \306E\,\307C\,\310E\,\311E\,\312E\,\313E\,\314I\,\315I\, @@ -21682,10 +21641,9 @@ minitel1b-nb|minitel 1b (40cols) noir & blanc sans couleurs avec bold et dim ... # Fonctionne par exemple avec Midnight Commander (mc). minitel2-80|minitel 2 (80cols) avec filets VT100 (DEC), - G0, acsc=ffggjjkkllmmnnooqqssttuuvvwwxxyyzz||}}, enacs=\E)0, rmacs=^O, smacs=^N, u6=\E[%i%d;%dR, - C0=ffggjjkkllmmnnooqqssttuuvvwwxxyyzz||}}, E0=^O, + C0=ffggjjkkllmmnnooqqssttuuvvwwxxyyzz||}}, S0=\E)0\016, XC=B%\E(B\,\243\E(3}\,\247\E(R[\,\257\E(3v\,\260\E(3f\,\261 \E(3g\,\265\E(3Y\,\267\E(3~\,\274\E(3O\,\275\E(3P\,\276 @@ -21703,7 +21661,6 @@ minitel2-80|minitel 2 (80cols) avec filets VT100 (DEC), use=minitel12-80, minitel12-80|minitel 12 (80cols), - G0, civis=\E[<1h, cnorm=\E[<1l, is2=\E[12h, u6=\E[%i%d;%dH, u7=\E[6n, .acsc=ffggj+k+l+m+n+ovq-swt+u+v+w+xx}}\,m+k.l-j0 @@ -21711,7 +21668,7 @@ minitel12-80|minitel 12 (80cols), .enacs=\E)3, .rmacs=^O, .rs3=\E[?4l, .scs=\E(%p1%c, .smacs=^N, C0=ffggj+k+l+m+n+ovq-swt+u+v+w+xx}}\,m+k.l-j0\177, - E0=^O, S0=\E)3\016, + S0=\E)3\016, XC=B%\E(B\,\243\E(3}\,\247\E(R[\,\257\E(3v\,\260\E(3f\,\261 \E(3g\,\267\E(3~\,\274\E(3O\,\275\E(3P\,\276\E(3Q\,\300A \,\301A\,\302A\,\303A\,\304A\,\305A\,\306E\,\307C\,\310E @@ -21765,7 +21722,7 @@ screen.minitel1b-80|screen.minitel2-80|screen.minitel12-80|Screen specific for m screen.minitel1-nb|Screen specific for minitel1-nb, colors@, ncv@, pairs@, - bold=\E[1m, dim=\E[2m, op@, setab@, setaf@, setb@, setf@, + bold=\E[1m, op@, setab@, setaf@, setb@, setf@, use=screen.minitel1, screen.minitel1b-nb|Screen specific for minitel1b-nb, @@ -21776,35 +21733,27 @@ screen.minitel1b-nb|Screen specific for minitel1b-nb, # From: Alexandre Montaron, 29 Sep 2016 linux-m1|Linux Minitel 1 "like" Couleurs, - am, bw@, ccc, mir, msgr, xenl, - colors#8, it#8, ncv#16, pairs#64, + am, ccc, mir, msgr, xenl, + it#8, ncv#16, acsc=a\261f\370g\361h\260j\274k\273l\311m\310n\316q\315t \314u\271v\312w\313x\272y\363z\362{\343|\252~\372, - bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[J, cr=\r, - csr=\E[%i%p1%d;%p2%dr, cub1=^H, cud1=\n, cuf1=\E[C, - cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, dch=\E[%p1%dP, - dch1=\E[P, dim=\E[2m, dl=\E[%p1%dM, dl1=\E[M, - ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K, enacs=\E)U, - flash=\E[?5h$<100/>\E[?5l, home=\E[H, hpa=\E[%i%p1%d`, - ht=^I, hts=\EH, il=\E[%p1%dL, il1=\E[L, ind=\n, + bel=^G, blink=\E[5m, bold=\E[1m, cr=\r, cub1=^H, cud1=\n, + dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, ech=\E[%p1%dX, + el1=\E[1K, enacs=\E)U, flash=\E[?5h$<100/>\E[?5l, + hpa=\E[%i%p1%d`, ht=^I, hts=\EH, ind=\n, initc=\E]P%p1%{15}%&%X%p2%{255}%&%02X%p3%{255}%&%02X%p4 %{255}%&%02X, is2=\E]R\E]P3FFFF80\E[?8c, ka1=\EOw, ka3=\EOy, kb2=\E[G, - kbs=^?, kc1=\EOq, kc3=\EOs, kcbt=\E^I, kclr=\E\r, kcub1=\E[D, - kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kdl1=\E\E[A, kent=\EOM, - kf1=\E[[A, kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, - kf13=\E[25~, kf14=\E[26~, kf15=\E[28~, kf16=\E[29~, - kf17=\E[31~, kf18=\E[32~, kf19=\E[33~, kf2=\E[[B, - kf20=\E[34~, kf3=\E[[C, kf4=\E[[D, kf5=\E[[E, kf6=\E[17~, - kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, kil1=\E\E[B, - kmous=\E[M, nel=\EE, oc=\E]R\E]P3FFFF80, op=\E[39;49m, - rc=\E8, rev=\E[7m, ri=\EM, rmacs=^O, rmam=\E[?7l, rmir=\E[4l, - rmpch=\E[10m, rmso=\E[27m, rs1=\Ec, rs3=\E[37;40m\E[8], - sc=\E7, setab=\E[4%p1%dm, setaf=\E[3%p1%dm, sgr0=\E[m, - smacs=^N, smam=\E[?7h, smir=\E[4h, smpch=\E[11m, - smso=\E[7m, tbc=\E[3g, vpa=\E[%i%p1%dd, .VN=\E[?5l, - .VR=\E[?5h, .am@, .ich=\E[%p1%d@, .ich1=\E[@, .ll=\E[99H, - .rmcup=, .rmul=\E[24m, .smcup=\E]R\E]P3FFFF80\E[?8c, + kbs=^?, kc1=\EOq, kc3=\EOs, kcbt=\E^I, kclr=\E\r, + kdl1=\E\E[A, kent=\EOM, kf2=\E[[B, khome=\E[1~, + kil1=\E\E[B, kmous=\E[M, nel=\EE, oc=\E]R\E]P3FFFF80, + op=\E[39;49m, rev=\E[7m, ri=\EM, rmacs=^O, rmam=\E[?7l, + rmir=\E[4l, rmpch=\E[10m, rmso=\E[27m, rs1=\Ec, + rs3=\E[37;40m\E[8], sgr0=\E[m, smacs=^N, smam=\E[?7h, + smir=\E[4h, smpch=\E[11m, smso=\E[7m, tbc=\E[3g, + vpa=\E[%i%p1%dd, .VN=\E[?5l, .VR=\E[?5h, .am@, + .ich=\E[%p1%d@, .ich1=\E[@, .ll=\E[99H, .rmcup=, + .rmul=\E[24m, .smcup=\E]R\E]P3FFFF80\E[?8c, .smul=\E[4m, E3=\E[99H\E[2J\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n \n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n @@ -21814,7 +21763,11 @@ linux-m1|Linux Minitel 1 "like" Couleurs, \n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n \n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n \n\n\n\n\n\n\n\n\n\n, - use=vt220+pcedit, use=vt220+cvis, use=linux+decid, + use=ansi+arrows, use=ansi+csr, use=ansi+cup, + use=ansi+erase, use=ansi+idl, use=ansi+local1, + use=klone+color, use=linux+decid, use=linux+lockeys, + use=vt220+pcedit, use=vt220+cvis, use=vt220+sfkeys, + use=vt220+ufkeys, # 1. Using double-shapes for VT100 graphical chars (eg: mc). # 2. Native brown color corrected to good yellow color. @@ -21849,8 +21802,7 @@ linux-m2|Linux Minitel 2 "like" Couleurs (Vert/Blanc/Noir+Bleu), 900\E]P600A900\E]P700A900\E]P80000FF\E]P9FFFFFF\E]PAFFFF FF\E]PBFFFFFF\E]PCFFFFFF\E]PDFFFFFF\E]PEFFFFFF\E]PFFFFFF F\E[;37m, - oc@, op@, rmacs=^O, setab=^A, setaf=^A, sgr0=\E[;37m, smacs=^N, - .setab@, .setaf@, + oc@, op@, setab=^A, setaf=^A, sgr0=\E[;37m, .setab@, .setaf@, .smcup=\E]R\E]P100A900\E]P200A900\E]P3FFFFFF\E]P400A900\E]P5 00A900\E]P600A900\E]P700A900\E]P80000FF\E]P9FFFFFF\E] PAFFFFFF\E]PBFFFFFF\E]PCFFFFFF\E]PDFFFFFF\E]PEFFFFFF @@ -21872,10 +21824,8 @@ linux-s|Linux console with added status line at bottom, screen.linux-m1|Linux m1 specific for screen, ncv@, - dim=\E[2m, kbs=^?, kclr=\E\r, kdl1=\E\E[A, kf13=\E[25~, - kf14=\E[26~, kf15=\E[28~, kf16=\E[29~, kf17=\E[31~, - kf18=\E[32~, kf19=\E[33~, kf20=\E[34~, kil1=\E\E[B, rmul@, - smul@, u8=\E[?1;2c, + kclr=\E\r, kdl1=\E\E[A, kil1=\E\E[B, rmul@, smul@, + u8=\E[?1;2c, E3=\E[99H\E[2J\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n \n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n \n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n @@ -21885,6 +21835,7 @@ screen.linux-m1|Linux m1 specific for screen, \n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n \n\n\n\n\n\n\n\n\n\n, use=decid+cpr, use=xterm+x11mouse, use=screen, + use=vt220+sfkeys, screen.linux-m1b|Linux m1b specific for screen, colors@, pairs@, @@ -21898,27 +21849,24 @@ screen.linux-m2|Linux m2 specific for screen, # Putty : putty-m1|Putty Minitel 1 "like" Couleurs, - hs, - dim@, kf1=\E[11~, kf2=\E[12~, kf3=\E[13~, kf4=\E[14~, - kf5=\E[15~, rmul=\E[24m, smul=\E[4m, .E3=\E[300S, - use=xterm+alt47, use=putty+screen, use=xterm+sl-twm, - use=ecma+index, use=linux-m1, + dim@, rmul=\E[24m, smul=\E[4m, .E3=\E[300S, + use=xterm+r5+lockeys, use=xterm+alt47, + use=putty+screen, use=xterm+sl-twm, use=ecma+index, + use=linux-m1, putty-m1b|Putty Minitel 1B "like" Monochrome (Gris/Blanc/Noir), - hs, - dim@, kf1=\E[11~, kf2=\E[12~, kf3=\E[13~, kf4=\E[14~, - kf5=\E[15~, rmul=\E[24m, smul=\E[4m, .E3=\E[300S, - use=xterm+alt47, use=putty+screen, use=xterm+sl-twm, - use=ecma+index, use=linux-m1b, + dim@, rmul=\E[24m, smul=\E[4m, .E3=\E[300S, + use=xterm+r5+lockeys, use=xterm+alt47, + use=putty+screen, use=xterm+sl-twm, use=ecma+index, + use=linux-m1b, putty-m2|Putty Minitel 2 "like" Couleurs (Vert/Blanc/Noir), - hs, acsc=``aabbccddeeffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{ {||}}~~, - dim@, kf1=\E[11~, kf2=\E[12~, kf3=\E[13~, kf4=\E[14~, - kf5=\E[15~, rmul=\E[24m, smul=\E[4m, .E3=\E[300S, - use=xterm+alt47, use=putty+screen, use=xterm+sl-twm, - use=ecma+index, use=linux-m2, + dim@, rmul=\E[24m, smul=\E[4m, .E3=\E[300S, + use=xterm+r5+lockeys, use=xterm+alt47, + use=putty+screen, use=xterm+sl-twm, use=ecma+index, + use=linux-m2, putty+screen|PuTTY with screen resizing extensions (building-block), .WS=\E[8;%p1%d;%p2%dt, Z0=\E[?3h, Z1=\E[?3l, @@ -22028,8 +21976,8 @@ blit|jerq|blit running teletype rom, cup=\EY%p2%{32}%+%c%p1%{32}%+%c, cuu1=\EA, dch=\Ee%p1%{32}%+%c, dch1=\Ee!, dl=\EE%p1%{32}%+%c, dl1=\EE!, el=\EK, ht=^I, ich=\Ef%p1%{32}%+%c, ich1=\Ef!, - il=\EF%p1%{32}%+%c, il1=\EF!, ind=\n, kbs=^H, kcub1=\ED, - kcud1=\EB, kcuf1=\EC, kcuu1=\EA, kf1=\Ex, kf2=\Ey, kf3=\Ez, + il=\EF%p1%{32}%+%c, il1=\EF!, ind=\n, kbs=^H, kf1=\Ex, + kf2=\Ey, kf3=\Ez, use=vt52+arrows, # (cbblit: here's a BSD termcap that says -- esr) cbblit|fixterm|blit running columbus code, @@ -22086,14 +22034,13 @@ bg2.0rv|bg3.10rv|BBn BitGraph 2.0 (reverse video), bg2.0|bg3.10|BBN BitGraph 2.0 or later (no init), OTbs, xenl, cols#85, lines#64, - bel=^G, clear=\E[H\E[J$<150>, cr=\r, - csr=\E[%i%p1%d;%p2%dr, cub1=^H, cud1=\E[B, cuf1=\E[C, - cup=%i\E[%p1%d;%p2%dH, cuu1=\E[A, dl1=\E[M$<2*>, - ed=\E[J$<150>, el=\E[K$<2>, ht=^I, il1=\E[L$<2*>, - ind=\n$<280>, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, - kcuu1=\E[A, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, lf1=PF1, - lf2=PF2, lf3=PF3, lf4=PF4, rc=\E8, rmkx=\E>, rmso=\E[m, sc=\E7, - sgr0=\E[m, smkx=\E=, smso=\E[7m, + bel=^G, clear=\E[H\E[J$<150>, cr=\r, cub1=^H, + cup=%i\E[%p1%d;%p2%dH, dl1=\E[M$<2*>, ed=\E[J$<150>, + el=\E[K$<2>, ht=^I, il1=\E[L$<2*>, ind=\n$<280>, + kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf1=\EOP, + kf2=\EOQ, kf3=\EOR, kf4=\EOS, lf1=PF1, lf2=PF2, lf3=PF3, + lf4=PF4, rmkx=\E>, rmso=\E[m, sgr0=\E[m, smkx=\E=, + smso=\E[7m, use=ansi+csr, use=ansi+local1, bg1.25rv|BBN BitGraph 1.25 (reverse video), flash=\E[?5l$<200/>\E[?5h, is2=\E>\E[?5h\E[?7h, @@ -22104,14 +22051,13 @@ bg1.25nv|BBN BitGraph 1.25 (normal video), # (bg1.25: I added / based on the init string -- esr) bg1.25|BBN BitGraph 1.25, cols#85, lines#64, - bel=^G, clear=\E[H\E[J$<150>, cr=\r, cub1=^H, cud1=\E[B, - cuf1=\E[C, cup=%i\E[%p1%d;%p2%dH, cuu1=\E[A, - dl1=\E[M$<2*>, ed=\E[J$<150>, el=\E[K$<2>, ht=^I, - il1=\E[L$<2*>, ind=\n$<280>, kcub1=\ED, kcud1=\EB, - kcuf1=\EC, kcuu1=\EA, kf1=\EP, kf2=\EQ, kf3=\ER, kf4=\ES, - lf1=PF1, lf2=PF2, lf3=PF3, lf4=PF4, ll=\E[64;1H, rmam=\E[?7l, - rmkx=\E>, rmso=\E[m, sgr0=\E[m, smam=\E[?7h, smkx=\E=, - smso=\E[7m, + bel=^G, clear=\E[H\E[J$<150>, cr=\r, cub1=^H, + cup=%i\E[%p1%d;%p2%dH, dl1=\E[M$<2*>, ed=\E[J$<150>, + el=\E[K$<2>, ht=^I, il1=\E[L$<2*>, ind=\n$<280>, kf1=\EP, + kf2=\EQ, kf3=\ER, kf4=\ES, lf1=PF1, lf2=PF2, lf3=PF3, lf4=PF4, + ll=\E[64;1H, rmam=\E[?7l, rmkx=\E>, rmso=\E[m, sgr0=\E[m, + smam=\E[?7h, smkx=\E=, smso=\E[7m, use=ansi+local1, + use=vt52+arrows, #### Bull (bq, dku, vip) # @@ -22181,33 +22127,32 @@ bg1.25|BBN BitGraph 1.25, # This entry covers the following terminals: # dku7102, tws2102, and tws models 2105 to 2112 tws-generic|dku7102|Bull Questar tws terminals, - am, eslok, hs, mir, msgr, xenl, xhp@, xon, - cols#80, it#8, lines#24, wsl#80, + am, mir, msgr, xenl, xhp@, xon, + cols#80, lines#24, wsl#80, acsc=``aaffggj)k\,l&m#n/ooppq*rrsst'u-v+w.x%yyzz{{||}}~~, - bel=^G, blink=\E[0;5m, cbt=\E[Z, civis=\E[1r, clear=\E[2J, - cnorm=\E[r, cr=\r, cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, - cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%df, - cuu=\E[%p1%dA, cuu1=\E[A, dch=\E[%p1%dP, dch1=\E[P, - dim=\E[0;2m, dl=\E[%p1%dM, dl1=\E[M, - dsl=\EPY99:98\E\\\E[0;98v\E[2J\E[v, ed=\E[J, el=\E[K, - fsl=\E[v, home=\E[H, ht=\E[I, hts=\EH, il=\E[%p1%dL, - il1=\E[L, ind=\n, invis=\E[0;8m, + bel=^G, blink=\E[0;5m, civis=\E[1r, clear=\E[2J, + cnorm=\E[r, cr=\r, cub1=^H, cud1=\n, cup=\E[%i%p1%d;%p2%df, + dch=\E[%p1%dP, dch1=\E[P, dim=\E[0;2m, + dsl=\EPY99:98\E\\\E[0;98v\E[2J\E[v, fsl=\E[v, + home=\E[H, ht=\E[I, ind=\n, invis=\E[0;8m, is1=\E[?=h\Ec\E`\E[?>h\EPY99:98\E\\, is2=\E[5;>;12;18;?h\EPY99:98\E\\, - smir=\E[4h, smso=\E[0;7m, smul=\E[0;4m, tbc=\E[3g, - tsl=\EPY99:98\E\\\E[0;98v\E[2;7m, + smir=\E[4h, smso=\E[0;7m, smul=\E[0;4m, + tsl=\EPY99:98\E\\\E[0;98v\E[2;7m, use=ansi+arrows, + use=ansi+erase, use=ansi+idl, use=ansi+inittabs, + use=ansi+local, use=ansi+sgrdim, use=dec+sl, + tws2102-sna|dku7102-sna|Bull Questar tws2102 for SNA, dsl=\E[0;98v\E[2J\E[v, fsl=\E[v, is3=\Eb, tsl=\E[0;98v, use=tws-generic, @@ -22303,39 +22248,30 @@ dku7202|Bull Questar 200 DKU7202 (colour/character attributes), # This entry covers BQ303, BQ306, BQ310, Q303, Q306, Q310 bq300|Bull VT320 ISO Latin 1 80 columns terminal, - am, eo, eslok, hs, km, mir, msgr, xenl, xon, - cols#80, it#8, lines#24, vt#3, wsl#80, - acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, - bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[J, cr=\r, - csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=\E[D, - cud=\E[%p1%dB, cud1=\E[B, cuf=\E[%p1%dC, cuf1=\E[C, - cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, - dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M, - dsl=\E[1$}\E[2$~\n\E[0$}, ech=\E[%p1%dX, ed=\E[J, - el=\E[K, el1=\E[1K, enacs=\E(B\E)0, - flash=\E[?5h$<50>\E[?5l, fsl=\E[0$}, home=\E[H, ht=^I, - hts=\EH, ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L, ind=\ED, - is1=\E[63;1"p\E[2h, + eo, km, mir, xenl, xon, + vt#3, wsl#80, + blink=\E[5m, bold=\E[1m, cup=\E[%i%p1%d;%p2%dH, + dch=\E[%p1%dP, dch1=\E[P, dsl=\E[1$}\E[2$~\n\E[0$}, + ech=\E[%p1%dX, el1=\E[1K, flash=\E[?5h$<50>\E[?5l, + ich=\E[%p1%d@, ind=\ED, is1=\E[63;1"p\E[2h, is2=\E[?2h\E[?3l\E[?5l\E[?7h\E[?8h\E>\E[?1l\E\sF\E[?42l\E[?4 l, is3=\E[0$}\E[?25h\E[2l\E[H\E[J, ka1=\EOw, ka3=\EOy, - kb2=\EOu, kbs=^H, kc1=\EOq, kc3=\EOs, kcub1=\E[D, kcud1=\E[B, - kcuf1=\E[C, kcuu1=\E[A, kf1=\EOP, kf10=\E[21~, kf11=\E[23~, - kf12=\E[24~, kf13=\E[25~, kf14=\E[26~, kf15=\E[28~, - kf16=\E[29~, kf17=\E[31~, kf18=\E[32~, kf19=\E[33~, - kf2=\EOQ, kf20=\E[34~, kf3=\EOR, kf4=\EOS, kf6=\E[17~, - kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, khlp=\E[28~, - krdo=\E[29~, lf1=pf1, lf2=pf2, lf3=pf3, lf4=pf4, nel=\EE, - rc=\E8, rev=\E[7m, ri=\EM, rmacs=\E(B, rmam=\E[?7l, - rmcup=\E[?7h, rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[27m, - rmul=\E[24m, rs1=\E[!p, rs2=\E[?3l, s0ds=\E(B, s1ds=\E(0, - sc=\E7, + kb2=\EOu, kc1=\EOq, kc3=\EOs, kf1=\EOP, kf2=\EOQ, kf3=\EOR, + kf4=\EOS, khlp=\E[28~, krdo=\E[29~, lf1=pf1, lf2=pf2, + lf3=pf3, lf4=pf4, nel=\EE, rev=\E[7m, ri=\EM, rmacs=\E(B, + rmam=\E[?7l, rmcup=\E[?7h, rmir=\E[4l, rmkx=\E[?1l\E>, + rmso=\E[27m, rmul=\E[24m, rs1=\E[!p, rs2=\E[?3l, s0ds=\E(B, + s1ds=\E(0, sgr=\E[%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1 %;m%?%p9%t\E(0%e\E(B%;, sgr0=\E[0m\E(B, smacs=\E(0, smam=\E[?7h, smcup=\E[?7l\E[?1l\E(B, smir=\E[4h, smso=\E[7m, - smul=\E[4m, tbc=\E[3g, tsl=\E[1$}\E[2$~, use=ansi+enq, - use=vt220+vtedit, use=ansi+pp, use=vt220+cvis, + smul=\E[4m, tsl=\E[1$}\E[2$~, use=ansi+enq, use=ansi+csr, + use=ansi+erase, use=ansi+idl, use=ansi+local, + use=ansi+pp, use=dec+sl, use=vt100+4bsd, use=vt220+cvis, + use=vt220+vtedit, use=vt220+sfkeys, use=vt220+ufkeys, + bq300-rv|Bull VT320 reverse 80 columns, flash=\E[?5l$<50>\E[?5h, is2=\E[?2h\E[?3l\E[?5h\E[?7h\E[?8h\E>\E[?1l\E\sF\E[?42l\E[?4 @@ -22408,28 +22344,26 @@ bq300-w-rv|Bull VT320 reverse mode 132 columns, # and : 22 Bold off, 24 Underline off, 25 Blinking off, 27 Reverse off # (bq300-8: ,,,,, to get under 1024 --esr) bq300-8|Bull VT320 full 8 bits 80 columns, - am, eo, eslok, hs, km, mc5i, mir, msgr, xenl, xon, - cols#80, it#8, lines#24, vt#3, wsl#80, - acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, - bel=^G, blink=\2335m, bold=\2331m, clear=\233H\233J, cr=\r, + eo, eslok, hs, km, mc5i, mir, xenl, xon, + vt#3, wsl#80, + blink=\2335m, bold=\2331m, clear=\233H\233J, csr=\233%i%p1%d;%p2%dr, cub=\233%p1%dD, cub1=\2331D, cud=\233%p1%dB, cud1=\2331B, cuf=\233%p1%dC, cuf1=\2331C, cup=\233%i%p1%d;%p2%dH, cuu=\233%p1%dA, cuu1=\2331A, dch=\233%p1%dP, dch1=\233P, dl=\233%p1%dM, dl1=\233M, dsl=\2331$}\2332$~\n\2330$}, ech=\233%p1%dX, ed=\233J, - el=\233K, el1=\2331K, enacs=\E(B\E)0, - flash=\233?5h$<50>\233?5l, fsl=\2330$}, home=\233H, - ht=^I, hts=\EH, ich=\233%p1%d@, il=\233%p1%dL, il1=\233L, - ind=\ED, is1=\E[63;2"p\E[2h, + el=\233K, el1=\2331K, flash=\233?5h$<50>\233?5l, + fsl=\2330$}, home=\233H, ich=\233%p1%d@, il=\233%p1%dL, + il1=\233L, ind=\ED, is1=\E[63;2"p\E[2h, is2=\E[?2h\E[?3l\E[?5l\E[?7h\E[?8h\E>\E[?1l\E\sG\E[?42l\E[?4 l, is3=\2330$}\233?25h\2332l\233H\233J, ka1=\217w, - ka3=\217y, kb2=\217u, kbs=^H, kc1=\217q, kc3=\217s, - kcub1=\233D, kcud1=\233B, kcuf1=\233C, kcuu1=\233A, - kdch1=\2333~, kf1=\217P, kf10=\23321~, kf11=\23323~, - kf12=\23324~, kf13=\23325~, kf14=\23326~, kf15=\23328~, - kf16=\23329~, kf17=\23331~, kf18=\23332~, kf19=\23333~, - kf2=\217Q, kf20=\23334~, kf3=\217R, kf4=\217S, kf6=\23317~, + ka3=\217y, kb2=\217u, kc1=\217q, kc3=\217s, kcub1=\233D, + kcud1=\233B, kcuf1=\233C, kcuu1=\233A, kdch1=\2333~, + kf1=\217P, kf10=\23321~, kf11=\23323~, kf12=\23324~, + kf13=\23325~, kf14=\23326~, kf15=\23328~, kf16=\23329~, + kf17=\23331~, kf18=\23332~, kf19=\23333~, kf2=\217Q, + kf20=\23334~, kf3=\217R, kf4=\217S, kf6=\23317~, kf7=\23318~, kf8=\23319~, kf9=\23320~, kfnd=\2331~, khlp=\23328~, kich1=\2332~, knp=\2336~, kpp=\2335~, krdo=\23329~, kslt=\2334~, lf1=pf1, lf2=pf2, lf3=pf3, @@ -22443,7 +22377,7 @@ bq300-8|Bull VT320 full 8 bits 80 columns, sgr0=\2330m\E(B, smacs=\E(0, smam=\233?7h, smcup=\233?7l\233?1l\E(B, smir=\2334h, smso=\2337m, smul=\2334m, tbc=\2333g, tsl=\2331$}\2332$~, - use=vt220+cvis8, + use=vt100+4bsd, use=vt220+cvis8, bq300-8rv|Bull VT320 8-bit reverse mode 80 columns, flash=\233?5l$<50>\233?5h, is2=\E[?2h\E[?3l\E[?5h\E[?7h\E[?8h\E>\E[?1l\E\sG\E[?42l\E[?4 @@ -22492,13 +22426,12 @@ bq300-pc-w-rv|Questar 303 with PC keyboard reverse mode 132 columns, # 8 bit Control Characters, # 80 columns screen. bq300-8-pc|Q306-8-pc|Questar 303 with PC keyboard in full 8 bits 80 columns, - kbs=^H, kdch1=\2333~, kend=\2334~, kf1=\23317~, - kf10=\23328~, kf11=\23329~, kf12=\23331~, kf13@, kf14@, - kf15@, kf16@, kf17@, kf18@, kf19@, kf2=\23318~, kf20@, - kf3=\23319~, kf4=\23320~, kf5=\23321~, kf6=\23323~, - kf7=\23324~, kf8=\23325~, kf9=\23326~, kfnd@, khlp@, - khome=\2331~, kich1=\2332~, knp=\2336~, kpp=\2335~, krdo@, - kslt@, lf1@, lf2@, lf3@, lf4@, use=bq300-8, + kend=\2334~, kf1=\23317~, kf10=\23328~, kf11=\23329~, + kf12=\23331~, kf13@, kf14@, kf15@, kf16@, kf17@, kf18@, kf19@, + kf2=\23318~, kf20@, kf3=\23319~, kf4=\23320~, kf5=\23321~, + kf6=\23323~, kf7=\23324~, kf8=\23325~, kf9=\23326~, kfnd@, + khlp@, khome=\2331~, krdo@, kslt@, lf1@, lf2@, lf3@, lf4@, + use=bq300-8, bq300-8-pc-rv|Questar 303 with PC keyboard full 8 bits reverse mode 80 columns, flash=\E[?5l$<50>\E[?5h, is2=\E[?2h\E[?3l\E[?5h\E[?7h\E[?8h\E>\E[?1l\E\sG\E[?42l\E[?4 @@ -22571,17 +22504,15 @@ bq300-8-pc-w-rv|Questar 303 with PC keyboard full 8 bits reverse 132 columns, # This covers the vip7800 and BQ3155-vip7800 vip|Bull Questar 3155-7800, am, eslok, hs, km, mc5i, msgr, xenl, xon, - cols#80, it#8, lines#24, vt#3, wsl#80, - acsc=0pjdkblamcnkqitgufvhwexj, bel=^G, blink=\EsB, - cbt=\E[Z, clear=\E`, cr=\r, cub1=^H, cud1=\n, cuf1=\EC, - cup=\E[%i%p1%03d%p2%03df, cuu1=\EA, dch1=\E[P, dim=\EsL, - dl1=\E[M, dsl=\Ev, ed=\EJ, el=\EK, - flash=\007$<80>\007$<80>\007, fsl=\EO, home=\EH, ht=^I, - hts=\Ep, ich1=\E[I, ind=\n, invis=\EsH, + vt#3, wsl#80, + acsc=0pjdkblamcnkqitgufvhwexj, blink=\EsB, clear=\E`, + cub1=^H, cud1=\n, cup=\E[%i%p1%03d%p2%03df, dch1=\E[P, + dim=\EsL, dl1=\E[M, dsl=\Ev, + flash=\007$<80>\007$<80>\007, fsl=\EO, hts=\Ep, + ich1=\E[I, invis=\EsH, is2=\E[00u\E[<>001001024080024080u\E[01u, - is3=\Er\E[W\E`, kHOM=\EH, kLFT=\Eo, kRIT=\Eu, kbs=^H, - kcbt=\E[Z, kclr=\E`, kctab=\E[g, kcub1=\ED, kcud1=\EB, - kcuf1=\EC, kcuu1=\EA, kdch1=\E[P, kdl1=\E[M, ked=\EJ, + is3=\Er\E[W\E`, kHOM=\EH, kLFT=\Eo, kRIT=\Eu, kcbt=\E[Z, + kclr=\E`, kctab=\E[g, kdch1=\E[P, kdl1=\E[M, ked=\EJ, kel=\EK, kf1=\E0, kf10=\ET, kf11=\E\\, kf12=\E\^, kf13@, kf14@, kf15@, kf16@, kf17@, kf18@, kf19@, kf2=\E2, kf20@, kf21=\E1, kf22=\E5, kf23=\E7, kf24=\E9, kf25=\E;, kf26=\E=, kf27=\E?, @@ -22594,7 +22525,8 @@ vip|Bull Questar 3155-7800, ri=\EA\EJ\EH\E[L$<10>, rmacs=\EF, rmir=\E[J, rmso=\EsR, rmul=\EsR, rs1=\Ec, rs2=\E[G, s0ds=\EF, s1ds=\EG, sgr0=\EsR\EsU\EF, smacs=\EG, smir=\E[I, smso=\EsI, - smul=\Es_, tbc=\E[N, tsl=\Ew, + smul=\Es_, tbc=\E[N, tsl=\Ew, use=ansi+inittabs, + use=vt52-basic, # normal screen, 8 bits, 132 columns terminal. vip-w|vip7800-w|Q310-vip-w|Q310-vip-w-am|Questar 3155-vip7800 wide, cols#132, wsl#132, @@ -22773,8 +22705,7 @@ vt50|DEC VT50, cuu1=\EA, ed=\EJ, el=\EK, ht=^I, ind=\n, u8=\E/A, u9=\EZ, vt50h|DEC VT50h, cub1=\ED, cud1=\EB, cup=\EY%p1%{32}%+%c%p2%{32}%+%c, - kcub1=\ED, kcud1=\EB, kcuf1=\EC, kcuu1=\EA, u8=\E/[HJ], - use=vt52+keypad, use=vt50, + u8=\E/[HJ], use=vt52+keypad, use=vt50, use=vt52+arrows, # (vt61: there's a BSD termcap that claims , ) vt61|vt-61|vt61.5|DEC VT61, @@ -22782,24 +22713,21 @@ vt61|vt-61|vt61.5|DEC VT61, bel=^G, clear=\EH\EJ$<120>, cr=\r$<20>, cub1=^H, cud1=\n, cuf1=\EC$<20>, cup=\EY%p1%{32}%+%c%p2%{32}%+%c$<20>, cuu1=\EA$<20>, ed=\EJ$<120>, el=\EK$<70>, ht=^I, - ind=\n$<20>, kcub1=\ED, kcud1=\EB, kcuf1=\EC, kcuu1=\EA, - ri=\E$<20>I, + ind=\n$<20>, ri=\E$<20>I, use=vt52+arrows, # The gigi does standout with red! # (gigi: I added / based on the init string, corrected cub1 -- esr) gigi|vk100|DEC gigi graphics terminal, OTbs, am, xenl, cols#84, lines#24, - bel=^G, clear=\E[H\E[2J, cr=\r, cub=\E[%p1%dD, cub1=^H, - cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C, - cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, ed=\E[J, - el=\E[K, ht=^I, ind=\n, + bel=^G, clear=\E[H\E[2J, cr=\r, cub1=^H, cud1=\n, + cup=\E[%i%p1%d;%p2%dH, ed=\E[J, el=\E[K, ht=^I, ind=\n, is2=\E>\E[?3l\E[?4l\E[?5l\E[?20l\E[?7h\E[?8h, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, khome=\E[H, ri=\EM, rmam=\E[?7l, rmkx=\E[?1l\E>, rmso=\E[m, rmul=\E[m, sgr0=\E[m, smam=\E[?7h, smkx=\E[?1h\E=, smso=\E[7;31m, - smul=\E[4m, + smul=\E[4m, use=ansi+local, # DEC PRO-350 console (VT220-style). The 350 was DEC's attempt to produce # a PC differentiated from the IBM clones. It was a total, ludicrous, @@ -22812,10 +22740,10 @@ pro350|decpro|DEC pro console, acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, clear=\EH\EJ, cub1=^H, cud1=\EB, cuf1=\EC, cup=\EY%p1%{32}%+%c%p2%{32}%+%c, cuu1=\EA, ed=\EJ, - el=\EK, home=\EH, ht=^I, kcub1=\ED, kcud1=\EB, kcuf1=\EC, - kcuu1=\EA, kf0=\EE, kf1=\EF, kf2=\EG, kf3=\EH, kf4=\EI, - kf5=\EJ, kf6=\Ei, kf7=\Ej, khome=\EH, ri=\EI, rmacs=\EG, - rmso=\E^N, rmul=\E^C, smacs=\EF, smso=\E^H, smul=\E^D, + el=\EK, home=\EH, ht=^I, kf0=\EE, kf1=\EF, kf2=\EG, kf3=\EH, + kf4=\EI, kf5=\EJ, kf6=\Ei, kf7=\Ej, khome=\EH, ri=\EI, + rmacs=\EG, rmso=\E^N, rmul=\E^C, smacs=\EF, smso=\E^H, + smul=\E^D, use=vt52+arrows, dw1|DECwriter I, OTbs, hc, os, @@ -22864,8 +22792,7 @@ ln03|DEC ln03 laser printer, smul=\E[4m, ln03-w|DEC ln03 laser printer 132 cols, cols#132, - bel=^G, cr=\r, cud1=\n, ht=^I, ind=\n, kbs=^H, kcub1=^H, - kcud1=\n, nel=\r\n, use=ln03, + kbs=^H, kcub1=^H, kcud1=\n, use=ln03, #### Delta Data (dd) # @@ -22890,17 +22817,17 @@ ddr|rebus3180|ddr3180|Rebus/DDR 3180 VT100 emulator, OTbs, am, xenl, cols#80, it#8, lines#24, vt#3, blink=\E[5m$<2/>, bold=\E[1m$<2/>, - clear=\E[H\E[2J$<50/>, csr=\E[%i%p1%d;%p2%dr, cub1=^H, - cud1=\n, cuf1=\E[C$<2/>, cup=\E[%i%p1%d;%p2%dH$<5/>, - cuu1=\E[A$<2/>, ed=\E[J$<50/>, el=\E[K$<3/>, home=\E[H, - ht=^I, ind=\ED$<5/>, is2=\E[1;24r\E[24;1H, kbs=^H, - kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf1=\EOP, - kf2=\EOQ, kf3=\EOR, kf4=\EOS, rc=\E8, rev=\E[7m$<2/>, + clear=\E[H\E[2J$<50/>, cub1=^H, cud1=\n, cuf1=\E[C$<2/>, + cup=\E[%i%p1%d;%p2%dH$<5/>, cuu1=\E[A$<2/>, + ed=\E[J$<50/>, el=\E[K$<3/>, home=\E[H, ht=^I, + ind=\ED$<5/>, is2=\E[1;24r\E[24;1H, kbs=^H, kcub1=\E[D, + kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf1=\EOP, kf2=\EOQ, + kf3=\EOR, kf4=\EOS, rev=\E[7m$<2/>, rf=/usr/share/tabset/vt100, ri=\EM$<5/>, rmam=\E[7l, rmkx=\E[?1l\E>, rmso=\E[m, rmul=\E[m$<2/>, - rs1=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, sc=\E7, + rs1=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, sgr0=\E[m$<2/>, smam=\E[7l, smkx=\E[?1h\E=, smso=\E[7m, - smul=\E[4m$<2/>, + smul=\E[4m$<2/>, use=ansi+csr, #### Evans & Sutherland # @@ -23006,11 +22933,11 @@ h19|heath|h19-b|heathkit|heath-19|z19|zenith|Heathkit h19, clear=\EE, cnorm=\Ey4, cr=\r, cub1=^H, cud1=\EB, cuf1=\EC, cup=\EY%p1%{32}%+%c%p2%{32}%+%c, cuu1=\EA, cvvis=\Ex4, dch1=\EN, ed=\EJ, el=\EK, fsl=\Ek\Ey5, home=\EH, ht=^I, ind=\n, - ip=$<1.5/>, kbs=^H, kcub1=\ED, kcud1=\EB, kcuf1=\EC, - kcuu1=\EA, kf1=\ES, kf2=\ET, kf3=\EU, kf4=\EV, kf5=\EW, - kf6=\EP, kf7=\EQ, kf8=\ER, khome=\EH, lf6=blue, lf7=red, - lf8=white, ri=\EI, rmacs=\EG, rmir=\EO, rmso=\Eq, smacs=\EF, - smir=\E@, smso=\Ep, tsl=\Ej\Ex5\EY8%p1%{32}%+%c\Eo\Eo, + ip=$<1.5/>, kbs=^H, kf1=\ES, kf2=\ET, kf3=\EU, kf4=\EV, + kf5=\EW, kf6=\EP, kf7=\EQ, kf8=\ER, khome=\EH, lf6=blue, + lf7=red, lf8=white, ri=\EI, rmacs=\EG, rmir=\EO, rmso=\Eq, + smacs=\EF, smir=\E@, smso=\Ep, + tsl=\Ej\Ex5\EY8%p1%{32}%+%c\Eo\Eo, use=vt52+arrows, h19-u|Heathkit with underscore cursor, cnorm@, cvvis@, use=h19-b, h19-g|h19g|Heathkit w/block cursor, @@ -23068,12 +22995,11 @@ z29|zenith29|z29b|Zenith z29b, cvvis=\Ex4, dch1=\EN$<0.1*>, dl1=\EM$<1/>, dsl=\Ey1, ed=\EJ$<14>, el=\EK$<1>, fsl=\Ek\Ey5, home=\EH, ht=^I, ich1=\E<\E[1@\E[?2h$<1>, il1=\EL$<1/>, ind=\n$<2>, - is2=\E<\E[?2h\Ev, kbs=^H, kcub1=\ED, kcud1=\EB, kcuf1=\EC, - kcuu1=\EA, kf0=\E~, kf1=\ES, kf2=\ET, kf3=\EU, kf4=\EV, - kf5=\EW, kf6=\EP, kf7=\EQ, kf8=\ER, kf9=\E0I, khome=\EH, - lf0=home, ri=\EI$<2/>, rmacs=\EF, rmir=\EO, rmso=\Eq, - rmul=\Es0, smacs=\EG, smir=\E@, smso=\Ep, smul=\Es8, - tsl=\Ej\Ex5\Ex1\EY8%+ \Eo, + is2=\E<\E[?2h\Ev, kbs=^H, kf0=\E~, kf1=\ES, kf2=\ET, kf3=\EU, + kf4=\EV, kf5=\EW, kf6=\EP, kf7=\EQ, kf8=\ER, kf9=\E0I, + khome=\EH, lf0=home, ri=\EI$<2/>, rmacs=\EF, rmir=\EO, + rmso=\Eq, rmul=\Es0, smacs=\EG, smir=\E@, smso=\Ep, + smul=\Es8, tsl=\Ej\Ex5\Ex1\EY8%+ \Eo, use=vt52+arrows, # z29 in ANSI mode. Assumes that the cursor is in the correct state, and that # the world is stable. causes the terminal to be reset to the state # indicated by the name. kc -> key click, nkc -> no key click, uc -> underscore @@ -23085,22 +23011,20 @@ z29a|z29a-kc-bc|h29a-kc-bc|Heath/Zenith 29 in ANSI mode, OTbs, OTpt, am, eslok, hs, mir, msgr, OTkn#10, cols#80, it#8, lines#24, OTbc=\ED, bel=^G, blink=\E[5m, bold=\E[2m, clear=\E[2J, - cr=\r, csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H, - cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C, - cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, - dch=\E[%p1%dP, dch1=\E[1P, dim=\E[2m, dl=\E[%p1%dM, - dl1=\E[M, dsl=\E[>1l, ed=\E[J, el=\E[K, fsl=\E[u\E[>5l, + cr=\r, csr=\E[%i%p1%d;%p2%dr, cub1=^H, cud1=\n, + cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[1P, + dim=\E[2m, dsl=\E[>1l, ed=\E[J, el=\E[K, fsl=\E[u\E[>5l, home=\E[H, ht=^I, hts=\EH, if=/usr/share/tabset/vt100, - il=\E[%p1%dL, il1=\E[L, ind=\ED, kbs=^H, kclr=\E[J, - kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, ked=\E[J, - kf0=\E[~, kf1=\EOS, kf2=\EOT, kf3=\EOU, kf4=\EOV, kf5=\EOW, - kf6=\EOP, kf7=\EOQ, kf8=\EOR, kf9=\EOX, khome=\E[H, lf0=help, - mc0=\E#7, nel=\r\ED, rc=\E[r, rev=\E[7m, ri=\EM, - rmcup=\E[?7h, rmso=\E[m, rmul=\E[m, + ind=\ED, kclr=\E[J, ked=\E[J, kf0=\E[~, kf1=\EOS, kf2=\EOT, + kf3=\EOU, kf4=\EOV, kf5=\EOW, kf6=\EOP, kf7=\EOQ, kf8=\EOR, + kf9=\EOX, khome=\E[H, lf0=help, mc0=\E#7, nel=\r\ED, rc=\E[r, + rev=\E[7m, ri=\EM, rmcup=\E[?7h, rmso=\E[m, rmul=\E[m, rs1=\E<\E[1;24r\E[24;1H\E[?7h\E[>4h\E[>1;2;3;5;6;7;8;9l\E[m \E[11m, sc=\E[s, sgr0=\E[m, smcup=\E[?7l, smso=\E[7;2m, smul=\E[4m, tbc=\E[3g, tsl=\E[s\E[>5;1h\E[25;%i%dH\E[1K, + use=ansi+apparrows, use=ansi+idl, use=ansi+local, + z29a-kc-uc|h29a-kc-uc|Zenith z29 ANSI mode with keyclick and underscore cursor, rs1=\E<\E[1;24r\E[24;1H\E[?7h\E[>1;2;3;4;5;6;7;8;9l\E[m\E[11 m, @@ -23115,27 +23039,24 @@ z29a-nkc-uc|h29a-nkc-uc|Zenith z29 ANSI mode with underscore cursor and no keycl use=z29a, # From: Jeff Bartig 31 Mar 1995 z39-a|z39a|zenith39-a|zenith39-ansi|Zenith 39 in ANSI mode, - am, eslok, hs, mc5i, mir, msgr, xon, + am, eslok, hs, mir, msgr, xon, cols#80, lines#24, acsc=0a``aaffggjjkkllmmnnooqqssttuuvvwwxx~~, bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[1Z, civis=\E[>5h, clear=\E[2J\E[H, cnorm=\E[>5l, cr=\r, - csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H, - cud=\E[%p1%dB, cud1=\E[B, cuf=\E[%p1%dC, cuf1=\E[C, - cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, + csr=\E[%i%p1%d;%p2%dr, cub1=^H, cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[1P, dim=\E[2m, dl=\E[%p1%dM, dl1=\E[1M, dsl=\E[>1l, ed=\E[0J, el=\E[0K, el1=\E[1K, - fsl=\E[u, home=\E[H, ht=^I, hts=\EH, il=\E[%p1%dL, il1=\E[1L, - ind=\n, is2=\E<\E[>1;3;5;6;7l\E[0m\E[2J, ka1=\EOw, - ka3=\EOu, kb2=\EOy, kbs=^H, kc1=\EOq, kc3=\EOs, kcub1=\E[D, - kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, ked=\E[J, kf1=\EOS, - kf2=\EOT, kf3=\EOU, kf4=\EOV, kf5=\EOW, kf6=\EOP, kf7=\EOQ, - kf8=\EOR, kf9=\EOX, khlp=\E[~, khome=\E[H, ll=\E[24;1H, - mc0=\E[?19h\E[i, mc4=\E[4i, mc5=\E[5i, rc=\E[u, rev=\E[7m, - rmacs=\E(B, rmir=\E[4l, rmkx=\E[>7l, rmso=\E[0m, + fsl=\E[u, home=\E[H, il=\E[%p1%dL, il1=\E[1L, ind=\n, + is2=\E<\E[>1;3;5;6;7l\E[0m\E[2J, ka1=\EOw, ka3=\EOu, + kb2=\EOy, kc1=\EOq, kc3=\EOs, ked=\E[J, kf1=\EOS, kf2=\EOT, + kf3=\EOU, kf4=\EOV, kf5=\EOW, kf6=\EOP, kf7=\EOQ, kf8=\EOR, + kf9=\EOX, khlp=\E[~, ll=\E[24;1H, mc0=\E[?19h\E[i, rc=\E[u, + rev=\E[7m, rmacs=\E(B, rmir=\E[4l, rmkx=\E[>7l, rmso=\E[0m, rmul=\E[0m, rs2=\E<\Ec\0, sc=\E[s, sgr0=\E[0m, smacs=\E(0, - smir=\E[4h, smkx=\E[>7h, smso=\E[7m, smul=\E[4m, tbc=\E[3g, - tsl=\E[s\E[>1h\E[25;%i%p1%dH, + smir=\E[4h, smkx=\E[>7h, smso=\E[7m, smul=\E[4m, + tsl=\E[s\E[>1h\E[25;%i%p1%dH, use=ansi+arrows, + use=ansi+local, use=ansi+pp, use=ansi+tabs, # From: Brad Brahms z100|h100|z110|z-100|h-100|Heath/Zenith z-100 pc with color monitor, @@ -23148,11 +23069,10 @@ z100bw|h100bw|z110bw|z-100bw|h-100bw|Heath/Zenith z-100 pc, clear=\EE$<5*/>, cnorm=\Ey4, cub1=^H, cud1=\EB, cuf1=\EC, cup=\EY%p1%{32}%+%c%p2%{32}%+%c$<1*/>, cuu1=\EA, cvvis=\Ex4, dch1=\EN$<1*/>, dl1=\EM$<5*/>, ed=\EJ, el=\EK, - home=\EH, ht=^I, il1=\EL$<5*/>, kbs=^H, kcub1=\ED, kcud1=\EB, - kcuf1=\EC, kcuu1=\EA, kf0=\EJ, kf1=\ES, kf2=\ET, kf3=\EU, - kf4=\EV, kf5=\EW, kf6=\EP, kf7=\EQ, kf8=\ER, kf9=\EOI, - khome=\EH, ri=\EI, rmacs=\EG, rmir=\EO, rmso=\Eq, smacs=\EF, - smir=\E@, smso=\Ep, + home=\EH, ht=^I, il1=\EL$<5*/>, kbs=^H, kf0=\EJ, kf1=\ES, + kf2=\ET, kf3=\EU, kf4=\EV, kf5=\EW, kf6=\EP, kf7=\EQ, kf8=\ER, + kf9=\EOI, khome=\EH, ri=\EI, rmacs=\EG, rmir=\EO, rmso=\Eq, + smacs=\EF, smir=\E@, smso=\Ep, use=vt52+arrows, p19|h19-b with il1/dl1, dl1=\EM$<2*/>, il1=\EL$<2*/>, use=h19-b, # From: @@ -23164,10 +23084,9 @@ ztx|ztx11|zt-1|htx11|ztx-1-a|Heath/Zenith ztx-10 or 11, cup=\EY%p1%{32}%+%c%p2%{32}%+%c, cuu1=\EA, dl1=\EM, dsl=\Ey1, ed=\EJ, el=\EK, fsl=\Ek\Ey5, home=\EH, ht=^I, il1=\EL, is2=\Ej\EH\Eq\Ek\Ev\Ey1\Ey5\EG\Ey8\Ey9\Ey>, - kbs=^H, kcub1=\ED, kcud1=\EB, kcuf1=\EC, kcuu1=\EA, kf0=\ES, - kf1=\EB, kf2=\EU, kf3=\EV, kf4=\EW, kf5=\EP, kf6=\EQ, kf7=\ER, - ri=\EI, rmso=\Eq, rmul=\Eq, smso=\Es5, smul=\Es2, - tsl=\Ej\Ex5\Ex1\EY8%+ \Eo, + kbs=^H, kf0=\ES, kf1=\EB, kf2=\EU, kf3=\EV, kf4=\EW, kf5=\EP, + kf6=\EQ, kf7=\ER, ri=\EI, rmso=\Eq, rmul=\Eq, smso=\Es5, + smul=\Es2, tsl=\Ej\Ex5\Ex1\EY8%+ \Eo, use=vt52+arrows, #### IMS International (ims) # @@ -23256,16 +23175,13 @@ graphos|graphos III, am, mir, cols#80, it#8, lines#24, clear=\E[H\E[2J, cnorm=\Ez56;2;0;0z\Ez73z\Ez4;1;1z, - cr=\r, cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\E[B, - cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, - cuu=\E[%p1%dA, cuu1=\E[A, - cvvis=\Ez4;2;1z\Ez56;2;80;24z, dch1=\E[P, dl=\E[%p1%dM, - dl1=\E[M, ed=\E[J, el=\E[K, home=\E[H, ht=^I, il=\E[%p1%dL, - il1=\E[L, ind=\ED, kbs=^H, kcub1=\E[D, kcud1=\E[B, - kcuf1=\E[C, kcuu1=\E[A, kf1=\EOP, kf2=\EOQ, kf3=\EOR, - kf4=\EOS, khome=\E[H, nel=\r\ED, rc=\E8, ri=\EM, rmdc=\E[4l, - rmir=\E[4l, rmso=\E[m, sc=\E7, sgr0=\E[m, smdc=\E[4h, - smir=\E[4h, smso=\E[7m, + cr=\r, cub1=^H, cvvis=\Ez4;2;1z\Ez56;2;80;24z, dch1=\E[P, + ht=^I, ind=\ED, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, + nel=\r\ED, rc=\E8, ri=\EM, rmdc=\E[4l, rmir=\E[4l, sc=\E7, + sgr0=\E[m, smdc=\E[4h, smir=\E[4h, use=ansi+arrows, + use=ansi+cup, use=ansi+erase, use=ansi+idl, + use=ansi+local, use=ansi+sgrso, + graphos-30|graphos III with 30 lines, lines#30, cvvis=\Ez4;2;1z\Ez56;2;80;30z, use=graphos, @@ -23295,7 +23211,6 @@ graphos-30|graphos III with 30 lines, modgraph|mod24|modgraph terminal emulating VT100, xenl@, - cols#80, lines#24, cvvis=\E\^9;0s\E\^7;1s, is2=\E\^9;0s\E\^7;1s\E[3g\E\^11;9s\E\^11;17s\E\^11;25s\E\^11 ;33s\E\^11;41s\E\^11;49s\E\^11;57s\E\^11;65s\E\^11;73s @@ -23330,15 +23245,15 @@ modgraph48|mod|Modgraph w/48 lines, OTbs, OTpt, am, xenl, cols#80, it#8, lines#48, vt#3, OTnl=\n, bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[;H\E[2J, - cr=\r, csr=\E[%i%p1%d;%p2%dr, cub1=^H, cud1=\n, cuf1=\E[C, - cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, ed=\E[J, el=\E[K, + cr=\r, cub1=^H, cud1=\n, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, + cuu1=\E[A, ed=\E[J, el=\E[K, flash=\E[?5h\E[0q\E[1;2q\E[?5l\E[0q\E[4;3q, home=\E[H, ht=^I, is2=\E<\E[1;48r\E[0q\E[3;4q\E=\E[?1h, kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, - kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, rc=\E8, rev=\E[7m, - ri=\EM, rmkx=\E[?1l\E>, rmso=\E[m, rmul=\E[m, - rs1=\E=\E[0q\E>, sc=\E7, sgr0=\E[m, smkx=\E[?1h\E=, - smso=\E[7m, smul=\E[4m, + kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, rev=\E[7m, ri=\EM, + rmkx=\E[?1l\E>, rmso=\E[m, rmul=\E[m, rs1=\E=\E[0q\E>, + sgr0=\E[m, smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, + use=ansi+csr, #### Morrow Designs # @@ -23419,21 +23334,20 @@ rt6221|Ramtek 6221 80x24, OTbs, OTpt, msgr, xon, OTkn#4, cols#80, it#8, lines#24, vt#3, acsc=, bel=^G, blink=\E[5m, bold=\E[1m, civis=\E[>5l, - clear=\E[1;1H\E[J, cnorm=\E[>5h\E[>9h, cr=\r, - csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H, - cud=\E[%p1%dB, cud1=^K, cuf=\E[%p1%dC, cuf1=\E[C, - cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\EM, + clear=\E[1;1H\E[J, cnorm=\E[>5h\E[>9h, cr=\r, cub1=^H, + cud1=^K, cup=\E[%i%p1%d;%p2%dH, cuu1=\EM, cvvis=\E[>7h\E[>9l, ed=\E[J, el=\E[K, home=\E[1;1H, ht=^I, hts=\EH, ind=\n, is2=\E)0, kbs=^H, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf0=\EOP, kf1=\EOQ, kf2=\EOR, kf3=\EOS, lf0=PF1, lf1=PF2, lf2=PF3, lf3=PF4, ll=\E[24;1H, - nel=\EE, rc=\E8, rev=\E[7m, ri=\EM, rmacs=^O, rmkx=\E>, - rmso=\E[m, rmul=\E[m, + nel=\EE, rev=\E[7m, ri=\EM, rmacs=^O, rmkx=\E>, rmso=\E[m, + rmul=\E[m, rs1=\E[1w\E[>37m\E[>39m\E[1v\E[20l\E[?3l\E[?6l\E[>5h\E[>6h \E[>7h\E[>8l\E[>9h\E[>10l\E[1;24r\E[m\E[q\E(B\017\E)0\E# 5\E>, - sc=\E7, sgr0=\E[m, smacs=^N, smkx=\E=, smso=\E[7m, - smul=\E[4m, tbc=\E[3g, + sgr0=\E[m, smacs=^N, smkx=\E=, smso=\E[7m, smul=\E[4m, + tbc=\E[3g, use=ansi+csr, use=ansi+local, + # [TO DO: Check out: short forms of ho/cl and ll; reset (\Ec)]. rt6221-w|Ramtek 6221 160x48, cols#160, lines#48, @@ -23468,21 +23382,19 @@ rca|RCA vp3301/vp3501, hirez100|Selanar HiREZ-100, OTbs, OTpt, mir, msgr, xon, OTkn#4, cols#80, it#8, lines#48, vt#3, - acsc=, bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[J, - cr=\r, cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\n, - cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, - cuu=\E[%p1%dA, cuu1=\EM, dch=\E[%p1%dP, dch1=\E[P, - dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K, home=\E[H, ht=^I, - hts=\EH, il=\E[%p1%dL, il1=\E[L, is2=\E<\E)0, kbs=^H, - kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kf0=\EOP, - kf1=\EOQ, kf2=\EOR, kf3=\EOS, lf0=PF1, lf1=PF2, lf2=PF3, - lf3=PF4, ll=\E[48H, mc0=\E[i, mc4=\E[4i\E[?4i, - mc5=\E[?5i\E[5i, nel=\EE, rc=\E8, rev=\E[7m, rmacs=^O, - rmkx=\E[?1l\E>, rmso=\E[m, rmul=\E[m, + acsc=, bel=^G, blink=\E[5m, bold=\E[1m, cr=\r, cub1=^H, + cud1=\n, cuu1=\EM, dch=\E[%p1%dP, dch1=\E[P, ht=^I, hts=\EH, + is2=\E<\E)0, kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, + kcuu1=\EOA, kf0=\EOP, kf1=\EOQ, kf2=\EOR, kf3=\EOS, lf0=PF1, + lf1=PF2, lf2=PF3, lf3=PF4, ll=\E[48H, mc0=\E[i, + mc4=\E[4i\E[?4i, mc5=\E[?5i\E[5i, nel=\EE, rc=\E8, + rev=\E[7m, rmacs=^O, rmkx=\E[?1l\E>, rs1=\030\E2\E<\E[4i\E[?4i\E[12h\E[2;4;20l\E[?0;7h\E[?1;3;6;1 9l\E[r\E[m\E(B\017\E)0\E>, - sc=\E7, sgr0=\E[m, smacs=^N, smkx=\E[?1h\E=, smso=\E[7m, - smul=\E[4m, tbc=\E[3g, + sc=\E7, sgr0=\E[m, smacs=^N, smkx=\E[?1h\E=, tbc=\E[3g, + use=ansi+cup, use=ansi+erase, use=ansi+idl, + use=ansi+local, use=ansi+sgrso, use=ansi+sgrul, + hirez100-w|Selanar HiREZ-100 in 132-column mode, cols#132, use=hirez100, @@ -23521,8 +23433,7 @@ vsc|Signetics Vsc Video driver by RMC, # (soroc120: removed obsolete ":ma=^K^P^R^L^L :" -- esr) soroc120|iq120|soroc|Soroc iq120, - clear=\E*$<2>, cud1=\n, ed=\EY, el=\ET, kcub1=^H, kcud1=\n, - kcuf1=^L, kcuu1=^K, use=adm3a, + clear=\E*$<2>, ed=\EY, el=\ET, use=adm3a, soroc140|iq140|Soroc iq140, OTbs, am, mir, cols#80, lines#24, @@ -23619,15 +23530,14 @@ synertek|ktm|synertek380|Synertek KTM 3/80 tubeless terminal, # https://ub.fnwi.uva.nl/computermuseum/tab13215g.html # This monochrome graphics terminal of TAB Products, California, is a DEC # VT52/VT100/VT132 compatible alphanumeric terminal (TAB 132/15), -# factory-fitted with additional hardware for Tektronix 4010 emulation. -# Also the terminal understands a selection of Tektronix 4027 commands. +# factory-fitted with additional hardware for Tektronix 4010 emulation. +# Also the terminal understands a selection of Tektronix 4027 commands. tab132|tab|tab132-15|tab 132/15, da, db, - OTdN@, cols#80, lines#24, lm#96, - cud1=\n, cup=\E[%i%p1%d;%p2%dH, dch1=\E[P, dl1=\E[M, - il1=\E[L, is2=\E[?7h\E[?3l\E[?5l, kcub1=\E[D, kcud1=\E[B, - kcuu1=\E[A, rmir=\E[4l, rmkx@, smir=\E[4h, smkx@, - use=decid+cpr, use=vt100+4bsd, + OTdN@, lm#96, + cup=\E[%i%p1%d;%p2%dH, dch1=\E[P, dl1=\E[M, il1=\E[L, + is2=\E[?7h\E[?3l\E[?5l, rmir=\E[4l, rmkx@, smir=\E[4h, + smkx@, use=decid+cpr, use=vt100+4bsd, tab132-w|tab132 in wide mode, cols#132, is2=\E[?7h\E[?3h\E[?5l, use=tab132, @@ -23682,7 +23592,7 @@ t1061f|Teleray 1061 with fast PROMs, # "Teleray Arpa Special", officially designated as # "Teleray Arpa network model 10" with "Special feature 720". # This is the new (1981) fast microcode updating the older "arpa" proms -# (which gave meta-key and programmable-fxn keys). 720 is much much faster, +# (which gave meta-key and programmable-fxn keys). 720 is much, much faster, # converts the keypad to programmable function keys, and has other goodies. # Standout mode is still broken (magic cookie, etc) so is suppressed as no # programs handle such lossage properly. @@ -23705,14 +23615,14 @@ t10|Teleray 10 special, t16|Teleray 16, am, da, db, mir, xhp, xt, cols#80, lines#24, - bel=^G, clear=\E[H\E[2J, cr=\r, cub1=^H, cud1=\E[B, - cuf1=\E[C, cup=%i\E[%p1%d;%p2%df, cuu1=\E[A, dch1=\E[P, - dl1=\E[M, ed=\E[0J, el=\E[0K, home=\E[H, ht=^I, il1=\E[L, - ind=\n, kf1=^Z1, kf10=^Z0, kf2=^Z2, kf3=^Z3, kf4=^Z4, kf5=^Z5, - kf6=^Z6, kf7=^Z7, kf8=^Z8, kf9=^Z9, ri=\E[T, - rmcup=\E[V\E[24;1f\E[?38h, rmir=\E[4l, rmso=\E[m, - rmul=\E[m, sgr0=\E[m, smcup=\E[U\E[?38l, smir=\E[4h, - smso=\E[7m, smul=\E[4m, + bel=^G, clear=\E[H\E[2J, cr=\r, cub1=^H, + cup=%i\E[%p1%d;%p2%df, dch1=\E[P, dl1=\E[M, ed=\E[0J, + el=\E[0K, home=\E[H, ht=^I, il1=\E[L, ind=\n, kf1=^Z1, + kf10=^Z0, kf2=^Z2, kf3=^Z3, kf4=^Z4, kf5=^Z5, kf6=^Z6, kf7=^Z7, + kf8=^Z8, kf9=^Z9, ri=\E[T, rmcup=\E[V\E[24;1f\E[?38h, + rmir=\E[4l, rmso=\E[m, rmul=\E[m, sgr0=\E[m, + smcup=\E[U\E[?38l, smir=\E[4h, smso=\E[7m, smul=\E[4m, + use=ansi+local1, #### Texas Instruments (ti) # @@ -23749,12 +23659,10 @@ ti703-w|ti707-w|Texas Instruments Silent 703/707 (132 column), # Texas Instruments 916 VDT 7 bit control mode # ti916|ti916-220-7|Texas Instruments 916 VDT 8859/1 VT220 mode 7 bit CTRL, - da, db, in, msgr, - cbt=\E[Z, clear=\E[H\E[2J$<6>, cub=\E[%p1%dD, - cud=\E[%p1%dB, cuf=\E[%p1%dC, cup=\E[%i%p1%d;%p2%dH, - cuu=\E[%p1%dA, dch=\E[%p1%dP$<250>, dch1=\E[P, - dl=\E[%p1%dM, ech=\E[%p1%dX$<20>, ed=\E[J$<6>, el=\E[0K, - el1=\E[1K, enacs=\E(B\E)0, ff=^L, flash=\E[?5h\E[?5l$<6>, + da, db, in, + cbt=\E[Z, clear=\E[H\E[2J$<6>, dch=\E[%p1%dP$<250>, + ech=\E[%p1%dX$<20>, ed=\E[J$<6>, el=\E[0K, + enacs=\E(B\E)0, ff=^L, flash=\E[?5h\E[?5l$<6>, hpa=\E[%p1%{1}%+%dG, hts=\E[0W, ich=\E[%p1%d@$<250>, il=\E[%p1%dL$<36>, ip=$<10>, is2=\E[1;24r\E[24;1H, kcmd=\E[29~, kdch1=\E[P, kent=\n, kf1=\E[17~, kf10=\E[28~, @@ -23762,18 +23670,17 @@ ti916|ti916-220-7|Texas Instruments 916 VDT 8859/1 VT220 mode 7 bit CTRL, kf4=\E[20~, kf5=\E[21~, kf6=\E[23~, kf7=\E[24~, kf8=\E[25~, kf9=\E[26~, khome=\E[H, kich1=\E[@, knp=\E[S, kpp=\E[T, kprt=^X, prot=\E&, rmacs=\017$<2>, rs2=\E[!p, sgr@, - smacs=\016$<2>, tbc=\E[3g, vpa=\E[%p1%{1}%+%dd, - use=vt220, + smacs=\016$<2>, vpa=\E[%p1%{1}%+%dd, use=vt220, # # Texas Instruments 916 VDT 8 bit control mode # ti916-8|ti916-220-8|Texas Instruments 916 VDT 8859/1 8 VT220 mode bit CTRL, kcmd=\23329~, kcub1=\233D, kcud1=\233B, kcuf1=\233C, - kcuu1=\233A, kdch1=\233P, kent=\n, kf1=\23317~, - kf10=\23328~, kf11=\23329~, kf12=\23331~, kf2=\23318~, - kf3=\23319~, kf4=\23320~, kf5=\23321~, kf6=\23323~, - kf7=\23324~, kf8=\23325~, kf9=\23326~, khome=\233H, - kich1=\233@, knp=\233S, kpp=\233T, kprt=^X, use=ti916, + kcuu1=\233A, kdch1=\233P, kf1=\23317~, kf10=\23328~, + kf11=\23329~, kf12=\23331~, kf2=\23318~, kf3=\23319~, + kf4=\23320~, kf5=\23321~, kf6=\23323~, kf7=\23324~, + kf8=\23325~, kf9=\23326~, khome=\233H, kich1=\233@, + knp=\233S, kpp=\233T, use=ti916, # # Texas Instruments 916 VDT 8859/1 7 bit control 132 column mode # @@ -23788,28 +23695,27 @@ ti924|Texas Instruments 924 VDT 8859/1 7 bit CTRL, OTbs, am, xon, cols#80, it#8, lines#24, bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[2J\E[H, cr=\r, - csr=%i\E[%p1%d;%p2%dr, cub1=\E[D, cud1=\E[B, cuf1=\E[C, - cup=%i\E[%p1%d;%p2%dH, cuu1=\E[A, cvvis=\E[?31h, - dl1=\E[M, ed=\E[J, el=\E[K, home=\E[H, ht=^I, hts=\EH, - il1=\E[L, ind=\ED, kbs=^H, kcub1=\E[D, kcud1=\E[B, + csr=%i\E[%p1%d;%p2%dr, cup=%i\E[%p1%d;%p2%dH, + cvvis=\E[?31h, dl1=\E[M, ed=\E[J, el=\E[K, home=\E[H, ht=^I, + hts=\EH, il1=\E[L, ind=\ED, kbs=^H, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kdch1=\E[P, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, kf5=\E[16~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, kich1=\E[@, rc=\E8, rev=\E[7m, ri=\EM, rmso=\E[m, rmul=\E[m, sc=\E7, sgr0=\E[m, smso=\E[7m, - smul=\E[4m, tbc=\E[3g, use=vt220+cvis, + smul=\E[4m, tbc=\E[3g, use=ansi+local1, use=vt220+cvis, ti924-8|Texas Instruments 924 VDT 8859/1 8 bit CTRL, am, xon, cols#80, it#8, lines#24, bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[2J\E[H, cr=\r, - csr=%i\E[%p1%d;%p2%dr, cub1=\E[D, cud1=\E[B, cuf1=\E[C, - cup=%i\E[%p1%d;%p2%dH, cuu1=\E[A, cvvis=\E[?31h, - dl1=\E[M, ed=\E[J, el=\E[K, home=\E[H, ht=^I, hts=\EH, - il1=\E[L, ind=\ED, kbs=^H, kcub1=\E[D, kcud1=\E[B, + csr=%i\E[%p1%d;%p2%dr, cup=%i\E[%p1%d;%p2%dH, + cvvis=\E[?31h, dl1=\E[M, ed=\E[J, el=\E[K, home=\E[H, ht=^I, + hts=\EH, il1=\E[L, ind=\ED, kbs=^H, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kdch1=\233P, kf1=\217P, kf2=\217Q, kf3=\217R, kf4=\217S, kf5=\23316~, kf6=\23317~, kf7=\23318~, kf8=\23319~, kf9=\23320~, kich1=\233@, rc=\E8, rev=\E[7m, ri=\EM, rmso=\E[m, rmul=\E[m, sc=\E7, sgr0=\E[m, - smso=\E[7m, smul=\E[4m, tbc=\E[3g, use=vt220+cvis, + smso=\E[7m, smul=\E[4m, tbc=\E[3g, use=ansi+local1, + use=vt220+cvis, ti924w|Texas Instruments 924 VDT 7 bit - 132 column mode, cols#132, use=ti924, ti924-8w|Texas Instruments 924 VDT 8 bit - 132 column mode, @@ -23821,11 +23727,11 @@ ti931|Texas Instruments 931 VDT, cud1=\EB, cuf1=\EC, cup=\EY%p1%{32}%+%c%p2%{32}%+%c, cuu1=\EA, dch1=\EQ, dl1=\EO, ed=\EJ, el=\EI, home=\EH, ich1=\ER\EP\EM, il1=\EN, ind=\Ea, invis=\E4H, - is2=\EGB\E(@B@@\E), kcub1=\ED, kcud1=\EB, kcuf1=\EC, - kcuu1=\EA, kdch1=\EQ, kdl1=\EO, kf1=\Ei1, kf2=\Ei2, kf3=\Ei3, - kf4=\Ei4, kf5=\Ei5, kf6=\Ei6, kf7=\Ei7, kf8=\Ei8, kf9=\Ei9, - kich1=\EP, kil1=\EN, rev=\E4B, ri=\Eb, rmso=\E4@, rmul=\E4@, - sgr0=\E4@, smso=\E4A, smul=\E4D, + is2=\EGB\E(@B@@\E), kdch1=\EQ, kdl1=\EO, kf1=\Ei1, + kf2=\Ei2, kf3=\Ei3, kf4=\Ei4, kf5=\Ei5, kf6=\Ei6, kf7=\Ei7, + kf8=\Ei8, kf9=\Ei9, kich1=\EP, kil1=\EN, rev=\E4B, ri=\Eb, + rmso=\E4@, rmul=\E4@, sgr0=\E4@, smso=\E4A, smul=\E4D, + use=vt52+arrows, ti926|Texas Instruments 926 VDT 8859/1 7 bit CTRL, csr@, ind=\E[1S, ri=\E[1T, use=ti924, # (ti926-8: I corrected this from the broken SCO entry -- esr) @@ -23835,16 +23741,14 @@ ti_ansi|basic entry for ti928, am, bce, eo, xenl, xon, colors#8, cols#80, it#8, lines#25, pairs#64, bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, clear=\E[2J\E[H, - cr=\r, csr=\E[%i%p1%d;%p2%dr, cub1=^H, cud1=\E[B, - cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, dch1=\E[P, - dl1=\E[M, ed=\E[J, el=\E[K, home=\E[H, ht=^I, ich1=\E[@, - il1=\E[L, ind=\E[S, kbs=^H, kcub1=\E[D, kcud1=\E[B, - kcuf1=\E[C, kcuu1=\E[A, kend=\E[F, kf0=\E[V, kf1=\E[M, - kf2=\E[N, kf3=\E[O, kf4=\E[P, kf5=\E[Q, kf6=\E[R, kf7=\E[S, - kf8=\E[T, kf9=\E[U, khome=\E[H, knp=\E[G, kpp=\E[I, - op=\E[37;40m, ri=\E[T, rmso=\E[m, rmul=\E[m, + cr=\r, csr=\E[%i%p1%d;%p2%dr, cub1=^H, + cup=\E[%i%p1%d;%p2%dH, dch1=\E[P, dl1=\E[M, ed=\E[J, + el=\E[K, home=\E[H, ht=^I, ich1=\E[@, il1=\E[L, ind=\E[S, + kend=\E[F, kf0=\E[V, kf1=\E[M, kf2=\E[N, kf3=\E[O, kf4=\E[P, + kf5=\E[Q, kf6=\E[R, kf7=\E[S, kf8=\E[T, kf9=\E[U, knp=\E[G, + kpp=\E[I, op=\E[37;40m, ri=\E[T, rmso=\E[m, rmul=\E[m, setab=\E[4%p1%dm, setaf=\E[3%p1%dm, sgr0=\E[m, - smso=\E[7m, smul=\E[4m, + smso=\E[7m, smul=\E[4m, use=ansi+arrows, use=ansi+local1, # # 928 VDT 7 bit control mode # @@ -23901,10 +23805,9 @@ cci|cci1|z8001|zen8001|CCI Custom Zentec 8001, csr=\ER%p1%{32}%+%c%p2%{32}%+%c, cub1=^H, cud1=\n, cuf1=\EC, cup=\EY%p1%{32}%+%c%p2%{32}%+%c, cuu1=\EA, cvvis=\EF\EQ\EM \ER 7, dim=\EM!, ed=\EJ, el=\EK, home=\EH, - invis=\EM(, is2=\EM \EF\ET\EP\ER 7, kbs=^H, kcub1=\ED, - kcud1=\EB, kcuf1=\EC, kcuu1=\EA, khome=\EH, mc4=^T, mc5=^R, - rev=\EM$, ri=\EI, rmso=\EM\s, rmul=\EM\s, sgr0=\EM\s, - smso=\EM$, smul=\EM0, + invis=\EM(, is2=\EM \EF\ET\EP\ER 7, kbs=^H, khome=\EH, + mc4=^T, mc5=^R, rev=\EM$, ri=\EI, rmso=\EM\s, rmul=\EM\s, + sgr0=\EM\s, smso=\EM$, smul=\EM0, use=vt52+arrows, ######## OBSOLETE UNIX CONSOLES # @@ -23945,42 +23848,38 @@ apollo_color|Apollo color display, # From: Eric Raymond Mon Nov 27 19:00:53 EST 1995 att6386|at386|386at|AT&T WGS 6386 console, am, bw, eo, xon, - cols#80, it#8, lines#25, + cols#80, lines#25, acsc=``a1fxgqh0jYk?lZm@nEooppqDrrsstCu4vAwBx3yyzz{{||}}~~, - bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, civis=\E[=C, - clear=\E[2J\E[H, cnorm=\E[=1C, cr=\r, cub=\E[%p1%dD, - cub1=\E[D, cud=\E[%p1%dB, cud1=\E[B, cuf=\E[%p1%dC, - cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, - cuu1=\E[A, dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, - dl=\E[%p1%dM, dl1=\E[1M, ech=\E[%p1%dX, ed=\E[J, el=\E[K, - home=\E[H, hpa=\E[%i%p1%dG, ht=^I, hts=\EH, ich=\E[%p1%d@, + bel=^G, civis=\E[=C, clear=\E[2J\E[H, cnorm=\E[=1C, cr=\r, + cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P, + dim=\E[2m, dl=\E[%p1%dM, dl1=\E[1M, ech=\E[%p1%dX, ed=\E[J, + el=\E[K, home=\E[H, hpa=\E[%i%p1%dG, ich=\E[%p1%d@, ich1=\E[1@, il=\E[%p1%dL, il1=\E[1L, ind=\E[S, invis=\E[9m, - is2=\E[0;10;39m, kbs=^H, kcbt=^], kcub1=\E[D, kcud1=\E[B, - kcuf1=\E[C, kcuu1=\E[A, kdch1=\E[P, kend=\E[Y, kf1=\EOP, + is2=\E[0;10;39m, kcbt=^], kdch1=\E[P, kend=\E[Y, kf1=\EOP, kf10=\EOY, kf11=\EOZ, kf12=\EOA, kf2=\EOQ, kf3=\EOR, kf4=\EOS, kf5=\EOT, kf6=\EOU, kf7=\EOV, kf8=\EOW, kf9=\EOX, - khome=\E[H, kich1=\E[@, knp=\E[U, kpp=\E[V, krmir=\E0, - nel=\r\E[S, rc=\E8, rev=\E[7m, ri=\E[T, rmacs=\E[10m, - rmso=\E[m, rmul=\E[m, sc=\E7, + kich1=\E[@, knp=\E[U, kpp=\E[V, krmir=\E0, nel=\r\E[S, + rc=\E8, ri=\E[T, rmacs=\E[10m, sc=\E7, sgr=\E[10m\E[0%?%p1%p3%|%t;7%;%?%p2%t;4%;%?%p4%t;5%;%?%p5%t; 2%;%?%p6%t;1%;%?%p9%t;12%e;10%;%?%p7%t;9%;m, - sgr0=\E[0;10m, smacs=\E[12m, smso=\E[7m, smul=\E[4m, - tbc=\E[3g, vpa=\E[%i%p1%dd, use=ecma+index, - use=klone+color, + sgr0=\E[0;10m, smacs=\E[12m, vpa=\E[%i%p1%dd, + use=ansi+arrows, use=ansi+inittabs, use=ansi+local, + use=ansi+sgrbold, use=ecma+index, use=klone+color, + # (pc6300plus: removed ":KM=/usr/lib/ua/kmap.s5:"; renamed BO/EE/CI/CV -- esr) pc6300plus|AT&T 6300 plus, OTbs, am, xon, cols#80, lines#24, bel=^G, blink=\E[5m, bold=\E[1m, civis=\E[=C, - clear=\E[2J\E[H, cnorm=\E[=1C, cr=\r, cub1=^H, cud1=\E[B, - cuf1=\E[C, cup=\E[%i%p1%2d;%p2%2dH, cuu1=\E[A, - dch1=\E[1P, dim=\E[2m, dl1=\E[1M, ed=\E[0J, el=\E[0K, - home=\E[H, hts=\EH, ich1=\E[1@, il1=\E[1L, ind=\n, - invis=\E[9m, kbs=^H, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, - kcuu1=\E[A, kf1=\EOc, kf10=\EOu, kf2=\EOd, kf3=\EOe, - kf4=\EOf, kf5=\EOg, kf6=\EOh, kf7=\EOi, kf8=\EOj, kf9=\EOk, - nel=\r\n, rev=\E[7m, rmso=\E[m, rmul=\E[m, sgr0=\E[m, - smso=\E[7m, smul=\E[4m, tbc=\E[3g, + clear=\E[2J\E[H, cnorm=\E[=1C, cr=\r, cub1=^H, + cup=\E[%i%p1%2d;%p2%2dH, dch1=\E[1P, dim=\E[2m, + dl1=\E[1M, ed=\E[0J, el=\E[0K, home=\E[H, hts=\EH, + ich1=\E[1@, il1=\E[1L, ind=\n, invis=\E[9m, kbs=^H, + kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf1=\EOc, + kf10=\EOu, kf2=\EOd, kf3=\EOe, kf4=\EOf, kf5=\EOg, kf6=\EOh, + kf7=\EOi, kf8=\EOj, kf9=\EOk, nel=\r\n, rev=\E[7m, rmso=\E[m, + rmul=\E[m, sgr0=\E[m, smso=\E[7m, smul=\E[4m, tbc=\E[3g, + use=ansi+local1, # From: Benjamin C. W. Sittler # @@ -24103,28 +24002,25 @@ att7300|unixpc|pc7300|3b1|s4|AT&T UNIX PC Model 7300, am, xon, cols#80, it#8, lines#24, bel=^G, blink=\E[9m, bold=\E[1m, cbt=\E^I, civis=\E[=1C, - clear=\E[2J\E[H, cnorm=\E[=0C, cr=\r, cub=\E[%p1%dD, - cub1=^H, cud=\E[%p1%dB, cud1=\E[B, cuf=\E[%p1%dC, - cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, - cuu1=\E[A, dch1=\E[P, dim=\E[2m, dl=\E[%p1%dM, dl1=\E[M, - ed=\E[0J, el=\E[0K, home=\E[H, ich1=\E[@, il=\E[%p1%dL, - il1=\E[L, ind=\n, invis=\E[9m, is1=\017\E[=1w, kBEG=\ENB, - kCAN=\EOW, kCPY=\END, kCRT=\EON, kDC=\ENF, kDL=\ENE, - kEND=\ENN, kEOL=\EOA, kFND=\EOX, kHLP=\EOM, kHOM=\ENM, - kIC=\ENJ, kLFT=\ENK, kMOV=\ENC, kNXT=\ENH, kOPT=\EOR, - kPRV=\ENG, kRDO=\EOT, kRIT=\ENL, kRPL=\EOY, kSAV=\EOO, - kUND=\EOS, kbeg=\ENb, kbs=^H, kcan=\EOw, kcbt=\E[Z, - kclo=\EOV, kclr=\E[J, kcmd=\EOu, kcpy=\ENd, kcrt=\EOn, - kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kdch1=\ENf, - ked=\E[J, kel=\EOa, kend=\E0, kext=\EOk, kf1=\EOc, kf2=\EOd, - kf3=\EOe, kf4=\EOf, kf5=\EOg, kf6=\EOh, kf7=\EOi, kf8=\EOj, - kfnd=\EOx, khlp=\EOm, khome=\E[H, kich1=\ENj, kind=\E[B, - kmov=\ENc, kmrk=\ENi, knp=\E[U, knxt=\ENh, kopn=\EOv, - kopt=\EOr, kpp=\E[V, kprt=\EOz, kprv=\ENg, krdo=\EOt, - kref=\EOb, krfr=\ENa, kri=\E[A, krpl=\EOy, krst=\EOB, - ksav=\EOo, kslt=\ENI, kund=\EOs, nel=\EE, rev=\E[7m, ri=\EM, - rmso=\E[m, rmul=\E[m, sgr0=\E[0;10m, smso=\E[7m, - smul=\E[4m, + clear=\E[2J\E[H, cnorm=\E[=0C, cr=\r, cub1=^H, + cup=\E[%i%p1%d;%p2%dH, dch1=\E[P, dim=\E[2m, ed=\E[0J, + el=\E[0K, home=\E[H, ich1=\E[@, ind=\n, invis=\E[9m, + is1=\017\E[=1w, kBEG=\ENB, kCAN=\EOW, kCPY=\END, kCRT=\EON, + kDC=\ENF, kDL=\ENE, kEND=\ENN, kEOL=\EOA, kFND=\EOX, + kHLP=\EOM, kHOM=\ENM, kIC=\ENJ, kLFT=\ENK, kMOV=\ENC, + kNXT=\ENH, kOPT=\EOR, kPRV=\ENG, kRDO=\EOT, kRIT=\ENL, + kRPL=\EOY, kSAV=\EOO, kUND=\EOS, kbeg=\ENb, kcan=\EOw, + kcbt=\E[Z, kclo=\EOV, kclr=\E[J, kcmd=\EOu, kcpy=\ENd, + kcrt=\EOn, kdch1=\ENf, ked=\E[J, kel=\EOa, kend=\E0, + kext=\EOk, kf1=\EOc, kf2=\EOd, kf3=\EOe, kf4=\EOf, kf5=\EOg, + kf6=\EOh, kf7=\EOi, kf8=\EOj, kfnd=\EOx, khlp=\EOm, + kich1=\ENj, kind=\E[B, kmov=\ENc, kmrk=\ENi, knp=\E[U, + knxt=\ENh, kopn=\EOv, kopt=\EOr, kpp=\E[V, kprt=\EOz, + kprv=\ENg, krdo=\EOt, kref=\EOb, krfr=\ENa, kri=\E[A, + krpl=\EOy, krst=\EOB, ksav=\EOo, kslt=\ENI, kund=\EOs, + nel=\EE, rev=\E[7m, ri=\EM, rmso=\E[m, rmul=\E[m, + sgr0=\E[0;10m, smso=\E[7m, smul=\E[4m, use=ansi+arrows, + use=ansi+idl, use=ansi+local, #### Convergent Technology # @@ -24220,11 +24116,11 @@ fos|fortune|Fortune system, masscomp|masscomp workstation console, OTbs, km, mir, cols#80, it#8, lines#24, - clear=\E[2J, cub1=^H, cud1=\E[B, cuf1=\E[C, - cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, dch1=\E[P, dl1=\E[M, - ed=\E[J, el=\E[K, ht=^I, il1=\E[L, is2=\EGc\EGb\EGw, kbs=^H, - kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, rmir=\E[4l, - rmso=\E[m, rmul=\EGau, smir=\E[4h, smso=\E[7m, smul=\EGu, + clear=\E[2J, cub1=^H, cup=\E[%i%p1%d;%p2%dH, dch1=\E[P, + dl1=\E[M, ed=\E[J, el=\E[K, ht=^I, il1=\E[L, + is2=\EGc\EGb\EGw, kbs=^H, kcub1=\EOD, kcud1=\EOB, + kcuf1=\EOC, kcuu1=\EOA, rmir=\E[4l, rmso=\E[m, rmul=\EGau, + smir=\E[4h, smso=\E[7m, smul=\EGu, use=ansi+local1, masscomp1|masscomp large screen version 1, cols#104, lines#36, use=masscomp, masscomp2|masscomp large screen version 2, @@ -24252,10 +24148,9 @@ pmcons|pmconsole|PMAX console, pcix|PC/IX console, am, bw, eo, cols#80, lines#24, - clear=\Ec, cub1=^H, cud1=\E[B, cuf1=\E[C, - cup=\E[%i%p1%2d;%p2%2dH, cuu1=\E[A, ed=\E[J, el=\E[K, - home=\E[H, rmso=\E[m, rmul=\E[m, sgr0=\E[m, smso=\E[7m, - smul=\E[4m, + clear=\Ec, cub1=^H, cup=\E[%i%p1%2d;%p2%2dH, ed=\E[J, + el=\E[K, home=\E[H, rmso=\E[m, rmul=\E[m, sgr0=\E[m, + smso=\E[7m, smul=\E[4m, use=ansi+local1, # (ibmpcx: this entry used to be known as ibmx. # It formerly included the following extension capabilities: @@ -24271,12 +24166,11 @@ pcix|PC/IX console, ibmpcx|xenix|ibmx|IBM PC xenix console display, OTbs, am, msgr, cols#80, lines#25, - clear=^L, cub1=^H, cud1=\E[B, cuf1=\E[C, - cup=\E[%p1%d;%p2%dH, cuu1=\E[A, dch1=\E[P, dl1=\E[M, - ed=\E[J, el=\E[K, home=\E[H, ich1=\E[@, il1=\E[L, kbs=^H, - kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kend=\E[d, - kf1=\E[K, kf2=\E[L, kf3=\E[M, kf4=\E[N, khome=\E[Y, knp=\E[e, - kpp=\E[Z, use=klone+acs, use=klone+sgr8, + clear=^L, cub1=^H, cup=\E[%p1%d;%p2%dH, dch1=\E[P, + dl1=\E[M, ed=\E[J, el=\E[K, home=\E[H, ich1=\E[@, il1=\E[L, + kend=\E[d, kf1=\E[K, kf2=\E[L, kf3=\E[M, kf4=\E[N, + khome=\E[Y, knp=\E[e, kpp=\E[Z, use=ansi+arrows, + use=ansi+local1, use=klone+acs, use=klone+sgr8, ######## OTHER OBSOLETE TYPES # @@ -24324,9 +24218,7 @@ ctrm|C terminal emulator, cup=\E&a%p2%dc%p1%dY, cuu1=\EA, dch1=\EP$<2>, dl1=\EM, ed=\EJ, el=\EK, hpa=\E&a%p1%dC, ht=\011$<2>, hts=\E1, il1=\EL, ind=\n, ip=$<2>, is2=\E&jA\r, kbs=^H, kcub1=\Eu\r, - kcud1=\Ew\r, kcuf1=\Ev\r, kcuu1=\Et\r, kf1=\Ep\r, - kf2=\Eq\r, kf3=\Er\r, kf4=\Es\r, kf5=\Et\r, kf6=\Eu\r, - kf7=\Ev\r, kf8=\Ew\r, khome=\Ep\r, + kcud1=\Ew\r, kcuf1=\Ev\r, kcuu1=\Et\r, khome=\Ep\r, op=\E&bn\E&bB\E&bG\E&bR%{0}%PX%{0}%PY%{0}%PZ%{1}%PW%{1}%PV %{1}%PU, rev=%?%gB%{0}%=%t\E&dB%{1}%PB%;, rmir=\ER, rmkx=\E&jA, @@ -24343,6 +24235,7 @@ ctrm|C terminal emulator, %t\E&dD%;, sgr0=\E&d@%{0}%PA%{0}%PB%{0}%PH, smir=\EQ, smkx=\E&jB, smso=\E&dD, smul=\E&dD, tbc=\E3, vpa=\E&a%p1%dY, + use=hp+pfk+cr, # gs6300 - can't use blue foreground, it clashes with underline; # it's simulated with cyan @@ -24353,19 +24246,17 @@ gs6300|emots|AT&T PC6300 with EMOTS terminal emulator, colors#8, cols#80, it#8, lines#24, pairs#63, acsc=++\,\,--..``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyz z{{||}}~~, - bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[J, cr=\r, - cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\n, - cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, - cuu=\E[%p1%dA, cuu1=\E[A, dch=\E[%p1%dP, dch1=\E[P, - dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K, home=\E[H, ht=^I, - ich=\E[%p1%d@, ich1=\E[@, il=\E[%p1%dL, il1=\E[L, ind=\n, - is2=\E[m, kbs=^H, kcbt=^R^I, kcub1=\E[D, kcud1=\E[B, - kcuf1=\E[C, kcuu1=\E[A, kf1=\E[0s, kf2=\E[24s, kf3=\E[1s, - kf4=\E[23s, kf5=\E[2s, kf6=\E[22s, kf7=\E[3s, kf8=\E[21s, - khome=\E[H, mc4=\E[4i, mc5=\E[5i, op=\E[?;m, rev=\E[7m, - ri=\E[L, rmacs=\E[10m, rs1=\Ec, setb=\E[?;%p1%dm, + bel=^G, blink=\E[5m, bold=\E[1m, cr=\r, cub1=^H, cud1=\n, + cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P, + home=\E[H, ht=^I, ich=\E[%p1%d@, ich1=\E[@, ind=\n, is2=\E[m, + kcbt=^R^I, kf1=\E[0s, kf2=\E[24s, kf3=\E[1s, kf4=\E[23s, + kf5=\E[2s, kf6=\E[22s, kf7=\E[3s, kf8=\E[21s, mc4=\E[4i, + mc5=\E[5i, op=\E[?;m, rev=\E[7m, ri=\E[L, rmacs=\E[10m, + rs1=\Ec, setb=\E[?;%p1%dm, setf=\E[?%?%p1%{0}%=%t0%e%p1%{1}%=%t2%e%p1%{1}%-%d%;m, sgr0=\E[m\E[10m, smacs=\E[11m, smso=\E[1m, smul=\E[4m, + use=ansi+arrows, use=ansi+erase, use=ansi+idl, + use=ansi+local, # From: 29 Oct 85 05:40:18 GMT # MS-Kermit with Heath-19 emulation mode enabled @@ -24383,18 +24274,17 @@ versaterm|VersaTerm VT100 emulator for the Macintosh, am, xenl, cols#80, it#8, lines#24, bel=^G, blink=\E[5m$<2/>, bold=\E[1m$<2/>, - clear=\E[;H\E[2J$<50/>, cr=\r, csr=\E[%i%p1%d;%p2%dr, - cub1=^H, cud1=\n, cuf1=\E[C$<2/>, - cup=\E[%i%p1%d;%p2%dH$<5/>, cuu1=\E[A$<2/>, - dch1=\E[1P$<7/>, dl1=\E[1M$<9/>, ed=\E[J$<50/>, - el=\E[K$<3/>, home=\E[H, ht=^I, ich1=\E[1@$<7/>, - il1=\E[1L$<9/>, is2=\E[1;24r\E[24;1H, kbs=^H, kcub1=\EOD, - kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kf1=\EOP, kf2=\EOQ, - kf3=\EOR, kf4=\EOS, nel=\r\n, rc=\E8, rev=\E[7m$<2/>, - rf=/usr/share/tabset/vt100, ri=\EM$<5/>, - rmkx=\E>\E[?1l, rmso=\E[m$<2/>, rmul=\E[m$<2/>, rs1=\E>, - sc=\E7, sgr0=\E[m$<2/>, smkx=\E=\E[?1h, smso=\E[7m$<2/>, - smul=\E[4m$<2/>, + clear=\E[;H\E[2J$<50/>, cr=\r, cub1=^H, cud1=\n, + cuf1=\E[C$<2/>, cup=\E[%i%p1%d;%p2%dH$<5/>, + cuu1=\E[A$<2/>, dch1=\E[1P$<7/>, dl1=\E[1M$<9/>, + ed=\E[J$<50/>, el=\E[K$<3/>, home=\E[H, ht=^I, + ich1=\E[1@$<7/>, il1=\E[1L$<9/>, is2=\E[1;24r\E[24;1H, + kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, + kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, nel=\r\n, + rev=\E[7m$<2/>, rf=/usr/share/tabset/vt100, + ri=\EM$<5/>, rmkx=\E>\E[?1l, rmso=\E[m$<2/>, + rmul=\E[m$<2/>, rs1=\E>, sgr0=\E[m$<2/>, smkx=\E=\E[?1h, + smso=\E[7m$<2/>, smul=\E[4m$<2/>, use=ansi+csr, # From: Rick Thomas # (xtalk: I added / based on the init string. @@ -24402,9 +24292,8 @@ xtalk|IBM PC with xtalk communication program (versions up to 3.4), am, mir, msgr, xon, cols#80, it#8, lines#24, vt#3, xmc#1, acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, - bel=^G, clear=\E[H\E[J$<50>, cr=\r, cub=\E[%p1%dD, cub1=^H, - cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C$<2>, - cup=\E[%i%p1%d;%p2%dH$<5>, cuu=\E[%p1%dA, + bel=^G, clear=\E[H\E[J$<50>, cr=\r, cub1=^H, cud1=\n, + cuf1=\E[C$<2>, cup=\E[%i%p1%d;%p2%dH$<5>, cuu1=\E[A$<2>, dl1=\E[M$<99>, ed=\E[J$<50>, el=\E[K$<3>, el1=\E[1K$<3>, enacs=\E(B\E)0, home=\E[H, ht=^I, hts=\EH, il1=\E[L$<99>, ind=\n, kbs=^H, kcub1=\EOD, kcud1=\EOB, @@ -24412,7 +24301,7 @@ xtalk|IBM PC with xtalk communication program (versions up to 3.4), rmkx=\E[?1l\E>, rmso=\E[m\s, rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, sgr0=\E[m, smacs=^N, smam=\E[?7h, smkx=\E[?1h\E=, smso=\E[7m\s, - tbc=\E[3g, use=vt100+fnkeys, + tbc=\E[3g, use=ansi+local, use=vt100+fnkeys, # The official PC terminal emulator program of the AT&T Product Centers. # Note - insert mode commented out - doesn't seem to work on AT&T PC. @@ -24577,17 +24466,13 @@ digilog|digilog 333, # The DWK was a terminal manufactured in the Soviet Union c.1986 dwk|dwk-vt|dwk terminal, am, - cols#80, it#8, lines#24, acsc=+\^\,Q-S.M0\177`+a:f'g#h#i#jXkClJmFnNo~qUs_tEuPv\\wKxW~ _, - bel=^G, clear=\EH\EJ, cr=\r, cub1=^H, cud1=\n, cuf1=\EC, - cup=\EY%p1%{32}%+%c%p2%{32}%+%c, cuu1=\EA, dch1=\EP, - ed=\EJ, el=\EK, home=\EH, ht=^I, ich1=\EQ, ind=\n, kbs=^?, - kcub1=\ED, kcud1=\EB, kcuf1=\EC, kcuu1=\EA, kdch1=\Ee, - kf1=\Ef1, kf10=\Ef0, kf2=\Ef2, kf3=\Ef3, kf4=\Ef4, kf5=\Ef5, - kf6=\Ef6, kf7=\Ef7, kf8=\Ef8, kf9=\Ef9, kich1=\Ed, knp=\Eh, - kpp=\Eg, nel=\r\n, rev=\ET, ri=\ES, rmacs=\EG, rmso=\EX, - sgr0=\EX, smacs=\EF, smso=\ET, + clear=\EH\EJ, cub1=^H, cud1=\n, dch1=\EP, ich1=\EQ, kbs=^?, + kdch1=\Ee, kf1=\Ef1, kf10=\Ef0, kf2=\Ef2, kf3=\Ef3, kf4=\Ef4, + kf5=\Ef5, kf6=\Ef6, kf7=\Ef7, kf8=\Ef8, kf9=\Ef9, kich1=\Ed, + knp=\Eh, kpp=\Eg, rev=\ET, ri=\ES, rmacs=\EG, rmso=\EX, + sgr0=\EX, smacs=\EF, smso=\ET, use=vt52-basic, env230|envision230|envision 230 graphics terminal, xenl@, enacs@, mc0=\E[0i, mc4=\E[4i, mc5=\E[5i, rmacs@, @@ -24636,14 +24521,13 @@ opus3n1+|Esprit Opus3n1+ in wy60 mode with ANSI arrow keys, is2=\E`:\Ee(\EO\Ee6\Ec41\E~4\Ec21\Ed/\Ezz&\E[A\177\Ezz'\E[B \177\Ezz(\E[D\177\Ezz)\E[C\177\Ezz<\E[Q\177\Ezz`\E[F \177\EA1*\EZH12, - kHOM=\E{, kbs=^H, kcbt=\EI, kcub1=\E[D, kcud1=\E[B, - kcuf1=\E[C, kcuu1=\E[A, kdch1=\EW, kdl1=\ER, ked=\EY, - kel=\ET, kend=\E[F, kent=\E7, kf1=^A@\r, kf10=^AI\r, - kf11=^AJ\r, kf12=^AK\r, kf13=^AL\r, kf14=^AM\r, kf15=^AN\r, - kf16=^AO\r, kf2=^AA\r, kf3=^AB\r, kf4=^AC\r, kf5=^AD\r, - kf6=^AE\r, kf7=^AF\r, kf8=^AG\r, kf9=^AH\r, khome=^^, - kich1=\EQ, kil1=\EE, knp=\EK, kpp=\EJ, kprt=\EP, krpl=\Er, - mc0=\EP, mc4=^T, mc5=^R, nel=\r\n$<3>, + kHOM=\E{, kcbt=\EI, kdch1=\EW, kdl1=\ER, ked=\EY, kel=\ET, + kend=\E[F, kent=\E7, kf1=^A@\r, kf10=^AI\r, kf11=^AJ\r, + kf12=^AK\r, kf13=^AL\r, kf14=^AM\r, kf15=^AN\r, kf16=^AO\r, + kf2=^AA\r, kf3=^AB\r, kf4=^AC\r, kf5=^AD\r, kf6=^AE\r, + kf7=^AF\r, kf8=^AG\r, kf9=^AH\r, khome=^^, kich1=\EQ, + kil1=\EE, knp=\EK, kpp=\EJ, kprt=\EP, krpl=\Er, mc0=\EP, + mc4=^T, mc5=^R, nel=\r\n$<3>, pfloc=\EZ2%p1%{63}%+%c%p2%s\177, pfx=\EZ1%p1%{63}%+%c%p2%s\177, pln=\Ez%p1%{47}%+%c%p2%s\r, prot=\E), ri=\Ej$<7>, @@ -24657,7 +24541,8 @@ opus3n1+|Esprit Opus3n1+ in wy60 mode with ANSI arrow keys, smcup=\Ezz&\E[A\177\Ezz'\E[B\177\Ezz(\E[D\177\Ezz)\E[C\177 \Ezz<\E[Q\177, smir=\Eq, smln=\EA10, smxon=\Ec21, tbc=\E0, tsl=\Ez(, - uc=\EG8\EG0, use=adm+sgr, + uc=\EG8\EG0, use=ansi+arrows, use=adm+sgr, + teletec|Teletec Datascreen, OTbs, am, cols#80, lines#24, @@ -24692,15 +24577,14 @@ teletec|Teletec Datascreen, v3220|LANPAR Vision II model 3220/3221/3222, OTbs, am, mir, xenl, cols#80, it#8, lines#24, - clear=\E[H\E[J, cub1=^H, cud1=\E[B, cuf1=\E[C, - cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, dch1=\E[P, dl1=\E[M, - ed=\E[J, el=\E[K, ht=^I, il1=\E[L, - is2=\E>\E[?3l\E[?7h\E[?8h\E[p, kcub1=\E[D, kcud1=\E[B, - kcuf1=\E[C, kcuu1=\E[A, kf0=\E[1~, kf1=\E[2~, kf2=\E[3~, - kf3=\E[4~, kf4=\E[5~, kf5=\E[6~, kf6=\E[OP, kf7=\E[OQ, - kf8=\E[OR, kf9=\E[OS, khome=\E[H, ri=\EM, rmam=\E[?7l, - rmir=\E[4l, rmkx=\E>, rmso=\E[m, rmul=\E[m, sgr0=\E[m, - smam=\E[?7h, smir=\E[4h, smkx=\E=, smso=\E[7m, smul=\E[4m, + cub1=^H, cup=\E[%i%p1%d;%p2%dH, dch1=\E[P, dl1=\E[M, ht=^I, + il1=\E[L, is2=\E>\E[?3l\E[?7h\E[?8h\E[p, kcub1=\E[D, + kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf0=\E[1~, kf1=\E[2~, + kf2=\E[3~, kf3=\E[4~, kf4=\E[5~, kf5=\E[6~, kf6=\E[OP, + kf7=\E[OQ, kf8=\E[OR, kf9=\E[OS, khome=\E[H, ri=\EM, + rmam=\E[?7l, rmir=\E[4l, rmkx=\E>, rmso=\E[m, rmul=\E[m, + sgr0=\E[m, smam=\E[?7h, smir=\E[4h, smkx=\E=, smso=\E[7m, + smul=\E[4m, use=ansi+erase, use=ansi+local1, ######## ICH/ICH1 VERSUS RMIR/SMIR # # Some non-curses applications get confused if both ich/ich1 and rmir/smir @@ -25469,7 +25353,7 @@ v3220|LANPAR Vision II model 3220/3221/3222, # differences, noted in # https://invisible-island.net/ncurses/ncurses-netbsd.html # -# ncurses makes explicit checks for a few user-definable capabilities: AX, +# ncurses makes explicit checks for a few user-definable capabilities: AX, E3, # RGB, U8, XM, which are documented in the user_caps(5) manual page. # #### SCREEN Extensions: @@ -25559,6 +25443,11 @@ v3220|LANPAR Vision II model 3220/3221/3222, # PS is sent before the pasted text # PE is sent after the pasted text # +# vim also uses these names for xterm focus: +# +# fe enables focus events +# fd disables focus events +# # Here are the other xterm-related extensions which are used in this file: # # Cr is a string capability which resets the cursor color @@ -25706,7 +25595,7 @@ v3220|LANPAR Vision II model 3220/3221/3222, # * Replaced Qume QVT and Freedom-series entries with purpose-built # terminfo entries. # * Enhanced vt220, tvi910, tvi924, hpterm, hp2645, adm42, tek -# and dg200 entries using caps from from SCO. +# and dg200 entries using caps from SCO. # * Added the usual set of function-key mappings to ANSI entry. # * Corrected xterm's function-key capabilities. # 9.4.5 (Tue Mar 28 14:27:49 EST 1995): @@ -27776,13 +27665,13 @@ v3220|LANPAR Vision II model 3220/3221/3222, # + correct PS vs PE names in bracketed+paste (report by Bram Moolenaar) # -TD # -# 2022-01-07 +# 2023-01-07 # + add comment to bracketed+paste explaining that vim patch 9.0.1117 is # needed for use with the updated xterm descriptions (suggested by Bram # Moolenaar). # + add RV report+version (suggested by Bram Moolenaar). # -# 2022-01-14 +# 2023-01-14 # + change RV to XR/xr, to avoid conflict with pre-existing usage in vim, # to use RV/rv to denote DA2 and its response (discussion with Bram # Moolenaar) -TD @@ -27790,8 +27679,133 @@ v3220|LANPAR Vision II model 3220/3221/3222, # of terminals which may support focus in/out -TD # + use xterm+focus in xterm-p370 and tmux -TD # -# 2022-01-28 +# 2023-01-28 # + document XF, kxIN and kxOUT -TD # + add note on sun/wscons/cmdtool/shelltool -TD # +# 2023-04-01 +# + remove DECCOLM+DECSCLM from foot (patch by Daniel Ekloef). +# +# 2023-04-08 +# + add xterm+focus to alacritty+common (patch by Christian Duerr). +# +# 2023-05-08 +# + add mode 1004 to xterm+sm+1006 from xterm #380 -TD +# +# 2023-06-05 +# + add xterm+focus to foot+base (patch by Daniel Ekloef). +# +# 2023-07-08 +# + add linux+kbs for terminals which imitate xterm's behavior with +# Linux -TD +# +# 2023-07-15 +# + mention E3 in regard to user_caps(5) -TD +# +# 2023-08-12 +# + add/use putty+cursor to reflect amending of modified cursor-keys in +# 2021 -TD +# + add ecma+strikeout to putty -TD +# +# 2023-10-21 +# + use oldxterm+sm+1006 in vte-2014 (report by Benno Schulenberg) -TD +# + add ansi+apparrows -TD +# +# 2023-10-28 +# + move xterm focus mode 1004 from xterm+sm+1006 into xterm+focus as +# fe/fd capabilities, like vim (vim-pr #13440). +# +# 2023-11-11 +# + used "infocmp -u" to help trim redundant capabilities -TD +# +# 2023-12-09 +# + remove xterm+sm+1006 from tmux (Debian #1057688). +# + used "infocmp -u" to help trim redundant capabilities -TD +# +# 2023-12-16 +# + used "infocmp -u" to help trim redundant capabilities -TD +# +# 2023-12-30 +# + add ms-vt100-16color, winconsole -TD +# + add rio, rio-direct -TD +# + add mostlike -TD +# + add wezterm, contour -TD +# +# 2024-01-06 +# + use ansi+arrows, ansi+apparrows, ansi+csr, ansi+erase, ansi+idc, +# ansi+idc1, ansi+idl, ansi+idl1, ansi+inittabs to trim -TD +# +# 2024-01-07 +# + restore padding for wy520* and vt320-k311 (report by Sven Joachim). +# +# 2024-01-13 +# + use ansi+local, ansi+local1, ansi+pp, ansi+rca, ansi+rca2, ansi+sgr +# to trim -TD +# +# 2024-01-14 +# + use ansi+sgrbold, ansi+sgrdim, ansi+sgrso, ansi+sgrul, ansi+tabs +# ecma+color, ecma+sgr, vt100+4bsd, vt100+pfkeys, vt220+pcedit +# xterm+256color, xterm+acs, xterm+nopcfkeys, xterm+pcf2 to trim -TD +# +# 2024-01-27 +# + amend change to z39-a (report by Sven Joachim). +# + use xterm+nopcfkeys, vt52-basic, dec+pp, dec+sl, vt52+arrows, +# hp+pfk+cr, klone+acs, klone+color, klone+sgr, ncr160wy50+pp +# to trim -TD +# + NetBSD-related fixes for x68k and wsvt52 (patch by Thomas Klausner) +# +# 2024-02-11 +# + add vt100+noapp, vt100+noapp+pc, xterm+app+pc, xterm+decedit from +# xterm #389 -TD +# +# 2024-03-09 +# + modify xgterm to work around line-drawing bug -TD +# + use CSI 3J in vte-2017 (report by Sven Joachim) +# +# 2024-05-25 +# + review/update iTerm2 for 3.5.0 -TD +# +# 2024-07-27 +# + modify wezterm, omitting its broken left/right margin feature (report +# by Thayne McCombs) -TD +# +# 2024-08-17 +# + review/update foot for 1.18.1 -TD +# + add a note about DomTerm 3.2.0 -TD +# +# 2024-09-07 +# + update comments -TD +# +# 2024-10-05 +# + use xterm+alt+title in wezterm -TD +# + update comments -TD +# +# 2024-10-26 +# + update ms-terminal -TD +# + add ms-terminal-direct -TD +# +# 2024-11-02 +# + add extended-keys for djgpp 2.05 -TD +# +# 2024-12-28 +# + add ghostty -TD +# +# 2025-01-04 +# + cleanup use-clauses -TD +# + add linux+lockeys, xterm+r5+lockeys, xterm+r5+fkeys -TD +# + add vt220+ufkeys, vt220+sfkeys +# +# 2025-02-03 +# + add note for ghostty 1.1.0 -TD +# +# 2025-02-08 +# + update st (report by Alexander Kashpir) -TD +# +# 2025-02-15 +# + minor fixes to comments (report by Sven Joachim) -TD +# +# 2025-03-01 +# + add color to vt525 (Branden Robinson) +# + add vt520-w and vt525-w (Branden Robinson) +# ######## SHANTIH! SHANTIH! SHANTIH! diff --git a/mk-1st.awk b/mk-1st.awk index 30638c35..639de74a 100644 --- a/mk-1st.awk +++ b/mk-1st.awk @@ -1,6 +1,6 @@ -# $Id: mk-1st.awk,v 1.124 2021/10/15 00:50:05 tom Exp $ +# $Id: mk-1st.awk,v 1.128 2024/08/11 09:04:32 tom Exp $ ############################################################################## -# Copyright 2018-2020,2021 Thomas E. Dickey # +# Copyright 2018-2023,2024 Thomas E. Dickey # # Copyright 1998-2016,2017 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # @@ -253,9 +253,9 @@ function shlib_install(directory) { } function install_dll(directory,filename) { src_name = sprintf("../lib/%s", filename); - dst_name = sprintf("$(DESTDIR)%s/%s", directory, filename); + dst_name = sprintf("%s/%s", directory, filename); printf "\t@echo installing %s as %s\n", src_name, dst_name - if ( directory == "$(bindir)" ) { + if ( directory == "$(BINDIR)" ) { program = "$(INSTALL) -m 755"; } else { program = "$(INSTALL_LIB)"; @@ -354,8 +354,7 @@ BEGIN { && ( $1 != "link_test" ) \ && ( $2 == "lib" \ || $2 == "progs" \ - || $2 == "c++" \ - || $2 == "tack" )) + || $2 == "c++" )) { if ( found == 0 ) { @@ -404,14 +403,14 @@ END { if ( ShlibVer == "cygdll" || ShlibVer == "msysdll" || ShlibVer == "mingw" || ShlibVer == "msvcdll") { - dst_dirs = "$(DESTDIR)$(bindir) $(DESTDIR)$(libdir)"; + dst_dirs = "$(BINDIR) $(LIBDIR)"; printf "install.%s :: %s $(LIBRARIES)\n", name, dst_dirs - install_dll("$(bindir)",end_name); - install_dll("$(libdir)",imp_name); + install_dll("$(BINDIR)",end_name); + install_dll("$(LIBDIR)",imp_name); } else { - lib_dir = "$(DESTDIR)$(libdir)"; + lib_dir = "$(LIBDIR)"; printf "install.%s :: %s/%s\n", name, lib_dir, end_name print "" if ( ReLink == "yes" ) { @@ -431,13 +430,13 @@ END { } ovr_name = sprintf("%scurses%s.a", curses_prefix, suffix) printf "\t@echo linking %s to %s\n", imp_name, ovr_name - printf "\tcd $(DESTDIR)$(libdir) && (" + printf "\tcd $(LIBDIR) && (" symlink(imp_name, ovr_name) printf ")\n" } else { ovr_name = sprintf("libcurses%s", suffix) printf "\t@echo linking %s to %s\n", end_name, ovr_name - printf "\tcd $(DESTDIR)$(libdir) && (" + printf "\tcd $(LIBDIR) && (" symlink(end_name, ovr_name) printf ")\n" } @@ -451,19 +450,19 @@ END { printf "uninstall.%s ::\n", name if ( ShlibVer == "cygdll" || ShlibVer == "msysdll" || ShlibVer == "mingw" || ShlibVer == "msvcdll") { - printf "\t@echo uninstalling $(DESTDIR)$(bindir)/%s\n", end_name - printf "\t-@rm -f $(DESTDIR)$(bindir)/%s\n", end_name + printf "\t@echo uninstalling $(BINDIR)/%s\n", end_name + printf "\t-@rm -f $(BINDIR)/%s\n", end_name - printf "\t@echo uninstalling $(DESTDIR)$(libdir)/%s\n", imp_name - printf "\t-@rm -f $(DESTDIR)$(libdir)/%s\n", imp_name + printf "\t@echo uninstalling $(LIBDIR)/%s\n", imp_name + printf "\t-@rm -f $(LIBDIR)/%s\n", imp_name } else { - printf "\t@echo uninstalling $(DESTDIR)$(libdir)/%s\n", end_name - removelinks("$(DESTDIR)$(libdir)") + printf "\t@echo uninstalling $(LIBDIR)/%s\n", end_name + removelinks("$(LIBDIR)") if ( overwrite == "yes" && name == "ncurses" ) { ovr_name = sprintf("libcurses%s", suffix) - printf "\t-@rm -f $(DESTDIR)$(libdir)/%s\n", ovr_name + printf "\t-@rm -f $(LIBDIR)/%s\n", ovr_name } } if ( rmSoLocs == "yes" ) { @@ -504,7 +503,7 @@ END { print "install \\" print "install.libs \\" printf "install.%s :: \\\n", trim_suffix(name); - printf "\t\t$(DESTDIR)$(libdir) \\\n"; + printf "\t\t$(LIBDIR) \\\n"; use_name = TermlibRoot USE_LIB_SUFFIX if ( (name != use_name ) && ( index(name, "++") == 0 ) && ( index(name, "tic") == 1 || index(name, "ncurses") == 1 ) ) { if ( trim_suffix(TermlibRoot) != trim_suffix(name) ) { @@ -515,14 +514,14 @@ END { } } printf "\t\t../lib/%s\n", lib_name - printf "\t@echo installing ../lib/%s as $(DESTDIR)$(libdir)/%s\n", lib_name, lib_name - printf "\tcd ../lib; $(LIBTOOL_INSTALL) $(INSTALL) %s $(DESTDIR)$(libdir)\n", lib_name + printf "\t@echo installing ../lib/%s as $(LIBDIR)/%s\n", lib_name, lib_name + printf "\tcd ../lib; $(LIBTOOL_INSTALL) $(INSTALL) %s $(LIBDIR)\n", lib_name print "" print "uninstall \\" print "uninstall.libs \\" printf "uninstall.%s ::\n", trim_suffix(name) - printf "\t@echo uninstalling $(DESTDIR)$(libdir)/%s\n", lib_name - printf "\t-@$(LIBTOOL_UNINSTALL) rm -f $(DESTDIR)$(libdir)/%s\n", lib_name + printf "\t@echo uninstalling $(LIBDIR)/%s\n", lib_name + printf "\t-@$(LIBTOOL_UNINSTALL) rm -f $(LIBDIR)/%s\n", lib_name } else { @@ -543,41 +542,41 @@ END { print "" print "install \\" print "install.libs \\" - printf "install.%s :: $(DESTDIR)$(libdir) ../lib/%s\n", name, lib_name - printf "\t@echo installing ../lib/%s as $(DESTDIR)$(libdir)/%s\n", lib_name, lib_name - printf "\t$(INSTALL_DATA) ../lib/%s $(DESTDIR)$(libdir)/%s\n", lib_name, lib_name + printf "install.%s :: $(LIBDIR) ../lib/%s\n", name, lib_name + printf "\t@echo installing ../lib/%s as $(LIBDIR)/%s\n", lib_name, lib_name + printf "\t$(INSTALL_DATA) ../lib/%s $(LIBDIR)/%s\n", lib_name, lib_name if ( overwrite == "yes" && lib_name == "libncurses.a" ) { printf "\t@echo linking libcurses.a to libncurses.a\n" - printf "\t-@rm -f $(DESTDIR)$(libdir)/libcurses.a\n" - printf "\t(cd $(DESTDIR)$(libdir) && " + printf "\t-@rm -f $(LIBDIR)/libcurses.a\n" + printf "\t(cd $(LIBDIR) && " symlink("libncurses.a", "libcurses.a") printf ")\n" } if ( ReRanlib == "yes" ) { - printf "\t$(RANLIB) $(DESTDIR)$(libdir)/%s\n", lib_name + printf "\t$(RANLIB) $(LIBDIR)/%s\n", lib_name } if ( host == "vxworks" ) { - printf "\t@echo installing ../lib/lib%s$o as $(DESTDIR)$(libdir)/lib%s$o\n", name, name - printf "\t$(INSTALL_DATA) ../lib/lib%s$o $(DESTDIR)$(libdir)/lib%s$o\n", name, name + printf "\t@echo installing ../lib/lib%s$o as $(LIBDIR)/lib%s$o\n", name, name + printf "\t$(INSTALL_DATA) ../lib/lib%s$o $(LIBDIR)/lib%s$o\n", name, name } print "" print "uninstall \\" print "uninstall.libs \\" printf "uninstall.%s ::\n", name - printf "\t@echo uninstalling $(DESTDIR)$(libdir)/%s\n", lib_name - printf "\t-@rm -f $(DESTDIR)$(libdir)/%s\n", lib_name + printf "\t@echo uninstalling $(LIBDIR)/%s\n", lib_name + printf "\t-@rm -f $(LIBDIR)/%s\n", lib_name if ( overwrite == "yes" && lib_name == "libncurses.a" ) { printf "\t@echo linking libcurses.a to libncurses.a\n" - printf "\t-@rm -f $(DESTDIR)$(libdir)/libcurses.a\n" + printf "\t-@rm -f $(LIBDIR)/libcurses.a\n" } if ( host == "vxworks" ) { - printf "\t@echo uninstalling $(DESTDIR)$(libdir)/lib%s$o\n", name - printf "\t-@rm -f $(DESTDIR)$(libdir)/lib%s$o\n", name + printf "\t@echo uninstalling $(LIBDIR)/lib%s$o\n", name + printf "\t-@rm -f $(LIBDIR)/lib%s$o\n", name } } print "" diff --git a/ncurses/Makefile.in b/ncurses/Makefile.in index 59e80d05..404a4e9f 100644 --- a/ncurses/Makefile.in +++ b/ncurses/Makefile.in @@ -1,6 +1,6 @@ -# $Id: Makefile.in,v 1.183 2022/10/01 12:47:39 tom Exp $ +# $Id: Makefile.in,v 1.185 2024/08/10 18:07:57 tom Exp $ ############################################################################## -# Copyright 2018-2021,2022 Thomas E. Dickey # +# Copyright 2018-2022,2024 Thomas E. Dickey # # Copyright 1998-2017,2018 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # @@ -69,7 +69,9 @@ datarootdir = @datarootdir@ datadir = @datadir@ includesubdir = @includesubdir@ -INCLUDEDIR = $(DESTDIR)$(includedir)$(includesubdir) +INCLUDEDIR = $(DESTDIR)$(includedir@MERGE_PREFIX@)$(includesubdir) +BINDIR = $(DESTDIR)$(bindir@MERGE_PREFIX@) +LIBDIR = $(DESTDIR)$(libdir@MERGE_PREFIX@) PACKAGE = @PACKAGE@ @@ -235,8 +237,8 @@ all libs :: $(AUTO_SRC) ../lib $(LIBRARIES) sources: $(AUTO_SRC) -$(DESTDIR)$(bindir) \ -$(DESTDIR)$(libdir) : +$(BINDIR) \ +$(LIBDIR) : mkdir -p $@ ../lib : ; mkdir $@ @@ -251,7 +253,7 @@ init_keytry.h : make_keys$(BUILD_EXEEXT) keys.list ./make_keys$(BUILD_EXEEXT) keys.list > $@ keys.list : $(tinfo)/MKkeys_list.sh - AWK=$(AWK) $(SHELL) $(tinfo)/MKkeys_list.sh $(CAPLIST) | LC_ALL=C sort >$@ + AWK=$(AWK) USE_SIGWINCH=@cf_cv_enable_sigwinch@ $(SHELL) $(tinfo)/MKkeys_list.sh $(CAPLIST) | LC_ALL=C sort >$@ make_keys$(BUILD_EXEEXT) : \ build.priv.h \ @@ -288,7 +290,7 @@ report_offsets$(BUILD_EXEEXT) : \ $(SHELL) -e $(tinfo)/MKuserdefs.sh $(AWK) $(USE_BIG_STRINGS) $(CAPLIST) > $@ ./lib_keyname.c: keys.list $(base)/MKkeyname.awk - $(AWK) -f $(base)/MKkeyname.awk bigstrings=$(USE_BIG_STRINGS) keys.list > $@ + $(AWK) -f $(base)/MKkeyname.awk use_sigwinch=@cf_cv_enable_sigwinch@ bigstrings=$(USE_BIG_STRINGS) keys.list > $@ ./codes.c: $(tinfo)/MKcodes.awk $(AWK) -f $(tinfo)/MKcodes.awk bigstrings=$(USE_BIG_STRINGS) $(CAPLIST) >$@ diff --git a/ncurses/base/MKkeyname.awk b/ncurses/base/MKkeyname.awk index b3d04ee7..545661f7 100644 --- a/ncurses/base/MKkeyname.awk +++ b/ncurses/base/MKkeyname.awk @@ -1,6 +1,6 @@ -# $Id: MKkeyname.awk,v 1.51 2020/02/02 23:34:34 tom Exp $ +# $Id: MKkeyname.awk,v 1.53 2024/12/07 21:09:39 tom Exp $ ############################################################################## -# Copyright 2020 Thomas E. Dickey # +# Copyright 2020,2024 Thomas E. Dickey # # Copyright 1998-2016,2017 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # @@ -59,7 +59,7 @@ END { if (bigstrings) { printf "\t{ -1, 0 }};\n" print "" - print "static const char key_names[] = "names";" + print "static const char key_names[] ="names";" } else { printf "\t{ 0, 0 }};\n" } @@ -72,7 +72,7 @@ END { print "safe_keyname (SCREEN *sp, int c)" print "{" print " char name[20];" - print " NCURSES_CONST char *result = 0;" + print " NCURSES_CONST char *result = NULL;" print "" print " if (c == -1) {" print " result = \"-1\";" @@ -86,7 +86,7 @@ END { print " }" print " }" } else { - print " for (i = 0; _nc_key_names[i].name != 0; i++) {" + print " for (i = 0; _nc_key_names[i].name != NULL; i++) {" print " if (_nc_key_names[i].code == c) {" print " result = (NCURSES_CONST char *)_nc_key_names[i].name;" print " break;" @@ -94,12 +94,12 @@ END { print " }" } print "" - print " if (result == 0 && (c >= 0 && c < SIZEOF_TABLE)) {" - print " if (MyTable == 0)" + print " if (result == NULL && (c >= 0 && c < SIZEOF_TABLE)) {" + print " if (MyTable == NULL)" print " MyTable = typeCalloc(char *, SIZEOF_TABLE);" print "" - print " if (MyTable != 0) {" - print " int m_prefix = (sp == 0 || sp->_use_meta);" + print " if (MyTable != NULL) {" + print " int m_prefix = (sp == NULL || sp->_use_meta);" print "" print " /* if sense of meta() changed, discard cached data */" print " if (MyInit != (m_prefix + 1)) {" @@ -112,7 +112,7 @@ END { print " }" print "" print " /* create and cache result as needed */" - print " if (MyTable[c] == 0) {" + print " if (MyTable[c] == NULL) {" print " int cc = c;" print " char *p = name;" print "#define P_LIMIT (sizeof(name) - (size_t) (p - name))" @@ -132,22 +132,22 @@ END { print " result = MyTable[c];" print " }" print "#if NCURSES_EXT_FUNCS && NCURSES_XNAMES" - print " } else if (result == 0 && HasTerminal(sp)) {" + print " } else if (result == NULL && HasTerminal(sp)) {" print " int j, k;" print " char * bound;" print " TERMTYPE2 *tp = &TerminalType(TerminalOf(sp));" print " unsigned save_trace = _nc_tracing;" print "" print " _nc_tracing = 0; /* prevent recursion via keybound() */" - print " for (j = 0; (bound = NCURSES_SP_NAME(keybound)(NCURSES_SP_ARGx c, j)) != 0; ++j) {" + print " for (j = 0; (bound = NCURSES_SP_NAME(keybound)(NCURSES_SP_ARGx c, j)) != NULL; ++j) {" print " for(k = STRCOUNT; k < (int) NUM_STRINGS(tp); k++) {" - print " if (tp->Strings[k] != 0 && !strcmp(bound, tp->Strings[k])) {" + print " if (tp->Strings[k] != NULL && !strcmp(bound, tp->Strings[k])) {" print " result = ExtStrname(tp, k, strnames);" print " break;" print " }" print " }" print " free(bound);" - print " if (result != 0)" + print " if (result != NULL)" print " break;" print " }" print " _nc_tracing = save_trace;" @@ -166,7 +166,7 @@ END { print "#if NO_LEAKS" print "void _nc_keyname_leaks(void)" print "{" - print " if (MyTable != 0) {" + print " if (MyTable != NULL) {" print " int j;" print " for (j = 0; j < SIZEOF_TABLE; ++j) {" print " FreeIfNeeded(MyTable[j]);" diff --git a/ncurses/base/MKlib_gen.sh b/ncurses/base/MKlib_gen.sh index f0ac0452..fbaf3f2d 100755 --- a/ncurses/base/MKlib_gen.sh +++ b/ncurses/base/MKlib_gen.sh @@ -2,10 +2,10 @@ # # MKlib_gen.sh -- generate sources from curses.h macro definitions # -# ($Id: MKlib_gen.sh,v 1.73 2022/10/01 13:14:20 tom Exp $) +# ($Id: MKlib_gen.sh,v 1.79 2025/02/23 01:55:06 tom Exp $) # ############################################################################## -# Copyright 2018-2021,2022 Thomas E. Dickey # +# Copyright 2018-2024,2025 Thomas E. Dickey # # Copyright 1998-2016,2017 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # @@ -188,6 +188,10 @@ if test "$USE" = generated ; then cat >$ED4 <$ED4 <$ED4 <" print "" + print "#if USE_STDBOOL_H" + print "#include " + print "#endif" + print "" print "#undef NCURSES_NOMACROS /* _this_ file uses macros */" print "#define NCURSES_NOMACROS 1" print "" @@ -464,8 +474,11 @@ BEGIN { } END { if ( "$USE" != "generated" ) { - print "int main(void)" - print "{" + print "static int link_test(int code)" + print "{" + print " switch(code)" + print " {" + casenum = 1; for (n = 1; n < start; ++n) { value = calls[n]; if ( value !~ /P_POUNDC/ ) { @@ -473,20 +486,37 @@ END { sub(/^[0-9a-zA-Z_]+ /,"",value); sub(/^[*][ \t]*/,"",value); gsub("struct[ \t]*[0-9a-zA-Z_]+[ \t]*[*]","",value); + arg_l = index(value, "("); + arg_r = index(value, ")"); + if ( arg_l > 0 && arg_r > arg_l + 1 ) { + args = substr(value, arg_l + 1, arg_r - arg_l - 1); + gsub(/[0-9a-zA-Z_]+[ \t]*[*][ \t]*[0-9a-zA-Z_]+/,"NULL",args); + gsub(/ (bool|int|short|attr_t|chtype|wchar_t|NCURSES_BOOL|NCURSES_OUTC|NCURSES_OUTC_sp|va_list) /," ",args); + value = substr(value,0,arg_l) args substr(value,arg_r); + } gsub(/[0-9a-zA-Z_]+[ \t]*[*][ \t]*/,"",value); gsub(/ (const) /," ",value); - gsub(/ (int|short|attr_t|chtype|wchar_t|NCURSES_BOOL|NCURSES_OUTC|NCURSES_OUTC_sp|va_list) /," ",value); + gsub(/ (bool|int|short|attr_t|chtype|wchar_t|NCURSES_BOOL|NCURSES_OUTC|NCURSES_OUTC_sp|va_list) /," ",value); gsub(/ void /,"",value); sub(/^/,"call_",value); gsub(/ (a[0-9]|z) /, " 0 ", value); gsub(/ int[ \t]*[(][^)]+[)][(][^)]+[)]/, "0", value); - printf "\t%s;\n", value; + if ( index(value, "call_NCURSES_SP_NAME") > 0 ) { + sub("0","NULL", value); + } + printf " case %d: %s; break;\n", casenum++, value; } else { + if ( index(value, "call_NCURSES_SP_NAME") > 0 ) { + printf "/* FIXME %s */\n", value; + sub("0","NULL", value); + } print value; } } - print " return 0;" - print "}" + print " default: return 0; /* case did not exist */" + print " }" + print " return 1; /* case exists */" + print "}" } } EOF1 @@ -527,3 +557,34 @@ $preprocessor $TMP 2>/dev/null \ -e '/#ident/d' \ -e '/#line/d' \ | sed -f $ED4 + +# a simple test-driver checks one or all of the linkages +if test "$USE" = "implemented" +then +cat <<"EOF" +int main(int argc, char *argv[]) +{ + int n; + int rc; + if (argc > 1) + { + rc = !link_test(atoi(argv[1])); + } + else + { + rc = 0; + for (n = 1; ; ++n) + { + printf("TEST %d\n", n); + fflush(stdout); + if (!link_test(n)) + { + rc = 1; + break; + } + } + } + return rc; +} +EOF +fi diff --git a/ncurses/base/MKunctrl.awk b/ncurses/base/MKunctrl.awk index 9a2a6db6..c8f66966 100644 --- a/ncurses/base/MKunctrl.awk +++ b/ncurses/base/MKunctrl.awk @@ -1,6 +1,6 @@ -# $Id: MKunctrl.awk,v 1.29 2020/02/02 23:34:34 tom Exp $ +# $Id: MKunctrl.awk,v 1.31 2024/12/07 21:06:39 tom Exp $ ############################################################################## -# Copyright 2020 Thomas E. Dickey # +# Copyright 2020,2024 Thomas E. Dickey # # Copyright 1998-2012,2017 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # @@ -135,7 +135,7 @@ END { print "" if (bigstrings) { - print "static const char unctrl_blob[] = "blob";" + print "static const char unctrl_blob[] ="blob";" print "" stringname = "unctrl_blob + unctrl" } else { @@ -144,10 +144,10 @@ END { print "\tint check = (int) ChCharOf(ch);" print "\tconst char *result;" print "" - print "(void) sp;" + print "\t(void) sp;" print "\tif (check >= 0 && check < (int)SIZEOF(unctrl_table)) {" print "#if NCURSES_EXT_FUNCS" - print "\t\tif ((sp != 0)" + print "\t\tif ((sp != NULL)" print "\t\t && (sp->_legacy_coding > 1)" print "\t\t && (check >= 128)" print "\t\t && (check < 160))" @@ -155,7 +155,8 @@ END { print "\t\telse" print "\t\tif ((check >= 160)" print "\t\t && (check < 256)" - print "\t\t && ((sp != 0)" + print "\t\t && !_nc_unicode_locale()" + print "\t\t && ((sp != NULL)" print "\t\t && ((sp->_legacy_coding > 0)" print "\t\t || (sp->_legacy_coding == 0" print "\t\t && isprint(check)))))" @@ -164,7 +165,7 @@ END { print "#endif /* NCURSES_EXT_FUNCS */" printf "\t\t\tresult = %s_table[check];\n", stringname; print "\t} else {" - print "\t\tresult = 0;" + print "\t\tresult = NULL;" print "\t}" print "\treturn (NCURSES_CONST char *)result;" print "}" diff --git a/ncurses/base/define_key.c b/ncurses/base/define_key.c index fb9ae36b..2ef5fad4 100644 --- a/ncurses/base/define_key.c +++ b/ncurses/base/define_key.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020 Thomas E. Dickey * + * Copyright 2020,2024 Thomas E. Dickey * * Copyright 1998-2009,2014 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -34,7 +34,7 @@ #include -MODULE_ID("$Id: define_key.c,v 1.22 2020/02/02 23:34:34 tom Exp $") +MODULE_ID("$Id: define_key.c,v 1.23 2024/12/07 21:24:18 tom Exp $") NCURSES_EXPORT(int) NCURSES_SP_NAME(define_key) (NCURSES_SP_DCLx const char *str, int keycode) @@ -42,7 +42,7 @@ NCURSES_SP_NAME(define_key) (NCURSES_SP_DCLx const char *str, int keycode) int code = ERR; T((T_CALLED("define_key(%p, %s,%d)"), (void *) SP_PARM, _nc_visbuf(str), keycode)); - if (SP_PARM == 0 || !HasTInfoTerminal(SP_PARM)) { + if (SP_PARM == NULL || !HasTInfoTerminal(SP_PARM)) { code = ERR; } else if (keycode > 0) { unsigned ukey = (unsigned) keycode; @@ -53,13 +53,13 @@ NCURSES_SP_NAME(define_key) (NCURSES_SP_DCLx const char *str, int keycode) #define CallHasKey(keycode) NCURSES_SP_NAME(has_key)(NCURSES_SP_ARGx keycode) #endif - if (str != 0) { + if (str != NULL) { NCURSES_SP_NAME(define_key) (NCURSES_SP_ARGx str, 0); } else if (CallHasKey(keycode)) { while (_nc_remove_key(&(SP_PARM->_keytry), ukey)) code = OK; } - if (str != 0) { + if (str != NULL) { if (NCURSES_SP_NAME(key_defined) (NCURSES_SP_ARGx str) == 0) { if (_nc_add_to_try(&(SP_PARM->_keytry), str, ukey) == OK) { code = OK; diff --git a/ncurses/base/key_defined.c b/ncurses/base/key_defined.c index 25d5a674..28939ede 100644 --- a/ncurses/base/key_defined.c +++ b/ncurses/base/key_defined.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020 Thomas E. Dickey * + * Copyright 2020-2023,2024 Thomas E. Dickey * * Copyright 2003-2006,2009 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -32,8 +32,9 @@ ****************************************************************************/ #include +#include -MODULE_ID("$Id: key_defined.c,v 1.10 2020/02/02 23:34:34 tom Exp $") +MODULE_ID("$Id: key_defined.c,v 1.12 2024/12/07 21:24:18 tom Exp $") static int find_definition(TRIES * tree, const char *str) @@ -41,10 +42,10 @@ find_definition(TRIES * tree, const char *str) TRIES *ptr; int result = OK; - if (str != 0 && *str != '\0') { - for (ptr = tree; ptr != 0; ptr = ptr->sibling) { + if (VALID_STRING(str) && *str != '\0') { + for (ptr = tree; ptr != NULL; ptr = ptr->sibling) { if (UChar(*str) == UChar(ptr->ch)) { - if (str[1] == '\0' && ptr->child != 0) { + if (str[1] == '\0' && ptr->child != NULL) { result = ERR; } else if ((result = find_definition(ptr->child, str + 1)) == OK) { @@ -71,7 +72,7 @@ NCURSES_SP_NAME(key_defined) (NCURSES_SP_DCLx const char *str) int code = ERR; T((T_CALLED("key_defined(%p, %s)"), (void *) SP_PARM, _nc_visbuf(str))); - if (SP_PARM != 0 && str != 0) { + if (SP_PARM != NULL && str != NULL) { code = find_definition(SP_PARM->_keytry, str); } diff --git a/ncurses/base/keybound.c b/ncurses/base/keybound.c index bbd912a0..9dc40467 100644 --- a/ncurses/base/keybound.c +++ b/ncurses/base/keybound.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020 Thomas E. Dickey * + * Copyright 2020,2024 Thomas E. Dickey * * Copyright 1999-2009,2011 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -34,7 +34,7 @@ #include -MODULE_ID("$Id: keybound.c,v 1.12 2020/02/02 23:34:34 tom Exp $") +MODULE_ID("$Id: keybound.c,v 1.13 2024/12/07 21:24:18 tom Exp $") /* * Returns the count'th string definition which is associated with the @@ -43,10 +43,10 @@ MODULE_ID("$Id: keybound.c,v 1.12 2020/02/02 23:34:34 tom Exp $") NCURSES_EXPORT(char *) NCURSES_SP_NAME(keybound) (NCURSES_SP_DCLx int code, int count) { - char *result = 0; + char *result = NULL; T((T_CALLED("keybound(%p, %d,%d)"), (void *) SP_PARM, code, count)); - if (SP_PARM != 0 && code >= 0) { + if (SP_PARM != NULL && code >= 0) { result = _nc_expand_try(SP_PARM->_keytry, (unsigned) code, &count, diff --git a/ncurses/base/keyok.c b/ncurses/base/keyok.c index 945228aa..3b2953f5 100644 --- a/ncurses/base/keyok.c +++ b/ncurses/base/keyok.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2019-2020,2021 Thomas E. Dickey * + * Copyright 2019-2021,2024 Thomas E. Dickey * * Copyright 1998-2012,2014 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -34,7 +34,7 @@ #include -MODULE_ID("$Id: keyok.c,v 1.17 2021/06/17 21:26:02 tom Exp $") +MODULE_ID("$Id: keyok.c,v 1.18 2024/12/07 21:24:18 tom Exp $") /* * Enable (or disable) ncurses' interpretation of a keycode by adding (or @@ -63,7 +63,7 @@ NCURSES_SP_NAME(keyok) (NCURSES_SP_DCLx int c, bool flag) if (flag) { while ((s = _nc_expand_try(SP_PARM->_key_ok, - ch, &count, (size_t) 0)) != 0) { + ch, &count, (size_t) 0)) != NULL) { if (_nc_remove_key(&(SP_PARM->_key_ok), ch)) { code = _nc_add_to_try(&(SP_PARM->_keytry), s, ch); free(s); @@ -76,7 +76,7 @@ NCURSES_SP_NAME(keyok) (NCURSES_SP_DCLx int c, bool flag) } } else { while ((s = _nc_expand_try(SP_PARM->_keytry, - ch, &count, (size_t) 0)) != 0) { + ch, &count, (size_t) 0)) != NULL) { if (_nc_remove_key(&(SP_PARM->_keytry), ch)) { code = _nc_add_to_try(&(SP_PARM->_key_ok), s, ch); free(s); diff --git a/ncurses/base/legacy_coding.c b/ncurses/base/legacy_coding.c index a71aee01..3da1414d 100644 --- a/ncurses/base/legacy_coding.c +++ b/ncurses/base/legacy_coding.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020 Thomas E. Dickey * + * Copyright 2020,2024 Thomas E. Dickey * * Copyright 2005,2009 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -34,7 +34,7 @@ #include -MODULE_ID("$Id: legacy_coding.c,v 1.6 2020/02/02 23:34:34 tom Exp $") +MODULE_ID("$Id: legacy_coding.c,v 1.7 2024/12/07 20:00:48 tom Exp $") NCURSES_EXPORT(int) NCURSES_SP_NAME(use_legacy_coding) (NCURSES_SP_DCLx int level) @@ -42,7 +42,7 @@ NCURSES_SP_NAME(use_legacy_coding) (NCURSES_SP_DCLx int level) int result = ERR; T((T_CALLED("use_legacy_coding(%p,%d)"), (void *) SP_PARM, level)); - if (level >= 0 && level <= 2 && SP_PARM != 0) { + if (level >= 0 && level <= 2 && SP_PARM != NULL) { result = SP_PARM->_legacy_coding; SP_PARM->_legacy_coding = level; } diff --git a/ncurses/base/lib_addch.c b/ncurses/base/lib_addch.c index a14bfd3b..634714a6 100644 --- a/ncurses/base/lib_addch.c +++ b/ncurses/base/lib_addch.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2019-2021,2022 Thomas E. Dickey * + * Copyright 2019-2022,2024 Thomas E. Dickey * * Copyright 1998-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -37,7 +37,7 @@ #include #include -MODULE_ID("$Id: lib_addch.c,v 1.141 2022/06/12 15:16:41 tom Exp $") +MODULE_ID("$Id: lib_addch.c,v 1.144 2024/12/07 17:18:07 tom Exp $") static const NCURSES_CH_T blankchar = NewChar(BLANK_TEXT); @@ -118,7 +118,7 @@ _nc_render(WINDOW *win, NCURSES_CH_T ch) #endif static bool -newline_forces_scroll(WINDOW *win, NCURSES_SIZE_T *ypos) +newline_forces_scroll(const WINDOW *win, NCURSES_SIZE_T *ypos) { bool result = FALSE; @@ -451,14 +451,14 @@ waddch_nosync(WINDOW *win, const NCURSES_CH_T ch) if ((AttrOf(ch) & A_ALTCHARSET) || ( #if USE_WIDEC_SUPPORT - (sp != 0 && sp->_legacy_coding) && + (sp != NULL && sp->_legacy_coding) && #endif s[1] == 0 ) || ( - (isprint((int) t) && !iscntrl((int) t)) + (isprint(UChar(t)) && !iscntrl(UChar(t))) #if USE_WIDEC_SUPPORT - || ((sp == 0 || !sp->_legacy_coding) && + || ((sp == NULL || !sp->_legacy_coding) && (WINDOW_EXT(win, addch_used) || !_nc_is_charable(CharOf(ch)))) #endif diff --git a/ncurses/base/lib_addstr.c b/ncurses/base/lib_addstr.c index ea449794..5bea4187 100644 --- a/ncurses/base/lib_addstr.c +++ b/ncurses/base/lib_addstr.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2019-2020,2022 Thomas E. Dickey * + * Copyright 2019-2024,2025 Thomas E. Dickey * * Copyright 1998-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -45,7 +45,7 @@ #include -MODULE_ID("$Id: lib_addstr.c,v 1.58 2022/06/11 20:12:04 tom Exp $") +MODULE_ID("$Id: lib_addstr.c,v 1.65 2025/02/20 08:53:36 tom Exp $") NCURSES_EXPORT(int) waddnstr(WINDOW *win, const char *astr, int n) @@ -55,16 +55,18 @@ waddnstr(WINDOW *win, const char *astr, int n) T((T_CALLED("waddnstr(%p,%s,%d)"), (void *) win, _nc_visbufn(astr, n), n)); - if (win && (str != 0)) { + if (win != NULL && str != NULL) { + bool explicit = (n >= 0); + TR(TRACE_VIRTPUT | TRACE_ATTRS, ("... current %s", _traceattr(WINDOW_ATTRS(win)))); code = OK; TR(TRACE_VIRTPUT, ("str is not null, length = %d", - ((n > 0) ? n : (int) strlen(str)))); - if (n < 0) + (explicit ? n : (int) strlen(str)))); + if (!explicit) n = INT_MAX; - while ((*str != '\0') && (n-- > 0)) { + while ((n-- > 0) && (*str != '\0')) { NCURSES_CH_T ch; TR(TRACE_VIRTPUT, ("*str = %#o", UChar(*str))); SetChar(ch, UChar(*str++), A_NORMAL); @@ -121,7 +123,7 @@ NCURSES_EXPORT(int) _nc_wchstrlen(const cchar_t *s) { int result = 0; - if (s != 0) { + if (s != NULL) { while (CharOf(s[result]) != L'\0') { result++; } @@ -144,7 +146,7 @@ wadd_wchnstr(WINDOW *win, const cchar_t *astr, int n) _nc_viscbuf(astr, n), n)); - if (!win) + if (!win || !astr) returnCode(ERR); y = win->_cury; @@ -228,16 +230,18 @@ waddnwstr(WINDOW *win, const wchar_t *str, int n) T((T_CALLED("waddnwstr(%p,%s,%d)"), (void *) win, _nc_viswbufn(str, n), n)); - if (win && (str != 0)) { + if (win != NULL && str != NULL) { + bool explicit = (n >= 0); + TR(TRACE_VIRTPUT | TRACE_ATTRS, ("... current %s", _traceattr(WINDOW_ATTRS(win)))); code = OK; TR(TRACE_VIRTPUT, ("str is not null, length = %d", - ((n > 0) ? n : (int) wcslen(str)))); - if (n < 0) + (explicit ? n : (int) wcslen(str)))); + if (!explicit) n = INT_MAX; - while ((*str != L('\0')) && (n-- > 0)) { + while ((n-- > 0) && (*str != L('\0'))) { NCURSES_CH_T ch; TR(TRACE_VIRTPUT, ("*str[0] = %#lx", (unsigned long) *str)); SetChar(ch, *str++, A_NORMAL); diff --git a/ncurses/base/lib_beep.c b/ncurses/base/lib_beep.c index b1a60b92..20a53d52 100644 --- a/ncurses/base/lib_beep.c +++ b/ncurses/base/lib_beep.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020 Thomas E. Dickey * + * Copyright 2020,2024 Thomas E. Dickey * * Copyright 1998-2013,2014 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -47,7 +47,7 @@ #define CUR SP_TERMTYPE #endif -MODULE_ID("$Id: lib_beep.c,v 1.18 2020/02/02 23:34:34 tom Exp $") +MODULE_ID("$Id: lib_beep.c,v 1.20 2024/12/15 00:03:48 tom Exp $") /* * beep() @@ -65,11 +65,11 @@ NCURSES_SP_NAME(beep) (NCURSES_SP_DCL0) T((T_CALLED("beep(%p)"), (void *) SP_PARM)); #ifdef USE_TERM_DRIVER - if (SP_PARM != 0) + if (SP_PARM != NULL) res = CallDriver_1(SP_PARM, td_doBeepOrFlash, TRUE); #else /* FIXME: should make sure that we are not in altchar mode */ - if (cur_term == 0) { + if (cur_term == NULL) { res = ERR; } else if (bell) { res = NCURSES_PUTP2_FLUSH("bell", bell); diff --git a/ncurses/base/lib_bkgd.c b/ncurses/base/lib_bkgd.c index 4f990808..0358f4a2 100644 --- a/ncurses/base/lib_bkgd.c +++ b/ncurses/base/lib_bkgd.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2020,2021 Thomas E. Dickey * + * Copyright 2018-2021,2024 Thomas E. Dickey * * Copyright 1998-2014,2016 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -37,7 +37,7 @@ #include -MODULE_ID("$Id: lib_bkgd.c,v 1.63 2021/05/08 14:58:12 tom Exp $") +MODULE_ID("$Id: lib_bkgd.c,v 1.64 2024/12/07 20:00:48 tom Exp $") static const NCURSES_CH_T blank = NewChar(BLANK_TEXT); @@ -136,7 +136,7 @@ _nc_background(WINDOW *win, const ARG_CH_T ch, bool narrow) #define TraceChar(c) _tracechar(CharOf(c)) #endif - if (SP == 0) { + if (SP == NULL) { ; } else if (win) { NCURSES_CH_T new_bkgd = CHDEREF(ch); diff --git a/ncurses/base/lib_chgat.c b/ncurses/base/lib_chgat.c index 74c4f75b..e78c76a6 100644 --- a/ncurses/base/lib_chgat.c +++ b/ncurses/base/lib_chgat.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020 Thomas E. Dickey * + * Copyright 2020-2015,2025 Thomas E. Dickey * * Copyright 1998-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -43,7 +43,7 @@ #include -MODULE_ID("$Id: lib_chgat.c,v 1.13 2020/02/02 23:34:34 tom Exp $") +MODULE_ID("$Id: lib_chgat.c,v 1.15 2025/02/15 20:53:36 tom Exp $") NCURSES_EXPORT(int) wchgat(WINDOW *win, @@ -62,7 +62,8 @@ wchgat(WINDOW *win, color_pair)); set_extended_pair(opts, color_pair); - if (win) { + if (win != NULL + && color_pair >= 0) { struct ldat *line = &(win->_line[win->_cury]); int i; diff --git a/ncurses/base/lib_color.c b/ncurses/base/lib_color.c index b61d44a6..c4198d13 100644 --- a/ncurses/base/lib_color.c +++ b/ncurses/base/lib_color.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2021,2022 Thomas E. Dickey * + * Copyright 2018-2024,2025 Thomas E. Dickey * * Copyright 1998-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -49,7 +49,7 @@ #define CUR SP_TERMTYPE #endif -MODULE_ID("$Id: lib_color.c,v 1.149 2022/04/30 18:36:54 tom Exp $") +MODULE_ID("$Id: lib_color.c,v 1.155 2025/01/18 14:47:35 tom Exp $") #ifdef USE_TERM_DRIVER #define CanChange InfoOf(SP_PARM).canchange @@ -146,13 +146,13 @@ NCURSES_EXPORT_VAR(const color_t*) _nc_hls_palette = hls_palette; static int default_fg(NCURSES_SP_DCL0) { - return (SP_PARM != 0) ? SP_PARM->_default_fg : COLOR_WHITE; + return (SP_PARM != NULL) ? SP_PARM->_default_fg : COLOR_WHITE; } static int default_bg(NCURSES_SP_DCL0) { - return SP_PARM != 0 ? SP_PARM->_default_bg : COLOR_BLACK; + return SP_PARM != NULL ? SP_PARM->_default_bg : COLOR_BLACK; } #else #define default_fg(sp) COLOR_WHITE @@ -248,7 +248,7 @@ init_color_table(NCURSES_SP_DCL0) static bool init_direct_colors(NCURSES_SP_DCL0) { - static NCURSES_CONST char name[] = "RGB"; + static NCURSES_CONST char name[] = UserCap(RGB); rgb_bits_t *result = &(SP_PARM->_direct_color); @@ -273,7 +273,7 @@ init_direct_colors(NCURSES_SP_DCL0) result->bits.red = UChar(n); result->bits.green = UChar(n); result->bits.blue = UChar(n); - } else if ((s = tigetstr(name)) != 0 && VALID_STRING(s)) { + } else if ((s = tigetstr(name)) != NULL && VALID_STRING(s)) { int red = n; int green = n; int blue = width - (2 * n); @@ -312,7 +312,7 @@ reset_color_pair(NCURSES_SP_DCL0) bool result = FALSE; (void) SP_PARM; - if (orig_pair != 0) { + if (orig_pair != NULL) { (void) NCURSES_PUTP2("orig_pair", orig_pair); result = TRUE; } @@ -339,7 +339,7 @@ NCURSES_SP_NAME(_nc_reset_colors) (NCURSES_SP_DCL0) #ifdef USE_TERM_DRIVER result = CallDriver(SP_PARM, td_rescolors); #else - if (orig_colors != 0) { + if (orig_colors != NULL) { NCURSES_PUTP2("orig_colors", orig_colors); result = TRUE; } @@ -362,7 +362,7 @@ NCURSES_SP_NAME(start_color) (NCURSES_SP_DCL0) T((T_CALLED("start_color(%p)"), (void *) SP_PARM)); - if (SP_PARM == 0) { + if (SP_PARM == NULL) { result = ERR; } else if (SP_PARM->_coloron) { result = OK; @@ -406,12 +406,12 @@ NCURSES_SP_NAME(start_color) (NCURSES_SP_DCL0) #endif ReservePairs(SP_PARM, 16); - if (SP_PARM->_color_pairs != 0) { + if (SP_PARM->_color_pairs != NULL) { if (init_direct_colors(NCURSES_SP_ARG)) { result = OK; } else { TYPE_CALLOC(color_t, maxcolors, SP_PARM->_color_table); - if (SP_PARM->_color_table != 0) { + if (SP_PARM->_color_table != NULL) { MakeColorPair(SP_PARM->_color_pairs[0], default_fg(NCURSES_SP_ARG), default_bg(NCURSES_SP_ARG)); @@ -425,7 +425,7 @@ NCURSES_SP_NAME(start_color) (NCURSES_SP_DCL0) COLORS, COLOR_PAIRS)); SP_PARM->_coloron = 1; - } else if (SP_PARM->_color_pairs != 0) { + } else if (SP_PARM->_color_pairs != NULL) { FreeAndNull(SP_PARM->_color_pairs); } } @@ -526,13 +526,13 @@ _nc_reserve_pairs(SCREEN *sp, int want) if (have > sp->_pair_limit) have = sp->_pair_limit; - if (sp->_color_pairs == 0) { + if (sp->_color_pairs == NULL) { TYPE_CALLOC(colorpair_t, have, sp->_color_pairs); } else if (have > sp->_pair_alloc) { -#if NCURSES_EXT_COLORS +#if NCURSES_EXT_COLORS && NCURSES_EXT_FUNCS colorpair_t *next; - if ((next = typeCalloc(colorpair_t, have)) == 0) + if ((next = typeCalloc(colorpair_t, have)) == NULL) _nc_err_abort(MSG_NO_MEMORY); memcpy(next, sp->_color_pairs, (size_t) sp->_pair_alloc * sizeof(*next)); _nc_copy_pairs(sp, next, sp->_color_pairs, sp->_pair_alloc); @@ -540,13 +540,13 @@ _nc_reserve_pairs(SCREEN *sp, int want) sp->_color_pairs = next; #else TYPE_REALLOC(colorpair_t, have, sp->_color_pairs); - if (sp->_color_pairs != 0) { + if (sp->_color_pairs != NULL) { memset(sp->_color_pairs + sp->_pair_alloc, 0, sizeof(colorpair_t) * (size_t) (have - sp->_pair_alloc)); } #endif } - if (sp->_color_pairs != 0) { + if (sp->_color_pairs != NULL) { sp->_pair_alloc = have; } } @@ -713,7 +713,7 @@ _nc_init_color(SCREEN *sp, int color, int r, int g, int b) color, r, g, b)); - if (sp == 0 || sp->_direct_color.value) + if (sp == NULL || sp->_direct_color.value) returnCode(result); maxcolors = MaxColors; @@ -745,7 +745,7 @@ _nc_init_color(SCREEN *sp, int color, int r, int g, int b) NCURSES_PUTP2("initialize_color", TIPARM_4(initialize_color, color, r, g, b)); #endif - sp->_color_defs = max(color + 1, sp->_color_defs); + sp->_color_defs = Max(color + 1, sp->_color_defs); result = OK; } @@ -776,7 +776,7 @@ init_color(NCURSES_COLOR_T color, NCURSES_EXPORT(bool) NCURSES_SP_NAME(can_change_color) (NCURSES_SP_DCL) { - int result = FALSE; + bool result = FALSE; T((T_CALLED("can_change_color(%p)"), (void *) SP_PARM)); @@ -784,7 +784,7 @@ NCURSES_SP_NAME(can_change_color) (NCURSES_SP_DCL) result = TRUE; } - returnCode(result); + returnBool(result); } #if NCURSES_SP_FUNCS @@ -798,7 +798,7 @@ can_change_color(void) NCURSES_EXPORT(bool) NCURSES_SP_NAME(has_colors) (NCURSES_SP_DCL0) { - int code = FALSE; + bool code = FALSE; (void) SP_PARM; T((T_CALLED("has_colors(%p)"), (void *) SP_PARM)); @@ -814,7 +814,7 @@ NCURSES_SP_NAME(has_colors) (NCURSES_SP_DCL0) || set_color_pair)) ? TRUE : FALSE); #endif } - returnCode(code); + returnBool(code); } #if NCURSES_SP_FUNCS @@ -837,7 +837,7 @@ _nc_color_content(SCREEN *sp, int color, int *r, int *g, int *b) (void *) g, (void *) b)); - if (sp != 0) { + if (sp != NULL) { int maxcolors = MaxColors; if (color >= 0 && OkColorHi(color) && sp->_coloron) { @@ -1008,14 +1008,14 @@ NCURSES_SP_NAME(_nc_do_color) (NCURSES_SP_DCLx TIPARM_1(set_color_pair, pair), 1, outc); return; - } else if (SP_PARM != 0) { + } else if (SP_PARM != NULL) { if (_nc_pair_content(SP_PARM, pair, &fg, &bg) == ERR) return; } } if (old_pair >= 0 - && SP_PARM != 0 + && SP_PARM != NULL && _nc_pair_content(SP_PARM, old_pair, &old_fg, &old_bg) != ERR) { if ((isDefaultColor(fg) && !isDefaultColor(old_fg)) || (isDefaultColor(bg) && !isDefaultColor(old_bg))) { @@ -1081,7 +1081,7 @@ _nc_do_color(int old_pair, int pair, int reverse, NCURSES_OUTC outc) } #endif -#if NCURSES_EXT_COLORS +#if NCURSES_EXT_COLORS && NCURSES_EXT_FUNCS NCURSES_EXPORT(int) NCURSES_SP_NAME(init_extended_pair) (NCURSES_SP_DCLx int pair, int f, int b) { @@ -1115,11 +1115,11 @@ NCURSES_SP_NAME(extended_pair_content) (NCURSES_SP_DCLx NCURSES_EXPORT(void) NCURSES_SP_NAME(reset_color_pairs) (NCURSES_SP_DCL0) { - if (SP_PARM != 0) { + if (SP_PARM != NULL) { if (SP_PARM->_color_pairs) { _nc_free_ordered_pairs(SP_PARM); free(SP_PARM->_color_pairs); - SP_PARM->_color_pairs = 0; + SP_PARM->_color_pairs = NULL; SP_PARM->_pair_alloc = 0; ReservePairs(SP_PARM, 16); clearok(CurScreen(SP_PARM), TRUE); diff --git a/ncurses/base/lib_colorset.c b/ncurses/base/lib_colorset.c index 387edef6..d200b9f0 100644 --- a/ncurses/base/lib_colorset.c +++ b/ncurses/base/lib_colorset.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020 Thomas E. Dickey * + * Copyright 2020,2024 Thomas E. Dickey * * Copyright 1998-2014,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -42,7 +42,7 @@ #include #include -MODULE_ID("$Id: lib_colorset.c,v 1.16 2020/02/02 23:34:34 tom Exp $") +MODULE_ID("$Id: lib_colorset.c,v 1.17 2024/12/07 20:00:48 tom Exp $") NCURSES_EXPORT(int) wcolor_set(WINDOW *win, NCURSES_PAIRS_T pair_arg, void *opts) @@ -53,7 +53,7 @@ wcolor_set(WINDOW *win, NCURSES_PAIRS_T pair_arg, void *opts) T((T_CALLED("wcolor_set(%p,%d)"), (void *) win, color_pair)); set_extended_pair(opts, color_pair); if (win - && (SP != 0) + && (SP != NULL) && (color_pair >= 0) && (color_pair < SP->_pair_limit)) { TR(TRACE_ATTRS, ("... current %ld", (long) GET_WINDOW_PAIR(win))); diff --git a/ncurses/base/lib_delch.c b/ncurses/base/lib_delch.c index d39a8eba..a24cb677 100644 --- a/ncurses/base/lib_delch.c +++ b/ncurses/base/lib_delch.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020 Thomas E. Dickey * + * Copyright 2020,2024 Thomas E. Dickey * * Copyright 1998-2001,2009 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -41,7 +41,7 @@ #include -MODULE_ID("$Id: lib_delch.c,v 1.14 2020/02/02 23:34:34 tom Exp $") +MODULE_ID("$Id: lib_delch.c,v 1.16 2024/10/19 21:20:46 tom Exp $") NCURSES_EXPORT(int) wdelch(WINDOW *win) @@ -54,8 +54,8 @@ wdelch(WINDOW *win) NCURSES_CH_T blank = win->_nc_bkgd; struct ldat *line = &(win->_line[win->_cury]); NCURSES_CH_T *end = &(line->text[win->_maxx]); - NCURSES_CH_T *temp2 = &(line->text[win->_curx + 1]); - NCURSES_CH_T *temp1 = temp2 - 1; + NCURSES_CH_T *temp1 = &(line->text[win->_curx]); + const NCURSES_CH_T *temp2 = temp1 + 1; CHANGED_TO_EOL(line, win->_curx, win->_maxx); while (temp1 < end) diff --git a/ncurses/base/lib_delwin.c b/ncurses/base/lib_delwin.c index 1136305a..855671ca 100644 --- a/ncurses/base/lib_delwin.c +++ b/ncurses/base/lib_delwin.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020,2021 Thomas E. Dickey * + * Copyright 2020-2023,2024 Thomas E. Dickey * * Copyright 1998-2008,2009 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -43,30 +43,31 @@ #include -MODULE_ID("$Id: lib_delwin.c,v 1.24 2021/12/11 23:56:25 tom Exp $") +MODULE_ID("$Id: lib_delwin.c,v 1.29 2024/12/07 17:28:13 tom Exp $") static bool -cannot_delete(WINDOW *win) +cannot_delete(const WINDOW *win) { bool result = TRUE; + bool found = FALSE; + SCREEN *scan; + WINDOWLIST *p; - if (IS_PAD(win)) { - result = FALSE; - } else { - WINDOWLIST *p; -#ifdef USE_SP_WINDOWLIST - SCREEN *sp = _nc_screen_of(win); -#endif - - for (each_window(SP_PARM, p)) { + for (each_screen(scan)) { + for (each_window(scan, p)) { if (&(p->win) == win) { result = FALSE; + found = TRUE; + break; } else if (IS_SUBWIN(&(p->win)) && p->win._parent == win) { result = TRUE; + found = TRUE; break; } } + if (found) + break; } return result; } @@ -79,7 +80,7 @@ delwin(WINDOW *win) T((T_CALLED("delwin(%p)"), (void *) win)); if (_nc_try_global(curses) == 0) { - if (win == 0 + if (win == NULL || cannot_delete(win)) { result = ERR; } else if (IS_PAD(win)) { @@ -91,7 +92,7 @@ delwin(WINDOW *win) #endif if (IS_SUBWIN(win)) { touchwin(win->_parent); - } else if (CurScreen(SP_PARM) != 0) { + } else if (CurScreen(SP_PARM) != NULL) { touchwin(CurScreen(SP_PARM)); } result = _nc_freewin(win); diff --git a/ncurses/base/lib_dft_fgbg.c b/ncurses/base/lib_dft_fgbg.c index 4dd43bb1..d6cf303a 100644 --- a/ncurses/base/lib_dft_fgbg.c +++ b/ncurses/base/lib_dft_fgbg.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020,2021 Thomas E. Dickey * + * Copyright 2020-2024,2025 Thomas E. Dickey * * Copyright 1998-2014,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -38,7 +38,7 @@ #define CUR SP_TERMTYPE #endif -MODULE_ID("$Id: lib_dft_fgbg.c,v 1.31 2021/04/03 22:27:18 tom Exp $") +MODULE_ID("$Id: lib_dft_fgbg.c,v 1.33 2025/01/18 14:47:35 tom Exp $") /* * Modify the behavior of color-pair 0 so that the library doesn't assume that @@ -69,17 +69,17 @@ NCURSES_SP_NAME(assume_default_colors) (NCURSES_SP_DCLx int fg, int bg) int code = ERR; T((T_CALLED("assume_default_colors(%p,%d,%d)"), (void *) SP_PARM, fg, bg)); - if (SP_PARM != 0) { + if (SP_PARM != NULL) { #ifdef USE_TERM_DRIVER code = CallDriver_2(SP_PARM, td_defaultcolors, fg, bg); #else if ((orig_pair || orig_colors) && !initialize_pair) { SP_PARM->_default_color = isDefaultColor(fg) || isDefaultColor(bg); - SP_PARM->_has_sgr_39_49 = (tigetflag("AX") == TRUE); + SP_PARM->_has_sgr_39_49 = (tigetflag(UserCap(AX)) == TRUE); SP_PARM->_default_fg = isDefaultColor(fg) ? COLOR_DEFAULT : fg; SP_PARM->_default_bg = isDefaultColor(bg) ? COLOR_DEFAULT : bg; - if (SP_PARM->_color_pairs != 0) { + if (SP_PARM->_color_pairs != NULL) { bool save = SP_PARM->_default_color; SP_PARM->_assumed_color = TRUE; SP_PARM->_default_color = TRUE; diff --git a/ncurses/base/lib_driver.c b/ncurses/base/lib_driver.c index c53802f3..171ad615 100644 --- a/ncurses/base/lib_driver.c +++ b/ncurses/base/lib_driver.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018,2020 Thomas E. Dickey * + * Copyright 2018-2024,2025 Thomas E. Dickey * * Copyright 2009-2012,2014 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -34,7 +34,7 @@ #include -MODULE_ID("$Id: lib_driver.c,v 1.9 2020/08/29 19:53:35 tom Exp $") +MODULE_ID("$Id: lib_driver.c,v 1.11 2025/02/20 01:02:09 tom Exp $") #ifndef EXP_WIN32_DRIVER typedef struct DriverEntry { @@ -56,12 +56,12 @@ _nc_get_driver(TERMINAL_CONTROL_BLOCK * TCB, const char *name, int *errret) int code = ERR; size_t i; TERM_DRIVER *res = (TERM_DRIVER *) 0; - TERM_DRIVER *use = 0; + TERM_DRIVER *use = NULL; T((T_CALLED("_nc_get_driver(%p, %s, %p)"), (void *) TCB, NonNull(name), (void *) errret)); - assert(TCB != 0); + assert(TCB != NULL); for (i = 0; i < SIZEOF(DriverTable); i++) { res = DriverTable[i].driver; @@ -72,7 +72,7 @@ _nc_get_driver(TERMINAL_CONTROL_BLOCK * TCB, const char *name, int *errret) } } } - if (use != 0) { + if (use != NULL) { TCB->drv = use; code = OK; } @@ -98,7 +98,7 @@ NCURSES_SP_NAME(_nc_mcprint) (SCREEN *sp, char *data, int len) { int code = ERR; - if (0 != TerminalOf(sp)) + if (NULL != TerminalOf(sp)) code = CallDriver_2(sp, td_print, data, len); return (code); } diff --git a/ncurses/base/lib_echo.c b/ncurses/base/lib_echo.c index d8f57f29..381f51fb 100644 --- a/ncurses/base/lib_echo.c +++ b/ncurses/base/lib_echo.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020 Thomas E. Dickey * + * Copyright 2020-2023,2024 Thomas E. Dickey * * Copyright 1998-2000,2009 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -45,15 +45,15 @@ #include -MODULE_ID("$Id: lib_echo.c,v 1.9 2020/02/02 23:34:34 tom Exp $") +MODULE_ID("$Id: lib_echo.c,v 1.11 2024/12/07 20:00:48 tom Exp $") NCURSES_EXPORT(int) NCURSES_SP_NAME(echo) (NCURSES_SP_DCL0) { T((T_CALLED("echo(%p)"), (void *) SP_PARM)); - if (0 == SP_PARM) + if (NULL == SP_PARM) returnCode(ERR); - SP_PARM->_echo = TRUE; + IsEcho(SP_PARM) = TRUE; returnCode(OK); } @@ -69,9 +69,9 @@ NCURSES_EXPORT(int) NCURSES_SP_NAME(noecho) (NCURSES_SP_DCL0) { T((T_CALLED("noecho(%p)"), (void *) SP_PARM)); - if (0 == SP_PARM) + if (NULL == SP_PARM) returnCode(ERR); - SP_PARM->_echo = FALSE; + IsEcho(SP_PARM) = FALSE; returnCode(OK); } diff --git a/ncurses/base/lib_endwin.c b/ncurses/base/lib_endwin.c index b8a9e4e6..85d2bdba 100644 --- a/ncurses/base/lib_endwin.c +++ b/ncurses/base/lib_endwin.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020 Thomas E. Dickey * + * Copyright 2020,2023 Thomas E. Dickey * * Copyright 1998-2014,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -43,7 +43,7 @@ #include -MODULE_ID("$Id: lib_endwin.c,v 1.25 2020/02/02 23:34:34 tom Exp $") +MODULE_ID("$Id: lib_endwin.c,v 1.28 2023/11/11 21:27:32 tom Exp $") NCURSES_EXPORT(int) NCURSES_SP_NAME(endwin) (NCURSES_SP_DCL0) @@ -52,20 +52,24 @@ NCURSES_SP_NAME(endwin) (NCURSES_SP_DCL0) T((T_CALLED("endwin(%p)"), (void *) SP_PARM)); - if (SP_PARM) { + if (SP_PARM != NULL) { + if (SP_PARM->_endwin != ewSuspend) { #ifdef USE_TERM_DRIVER - TERMINAL_CONTROL_BLOCK *TCB = TCBOf(SP_PARM); + TERMINAL_CONTROL_BLOCK *TCB = TCBOf(SP_PARM); - SP_PARM->_endwin = ewSuspend; - if (TCB && TCB->drv && TCB->drv->td_scexit) - TCB->drv->td_scexit(SP_PARM); + SP_PARM->_endwin = ewSuspend; + if (TCB && TCB->drv && TCB->drv->td_scexit) + TCB->drv->td_scexit(SP_PARM); #else - SP_PARM->_endwin = ewSuspend; - SP_PARM->_mouse_wrap(SP_PARM); - _nc_screen_wrap(); - _nc_mvcur_wrap(); /* wrap up cursor addressing */ + SP_PARM->_endwin = ewSuspend; + SP_PARM->_mouse_wrap(SP_PARM); + _nc_screen_wrap(); + _nc_mvcur_wrap(); /* wrap up cursor addressing */ #endif - code = NCURSES_SP_NAME(reset_shell_mode) (NCURSES_SP_ARG); + code = OK; + } + if (NCURSES_SP_NAME(reset_shell_mode) (NCURSES_SP_ARG) == ERR) + code = ERR; } returnCode(code); diff --git a/ncurses/base/lib_erase.c b/ncurses/base/lib_erase.c index aa9437a1..461acdda 100644 --- a/ncurses/base/lib_erase.c +++ b/ncurses/base/lib_erase.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020,2022 Thomas E. Dickey * + * Copyright 2020-2022,2024 Thomas E. Dickey * * Copyright 1998-2009,2016 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -42,7 +42,7 @@ #include -MODULE_ID("$Id: lib_erase.c,v 1.20 2022/09/03 21:40:27 tom Exp $") +MODULE_ID("$Id: lib_erase.c,v 1.21 2024/12/07 20:00:48 tom Exp $") NCURSES_EXPORT(int) werase(WINDOW *win) @@ -71,7 +71,7 @@ werase(WINDOW *win) */ if_WIDEC({ if (isWidecExt(start[0])) { - int x = (win->_parent != 0) ? (win->_begx) : 0; + int x = (win->_parent != NULL) ? (win->_begx) : 0; while (x-- > 0) { if (isWidecBase(start[-1])) { --start; diff --git a/ncurses/base/lib_flash.c b/ncurses/base/lib_flash.c index 975d5f56..13e9bbb1 100644 --- a/ncurses/base/lib_flash.c +++ b/ncurses/base/lib_flash.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020 Thomas E. Dickey * + * Copyright 2020,2024 Thomas E. Dickey * * Copyright 1998-2013,2014 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -47,7 +47,7 @@ #define CUR SP_TERMTYPE #endif -MODULE_ID("$Id: lib_flash.c,v 1.15 2020/02/02 23:34:34 tom Exp $") +MODULE_ID("$Id: lib_flash.c,v 1.16 2024/12/14 22:31:47 tom Exp $") /* * flash() @@ -64,7 +64,7 @@ NCURSES_SP_NAME(flash) (NCURSES_SP_DCL0) T((T_CALLED("flash(%p)"), (void *) SP_PARM)); #ifdef USE_TERM_DRIVER - if (SP_PARM != 0) + if (SP_PARM != NULL) res = CallDriver_1(SP_PARM, td_doBeepOrFlash, FALSE); #else if (HasTerminal(SP_PARM)) { diff --git a/ncurses/base/lib_freeall.c b/ncurses/base/lib_freeall.c index 75bbe77e..304ef8f6 100644 --- a/ncurses/base/lib_freeall.c +++ b/ncurses/base/lib_freeall.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2020,2021 Thomas E. Dickey * + * Copyright 2018-2021,2024 Thomas E. Dickey * * Copyright 1998-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -40,7 +40,7 @@ extern int malloc_errfd; /* FIXME */ #endif -MODULE_ID("$Id: lib_freeall.c,v 1.76 2021/11/06 21:52:49 tom Exp $") +MODULE_ID("$Id: lib_freeall.c,v 1.78 2024/12/07 18:00:11 tom Exp $") /* * Free all ncurses data. This is used for testing only (there's no practical @@ -54,11 +54,11 @@ NCURSES_SP_NAME(_nc_freeall) (NCURSES_SP_DCL0) T((T_CALLED("_nc_freeall()"))); #if NO_LEAKS _nc_globals.leak_checking = TRUE; - if (SP_PARM != 0) { - if (SP_PARM->_oldnum_list != 0) { + if (SP_PARM != NULL) { + if (SP_PARM->_oldnum_list != NULL) { FreeAndNull(SP_PARM->_oldnum_list); } - if (SP_PARM->_panelHook.destroy != 0) { + if (SP_PARM->_panelHook.destroy != NULL) { SP_PARM->_panelHook.destroy(SP_PARM->_panelHook.stdscr_pseudo_panel); } #if NCURSES_EXT_COLORS @@ -66,10 +66,10 @@ NCURSES_SP_NAME(_nc_freeall) (NCURSES_SP_DCL0) #endif } #endif - if (SP_PARM != 0) { + if (SP_PARM != NULL) { _nc_lock_global(curses); - while (WindowList(SP_PARM) != 0) { + while (WindowList(SP_PARM) != NULL) { WINDOWLIST *p, *q; bool deleted = FALSE; @@ -87,7 +87,7 @@ NCURSES_SP_NAME(_nc_freeall) (NCURSES_SP_DCL0) #endif for (each_window(SP_PARM, q)) { - WINDOW *q_win = &(q->win); + const WINDOW *q_win = &(q->win); #ifndef USE_SP_WINDOWLIST if (q->screen != SP_PARM) @@ -119,7 +119,7 @@ NCURSES_SP_NAME(_nc_freeall) (NCURSES_SP_DCL0) _nc_unlock_global(curses); } - (void) _nc_printf_string(0, empty_va); + (void) _nc_printf_string(NULL, empty_va); #ifdef TRACE (void) _nc_trace_buf(-1, (size_t) 0); #endif diff --git a/ncurses/base/lib_getch.c b/ncurses/base/lib_getch.c index 831ded9d..a8d720c3 100644 --- a/ncurses/base/lib_getch.c +++ b/ncurses/base/lib_getch.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2021,2022 Thomas E. Dickey * + * Copyright 2018-2023,2024 Thomas E. Dickey * * Copyright 1998-2015,2016 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -44,7 +44,7 @@ #define NEED_KEY_EVENT #include -MODULE_ID("$Id: lib_getch.c,v 1.145 2022/12/24 22:38:38 tom Exp $") +MODULE_ID("$Id: lib_getch.c,v 1.148 2024/12/07 17:40:33 tom Exp $") #include @@ -135,7 +135,7 @@ _nc_use_meta(WINDOW *win) } #ifdef USE_TERM_DRIVER -# if defined(_NC_WINDOWS) && !defined(EXP_WIN32_DRIVER) +# if defined(_NC_WINDOWS_NATIVE) && !defined(EXP_WIN32_DRIVER) static HANDLE _nc_get_handle(int fd) { @@ -163,7 +163,7 @@ check_mouse_activity(SCREEN *sp, int delay EVENTLIST_2nd(_nc_eventlist * evl)) _nc_console_handle(sp->_ifd), delay EVENTLIST_2nd(evl)); } else -# elif defined(_NC_WINDOWS) +# elif defined(_NC_WINDOWS_NATIVE) /* if we emulate terminfo on console, we have to use the console routine */ if (IsTermInfoOnConsole(sp)) { HANDLE fd = _nc_get_handle(sp->_ifd); @@ -298,8 +298,8 @@ fifo_push(SCREEN *sp EVENTLIST_2nd(_nc_eventlist * evl)) } else #endif #if USE_KLIBC_KBD - if (NC_ISATTY(sp->_ifd) && sp->_cbreak) { - ch = _read_kbd(0, 1, !sp->_raw); + if (NC_ISATTY(sp->_ifd) && IsCbreak(sp)) { + ch = _read_kbd(0, 1, !IsRaw(sp)); n = (ch == -1) ? -1 : 1; sp->_extended_key = (ch == 0); } else @@ -308,15 +308,15 @@ fifo_push(SCREEN *sp EVENTLIST_2nd(_nc_eventlist * evl)) #if defined(USE_TERM_DRIVER) int buf; # if defined(EXP_WIN32_DRIVER) - if (NC_ISATTY(sp->_ifd) && IsTermInfoOnConsole(sp) && sp->_cbreak) { + if (NC_ISATTY(sp->_ifd) && IsTermInfoOnConsole(sp) && IsCbreak(sp)) { _nc_set_read_thread(TRUE); n = _nc_console_read(sp, _nc_console_handle(sp->_ifd), &buf); _nc_set_read_thread(FALSE); } else -# elif defined(_NC_WINDOWS) - if (NC_ISATTY(sp->_ifd) && IsTermInfoOnConsole(sp) && sp->_cbreak) +# elif defined(_NC_WINDOWS_NATIVE) + if (NC_ISATTY(sp->_ifd) && IsTermInfoOnConsole(sp) && IsCbreak(sp)) n = _nc_mingw_console_read(sp, _nc_get_handle(sp->_ifd), &buf); @@ -414,7 +414,7 @@ recur_wgetnstr(WINDOW *win, char *buf) SCREEN *sp = _nc_screen_of(win); int rc; - if (sp != 0) { + if (sp != NULL) { #ifdef USE_PTHREADS if (_nc_use_pthreads && sp != CURRENT_SCREEN) { SCREEN *save_SP; @@ -457,7 +457,7 @@ _nc_wgetch(WINDOW *win, *result = 0; sp = _nc_screen_of(win); - if (win == 0 || sp == 0) { + if (win == NULL || sp == NULL) { returnCode(ERR); } @@ -479,8 +479,8 @@ _nc_wgetch(WINDOW *win, */ if (head == -1 && !sp->_notty && - !sp->_raw && - !sp->_cbreak && + !IsRaw(sp) && + !IsCbreak(sp) && !sp->_called_wgetch) { char buf[MAXCOLUMNS], *bufp; @@ -513,13 +513,13 @@ _nc_wgetch(WINDOW *win, recur_wrefresh(win); - if (win->_notimeout || (win->_delay >= 0) || (sp->_cbreak > 1)) { + if (win->_notimeout || (win->_delay >= 0) || (IsCbreak(sp) > 1)) { if (head == -1) { /* fifo is empty */ int delay; TR(TRACE_IEVENT, ("timed delay in wgetch()")); - if (sp->_cbreak > 1) - delay = (sp->_cbreak - 1) * 100; + if (IsCbreak(sp) > 1) + delay = (IsCbreak(sp) - 1) * 100; else delay = win->_delay; @@ -638,7 +638,7 @@ _nc_wgetch(WINDOW *win, * However, we provide the same visual result as Solaris, moving the * cursor to the left. */ - if (sp->_echo && !IS_PAD(win)) { + if (IsEcho(sp) && !IS_PAD(win)) { chtype backup = (chtype) ((ch == KEY_BACKSPACE) ? '\b' : ch); if (backup < KEY_MIN) wechochar(win, backup); @@ -647,7 +647,7 @@ _nc_wgetch(WINDOW *win, /* * Simulate ICRNL mode */ - if ((ch == '\r') && sp->_nl) + if ((ch == '\r') && IsNl(sp)) ch = '\n'; /* Strip 8th-bit if so desired. We do this only for characters that diff --git a/ncurses/base/lib_getstr.c b/ncurses/base/lib_getstr.c index 8ddf7651..8e7d6dc0 100644 --- a/ncurses/base/lib_getstr.c +++ b/ncurses/base/lib_getstr.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2020,2021 Thomas E. Dickey * + * Copyright 2018-2024,2025 Thomas E. Dickey * * Copyright 1998-2011,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -42,14 +42,14 @@ #define NEED_KEY_EVENT #include -MODULE_ID("$Id: lib_getstr.c,v 1.38 2021/10/23 19:02:39 tom Exp $") +MODULE_ID("$Id: lib_getstr.c,v 1.42 2025/01/19 00:51:54 tom Exp $") /* * This wipes out the last character, no matter whether it was a tab, control * or other character, and handles reverse wraparound. */ static char * -WipeOut(WINDOW *win, int y, int x, char *first, char *last, int echoed) +WipeOut(WINDOW *win, int y, int x, const char *first, char *last, int echoed) { if (last > first) { *--last = '\0'; @@ -78,14 +78,14 @@ wgetnstr_events(WINDOW *win, { SCREEN *sp = _nc_screen_of(win); TTY buf; - bool oldnl, oldecho, oldraw, oldcbreak; + TTY_FLAGS save_flags; char erasec; char killc; - char *oldstr; + const char *oldstr; int ch; int y, x; - T((T_CALLED("wgetnstr(%p,%p,%d)"), (void *) win, (void *) str, maxlen)); + T((T_CALLED("wgetnstr_events(%p,%p,%d)"), (void *) win, (void *) str, maxlen)); if (!win || !str) returnCode(ERR); @@ -94,13 +94,11 @@ wgetnstr_events(WINDOW *win, NCURSES_SP_NAME(_nc_get_tty_mode) (NCURSES_SP_ARGx &buf); - oldnl = sp->_nl; - oldecho = sp->_echo; - oldraw = sp->_raw; - oldcbreak = sp->_cbreak; + save_flags = sp->_tty_flags; NCURSES_SP_NAME(nl) (NCURSES_SP_ARG); NCURSES_SP_NAME(noecho) (NCURSES_SP_ARG); - NCURSES_SP_NAME(raw) (NCURSES_SP_ARG); + if (!save_flags._raw) + NCURSES_SP_NAME(cbreak) (NCURSES_SP_ARG); erasec = NCURSES_SP_NAME(erasechar) (NCURSES_SP_ARG); killc = NCURSES_SP_NAME(killchar) (NCURSES_SP_ARG); @@ -122,7 +120,7 @@ wgetnstr_events(WINDOW *win, || ch == '\r' || ch == KEY_DOWN || ch == KEY_ENTER) { - if (oldecho == TRUE + if (save_flags._echo == TRUE && win->_cury == win->_maxy && win->_scroll) wechochar(win, (chtype) '\n'); @@ -138,18 +136,18 @@ wgetnstr_events(WINDOW *win, #endif if (ch == erasec || ch == KEY_LEFT || ch == KEY_BACKSPACE) { if (str > oldstr) { - str = WipeOut(win, y, x, oldstr, str, oldecho); + str = WipeOut(win, y, x, oldstr, str, save_flags._echo); } } else if (ch == killc) { while (str > oldstr) { - str = WipeOut(win, y, x, oldstr, str, oldecho); + str = WipeOut(win, y, x, oldstr, str, save_flags._echo); } } else if (ch >= KEY_MIN || (str - oldstr >= maxlen)) { NCURSES_SP_NAME(beep) (NCURSES_SP_ARG); } else { *str++ = (char) ch; - if (oldecho == TRUE) { + if (save_flags._echo == TRUE) { int oldy = win->_cury; if (waddch(win, (chtype) ch) == ERR) { /* @@ -159,7 +157,7 @@ wgetnstr_events(WINDOW *win, */ win->_flags &= ~_WRAPPED; waddch(win, (chtype) ' '); - str = WipeOut(win, y, x, oldstr, str, oldecho); + str = WipeOut(win, y, x, oldstr, str, save_flags._echo); continue; } else if (IS_WRAPPED(win)) { /* @@ -190,18 +188,14 @@ wgetnstr_events(WINDOW *win, /* Restore with a single I/O call, to fix minor asymmetry between * raw/noraw, etc. */ - sp->_nl = oldnl; - sp->_echo = oldecho; - sp->_raw = oldraw; - sp->_cbreak = oldcbreak; - + sp->_tty_flags = save_flags; NCURSES_SP_NAME(_nc_set_tty_mode) (NCURSES_SP_ARGx &buf); *str = '\0'; if (ch == ERR) returnCode(ch); - T(("wgetnstr returns %s", _nc_visbuf(oldstr))); + T(("wgetnstr_events returns %s", _nc_visbuf(oldstr))); #ifdef KEY_EVENT if (ch == KEY_EVENT) diff --git a/ncurses/base/lib_initscr.c b/ncurses/base/lib_initscr.c index 6b914913..10d43359 100644 --- a/ncurses/base/lib_initscr.c +++ b/ncurses/base/lib_initscr.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2019,2020 Thomas E. Dickey * + * Copyright 2019-2020,2024 Thomas E. Dickey * * Copyright 1998-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -46,7 +46,7 @@ #include /* needed for ISC */ #endif -MODULE_ID("$Id: lib_initscr.c,v 1.48 2020/09/07 14:26:48 tom Exp $") +MODULE_ID("$Id: lib_initscr.c,v 1.49 2024/12/07 20:00:48 tom Exp $") NCURSES_EXPORT(WINDOW *) initscr(void) @@ -90,7 +90,7 @@ initscr(void) } } #endif - if (newterm(name, stdout, stdin) == 0) { + if (newterm(name, stdout, stdin) == NULL) { fprintf(stderr, "Error opening terminal: %s.\n", name); ExitProgram(EXIT_FAILURE); } diff --git a/ncurses/base/lib_insch.c b/ncurses/base/lib_insch.c index 894605cc..430bcf21 100644 --- a/ncurses/base/lib_insch.c +++ b/ncurses/base/lib_insch.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020 Thomas E. Dickey * + * Copyright 2020,2024 Thomas E. Dickey * * Copyright 1998-2013,2016 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -44,7 +44,7 @@ #include #include -MODULE_ID("$Id: lib_insch.c,v 1.37 2020/02/02 23:34:34 tom Exp $") +MODULE_ID("$Id: lib_insch.c,v 1.39 2024/12/07 17:40:33 tom Exp $") /* * Insert the given character, updating the current location to simplify @@ -85,12 +85,12 @@ _nc_insert_ch(SCREEN *sp, WINDOW *win, chtype ch) #endif (isprint(ch8) || (ChAttrOf(ch) & A_ALTCHARSET) || - (sp != 0 && sp->_legacy_coding && !iscntrl(ch8)))) { + (sp != NULL && sp->_legacy_coding && !iscntrl(ch8)))) { if (win->_curx <= win->_maxx) { struct ldat *line = &(win->_line[win->_cury]); NCURSES_CH_T *end = &(line->text[win->_curx]); NCURSES_CH_T *temp1 = &(line->text[win->_maxx]); - NCURSES_CH_T *temp2 = temp1 - 1; + const NCURSES_CH_T *temp2 = temp1 - 1; SetChar2(wch, ch); @@ -151,7 +151,7 @@ winsch(WINDOW *win, chtype c) T((T_CALLED("winsch(%p, %s)"), (void *) win, _tracechtype(c))); - if (win != 0) { + if (win != NULL) { NCURSES_SIZE_T oy = win->_cury; NCURSES_SIZE_T ox = win->_curx; diff --git a/ncurses/base/lib_insnstr.c b/ncurses/base/lib_insnstr.c index dd51a9cd..b3eb216b 100644 --- a/ncurses/base/lib_insnstr.c +++ b/ncurses/base/lib_insnstr.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2020,2022 Thomas E. Dickey * + * Copyright 2018-2023,2024 Thomas E. Dickey * * Copyright 2004-2009,2016 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -41,7 +41,7 @@ #include #include -MODULE_ID("$Id: lib_insnstr.c,v 1.8 2022/05/21 17:35:15 tom Exp $") +MODULE_ID("$Id: lib_insnstr.c,v 1.11 2024/12/07 20:00:48 tom Exp $") NCURSES_EXPORT(int) winsnstr(WINDOW *win, const char *s, int n) @@ -51,7 +51,7 @@ winsnstr(WINDOW *win, const char *s, int n) T((T_CALLED("winsnstr(%p,%s,%d)"), (void *) win, _nc_visbufn(s, n), n)); - if (win != 0 && str != 0) { + if (win != NULL && str != NULL && n != 0) { SCREEN *sp = _nc_screen_of(win); #if USE_WIDEC_SUPPORT /* @@ -64,7 +64,7 @@ winsnstr(WINDOW *win, const char *s, int n) if (sp->_screen_unicode) { size_t nn = (n > 0) ? (size_t) n : strlen(s); wchar_t *buffer = typeMalloc(wchar_t, nn + 1); - if (buffer != 0) { + if (buffer != NULL) { mbstate_t state; size_t n3; init_mb(state); @@ -83,7 +83,7 @@ winsnstr(WINDOW *win, const char *s, int n) NCURSES_SIZE_T ox = win->_curx; const unsigned char *cp; - for (cp = str; (n <= 0 || (cp - str) < n) && *cp; cp++) { + for (cp = str; (n < 0 || (cp - str) < n) && *cp; cp++) { _nc_insert_ch(sp, win, (chtype) UChar(*cp)); } win->_curx = ox; diff --git a/ncurses/base/lib_instr.c b/ncurses/base/lib_instr.c index b9874b7c..c9016b65 100644 --- a/ncurses/base/lib_instr.c +++ b/ncurses/base/lib_instr.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020,2021 Thomas E. Dickey * + * Copyright 2020-2023,2024 Thomas E. Dickey * * Copyright 1998-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -42,7 +42,7 @@ #include -MODULE_ID("$Id: lib_instr.c,v 1.25 2021/04/03 22:24:18 tom Exp $") +MODULE_ID("$Id: lib_instr.c,v 1.28 2024/12/07 17:53:39 tom Exp $") NCURSES_EXPORT(int) winnstr(WINDOW *win, char *str, int n) @@ -63,7 +63,7 @@ winnstr(WINDOW *win, char *str, int n) for (; i < n;) { #if USE_WIDEC_SUPPORT - cchar_t *cell = &(text[col]); + const cchar_t *cell = &(text[col]); attr_t attrs; NCURSES_PAIRS_T pair; char *tmp; @@ -72,25 +72,25 @@ winnstr(WINDOW *win, char *str, int n) wchar_t *wch; int n2; - n2 = getcchar(cell, 0, 0, 0, 0); + n2 = getcchar(cell, NULL, NULL, NULL, NULL); if (n2 > 0 - && (wch = typeCalloc(wchar_t, (unsigned) n2 + 1)) != 0) { + && (wch = typeCalloc(wchar_t, (unsigned) n2 + 1)) != NULL) { bool done = FALSE; - if (getcchar(cell, wch, &attrs, &pair, 0) == OK) { + if (getcchar(cell, wch, &attrs, &pair, NULL) == OK) { mbstate_t state; size_t n3; init_mb(state); - n3 = wcstombs(0, wch, (size_t) 0); - if (!isEILSEQ(n3) && (n3 != 0)) { + n3 = wcstombs(NULL, wch, (size_t) 0); + if (!isEILSEQ(n3) && (n3 != 0) && (n3 <= MB_LEN_MAX)) { size_t need = n3 + 10 + (size_t) i; int have = (int) n3 + i; /* check for loop-done as well as overflow */ if (have > n || (int) need <= 0) { done = TRUE; - } else if ((tmp = typeCalloc(char, need)) == 0) { + } else if ((tmp = typeCalloc(char, need)) == NULL) { done = TRUE; } else { size_t i3; diff --git a/ncurses/base/lib_mouse.c b/ncurses/base/lib_mouse.c index f4151b81..a995b425 100644 --- a/ncurses/base/lib_mouse.c +++ b/ncurses/base/lib_mouse.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2021,2022 Thomas E. Dickey * + * Copyright 2018-2024,2025 Thomas E. Dickey * * Copyright 1998-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -44,7 +44,7 @@ * sysmouse (FreeBSD) * special-purpose mouse interface for OS/2 EMX. * - * Notes for implementors of new mouse-interface methods: + * Notes for implementers of new mouse-interface methods: * * The code is logically split into a lower level that accepts event reports * in a device-dependent format and an upper level that parses mouse gestures @@ -85,7 +85,7 @@ #define CUR SP_TERMTYPE #endif -MODULE_ID("$Id: lib_mouse.c,v 1.197 2022/08/13 14:13:12 tom Exp $") +MODULE_ID("$Id: lib_mouse.c,v 1.208 2025/02/15 15:12:21 tom Exp $") #include @@ -380,7 +380,7 @@ handle_sysmouse(int sig GCC_UNUSED) } #endif /* USE_SYSMOUSE */ -#ifndef USE_TERM_DRIVER +#if !defined(USE_TERM_DRIVER) || defined(EXP_WIN32_DRIVER) #define xterm_kmous "\033[M" static void @@ -388,10 +388,10 @@ init_xterm_mouse(SCREEN *sp) { sp->_mouse_type = M_XTERM; sp->_mouse_format = MF_X10; - sp->_mouse_xtermcap = tigetstr("XM"); + sp->_mouse_xtermcap = tigetstr(UserCap(XM)); if (VALID_STRING(sp->_mouse_xtermcap)) { char *code = strstr(sp->_mouse_xtermcap, "[?"); - if (code != 0) { + if (code != NULL) { code += 2; while ((*code >= '0') && (*code <= '9')) { char *next = code; @@ -417,7 +417,7 @@ init_xterm_mouse(SCREEN *sp) } } } else { - int code = tigetnum("XM"); + int code = tigetnum(UserCap(XM)); switch (code) { #ifdef EXP_XTERM_1005 case 1005: @@ -440,8 +440,11 @@ init_xterm_mouse(SCREEN *sp) #endif static void -enable_xterm_mouse(SCREEN *sp, int enable) +enable_xterm_mouse(SCREEN *sp, bool enable) { + TPUTS_TRACE(enable + ? "xterm mouse initialization" + : "xterm mouse deinitialization"); #if USE_EMX_MOUSE sp->_emxmouse_activated = enable; #else @@ -450,6 +453,18 @@ enable_xterm_mouse(SCREEN *sp, int enable) sp->_mouse_active = enable; } +#if defined(USE_TERM_DRIVER) +static void +enable_win32_mouse(SCREEN *sp, bool enable) +{ +#if defined(EXP_WIN32_DRIVER) + enable_xterm_mouse(sp, enable); +#else + sp->_mouse_active = enable; +#endif +} +#endif + #if USE_GPM_SUPPORT static bool allow_gpm_mouse(SCREEN *sp GCC_UNUSED) @@ -468,9 +483,9 @@ allow_gpm_mouse(SCREEN *sp GCC_UNUSED) if (NC_ISATTY(fileno(stdout))) { const char *list = getenv("NCURSES_GPM_TERMS"); const char *env = getenv("TERM"); - if (list != 0) { - if (env != 0) { - result = _nc_name_match(list, env, "|:"); + if (list != NULL) { + if (env != NULL) { + result = _nc_name_match(list, env, "|:") ? TRUE : FALSE; } } else { /* GPM checks the beginning of the $TERM variable to decide if it @@ -480,7 +495,7 @@ allow_gpm_mouse(SCREEN *sp GCC_UNUSED) * capability. Perhaps that works for someone. If so, they can * set the environment variable (above). */ - if (env != 0 && strstr(env, "linux") != 0) { + if (env != NULL && strstr(env, "linux") != NULL) { result = TRUE; } } @@ -492,7 +507,7 @@ allow_gpm_mouse(SCREEN *sp GCC_UNUSED) static void unload_gpm_library(SCREEN *sp) { - if (sp->_dlopen_gpm != 0) { + if (sp->_dlopen_gpm != NULL) { T(("unload GPM library")); sp->_mouse_gpm_loaded = FALSE; sp->_mouse_fd = -1; @@ -507,25 +522,25 @@ load_gpm_library(SCREEN *sp) /* * If we already had a successful dlopen, reuse it. */ - if (sp->_dlopen_gpm != 0) { + if (sp->_dlopen_gpm != NULL) { sp->_mouse_gpm_found = TRUE; sp->_mouse_gpm_loaded = TRUE; - } else if ((sp->_dlopen_gpm = dlopen(LIBGPM_SONAME, my_RTLD)) != 0) { + } else if ((sp->_dlopen_gpm = dlopen(LIBGPM_SONAME, my_RTLD)) != NULL) { #if (defined(__GNUC__) && (__GNUC__ >= 5)) || defined(__clang__) #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wpedantic" #endif - if (GET_DLSYM(gpm_fd) == 0 || - GET_DLSYM(Gpm_Open) == 0 || - GET_DLSYM(Gpm_Close) == 0 || - GET_DLSYM(Gpm_GetEvent) == 0) { + if (GET_DLSYM(gpm_fd) == NULL || + GET_DLSYM(Gpm_Open) == NULL || + GET_DLSYM(Gpm_Close) == NULL || + GET_DLSYM(Gpm_GetEvent) == NULL) { #if (defined(__GNUC__) && (__GNUC__ >= 5)) || defined(__clang__) #pragma GCC diagnostic pop #endif T(("GPM initialization failed: %s", dlerror())); unload_gpm_library(sp); dlclose(sp->_dlopen_gpm); - sp->_dlopen_gpm = 0; + sp->_dlopen_gpm = NULL; } else { sp->_mouse_gpm_found = TRUE; sp->_mouse_gpm_loaded = TRUE; @@ -741,11 +756,12 @@ initialize_mousetype(SCREEN *sp) #ifdef USE_TERM_DRIVER CallDriver(sp, td_initmouse); -#else +#endif +#if !defined(USE_TERM_DRIVER) || defined(EXP_WIN32_DRIVER) /* we know how to recognize mouse events under "xterm" */ if (NonEmpty(key_mouse)) { init_xterm_mouse(sp); - } else if (strstr(SP_TERMTYPE term_names, "xterm") != 0) { + } else if (strstr(SP_TERMTYPE term_names, "xterm") != NULL) { if (_nc_add_to_try(&(sp->_keytry), xterm_kmous, KEY_MOUSE) == OK) init_xterm_mouse(sp); } @@ -760,13 +776,15 @@ _nc_mouse_init(SCREEN *sp) { bool result = FALSE; - if (sp != 0) { + T((T_CALLED("_nc_mouse_init(%p)"), (void *) sp)); + + if (sp != NULL) { if (!sp->_mouse_initialized) { int i; sp->_mouse_initialized = TRUE; - TR(MY_TRACE, ("_nc_mouse_init() called")); + TR(MY_TRACE, ("set _mouse_initialized")); sp->_mouse_eventp = FirstEV(sp); for (i = 0; i < EV_MAX; i++) @@ -774,11 +792,11 @@ _nc_mouse_init(SCREEN *sp) initialize_mousetype(sp); - T(("_nc_mouse_init() set mousetype to %d", sp->_mouse_type)); + T(("set _mouse_type to %d", sp->_mouse_type)); } result = sp->_mouse_initialized; } - return result; + returnBool(result); } /* @@ -1096,7 +1114,7 @@ decode_xterm_X10(SCREEN *sp, MEVENT * eventp) sp->_ifd, #endif kbuf + grabbed, (size_t) (MAX_KBUF - (int) grabbed)); - if (res == -1) + if (res < 0) break; } _nc_set_read_thread(FALSE); @@ -1144,7 +1162,7 @@ decode_xterm_1005(SCREEN *sp, MEVENT * eventp) sp->_ifd, #endif (kbuf + grabbed), (size_t) 1); - if (res == -1) + if (res < 0) break; grabbed += (size_t) res; if (grabbed > 1) { @@ -1201,7 +1219,7 @@ typedef struct { } SGR_DATA; static bool -read_SGR(SCREEN *sp, SGR_DATA * result) +read_SGR(const SCREEN *sp, SGR_DATA * result) { char kbuf[80]; /* bigger than any possible mouse response */ int grabbed = 0; @@ -1222,7 +1240,7 @@ read_SGR(SCREEN *sp, SGR_DATA * result) sp->_ifd, #endif (kbuf + grabbed), (size_t) 1); - if (res == -1) + if (res < 0) break; if ((grabbed + MAX_KBUF) >= (int) sizeof(kbuf)) { result->nerror++; @@ -1386,13 +1404,16 @@ _nc_mouse_inline(SCREEN *sp) } static void -mouse_activate(SCREEN *sp, int on) +mouse_activate(SCREEN *sp, bool on) { + T((T_CALLED("mouse_activate(%p,%s)"), + (void *) SP_PARM, on ? "on" : "off")); + if (!on && !sp->_mouse_initialized) - return; + returnVoid; if (!_nc_mouse_init(sp)) - return; + returnVoid; if (on) { sp->_mouse_bstate = 0; @@ -1401,8 +1422,7 @@ mouse_activate(SCREEN *sp, int on) #if NCURSES_EXT_FUNCS NCURSES_SP_NAME(keyok) (NCURSES_SP_ARGx KEY_MOUSE, on); #endif - TPUTS_TRACE("xterm mouse initialization"); - enable_xterm_mouse(sp, 1); + enable_xterm_mouse(sp, TRUE); break; #if USE_GPM_SUPPORT case M_GPM: @@ -1420,26 +1440,29 @@ mouse_activate(SCREEN *sp, int on) #endif #ifdef USE_TERM_DRIVER case M_TERM_DRIVER: - sp->_mouse_active = TRUE; + enable_win32_mouse(sp, TRUE); break; #endif case M_NONE: - return; + returnVoid; + default: + T(("unexpected mouse mode")); + break; } /* Make runtime binding to cut down on object size of applications that * do not use the mouse (e.g., 'clear'). */ - sp->_mouse_event = _nc_mouse_event; + /* *INDENT-EQLS* */ + sp->_mouse_event = _nc_mouse_event; sp->_mouse_inline = _nc_mouse_inline; - sp->_mouse_parse = _nc_mouse_parse; + sp->_mouse_parse = _nc_mouse_parse; sp->_mouse_resume = _nc_mouse_resume; - sp->_mouse_wrap = _nc_mouse_wrap; + sp->_mouse_wrap = _nc_mouse_wrap; } else { switch (sp->_mouse_type) { case M_XTERM: - TPUTS_TRACE("xterm mouse deinitialization"); - enable_xterm_mouse(sp, 0); + enable_xterm_mouse(sp, FALSE); break; #if USE_GPM_SUPPORT case M_GPM: @@ -1454,14 +1477,18 @@ mouse_activate(SCREEN *sp, int on) #endif #ifdef USE_TERM_DRIVER case M_TERM_DRIVER: - sp->_mouse_active = FALSE; + enable_win32_mouse(sp, FALSE); break; #endif case M_NONE: - return; + returnVoid; + default: + T(("unexpected mouse mode")); + break; } } NCURSES_SP_NAME(_nc_flush) (NCURSES_SP_ARG); + returnVoid; } /************************************************************************** @@ -1807,10 +1834,10 @@ NCURSES_SP_NAME(getmouse) (NCURSES_SP_DCLx MEVENT * aevent) T((T_CALLED("getmouse(%p,%p)"), (void *) SP_PARM, (void *) aevent)); - if ((aevent != 0) && - (SP_PARM != 0) && + if ((aevent != NULL) && + (SP_PARM != NULL) && (SP_PARM->_mouse_type != M_NONE) && - (eventp = SP_PARM->_mouse_eventp) != 0) { + (eventp = SP_PARM->_mouse_eventp) != NULL) { /* compute the current-event pointer */ MEVENT *prev = PREV(eventp); @@ -1863,9 +1890,9 @@ NCURSES_SP_NAME(ungetmouse) (NCURSES_SP_DCLx MEVENT * aevent) T((T_CALLED("ungetmouse(%p,%p)"), (void *) SP_PARM, (void *) aevent)); - if (aevent != 0 && - SP_PARM != 0 && - (eventp = SP_PARM->_mouse_eventp) != 0) { + if (aevent != NULL && + SP_PARM != NULL && + (eventp = SP_PARM->_mouse_eventp) != NULL) { /* stick the given event in the next-free slot */ *eventp = *aevent; @@ -1899,7 +1926,7 @@ NCURSES_SP_NAME(mousemask) (NCURSES_SP_DCLx mmask_t newmask, mmask_t * oldmask) (unsigned long) newmask, (void *) oldmask)); - if (SP_PARM != 0) { + if (SP_PARM != NULL) { if (oldmask) *oldmask = SP_PARM->_mouse_mask; @@ -1961,12 +1988,26 @@ wenclose(const WINDOW *win, int y, int x) T((T_CALLED("wenclose(%p,%d,%d)"), (const void *) win, y, x)); - if (win != 0) { + if (win != NULL) { y -= win->_yoffset; - result = ((win->_begy <= y && - win->_begx <= x && - (win->_begx + win->_maxx) >= x && - (win->_begy + win->_maxy) >= y) ? TRUE : FALSE); + if (IS_PAD(win)) { + if (win->_pad._pad_y >= 0 && + win->_pad._pad_x >= 0 && + win->_pad._pad_top >= 0 && + win->_pad._pad_left >= 0 && + win->_pad._pad_right >= 0 && + win->_pad._pad_bottom >= 0) { + result = ((win->_pad._pad_top <= y && + win->_pad._pad_left <= x && + win->_pad._pad_right >= x && + win->_pad._pad_bottom >= y) ? TRUE : FALSE); + } + } else { + result = ((win->_begy <= y && + win->_begx <= x && + (win->_begx + win->_maxx) >= x && + (win->_begy + win->_maxy) >= y) ? TRUE : FALSE); + } } returnBool(result); } @@ -1979,7 +2020,7 @@ NCURSES_SP_NAME(mouseinterval) (NCURSES_SP_DCLx int maxclick) T((T_CALLED("mouseinterval(%p,%d)"), (void *) SP_PARM, maxclick)); - if (SP_PARM != 0) { + if (SP_PARM != NULL) { oldval = SP_PARM->_maxclick; if (maxclick >= 0) SP_PARM->_maxclick = maxclick; @@ -2001,9 +2042,9 @@ mouseinterval(int maxclick) /* This may be used by other routines to ask for the existence of mouse support */ NCURSES_EXPORT(bool) -_nc_has_mouse(SCREEN *sp) +_nc_has_mouse(const SCREEN *sp) { - return (((0 == sp) || (sp->_mouse_type == M_NONE)) ? FALSE : TRUE); + return (((NULL == sp) || (sp->_mouse_type == M_NONE)) ? FALSE : TRUE); } NCURSES_EXPORT(bool) @@ -2035,6 +2076,7 @@ wmouse_trafo(const WINDOW *win, int *pY, int *pX, bool to_screen) int y = *pY; int x = *pX; + T(("transform input %d,%d", y, x)); if (to_screen) { y += win->_begy + win->_yoffset; x += win->_begx; @@ -2050,6 +2092,7 @@ wmouse_trafo(const WINDOW *win, int *pY, int *pX, bool to_screen) if (result) { *pX = x; *pY = y; + T(("output transform %d,%d", y, x)); } } returnBool(result); diff --git a/ncurses/base/lib_mvwin.c b/ncurses/base/lib_mvwin.c index fca014ef..66421971 100644 --- a/ncurses/base/lib_mvwin.c +++ b/ncurses/base/lib_mvwin.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020,2021 Thomas E. Dickey * + * Copyright 2020-2021,2024 Thomas E. Dickey * * Copyright 1998-2009,2010 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -43,13 +43,13 @@ #include -MODULE_ID("$Id: lib_mvwin.c,v 1.20 2021/10/23 18:57:41 tom Exp $") +MODULE_ID("$Id: lib_mvwin.c,v 1.21 2024/07/27 19:23:59 tom Exp $") NCURSES_EXPORT(int) mvwin(WINDOW *win, int by, int bx) { #if NCURSES_SP_FUNCS - SCREEN *sp = _nc_screen_of(win); + const SCREEN *sp = _nc_screen_of(win); #endif T((T_CALLED("mvwin(%p,%d,%d)"), (void *) win, by, bx)); diff --git a/ncurses/base/lib_newterm.c b/ncurses/base/lib_newterm.c index 15d05a31..a7cd9aee 100644 --- a/ncurses/base/lib_newterm.c +++ b/ncurses/base/lib_newterm.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2020,2022 Thomas E. Dickey * + * Copyright 2018-2024,2025 Thomas E. Dickey * * Copyright 1998-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -49,7 +49,7 @@ #include -MODULE_ID("$Id: lib_newterm.c,v 1.104 2022/07/09 18:58:58 tom Exp $") +MODULE_ID("$Id: lib_newterm.c,v 1.108 2025/02/20 01:02:09 tom Exp $") #ifdef USE_TERM_DRIVER #define NumLabels InfoOf(SP_PARM).numlabels @@ -175,12 +175,12 @@ NCURSES_SP_NAME(newterm) (NCURSES_SP_DCLx FILE *ifp) { int errret; - SCREEN *result = 0; + SCREEN *result = NULL; SCREEN *current; TERMINAL *its_term; FILE *_ofp = ofp ? ofp : stdout; FILE *_ifp = ifp ? ifp : stdin; - TERMINAL *new_term = 0; + TERMINAL *new_term = NULL; START_TRACE(); T((T_CALLED("newterm(%p, \"%s\", %p,%p)"), @@ -190,8 +190,8 @@ NCURSES_SP_NAME(newterm) (NCURSES_SP_DCLx (void *) ifp)); #if NCURSES_SP_FUNCS - assert(SP_PARM != 0); - if (SP_PARM == 0) + assert(SP_PARM != NULL); + if (SP_PARM == NULL) returnSP(SP_PARM); #endif @@ -199,7 +199,7 @@ NCURSES_SP_NAME(newterm) (NCURSES_SP_DCLx _nc_lock_global(curses); current = CURRENT_SCREEN; - its_term = (current ? current->_term : 0); + its_term = (current ? current->_term : NULL); #if defined(EXP_WIN32_DRIVER) _setmode(fileno(_ifp), _O_BINARY); @@ -212,11 +212,11 @@ NCURSES_SP_NAME(newterm) (NCURSES_SP_DCLx TINFO_SETUP_TERM(&new_term, name, fileno(_ofp), &errret, FALSE) != ERR) { int slk_format; - int filter_mode; + bool filter_mode; - _nc_set_screen(0); + _nc_set_screen(NULL); #ifdef USE_TERM_DRIVER - assert(new_term != 0); + assert(new_term != NULL); #endif #if NCURSES_SP_FUNCS @@ -241,7 +241,7 @@ NCURSES_SP_NAME(newterm) (NCURSES_SP_DCLx filter_mode, slk_format) == ERR) { _nc_set_screen(current); - result = 0; + result = NULL; } else { int value; int cols; @@ -251,7 +251,7 @@ NCURSES_SP_NAME(newterm) (NCURSES_SP_DCLx #elif !NCURSES_SP_FUNCS _nc_set_screen(CURRENT_SCREEN); #endif - assert(SP_PARM != 0); + assert(SP_PARM != NULL); cols = *(ptrCols(SP_PARM)); #ifdef USE_TERM_DRIVER _nc_set_screen(SP_PARM); @@ -279,6 +279,7 @@ NCURSES_SP_NAME(newterm) (NCURSES_SP_DCLx /* allow user to set maximum escape delay from the environment */ if ((value = _nc_getenv_num("ESCDELAY")) >= 0) { + value = Min(value, MAX_DELAY_MSECS); #if NCURSES_EXT_FUNCS NCURSES_SP_NAME(set_escdelay) (NCURSES_SP_ARGx value); #else @@ -317,7 +318,7 @@ NCURSES_SP_NAME(newterm) (NCURSES_SP_DCLx NCURSES_SP_NAME(baudrate) (NCURSES_SP_ARG); /* sets a field in the screen structure */ - SP_PARM->_keytry = 0; + SP_PARM->_keytry = NULL; /* compute movement costs so we can do better move optimization */ #ifdef USE_TERM_DRIVER @@ -332,7 +333,7 @@ NCURSES_SP_NAME(newterm) (NCURSES_SP_DCLx * properly if we remove rmso or rmul. Curses applications * shouldn't be looking at this detail. */ -#define SGR0_TEST(mode) (mode != 0) && (exit_attribute_mode == 0 || strcmp(mode, exit_attribute_mode)) +#define SGR0_TEST(mode) (mode != NULL) && (exit_attribute_mode == NULL || strcmp(mode, exit_attribute_mode)) SP_PARM->_use_rmso = SGR0_TEST(exit_standout_mode); SP_PARM->_use_rmul = SGR0_TEST(exit_underline_mode); #if USE_ITALIC diff --git a/ncurses/base/lib_newwin.c b/ncurses/base/lib_newwin.c index a6723197..3085453d 100644 --- a/ncurses/base/lib_newwin.c +++ b/ncurses/base/lib_newwin.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020,2021 Thomas E. Dickey * + * Copyright 2020-2021,2024 Thomas E. Dickey * * Copyright 1998-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -44,18 +44,18 @@ #include #include -MODULE_ID("$Id: lib_newwin.c,v 1.76 2021/10/23 18:53:38 tom Exp $") +MODULE_ID("$Id: lib_newwin.c,v 1.79 2024/12/14 23:50:18 tom Exp $") #define window_is(name) ((sp)->_##name == win) #if USE_REENTRANT #define remove_window(name) \ - sp->_##name = 0 + sp->_##name = NULL #else #define remove_window(name) \ - sp->_##name = 0; \ + sp->_##name = NULL; \ if (win == name) \ - name = 0 + name = NULL #endif static void @@ -64,7 +64,7 @@ remove_window_from_screen(WINDOW *win) SCREEN *sp; #ifdef USE_SP_WINDOWLIST - if ((sp = _nc_screen_of(win)) != 0) { + if ((sp = _nc_screen_of(win)) != NULL) { if (window_is(curscr)) { remove_window(curscr); } else if (window_is(stdscr)) { @@ -99,17 +99,17 @@ _nc_freewin(WINDOW *win) T((T_CALLED("_nc_freewin(%p)"), (void *) win)); - if (win != 0) { + if (win != NULL) { if (_nc_nonsp_try_global(curses) == 0) { WINDOWLIST *p, *q; - q = 0; + q = NULL; for (each_window(sp, p)) { if (&(p->win) == win) { remove_window_from_screen(win); - if (q == 0) + if (q == NULL) WindowList(sp) = p->next; else q->next = p->next; @@ -150,8 +150,8 @@ NCURSES_SP_NAME(newwin) (NCURSES_SP_DCLx || begx < 0 || num_lines < 0 || num_columns < 0 - || SP_PARM == 0) - returnWin(0); + || SP_PARM == NULL) + returnWin(NULL); if (num_lines == 0) num_lines = SP_PARM->_lines_avail - begy; @@ -160,14 +160,14 @@ NCURSES_SP_NAME(newwin) (NCURSES_SP_DCLx win = NCURSES_SP_NAME(_nc_makenew) (NCURSES_SP_ARGx num_lines, num_columns, begy, begx, 0); - if (win == 0) - returnWin(0); + if (win == NULL) + returnWin(NULL); for (i = 0; i < num_lines; i++) { win->_line[i].text = typeCalloc(NCURSES_CH_T, (unsigned) num_columns); - if (win->_line[i].text == 0) { + if (win->_line[i].text == NULL) { (void) _nc_freewin(win); - returnWin(0); + returnWin(NULL); } for (ptr = win->_line[i].text; ptr < win->_line[i].text + num_columns; @@ -207,11 +207,14 @@ derwin(WINDOW *orig, int num_lines, int num_columns, int begy, int begx) /* * make sure window fits inside the original one */ - if (begy < 0 || begx < 0 || orig == 0 || num_lines < 0 || num_columns < 0) - returnWin(0); - if (begy + num_lines > orig->_maxy + 1 + if (begy < 0 + || begx < 0 + || orig == NULL + || num_lines < 0 + || num_columns < 0 + || begy + num_lines > orig->_maxy + 1 || begx + num_columns > orig->_maxx + 1) - returnWin(0); + returnWin(NULL); if (num_lines == 0) num_lines = orig->_maxy + 1 - begy; @@ -225,8 +228,8 @@ derwin(WINDOW *orig, int num_lines, int num_columns, int begy, int begx) win = NCURSES_SP_NAME(_nc_makenew) (NCURSES_SP_ARGx num_lines, num_columns, orig->_begy + begy, orig->_begx + begx, flags); - if (win == 0) - returnWin(0); + if (win == NULL) + returnWin(NULL); win->_pary = begy; win->_parx = begx; @@ -244,10 +247,10 @@ derwin(WINDOW *orig, int num_lines, int num_columns, int begy, int begx) NCURSES_EXPORT(WINDOW *) subwin(WINDOW *w, int l, int c, int y, int x) { - WINDOW *result = 0; + WINDOW *result = NULL; T((T_CALLED("subwin(%p, %d, %d, %d, %d)"), (void *) w, l, c, y, x)); - if (w != 0) { + if (w != NULL) { T(("parent has begy = %ld, begx = %ld", (long) w->_begy, (long) w->_begx)); result = derwin(w, l, c, y - w->_begy, x - w->_begx); @@ -255,13 +258,6 @@ subwin(WINDOW *w, int l, int c, int y, int x) returnWin(result); } -static bool -dimension_limit(int value) -{ - NCURSES_SIZE_T test = (NCURSES_SIZE_T) value; - return (test == value && value > 0); -} - NCURSES_EXPORT(WINDOW *) NCURSES_SP_NAME(_nc_makenew) (NCURSES_SP_DCLx int num_lines, @@ -278,20 +274,20 @@ NCURSES_SP_NAME(_nc_makenew) (NCURSES_SP_DCLx T((T_CALLED("_nc_makenew(%p,%d,%d,%d,%d)"), (void *) SP_PARM, num_lines, num_columns, begy, begx)); - if (SP_PARM == 0) - returnWin(0); + if (SP_PARM == NULL) + returnWin(NULL); - if (!dimension_limit(num_lines) || !dimension_limit(num_columns)) - returnWin(0); + if (!OK_DIMENSION(num_lines) || !OK_DIMENSION(num_columns)) + returnWin(NULL); - if ((wp = typeCalloc(WINDOWLIST, 1)) == 0) - returnWin(0); + if ((wp = typeCalloc(WINDOWLIST, 1)) == NULL) + returnWin(NULL); win = &(wp->win); - if ((win->_line = typeCalloc(struct ldat, ((unsigned) num_lines))) == 0) { + if ((win->_line = typeCalloc(struct ldat, ((unsigned) num_lines))) == NULL) { free(wp); - returnWin(0); + returnWin(NULL); } _nc_nonsp_lock_global(curses); @@ -322,7 +318,7 @@ NCURSES_SP_NAME(_nc_makenew) (NCURSES_SP_DCLx win->_sync = 0; win->_parx = -1; win->_pary = -1; - win->_parent = 0; + win->_parent = NULL; win->_regtop = 0; win->_regbottom = (NCURSES_SIZE_T) (num_lines - 1); @@ -389,18 +385,18 @@ NCURSES_SP_NAME(_nc_makenew) (NCURSES_SP_DCLx NCURSES_EXPORT(WINDOW *) _nc_curscr_of(SCREEN *sp) { - return (sp == 0) ? NULL : CurScreen(sp); + return (sp == NULL) ? NULL : CurScreen(sp); } NCURSES_EXPORT(WINDOW *) _nc_newscr_of(SCREEN *sp) { - return (sp == 0) ? NULL : NewScreen(sp); + return (sp == NULL) ? NULL : NewScreen(sp); } NCURSES_EXPORT(WINDOW *) _nc_stdscr_of(SCREEN *sp) { - return (sp == 0) ? NULL : StdScreen(sp); + return (sp == NULL) ? NULL : StdScreen(sp); } #endif diff --git a/ncurses/base/lib_nl.c b/ncurses/base/lib_nl.c index df07349f..e1195319 100644 --- a/ncurses/base/lib_nl.c +++ b/ncurses/base/lib_nl.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020 Thomas E. Dickey * + * Copyright 2020-2023,2024 Thomas E. Dickey * * Copyright 1998-2000,2009 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -45,7 +45,7 @@ #include -MODULE_ID("$Id: lib_nl.c,v 1.13 2020/02/02 23:34:34 tom Exp $") +MODULE_ID("$Id: lib_nl.c,v 1.15 2024/12/07 20:00:48 tom Exp $") #ifdef __EMX__ #include @@ -55,9 +55,9 @@ NCURSES_EXPORT(int) NCURSES_SP_NAME(nl) (NCURSES_SP_DCL0) { T((T_CALLED("nl(%p)"), (void *) SP_PARM)); - if (0 == SP_PARM) + if (NULL == SP_PARM) returnCode(ERR); - SP_PARM->_nl = TRUE; + IsNl(SP_PARM) = TRUE; #ifdef __EMX__ _nc_flush(); _fsetmode(NC_OUTPUT(SP_PARM), "t"); @@ -77,9 +77,9 @@ NCURSES_EXPORT(int) NCURSES_SP_NAME(nonl) (NCURSES_SP_DCL0) { T((T_CALLED("nonl(%p)"), (void *) SP_PARM)); - if (0 == SP_PARM) + if (NULL == SP_PARM) returnCode(ERR); - SP_PARM->_nl = FALSE; + IsNl(SP_PARM) = FALSE; #ifdef __EMX__ _nc_flush(); _fsetmode(NC_OUTPUT(SP_PARM), "b"); diff --git a/ncurses/base/lib_overlay.c b/ncurses/base/lib_overlay.c index 6d451d04..6ab8cf05 100644 --- a/ncurses/base/lib_overlay.c +++ b/ncurses/base/lib_overlay.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020 Thomas E. Dickey * + * Copyright 2020-2023,2024 Thomas E. Dickey * * Copyright 1998-2013,2016 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -41,7 +41,7 @@ #include -MODULE_ID("$Id: lib_overlay.c,v 1.33 2020/02/02 23:34:34 tom Exp $") +MODULE_ID("$Id: lib_overlay.c,v 1.35 2024/12/07 20:03:37 tom Exp $") static int overlap(const WINDOW *const src, WINDOW *const dst, int const flag) @@ -50,7 +50,7 @@ overlap(const WINDOW *const src, WINDOW *const dst, int const flag) T((T_CALLED("overlap(%p,%p,%d)"), (const void *) src, (void *) dst, flag)); - if (src != 0 && dst != 0) { + if (src != NULL && dst != NULL) { int sx1, sy1, sx2, sy2; int dx1, dy1, dx2, dy2; @@ -78,12 +78,12 @@ overlap(const WINDOW *const src, WINDOW *const dst, int const flag) dy2 = dy1 + dst->_maxy; if (dx2 >= sx1 && dx1 <= sx2 && dy2 >= sy1 && dy1 <= sy2) { - int sminrow = max(sy1, dy1) - sy1; - int smincol = max(sx1, dx1) - sx1; - int dminrow = max(sy1, dy1) - dy1; - int dmincol = max(sx1, dx1) - dx1; - int dmaxrow = min(sy2, dy2) - dy1; - int dmaxcol = min(sx2, dx2) - dx1; + int sminrow = Max(sy1, dy1) - sy1; + int smincol = Max(sx1, dx1) - sx1; + int dminrow = Max(sy1, dy1) - dy1; + int dmincol = Max(sx1, dx1) - dx1; + int dmaxrow = Min(sy2, dy2) - dy1; + int dmaxcol = Min(sx2, dx2) - dx1; rc = copywin(src, dst, sminrow, smincol, @@ -146,8 +146,8 @@ copywin(const WINDOW *src, WINDOW *dst, dminrow, dmincol, dmaxrow, dmaxcol, over)); - if (src != 0 - && dst != 0 + if (src != NULL + && dst != NULL && dmaxrow >= dminrow && dmaxcol >= dmincol) { attr_t bk; diff --git a/ncurses/base/lib_pad.c b/ncurses/base/lib_pad.c index d4bd7f11..c5bfd605 100644 --- a/ncurses/base/lib_pad.c +++ b/ncurses/base/lib_pad.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020,2021 Thomas E. Dickey * + * Copyright 2020-2021,2024 Thomas E. Dickey * * Copyright 1998-2010,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -43,7 +43,7 @@ #include -MODULE_ID("$Id: lib_pad.c,v 1.50 2021/10/23 22:57:27 tom Exp $") +MODULE_ID("$Id: lib_pad.c,v 1.52 2024/12/07 17:44:59 tom Exp $") NCURSES_EXPORT(WINDOW *) NCURSES_SP_NAME(newpad) (NCURSES_SP_DCLx int l, int c) @@ -55,17 +55,17 @@ NCURSES_SP_NAME(newpad) (NCURSES_SP_DCLx int l, int c) T((T_CALLED("newpad(%p,%d, %d)"), (void *) SP_PARM, l, c)); if (l <= 0 || c <= 0) - returnWin(0); + returnWin(NULL); win = NCURSES_SP_NAME(_nc_makenew) (NCURSES_SP_ARGx l, c, 0, 0, _ISPAD); if (win == NULL) - returnWin(0); + returnWin(NULL); for (i = 0; i < l; i++) { if_USE_SCROLL_HINTS(win->_line[i].oldindex = _NEWINDEX); - if ((win->_line[i].text = typeCalloc(NCURSES_CH_T, ((size_t) c))) == 0) { + if ((win->_line[i].text = typeCalloc(NCURSES_CH_T, ((size_t) c))) == NULL) { (void) _nc_freewin(win); - returnWin(0); + returnWin(NULL); } for (ptr = win->_line[i].text; ptr < win->_line[i].text + c; ptr++) SetChar(*ptr, BLANK_TEXT, BLANK_ATTR); @@ -92,7 +92,7 @@ subpad(WINDOW *orig, int l, int c, int begy, int begx) if (orig) { if (!IS_PAD(orig) || ((win = derwin(orig, l, c, begy, begx)) == NULL)) - returnWin(0); + returnWin(NULL); } returnWin(win); } @@ -143,7 +143,7 @@ pnoutrefresh(WINDOW *win, T((T_CALLED("pnoutrefresh(%p, %d, %d, %d, %d, %d, %d)"), (void *) win, pminrow, pmincol, sminrow, smincol, smaxrow, smaxcol)); - if (win == 0) + if (win == NULL) returnCode(ERR); if (!IS_PAD(win)) @@ -197,8 +197,8 @@ pnoutrefresh(WINDOW *win, #endif /* TRACE */ #if USE_SCROLL_HINTS if (win->_pad._pad_y >= 0) { - displaced = pminrow - win->_pad._pad_y - - (sminrow - win->_pad._pad_top); + displaced = ((pminrow - win->_pad._pad_y) - + (sminrow - win->_pad._pad_top)); T(("pad being shifted by %d line(s)", displaced)); } else displaced = 0; @@ -331,7 +331,7 @@ pechochar(WINDOW *pad, const chtype ch) { T((T_CALLED("pechochar(%p, %s)"), (void *) pad, _tracechtype(ch))); - if (pad == 0) + if (pad == NULL) returnCode(ERR); if (!IS_PAD(pad)) diff --git a/ncurses/base/lib_printw.c b/ncurses/base/lib_printw.c index d901b727..fa1a153b 100644 --- a/ncurses/base/lib_printw.c +++ b/ncurses/base/lib_printw.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2019,2020 Thomas E. Dickey * + * Copyright 2018-2020,2024 Thomas E. Dickey * * Copyright 1998-2012,2016 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -40,7 +40,7 @@ #include -MODULE_ID("$Id: lib_printw.c,v 1.28 2020/02/02 23:34:34 tom Exp $") +MODULE_ID("$Id: lib_printw.c,v 1.30 2024/12/07 17:44:59 tom Exp $") NCURSES_EXPORT(int) printw(const char *fmt, ...) @@ -133,7 +133,7 @@ mvwprintw(WINDOW *win, int y, int x, const char *fmt, ...) NCURSES_EXPORT(int) vwprintw(WINDOW *win, const char *fmt, va_list argp) { - char *buf; + const char *buf; int code = ERR; #if NCURSES_SP_FUNCS SCREEN *sp = _nc_screen_of(win); @@ -142,7 +142,7 @@ vwprintw(WINDOW *win, const char *fmt, va_list argp) T((T_CALLED("vwprintw(%p,%s,va_list)"), (void *) win, _nc_visbuf(fmt))); buf = NCURSES_SP_NAME(_nc_printf_string) (NCURSES_SP_ARGx fmt, argp); - if (buf != 0) { + if (buf != NULL) { code = waddstr(win, buf); } returnCode(code); @@ -151,7 +151,7 @@ vwprintw(WINDOW *win, const char *fmt, va_list argp) NCURSES_EXPORT(int) vw_printw(WINDOW *win, const char *fmt, va_list argp) { - char *buf; + const char *buf; int code = ERR; #if NCURSES_SP_FUNCS SCREEN *sp = _nc_screen_of(win); @@ -160,7 +160,7 @@ vw_printw(WINDOW *win, const char *fmt, va_list argp) T((T_CALLED("vw_printw(%p,%s,va_list)"), (void *) win, _nc_visbuf(fmt))); buf = NCURSES_SP_NAME(_nc_printf_string) (NCURSES_SP_ARGx fmt, argp); - if (buf != 0) { + if (buf != NULL) { code = waddstr(win, buf); } returnCode(code); diff --git a/ncurses/base/lib_redrawln.c b/ncurses/base/lib_redrawln.c index c99d6992..99c02490 100644 --- a/ncurses/base/lib_redrawln.c +++ b/ncurses/base/lib_redrawln.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020 Thomas E. Dickey * + * Copyright 2020,2024 Thomas E. Dickey * * Copyright 1998-2009,2010 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -40,7 +40,7 @@ #include -MODULE_ID("$Id: lib_redrawln.c,v 1.18 2020/02/02 23:34:34 tom Exp $") +MODULE_ID("$Id: lib_redrawln.c,v 1.19 2024/12/07 20:03:37 tom Exp $") NCURSES_EXPORT(int) wredrawln(WINDOW *win, int beg, int num) @@ -52,7 +52,7 @@ wredrawln(WINDOW *win, int beg, int num) T((T_CALLED("wredrawln(%p,%d,%d)"), (void *) win, beg, num)); - if (win == 0) + if (win == NULL) returnCode(ERR); sp = _nc_screen_of(win); diff --git a/ncurses/base/lib_refresh.c b/ncurses/base/lib_refresh.c index 4579cbf8..e43e28d6 100644 --- a/ncurses/base/lib_refresh.c +++ b/ncurses/base/lib_refresh.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020,2021 Thomas E. Dickey * + * Copyright 2020-2023,2024 Thomas E. Dickey * * Copyright 1998-2010,2011 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -43,7 +43,7 @@ #include -MODULE_ID("$Id: lib_refresh.c,v 1.47 2021/11/06 22:22:03 tom Exp $") +MODULE_ID("$Id: lib_refresh.c,v 1.49 2024/09/22 20:17:40 tom Exp $") NCURSES_EXPORT(int) wrefresh(WINDOW *win) @@ -55,7 +55,7 @@ wrefresh(WINDOW *win) T((T_CALLED("wrefresh(%p)"), (void *) win)); - if (win == 0) { + if (SP_PARM == NULL || win == NULL) { code = ERR; } else if (win == CurScreen(SP_PARM)) { CurScreen(SP_PARM)->_clear = TRUE; @@ -92,7 +92,7 @@ wnoutrefresh(WINDOW *win) T((T_CALLED("wnoutrefresh(%p)"), (void *) win)); - if (win == NULL) + if (SP_PARM == NULL || win == NULL) returnCode(ERR); /* @@ -208,7 +208,6 @@ wnoutrefresh(WINDOW *win) }); if_WIDEC({ - static cchar_t blank = BLANK; int last_dst = begx + ((last_src < win->_maxx) ? last_src : win->_maxx); @@ -254,6 +253,7 @@ wnoutrefresh(WINDOW *win) */ if (fix_left < dst_col || fix_right > last_dst) { for (j = fix_left; j <= fix_right; ++j) { + static cchar_t blank = BLANK; nline->text[j] = blank; CHANGED_CELL(nline, j); } diff --git a/ncurses/base/lib_restart.c b/ncurses/base/lib_restart.c index 81eb3688..fa2b3957 100644 --- a/ncurses/base/lib_restart.c +++ b/ncurses/base/lib_restart.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020 Thomas E. Dickey * + * Copyright 2020-2023,2024 Thomas E. Dickey * * Copyright 1998-2012,2015 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -42,7 +42,7 @@ #include -MODULE_ID("$Id: lib_restart.c,v 1.17 2020/02/02 23:34:34 tom Exp $") +MODULE_ID("$Id: lib_restart.c,v 1.20 2024/12/15 00:04:09 tom Exp $") NCURSES_EXPORT(int) NCURSES_SP_NAME(restartterm) (NCURSES_SP_DCLx @@ -52,7 +52,7 @@ NCURSES_SP_NAME(restartterm) (NCURSES_SP_DCLx { int result; #ifdef USE_TERM_DRIVER - TERMINAL *new_term = 0; + TERMINAL *new_term = NULL; #endif START_TRACE(); @@ -64,32 +64,29 @@ NCURSES_SP_NAME(restartterm) (NCURSES_SP_DCLx if (TINFO_SETUP_TERM(&new_term, termp, filenum, errret, FALSE) != OK) { result = ERR; - } else if (SP_PARM != 0) { - int saveecho = SP_PARM->_echo; - int savecbreak = SP_PARM->_cbreak; - int saveraw = SP_PARM->_raw; - int savenl = SP_PARM->_nl; + } else if (SP_PARM != NULL) { + TTY_FLAGS save_flags = SP_PARM->_tty_flags; #ifdef USE_TERM_DRIVER SP_PARM->_term = new_term; #endif - if (saveecho) { + if (save_flags._echo) { NCURSES_SP_NAME(echo) (NCURSES_SP_ARG); } else { NCURSES_SP_NAME(noecho) (NCURSES_SP_ARG); } - if (savecbreak) { + if (save_flags._cbreak) { NCURSES_SP_NAME(cbreak) (NCURSES_SP_ARG); NCURSES_SP_NAME(noraw) (NCURSES_SP_ARG); - } else if (saveraw) { + } else if (save_flags._raw) { NCURSES_SP_NAME(nocbreak) (NCURSES_SP_ARG); NCURSES_SP_NAME(raw) (NCURSES_SP_ARG); } else { NCURSES_SP_NAME(nocbreak) (NCURSES_SP_ARG); NCURSES_SP_NAME(noraw) (NCURSES_SP_ARG); } - if (savenl) { + if (save_flags._nl) { NCURSES_SP_NAME(nl) (NCURSES_SP_ARG); } else { NCURSES_SP_NAME(nonl) (NCURSES_SP_ARG); diff --git a/ncurses/base/lib_screen.c b/ncurses/base/lib_screen.c index 70cf6fd8..111c5704 100644 --- a/ncurses/base/lib_screen.c +++ b/ncurses/base/lib_screen.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2019-2020,2021 Thomas E. Dickey * + * Copyright 2019-2024,2025 Thomas E. Dickey * * Copyright 1998-2017,2018 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -42,7 +42,7 @@ #define CUR SP_TERMTYPE #endif -MODULE_ID("$Id: lib_screen.c,v 1.104 2021/10/23 17:12:16 tom Exp $") +MODULE_ID("$Id: lib_screen.c,v 1.112 2025/01/12 00:31:03 tom Exp $") #define MAX_SIZE 0x3fff /* 16k is big enough for a window or pad */ @@ -58,7 +58,7 @@ MODULE_ID("$Id: lib_screen.c,v 1.104 2021/10/23 17:12:16 tom Exp $") #define ARG_SLIMIT(name) /* nothing */ #endif -#define CUR_SLIMIT _nc_SLIMIT(limit - (size_t) (target - base)) +#define CUR_SLIMIT _nc_SLIMIT(limit - (size_t) (target + 1 - base)) #define TOP_SLIMIT _nc_SLIMIT(sizeof(buffer)) /* @@ -90,7 +90,6 @@ typedef struct { typedef struct { const char name[17]; PARAM_TYPE type; - size_t size; size_t offset; } SCR_PARAMS; @@ -120,8 +119,7 @@ static const SCR_ATTRS scr_attrs[] = }; #undef DATA -#define sizeof2(type,name) sizeof(((type *)0)->name) -#define DATA(name, type) { { #name }, type, sizeof2(WINDOW, name), offsetof(WINDOW, name) } +#define DATA(name, type) { { #name }, type, offsetof(WINDOW, name) } static const SCR_PARAMS scr_params[] = { @@ -174,7 +172,7 @@ read_txt(FILE *fp) char *result = malloc(limit); char *buffer; - if (result != 0) { + if (result != NULL) { int ch = 0; size_t used = 0; @@ -184,9 +182,9 @@ read_txt(FILE *fp) if (used + 2 >= limit) { limit += 1024; buffer = realloc(result, limit); - if (buffer == 0) { + if (buffer == NULL) { free(result); - result = 0; + result = NULL; break; } result = buffer; @@ -203,7 +201,7 @@ read_txt(FILE *fp) TR(TRACE_IEVENT, ("READ:%s", result)); } else if (used == 0) { free(result); - result = 0; + result = NULL; } } return result; @@ -224,7 +222,6 @@ decode_attr(char *source, attr_t *target, int *color) source++; found = FALSE; } else if (found) { - size_t n; char *next = source; if (source[0] == GUTTER) { @@ -243,6 +240,8 @@ decode_attr(char *source, attr_t *target, int *color) *target |= pair; *color = value; } else { + size_t n; + while (isalnum(UChar(*next))) { ++next; } @@ -306,8 +305,8 @@ decode_char(char *source, int *target) if (limit) { *target = 0; while (limit-- > 0) { - char *find = strchr(digits, *source++); - int ch = (find != 0) ? (int) (find - digits) : -1; + const char *find = strchr(digits, *source++); + int ch = (find != NULL) ? (int) (find - digits) : -1; *target *= base; if (ch >= 0 && ch < base) { *target += ch; @@ -339,7 +338,7 @@ decode_chtype(char *source, chtype fillin, chtype *target) #if NCURSES_WIDECHAR static char * -decode_cchar(char *source, cchar_t *fillin, cchar_t *target) +decode_cchar(char *source, const cchar_t *fillin, cchar_t *target) { int color; attr_t attr = fillin->attr; @@ -384,18 +383,18 @@ read_win(WINDOW *win, FILE *fp) memset(win, 0, sizeof(WINDOW)); for (;;) { - char *name; + const char *name; char *value; char *txt = read_txt(fp); - if (txt == 0) + if (txt == NULL) break; if (!strcmp(txt, "rows:")) { free(txt); code = OK; break; } - if ((value = strchr(txt, '=')) == 0) { + if ((value = strchr(txt, '=')) == NULL) { free(txt); continue; } @@ -507,8 +506,8 @@ NCURSES_SP_NAME(getwin) (NCURSES_SP_DCLx FILE *filep) T((T_CALLED("getwin(%p)"), (void *) filep)); - if (filep == 0) { - returnWin(0); + if (filep == NULL) { + returnWin(NULL); } /* @@ -516,7 +515,7 @@ NCURSES_SP_NAME(getwin) (NCURSES_SP_DCLx FILE *filep) * screen-dump, or new-format. */ if (read_block(&tmp, (size_t) 4, filep) < 0) { - returnWin(0); + returnWin(NULL); } /* * If this is a new-format file, and we do not support it, give up. @@ -525,9 +524,9 @@ NCURSES_SP_NAME(getwin) (NCURSES_SP_DCLx FILE *filep) #if NCURSES_EXT_PUTWIN if (read_win(&tmp, filep) < 0) #endif - returnWin(0); + returnWin(NULL); } else if (read_block(((char *) &tmp) + 4, sizeof(WINDOW) - 4, filep) < 0) { - returnWin(0); + returnWin(NULL); } else { old_format = TRUE; } @@ -539,7 +538,7 @@ NCURSES_SP_NAME(getwin) (NCURSES_SP_DCLx FILE *filep) tmp._maxy > MAX_SIZE || tmp._maxx == 0 || tmp._maxx > MAX_SIZE) { - returnWin(0); + returnWin(NULL); } if (IS_PAD(&tmp)) { @@ -557,7 +556,7 @@ NCURSES_SP_NAME(getwin) (NCURSES_SP_DCLx FILE *filep) * fields, because the window hierarchy within which they * made sense is probably gone. */ - if (nwin != 0) { + if (nwin != NULL) { int n; size_t linesize = sizeof(NCURSES_CH_T) * (size_t) (tmp._maxx + 1); @@ -595,13 +594,13 @@ NCURSES_SP_NAME(getwin) (NCURSES_SP_DCLx FILE *filep) for (n = 0; n <= nwin->_maxy; n++) { if (read_block(nwin->_line[n].text, linesize, filep) < 0) { delwin(nwin); - returnWin(0); + returnWin(NULL); } } } #if NCURSES_EXT_PUTWIN else { - char *txt = 0; + char *txt = NULL; bool success = TRUE; NCURSES_CH_T prior = blank; @@ -610,7 +609,7 @@ NCURSES_SP_NAME(getwin) (NCURSES_SP_DCLx FILE *filep) long row; char *next; - if ((txt = read_txt(filep)) == 0) { + if ((txt = read_txt(filep)) == NULL) { T(("...failed to read string for row %d", n + 1)); success = FALSE; break; @@ -629,13 +628,13 @@ NCURSES_SP_NAME(getwin) (NCURSES_SP_DCLx FILE *filep) break; } free(txt); - txt = 0; + txt = NULL; } if (!success) { free(txt); delwin(nwin); - returnWin(0); + returnWin(NULL); } } #endif @@ -799,7 +798,7 @@ putwin(WINDOW *win, FILE *filep) T((T_CALLED("putwin(%p,%p)"), (void *) win, (void *) filep)); #if NCURSES_EXT_PUTWIN - if (win != 0) { + if (win != NULL) { const char *version = curses_version(); char buffer[1024]; NCURSES_CH_T last_cell; @@ -918,7 +917,7 @@ putwin(WINDOW *win, FILE *filep) * ncurses is compiled with wide-character support, and also may depend * on the version of ncurses, e.g., if the WINDOW structure is extended. */ - if (win != 0) { + if (win != NULL) { size_t len = (size_t) (win->_maxx + 1); int y; @@ -944,7 +943,7 @@ putwin(WINDOW *win, FILE *filep) * Replace a window covering the whole screen, i.e., newscr or curscr. */ static WINDOW * -replace_window(WINDOW *target, FILE *source) +replace_window(const WINDOW *target, FILE *source) { WINDOW *result = getwin(source); #if NCURSES_EXT_FUNCS @@ -961,26 +960,28 @@ replace_window(WINDOW *target, FILE *source) } } #endif - delwin(target); return result; } NCURSES_EXPORT(int) NCURSES_SP_NAME(scr_restore) (NCURSES_SP_DCLx const char *file) { - FILE *fp = 0; + FILE *fp = NULL; int code = ERR; T((T_CALLED("scr_restore(%p,%s)"), (void *) SP_PARM, _nc_visbuf(file))); - if (_nc_access(file, R_OK) >= 0 - && (fp = safe_fopen(file, BIN_R)) != 0) { - NewScreen(SP_PARM) = replace_window(NewScreen(SP_PARM), fp); + if (SP_PARM != NULL + && _nc_access(file, R_OK) >= 0 + && (fp = safe_fopen(file, BIN_R)) != NULL) { + WINDOW *my_newscr = replace_window(NewScreen(SP_PARM), fp); + (void) fclose(fp); + if (my_newscr != NULL) { + delwin(NewScreen(SP_PARM)); + NewScreen(SP_PARM) = my_newscr; #if !USE_REENTRANT - newscr = NewScreen(SP_PARM); + newscr = my_newscr; #endif - (void) fclose(fp); - if (NewScreen(SP_PARM) != 0) { code = OK; } } @@ -999,12 +1000,12 @@ NCURSES_EXPORT(int) scr_dump(const char *file) { int result; - FILE *fp = 0; + FILE *fp = NULL; T((T_CALLED("scr_dump(%s)"), _nc_visbuf(file))); if (_nc_access(file, W_OK) < 0 - || (fp = safe_fopen(file, BIN_W)) == 0) { + || (fp = safe_fopen(file, BIN_W)) == NULL) { result = ERR; } else { (void) putwin(newscr, fp); @@ -1021,23 +1022,25 @@ NCURSES_SP_NAME(scr_init) (NCURSES_SP_DCLx const char *file) T((T_CALLED("scr_init(%p,%s)"), (void *) SP_PARM, _nc_visbuf(file))); - if (SP_PARM != 0 && + if (SP_PARM != NULL && #ifdef USE_TERM_DRIVER InfoOf(SP_PARM).caninit #else !(exit_ca_mode && non_rev_rmcup) #endif ) { - FILE *fp = 0; + FILE *fp = NULL; if (_nc_access(file, R_OK) >= 0 - && (fp = safe_fopen(file, BIN_R)) != 0) { - CurScreen(SP_PARM) = replace_window(CurScreen(SP_PARM), fp); + && (fp = safe_fopen(file, BIN_R)) != NULL) { + WINDOW *my_curscr = replace_window(CurScreen(SP_PARM), fp); + (void) fclose(fp); + if (my_curscr != NULL) { + delwin(CurScreen(SP_PARM)); + CurScreen(SP_PARM) = my_curscr; #if !USE_REENTRANT - curscr = CurScreen(SP_PARM); + curscr = my_curscr; #endif - (void) fclose(fp); - if (CurScreen(SP_PARM) != 0) { code = OK; } } @@ -1060,13 +1063,14 @@ NCURSES_SP_NAME(scr_set) (NCURSES_SP_DCLx const char *file) T((T_CALLED("scr_set(%p,%s)"), (void *) SP_PARM, _nc_visbuf(file))); - if (NCURSES_SP_NAME(scr_init) (NCURSES_SP_ARGx file) == OK) { + if (SP_PARM != NULL + && NCURSES_SP_NAME(scr_init) (NCURSES_SP_ARGx file) == OK) { delwin(NewScreen(SP_PARM)); NewScreen(SP_PARM) = dupwin(curscr); #if !USE_REENTRANT newscr = NewScreen(SP_PARM); #endif - if (NewScreen(SP_PARM) != 0) { + if (NewScreen(SP_PARM) != NULL) { code = OK; } } diff --git a/ncurses/base/lib_set_term.c b/ncurses/base/lib_set_term.c index 78de8592..39346b32 100644 --- a/ncurses/base/lib_set_term.c +++ b/ncurses/base/lib_set_term.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2021,2022 Thomas E. Dickey * + * Copyright 2018-2024,2025 Thomas E. Dickey * * Copyright 1998-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -57,7 +57,7 @@ #undef CUR #define CUR SP_TERMTYPE -MODULE_ID("$Id: lib_set_term.c,v 1.184 2022/12/10 21:34:12 tom Exp $") +MODULE_ID("$Id: lib_set_term.c,v 1.196 2025/02/15 12:55:53 tom Exp $") #ifdef USE_TERM_DRIVER #define MaxColors InfoOf(sp).maxcolors @@ -81,7 +81,7 @@ set_term(SCREEN *screenp) _nc_set_screen(screenp); newSP = screenp; - if (newSP != 0) { + if (newSP != NULL) { TINFO_SET_CURTERM(newSP, newSP->_term); #if !USE_REENTRANT curscr = CurScreen(newSP); @@ -91,11 +91,11 @@ set_term(SCREEN *screenp) COLOR_PAIRS = newSP->_pair_count; #endif } else { - TINFO_SET_CURTERM(oldSP, 0); + TINFO_SET_CURTERM(oldSP, NULL); #if !USE_REENTRANT - curscr = 0; - newscr = 0; - stdscr = 0; + curscr = NULL; + newscr = NULL; + stdscr = NULL; COLORS = 0; COLOR_PAIRS = 0; #endif @@ -110,7 +110,7 @@ set_term(SCREEN *screenp) static void _nc_free_keytry(TRIES * kt) { - if (kt != 0) { + if (kt != NULL) { _nc_free_keytry(kt->child); _nc_free_keytry(kt->sibling); free(kt); @@ -120,7 +120,7 @@ _nc_free_keytry(TRIES * kt) static bool delink_screen(SCREEN *sp) { - SCREEN *last = 0; + SCREEN *last = NULL; SCREEN *temp; bool result = FALSE; @@ -160,7 +160,7 @@ delscreen(SCREEN *sp) rop++) { if (rop->win) { (void) delwin(rop->win); - rop->win = 0; + rop->win = NULL; } } } @@ -174,9 +174,9 @@ delscreen(SCREEN *sp) } } - if (sp->_slk != 0) { + if (sp->_slk != NULL) { - if (sp->_slk->ent != 0) { + if (sp->_slk->ent != NULL) { int i; for (i = 0; i < sp->_slk->labcnt; ++i) { @@ -186,14 +186,14 @@ delscreen(SCREEN *sp) free(sp->_slk->ent); } free(sp->_slk); - sp->_slk = 0; + sp->_slk = NULL; } _nc_free_keytry(sp->_keytry); - sp->_keytry = 0; + sp->_keytry = NULL; _nc_free_keytry(sp->_key_ok); - sp->_key_ok = 0; + sp->_key_ok = NULL; FreeIfNeeded(sp->_current_attr); @@ -217,9 +217,9 @@ delscreen(SCREEN *sp) } #if USE_GPM_SUPPORT #ifdef HAVE_LIBDL - if (sp->_dlopen_gpm != 0) { + if (sp->_dlopen_gpm != NULL) { dlclose(sp->_dlopen_gpm); - sp->_dlopen_gpm = 0; + sp->_dlopen_gpm = NULL; } #endif #endif /* USE_GPM_SUPPORT */ @@ -232,17 +232,17 @@ delscreen(SCREEN *sp) */ if (is_current) { #if !USE_REENTRANT - curscr = 0; - newscr = 0; - stdscr = 0; + curscr = NULL; + newscr = NULL; + stdscr = NULL; COLORS = 0; COLOR_PAIRS = 0; #endif - _nc_set_screen(0); + _nc_set_screen(NULL); #if USE_WIDEC_SUPPORT - if (SP == 0) { + if (SP == NULL) { FreeIfNeeded(_nc_wacs); - _nc_wacs = 0; + _nc_wacs = NULL; } #endif } else { @@ -303,7 +303,7 @@ extract_fgbg(const char *src, int *result) } #endif -#define ReturnScreenError() do { _nc_set_screen(0); \ +#define ReturnScreenError() do { _nc_set_screen(NULL); \ returnCode(ERR); } while (0) /* OS-independent screen initializations */ @@ -315,7 +315,7 @@ NCURSES_SP_NAME(_nc_setupscreen) ( int slines, int scolumns, FILE *output, - int filtered, + bool filtered, int slk_format) { #ifndef USE_TERM_DRIVER @@ -331,10 +331,13 @@ NCURSES_SP_NAME(_nc_setupscreen) ( T((T_CALLED("_nc_setupscreen(%d, %d, %p, %d, %d)"), slines, scolumns, (void *) output, filtered, slk_format)); - assert(CURRENT_SCREEN == 0); /* has been reset in newterm() ! */ + /* CURRENT_SCREEN is reset in newterm() */ + if (CURRENT_SCREEN) + returnCode(ERR); #if NCURSES_SP_FUNCS - assert(spp != 0); + if (spp == NULL) + returnCode(ERR); sp = *spp; if (!sp) { @@ -357,13 +360,13 @@ NCURSES_SP_NAME(_nc_setupscreen) ( sp->_next_screen = _nc_screen_chain; _nc_screen_chain = sp; - if ((sp->_current_attr = typeCalloc(NCURSES_CH_T, 1)) == 0) { + if ((sp->_current_attr = typeCalloc(NCURSES_CH_T, 1)) == NULL) { ReturnScreenError(); } #else if (!_nc_alloc_screen() - || ((SP->_acs_map = typeCalloc(chtype, ACS_LEN)) == 0) - || ((SP->_screen_acs_map = typeCalloc(bool, ACS_LEN)) == 0)) { + || ((SP->_acs_map = typeCalloc(chtype, ACS_LEN)) == NULL) + || ((SP->_screen_acs_map = typeCalloc(bool, ACS_LEN)) == NULL)) { returnCode(ERR); } @@ -373,7 +376,7 @@ NCURSES_SP_NAME(_nc_setupscreen) ( sp->_next_screen = _nc_screen_chain; _nc_screen_chain = sp; - if ((sp->_current_attr = typeCalloc(NCURSES_CH_T, 1)) == 0) { + if ((sp->_current_attr = typeCalloc(NCURSES_CH_T, 1)) == NULL) { returnCode(ERR); } #endif @@ -389,6 +392,10 @@ NCURSES_SP_NAME(_nc_setupscreen) ( #else _nc_get_screensize(sp, &slines, &scolumns); #endif + if (scolumns < 0) + scolumns = 0; + if (slines < 0) + slines = 0; SET_LINES(slines); SET_COLS(scolumns); @@ -420,11 +427,6 @@ NCURSES_SP_NAME(_nc_setupscreen) ( #endif T(("filter screensize %dx%d", slines, scolumns)); } -#ifdef __DJGPP__ - T(("setting output mode to binary")); - fflush(output); - setmode(output, O_BINARY); -#endif #if defined(EXP_WIN32_DRIVER) T(("setting output mode to binary")); fflush(output); @@ -442,7 +444,7 @@ NCURSES_SP_NAME(_nc_setupscreen) ( _setmode(fileno(output), _O_BINARY); #endif sp->out_limit = (size_t) ((2 + slines) * (6 + scolumns)); - if ((sp->out_buffer = malloc(sp->out_limit)) == 0) + if ((sp->out_buffer = malloc(sp->out_limit)) == NULL) sp->out_limit = 0; sp->out_inuse = 0; @@ -484,7 +486,7 @@ NCURSES_SP_NAME(_nc_setupscreen) ( * Allow those assumed/default color assumptions to be overridden at * runtime: */ - if ((env = getenv("NCURSES_ASSUMED_COLORS")) != 0) { + if ((env = getenv("NCURSES_ASSUMED_COLORS")) != NULL) { int fg, bg; char sep1, sep2; int count = sscanf(env, "%d%c%d%c", &fg, &sep1, &bg, &sep2); @@ -560,7 +562,7 @@ NCURSES_SP_NAME(_nc_setupscreen) ( * in the environment, reset the support-flag. */ if (magic_cookie_glitch >= 0) { - if (getenv("NCURSES_NO_MAGIC_COOKIE") != 0) { + if (getenv("NCURSES_NO_MAGIC_COOKIE") != NULL) { support_cookies = FALSE; } } @@ -638,10 +640,10 @@ NCURSES_SP_NAME(_nc_setupscreen) ( NCURSES_SP_NAME(_nc_init_acs) (NCURSES_SP_ARG); #if USE_WIDEC_SUPPORT sp->_screen_unicode = _nc_unicode_locale(); - if (_nc_wacs == 0) { + if (_nc_wacs == NULL) { _nc_init_wacs(); } - if (_nc_wacs == 0) { + if (_nc_wacs == NULL) { ReturnScreenError(); } @@ -649,7 +651,7 @@ NCURSES_SP_NAME(_nc_setupscreen) ( && _nc_locale_breaks_acs(sp->_term)); #endif env = _nc_get_locale(); - sp->_legacy_coding = ((env == 0) + sp->_legacy_coding = ((env == NULL) || !strcmp(env, "C") || !strcmp(env, "POSIX")); T(("legacy-coding %d", sp->_legacy_coding)); @@ -657,19 +659,19 @@ NCURSES_SP_NAME(_nc_setupscreen) ( sp->_nc_sp_idcok = TRUE; sp->_nc_sp_idlok = FALSE; - sp->oldhash = 0; - sp->newhash = 0; + sp->oldhash = NULL; + sp->newhash = NULL; T(("creating newscr")); NewScreen(sp) = NCURSES_SP_NAME(newwin) (NCURSES_SP_ARGx slines, scolumns, 0, 0); - if (NewScreen(sp) == 0) { + if (NewScreen(sp) == NULL) { ReturnScreenError(); } T(("creating curscr")); CurScreen(sp) = NCURSES_SP_NAME(newwin) (NCURSES_SP_ARGx slines, scolumns, 0, 0); - if (CurScreen(sp) == 0) { + if (CurScreen(sp) == NULL) { ReturnScreenError(); } #if !USE_REENTRANT @@ -689,7 +691,7 @@ NCURSES_SP_NAME(_nc_setupscreen) ( * unless we use the term-driver. */ #ifndef USE_TERM_DRIVER - if (cur_term != 0 && + if (cur_term != NULL && !memcmp(&cur_term->Ottyb, &null_TTY, sizeof(TTY))) #endif { @@ -755,7 +757,7 @@ NCURSES_SP_NAME(_nc_setupscreen) ( assert((sp->_lines_avail + sp->_topstolen + bottom_stolen) == slines); if ((StdScreen(sp) = NCURSES_SP_NAME(newwin) (NCURSES_SP_ARGx sp->_lines_avail, - scolumns, 0, 0)) == 0) { + scolumns, 0, 0)) == NULL) { ReturnScreenError(); } SET_LINES(sp->_lines_avail); @@ -771,10 +773,10 @@ NCURSES_EXPORT(int) _nc_setupscreen(int slines GCC_UNUSED, int scolumns GCC_UNUSED, FILE *output, - int filtered, + bool filtered, int slk_format) { - SCREEN *sp = 0; + SCREEN *sp = NULL; int rc = NCURSES_SP_NAME(_nc_setupscreen) (&sp, slines, scolumns, @@ -782,7 +784,7 @@ _nc_setupscreen(int slines GCC_UNUSED, filtered, slk_format); if (rc != OK) - _nc_set_screen(0); + _nc_set_screen(NULL); return rc; } #endif @@ -805,13 +807,13 @@ NCURSES_SP_NAME(_nc_ripoffline) (NCURSES_SP_DCLx TR_FUNC_ARG(0, init))); #if NCURSES_SP_FUNCS - if (SP_PARM != 0 && SP_PARM->_prescreen) + if (SP_PARM != NULL && SP_PARM->_prescreen) #endif { if (line == 0) { code = OK; } else { - if (safe_ripoff_sp == 0) { + if (safe_ripoff_sp == NULL) { safe_ripoff_sp = safe_ripoff_stack; } if (safe_ripoff_sp < safe_ripoff_stack + N_RIPS) { diff --git a/ncurses/base/lib_slk.c b/ncurses/base/lib_slk.c index 47e57e0b..7f35006d 100644 --- a/ncurses/base/lib_slk.c +++ b/ncurses/base/lib_slk.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020,2022 Thomas E. Dickey * + * Copyright 2020-2022,2024 Thomas E. Dickey * * Copyright 1998-2010,2011 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -48,7 +48,7 @@ #define CUR SP_TERMTYPE #endif -MODULE_ID("$Id: lib_slk.c,v 1.50 2022/08/20 18:29:22 tom Exp $") +MODULE_ID("$Id: lib_slk.c,v 1.51 2024/12/07 20:03:37 tom Exp $") #ifdef USE_TERM_DRIVER #define NumLabels InfoOf(SP_PARM).numlabels @@ -68,7 +68,7 @@ MODULE_ID("$Id: lib_slk.c,v 1.50 2022/08/20 18:29:22 tom Exp $") static int slk_failed(NCURSES_SP_DCL0) { - if ((0 != SP_PARM) && SP_PARM->_slk) { + if ((NULL != SP_PARM) && SP_PARM->_slk) { FreeIfNeeded(SP_PARM->_slk->ent); free(SP_PARM->_slk); SP_PARM->_slk = (SLK *) 0; @@ -148,7 +148,7 @@ _nc_slk_initialize(WINDOW *stwin, int cols) assert(stwin); sp = _nc_screen_of(stwin); - if (0 == sp) + if (NULL == sp) returnCode(ERR); assert(TerminalOf(SP_PARM)); @@ -157,7 +157,7 @@ _nc_slk_initialize(WINDOW *stwin, int cols) if (SP_PARM->_slk) { /* we did this already, so simply return */ returnCode(OK); - } else if ((SP_PARM->_slk = typeCalloc(SLK, 1)) == 0) + } else if ((SP_PARM->_slk = typeCalloc(SLK, 1)) == NULL) returnCode(ERR); if (!SP_PARM->slk_format) @@ -196,13 +196,13 @@ _nc_slk_initialize(WINDOW *stwin, int cols) for (i = 0; i < SP_PARM->_slk->labcnt; i++) { size_t used = max_length + 1; - SP_PARM->_slk->ent[i].ent_text = (char *) _nc_doalloc(0, used); - if (SP_PARM->_slk->ent[i].ent_text == 0) + SP_PARM->_slk->ent[i].ent_text = (char *) _nc_doalloc(NULL, used); + if (SP_PARM->_slk->ent[i].ent_text == NULL) returnCode(slk_failed(NCURSES_SP_ARG)); memset(SP_PARM->_slk->ent[i].ent_text, 0, used); - SP_PARM->_slk->ent[i].form_text = (char *) _nc_doalloc(0, used); - if (SP_PARM->_slk->ent[i].form_text == 0) + SP_PARM->_slk->ent[i].form_text = (char *) _nc_doalloc(NULL, used); + if (SP_PARM->_slk->ent[i].form_text == NULL) returnCode(slk_failed(NCURSES_SP_ARG)); if (used > 1) { @@ -235,7 +235,7 @@ NCURSES_SP_NAME(slk_restore) (NCURSES_SP_DCL0) { T((T_CALLED("slk_restore(%p)"), (void *) SP_PARM)); - if (0 == SP_PARM) + if (NULL == SP_PARM) returnCode(ERR); if (SP_PARM->_slk == NULL) returnCode(ERR); diff --git a/ncurses/base/lib_slkatr_set.c b/ncurses/base/lib_slkatr_set.c index 7c5a23ac..4c2c3622 100644 --- a/ncurses/base/lib_slkatr_set.c +++ b/ncurses/base/lib_slkatr_set.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020 Thomas E. Dickey * + * Copyright 2020,2024 Thomas E. Dickey * * Copyright 1998-2014,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -39,7 +39,7 @@ */ #include -MODULE_ID("$Id: lib_slkatr_set.c,v 1.17 2020/02/02 23:34:34 tom Exp $") +MODULE_ID("$Id: lib_slkatr_set.c,v 1.18 2024/12/07 20:03:37 tom Exp $") NCURSES_EXPORT(int) NCURSES_SP_NAME(slk_attr_set) (NCURSES_SP_DCLx @@ -56,8 +56,8 @@ NCURSES_SP_NAME(slk_attr_set) (NCURSES_SP_DCLx color_pair)); set_extended_pair(opts, color_pair); - if (SP_PARM != 0 - && SP_PARM->_slk != 0 + if (SP_PARM != NULL + && SP_PARM->_slk != NULL && color_pair >= 0 && color_pair < SP_PARM->_pair_limit) { TR(TRACE_ATTRS, ("... current %s", _tracech_t(CHREF(SP_PARM->_slk->attr)))); diff --git a/ncurses/base/lib_slkatrof.c b/ncurses/base/lib_slkatrof.c index 2d53ab20..03c09cf1 100644 --- a/ncurses/base/lib_slkatrof.c +++ b/ncurses/base/lib_slkatrof.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020 Thomas E. Dickey * + * Copyright 2020,2024 Thomas E. Dickey * * Copyright 1998-2005,2009 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -39,14 +39,14 @@ */ #include -MODULE_ID("$Id: lib_slkatrof.c,v 1.12 2020/02/02 23:34:34 tom Exp $") +MODULE_ID("$Id: lib_slkatrof.c,v 1.13 2024/12/07 20:03:37 tom Exp $") NCURSES_EXPORT(int) NCURSES_SP_NAME(slk_attroff) (NCURSES_SP_DCLx const chtype attr) { T((T_CALLED("slk_attroff(%p,%s)"), (void *) SP_PARM, _traceattr(attr))); - if (SP_PARM != 0 && SP_PARM->_slk != 0) { + if (SP_PARM != NULL && SP_PARM->_slk != NULL) { TR(TRACE_ATTRS, ("... current %s", _tracech_t(CHREF(SP_PARM->_slk->attr)))); RemAttr(SP_PARM->_slk->attr, attr); if ((attr & A_COLOR) != 0) { diff --git a/ncurses/base/lib_slkatron.c b/ncurses/base/lib_slkatron.c index accc2f2a..0e714edd 100644 --- a/ncurses/base/lib_slkatron.c +++ b/ncurses/base/lib_slkatron.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020 Thomas E. Dickey * + * Copyright 2020,2024 Thomas E. Dickey * * Copyright 1998-2009,2010 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -39,14 +39,14 @@ */ #include -MODULE_ID("$Id: lib_slkatron.c,v 1.13 2020/02/02 23:34:34 tom Exp $") +MODULE_ID("$Id: lib_slkatron.c,v 1.14 2024/12/07 20:03:37 tom Exp $") NCURSES_EXPORT(int) NCURSES_SP_NAME(slk_attron) (NCURSES_SP_DCLx const chtype attr) { T((T_CALLED("slk_attron(%p,%s)"), (void *) SP_PARM, _traceattr(attr))); - if (SP_PARM != 0 && SP_PARM->_slk != 0) { + if (SP_PARM != NULL && SP_PARM->_slk != NULL) { TR(TRACE_ATTRS, ("... current %s", _tracech_t(CHREF(SP_PARM->_slk->attr)))); AddAttr(SP_PARM->_slk->attr, attr); if ((attr & A_COLOR) != 0) { diff --git a/ncurses/base/lib_slkatrset.c b/ncurses/base/lib_slkatrset.c index 11fa7e6f..2d410be5 100644 --- a/ncurses/base/lib_slkatrset.c +++ b/ncurses/base/lib_slkatrset.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020 Thomas E. Dickey * + * Copyright 2020,2024 Thomas E. Dickey * * Copyright 1998-2005,2009 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -39,14 +39,14 @@ */ #include -MODULE_ID("$Id: lib_slkatrset.c,v 1.11 2020/02/02 23:34:34 tom Exp $") +MODULE_ID("$Id: lib_slkatrset.c,v 1.12 2024/12/07 20:03:37 tom Exp $") NCURSES_EXPORT(int) NCURSES_SP_NAME(slk_attrset) (NCURSES_SP_DCLx const chtype attr) { T((T_CALLED("slk_attrset(%p,%s)"), (void *) SP_PARM, _traceattr(attr))); - if (SP_PARM != 0 && SP_PARM->_slk != 0) { + if (SP_PARM != NULL && SP_PARM->_slk != NULL) { SetAttr(SP_PARM->_slk->attr, attr); returnCode(OK); } else diff --git a/ncurses/base/lib_slkattr.c b/ncurses/base/lib_slkattr.c index af49f3bb..9a633913 100644 --- a/ncurses/base/lib_slkattr.c +++ b/ncurses/base/lib_slkattr.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020 Thomas E. Dickey * + * Copyright 2020,2024 Thomas E. Dickey * * Copyright 1998-2009,2010 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -39,14 +39,14 @@ */ #include -MODULE_ID("$Id: lib_slkattr.c,v 1.12 2020/02/02 23:34:34 tom Exp $") +MODULE_ID("$Id: lib_slkattr.c,v 1.13 2024/12/07 20:03:37 tom Exp $") NCURSES_EXPORT(attr_t) NCURSES_SP_NAME(slk_attr) (NCURSES_SP_DCL0) { T((T_CALLED("slk_attr(%p)"), (void *) SP_PARM)); - if (SP_PARM != 0 && SP_PARM->_slk != 0) { + if (SP_PARM != NULL && SP_PARM->_slk != NULL) { attr_t result = AttrOf(SP_PARM->_slk->attr) & ALL_BUT_COLOR; int pair = GetPair(SP_PARM->_slk->attr); diff --git a/ncurses/base/lib_slkclear.c b/ncurses/base/lib_slkclear.c index 10531e4d..5d54623f 100644 --- a/ncurses/base/lib_slkclear.c +++ b/ncurses/base/lib_slkclear.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020 Thomas E. Dickey * + * Copyright 2020,2024 Thomas E. Dickey * * Copyright 1998-2007,2009 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -41,7 +41,7 @@ */ #include -MODULE_ID("$Id: lib_slkclear.c,v 1.15 2020/02/02 23:34:34 tom Exp $") +MODULE_ID("$Id: lib_slkclear.c,v 1.16 2024/12/07 20:03:37 tom Exp $") NCURSES_EXPORT(int) NCURSES_SP_NAME(slk_clear) (NCURSES_SP_DCL0) @@ -50,7 +50,7 @@ NCURSES_SP_NAME(slk_clear) (NCURSES_SP_DCL0) T((T_CALLED("slk_clear(%p)"), (void *) SP_PARM)); - if (SP_PARM != 0 && SP_PARM->_slk != 0) { + if (SP_PARM != NULL && SP_PARM->_slk != NULL) { SP_PARM->_slk->hidden = TRUE; /* For simulated SLK's it looks much more natural to inherit those attributes from the standard screen */ diff --git a/ncurses/base/lib_slkcolor.c b/ncurses/base/lib_slkcolor.c index 00d1eaa0..1801364c 100644 --- a/ncurses/base/lib_slkcolor.c +++ b/ncurses/base/lib_slkcolor.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018,2020 Thomas E. Dickey * + * Copyright 2018-2020,2024 Thomas E. Dickey * * Copyright 1998-2014,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -39,7 +39,7 @@ */ #include -MODULE_ID("$Id: lib_slkcolor.c,v 1.20 2020/02/02 23:34:34 tom Exp $") +MODULE_ID("$Id: lib_slkcolor.c,v 1.21 2024/12/07 20:03:37 tom Exp $") static int _nc_slk_color(SCREEN *sp, int pair_arg) @@ -48,8 +48,8 @@ _nc_slk_color(SCREEN *sp, int pair_arg) T((T_CALLED("slk_color(%p,%d)"), (void *) sp, pair_arg)); - if (sp != 0 - && sp->_slk != 0 + if (sp != NULL + && sp->_slk != NULL && pair_arg >= 0 && pair_arg < sp->_pair_limit) { TR(TRACE_ATTRS, ("... current is %s", _tracech_t(CHREF(sp->_slk->attr)))); diff --git a/ncurses/base/lib_slklab.c b/ncurses/base/lib_slklab.c index 894ff26d..23555039 100644 --- a/ncurses/base/lib_slklab.c +++ b/ncurses/base/lib_slklab.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020 Thomas E. Dickey * + * Copyright 2020,2024 Thomas E. Dickey * * Copyright 1998-2003,2009 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -41,15 +41,15 @@ */ #include -MODULE_ID("$Id: lib_slklab.c,v 1.11 2020/02/02 23:34:34 tom Exp $") +MODULE_ID("$Id: lib_slklab.c,v 1.12 2024/12/07 20:03:37 tom Exp $") NCURSES_EXPORT(char *) NCURSES_SP_NAME(slk_label) (NCURSES_SP_DCLx int n) { T((T_CALLED("slk_label(%p,%d)"), (void *) SP_PARM, n)); - if (SP_PARM == 0 || SP_PARM->_slk == 0 || n < 1 || n > SP_PARM->_slk->labcnt) - returnPtr(0); + if (SP_PARM == NULL || SP_PARM->_slk == NULL || n < 1 || n > SP_PARM->_slk->labcnt) + returnPtr(NULL); returnPtr(SP_PARM->_slk->ent[n - 1].ent_text); } diff --git a/ncurses/base/lib_slkrefr.c b/ncurses/base/lib_slkrefr.c index 7a40624b..f0abcc40 100644 --- a/ncurses/base/lib_slkrefr.c +++ b/ncurses/base/lib_slkrefr.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020,2021 Thomas E. Dickey * + * Copyright 2020-2021,2024 Thomas E. Dickey * * Copyright 1998-2013,2014 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -44,7 +44,7 @@ #define CUR SP_TERMTYPE #endif -MODULE_ID("$Id: lib_slkrefr.c,v 1.32 2021/09/04 10:54:35 tom Exp $") +MODULE_ID("$Id: lib_slkrefr.c,v 1.34 2024/12/07 17:58:16 tom Exp $") #ifdef USE_TERM_DRIVER #define NumLabels InfoOf(SP_PARM).numlabels @@ -58,7 +58,7 @@ MODULE_ID("$Id: lib_slkrefr.c,v 1.32 2021/09/04 10:54:35 tom Exp $") static void slk_paint_info(WINDOW *win) { - SCREEN *sp = _nc_screen_of(win); + const SCREEN *sp = _nc_screen_of(win); if (win && sp && (sp->slk_format == 4)) { int i; @@ -83,7 +83,7 @@ slk_intern_refresh(SCREEN *sp) SLK *slk; int numlab; - if (sp == 0) + if (sp == NULL) return; slk = sp->_slk; @@ -145,7 +145,7 @@ NCURSES_SP_NAME(slk_noutrefresh) (NCURSES_SP_DCL0) { T((T_CALLED("slk_noutrefresh(%p)"), (void *) SP_PARM)); - if (SP_PARM == 0 || SP_PARM->_slk == 0) + if (SP_PARM == NULL || SP_PARM->_slk == NULL) returnCode(ERR); if (SP_PARM->_slk->hidden) returnCode(OK); @@ -170,7 +170,7 @@ NCURSES_SP_NAME(slk_refresh) (NCURSES_SP_DCL0) { T((T_CALLED("slk_refresh(%p)"), (void *) SP_PARM)); - if (SP_PARM == 0 || SP_PARM->_slk == 0) + if (SP_PARM == NULL || SP_PARM->_slk == NULL) returnCode(ERR); if (SP_PARM->_slk->hidden) returnCode(OK); diff --git a/ncurses/base/lib_slkset.c b/ncurses/base/lib_slkset.c index 3e777f14..5476c5a6 100644 --- a/ncurses/base/lib_slkset.c +++ b/ncurses/base/lib_slkset.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2019,2020 Thomas E. Dickey * + * Copyright 2019-2020,2024 Thomas E. Dickey * * Copyright 1998-2011,2012 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -45,7 +45,7 @@ #endif #endif -MODULE_ID("$Id: lib_slkset.c,v 1.26 2020/02/02 23:34:34 tom Exp $") +MODULE_ID("$Id: lib_slkset.c,v 1.27 2024/12/07 20:03:37 tom Exp $") NCURSES_EXPORT(int) NCURSES_SP_NAME(slk_set) (NCURSES_SP_DCLx int i, const char *astr, int format) @@ -60,14 +60,14 @@ NCURSES_SP_NAME(slk_set) (NCURSES_SP_DCLx int i, const char *astr, int format) T((T_CALLED("slk_set(%p, %d, \"%s\", %d)"), (void *) SP_PARM, i, str, format)); - if (SP_PARM == 0 - || (slk = SP_PARM->_slk) == 0 + if (SP_PARM == NULL + || (slk = SP_PARM->_slk) == NULL || i < 1 || i > slk->labcnt || format < 0 || format > 2) returnCode(ERR); - if (str == 0) + if (str == NULL) str = ""; --i; /* Adjust numbering of labels */ @@ -84,7 +84,7 @@ NCURSES_SP_NAME(slk_set) (NCURSES_SP_DCLx int i, const char *astr, int format) size_t need; init_mb(state); - need = mbrtowc(0, p, strlen(p), &state); + need = mbrtowc(NULL, p, strlen(p), &state); if (need == (size_t) -1) break; mbrtowc(&wc, p, need, &state); @@ -107,14 +107,14 @@ NCURSES_SP_NAME(slk_set) (NCURSES_SP_DCLx int i, const char *astr, int format) #endif FreeIfNeeded(slk->ent[i].ent_text); - if ((slk->ent[i].ent_text = strdup(str)) == 0) + if ((slk->ent[i].ent_text = strdup(str)) == NULL) returnCode(ERR); slk->ent[i].ent_text[numchrs] = '\0'; if ((slk->ent[i].form_text = (char *) _nc_doalloc(slk->ent[i].form_text, (size_t) (limit + numchrs + 1)) - ) == 0) + ) == NULL) returnCode(ERR); switch (format) { diff --git a/ncurses/base/lib_slktouch.c b/ncurses/base/lib_slktouch.c index 6696a25f..f269b913 100644 --- a/ncurses/base/lib_slktouch.c +++ b/ncurses/base/lib_slktouch.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020 Thomas E. Dickey * + * Copyright 2020,2024 Thomas E. Dickey * * Copyright 1998-2000,2009 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -39,14 +39,14 @@ */ #include -MODULE_ID("$Id: lib_slktouch.c,v 1.9 2020/02/02 23:34:34 tom Exp $") +MODULE_ID("$Id: lib_slktouch.c,v 1.10 2024/12/07 20:03:37 tom Exp $") NCURSES_EXPORT(int) NCURSES_SP_NAME(slk_touch) (NCURSES_SP_DCL0) { T((T_CALLED("slk_touch(%p)"), (void *) SP_PARM)); - if (SP_PARM == 0 || SP_PARM->_slk == 0) + if (SP_PARM == NULL || SP_PARM->_slk == NULL) returnCode(ERR); SP_PARM->_slk->dirty = TRUE; diff --git a/ncurses/base/lib_touch.c b/ncurses/base/lib_touch.c index d8d59e13..130a76d6 100644 --- a/ncurses/base/lib_touch.c +++ b/ncurses/base/lib_touch.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020 Thomas E. Dickey * + * Copyright 2020,2024 Thomas E. Dickey * * Copyright 1998-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -44,7 +44,7 @@ #include -MODULE_ID("$Id: lib_touch.c,v 1.16 2020/02/02 23:34:34 tom Exp $") +MODULE_ID("$Id: lib_touch.c,v 1.17 2024/11/23 19:17:05 tom Exp $") #undef is_linetouched @@ -55,10 +55,10 @@ is_linetouched(WINDOW *win, int line) /* XSI doesn't define any error, and gcc ultimately made it impossible */ if (!win || (line > win->_maxy) || (line < 0)) { - returnCode(FALSE); + returnBool(FALSE); } - returnCode(win->_line[line].firstchar != _NOCHANGE ? TRUE : FALSE); + returnBool(win->_line[line].firstchar != _NOCHANGE ? TRUE : FALSE); } NCURSES_EXPORT(bool) @@ -71,9 +71,9 @@ is_wintouched(WINDOW *win) for (i = 0; i <= win->_maxy; i++) if (win->_line[i].firstchar != _NOCHANGE) - returnCode(TRUE); + returnBool(TRUE); } - returnCode(FALSE); + returnBool(FALSE); } NCURSES_EXPORT(int) diff --git a/ncurses/base/lib_ungetch.c b/ncurses/base/lib_ungetch.c index fcbe6f4a..8729f1fd 100644 --- a/ncurses/base/lib_ungetch.c +++ b/ncurses/base/lib_ungetch.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020 Thomas E. Dickey * + * Copyright 2020,2024 Thomas E. Dickey * * Copyright 1998-2011,2012 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -43,7 +43,7 @@ #include -MODULE_ID("$Id: lib_ungetch.c,v 1.17 2020/02/02 23:34:34 tom Exp $") +MODULE_ID("$Id: lib_ungetch.c,v 1.18 2024/12/07 20:03:37 tom Exp $") #include @@ -65,7 +65,7 @@ safe_ungetch(SCREEN *sp, int ch) T((T_CALLED("ungetch(%p,%s)"), (void *) sp, _nc_tracechar(sp, ch))); - if (sp != 0 && tail >= 0) { + if (sp != NULL && tail >= 0) { if (head < 0) { head = 0; t_inc(); diff --git a/ncurses/base/lib_wattron.c b/ncurses/base/lib_wattron.c index 906021d3..f15f3a4f 100644 --- a/ncurses/base/lib_wattron.c +++ b/ncurses/base/lib_wattron.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020,2022 Thomas E. Dickey * + * Copyright 2020-2022,2024 Thomas E. Dickey * * Copyright 1998-2009,2010 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -43,13 +43,13 @@ #include #include -MODULE_ID("$Id: lib_wattron.c,v 1.13 2022/04/15 22:34:38 tom Exp $") +MODULE_ID("$Id: lib_wattron.c,v 1.14 2024/12/07 20:03:37 tom Exp $") NCURSES_EXPORT(int) wattr_on(WINDOW *win, attr_t at, void *opts GCC_UNUSED) { T((T_CALLED("wattr_on(%p,%s)"), (void *) win, _traceattr(at))); - if (win != 0) { + if (win != NULL) { T(("... current %s (%d)", _traceattr(WINDOW_ATTRS(win)), GET_WINDOW_PAIR(win))); diff --git a/ncurses/base/lib_winch.c b/ncurses/base/lib_winch.c index 91253d10..2fb4f1c4 100644 --- a/ncurses/base/lib_winch.c +++ b/ncurses/base/lib_winch.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020 Thomas E. Dickey * + * Copyright 2020,2024 Thomas E. Dickey * * Copyright 1998-2009,2010 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -40,13 +40,13 @@ #include -MODULE_ID("$Id: lib_winch.c,v 1.9 2020/02/02 23:34:34 tom Exp $") +MODULE_ID("$Id: lib_winch.c,v 1.10 2024/12/07 20:03:37 tom Exp $") NCURSES_EXPORT(chtype) winch(WINDOW *win) { T((T_CALLED("winch(%p)"), (void *) win)); - if (win != 0) { + if (win != NULL) { returnChtype((chtype) CharOf(win->_line[win->_cury].text[win->_curx]) | AttrOf(win->_line[win->_cury].text[win->_curx])); } else { diff --git a/ncurses/base/lib_window.c b/ncurses/base/lib_window.c index 5323fbf0..d69b22b2 100644 --- a/ncurses/base/lib_window.c +++ b/ncurses/base/lib_window.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020,2021 Thomas E. Dickey * + * Copyright 2020-2021,2024 Thomas E. Dickey * * Copyright 1998-2010,2016 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -40,7 +40,7 @@ #include -MODULE_ID("$Id: lib_window.c,v 1.32 2021/10/23 23:06:24 tom Exp $") +MODULE_ID("$Id: lib_window.c,v 1.33 2024/12/07 20:03:37 tom Exp $") NCURSES_EXPORT(void) _nc_synchook(WINDOW *win) @@ -61,8 +61,8 @@ mvderwin(WINDOW *win, int y, int x) T((T_CALLED("mvderwin(%p,%d,%d)"), (void *) win, y, x)); - if (win != 0 - && (orig = win->_parent) != 0 + if (win != NULL + && (orig = win->_parent) != NULL && (x >= 0 && y >= 0) && (x + getmaxx(win) <= getmaxx(orig)) && (y + getmaxy(win) <= getmaxy(orig))) { @@ -178,11 +178,11 @@ NCURSES_EXPORT(WINDOW *) dupwin(WINDOW *win) /* make an exact duplicate of the given window */ { - WINDOW *nwin = 0; + WINDOW *nwin = NULL; T((T_CALLED("dupwin(%p)"), (void *) win)); - if (win != 0) { + if (win != NULL) { #if NCURSES_SP_FUNCS SCREEN *sp = _nc_screen_of(win); #endif @@ -199,7 +199,7 @@ dupwin(WINDOW *win) win->_begx); } - if (nwin != 0) { + if (nwin != NULL) { int i; size_t linesize; diff --git a/ncurses/base/nc_panel.c b/ncurses/base/nc_panel.c index 002f118e..b6e0642f 100644 --- a/ncurses/base/nc_panel.c +++ b/ncurses/base/nc_panel.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020 Thomas E. Dickey * + * Copyright 2020,2024 Thomas E. Dickey * * Copyright 1998-2000,2009 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -33,7 +33,7 @@ #include -MODULE_ID("$Id: nc_panel.c,v 1.6 2020/02/02 23:34:34 tom Exp $") +MODULE_ID("$Id: nc_panel.c,v 1.7 2024/12/07 20:03:37 tom Exp $") NCURSES_EXPORT(struct panelhook *) NCURSES_SP_NAME(_nc_panelhook) (NCURSES_SP_DCL0) @@ -42,7 +42,7 @@ NCURSES_SP_NAME(_nc_panelhook) (NCURSES_SP_DCL0) ? &(SP_PARM->_panelHook) : (CURRENT_SCREEN ? &(CURRENT_SCREEN->_panelHook) - : 0)); + : NULL)); } #if NCURSES_SP_FUNCS diff --git a/ncurses/base/new_pair.c b/ncurses/base/new_pair.c index 70866c63..89a1a56f 100644 --- a/ncurses/base/new_pair.c +++ b/ncurses/base/new_pair.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2020,2021 Thomas E. Dickey * + * Copyright 2018-2021,2024 Thomas E. Dickey * * Copyright 2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -61,7 +61,7 @@ #endif -MODULE_ID("$Id: new_pair.c,v 1.23 2021/08/16 22:11:26 tom Exp $") +MODULE_ID("$Id: new_pair.c,v 1.26 2024/12/07 18:05:04 tom Exp $") #if NCURSES_EXT_COLORS @@ -148,10 +148,10 @@ _nc_find_color_pair(SCREEN *sp, int fg, int bg) find.fg = fg; find.bg = bg; - if (sp != 0) { + if (sp != NULL) { void *pp; - if ((pp = tfind(&find, &sp->_ordered_pairs, compare_data)) != 0) { - colorpair_t *temp = *(colorpair_t **) pp; + if ((pp = tfind(&find, &sp->_ordered_pairs, compare_data)) != NULL) { + const colorpair_t *temp = *(colorpair_t **) pp; result = (int) (temp - sp->_color_pairs); } } @@ -193,7 +193,7 @@ _nc_free_ordered_pairs(SCREEN *sp) * pair table. */ NCURSES_EXPORT(void) -_nc_reset_color_pair(SCREEN *sp, int pair, colorpair_t * next) +_nc_reset_color_pair(SCREEN *sp, int pair, const colorpair_t * next) { colorpair_t *last; @@ -252,8 +252,8 @@ _nc_copy_pairs(SCREEN *sp, colorpair_t * target, colorpair_t * source, int lengt { int n; for (n = 0; n < length; ++n) { - void *find = tfind(source + n, &sp->_ordered_pairs, compare_data); - if (find != 0) { + const void *find = tfind(source + n, &sp->_ordered_pairs, compare_data); + if (find != NULL) { tdelete(source + n, &sp->_ordered_pairs, compare_data); tsearch(target + n, &sp->_ordered_pairs, compare_data); } @@ -266,7 +266,7 @@ NCURSES_SP_NAME(alloc_pair) (NCURSES_SP_DCLx int fg, int bg) int pair; T((T_CALLED("alloc_pair(%d,%d)"), fg, bg)); - if (SP_PARM == 0) { + if (SP_PARM == NULL) { pair = -1; } else if ((pair = _nc_find_color_pair(SP_PARM, fg, bg)) < 0) { /* @@ -291,7 +291,7 @@ NCURSES_SP_NAME(alloc_pair) (NCURSES_SP_DCLx int fg, int bg) if (!found && (SP_PARM->_pair_alloc < SP_PARM->_pair_limit)) { pair = SP_PARM->_pair_alloc; ReservePairs(SP_PARM, pair); - if (SP_PARM->_color_pairs == 0) { + if (SP_PARM->_color_pairs == NULL) { pair = -1; } else { found = TRUE; diff --git a/ncurses/base/resizeterm.c b/ncurses/base/resizeterm.c index b25cf908..041401aa 100644 --- a/ncurses/base/resizeterm.c +++ b/ncurses/base/resizeterm.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020,2021 Thomas E. Dickey * + * Copyright 2020-2021,2024 Thomas E. Dickey * * Copyright 1998-2015,2016 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -46,7 +46,7 @@ #define CUR SP_TERMTYPE #endif -MODULE_ID("$Id: resizeterm.c,v 1.52 2021/10/23 17:12:33 tom Exp $") +MODULE_ID("$Id: resizeterm.c,v 1.58 2024/12/07 18:05:04 tom Exp $") /* * If we're trying to be reentrant, do not want any local statics. @@ -103,8 +103,9 @@ NCURSES_EXPORT(bool) NCURSES_SP_NAME(is_term_resized) (NCURSES_SP_DCLx int ToLines, int ToCols) { T((T_CALLED("is_term_resized(%p, %d, %d)"), (void *) SP_PARM, ToLines, ToCols)); - returnCode(ToLines > 0 + returnBool(ToLines > 0 && ToCols > 0 + && SP_PARM != NULL && (ToLines != screen_lines(SP_PARM) || ToCols != screen_columns(SP_PARM))); } @@ -122,10 +123,10 @@ is_term_resized(int ToLines, int ToCols) static ripoff_t * ripped_window(WINDOW *win) { - ripoff_t *result = 0; + ripoff_t *result = NULL; ripoff_t *rop; - if (win != 0) { + if (win != NULL) { #ifdef USE_SP_RIPOFF SCREEN *sp = _nc_screen_of(win); #endif @@ -148,7 +149,7 @@ ripped_bottom(WINDOW *win) { int result = 0; - if (win != 0) { + if (win != NULL) { ripoff_t *rop; #ifdef USE_SP_RIPOFF @@ -174,7 +175,7 @@ child_depth(WINDOW *cmp) { int depth = 0; - if (cmp != 0) { + if (cmp != NULL) { #ifdef USE_SP_WINDOWLIST SCREEN *sp = _nc_screen_of(cmp); #endif @@ -199,9 +200,9 @@ parent_depth(WINDOW *cmp) { int depth = 0; - if (cmp != 0) { + if (cmp != NULL) { WINDOW *tst; - while ((tst = cmp->_parent) != 0) { + while ((tst = cmp->_parent) != NULL) { ++depth; cmp = tst; } @@ -219,17 +220,17 @@ adjust_window(WINDOW *win, int ToLines, int ToCols, int stolen EXTRA_DCLS) int bottom = CurLines + _nc_screen_of(win)->_topstolen - stolen; int myLines = win->_maxy + 1; int myCols = win->_maxx + 1; - ripoff_t *rop = ripped_window(win); + const ripoff_t *rop = ripped_window(win); T((T_CALLED("adjust_window(%p,%d,%d)%s depth %d/%d currently %ldx%ld at %ld,%ld"), (void *) win, ToLines, ToCols, - (rop != 0) ? " (rip)" : "", + (rop != NULL) ? " (rip)" : "", parent_depth(win), child_depth(win), (long) getmaxy(win), (long) getmaxx(win), (long) getbegy(win) + win->_yoffset, (long) getbegx(win))); - if (rop != 0 && rop->line < 0) { + if (rop != NULL && rop->line < 0) { /* * If it is a ripped-off window at the bottom of the screen, simply * move it to the same relative position. @@ -354,10 +355,10 @@ NCURSES_SP_NAME(resize_term) (NCURSES_SP_DCLx int ToLines, int ToCols) T((T_CALLED("resize_term(%p,%d,%d) old(%d,%d)"), (void *) SP_PARM, ToLines, ToCols, - (SP_PARM == 0) ? -1 : screen_lines(SP_PARM), - (SP_PARM == 0) ? -1 : screen_columns(SP_PARM))); + (SP_PARM == NULL) ? -1 : screen_lines(SP_PARM), + (SP_PARM == NULL) ? -1 : screen_columns(SP_PARM))); - if (SP_PARM == 0 || ToLines <= 0 || ToCols <= 0) { + if (SP_PARM == NULL || ToLines <= 0 || ToCols <= 0) { returnCode(ERR); } @@ -409,8 +410,8 @@ NCURSES_SP_NAME(resize_term) (NCURSES_SP_DCLx int ToLines, int ToCols) #ifdef USE_TERM_DRIVER CallDriver_2(SP_PARM, td_setsize, ToLines, ToCols); #else - lines = (NCURSES_SIZE_T) ToLines; - columns = (NCURSES_SIZE_T) ToCols; + lines = (NCURSES_INT2) ToLines; + columns = (NCURSES_INT2) ToCols; #endif SP_PARM->_lines_avail = (NCURSES_SIZE_T) (ToLines - was_stolen); @@ -473,18 +474,18 @@ NCURSES_SP_NAME(resizeterm) (NCURSES_SP_DCLx int ToLines, int ToCols) T((T_CALLED("resizeterm(%p, %d,%d) old(%d,%d)"), (void *) SP_PARM, ToLines, ToCols, - (SP_PARM == 0) ? -1 : screen_lines(SP_PARM), - (SP_PARM == 0) ? -1 : screen_columns(SP_PARM))); + (SP_PARM == NULL) ? -1 : screen_lines(SP_PARM), + (SP_PARM == NULL) ? -1 : screen_columns(SP_PARM))); - if (SP_PARM != 0 && ToLines > 0 && ToCols > 0) { + if (SP_PARM != NULL && ToLines > 0 && ToCols > 0) { result = OK; SP_PARM->_sig_winch = FALSE; if (NCURSES_SP_NAME(is_term_resized) (NCURSES_SP_ARGx ToLines, ToCols)) { #if USE_SIGWINCH ripoff_t *rop; - bool slk_visible = (SP_PARM != 0 - && SP_PARM->_slk != 0 + bool slk_visible = (SP_PARM != NULL + && SP_PARM->_slk != NULL && !(SP_PARM->_slk->hidden)); if (slk_visible) { @@ -505,7 +506,7 @@ NCURSES_SP_NAME(resizeterm) (NCURSES_SP_DCLx int ToLines, int ToCols) */ for (each_ripoff(rop)) { if (rop->win != StdScreen(SP_PARM) - && rop->win != 0 + && rop->win != NULL && rop->line < 0) { if (rop->hook != _nc_slk_initialize) { diff --git a/ncurses/base/safe_sprintf.c b/ncurses/base/safe_sprintf.c index 3fff2e83..219b6069 100644 --- a/ncurses/base/safe_sprintf.c +++ b/ncurses/base/safe_sprintf.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2020,2021 Thomas E. Dickey * + * Copyright 2018-2024,2025 Thomas E. Dickey * * Copyright 1998-2012,2013 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -34,7 +34,7 @@ #include #include -MODULE_ID("$Id: safe_sprintf.c,v 1.35 2021/10/03 00:25:09 tom Exp $") +MODULE_ID("$Id: safe_sprintf.c,v 1.39 2025/02/20 01:07:05 tom Exp $") #if USE_SAFE_SPRINTF @@ -60,12 +60,12 @@ _nc_printf_length(const char *fmt, va_list ap) size_t fmt_len; char fmt_arg[BUFSIZ]; - if (fmt == 0 || *fmt == '\0') + if (fmt == NULL || *fmt == '\0') return 0; fmt_len = strlen(fmt) + 1; - if ((format = typeMalloc(char, fmt_len)) == 0) + if ((format = typeMalloc(char, fmt_len)) == NULL) return -1; - if ((buffer = typeMalloc(char, length)) == 0) { + if ((buffer = typeMalloc(char, length)) == NULL) { free(format); return -1; } @@ -114,7 +114,7 @@ _nc_printf_length(const char *fmt, va_list ap) _nc_SLIMIT(sizeof(fmt_arg)) "%d", ival); fmt_len += strlen(fmt_arg); - if ((format = _nc_doalloc(format, fmt_len)) == 0) { + if ((format = _nc_doalloc(format, fmt_len)) == NULL) { free(buffer); return -1; } @@ -162,7 +162,7 @@ _nc_printf_length(const char *fmt, va_list ap) if (prec > (int) length) { length = length + (size_t) prec; buffer = typeRealloc(char, length, buffer); - if (buffer == 0) { + if (buffer == NULL) { free(format); return -1; } @@ -262,13 +262,19 @@ NCURSES_SP_NAME(_nc_printf_string) (NCURSES_SP_DCLx if (my_buffer != NULL) { # if HAVE_VSNPRINTF - /* SUSv2, 1997 */ - int used; - while ((used = vsnprintf(my_buffer, my_length, fmt, ap)) - >= (int) my_length) { + do { + /* SUSv2, 1997 */ + int used; + va_list ap2; + + begin_va_copy(ap2, ap); + used = vsnprintf(my_buffer, my_length, fmt, ap2); + end_va_copy(ap2); + if (used < (int) my_length) + break; my_length = (size_t) ((3 * used) / 2); my_buffer = typeRealloc(char, my_length, my_buffer); - } + } while (my_buffer != NULL); # else /* ISO/ANSI C, 1989 */ vsprintf(my_buffer, fmt, ap); diff --git a/ncurses/base/tries.c b/ncurses/base/tries.c index 0f309c21..2f080d5e 100644 --- a/ncurses/base/tries.c +++ b/ncurses/base/tries.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020 Thomas E. Dickey * + * Copyright 2020-2023,2024 Thomas E. Dickey * * Copyright 1998-2009,2010 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -39,8 +39,9 @@ */ #include +#include -MODULE_ID("$Id: tries.c,v 1.31 2020/02/02 23:34:34 tom Exp $") +MODULE_ID("$Id: tries.c,v 1.33 2024/12/07 21:24:18 tom Exp $") /* * Expand a keycode into the string that it corresponds to, returning null if @@ -50,12 +51,12 @@ NCURSES_EXPORT(char *) _nc_expand_try(TRIES * tree, unsigned code, int *count, size_t len) { TRIES *ptr = tree; - char *result = 0; + char *result = NULL; if (code != 0) { - while (ptr != 0) { + while (ptr != NULL) { if ((result = _nc_expand_try(ptr->child, code, count, len + 1)) - != 0) { + != NULL) { break; } if (ptr->value == code) { @@ -68,8 +69,8 @@ _nc_expand_try(TRIES * tree, unsigned code, int *count, size_t len) ptr = ptr->sibling; } } - if (result != 0) { - if (ptr != 0 && (result[len] = (char) ptr->ch) == 0) + if (result != NULL) { + if (ptr != NULL && (result[len] = (char) ptr->ch) == 0) *((unsigned char *) (result + len)) = 128; #ifdef TRACE if (len == 0 && USE_TRACEF(TRACE_MAXIMUM)) { @@ -95,7 +96,7 @@ _nc_remove_key(TRIES ** tree, unsigned code) if (code == 0) returnCode(FALSE); - while (*tree != 0) { + while (*tree != NULL) { if (_nc_remove_key(&(*tree)->child, code)) { returnCode(TRUE); } @@ -124,14 +125,14 @@ _nc_remove_string(TRIES ** tree, const char *string) { T((T_CALLED("_nc_remove_string(%p,%s)"), (void *) tree, _nc_visbuf(string))); - if (string == 0 || *string == 0) + if (!VALID_STRING(string) || *string == 0) returnCode(FALSE); - while (*tree != 0) { + while (*tree != NULL) { if (UChar((*tree)->ch) == UChar(*string)) { if (string[1] != 0) returnCode(_nc_remove_string(&(*tree)->child, string + 1)); - if ((*tree)->child == 0) { + if ((*tree)->child == NULL) { TRIES *to_free = *tree; *tree = (*tree)->sibling; free(to_free); diff --git a/ncurses/base/vsscanf.c b/ncurses/base/vsscanf.c index ef524250..022365f0 100644 --- a/ncurses/base/vsscanf.c +++ b/ncurses/base/vsscanf.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020 Thomas E. Dickey * + * Copyright 2020-2023,2025 Thomas E. Dickey * * Copyright 1998-2004,2012 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -39,15 +39,12 @@ #if !HAVE_VSSCANF -MODULE_ID("$Id: vsscanf.c,v 1.21 2020/02/02 23:34:34 tom Exp $") +MODULE_ID("$Id: vsscanf.c,v 1.23 2025/02/20 01:08:11 tom Exp $") #if !(HAVE_VFSCANF || HAVE__DOSCAN) #include -#define L_SQUARE '[' -#define R_SQUARE ']' - typedef enum { cUnknown ,cError /* anything that isn't ANSI */ @@ -218,7 +215,7 @@ vsscanf(const char *str, const char *format, va_list ap) int eaten; void *pointer; - if (my_fmt != 0) { + if (my_fmt != NULL) { /* * Split the original format into chunks, adding a "%n" to the end * of each (except of course if it used %n), and use that @@ -232,7 +229,7 @@ vsscanf(const char *str, const char *format, va_list ap) state = sUnknown; chunk = cUnknown; other = oUnknown; - pointer = 0; + pointer = NULL; for (n = 0; format[n] != 0 && state != sFinal; ++n) { my_fmt[n] = format[n]; switch (state) { @@ -243,7 +240,7 @@ vsscanf(const char *str, const char *format, va_list ap) case sPercent: if (format[n] == '%') { state = sUnknown; - } else if (format[n] == L_SQUARE) { + } else if (format[n] == L_BLOCK) { state = sLeft; } else { state = sNormal; @@ -258,7 +255,7 @@ vsscanf(const char *str, const char *format, va_list ap) } break; case sRange: - if (format[n] == R_SQUARE) { + if (format[n] == R_BLOCK) { state = sFinal; chunk = cRange; } diff --git a/ncurses/base/wresize.c b/ncurses/base/wresize.c index 5eb6a304..957a5035 100644 --- a/ncurses/base/wresize.c +++ b/ncurses/base/wresize.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2019-2020,2021 Thomas E. Dickey * + * Copyright 2019-2023,2024 Thomas E. Dickey * * Copyright 1998-2010,2011 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -34,7 +34,7 @@ #include -MODULE_ID("$Id: wresize.c,v 1.42 2021/10/23 18:54:16 tom Exp $") +MODULE_ID("$Id: wresize.c,v 1.45 2024/12/07 18:08:56 tom Exp $") static int cleanup_lines(struct ldat *data, int length) @@ -55,7 +55,7 @@ repair_subwindows(WINDOW *cmp) WINDOWLIST *wp; struct ldat *pline = cmp->_line; int row; -#ifdef USE_SP_WINDOWLIST +#if NCURSES_SP_FUNCS && defined(USE_SP_WINDOWLIST) SCREEN *sp = _nc_screen_of(cmp); #endif @@ -109,7 +109,7 @@ wresize(WINDOW *win, int ToLines, int ToCols) { int col, row, size_x, size_y; struct ldat *pline; - struct ldat *new_lines = 0; + struct ldat *new_lines = NULL; #ifdef TRACE T((T_CALLED("wresize(%p,%d,%d)"), (void *) win, ToLines, ToCols)); @@ -125,9 +125,11 @@ wresize(WINDOW *win, int ToLines, int ToCols) } #endif - if (!win || --ToLines < 0 || --ToCols < 0) + if (!win || !OK_DIMENSION(ToLines) || !OK_DIMENSION(ToCols)) returnCode(ERR); + ToLines--; + ToCols--; size_x = win->_maxx; size_y = win->_maxy; @@ -147,7 +149,7 @@ wresize(WINDOW *win, int ToLines, int ToCols) } pline = win->_parent->_line; } else { - pline = 0; + pline = NULL; } /* @@ -156,7 +158,7 @@ wresize(WINDOW *win, int ToLines, int ToCols) * (at least temporarily) the array pointing to the individual lines. */ new_lines = typeCalloc(struct ldat, (unsigned) (ToLines + 1)); - if (new_lines == 0) + if (new_lines == NULL) returnCode(ERR); /* @@ -173,7 +175,7 @@ wresize(WINDOW *win, int ToLines, int ToCols) if (row <= size_y) { if (ToCols != size_x) { s = typeMalloc(NCURSES_CH_T, (unsigned) ToCols + 1); - if (s == 0) + if (s == NULL) returnCode(cleanup_lines(new_lines, row)); for (col = 0; col <= ToCols; ++col) { bool valid = (col <= size_x); @@ -193,15 +195,15 @@ wresize(WINDOW *win, int ToLines, int ToCols) } } else { s = typeMalloc(NCURSES_CH_T, (unsigned) ToCols + 1); - if (s == 0) + if (s == NULL) returnCode(cleanup_lines(new_lines, row)); for (col = 0; col <= ToCols; ++col) s[col] = win->_nc_bkgd; } - } else if (pline != 0 && pline[win->_pary + row].text != 0) { + } else if (pline != NULL && pline[win->_pary + row].text != NULL) { s = &pline[win->_pary + row].text[win->_parx]; } else { - s = 0; + s = NULL; } if_USE_SCROLL_HINTS(new_lines[row].oldindex = row); diff --git a/ncurses/build.priv.h b/ncurses/build.priv.h index 9014e74a..0e2fdecc 100644 --- a/ncurses/build.priv.h +++ b/ncurses/build.priv.h @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2019,2020 Thomas E. Dickey * + * Copyright 2019-2020,2024 Thomas E. Dickey * * Copyright 2010,2012 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -32,7 +32,7 @@ ****************************************************************************/ /* - * $Id: build.priv.h,v 1.12 2020/02/02 23:34:34 tom Exp $ + * $Id: build.priv.h,v 1.13 2024/12/14 22:32:09 tom Exp $ * * build.priv.h * @@ -78,7 +78,7 @@ extern "C" { #define EXIT_FAILURE 1 #endif -#define FreeAndNull(p) do { free(p); p = 0; } while (0) +#define FreeAndNull(p) do { free(p); p = NULL; } while (0) #define UChar(c) ((unsigned char)(c)) #define SIZEOF(v) (sizeof(v) / sizeof(v[0])) diff --git a/ncurses/curses.priv.h b/ncurses/curses.priv.h index b0ab21bf..6f588d1c 100644 --- a/ncurses/curses.priv.h +++ b/ncurses/curses.priv.h @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2022,2023 Thomas E. Dickey * + * Copyright 2018-2024,2025 Thomas E. Dickey * * Copyright 1998-2017,2018 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -35,7 +35,7 @@ ****************************************************************************/ /* - * $Id: curses.priv.h,v 1.660 2023/02/25 21:24:20 tom Exp $ + * $Id: curses.priv.h,v 1.701 2025/03/01 17:17:12 tom Exp $ * * curses.priv.h * @@ -59,7 +59,7 @@ extern "C" { #if USE_RCS_IDS #define MODULE_ID(id) static const char Ident[] = id; #else -#define MODULE_ID(id) /*nothing*/ +#define MODULE_ID(id) /* nothing */ #endif #include /* for offsetof */ @@ -72,12 +72,6 @@ extern "C" { #include #endif -#if HAVE_LIMITS_H -# include -#elif HAVE_SYS_PARAM_H -# include -#endif - #include #include @@ -89,28 +83,29 @@ extern "C" { # endif #endif -#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 path-size */ -# endif -#endif - #if DECL_ERRNO extern int errno; #endif /* Some Windows related defines */ + #undef _NC_WINDOWS -#if (defined(_WIN32) || defined(_WIN64)) +#if (defined(_WIN32) || defined(_WIN64__) || defined(__MSYS__) || defined(__CYGWIN__)) #define _NC_WINDOWS #else #undef EXP_WIN32_DRIVER #endif +#undef _NC_CYGWIN +#if (defined(__MSYS__) || defined(__CYGWIN__)) +#define _NC_CYGWIN +#endif + +#undef _NC_WINDOWS_NATIVE +#if (defined(_WIN32) || defined(_WIN64)) +#define _NC_WINDOWS_NATIVE +#endif + #undef _NC_MINGW #if (defined(__MINGW32__) || defined(__MINGW64__)) #define _NC_MINGW @@ -141,8 +136,18 @@ extern int errno; # endif #endif +#if (defined(__USE_MINGW_ANSI_STDIO) && __USE_MINGW_ANSI_STDIO != 0) && (defined(__GNUC__) && (__GNUC__ < 12)) +# undef PRIxPTR /* gcc bug fixed in 12.x */ +# define PRIxPTR "lX" +# define CASTxPTR(n) (unsigned long)(intptr_t)(void*)(n) +#else +# define CASTxPTR(n) (intptr_t)(n) +#endif + #ifndef PRIxPTR # define PRIxPTR "lx" +# undef CASTxPTR +# define CASTxPTR(n) (long)(void*)(n) #endif /* include signal.h before curses.h to work-around defect in glibc 2.1.3 */ @@ -203,7 +208,7 @@ extern int errno; * the path separator in configure doesn't work properly. So, if building * for MinGW, we enforce the correct Windows PATH separator */ -#if defined(_NC_WINDOWS) +#if defined(_NC_WINDOWS_NATIVE) || defined(__DJGPP__) # ifdef NCURSES_PATHSEP # undef NCURSES_PATHSEP # endif @@ -228,6 +233,15 @@ extern int errno; 0) #endif +/* + * The stricmp() function is in MSVCRT, and cannot be called or linked from + * Cygwin runtime-dependent binaries currently. Use the POSIX strcaseccmp() + * function instead which is pretty much the same. + */ +#if defined(_NC_CYGWIN) +#define stricmp(s1, s2) strcasecmp(s1, s2) +#endif + /* * Not all platforms have memmove; some have an equivalent bcopy. (Some may * have neither). @@ -303,7 +317,6 @@ extern NCURSES_EXPORT(void *) _nc_memmove (void *, const void *, size_t); #define NO_TERMINAL "unknown" #define USE_SP_RIPOFF 1 #define USE_SP_TERMTYPE 1 -#define USE_SP_WINDOWLIST 1 #else #define NO_TERMINAL 0 #endif @@ -314,6 +327,12 @@ extern NCURSES_EXPORT(void *) _nc_memmove (void *, const void *, size_t); : no_terminal), \ NonEmpty(term_env)) +/* + * Originally a terminal-driver option, the window-list is per-screen to allow + * freeing memory used for windows when a screen is deleted. + */ +#define USE_SP_WINDOWLIST 1 + /* * Note: ht/cbt expansion flakes out randomly under Linux 1.1.47, but only * when we're throwing control codes at the screen at high volume. To see @@ -336,6 +355,11 @@ typedef TRIES { */ #define StringOf(ch) {ch, 0} +#define CSI_CHR 0x9b +#define ESC_CHR 0x1b + +#define L_BLOCK '[' +#define R_BLOCK ']' #define L_BRACE '{' #define R_BRACE '}' #define S_QUOTE '\'' @@ -343,6 +367,12 @@ typedef TRIES { #define VT_ACSC "``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~" +/* + * To make them easier to find, user-defined capabilities used within ncurses + * should be tagged with this macro: + */ +#define UserCap(name) #name + /* * Structure for palette tables */ @@ -421,8 +451,8 @@ typedef union { #include #include -#define IsPreScreen(sp) (((sp) != 0) && sp->_prescreen) -#define HasTerminal(sp) (((sp) != 0) && (0 != ((sp)->_term))) +#define IsPreScreen(sp) (((sp) != NULL) && sp->_prescreen) +#define HasTerminal(sp) (((sp) != NULL) && (NULL != ((sp)->_term))) #define IsValidScreen(sp) (HasTerminal(sp) && !IsPreScreen(sp)) #if USE_REENTRANT @@ -565,10 +595,10 @@ extern NCURSES_EXPORT(void) _nc_set_no_padding(SCREEN *); #define SET_SCREEN_PAIR(s,p) SetPair(SCREEN_ATTRS(s), p) #if USE_REENTRANT || NCURSES_SP_FUNCS -NCURSES_EXPORT(int *) _nc_ptr_Lines (SCREEN *); -NCURSES_EXPORT(int *) _nc_ptr_Cols (SCREEN *); -NCURSES_EXPORT(int *) _nc_ptr_Tabsize (SCREEN *); -NCURSES_EXPORT(int *) _nc_ptr_Escdelay (SCREEN *); +extern NCURSES_EXPORT(int *) _nc_ptr_Lines (SCREEN *); +extern NCURSES_EXPORT(int *) _nc_ptr_Cols (SCREEN *); +extern NCURSES_EXPORT(int *) _nc_ptr_Tabsize (SCREEN *); +extern NCURSES_EXPORT(int *) _nc_ptr_Escdelay (SCREEN *); #endif #if USE_REENTRANT @@ -866,6 +896,18 @@ typedef int (*TYPE_Gpm_GetEvent) (Gpm_Event *); #endif /* HAVE_LIBDL */ #endif /* USE_GPM_SUPPORT */ +/* + * Limit delay-times to 30 seconds, which is consistent with signed 16-bit + * numbers in legacy terminfo. + */ +#define MAX_DELAY_MSECS 30000 + +/* + * Limit screen dimensions read from environment variables. + */ +#define MAX_ENV_LINES 512 +#define MAX_ENV_COLUMNS 512 + /* * When converting from terminfo to termcap, check for cases where we can trim * octal escapes down to 2-character form. It is useful for terminfo format @@ -896,6 +938,7 @@ typedef int (*TYPE_Gpm_GetEvent) (Gpm_Event *); * string is less than 80 columns, but this buffer size is an absolute * limit. */ +#define TRACECHR_BUF 40 #define TRACEMSE_MAX (80 + (5 * 10) + (32 * 15)) #define TRACEMSE_FMT "id %2d at (%2d, %2d, %2d) state %4lx = {" /* } */ @@ -931,11 +974,25 @@ extern NCURSES_EXPORT_VAR(NCURSES_GLOBALS) _nc_globals; extern NCURSES_EXPORT_VAR(NCURSES_PRESCREEN) _nc_prescreen; typedef enum { - ewInitial = 0, + ewUnknown = 0, + ewInitial, ewRunning, ewSuspend } ENDWIN; +typedef struct { + int _nl; /* True if NL -> CR/NL is on */ + int _raw; /* True if in raw mode */ + int _cbreak; /* 1 if in cbreak mode */ + /* > 1 if in halfdelay mode */ + int _echo; /* True if echo on */ +} TTY_FLAGS; + +#define IsNl(sp) (sp)->_tty_flags._nl +#define IsRaw(sp) (sp)->_tty_flags._raw +#define IsCbreak(sp) (sp)->_tty_flags._cbreak +#define IsEcho(sp) (sp)->_tty_flags._echo + /* * The SCREEN structure. */ @@ -986,11 +1043,7 @@ typedef struct screen { int _cursrow; /* physical cursor row */ int _curscol; /* physical cursor column */ bool _notty; /* true if we cannot switch non-tty */ - int _nl; /* True if NL -> CR/NL is on */ - int _raw; /* True if in raw mode */ - int _cbreak; /* 1 if in cbreak mode */ - /* > 1 if in halfdelay mode */ - int _echo; /* True if echo on */ + TTY_FLAGS _tty_flags; int _use_meta; /* use the meta key? */ struct _SLK *_slk; /* ptr to soft key struct / NULL */ int slk_format; /* selected format for this screen */ @@ -1216,7 +1269,7 @@ typedef struct screen { #endif #ifdef TRACE - char tracechr_buf[40]; + char tracechr_buf[TRACECHR_BUF]; char tracemse_buf[TRACEMSE_MAX]; #if USE_REENTRANT long _outchars; @@ -1244,24 +1297,24 @@ extern NCURSES_EXPORT_VAR(SIG_ATOMIC_T) _nc_have_sigwinch; #define WINDOW_EXT(w,m) (((WINDOWLIST *)((void *)((char *)(w) - offsetof(WINDOWLIST, win))))->m) #ifdef USE_SP_WINDOWLIST -#define SP_INIT_WINDOWLIST(sp) WindowList(sp) = 0 +#define SP_INIT_WINDOWLIST(sp) WindowList(sp) = NULL #else #define SP_INIT_WINDOWLIST(sp) /* nothing */ #endif #define SP_PRE_INIT(sp) \ - sp->_cursrow = -1; \ - sp->_curscol = -1; \ - sp->_nl = TRUE; \ - sp->_raw = FALSE; \ - sp->_cbreak = 0; \ - sp->_echo = TRUE; \ - sp->_fifohead = -1; \ - sp->_endwin = ewSuspend; \ - sp->_cursor = -1; \ + sp->_cursrow = -1; \ + sp->_curscol = -1; \ + IsNl(sp) = TRUE; \ + IsRaw(sp) = FALSE; \ + IsCbreak(sp) = 0; \ + IsEcho(sp) = TRUE; \ + sp->_fifohead = -1; \ + sp->_endwin = ewSuspend; \ + sp->_cursor = -1; \ SP_INIT_WINDOWLIST(sp); \ - sp->_outch = NCURSES_OUTC_FUNC; \ - sp->jump = 0 \ + sp->_outch = NCURSES_OUTC_FUNC; \ + sp->jump = NULL \ /* usually in */ #ifndef UCHAR_MAX @@ -1274,12 +1327,12 @@ extern NCURSES_EXPORT_VAR(SIG_ATOMIC_T) _nc_have_sigwinch; /* Checks for isprint() should be done on 8-bit characters (non-wide) */ #define is8bits(c) ((unsigned)(c) <= UCHAR_MAX) -#ifndef min -#define min(a,b) ((a) > (b) ? (b) : (a)) +#ifndef Min +#define Min(a,b) ((a) > (b) ? (b) : (a)) #endif -#ifndef max -#define max(a,b) ((a) < (b) ? (b) : (a)) +#ifndef Max +#define Max(a,b) ((a) < (b) ? (b) : (a)) #endif /* usually in */ @@ -1343,11 +1396,8 @@ extern NCURSES_EXPORT_VAR(SIG_ATOMIC_T) _nc_have_sigwinch; #define TR_PUTC(c) TR(TRACE_CHARPUT, ("PUTC %#x", UChar(c))) -#ifndef MB_LEN_MAX -#define MB_LEN_MAX 8 /* should be >= MB_CUR_MAX, but that may be a function */ -#endif - #if USE_WIDEC_SUPPORT /* { */ +/* true if the status/errno indicate an illegal multibyte sequence */ #define isEILSEQ(status) (((size_t)status == (size_t)-1) && (errno == EILSEQ)) #define init_mb(state) memset(&(state), 0, sizeof(state)) @@ -1358,7 +1408,20 @@ extern NCURSES_EXPORT_VAR(SIG_ATOMIC_T) _nc_have_sigwinch; #define NulColor /* nothing */ #endif -#define NulChar 0,0,0,0 /* FIXME: see CCHARW_MAX */ +#if CCHARW_MAX > 6 +#define NulChar 0,0,0,0,0 +#elif CCHARW_MAX > 5 +#define NulChar 0,0,0,0 /* ncurses7 */ +#elif CCHARW_MAX > 4 +#define NulChar 0,0,0 /* ncurses6 */ +#elif CCHARW_MAX > 3 +#define NulChar 0,0 +#elif CCHARW_MAX > 2 +#define NulChar 0 +#else +#define NulChar /* nothing */ +#endif + #define CharOf(c) ((c).chars[0]) #define AttrOf(c) ((c).attr) @@ -1369,16 +1432,12 @@ extern NCURSES_EXPORT_VAR(SIG_ATOMIC_T) _nc_have_sigwinch; #define NewChar2(c,a) { a, { c, NulChar } NulColor } #define NewChar(ch) NewChar2(ChCharOf(ch), ChAttrOf(ch)) -#if CCHARW_MAX == 5 +#if CCHARW_MAX > 1 #define CharEq(a,b) (((a).attr == (b).attr) \ - && (a).chars[0] == (b).chars[0] \ - && (a).chars[1] == (b).chars[1] \ - && (a).chars[2] == (b).chars[2] \ - && (a).chars[3] == (b).chars[3] \ - && (a).chars[4] == (b).chars[4] \ + && !memcmp((a).chars, \ + (b).chars, \ + CCHARW_MAX * sizeof((b).chars[0])) \ if_EXT_COLORS(&& (a).ext_color == (b).ext_color)) -#elif CCHARW_MAX > 0 -#error Inconsistent values for CCHARW_MAX #else #define CharEq(a,b) (!memcmp(&(a), &(b), sizeof(a))) #endif @@ -1479,7 +1538,7 @@ extern NCURSES_EXPORT_VAR(SIG_ATOMIC_T) _nc_have_sigwinch; #define isWidecExt(ch) (0) #define if_WIDEC(code) /* nothing */ -#define Charable(ch) ((ch) >= ' ' && (ch) <= '~') +#define Charable(ch) (CharOf(ch) >= ' ' && CharOf(ch) <= '~') #define L(ch) ch #endif /* } */ @@ -1493,10 +1552,12 @@ extern NCURSES_EXPORT_VAR(SIG_ATOMIC_T) _nc_have_sigwinch; #define CHANGED -1 #define LEGALYX(w, y, x) \ - ((w) != 0 && \ + ((w) != NULL && \ ((x) >= 0 && (x) <= (w)->_maxx && \ (y) >= 0 && (y) <= (w)->_maxy)) +#define OK_DIMENSION(n) ((NCURSES_SIZE_T)(n) == (n) && (n) > 0) + #define CHANGED_CELL(line,col) \ if (line->firstchar == _NOCHANGE) \ line->firstchar = line->lastchar = (NCURSES_SIZE_T) (col); \ @@ -1521,15 +1582,28 @@ extern NCURSES_EXPORT_VAR(SIG_ATOMIC_T) _nc_have_sigwinch; #define SIZEOF(v) (sizeof(v)/sizeof(v[0])) -#define FreeIfNeeded(p) if ((p) != 0) free(p) +#include +#include + +#define FreeIfNeeded(p) if ((p) != NULL) free(p) /* FreeAndNull() is not a comma-separated expression because some compilers * do not accept a mixture of void with values. */ -#define FreeAndNull(p) do { free(p); p = 0; } while (0) +#define FreeAndNull(p) do { free(p); p = NULL; } while (0) -#include -#include +#ifdef EXP_OOM_TESTING +extern NCURSES_EXPORT(void *) _nc_oom_malloc(size_t size); +extern NCURSES_EXPORT(void *) _nc_oom_calloc(size_t nmemb, size_t size); +extern NCURSES_EXPORT(void *) _nc_oom_realloc(void *ptr, size_t size); +extern NCURSES_EXPORT(void) _nc_oom_free(void *ptr); +extern NCURSES_EXPORT(char *) _nc_oom_strdup(const char *ptr); +#define malloc(size) _nc_oom_malloc(size) +#define calloc(nmemb, size) _nc_oom_calloc(nmemb, size) +#define realloc(ptr, size) _nc_oom_realloc(ptr, size) +#define free(ptr) _nc_oom_free(ptr) +#define strdup(ptr) _nc_oom_strdup(ptr) +#endif /* * Use these for tic/infocmp malloc failures. Generally the ncurses library @@ -1538,21 +1612,21 @@ extern NCURSES_EXPORT_VAR(SIG_ATOMIC_T) _nc_have_sigwinch; #define TYPE_MALLOC(type, size, name) \ do { \ name = typeMalloc(type, size); \ - if (name == 0) \ + if (name == NULL) \ _nc_err_abort(MSG_NO_MEMORY); \ } while (0) #define TYPE_CALLOC(type, size, name) \ do { \ name = typeCalloc(type, size); \ - if (name == 0) \ + if (name == NULL) \ _nc_err_abort(MSG_NO_MEMORY); \ } while (0) #define TYPE_REALLOC(type, size, name) \ do { \ name = typeRealloc(type, size, name); \ - if (name == 0) \ + if (name == NULL) \ _nc_err_abort(MSG_NO_MEMORY); \ } while (0) @@ -1584,8 +1658,8 @@ extern NCURSES_EXPORT_VAR(SIG_ATOMIC_T) _nc_have_sigwinch; /* * Standardize/simplify common loops */ -#define each_screen(p) p = _nc_screen_chain; p != 0; p = (p)->_next_screen -#define each_window(sp,p) p = WindowList(sp); p != 0; p = (p)->next +#define each_screen(p) p = _nc_screen_chain; p != NULL; p = (p)->_next_screen +#define each_window(sp,p) p = WindowList(sp); p != NULL; p = (p)->next #define each_ripoff(p) p = safe_ripoff_stack; (p - safe_ripoff_stack) < N_RIPS; ++p /* @@ -1597,8 +1671,8 @@ extern NCURSES_EXPORT_VAR(SIG_ATOMIC_T) _nc_have_sigwinch; #define T_CREATE(fmt) "create :" fmt #define T_RETURN(fmt) "return }" fmt -#define NonNull(s) ((s) != 0 ? s : "") -#define NonEmpty(s) ((s) != 0 && *(s) != '\0') +#define NonNull(s) ((s) != NULL ? s : "") +#define NonEmpty(s) ((s) != NULL && *(s) != '\0') #ifdef TRACE @@ -1657,7 +1731,7 @@ typedef void VoidFunc(void); #define returnMMask(code) TRACE_RETURN_SP(code,mmask_t) #define returnPtr(code) TRACE_RETURN1(code,ptr) #define returnSP(code) TRACE_RETURN1(code,sp) -#define returnVoid T((T_RETURN(""))); return +#define returnVoid { T((T_RETURN(""))); return; } #define returnVoidPtr(code) TRACE_RETURN1(code,void_ptr) #define returnWin(code) TRACE_RETURN1(code,win) @@ -1665,7 +1739,7 @@ typedef void VoidFunc(void); #define returnPtrDB(rc) do { TR(TRACE_DATABASE,(T_RETURN("%p"), (rc))); return (rc); } while (0) #define returnVoidDB do { TR(TRACE_DATABASE,(T_RETURN(""))); return; } while (0) -extern NCURSES_EXPORT(NCURSES_BOOL) _nc_retrace_bool (int); +extern NCURSES_EXPORT(bool) _nc_retrace_bool (bool); extern NCURSES_EXPORT(NCURSES_CONST void *) _nc_retrace_cvoid_ptr (NCURSES_CONST void *); extern NCURSES_EXPORT(SCREEN *) _nc_retrace_sp (SCREEN *); extern NCURSES_EXPORT(WINDOW *) _nc_retrace_win (WINDOW *); @@ -1790,18 +1864,18 @@ extern NCURSES_EXPORT(void) name (void); \ TR(TRACE_ATTRS, ("new attribute is %s", _traceattr((S))));} #define DelCharCost(sp,count) \ - ((parm_dch != 0) \ + ((parm_dch != NULL) \ ? sp->_dch_cost \ - : ((delete_character != 0) \ + : ((delete_character != NULL) \ ? (sp->_dch1_cost * count) \ : INFINITY)) #define InsCharCost(sp,count) \ - ((parm_ich != 0) \ + ((parm_ich != NULL) \ ? sp->_ich_cost \ : ((enter_insert_mode && exit_insert_mode) \ ? sp->_smir_cost + sp->_rmir_cost + (sp->_ip_cost * count) \ - : ((insert_character != 0) \ + : ((insert_character != NULL) \ ? ((sp->_ich1_cost + sp->_ip_cost) * count) \ : INFINITY))) @@ -1888,7 +1962,7 @@ extern NCURSES_EXPORT(void) _nc_expanded (void); #endif #define save_ttytype(termp) \ - if (TerminalType(termp).term_names != 0) { \ + if (TerminalType(termp).term_names != NULL) { \ _nc_STRNCPY(ttytype, \ TerminalType(termp).term_names, \ NAMESIZE - 1); \ @@ -1945,11 +2019,11 @@ extern NCURSES_EXPORT(void) _nc_linedump (void); /* lib_acs.c */ extern NCURSES_EXPORT(void) _nc_init_acs (void); /* corresponds to traditional 'init_acs()' */ -extern NCURSES_EXPORT(int) _nc_msec_cost (const char *const, int); /* used by 'tack' program */ +extern NCURSES_EXPORT(int) _nc_msec_cost (const char *const, int); /* lib_addch.c */ #if USE_WIDEC_SUPPORT -NCURSES_EXPORT(int) _nc_build_wch(WINDOW *win, ARG_CH_T ch); +extern NCURSES_EXPORT(int) _nc_build_wch(WINDOW *win, ARG_CH_T ch); #endif /* lib_addstr.c */ @@ -1966,7 +2040,7 @@ extern NCURSES_EXPORT(void) _nc_reserve_pairs(SCREEN *, int); extern NCURSES_EXPORT(void) _nc_change_pair(SCREEN *, int); #define ReservePairs(sp,want) \ - if ((sp->_color_pairs == 0) || (want >= sp->_pair_alloc)) \ + if ((sp->_color_pairs == NULL) || (want >= sp->_pair_alloc)) \ _nc_reserve_pairs(sp, want) /* lib_getch.c */ @@ -1991,7 +2065,7 @@ extern NCURSES_EXPORT(void) _nc_screen_resume (void); extern NCURSES_EXPORT(void) _nc_screen_wrap (void); /* lib_mouse.c */ -extern NCURSES_EXPORT(bool) _nc_has_mouse (SCREEN *); +extern NCURSES_EXPORT(bool) _nc_has_mouse (const SCREEN *); /* lib_mvcur.c */ #define INFINITY 1000000 /* cost: too high to use */ @@ -1999,7 +2073,7 @@ extern NCURSES_EXPORT(bool) _nc_has_mouse (SCREEN *); /* lib_setup.c */ extern NCURSES_EXPORT(char *) _nc_get_locale(void); -extern NCURSES_EXPORT(int) _nc_unicode_locale(void); +extern NCURSES_EXPORT(bool) _nc_unicode_locale(void); extern NCURSES_EXPORT(int) _nc_locale_breaks_acs(TERMINAL *); extern NCURSES_EXPORT(int) _nc_setupterm(const char *, int, int *, int); extern NCURSES_EXPORT(void) _nc_tinfo_cmdch(TERMINAL *, int); @@ -2009,7 +2083,7 @@ extern NCURSES_EXPORT(SCREEN *) _nc_find_prescr(void); extern NCURSES_EXPORT(void) _nc_forget_prescr(void); #else #define _nc_find_prescr() _nc_prescreen.allocated -#define _nc_forget_prescr() _nc_prescreen.allocated = 0 +#define _nc_forget_prescr() _nc_prescreen.allocated = NULL #endif /* lib_set_term.c */ @@ -2062,7 +2136,7 @@ typedef struct { /* strings.c */ extern NCURSES_EXPORT(string_desc *) _nc_str_init (string_desc *, char *, size_t); extern NCURSES_EXPORT(string_desc *) _nc_str_null (string_desc *, size_t); -extern NCURSES_EXPORT(string_desc *) _nc_str_copy (string_desc *, string_desc *); +extern NCURSES_EXPORT(string_desc *) _nc_str_copy (string_desc *, const string_desc *); extern NCURSES_EXPORT(bool) _nc_safe_strcat (string_desc *, const char *); extern NCURSES_EXPORT(bool) _nc_safe_strcpy (string_desc *, const char *); @@ -2093,7 +2167,7 @@ extern NCURSES_EXPORT(int) _nc_access (const char *, int); extern NCURSES_EXPORT(int) _nc_baudrate (int); extern NCURSES_EXPORT(int) _nc_freewin (WINDOW *); extern NCURSES_EXPORT(int) _nc_getenv_num (const char *); -extern NCURSES_EXPORT(int) _nc_keypad (SCREEN *, int); +extern NCURSES_EXPORT(int) _nc_keypad (SCREEN *, bool); extern NCURSES_EXPORT(int) _nc_ospeed (int); extern NCURSES_EXPORT(int) _nc_outch (int); extern NCURSES_EXPORT(int) _nc_putchar (int); @@ -2101,17 +2175,19 @@ extern NCURSES_EXPORT(int) _nc_putp(const char *, const char *); extern NCURSES_EXPORT(int) _nc_putp_flush(const char *, const char *); extern NCURSES_EXPORT(int) _nc_read_termcap_entry (const char *const, TERMTYPE2 *const); extern NCURSES_EXPORT(int) _nc_setup_tinfo(const char *, TERMTYPE2 *); -extern NCURSES_EXPORT(int) _nc_setupscreen (int, int, FILE *, int, int); -extern NCURSES_EXPORT(int) _nc_timed_wait (SCREEN *, int, int, int * EVENTLIST_2nd(_nc_eventlist *)); +extern NCURSES_EXPORT(int) _nc_setupscreen (int, int, FILE *, bool, int); +extern NCURSES_EXPORT(int) _nc_timed_wait (const SCREEN *, int, int, int * EVENTLIST_2nd(_nc_eventlist *)); +extern NCURSES_EXPORT(int) _nc_trans_string (char *, const char *); extern NCURSES_EXPORT(void) _nc_init_termtype (TERMTYPE2 *const); extern NCURSES_EXPORT(void) _nc_do_color (int, int, int, NCURSES_OUTC); extern NCURSES_EXPORT(void) _nc_flush (void); -extern NCURSES_EXPORT(void) _nc_free_entry (ENTRY *, TERMTYPE2 *); +extern NCURSES_EXPORT(void) _nc_free_entry (ENTRY *, const TERMTYPE2 *); extern NCURSES_EXPORT(void) _nc_freeall (void); extern NCURSES_EXPORT(void) _nc_hash_map (void); extern NCURSES_EXPORT(void) _nc_init_keytry (SCREEN *); extern NCURSES_EXPORT(void) _nc_keep_tic_dir (const char *); extern NCURSES_EXPORT(void) _nc_make_oldhash (int i); +extern NCURSES_EXPORT(void) _nc_reset_input (FILE *, char *); extern NCURSES_EXPORT(void) _nc_scroll_oldhash (int n, int top, int bot); extern NCURSES_EXPORT(void) _nc_scroll_optimize (void); extern NCURSES_EXPORT(void) _nc_set_buffer (FILE *, int); @@ -2126,6 +2202,8 @@ extern NCURSES_EXPORT(const TERMTYPE2 *) _nc_fallback2 (const char *); #define _nc_fallback2(tp) _nc_fallback(tp) #endif +extern NCURSES_EXPORT(void) _nc_copy_termtype(TERMTYPE *, const TERMTYPE *); + #if NCURSES_EXT_NUMBERS extern NCURSES_EXPORT(void) _nc_copy_termtype2 (TERMTYPE2 *, const TERMTYPE2 *); extern NCURSES_EXPORT(void) _nc_export_termtype2(TERMTYPE *, const TERMTYPE2 *); @@ -2148,7 +2226,7 @@ extern NCURSES_EXPORT(void) _nc_comp_userdefs_leaks(void); extern NCURSES_EXPORT(void) _nc_db_iterator_leaks(void); extern NCURSES_EXPORT(void) _nc_keyname_leaks(void); extern NCURSES_EXPORT(void) _nc_names_leaks(void); -extern NCURSES_EXPORT(void) _nc_tgetent_leak(TERMINAL *); +extern NCURSES_EXPORT(void) _nc_tgetent_leak(const TERMINAL *); extern NCURSES_EXPORT(void) _nc_tgetent_leaks(void); #endif @@ -2188,7 +2266,7 @@ extern NCURSES_EXPORT(int) _nc_eventlist_timeout(_nc_eventlist *); */ #if USE_WIDEC_SUPPORT -#if defined(_NC_WINDOWS) && !defined(_NC_MSC) && !defined(EXP_WIN32_DRIVER) +#if defined(_NC_WINDOWS_NATIVE) && !defined(_NC_MSC) && !defined(EXP_WIN32_DRIVER) /* * MinGW has wide-character functions, but they do not work correctly. */ @@ -2202,11 +2280,11 @@ extern int __MINGW_NOTHROW _nc_mbtowc(wchar_t *, const char *, size_t); extern int __MINGW_NOTHROW _nc_mblen(const char *, size_t); #define mblen(s,n) _nc_mblen(s, n) -#endif /* _NC_WINDOWS && !_NC_MSC */ +#endif /* _NC_WINDOWS_NATIVE && !_NC_MSC */ -#if defined(_NC_WINDOWS) || defined(_NC_MINGW) +#if defined(_NC_WINDOWS_NATIVE) || defined(_NC_MINGW) /* see wcwidth.c */ -NCURSES_EXPORT(int) mk_wcwidth(wchar_t); +extern NCURSES_EXPORT(int) mk_wcwidth(uint32_t); #define wcwidth(ucs) _nc_wcwidth(ucs) #endif @@ -2239,7 +2317,7 @@ extern NCURSES_EXPORT_VAR(int *) _nc_oldnums; #define USE_SETBUF_0 0 -#define NC_OUTPUT(sp) ((sp != 0 && sp->_ofp != 0) ? sp->_ofp : stdout) +#define NC_OUTPUT(sp) ((sp != NULL && sp->_ofp != NULL) ? sp->_ofp : stdout) /* * On systems with a broken linker, define 'SP' as a function to force the @@ -2257,7 +2335,7 @@ extern NCURSES_EXPORT(void) _nc_set_screen (SCREEN *); /* current screen is private data; avoid possible linking conflicts too */ extern NCURSES_EXPORT_VAR(SCREEN *) SP; #define CURRENT_SCREEN SP -#define _nc_alloc_screen() ((SP = _nc_alloc_screen_sp()) != 0) +#define _nc_alloc_screen() ((SP = _nc_alloc_screen_sp()) != NULL) #define _nc_set_screen(sp) SP = sp #endif @@ -2313,7 +2391,7 @@ extern NCURSES_EXPORT(int) _nc_get_tty_mode(TTY *); #define SetSafeOutcWrapper(outc) \ SCREEN* sp = CURRENT_SCREEN; \ struct screen outc_wrapper; \ - if (sp==0) { \ + if (sp == NULL) { \ sp = &outc_wrapper; \ memset(sp,0,sizeof(struct screen)); \ sp->_outch = _nc_outc_wrapper; \ @@ -2463,16 +2541,12 @@ extern NCURSES_EXPORT_VAR(TERM_DRIVER) _nc_TINFO_DRIVER; #if defined(USE_WIN32CON_DRIVER) #include extern NCURSES_EXPORT_VAR(TERM_DRIVER) _nc_WIN_DRIVER; -extern NCURSES_EXPORT(int) _nc_mingw_isatty(int fd); -extern NCURSES_EXPORT(int) _nc_mingw_isconsole(int fd); -extern NCURSES_EXPORT(int) _nc_mingw_console_read( - SCREEN *sp, - HANDLE fd, - int *buf); -extern NCURSES_EXPORT(int) _nc_mingw_testmouse( - SCREEN * sp, - HANDLE fd, - int delay EVENTLIST_2nd(_nc_eventlist*)); +extern NCURSES_EXPORT(int) _nc_mingw_console_read(SCREEN *sp, HANDLE fd, int *buf); +extern NCURSES_EXPORT(int) _nc_mingw_isatty(int fd); +extern NCURSES_EXPORT(int) _nc_mingw_isconsole(int fd); +extern NCURSES_EXPORT(int) _nc_mingw_tcflush(int fd, int queue); +extern NCURSES_EXPORT(int) _nc_mingw_tcgetattr(int fd, struct termios *arg); +extern NCURSES_EXPORT(int) _nc_mingw_testmouse(SCREEN *sp, HANDLE fd, int delay EVENTLIST_2nd(_nc_eventlist*)); #else #endif extern NCURSES_EXPORT_VAR(TERM_DRIVER) _nc_TINFO_DRIVER; @@ -2487,9 +2561,17 @@ extern NCURSES_EXPORT_VAR(TERM_DRIVER) _nc_TINFO_DRIVER; #define NC_ISATTY(fd) isatty(fd) #endif +/* + * Perhaps not "real" but possibly not "fake". + */ +#define IsRealTty(fd,value) \ + (NC_ISATTY(fd) \ + && (value = ttyname(fd)) != NULL \ + && strncmp(value, "/dev/pts/", 9)) + #ifdef USE_TERM_DRIVER -# define IsTermInfo(sp) ((TCBOf(sp) != 0) && ((TCBOf(sp)->drv->isTerminfo))) -# define HasTInfoTerminal(sp) ((0 != TerminalOf(sp)) && IsTermInfo(sp)) +# define IsTermInfo(sp) ((TCBOf(sp) != NULL) && ((TCBOf(sp)->drv->isTerminfo))) +# define HasTInfoTerminal(sp) ((NULL != TerminalOf(sp)) && IsTermInfo(sp)) # if defined(EXP_WIN32_DRIVER) # define IsTermInfoOnConsole(sp) (IsTermInfo(sp) && _nc_console_test(TerminalOf(sp)->Filedes)) # elif defined(USE_WIN32CON_DRIVER) @@ -2499,7 +2581,7 @@ extern NCURSES_EXPORT_VAR(TERM_DRIVER) _nc_TINFO_DRIVER; # endif #else # define IsTermInfo(sp) TRUE -# define HasTInfoTerminal(sp) (0 != TerminalOf(sp)) +# define HasTInfoTerminal(sp) (NULL != TerminalOf(sp)) # if defined(EXP_WIN32_DRIVER) # define IsTermInfoOnConsole(sp) _nc_console_test(TerminalOf(sp)->Filedes) # else @@ -2547,7 +2629,7 @@ extern NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_putp_flush)(SCREEN*, const c extern NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_ripoffline)(SCREEN*, int, int (*)(WINDOW *,int)); extern NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_scrolln)(SCREEN*, int, int, int, int); extern NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_set_tty_mode)(SCREEN*, TTY*); -extern NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_setupscreen)(SCREEN**, int, int, FILE *, int, int); +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_setupscreen)(SCREEN**, int, int, FILE *, bool, int); extern NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_tgetent)(SCREEN*,char*,const char *); extern NCURSES_EXPORT(void) NCURSES_SP_NAME(_nc_do_color)(SCREEN*, int, int, int, NCURSES_SP_OUTC); extern NCURSES_EXPORT(void) NCURSES_SP_NAME(_nc_do_xmc_glitch)(SCREEN*, attr_t); @@ -2598,8 +2680,8 @@ extern NCURSES_EXPORT(NCURSES_CONST char *) _nc_unctrl (SCREEN *, chtype); #endif #ifdef EXP_XTERM_1005 -NCURSES_EXPORT(int) _nc_conv_to_utf8(unsigned char *, unsigned, unsigned); -NCURSES_EXPORT(int) _nc_conv_to_utf32(unsigned *, const char *, unsigned); +extern NCURSES_EXPORT(int) _nc_conv_to_utf8(unsigned char *, unsigned, unsigned); +extern NCURSES_EXPORT(int) _nc_conv_to_utf32(unsigned *, const char *, unsigned); #endif #ifdef __cplusplus diff --git a/ncurses/doit b/ncurses/doit new file mode 100644 index 00000000..ca093ee9 --- /dev/null +++ b/ncurses/doit @@ -0,0 +1 @@ +TERM=vxt-delay ASAN_OPTIONS=detect_odr_violation=0 ./lib_mvcur diff --git a/ncurses/llib-lncurses b/ncurses/llib-lncurses index 211cf3b7..19eecc5f 100644 --- a/ncurses/llib-lncurses +++ b/ncurses/llib-lncurses @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2019,2021,2022 Thomas E. Dickey * + * Copyright 2019-2023,2024 Thomas E. Dickey * * Copyright 1998-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -1475,7 +1475,7 @@ int mouseinterval( #undef _nc_has_mouse NCURSES_BOOL _nc_has_mouse( - SCREEN *sp) + const SCREEN *sp) { return(*(NCURSES_BOOL *)0); } #undef has_mouse_sp @@ -2032,7 +2032,7 @@ int _nc_setupscreen_sp( int slines, int scolumns, FILE *output, - int filtered, + NCURSES_BOOL filtered, int slk_format) { return(*(int *)0); } @@ -2041,7 +2041,7 @@ int _nc_setupscreen( int slines, int scolumns, FILE *output, - int filtered, + NCURSES_BOOL filtered, int slk_format) { return(*(int *)0); } @@ -2994,7 +2994,7 @@ ENTRY *_nc_tail; #undef _nc_free_entry void _nc_free_entry( ENTRY *headp, - TERMTYPE *tterm) + const TERMTYPE *tterm) { /* void */ } #undef _nc_free_entries @@ -3339,7 +3339,7 @@ int _nc_putp_flush_sp( #undef _nc_keypad int _nc_keypad( SCREEN *sp, - int flag) + NCURSES_BOOL flag) { return(*(int *)0); } /* ./tinfo/lib_raw.c */ @@ -3411,6 +3411,42 @@ int intrflush( NCURSES_BOOL flag) { return(*(int *)0); } +#undef is_nl_sp +int is_nl_sp( + SCREEN *sp) + { return(*(int *)0); } + +#undef is_raw_sp +int is_raw_sp( + SCREEN *sp) + { return(*(int *)0); } + +#undef is_cbreak_sp +int is_cbreak_sp( + SCREEN *sp) + { return(*(int *)0); } + +#undef is_echo_sp +int is_echo_sp( + SCREEN *sp) + { return(*(int *)0); } + +#undef is_nl +int is_nl(void) + { return(*(int *)0); } + +#undef is_raw +int is_raw(void) + { return(*(int *)0); } + +#undef is_cbreak +int is_cbreak(void) + { return(*(int *)0); } + +#undef is_echo +int is_echo(void) + { return(*(int *)0); } + /* ./tinfo/lib_setup.c */ #undef ttytype @@ -3489,8 +3525,8 @@ char *_nc_get_locale(void) { return(*(char **)0); } #undef _nc_unicode_locale -int _nc_unicode_locale(void) - { return(*(int *)0); } +NCURSES_BOOL _nc_unicode_locale(void) + { return(*(NCURSES_BOOL *)0); } #undef _nc_locale_breaks_acs int _nc_locale_breaks_acs( @@ -3656,6 +3692,21 @@ char *tiparm( ...) { return(*(char **)0); } +#undef tiparm_s +char *tiparm_s( + int num_expected, + int tparm_type, + const char *string, + ...) + { return(*(char **)0); } + +#undef tiscan_s +int tiscan_s( + int *num_expected, + int *tparm_type, + const char *string) + { return(*(int *)0); } + #undef _nc_tiparm char *_nc_tiparm( int expected, @@ -3797,7 +3848,7 @@ void _tracef( #undef _nc_retrace_bool NCURSES_BOOL _nc_retrace_bool( - int code) + NCURSES_BOOL code) { return(*(NCURSES_BOOL *)0); } #undef _nc_retrace_char @@ -4003,7 +4054,7 @@ int resetty(void) #undef _nc_timed_wait int _nc_timed_wait( - SCREEN *sp, + const SCREEN *sp, int mode, int milliseconds, int *timeleft) @@ -4106,7 +4157,7 @@ string_desc *_nc_str_null( #undef _nc_str_copy string_desc *_nc_str_copy( string_desc *dst, - string_desc *src) + const string_desc *const src) { return(*(string_desc **)0); } #undef _nc_safe_strcat @@ -4332,7 +4383,7 @@ int _nc_get_token( #undef _nc_trans_string int _nc_trans_string( char *ptr, - char *last) + const char *const last) { return(*(int *)0); } #undef _nc_push_token diff --git a/ncurses/llib-lncursest b/ncurses/llib-lncursest index 1b09d676..19dbf157 100644 --- a/ncurses/llib-lncursest +++ b/ncurses/llib-lncursest @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2019,2021,2022 Thomas E. Dickey * + * Copyright 2019-2023,2024 Thomas E. Dickey * * Copyright 2008-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -1484,7 +1484,7 @@ int mouseinterval( #undef _nc_has_mouse NCURSES_BOOL _nc_has_mouse( - SCREEN *sp) + const SCREEN *sp) { return(*(NCURSES_BOOL *)0); } #undef has_mouse_sp @@ -2041,7 +2041,7 @@ int _nc_setupscreen_sp( int slines, int scolumns, FILE *output, - int filtered, + NCURSES_BOOL filtered, int slk_format) { return(*(int *)0); } @@ -2050,7 +2050,7 @@ int _nc_setupscreen( int slines, int scolumns, FILE *output, - int filtered, + NCURSES_BOOL filtered, int slk_format) { return(*(int *)0); } @@ -3008,7 +3008,7 @@ ENTRY *_nc_tail; #undef _nc_free_entry void _nc_free_entry( ENTRY *headp, - TERMTYPE *tterm) + const TERMTYPE *tterm) { /* void */ } #undef _nc_free_entries @@ -3394,7 +3394,7 @@ int _nc_putp_flush_sp( #undef _nc_keypad int _nc_keypad( SCREEN *sp, - int flag) + NCURSES_BOOL flag) { return(*(int *)0); } /* ./tinfo/lib_raw.c */ @@ -3466,6 +3466,42 @@ int intrflush( NCURSES_BOOL flag) { return(*(int *)0); } +#undef is_nl_sp +int is_nl_sp( + SCREEN *sp) + { return(*(int *)0); } + +#undef is_raw_sp +int is_raw_sp( + SCREEN *sp) + { return(*(int *)0); } + +#undef is_cbreak_sp +int is_cbreak_sp( + SCREEN *sp) + { return(*(int *)0); } + +#undef is_echo_sp +int is_echo_sp( + SCREEN *sp) + { return(*(int *)0); } + +#undef is_nl +int is_nl(void) + { return(*(int *)0); } + +#undef is_raw +int is_raw(void) + { return(*(int *)0); } + +#undef is_cbreak +int is_cbreak(void) + { return(*(int *)0); } + +#undef is_echo +int is_echo(void) + { return(*(int *)0); } + /* ./tinfo/lib_setup.c */ #undef _nc_ttytype @@ -3566,8 +3602,8 @@ char *_nc_get_locale(void) { return(*(char **)0); } #undef _nc_unicode_locale -int _nc_unicode_locale(void) - { return(*(int *)0); } +NCURSES_BOOL _nc_unicode_locale(void) + { return(*(NCURSES_BOOL *)0); } #undef _nc_locale_breaks_acs int _nc_locale_breaks_acs( @@ -3741,6 +3777,21 @@ char *tiparm( ...) { return(*(char **)0); } +#undef tiparm_s +char *tiparm_s( + int num_expected, + int tparm_type, + const char *string, + ...) + { return(*(char **)0); } + +#undef tiscan_s +int tiscan_s( + int *num_expected, + int *tparm_type, + const char *string) + { return(*(int *)0); } + #undef _nc_tiparm char *_nc_tiparm( int expected, @@ -3896,7 +3947,7 @@ void _tracef( #undef _nc_retrace_bool NCURSES_BOOL _nc_retrace_bool( - int code) + NCURSES_BOOL code) { return(*(NCURSES_BOOL *)0); } #undef _nc_retrace_char @@ -4113,7 +4164,7 @@ int resetty(void) #undef _nc_timed_wait int _nc_timed_wait( - SCREEN *sp, + const SCREEN *sp, int mode, int milliseconds, int *timeleft) @@ -4227,7 +4278,7 @@ string_desc *_nc_str_null( #undef _nc_str_copy string_desc *_nc_str_copy( string_desc *dst, - string_desc *src) + const string_desc *const src) { return(*(string_desc **)0); } #undef _nc_safe_strcat @@ -4453,7 +4504,7 @@ int _nc_get_token( #undef _nc_trans_string int _nc_trans_string( char *ptr, - char *last) + const char *const last) { return(*(int *)0); } #undef _nc_push_token diff --git a/ncurses/llib-lncursestw b/ncurses/llib-lncursestw index 4576e0fc..aa0ad948 100644 --- a/ncurses/llib-lncursestw +++ b/ncurses/llib-lncursestw @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2021,2022 Thomas E. Dickey * + * Copyright 2018-2023,2024 Thomas E. Dickey * * Copyright 2009-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -2065,7 +2065,7 @@ int mouseinterval( #undef _nc_has_mouse NCURSES_BOOL _nc_has_mouse( - SCREEN *sp) + const SCREEN *sp) { return(*(NCURSES_BOOL *)0); } #undef has_mouse_sp @@ -2622,7 +2622,7 @@ int _nc_setupscreen_sp( int slines, int scolumns, FILE *output, - int filtered, + NCURSES_BOOL filtered, int slk_format) { return(*(int *)0); } @@ -2631,7 +2631,7 @@ int _nc_setupscreen( int slines, int scolumns, FILE *output, - int filtered, + NCURSES_BOOL filtered, int slk_format) { return(*(int *)0); } @@ -3581,7 +3581,7 @@ void _nc_free_ordered_pairs( void _nc_reset_color_pair( SCREEN *sp, int pair, - colorpair_t *next) + const colorpair_t *next) { /* void */ } #undef _nc_set_color_pair @@ -3959,7 +3959,7 @@ ENTRY *_nc_tail; #undef _nc_free_entry void _nc_free_entry( ENTRY *headp, - TERMTYPE2 *tterm) + const TERMTYPE2 *tterm) { /* void */ } #undef _nc_free_entries @@ -4355,7 +4355,7 @@ int _nc_putp_flush_sp( #undef _nc_keypad int _nc_keypad( SCREEN *sp, - int flag) + NCURSES_BOOL flag) { return(*(int *)0); } /* ./tinfo/lib_raw.c */ @@ -4427,6 +4427,42 @@ int intrflush( NCURSES_BOOL flag) { return(*(int *)0); } +#undef is_nl_sp +int is_nl_sp( + SCREEN *sp) + { return(*(int *)0); } + +#undef is_raw_sp +int is_raw_sp( + SCREEN *sp) + { return(*(int *)0); } + +#undef is_cbreak_sp +int is_cbreak_sp( + SCREEN *sp) + { return(*(int *)0); } + +#undef is_echo_sp +int is_echo_sp( + SCREEN *sp) + { return(*(int *)0); } + +#undef is_nl +int is_nl(void) + { return(*(int *)0); } + +#undef is_raw +int is_raw(void) + { return(*(int *)0); } + +#undef is_cbreak +int is_cbreak(void) + { return(*(int *)0); } + +#undef is_echo +int is_echo(void) + { return(*(int *)0); } + /* ./tinfo/lib_setup.c */ #undef _nc_ttytype @@ -4527,8 +4563,8 @@ char *_nc_get_locale(void) { return(*(char **)0); } #undef _nc_unicode_locale -int _nc_unicode_locale(void) - { return(*(int *)0); } +NCURSES_BOOL _nc_unicode_locale(void) + { return(*(NCURSES_BOOL *)0); } #undef _nc_locale_breaks_acs int _nc_locale_breaks_acs( @@ -4702,6 +4738,21 @@ char *tiparm( ...) { return(*(char **)0); } +#undef tiparm_s +char *tiparm_s( + int num_expected, + int tparm_type, + const char *string, + ...) + { return(*(char **)0); } + +#undef tiscan_s +int tiscan_s( + int *num_expected, + int *tparm_type, + const char *string) + { return(*(int *)0); } + #undef _nc_tiparm char *_nc_tiparm( int expected, @@ -4857,7 +4908,7 @@ void _tracef( #undef _nc_retrace_bool NCURSES_BOOL _nc_retrace_bool( - int code) + NCURSES_BOOL code) { return(*(NCURSES_BOOL *)0); } #undef _nc_retrace_char @@ -5085,7 +5136,7 @@ int resetty(void) #undef _nc_timed_wait int _nc_timed_wait( - SCREEN *sp, + const SCREEN *sp, int mode, int milliseconds, int *timeleft) @@ -5206,7 +5257,7 @@ string_desc *_nc_str_null( #undef _nc_str_copy string_desc *_nc_str_copy( string_desc *dst, - string_desc *src) + const string_desc *const src) { return(*(string_desc **)0); } #undef _nc_safe_strcat @@ -5454,7 +5505,7 @@ int _nc_get_token( #undef _nc_trans_string int _nc_trans_string( char *ptr, - char *last) + const char *const last) { return(*(int *)0); } #undef _nc_push_token diff --git a/ncurses/llib-lncursesw b/ncurses/llib-lncursesw index 127350d2..f2e03994 100644 --- a/ncurses/llib-lncursesw +++ b/ncurses/llib-lncursesw @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2021,2022 Thomas E. Dickey * + * Copyright 2018-2023,2024 Thomas E. Dickey * * Copyright 2001-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -2056,7 +2056,7 @@ int mouseinterval( #undef _nc_has_mouse NCURSES_BOOL _nc_has_mouse( - SCREEN *sp) + const SCREEN *sp) { return(*(NCURSES_BOOL *)0); } #undef has_mouse_sp @@ -2613,7 +2613,7 @@ int _nc_setupscreen_sp( int slines, int scolumns, FILE *output, - int filtered, + NCURSES_BOOL filtered, int slk_format) { return(*(int *)0); } @@ -2622,7 +2622,7 @@ int _nc_setupscreen( int slines, int scolumns, FILE *output, - int filtered, + NCURSES_BOOL filtered, int slk_format) { return(*(int *)0); } @@ -3572,7 +3572,7 @@ void _nc_free_ordered_pairs( void _nc_reset_color_pair( SCREEN *sp, int pair, - colorpair_t *next) + const colorpair_t *next) { /* void */ } #undef _nc_set_color_pair @@ -3945,7 +3945,7 @@ ENTRY *_nc_tail; #undef _nc_free_entry void _nc_free_entry( ENTRY *headp, - TERMTYPE2 *tterm) + const TERMTYPE2 *tterm) { /* void */ } #undef _nc_free_entries @@ -4300,7 +4300,7 @@ int _nc_putp_flush_sp( #undef _nc_keypad int _nc_keypad( SCREEN *sp, - int flag) + NCURSES_BOOL flag) { return(*(int *)0); } /* ./tinfo/lib_raw.c */ @@ -4372,6 +4372,42 @@ int intrflush( NCURSES_BOOL flag) { return(*(int *)0); } +#undef is_nl_sp +int is_nl_sp( + SCREEN *sp) + { return(*(int *)0); } + +#undef is_raw_sp +int is_raw_sp( + SCREEN *sp) + { return(*(int *)0); } + +#undef is_cbreak_sp +int is_cbreak_sp( + SCREEN *sp) + { return(*(int *)0); } + +#undef is_echo_sp +int is_echo_sp( + SCREEN *sp) + { return(*(int *)0); } + +#undef is_nl +int is_nl(void) + { return(*(int *)0); } + +#undef is_raw +int is_raw(void) + { return(*(int *)0); } + +#undef is_cbreak +int is_cbreak(void) + { return(*(int *)0); } + +#undef is_echo +int is_echo(void) + { return(*(int *)0); } + /* ./tinfo/lib_setup.c */ #undef ttytype @@ -4450,8 +4486,8 @@ char *_nc_get_locale(void) { return(*(char **)0); } #undef _nc_unicode_locale -int _nc_unicode_locale(void) - { return(*(int *)0); } +NCURSES_BOOL _nc_unicode_locale(void) + { return(*(NCURSES_BOOL *)0); } #undef _nc_locale_breaks_acs int _nc_locale_breaks_acs( @@ -4617,6 +4653,21 @@ char *tiparm( ...) { return(*(char **)0); } +#undef tiparm_s +char *tiparm_s( + int num_expected, + int tparm_type, + const char *string, + ...) + { return(*(char **)0); } + +#undef tiscan_s +int tiscan_s( + int *num_expected, + int *tparm_type, + const char *string) + { return(*(int *)0); } + #undef _nc_tiparm char *_nc_tiparm( int expected, @@ -4758,7 +4809,7 @@ void _tracef( #undef _nc_retrace_bool NCURSES_BOOL _nc_retrace_bool( - int code) + NCURSES_BOOL code) { return(*(NCURSES_BOOL *)0); } #undef _nc_retrace_char @@ -4975,7 +5026,7 @@ int resetty(void) #undef _nc_timed_wait int _nc_timed_wait( - SCREEN *sp, + const SCREEN *sp, int mode, int milliseconds, int *timeleft) @@ -5085,7 +5136,7 @@ string_desc *_nc_str_null( #undef _nc_str_copy string_desc *_nc_str_copy( string_desc *dst, - string_desc *src) + const string_desc *const src) { return(*(string_desc **)0); } #undef _nc_safe_strcat @@ -5333,7 +5384,7 @@ int _nc_get_token( #undef _nc_trans_string int _nc_trans_string( char *ptr, - char *last) + const char *const last) { return(*(int *)0); } #undef _nc_push_token diff --git a/ncurses/llib-ltic b/ncurses/llib-ltic index 0037884d..9e87aaea 100644 --- a/ncurses/llib-ltic +++ b/ncurses/llib-ltic @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020,2021 Thomas E. Dickey * + * Copyright 2020-2021,2023 Thomas E. Dickey * * Copyright 2012-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -150,7 +150,7 @@ int _nc_get_token( #undef _nc_trans_string int _nc_trans_string( char *ptr, - char *last) + const char *const last) { return(*(int *)0); } #undef _nc_push_token diff --git a/ncurses/llib-ltict b/ncurses/llib-ltict index b9895bcb..db9090b9 100644 --- a/ncurses/llib-ltict +++ b/ncurses/llib-ltict @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020,2021 Thomas E. Dickey * + * Copyright 2020-2021,2023 Thomas E. Dickey * * Copyright 2013-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -150,7 +150,7 @@ int _nc_get_token( #undef _nc_trans_string int _nc_trans_string( char *ptr, - char *last) + const char *const last) { return(*(int *)0); } #undef _nc_push_token diff --git a/ncurses/llib-ltictw b/ncurses/llib-ltictw index 2e407fd0..85db89bc 100644 --- a/ncurses/llib-ltictw +++ b/ncurses/llib-ltictw @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020,2021 Thomas E. Dickey * + * Copyright 2020-2021,2023 Thomas E. Dickey * * Copyright 2012-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -150,7 +150,7 @@ int _nc_get_token( #undef _nc_trans_string int _nc_trans_string( char *ptr, - char *last) + const char *const last) { return(*(int *)0); } #undef _nc_push_token diff --git a/ncurses/llib-lticw b/ncurses/llib-lticw index 2e407fd0..85db89bc 100644 --- a/ncurses/llib-lticw +++ b/ncurses/llib-lticw @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020,2021 Thomas E. Dickey * + * Copyright 2020-2021,2023 Thomas E. Dickey * * Copyright 2012-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -150,7 +150,7 @@ int _nc_get_token( #undef _nc_trans_string int _nc_trans_string( char *ptr, - char *last) + const char *const last) { return(*(int *)0); } #undef _nc_push_token diff --git a/ncurses/llib-ltinfo b/ncurses/llib-ltinfo index a5cd7cd3..9adcfcff 100644 --- a/ncurses/llib-ltinfo +++ b/ncurses/llib-ltinfo @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2019-2021,2022 Thomas E. Dickey * + * Copyright 2019-2023,2024 Thomas E. Dickey * * Copyright 2012-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -265,7 +265,7 @@ ENTRY *_nc_tail; #undef _nc_free_entry void _nc_free_entry( ENTRY *headp, - TERMTYPE *tterm) + const TERMTYPE *tterm) { /* void */ } #undef _nc_free_entries @@ -610,7 +610,7 @@ int _nc_putp_flush_sp( #undef _nc_keypad int _nc_keypad( SCREEN *sp, - int flag) + NCURSES_BOOL flag) { return(*(int *)0); } /* ./tinfo/lib_raw.c */ @@ -682,6 +682,42 @@ int intrflush( NCURSES_BOOL flag) { return(*(int *)0); } +#undef is_nl_sp +int is_nl_sp( + SCREEN *sp) + { return(*(int *)0); } + +#undef is_raw_sp +int is_raw_sp( + SCREEN *sp) + { return(*(int *)0); } + +#undef is_cbreak_sp +int is_cbreak_sp( + SCREEN *sp) + { return(*(int *)0); } + +#undef is_echo_sp +int is_echo_sp( + SCREEN *sp) + { return(*(int *)0); } + +#undef is_nl +int is_nl(void) + { return(*(int *)0); } + +#undef is_raw +int is_raw(void) + { return(*(int *)0); } + +#undef is_cbreak +int is_cbreak(void) + { return(*(int *)0); } + +#undef is_echo +int is_echo(void) + { return(*(int *)0); } + /* ./tinfo/lib_setup.c */ #undef ttytype @@ -760,8 +796,8 @@ char *_nc_get_locale(void) { return(*(char **)0); } #undef _nc_unicode_locale -int _nc_unicode_locale(void) - { return(*(int *)0); } +NCURSES_BOOL _nc_unicode_locale(void) + { return(*(NCURSES_BOOL *)0); } #undef _nc_locale_breaks_acs int _nc_locale_breaks_acs( @@ -927,6 +963,21 @@ char *tiparm( ...) { return(*(char **)0); } +#undef tiparm_s +char *tiparm_s( + int num_expected, + int tparm_type, + const char *string, + ...) + { return(*(char **)0); } + +#undef tiscan_s +int tiscan_s( + int *num_expected, + int *tparm_type, + const char *string) + { return(*(int *)0); } + #undef _nc_tiparm char *_nc_tiparm( int expected, @@ -1068,7 +1119,7 @@ void _tracef( #undef _nc_retrace_bool NCURSES_BOOL _nc_retrace_bool( - int code) + NCURSES_BOOL code) { return(*(NCURSES_BOOL *)0); } #undef _nc_retrace_char @@ -1274,7 +1325,7 @@ int resetty(void) #undef _nc_timed_wait int _nc_timed_wait( - SCREEN *sp, + const SCREEN *sp, int mode, int milliseconds, int *timeleft) @@ -1375,7 +1426,7 @@ string_desc *_nc_str_null( #undef _nc_str_copy string_desc *_nc_str_copy( string_desc *dst, - string_desc *src) + const string_desc *const src) { return(*(string_desc **)0); } #undef _nc_safe_strcat diff --git a/ncurses/llib-ltinfot b/ncurses/llib-ltinfot index bd3de812..77c31240 100644 --- a/ncurses/llib-ltinfot +++ b/ncurses/llib-ltinfot @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2019-2021,2022 Thomas E. Dickey * + * Copyright 2019-2023,2024 Thomas E. Dickey * * Copyright 2013-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -270,7 +270,7 @@ ENTRY *_nc_tail; #undef _nc_free_entry void _nc_free_entry( ENTRY *headp, - TERMTYPE *tterm) + const TERMTYPE *tterm) { /* void */ } #undef _nc_free_entries @@ -656,7 +656,7 @@ int _nc_putp_flush_sp( #undef _nc_keypad int _nc_keypad( SCREEN *sp, - int flag) + NCURSES_BOOL flag) { return(*(int *)0); } /* ./tinfo/lib_raw.c */ @@ -728,6 +728,42 @@ int intrflush( NCURSES_BOOL flag) { return(*(int *)0); } +#undef is_nl_sp +int is_nl_sp( + SCREEN *sp) + { return(*(int *)0); } + +#undef is_raw_sp +int is_raw_sp( + SCREEN *sp) + { return(*(int *)0); } + +#undef is_cbreak_sp +int is_cbreak_sp( + SCREEN *sp) + { return(*(int *)0); } + +#undef is_echo_sp +int is_echo_sp( + SCREEN *sp) + { return(*(int *)0); } + +#undef is_nl +int is_nl(void) + { return(*(int *)0); } + +#undef is_raw +int is_raw(void) + { return(*(int *)0); } + +#undef is_cbreak +int is_cbreak(void) + { return(*(int *)0); } + +#undef is_echo +int is_echo(void) + { return(*(int *)0); } + /* ./tinfo/lib_setup.c */ #undef _nc_ttytype @@ -828,8 +864,8 @@ char *_nc_get_locale(void) { return(*(char **)0); } #undef _nc_unicode_locale -int _nc_unicode_locale(void) - { return(*(int *)0); } +NCURSES_BOOL _nc_unicode_locale(void) + { return(*(NCURSES_BOOL *)0); } #undef _nc_locale_breaks_acs int _nc_locale_breaks_acs( @@ -1003,6 +1039,21 @@ char *tiparm( ...) { return(*(char **)0); } +#undef tiparm_s +char *tiparm_s( + int num_expected, + int tparm_type, + const char *string, + ...) + { return(*(char **)0); } + +#undef tiscan_s +int tiscan_s( + int *num_expected, + int *tparm_type, + const char *string) + { return(*(int *)0); } + #undef _nc_tiparm char *_nc_tiparm( int expected, @@ -1158,7 +1209,7 @@ void _tracef( #undef _nc_retrace_bool NCURSES_BOOL _nc_retrace_bool( - int code) + NCURSES_BOOL code) { return(*(NCURSES_BOOL *)0); } #undef _nc_retrace_char @@ -1375,7 +1426,7 @@ int resetty(void) #undef _nc_timed_wait int _nc_timed_wait( - SCREEN *sp, + const SCREEN *sp, int mode, int milliseconds, int *timeleft) @@ -1487,7 +1538,7 @@ string_desc *_nc_str_null( #undef _nc_str_copy string_desc *_nc_str_copy( string_desc *dst, - string_desc *src) + const string_desc *const src) { return(*(string_desc **)0); } #undef _nc_safe_strcat diff --git a/ncurses/llib-ltinfotw b/ncurses/llib-ltinfotw index 4d35a1e1..43b4f4b6 100644 --- a/ncurses/llib-ltinfotw +++ b/ncurses/llib-ltinfotw @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2021,2022 Thomas E. Dickey * + * Copyright 2018-2023,2024 Thomas E. Dickey * * Copyright 2012-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -282,7 +282,7 @@ ENTRY *_nc_tail; #undef _nc_free_entry void _nc_free_entry( ENTRY *headp, - TERMTYPE2 *tterm) + const TERMTYPE2 *tterm) { /* void */ } #undef _nc_free_entries @@ -678,7 +678,7 @@ int _nc_putp_flush_sp( #undef _nc_keypad int _nc_keypad( SCREEN *sp, - int flag) + NCURSES_BOOL flag) { return(*(int *)0); } /* ./tinfo/lib_raw.c */ @@ -750,6 +750,42 @@ int intrflush( NCURSES_BOOL flag) { return(*(int *)0); } +#undef is_nl_sp +int is_nl_sp( + SCREEN *sp) + { return(*(int *)0); } + +#undef is_raw_sp +int is_raw_sp( + SCREEN *sp) + { return(*(int *)0); } + +#undef is_cbreak_sp +int is_cbreak_sp( + SCREEN *sp) + { return(*(int *)0); } + +#undef is_echo_sp +int is_echo_sp( + SCREEN *sp) + { return(*(int *)0); } + +#undef is_nl +int is_nl(void) + { return(*(int *)0); } + +#undef is_raw +int is_raw(void) + { return(*(int *)0); } + +#undef is_cbreak +int is_cbreak(void) + { return(*(int *)0); } + +#undef is_echo +int is_echo(void) + { return(*(int *)0); } + /* ./tinfo/lib_setup.c */ #undef _nc_ttytype @@ -850,8 +886,8 @@ char *_nc_get_locale(void) { return(*(char **)0); } #undef _nc_unicode_locale -int _nc_unicode_locale(void) - { return(*(int *)0); } +NCURSES_BOOL _nc_unicode_locale(void) + { return(*(NCURSES_BOOL *)0); } #undef _nc_locale_breaks_acs int _nc_locale_breaks_acs( @@ -1025,6 +1061,21 @@ char *tiparm( ...) { return(*(char **)0); } +#undef tiparm_s +char *tiparm_s( + int num_expected, + int tparm_type, + const char *string, + ...) + { return(*(char **)0); } + +#undef tiscan_s +int tiscan_s( + int *num_expected, + int *tparm_type, + const char *string) + { return(*(int *)0); } + #undef _nc_tiparm char *_nc_tiparm( int expected, @@ -1180,7 +1231,7 @@ void _tracef( #undef _nc_retrace_bool NCURSES_BOOL _nc_retrace_bool( - int code) + NCURSES_BOOL code) { return(*(NCURSES_BOOL *)0); } #undef _nc_retrace_char @@ -1408,7 +1459,7 @@ int resetty(void) #undef _nc_timed_wait int _nc_timed_wait( - SCREEN *sp, + const SCREEN *sp, int mode, int milliseconds, int *timeleft) @@ -1527,7 +1578,7 @@ string_desc *_nc_str_null( #undef _nc_str_copy string_desc *_nc_str_copy( string_desc *dst, - string_desc *src) + const string_desc *const src) { return(*(string_desc **)0); } #undef _nc_safe_strcat diff --git a/ncurses/llib-ltinfow b/ncurses/llib-ltinfow index db846764..07f2f47e 100644 --- a/ncurses/llib-ltinfow +++ b/ncurses/llib-ltinfow @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2021,2022 Thomas E. Dickey * + * Copyright 2018-2023,2024 Thomas E. Dickey * * Copyright 2012-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -277,7 +277,7 @@ ENTRY *_nc_tail; #undef _nc_free_entry void _nc_free_entry( ENTRY *headp, - TERMTYPE2 *tterm) + const TERMTYPE2 *tterm) { /* void */ } #undef _nc_free_entries @@ -632,7 +632,7 @@ int _nc_putp_flush_sp( #undef _nc_keypad int _nc_keypad( SCREEN *sp, - int flag) + NCURSES_BOOL flag) { return(*(int *)0); } /* ./tinfo/lib_raw.c */ @@ -704,6 +704,42 @@ int intrflush( NCURSES_BOOL flag) { return(*(int *)0); } +#undef is_nl_sp +int is_nl_sp( + SCREEN *sp) + { return(*(int *)0); } + +#undef is_raw_sp +int is_raw_sp( + SCREEN *sp) + { return(*(int *)0); } + +#undef is_cbreak_sp +int is_cbreak_sp( + SCREEN *sp) + { return(*(int *)0); } + +#undef is_echo_sp +int is_echo_sp( + SCREEN *sp) + { return(*(int *)0); } + +#undef is_nl +int is_nl(void) + { return(*(int *)0); } + +#undef is_raw +int is_raw(void) + { return(*(int *)0); } + +#undef is_cbreak +int is_cbreak(void) + { return(*(int *)0); } + +#undef is_echo +int is_echo(void) + { return(*(int *)0); } + /* ./tinfo/lib_setup.c */ #undef ttytype @@ -782,8 +818,8 @@ char *_nc_get_locale(void) { return(*(char **)0); } #undef _nc_unicode_locale -int _nc_unicode_locale(void) - { return(*(int *)0); } +NCURSES_BOOL _nc_unicode_locale(void) + { return(*(NCURSES_BOOL *)0); } #undef _nc_locale_breaks_acs int _nc_locale_breaks_acs( @@ -949,6 +985,21 @@ char *tiparm( ...) { return(*(char **)0); } +#undef tiparm_s +char *tiparm_s( + int num_expected, + int tparm_type, + const char *string, + ...) + { return(*(char **)0); } + +#undef tiscan_s +int tiscan_s( + int *num_expected, + int *tparm_type, + const char *string) + { return(*(int *)0); } + #undef _nc_tiparm char *_nc_tiparm( int expected, @@ -1090,7 +1141,7 @@ void _tracef( #undef _nc_retrace_bool NCURSES_BOOL _nc_retrace_bool( - int code) + NCURSES_BOOL code) { return(*(NCURSES_BOOL *)0); } #undef _nc_retrace_char @@ -1307,7 +1358,7 @@ int resetty(void) #undef _nc_timed_wait int _nc_timed_wait( - SCREEN *sp, + const SCREEN *sp, int mode, int milliseconds, int *timeleft) @@ -1415,7 +1466,7 @@ string_desc *_nc_str_null( #undef _nc_str_copy string_desc *_nc_str_copy( string_desc *dst, - string_desc *src) + const string_desc *const src) { return(*(string_desc **)0); } #undef _nc_safe_strcat diff --git a/ncurses/new_pair.h b/ncurses/new_pair.h index 49d7e8b8..82f768cb 100644 --- a/ncurses/new_pair.h +++ b/ncurses/new_pair.h @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2020,2021 Thomas E. Dickey * + * Copyright 2018-2021,2024 Thomas E. Dickey * * Copyright 2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -34,7 +34,7 @@ /* * Common type definitions and macros for new_pair.c, lib_color.c * - * $Id: new_pair.h,v 1.13 2021/09/24 17:52:01 tom Exp $ + * $Id: new_pair.h,v 1.16 2024/12/07 17:27:35 tom Exp $ */ #ifndef NEW_PAIR_H @@ -111,12 +111,12 @@ colorpair_t; * that the index is within the limits of the table which we allocated. */ #define ValidPair(sp,pair) \ - ((sp != 0) && (pair >= 0) && (pair < sp->_pair_limit) && sp->_coloron) + ((sp != NULL) && (pair >= 0) && (pair < sp->_pair_limit) && sp->_coloron) -#if NCURSES_EXT_COLORS +#if NCURSES_EXT_FUNCS && NCURSES_EXT_COLORS extern NCURSES_EXPORT(void) _nc_copy_pairs(SCREEN*, colorpair_t*, colorpair_t*, int); extern NCURSES_EXPORT(void) _nc_free_ordered_pairs(SCREEN*); -extern NCURSES_EXPORT(void) _nc_reset_color_pair(SCREEN*, int, colorpair_t*); +extern NCURSES_EXPORT(void) _nc_reset_color_pair(SCREEN*, int, const colorpair_t*); extern NCURSES_EXPORT(void) _nc_set_color_pair(SCREEN*, int, int); #else #define _nc_free_ordered_pairs(sp) /* nothing */ diff --git a/ncurses/report_hashing.c b/ncurses/report_hashing.c index bed96efb..5a091eb0 100644 --- a/ncurses/report_hashing.c +++ b/ncurses/report_hashing.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020 Thomas E. Dickey * + * Copyright 2020,2025 Thomas E. Dickey * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -33,7 +33,7 @@ #include #include -MODULE_ID("$Id: report_hashing.c,v 1.3 2020/02/02 23:34:34 tom Exp $") +MODULE_ID("$Id: report_hashing.c,v 1.4 2025/02/20 01:02:09 tom Exp $") static void check_names(const char *name, NCURSES_CONST char *const *table, int termcap) @@ -46,7 +46,7 @@ check_names(const char *name, NCURSES_CONST char *const *table, int termcap) printf("%s:\n", name); for (n = 0; table[n] != NULL; ++n) { entry_ptr = _nc_find_entry(table[n], hash_table); - if (entry_ptr == 0) { + if (entry_ptr == NULL) { printf(" %s\n", table[n]); errs++; } diff --git a/ncurses/report_offsets.c b/ncurses/report_offsets.c index 83f6f381..6f7e4266 100644 --- a/ncurses/report_offsets.c +++ b/ncurses/report_offsets.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2020,2021 Thomas E. Dickey * + * Copyright 2018-2023,2024 Thomas E. Dickey * * Copyright 2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -31,21 +31,24 @@ * Author: Thomas E. Dickey * ****************************************************************************/ +#define NEW_PAIR_INTERNAL 1 #include -MODULE_ID("$Id: report_offsets.c,v 1.22 2021/08/19 19:51:33 tom Exp $") +MODULE_ID("$Id: report_offsets.c,v 1.30 2024/12/07 21:18:23 tom Exp $") #define show_size(type) \ - flag = 0; \ + flag = NULL; \ last = 0; \ printf("%5lu " #type "\n", (unsigned long)sizeof(type)) +#define show_name(name) \ + printf("%5lu " #name "\n", (unsigned long)(name)) #define show_offset(type,member) \ next = (unsigned long)offsetof(type,member); \ if (last > next) \ printf("?? incorrect order for " #type "." #member "\n"); \ printf("%5lu %c " #type "." #member "\n", next, flag ? *flag : ' '); \ last = next; \ - flag = 0 + flag = NULL #if NCURSES_WIDECHAR && NCURSES_EXT_COLORS #define show_COLORS(type,member) { flag = "c"; show_offset(type,member); } @@ -65,12 +68,7 @@ MODULE_ID("$Id: report_offsets.c,v 1.22 2021/08/19 19:51:33 tom Exp $") #define show_MLEAKS(type,member) /* nothing */ #endif -#ifdef USE_TERM_DRIVER -#define show_NORMAL(type,member) /* nothing */ -#else #define show_NORMAL(type,member) { flag = "n"; show_offset(type,member); } -#endif - #define show_OPTION(type,member) { flag = "+"; show_offset(type,member); } #if USE_REENTRANT @@ -106,7 +104,7 @@ MODULE_ID("$Id: report_offsets.c,v 1.22 2021/08/19 19:51:33 tom Exp $") int main(void) { - const char *flag = 0; + const char *flag = NULL; unsigned long last, next; printf("Size/offsets of data structures:\n"); @@ -116,9 +114,28 @@ main(void) #if USE_WIDEC_SUPPORT show_size(cchar_t); #endif + show_size(color_t); + show_size(colorpair_t); show_size(mmask_t); + show_size(rgb_bits_t); show_size(MEVENT); show_size(NCURSES_BOOL); + show_size(TRIES); + + printf("\n"); + printf("Sizes of buffers/arrays:\n"); +#if USE_WIDEC_SUPPORT + show_name(CCHARW_MAX); +#endif + show_name(EV_MAX); + show_name(FIFO_SIZE); + show_name(NAMESIZE); + show_name(MB_LEN_MAX); + show_name(PATH_MAX); +#ifdef TRACE + show_name(TRACECHR_BUF); + show_name(TRACEMSE_MAX); +#endif printf("\n"); show_size(SCREEN); @@ -160,11 +177,15 @@ main(void) #if USE_SIZECHANGE show_OPTION(SCREEN, _resize); #endif - show_DRIVER(SCREEN, _windowlist); +#ifdef USE_SP_WINDOWLIST + show_NORMAL(SCREEN, _windowlist); +#endif show_REENTR(SCREEN, _ttytype); show_SPFUNC(SCREEN, use_tioctl); show_WIDECH(SCREEN, _screen_acs_fix); +#if NCURSES_EXT_FUNCS && NCURSES_EXT_COLORS show_COLORS(SCREEN, _ordered_pairs); +#endif show_TRACES(SCREEN, tracechr_buf); printf("\n"); @@ -210,7 +231,9 @@ main(void) show_offset(NCURSES_GLOBALS, cached_tparm); #endif show_DRIVER(NCURSES_GLOBALS, term_driver); +#ifndef USE_SP_WINDOWLIST show_NORMAL(NCURSES_GLOBALS, _nc_windowlist); +#endif #if USE_HOME_TERMINFO show_OPTION(NCURSES_GLOBALS, home_terminfo); #endif @@ -223,6 +246,7 @@ main(void) #endif show_WIDECH(NCURSES_GLOBALS, key_name); show_TRACES(NCURSES_GLOBALS, trace_opened); + show_TRACES(NCURSES_GLOBALS, trace_level); show_MLEAKS(NCURSES_GLOBALS, leak_checking); printf("\n"); diff --git a/ncurses/term.priv.h b/ncurses/term.priv.h index 03669cb4..1f436b5f 100644 --- a/ncurses/term.priv.h +++ b/ncurses/term.priv.h @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2021 Thomas E. Dickey * + * Copyright 2021-2023,2024 Thomas E. Dickey * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -27,13 +27,12 @@ ****************************************************************************/ /* - * $Id: term.priv.h,v 1.7 2021/11/20 23:33:33 tom Exp $ + * $Id: term.priv.h,v 1.13 2024/03/02 20:43:06 tom Exp $ * * term.priv.h * * Header file for terminfo library objects which are private to * the library. - * */ #ifndef _TERM_PRIV_H @@ -46,11 +45,20 @@ extern "C" { #include +#ifndef __NCURSES_H +#include +#endif + #undef NCURSES_OPAQUE #define NCURSES_INTERNALS 1 #define NCURSES_OPAQUE 0 -#include /* PATH_MAX */ +#if HAVE_LIMITS_H +# include /* PATH_MAX, MB_LEN_MAX, etc */ +#elif HAVE_SYS_PARAM_H +# include +#endif + #include /* sig_atomic_t */ #include /* time_t */ #include /* time_t */ @@ -61,6 +69,28 @@ extern "C" { #endif #endif +/* + * If not properly configured to use the system's limits.h, we get gcc's + * fallback for limits.h which sets MB_LEN_MAX to 1, which is never correct. + */ +#if !HAVE_CONSISTENT_MB_LEN_MAX +#undef MB_LEN_MAX +#endif + +#ifndef MB_LEN_MAX +#define MB_LEN_MAX 16 /* should be >= MB_CUR_MAX, but that may be a function */ +#endif + +#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 path-size */ +# endif +#endif + /* * State of tparm(). */ @@ -238,7 +268,6 @@ typedef struct { #ifdef TRACE bool trace_opened; - char trace_fname[PATH_MAX]; int trace_level; FILE * trace_fp; int trace_fd; diff --git a/ncurses/tinfo/MKcaptab.awk b/ncurses/tinfo/MKcaptab.awk index ee4e2e9b..cd6730e5 100644 --- a/ncurses/tinfo/MKcaptab.awk +++ b/ncurses/tinfo/MKcaptab.awk @@ -1,5 +1,5 @@ ############################################################################## -# Copyright 2020 Thomas E. Dickey # +# Copyright 2020,2024 Thomas E. Dickey # # Copyright 1998-2006,2007 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # @@ -26,7 +26,7 @@ # use or other dealings in this Software without prior written # # authorization. # ############################################################################## -# $Id: MKcaptab.awk,v 1.21 2020/02/02 23:34:34 tom Exp $ +# $Id: MKcaptab.awk,v 1.22 2024/12/07 20:52:55 tom Exp $ function add_string(text) { if (text != "IGNORE") { offsets[num_strings] = offset; @@ -53,7 +53,7 @@ BEGIN { printf "/* generated by MKcaptab.awk %s(%d) */\n", tablename, bigstrings; print "" if (bigstrings) { - printf "static struct alias *_nc_%s_table = 0;\n", tablename; + printf "static struct alias *_nc_%s_table = NULL;\n", tablename; print ""; printf "static const char %s_text[] = \"\\\n", tablename; } else { diff --git a/ncurses/tinfo/MKcaptab.sh b/ncurses/tinfo/MKcaptab.sh old mode 100644 new mode 100755 index c800023d..a55d4807 --- a/ncurses/tinfo/MKcaptab.sh +++ b/ncurses/tinfo/MKcaptab.sh @@ -1,6 +1,6 @@ #!/bin/sh ############################################################################## -# Copyright 2019,2020 Thomas E. Dickey # +# Copyright 2019-2023,2024 Thomas E. Dickey # # Copyright 2007-2010,2011 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # @@ -27,13 +27,13 @@ # use or other dealings in this Software without prior written # # authorization. # ############################################################################## -# $Id: MKcaptab.sh,v 1.19 2020/02/02 23:34:34 tom Exp $ +# $Id: MKcaptab.sh,v 1.22 2024/12/07 21:30:44 tom Exp $ if test $# != 0 then AWK="$1"; shift 1 else - AWK=awk + AWK="awk" fi if test $# != 0 @@ -71,12 +71,12 @@ cat <<'EOF' /* *INDENT-OFF* */ EOF -cat "$@" |./make_hash 1 info $OPT1 -cat "$@" |./make_hash 3 cap $OPT1 +cat "$@" |./make_hash 1 info "$OPT1" +cat "$@" |./make_hash 3 cap "$OPT1" -cat "$@" |$AWK -f $OPT2 bigstrings=$OPT1 tablename=capalias +cat "$@" |$AWK -f "$OPT2" bigstrings="$OPT1" tablename=capalias -cat "$@" |$AWK -f $OPT2 bigstrings=$OPT1 tablename=infoalias +cat "$@" |$AWK -f "$OPT2" bigstrings="$OPT1" tablename=infoalias cat </NCURSES_INT2/g' + "$infocmp_path" -E "$x" | sed -e 's/[ ]short[ ]/ NCURSES_INT2 /g' done cat <= 19) +#include +#define USE_GETAUXVAL 1 +#else +#define USE_GETAUXVAL 0 +#endif + #include -MODULE_ID("$Id: access.c,v 1.31 2021/08/29 10:35:17 tom Exp $") +MODULE_ID("$Id: access.c,v 1.42 2025/02/20 01:02:09 tom Exp $") #define LOWERCASE(c) ((isalpha(UChar(c)) && isupper(UChar(c))) ? tolower(UChar(c)) : (c)) @@ -63,15 +70,15 @@ _nc_rootname(char *path) static char *temp; char *s; - temp = strdup(result); - result = temp; + if ((temp = strdup(result)) != NULL) + result = temp; #if !MIXEDCASE_FILENAMES for (s = result; *s != '\0'; ++s) { *s = (char) LOWERCASE(*s); } #endif #if defined(PROG_EXT) - if ((s = strrchr(result, '.')) != 0) { + if ((s = strrchr(result, '.')) != NULL) { if (!strcmp(s, PROG_EXT)) *s = '\0'; } @@ -87,10 +94,10 @@ NCURSES_EXPORT(bool) _nc_is_abs_path(const char *path) { #if defined(__EMX__) || defined(__DJGPP__) -#define is_pathname(s) ((((s) != 0) && ((s)[0] == '/')) \ +#define is_pathname(s) ((((s) != NULL) && ((s)[0] == '/')) \ || (((s)[0] != 0) && ((s)[1] == ':'))) #else -#define is_pathname(s) ((s) != 0 && (s)[0] == '/') +#define is_pathname(s) ((s) != NULL && (s)[0] == '/') #endif return is_pathname(path); } @@ -103,10 +110,10 @@ _nc_pathlast(const char *path) { const char *test = strrchr(path, '/'); #ifdef __EMX__ - if (test == 0) + if (test == NULL) test = strrchr(path, '\\'); #endif - if (test == 0) + if (test == NULL) test = path; else test++; @@ -124,7 +131,8 @@ _nc_access(const char *path, int mode) { int result; - if (path == 0) { + if (path == NULL) { + errno = ENOENT; result = -1; } else if (ACCESS(path, mode) < 0) { if ((mode & W_OK) != 0 @@ -135,7 +143,7 @@ _nc_access(const char *path, int mode) _nc_STRCPY(head, path, sizeof(head)); leaf = _nc_basename(head); - if (leaf == 0) + if (leaf == NULL) leaf = head; *leaf = '\0'; if (head == leaf) @@ -143,6 +151,7 @@ _nc_access(const char *path, int mode) result = ACCESS(head, R_OK | W_OK | X_OK); } else { + errno = EPERM; result = -1; } } else { @@ -177,14 +186,25 @@ _nc_is_file_path(const char *path) return result; } +#if HAVE_GETEUID && HAVE_GETEGID +#define is_posix_elevated() \ + (getuid() != geteuid() \ + || getgid() != getegid()) +#else +#define is_posix_elevated() FALSE +#endif + #if HAVE_ISSETUGID #define is_elevated() issetugid() -#elif HAVE_GETEUID && HAVE_GETEGID +#elif USE_GETAUXVAL && defined(AT_SECURE) #define is_elevated() \ - (getuid() != geteuid() \ - || getgid() != getegid()) + (getauxval(AT_SECURE) \ + ? TRUE \ + : (errno != ENOENT \ + ? FALSE \ + : is_posix_elevated())) #else -#define is_elevated() FALSE +#define is_elevated() is_posix_elevated() #endif #if HAVE_SETFSUID @@ -203,26 +223,55 @@ _nc_is_file_path(const char *path) #define resume_elevation() /* nothing */ #endif -#ifndef USE_ROOT_ENVIRON /* - * Returns true if we allow application to use environment variables that are - * used for searching lists of directories, etc. + * Returns true if not running as root or setuid. We use this check to allow + * applications to use environment variables that are used for searching lists + * of directories, etc. */ NCURSES_EXPORT(int) _nc_env_access(void) { int result = TRUE; +#if HAVE_GETUID && HAVE_GETEUID +#if !defined(USE_SETUID_ENVIRON) if (is_elevated()) { result = FALSE; - } else if ((getuid() == ROOT_UID) || (geteuid() == ROOT_UID)) { + } +#endif +#if !defined(USE_ROOT_ENVIRON) + if ((getuid() == ROOT_UID) || (geteuid() == ROOT_UID)) { result = FALSE; } +#endif +#endif /* HAVE_GETUID && HAVE_GETEUID */ return result; } -#endif /* USE_ROOT_ENVIRON */ #ifndef USE_ROOT_ACCESS +static int +is_a_file(int fd) +{ + int result = FALSE; + if (fd >= 0) { + struct stat sb; + if (fstat(fd, &sb) == 0) { + switch (sb.st_mode & S_IFMT) { + case S_IFBLK: + case S_IFCHR: + case S_IFDIR: + /* disallow devices and directories */ + break; + default: + /* allow regular files, fifos and sockets */ + result = TRUE; + break; + } + } + } + return result; +} + /* * Limit privileges if possible; otherwise disallow access for updating files. */ @@ -239,6 +288,12 @@ _nc_safe_fopen(const char *path, const char *mode) result = fopen(path, mode); } #endif + if (result != NULL) { + if (!is_a_file(fileno(result))) { + fclose(result); + result = NULL; + } + } return result; } @@ -255,6 +310,12 @@ _nc_safe_open3(const char *path, int flags, mode_t mode) result = open(path, flags, mode); } #endif + if (result >= 0) { + if (!is_a_file(result)) { + close(result); + result = -1; + } + } return result; } -#endif /* USE_ROOT_ENVIRON */ +#endif /* USE_ROOT_ACCESS */ diff --git a/ncurses/tinfo/add_tries.c b/ncurses/tinfo/add_tries.c index d41f4883..ff41c103 100644 --- a/ncurses/tinfo/add_tries.c +++ b/ncurses/tinfo/add_tries.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2019,2020 Thomas E. Dickey * + * Copyright 2019-2023,2024 Thomas E. Dickey * * Copyright 1998-2009,2010 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -39,8 +39,9 @@ */ #include +#include -MODULE_ID("$Id: add_tries.c,v 1.12 2020/02/02 23:34:34 tom Exp $") +MODULE_ID("$Id: add_tries.c,v 1.14 2024/12/07 20:04:23 tom Exp $") #define SET_TRY(dst,src) if ((dst->ch = *src++) == 128) dst->ch = '\0' #define CMP_TRY(a,b) ((a)? (a == b) : (b == 128)) @@ -53,17 +54,17 @@ _nc_add_to_try(TRIES ** tree, const char *str, unsigned code) T((T_CALLED("_nc_add_to_try(%p, %s, %u)"), (void *) *tree, _nc_visbuf(str), code)); - if (txt == 0 || *txt == '\0' || code == 0) + if (!VALID_STRING(str) || *txt == '\0' || code == 0) returnCode(ERR); - if ((*tree) != 0) { + if ((*tree) != NULL) { ptr = savedptr = (*tree); for (;;) { unsigned char cmp = *txt; while (!CMP_TRY(ptr->ch, cmp) - && ptr->sibling != 0) + && ptr->sibling != NULL) ptr = ptr->sibling; if (CMP_TRY(ptr->ch, cmp)) { @@ -71,12 +72,12 @@ _nc_add_to_try(TRIES ** tree, const char *str, unsigned code) ptr->value = (unsigned short) code; returnCode(OK); } - if (ptr->child != 0) + if (ptr->child != NULL) ptr = ptr->child; else break; } else { - if ((ptr->sibling = typeCalloc(TRIES, 1)) == 0) { + if ((ptr->sibling = typeCalloc(TRIES, 1)) == NULL) { returnCode(ERR); } @@ -90,7 +91,7 @@ _nc_add_to_try(TRIES ** tree, const char *str, unsigned code) } else { /* (*tree) == 0 :: First sequence to be added */ savedptr = ptr = (*tree) = typeCalloc(TRIES, 1); - if (ptr == 0) { + if (ptr == NULL) { returnCode(ERR); } @@ -105,8 +106,8 @@ _nc_add_to_try(TRIES ** tree, const char *str, unsigned code) ptr = ptr->child; - if (ptr == 0) { - while ((ptr = savedptr) != 0) { + if (ptr == NULL) { + while ((ptr = savedptr) != NULL) { savedptr = ptr->child; free(ptr); } diff --git a/ncurses/tinfo/alloc_entry.c b/ncurses/tinfo/alloc_entry.c index d5148ca6..596ec9df 100644 --- a/ncurses/tinfo/alloc_entry.c +++ b/ncurses/tinfo/alloc_entry.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2021,2022 Thomas E. Dickey * + * Copyright 2018-2024,2025 Thomas E. Dickey * * Copyright 1998-2013,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -48,7 +48,7 @@ #include -MODULE_ID("$Id: alloc_entry.c,v 1.77 2022/10/15 19:37:33 tom Exp $") +MODULE_ID("$Id: alloc_entry.c,v 1.83 2025/02/16 17:57:12 tom Exp $") #define ABSENT_OFFSET -1 #define CANCELLED_OFFSET -2 @@ -104,7 +104,7 @@ _nc_copy_entry(ENTRY * oldp) NCURSES_EXPORT(char *) _nc_save_str(const char *string) { - char *result = 0; + char *result = NULL; size_t old_next_free = next_free; if (stringbuf != NULL) { @@ -140,7 +140,7 @@ _nc_wrap_entry(ENTRY * const ep, bool copy_strings) /* copy the string parts to allocated storage, preserving pointers to it */ { int offsets[MAX_ENTRY_SIZE / sizeof(short)]; - int useoffsets[MAX_USES]; + int useoffsets[HARD_MAX_USES]; unsigned i, n; unsigned nuses; TERMTYPE2 *tp; @@ -158,14 +158,13 @@ _nc_wrap_entry(ENTRY * const ep, bool copy_strings) /* copy term_names, Strings, uses */ tp->term_names = _nc_save_str(tp->term_names); for_each_string(i, tp) { - if (tp->Strings[i] != ABSENT_STRING && - tp->Strings[i] != CANCELLED_STRING) { + if (VALID_STRING(tp->Strings[i])) { tp->Strings[i] = _nc_save_str(tp->Strings[i]); } } for (i = 0; i < nuses; i++) { - if (ep->uses[i].name == 0) { + if (ep->uses[i].name == NULL) { ep->uses[i].name = _nc_save_str(ep->uses[i].name); } } @@ -188,14 +187,17 @@ _nc_wrap_entry(ENTRY * const ep, bool copy_strings) } for (i = 0; i < nuses; i++) { - if (ep->uses[i].name == 0) + if (ep->uses[i].name == NULL) useoffsets[i] = ABSENT_OFFSET; else useoffsets[i] = (int) (ep->uses[i].name - stringbuf); } TYPE_MALLOC(char, next_free, tp->str_table); - (void) memcpy(tp->str_table, stringbuf, next_free); + if (stringbuf == NULL) + (void) memset(tp->str_table, 0, next_free); + else + (void) memcpy(tp->str_table, stringbuf, next_free); tp->term_names = tp->str_table + n; for_each_string(i, &(ep->tterm)) { @@ -235,7 +237,7 @@ _nc_wrap_entry(ENTRY * const ep, bool copy_strings) for (i = 0; i < nuses; i++) { if (useoffsets[i] == ABSENT_OFFSET) { - ep->uses[i].name = 0; + ep->uses[i].name = NULL; } else { ep->uses[i].name = strdup(tp->str_table + useoffsets[i]); } @@ -251,12 +253,12 @@ _nc_merge_entry(ENTRY * const target, ENTRY * const source) TERMTYPE2 *from = &(source->tterm); #if NCURSES_XNAMES TERMTYPE2 copy; - size_t str_size; + size_t str_size, copy_size; char *str_table; #endif unsigned i; - if (source == 0 || from == 0 || target == 0 || to == 0) + if (source == NULL || from == NULL || target == NULL || to == NULL) return; #if NCURSES_XNAMES @@ -285,21 +287,27 @@ _nc_merge_entry(ENTRY * const target, ENTRY * const source) if ((str_table = malloc(str_size)) == NULL) _nc_err_abort(MSG_NO_MEMORY); str_copied = str_table; - strcpy(str_copied, to->term_names); + _nc_STRCPY(str_copied, to->term_names, str_size); to->term_names = str_copied; - str_copied += strlen(str_copied) + 1; + copy_size = strlen(str_copied) + 1; + str_copied += copy_size; + str_size -= copy_size; for_each_string(i, from) { if (VALID_STRING(from->Strings[i])) { - strcpy(str_copied, from->Strings[i]); + _nc_STRCPY(str_copied, from->Strings[i], str_size); from->Strings[i] = str_copied; - str_copied += strlen(str_copied) + 1; + copy_size = strlen(str_copied) + 1; + str_copied += copy_size; + str_size -= copy_size; } } for_each_string(i, to) { if (VALID_STRING(to->Strings[i])) { - strcpy(str_copied, to->Strings[i]); + _nc_STRCPY(str_copied, to->Strings[i], str_size); to->Strings[i] = str_copied; - str_copied += strlen(str_copied) + 1; + copy_size = strlen(str_copied) + 1; + str_copied += copy_size; + str_size -= copy_size; } } free(to->str_table); @@ -330,16 +338,20 @@ _nc_merge_entry(ENTRY * const target, ENTRY * const source) str_copied = str_table; for (i = 0; i < NUM_EXT_NAMES(from); ++i) { if (VALID_STRING(from->ext_Names[i])) { - strcpy(str_copied, from->ext_Names[i]); + _nc_STRCPY(str_copied, from->ext_Names[i], str_size); from->ext_Names[i] = str_copied; - str_copied += strlen(str_copied) + 1; + copy_size = strlen(str_copied) + 1; + str_copied += copy_size; + str_size -= copy_size; } } for (i = 0; i < NUM_EXT_NAMES(to); ++i) { if (VALID_STRING(to->ext_Names[i])) { - strcpy(str_copied, to->ext_Names[i]); + _nc_STRCPY(str_copied, to->ext_Names[i], str_size); to->ext_Names[i] = str_copied; - str_copied += strlen(str_copied) + 1; + copy_size = strlen(str_copied) + 1; + str_copied += copy_size; + str_size -= copy_size; } } free(to->ext_str_table); @@ -348,6 +360,8 @@ _nc_merge_entry(ENTRY * const target, ENTRY * const source) } #endif for_each_boolean(i, from) { + if (i >= NUM_BOOLEANS(to)) + break; if (to->Booleans[i] != (NCURSES_SBOOL) CANCELLED_BOOLEAN) { int mergebool = from->Booleans[i]; @@ -359,6 +373,8 @@ _nc_merge_entry(ENTRY * const target, ENTRY * const source) } for_each_number(i, from) { + if (i >= NUM_NUMBERS(to)) + break; if (to->Numbers[i] != CANCELLED_NUMERIC) { int mergenum = from->Numbers[i]; @@ -375,6 +391,8 @@ _nc_merge_entry(ENTRY * const target, ENTRY * const source) * we ever want to deallocate entries. */ for_each_string(i, from) { + if (i >= NUM_STRINGS(to)) + break; if (to->Strings[i] != CANCELLED_STRING) { char *mergestring = from->Strings[i]; diff --git a/ncurses/tinfo/alloc_ttype.c b/ncurses/tinfo/alloc_ttype.c index 6220c210..cb711f48 100644 --- a/ncurses/tinfo/alloc_ttype.c +++ b/ncurses/tinfo/alloc_ttype.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2021,2022 Thomas E. Dickey * + * Copyright 2018-2024,2025 Thomas E. Dickey * * Copyright 1999-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -43,7 +43,7 @@ #include -MODULE_ID("$Id: alloc_ttype.c,v 1.46 2022/09/17 21:44:35 tom Exp $") +MODULE_ID("$Id: alloc_ttype.c,v 1.55 2025/02/16 18:31:37 tom Exp $") #if NCURSES_XNAMES /* @@ -181,7 +181,7 @@ realign_data(TERMTYPE2 *to, char **ext_Names, * Returns the first index in ext_Names[] for the given token-type */ static unsigned -_nc_first_ext_name(TERMTYPE2 *tp, int token_type) +_nc_first_ext_name(const TERMTYPE2 *tp, int token_type) { unsigned first; @@ -206,7 +206,7 @@ _nc_first_ext_name(TERMTYPE2 *tp, int token_type) * Returns the last index in ext_Names[] for the given token-type */ static unsigned -_nc_last_ext_name(TERMTYPE2 *tp, int token_type) +_nc_last_ext_name(const TERMTYPE2 *tp, int token_type) { unsigned last; @@ -229,15 +229,17 @@ _nc_last_ext_name(TERMTYPE2 *tp, int token_type) * Lookup an entry from extended-names, returning -1 if not found */ static int -_nc_find_ext_name(TERMTYPE2 *tp, char *name, int token_type) +_nc_find_ext_name(const TERMTYPE2 *tp, const char *name, int token_type) { - unsigned j; - unsigned first = _nc_first_ext_name(tp, token_type); - unsigned last = _nc_last_ext_name(tp, token_type); + if (name != NULL) { + unsigned j; + unsigned first = _nc_first_ext_name(tp, token_type); + unsigned last = _nc_last_ext_name(tp, token_type); - for (j = first; j < last; j++) { - if (!strcmp(name, tp->ext_Names[j])) { - return (int) j; + for (j = first; j < last; j++) { + if (!strcmp(name, tp->ext_Names[j])) { + return (int) j; + } } } return -1; @@ -248,7 +250,7 @@ _nc_find_ext_name(TERMTYPE2 *tp, char *name, int token_type) * (e.g., Booleans[]). */ static int -_nc_ext_data_index(TERMTYPE2 *tp, int n, int token_type) +_nc_ext_data_index(const TERMTYPE2 *tp, int n, int token_type) { switch (token_type) { case BOOLEAN: @@ -271,7 +273,7 @@ _nc_ext_data_index(TERMTYPE2 *tp, int n, int token_type) * data. */ static bool -_nc_del_ext_name(TERMTYPE2 *tp, char *name, int token_type) +_nc_del_ext_name(TERMTYPE2 *tp, const char *name, int token_type) { int first; @@ -378,12 +380,15 @@ adjust_cancels(TERMTYPE2 *to, TERMTYPE2 *from) int j, k; DEBUG(3, (T_CALLED("adjust_cancels(%s), from(%s)"), - to ? NonNull(to->term_names) : "?", - from ? NonNull(from->term_names) : "?")); + NonNull(to->term_names), + NonNull(from->term_names))); for (j = first; j < last;) { - char *name = to->ext_Names[j]; + char *name; int j_str = to->num_Strings - first - to->ext_Strings; + if ((j + j_str) > NUM_STRINGS(to)) + break; + name = to->ext_Names[j]; if (to->Strings[j + j_str] == CANCELLED_STRING) { if (_nc_find_ext_name(from, to->ext_Names[j], BOOLEAN) >= 0) { if (_nc_del_ext_name(to, name, STRING) @@ -530,9 +535,10 @@ copy_termtype(TERMTYPE2 *dst, const TERMTYPE2 *src, int mode) unsigned i; int pass; char *new_table; + size_t new_table_size; #if NCURSES_EXT_NUMBERS - short *oldptr = 0; - int *newptr = 0; + short *oldptr = NULL; + int *newptr = NULL; #endif DEBUG(2, (T_CALLED("copy_termtype(dst=%p, src=%p, mode=%d)"), (void *) @@ -550,19 +556,24 @@ copy_termtype(TERMTYPE2 *dst, const TERMTYPE2 *src, int mode) NUM_STRINGS(dst) * sizeof(dst->Strings[0])); new_table = NULL; + new_table_size = 0; for (pass = 0; pass < 2; ++pass) { size_t str_size = 0; if (src->term_names != NULL) { if (pass) { dst->term_names = new_table + str_size; - strcpy(dst->term_names + str_size, src->term_names); + _nc_STRCPY(dst->term_names + str_size, + src->term_names, + new_table_size - str_size); } str_size += strlen(src->term_names) + 1; } for_each_string(i, src) { if (VALID_STRING(src->Strings[i])) { if (pass) { - strcpy(new_table + str_size, src->Strings[i]); + _nc_STRCPY(new_table + str_size, + src->Strings[i], + new_table_size - str_size); dst->Strings[i] = new_table + str_size; } str_size += strlen(src->Strings[i]) + 1; @@ -574,6 +585,7 @@ copy_termtype(TERMTYPE2 *dst, const TERMTYPE2 *src, int mode) ++str_size; if ((new_table = malloc(str_size)) == NULL) _nc_err_abort(MSG_NO_MEMORY); + new_table_size = str_size; } } @@ -587,7 +599,7 @@ copy_termtype(TERMTYPE2 *dst, const TERMTYPE2 *src, int mode) TYPE_MALLOC(int, NUM_NUMBERS(dst), newptr); dst->Numbers = newptr; } - if ((mode == srcINT) && (oldptr != 0)) { + if ((mode == srcINT) && (oldptr != NULL)) { DEBUG(2, ("...copy int ->short")); for (i = 0; i < NUM_NUMBERS(dst); ++i) { if (src->Numbers[i] > MAX_OF_TYPE(short)) { @@ -596,7 +608,7 @@ copy_termtype(TERMTYPE2 *dst, const TERMTYPE2 *src, int mode) oldptr[i] = (short) src->Numbers[i]; } } - } else if ((mode == dstINT) && (newptr != 0)) { + } else if ((mode == dstINT) && (newptr != NULL)) { DEBUG(2, ("...copy short ->int")); for (i = 0; i < NUM_NUMBERS(dst); ++i) { newptr[i] = ((const short *) (src->Numbers))[i]; @@ -626,6 +638,7 @@ copy_termtype(TERMTYPE2 *dst, const TERMTYPE2 *src, int mode) memcpy(dst->ext_Names, src->ext_Names, i * sizeof(char *)); new_table = NULL; + new_table_size = 0; for (pass = 0; pass < 2; ++pass) { size_t str_size = 0; char *raw_data = src->ext_str_table; @@ -634,7 +647,9 @@ copy_termtype(TERMTYPE2 *dst, const TERMTYPE2 *src, int mode) size_t skip = strlen(raw_data) + 1; if (skip != 1) { if (pass) { - strcpy(new_table + str_size, raw_data); + _nc_STRCPY(new_table + str_size, + raw_data, + new_table_size - str_size); } str_size += skip; raw_data += skip; @@ -644,7 +659,9 @@ copy_termtype(TERMTYPE2 *dst, const TERMTYPE2 *src, int mode) for (i = 0; i < NUM_EXT_NAMES(dst); ++i) { if (VALID_STRING(src->ext_Names[i])) { if (pass) { - strcpy(new_table + str_size, src->ext_Names[i]); + _nc_STRCPY(new_table + str_size, + src->ext_Names[i], + new_table_size - str_size); dst->ext_Names[i] = new_table + str_size; } str_size += strlen(src->ext_Names[i]) + 1; @@ -656,18 +673,17 @@ copy_termtype(TERMTYPE2 *dst, const TERMTYPE2 *src, int mode) ++str_size; if ((new_table = calloc(str_size, 1)) == NULL) _nc_err_abort(MSG_NO_MEMORY); + new_table_size = str_size; } } } else { - dst->ext_Names = 0; + dst->ext_Names = NULL; } #endif + (void) new_table_size; DEBUG(2, (T_RETURN(""))); } -/* - * This entrypoint is used by tack 1.07 - */ NCURSES_EXPORT(void) _nc_copy_termtype(TERMTYPE *dst, const TERMTYPE *src) { diff --git a/ncurses/tinfo/captoinfo.c b/ncurses/tinfo/captoinfo.c index 7e14731d..835b112d 100644 --- a/ncurses/tinfo/captoinfo.c +++ b/ncurses/tinfo/captoinfo.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2020,2021 Thomas E. Dickey * + * Copyright 2018-2024,2025 Thomas E. Dickey * * Copyright 1998-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -98,7 +98,7 @@ #include #include -MODULE_ID("$Id: captoinfo.c,v 1.102 2021/09/04 10:29:15 tom Exp $") +MODULE_ID("$Id: captoinfo.c,v 1.108 2025/02/20 00:48:11 tom Exp $") #if 0 #define DEBUG_THIS(p) DEBUG(9, p) @@ -124,7 +124,7 @@ static char * init_string(void) /* initialize 'my_string', 'my_length' */ { - if (my_string == 0) + if (my_string == NULL) TYPE_MALLOC(char, my_length = 256, my_string); *my_string = '\0'; @@ -138,7 +138,7 @@ save_string(char *d, const char *const s) size_t need = have + strlen(s) + 2; if (need > my_length) { my_string = (char *) _nc_doalloc(my_string, my_length = (need + need)); - if (my_string == 0) + if (my_string == NULL) _nc_err_abort(MSG_NO_MEMORY); d = my_string + have; } @@ -247,24 +247,24 @@ cvtchar(register const char *sp) } static void -getparm(int parm, int n) -/* push n copies of param on the terminfo stack if not already there */ +getparam(int parameter, int n) +/* push n copies of parameter on the terminfo stack if not already there */ { int nn; if (seenr) { - if (parm == 1) - parm = 2; - else if (parm == 2) - parm = 1; + if (parameter == 1) + parameter = 2; + else if (parameter == 2) + parameter = 1; } for (nn = 0; nn < n; ++nn) { dp = save_string(dp, "%p"); - dp = save_char(dp, '0' + parm); + dp = save_char(dp, '0' + parameter); } - if (onstack == parm) { + if (onstack == parameter) { if (n > 1) { _nc_warning("string may not be optimal"); dp = save_string(dp, "%Pa"); @@ -277,13 +277,13 @@ getparm(int parm, int n) if (onstack != 0) push(); - onstack = parm; + onstack = parameter; - if (seenn && parm < 3) { + if (seenn && parameter < 3) { dp = save_string(dp, "%{96}%^"); } - if (seenm && parm < 3) { + if (seenm && parameter < 3) { dp = save_string(dp, "%{127}%^"); } } @@ -313,8 +313,8 @@ _nc_captoinfo(const char *cap, const char *s, int const parameterized) dp = init_string(); /* skip the initial padding (if we haven't been told not to) */ - capstart = 0; - if (s == 0) + capstart = NULL; + if (s == NULL) s = ""; if (parameterized >= 0 && isdigit(UChar(*s))) for (capstart = s; *s != '\0'; s++) @@ -353,20 +353,20 @@ _nc_captoinfo(const char *cap, const char *s, int const parameterized) break; case '6': case 'B': - getparm(param, 1); + getparam(param, 1); dp = save_string(dp, "%{10}%/%{16}%*"); - getparm(param, 1); + getparam(param, 1); dp = save_string(dp, "%{10}%m%+"); break; case '8': case 'D': - getparm(param, 2); + getparam(param, 2); dp = save_string(dp, "%{2}%*%-"); break; case '>': /* %?%{x}%>%t%{y}%+%; */ if (s[0] && s[1]) { - getparm(param, 2); + getparam(param, 2); dp = save_string(dp, "%?"); s += cvtchar(s); dp = save_string(dp, "%>%t"); @@ -385,9 +385,9 @@ _nc_captoinfo(const char *cap, const char *s, int const parameterized) int l; l = 2; if (*s != '=') - getparm(param, 1); + getparam(param, 1); if (s[1] == 'p') { - getparm(param + s[2] - '@', 1); + getparam(param + s[2] - '@', 1); if (param != onstack) { pop(); param--; @@ -423,12 +423,12 @@ _nc_captoinfo(const char *cap, const char *s, int const parameterized) s += l; break; } - getparm(param, 1); + getparam(param, 1); s += cvtchar(s); dp = save_string(dp, "%+"); break; case '+': - getparm(param, 1); + getparam(param, 1); s += cvtchar(s); dp = save_string(dp, "%+%c"); pop(); @@ -436,22 +436,22 @@ _nc_captoinfo(const char *cap, const char *s, int const parameterized) case 's': #ifdef WATERLOO s += cvtchar(s); - getparm(param, 1); + getparam(param, 1); dp = save_string(dp, "%-"); #else - getparm(param, 1); + getparam(param, 1); dp = save_string(dp, "%s"); pop(); #endif /* WATERLOO */ break; case '-': s += cvtchar(s); - getparm(param, 1); + getparam(param, 1); dp = save_string(dp, "%-%c"); pop(); break; case '.': - getparm(param, 1); + getparam(param, 1); dp = save_string(dp, "%c"); pop(); break; @@ -467,18 +467,18 @@ _nc_captoinfo(const char *cap, const char *s, int const parameterized) goto invalid; case '2': see02: - getparm(param, 1); + getparam(param, 1); dp = save_string(dp, "%2d"); pop(); break; case '3': see03: - getparm(param, 1); + getparam(param, 1); dp = save_string(dp, "%3d"); pop(); break; case 'd': - getparm(param, 1); + getparam(param, 1); dp = save_string(dp, "%d"); pop(); break; @@ -535,8 +535,7 @@ _nc_captoinfo(const char *cap, const char *s, int const parameterized) static int bcd_expression(const char *str) { - /* leave this non-const for HPUX */ - static char fmt[] = "%%p%c%%{10}%%/%%{16}%%*%%p%c%%{10}%%m%%+"; + static const char fmt[] = "%%p%c%%{10}%%/%%{16}%%*%%p%c%%{10}%%m%%+"; int len = 0; char ch1, ch2; @@ -620,7 +619,7 @@ _nc_infotocap(const char *cap GCC_UNUSED, const char *str, int const parameteriz { int seenone = 0, seentwo = 0, saw_m = 0, saw_n = 0; const char *padding; - const char *trimmed = 0; + const char *trimmed = NULL; int in0, in1, in2; char ch1 = 0, ch2 = 0; char *bufptr = init_string(); @@ -656,9 +655,9 @@ _nc_infotocap(const char *cap GCC_UNUSED, const char *str, int const parameteriz for (; !syntax_error && *str && - ((trimmed == 0) || (str < trimmed)); str++) { + ((trimmed == NULL) || (str < trimmed)); str++) { int c1, c2; - char *cp = 0; + char *cp = NULL; if (str[0] == '^') { if (str[1] == '\0' || (str + 1) == trimmed) { @@ -744,7 +743,7 @@ _nc_infotocap(const char *cap GCC_UNUSED, const char *str, int const parameteriz ++myfix; } } - } else if (strchr("E\\nrtbf", xx1) == 0) { + } else if (strchr("E\\nrtbf", xx1) == NULL) { switch (xx1) { case 'e': xx1 = 'E'; @@ -815,7 +814,7 @@ _nc_infotocap(const char *cap GCC_UNUSED, const char *str, int const parameteriz && ((in0 == 4 && in1 == 10 && in2 == 48) || (in0 == 3 && in1 == 9 && in2 == 38))) { /* dumb-down an optimized case from xterm-256color for termcap */ - if ((str = strstr(str, ";m")) == 0) + if ((str = strstr(str, ";m")) == NULL) break; /* cannot happen */ ++str; if (in2 == 48) { @@ -981,8 +980,8 @@ _nc_infotocap(const char *cap GCC_UNUSED, const char *str, int const parameteriz * 'str' always points to the end of what was scanned in this step, * but that may not be the end of the string. */ - assert(str != 0); - if (str == 0 || *str == '\0') + assert(str != NULL); + if (str == NULL || *str == '\0') break; } /* endwhile (*str) */ @@ -1029,7 +1028,7 @@ main(int argc, char *argv[]) char buf[BUFSIZ]; ++curr_line; - if (fgets(buf, sizeof(buf), stdin) == 0) + if (fgets(buf, sizeof(buf), stdin) == NULL) break; buf[strlen(buf) - 1] = '\0'; _nc_set_source(buf); @@ -1051,7 +1050,7 @@ main(int argc, char *argv[]) NCURSES_EXPORT(void) _nc_captoinfo_leaks(void) { - if (my_string != 0) { + if (my_string != NULL) { FreeAndNull(my_string); } my_length = 0; diff --git a/ncurses/tinfo/comp_error.c b/ncurses/tinfo/comp_error.c index 48f48784..d49164e6 100644 --- a/ncurses/tinfo/comp_error.c +++ b/ncurses/tinfo/comp_error.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2019,2020 Thomas E. Dickey * + * Copyright 2019-2023,2024 Thomas E. Dickey * * Copyright 1998-2012,2016 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -42,7 +42,7 @@ #include -MODULE_ID("$Id: comp_error.c,v 1.40 2020/02/02 23:34:34 tom Exp $") +MODULE_ID("$Id: comp_error.c,v 1.45 2024/12/07 20:04:23 tom Exp $") NCURSES_EXPORT_VAR(bool) _nc_suppress_warnings = FALSE; NCURSES_EXPORT_VAR(int) _nc_curr_line = 0; /* current line # in input */ @@ -60,17 +60,24 @@ _nc_get_source(void) NCURSES_EXPORT(void) _nc_set_source(const char *const name) { - FreeIfNeeded(SourceName); - SourceName = strdup(name); + if (name == NULL) { + free(SourceName); + SourceName = NULL; + } else if (SourceName == NULL) { + SourceName = strdup(name); + } else if (strcmp(name, SourceName)) { + free(SourceName); + SourceName = strdup(name); + } } NCURSES_EXPORT(void) _nc_set_type(const char *const name) { #define MY_SIZE (size_t) MAX_NAME_SIZE - if (TermType == 0) + if (TermType == NULL) TermType = typeMalloc(char, MY_SIZE + 1); - if (TermType != 0) { + if (TermType != NULL) { TermType[0] = '\0'; if (name) { _nc_STRNCAT(TermType, name, MY_SIZE, MY_SIZE); @@ -82,24 +89,24 @@ NCURSES_EXPORT(void) _nc_get_type(char *name) { #if NO_LEAKS - if (name == 0 && TermType != 0) { + if (name == NULL && TermType != NULL) { FreeAndNull(TermType); return; } #endif - if (name != 0) - _nc_STRCPY(name, TermType != 0 ? TermType : "", MAX_NAME_SIZE); + if (name != NULL) + _nc_STRCPY(name, TermType != NULL ? TermType : "", MAX_NAME_SIZE); } static NCURSES_INLINE void where_is_problem(void) { fprintf(stderr, "\"%s\"", SourceName ? SourceName : "?"); - if (_nc_curr_line >= 0) + if (_nc_curr_line > 0) fprintf(stderr, ", line %d", _nc_curr_line); - if (_nc_curr_col >= 0) + if (_nc_curr_col > 0) fprintf(stderr, ", col %d", _nc_curr_col); - if (TermType != 0 && TermType[0] != '\0') + if (TermType != NULL && TermType[0] != '\0') fprintf(stderr, ", terminal '%s'", TermType); fputc(':', stderr); fputc(' ', stderr); @@ -148,9 +155,7 @@ _nc_syserr_abort(const char *const fmt, ...) /* If we're debugging, try to show where the problem occurred - this * will dump core. */ -#ifndef USE_ROOT_ENVIRON - if (getuid() != ROOT_UID) -#endif + if (_nc_env_access()) abort(); #endif /* Dumping core in production code is not a good idea. diff --git a/ncurses/tinfo/comp_expand.c b/ncurses/tinfo/comp_expand.c index 724283ce..5ea100e6 100644 --- a/ncurses/tinfo/comp_expand.c +++ b/ncurses/tinfo/comp_expand.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020,2021 Thomas E. Dickey * + * Copyright 2020-2023,2024 Thomas E. Dickey * * Copyright 1998-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -36,7 +36,7 @@ #include #include -MODULE_ID("$Id: comp_expand.c,v 1.34 2021/09/04 10:29:15 tom Exp $") +MODULE_ID("$Id: comp_expand.c,v 1.37 2024/12/07 21:12:53 tom Exp $") #if 0 #define DEBUG_THIS(p) DEBUG(9, p) @@ -73,18 +73,18 @@ _nc_tic_expand(const char *srcp, bool tic_format, int numbers) int offset; } fixups[MAX_TC_FIXUPS]; - if (srcp == 0) { + if (srcp == NULL) { #if NO_LEAKS - if (buffer != 0) { + if (buffer != NULL) { FreeAndNull(buffer); length = 0; } #endif - return 0; + return NULL; } - if (buffer == 0 || need > length) { - if ((buffer = typeRealloc(char, length = need, buffer)) == 0) - return 0; + if (buffer == NULL || need > length) { + if ((buffer = typeRealloc(char, length = need, buffer)) == NULL) + return NULL; } DEBUG_THIS(("_nc_tic_expand %s:%s:%s", @@ -124,13 +124,12 @@ _nc_tic_expand(const char *srcp, bool tic_format, int numbers) case 1: if (str[0] == L_BRACE && isdigit(UChar(str[1]))) { - char *dst = 0; + char *dst = NULL; long value = strtol(str + 1, &dst, 0); - if (dst != 0 + if (dst != NULL && *dst == R_BRACE && value < 127 - && value != '\\' /* FIXME */ - && isprint((int) value)) { + && isprint(UChar(value))) { ch = (int) value; buffer[bufp++] = S_QUOTE; if (ch == '\\' diff --git a/ncurses/tinfo/comp_hash.c b/ncurses/tinfo/comp_hash.c index 80755f22..4554b923 100644 --- a/ncurses/tinfo/comp_hash.c +++ b/ncurses/tinfo/comp_hash.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2019,2020 Thomas E. Dickey * + * Copyright 2019-2023,2024 Thomas E. Dickey * * Copyright 1998-2008,2009 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -45,13 +45,12 @@ #include #include -MODULE_ID("$Id: comp_hash.c,v 1.53 2020/02/02 23:34:34 tom Exp $") +MODULE_ID("$Id: comp_hash.c,v 1.56 2024/12/07 20:05:08 tom Exp $") /* * Finds the entry for the given string in the hash table if present. * Returns a pointer to the entry in the table or 0 if not found. */ -/* entrypoint used by tack 1.07 */ NCURSES_EXPORT(struct name_table_entry const *) _nc_find_entry(const char *string, const HashValue * hash_table) @@ -59,7 +58,7 @@ _nc_find_entry(const char *string, bool termcap = (hash_table != _nc_get_hash_table(FALSE)); const HashData *data = _nc_get_hash_info(termcap); int hashvalue; - struct name_table_entry const *ptr = 0; + struct name_table_entry const *ptr = NULL; struct name_table_entry const *real_table; hashvalue = data->hash_of(string); @@ -72,7 +71,7 @@ _nc_find_entry(const char *string, ptr = real_table + data->table_data[hashvalue]; while (!data->compare_names(ptr->nte_name, string)) { if (ptr->nte_link < 0) { - ptr = 0; + ptr = NULL; break; } ptr = real_table + (ptr->nte_link @@ -104,14 +103,16 @@ _nc_find_type_entry(const char *string, && data->table_data[hashvalue] >= 0) { const struct name_table_entry *const table = _nc_get_table(termcap); - ptr = table + data->table_data[hashvalue]; - while (ptr->nte_type != type - || !data->compare_names(ptr->nte_name, string)) { - if (ptr->nte_link < 0) { - ptr = 0; - break; + if (table != NULL) { + ptr = table + data->table_data[hashvalue]; + while (ptr->nte_type != type + || !data->compare_names(ptr->nte_name, string)) { + if (ptr->nte_link < 0) { + ptr = NULL; + break; + } + ptr = table + (ptr->nte_link + data->table_data[data->table_size]); } - ptr = table + (ptr->nte_link + data->table_data[data->table_size]); } } @@ -124,7 +125,7 @@ _nc_find_user_entry(const char *string) { const HashData *data = _nc_get_hash_user(); int hashvalue; - struct user_table_entry const *ptr = 0; + struct user_table_entry const *ptr = NULL; struct user_table_entry const *real_table; hashvalue = data->hash_of(string); @@ -137,7 +138,7 @@ _nc_find_user_entry(const char *string) ptr = real_table + data->table_data[hashvalue]; while (!data->compare_names(ptr->ute_name, string)) { if (ptr->ute_link < 0) { - ptr = 0; + ptr = NULL; break; } ptr = real_table + (ptr->ute_link diff --git a/ncurses/tinfo/comp_parse.c b/ncurses/tinfo/comp_parse.c index 53bdf8b0..13af6e3c 100644 --- a/ncurses/tinfo/comp_parse.c +++ b/ncurses/tinfo/comp_parse.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2021,2022 Thomas E. Dickey * + * Copyright 2018-2024,2025 Thomas E. Dickey * * Copyright 1998-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -48,7 +48,7 @@ #include -MODULE_ID("$Id: comp_parse.c,v 1.131 2022/10/23 13:15:58 tom Exp $") +MODULE_ID("$Id: comp_parse.c,v 1.138 2025/01/12 00:36:01 tom Exp $") static void sanity_check2(TERMTYPE2 *, bool); NCURSES_IMPEXP void (NCURSES_API *_nc_check_termtype2) (TERMTYPE2 *, bool) = sanity_check2; @@ -64,13 +64,13 @@ enqueue(ENTRY * ep) DEBUG(2, (T_CALLED("enqueue(ep=%p)"), (void *) ep)); newp = _nc_copy_entry(ep); - if (newp == 0) + if (newp == NULL) _nc_err_abort(MSG_NO_MEMORY); newp->last = _nc_tail; _nc_tail = newp; - newp->next = 0; + newp->next = NULL; if (newp->last) newp->last->next = newp; DEBUG(2, (T_RETURN(""))); @@ -81,7 +81,7 @@ enqueue(ENTRY * ep) static char * force_bar(char *dst, char *src) { - if (strchr(src, '|') == 0) { + if (strchr(src, '|') == NULL) { size_t len = strlen(src); if (len > MAX_NAME_SIZE) len = MAX_NAME_SIZE; @@ -91,7 +91,7 @@ force_bar(char *dst, char *src) } return src; } -#define ForceBar(dst, src) ((strchr(src, '|') == 0) ? force_bar(dst, src) : src) +#define ForceBar(dst, src) ((strchr(src, '|') == NULL) ? force_bar(dst, src) : src) #if NCURSES_USE_TERMCAP && NCURSES_XNAMES static char * @@ -99,7 +99,7 @@ skip_index(char *name) { char *bar = strchr(name, '|'); - if (bar != 0 && (bar - name) == 2) + if (bar != NULL && (bar - name) == 2) name = bar + 1; return name; @@ -109,7 +109,9 @@ skip_index(char *name) static bool check_collisions(char *n1, char *n2, int counter) { - char *pstart, *qstart, *pend, *qend; + const char *pstart; + const char *qstart; + char *pend, *qend; char nc1[NAMEBUFFER_SIZE]; char nc2[NAMEBUFFER_SIZE]; @@ -150,7 +152,7 @@ static char * name_ending(char *name) { if (*name == '\0') { - name = 0; + name = NULL; } else { while (*name != '\0' && *name != '|') ++name; @@ -225,7 +227,7 @@ _nc_read_entry_source(FILE *fp, char *buf, (T_CALLED("_nc_read_entry_source(" "file=%p, buf=%p, literal=%d, silent=%d, hook=%#" PRIxPTR ")"), - (void *) fp, buf, literal, silent, (intptr_t) hook)); + (void *) fp, buf, literal, silent, CASTxPTR(hook))); if (silent) _nc_suppress_warnings = TRUE; /* shut the lexer up, too */ @@ -264,8 +266,9 @@ _nc_read_entry_source(FILE *fp, char *buf, if (_nc_tail) { /* set up the head pointer */ - for (_nc_head = _nc_tail; _nc_head->last; _nc_head = _nc_head->last) - continue; + for (_nc_head = _nc_tail; _nc_head->last; _nc_head = _nc_head->last) { + /* EMPTY */ ; + } DEBUG(2, ("head = %s", _nc_head->tterm.term_names)); DEBUG(2, ("tail = %s", _nc_tail->tterm.term_names)); @@ -400,10 +403,10 @@ NCURSES_EXPORT(int) _nc_resolve_uses2(bool fullresolve, bool literal) /* try to resolve all use capabilities */ { - ENTRY *qp, *rp, *lastread = 0; + ENTRY *qp, *rp, *lastread = NULL; bool keepgoing; unsigned i, j; - int unresolved, total_unresolved, multiples; + int total_unresolved, multiples; DEBUG(2, (T_CALLED("_nc_resolve_uses2"))); @@ -443,14 +446,13 @@ _nc_resolve_uses2(bool fullresolve, bool literal) total_unresolved = 0; _nc_curr_col = -1; for_entry_list(qp) { - unresolved = 0; for (i = 0; i < qp->nuses; i++) { bool foundit; char *child = _nc_first_name(qp->tterm.term_names); char *lookfor = qp->uses[i].name; long lookline = qp->uses[i].line; - if (lookfor == 0) + if (lookfor == NULL) continue; foundit = FALSE; @@ -512,12 +514,11 @@ _nc_resolve_uses2(bool fullresolve, bool literal) /* no good, mark this one unresolvable and complain */ if (!foundit) { - unresolved++; total_unresolved++; _nc_curr_line = (int) lookline; _nc_warning("resolution of use=%s failed", lookfor); - qp->uses[i].link = 0; + qp->uses[i].link = NULL; } } } @@ -537,12 +538,18 @@ _nc_resolve_uses2(bool fullresolve, bool literal) */ if (fullresolve) { do { + bool attempts; + bool progress; ENTRY merged; + attempts = FALSE; + progress = FALSE; keepgoing = FALSE; for_entry_list(qp) { if (qp->nuses > 0) { + attempts = TRUE; + DEBUG(2, ("%s: attempting merge of %d entries", _nc_first_name(qp->tterm.term_names), qp->nuses)); @@ -598,16 +605,33 @@ _nc_resolve_uses2(bool fullresolve, bool literal) #endif qp->tterm = merged.tterm; _nc_wrap_entry(qp, TRUE); + progress = TRUE; /* - * We know every entry is resolvable because name resolution - * didn't bomb. So go back for another pass. + * Every entry should be resolvable because name resolution + * did not fail. Continue if we have just made a change, + * or another entry may be changeable. */ /* FALLTHRU */ incomplete: keepgoing = TRUE; } } + + /* + * If we went all the way through the list without making any + * changes, while there were remaining use-linkages, something went + * wrong. Give up. + */ + if (!progress && attempts) { + for_entry_list(qp) { + for (i = 0; i < qp->nuses; ++i) { + _nc_warning("problem with use=%s", qp->uses[i].name); + } + } + _nc_warning("merge failed, infinite loop"); + return FALSE; + } } while (keepgoing); @@ -757,7 +781,7 @@ _nc_leaks_tic(void) _nc_names_leaks(); _nc_codes_leaks(); #endif - _nc_tic_expand(0, FALSE, 0); + _nc_tic_expand(NULL, FALSE, 0); T((T_RETURN(""))); } diff --git a/ncurses/tinfo/comp_scan.c b/ncurses/tinfo/comp_scan.c index 71361c50..0cfa9694 100644 --- a/ncurses/tinfo/comp_scan.c +++ b/ncurses/tinfo/comp_scan.c @@ -1,5 +1,5 @@ /**************************************************************************** -,* Copyright 2020-2021,2022 Thomas E. Dickey * +,* Copyright 2020-2023,2024 Thomas E. Dickey * * Copyright 1998-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -51,7 +51,7 @@ #include #include -MODULE_ID("$Id: comp_scan.c,v 1.119 2022/08/07 00:20:26 tom Exp $") +MODULE_ID("$Id: comp_scan.c,v 1.125 2024/12/07 21:17:54 tom Exp $") /* * Maximum length of string capability we'll accept before raising an error. @@ -61,7 +61,7 @@ MODULE_ID("$Id: comp_scan.c,v 1.119 2022/08/07 00:20:26 tom Exp $") #define iswhite(ch) (ch == ' ' || ch == '\t') -NCURSES_EXPORT_VAR (int) _nc_syntax = 0; /* termcap or terminfo? */ +NCURSES_EXPORT_VAR (int) _nc_syntax = SYN_TERMINFO; /* termcap or terminfo? */ NCURSES_EXPORT_VAR (int) _nc_strict_bsd = 1; /* ncurses extended termcap? */ NCURSES_EXPORT_VAR (long) _nc_curr_file_pos = 0; /* file offset of current line */ NCURSES_EXPORT_VAR (long) _nc_comment_start = 0; /* start of comment range before name */ @@ -70,7 +70,7 @@ NCURSES_EXPORT_VAR (long) _nc_start_line = 0; /* start line of current entry NCURSES_EXPORT_VAR (struct token) _nc_curr_token = { - 0, 0, 0 + NULL, 0, NULL }; /***************************************************************************** @@ -116,12 +116,12 @@ _nc_reset_input(FILE *fp, char *buf) (T_CALLED("_nc_reset_input(fp=%p, buf=%p)"), (void *) fp, buf)); pushtype = NO_PUSHBACK; - if (pushname != 0) + if (pushname != NULL) pushname[0] = '\0'; yyin = fp; bufstart = bufptr = buf; _nc_curr_file_pos = 0L; - if (fp != 0) + if (fp != NULL) _nc_curr_line = 0; _nc_curr_col = 0; @@ -197,18 +197,18 @@ next_char(void) int the_char; if (!yyin) { - if (result != 0) { + if (result != NULL) { FreeAndNull(result); FreeAndNull(pushname); - bufptr = 0; - bufstart = 0; + bufptr = NULL; + bufstart = NULL; allocated = 0; } /* * An string with an embedded null will truncate the input. This is * intentional (we don't read binary files here). */ - if (bufptr == 0 || *bufptr == '\0') + if (bufptr == NULL || *bufptr == '\0') return (EOF); if (*bufptr == '\n') { _nc_curr_line++; @@ -227,12 +227,12 @@ next_char(void) do { size_t used = 0; - bufstart = 0; + bufstart = NULL; do { if (used + (LEXBUFSIZ / 4) >= allocated) { allocated += (allocated + LEXBUFSIZ); result = typeRealloc(char, allocated, result); - if (result == 0) + if (result == NULL) return (EOF); if (bufstart) bufstart = result; @@ -254,7 +254,7 @@ next_char(void) if (used != 0) _nc_STRCAT(result, "\n", allocated); } - if ((bufptr = bufstart) != 0) { + if ((bufptr = bufstart) != NULL) { used = strlen(bufptr); if (used == 0) return (EOF); @@ -302,7 +302,7 @@ push_back(int c) /* push a character back onto the input stream */ { if (bufptr == bufstart) - _nc_syserr_abort("Can't backspace off beginning of line"); + _nc_syserr_abort("cannot backspace off beginning of line"); *--bufptr = (char) c; _nc_curr_col--; } @@ -311,7 +311,7 @@ static long stream_pos(void) /* return our current character position in the input stream */ { - return (yyin ? ftell(yyin) : (bufptr ? bufptr - bufstart : 0)); + return (yyin ? ftell(yyin) : (bufptr ? (long) (bufptr - bufstart) : 0)); } static bool @@ -328,9 +328,11 @@ end_of_stream(void) static NCURSES_INLINE int eat_escaped_newline(int ch) { - if (ch == '\\') - while ((ch = next_char()) == '\n' || iswhite(ch)) - continue; + if (ch == '\\') { + while ((ch = next_char()) == '\n' || iswhite(ch)) { + /* EMPTY */ ; + } + } return ch; } @@ -405,12 +407,12 @@ _nc_get_token(bool silent) if (pushtype != NO_PUSHBACK) { int retval = pushtype; - _nc_set_type(pushname != 0 ? pushname : ""); + _nc_set_type(pushname != NULL ? pushname : ""); DEBUG(3, ("pushed-back token: `%s', class %d", _nc_curr_token.tk_name, pushtype)); pushtype = NO_PUSHBACK; - if (pushname != 0) + if (pushname != NULL) pushname[0] = '\0'; /* currtok wasn't altered by _nc_push_token() */ @@ -419,11 +421,11 @@ _nc_get_token(bool silent) } if (end_of_stream()) { - yyin = 0; + yyin = NULL; (void) next_char(); /* frees its allocated memory */ - if (tok_buf != 0) { + if (tok_buf != NULL) { if (_nc_curr_token.tk_name == tok_buf) - _nc_curr_token.tk_name = 0; + _nc_curr_token.tk_name = NULL; } DEBUG(3, (T_RETURN("%d"), EOF)); return (EOF); @@ -434,11 +436,10 @@ _nc_get_token(bool silent) while ((ch = next_char()) == '\n' || iswhite(ch)) { if (ch == '\n') had_newline = TRUE; - continue; } ch = eat_escaped_newline(ch); - _nc_curr_token.tk_valstring = 0; + _nc_curr_token.tk_valstring = NULL; #ifdef TRACE old_line = _nc_curr_line; @@ -459,8 +460,9 @@ _nc_get_token(bool silent) dot_flag = TRUE; DEBUG(8, ("dot-flag set")); - while ((ch = next_char()) == '.' || iswhite(ch)) - continue; + while ((ch = next_char()) == '.' || iswhite(ch)) { + /* EMPTY */ ; + } } if (ch == EOF) { @@ -473,7 +475,7 @@ _nc_get_token(bool silent) #if NCURSES_EXT_FUNCS && !(ch == '.' && _nc_disable_period) #endif - && ((strchr) (terminfo_punct, (char) ch) == 0)) { + && ((strchr) (terminfo_punct, (char) ch) == NULL)) { if (!silent) _nc_warning("Illegal character (expected alphanumeric or %s) - '%s'", terminfo_punct, unctrl(UChar(ch))); @@ -481,7 +483,7 @@ _nc_get_token(bool silent) goto start_token; } - if (tok_buf == 0) + if (tok_buf == NULL) tok_buf = typeMalloc(char, TOK_BUF_SIZE); #ifdef TRACE @@ -497,14 +499,14 @@ _nc_get_token(bool silent) _nc_start_line = _nc_curr_line; _nc_syntax = ERR; - after_name = 0; - after_list = 0; + after_name = NULL; + after_list = NULL; while ((ch = next_char()) != '\n') { if (ch == EOF) { _nc_err_abort(MSG_NO_INPUTS); } else if (ch == '|') { after_list = tok_ptr; - if (after_name == 0) + if (after_name == NULL) after_name = tok_ptr; } else if (ch == ':' && last_char(0) != ',') { _nc_syntax = SYN_TERMCAP; @@ -517,7 +519,7 @@ _nc_get_token(bool silent) * If we did not see a '|', then we found a name with no * aliases or description. */ - if (after_name == 0) + if (after_name == NULL) break; /* * We saw a comma, but are not entirely sure this is @@ -549,7 +551,7 @@ _nc_get_token(bool silent) ; } if (islower(UChar(*s))) { - char *name = s; + const char *name = s; while (isalnum(UChar(*s))) { ++s; } @@ -601,8 +603,9 @@ _nc_get_token(bool silent) /* throw away trailing /, *$/ */ for (--tok_ptr; iswhite(*tok_ptr) || *tok_ptr == ','; - tok_ptr--) - continue; + tok_ptr--) { + /* EMPTY */ ; + } tok_ptr[1] = '\0'; } @@ -611,7 +614,7 @@ _nc_get_token(bool silent) * for following warning messages. If there's no '|', then there * is no description. */ - if (after_name != 0) { + if (after_name != NULL) { ch = *after_name; *after_name = '\0'; _nc_set_type(tok_buf); @@ -622,11 +625,11 @@ _nc_get_token(bool silent) * Compute the boundary between the aliases and the description * field for syntax-checking purposes. */ - if (after_list != 0) { + if (after_list != NULL) { if (!silent) { if (*after_list == '\0' || strchr("|", after_list[1]) != NULL) { _nc_warning("empty longname field"); - } else if (strchr(after_list, ' ') == 0) { + } else if (strchr(after_list, ' ') == NULL) { _nc_warning("older tic versions may treat the description field as an alias"); } } @@ -802,7 +805,7 @@ _nc_get_token(bool silent) type = _nc_get_token(silent); DEBUG(3, ("token: `%s', class %d", - ((_nc_curr_token.tk_name != 0) + ((_nc_curr_token.tk_name != NULL) ? _nc_curr_token.tk_name : ""), type)); @@ -831,7 +834,7 @@ _nc_get_token(bool silent) */ NCURSES_EXPORT(int) -_nc_trans_string(char *ptr, char *last) +_nc_trans_string(char *ptr, const char *const last) { int count = 0; int number = 0; @@ -1020,12 +1023,12 @@ _nc_push_token(int tokclass) * _nc_get_token() touches. */ pushtype = tokclass; - if (pushname == 0) + if (pushname == NULL) pushname = typeMalloc(char, MAX_NAME_SIZE + 1); _nc_get_type(pushname); DEBUG(3, ("pushing token: `%s', class %d", - ((_nc_curr_token.tk_name != 0) + ((_nc_curr_token.tk_name != NULL) ? _nc_curr_token.tk_name : ""), pushtype)); @@ -1050,10 +1053,10 @@ _nc_panic_mode(char ch) NCURSES_EXPORT(void) _nc_comp_scan_leaks(void) { - if (pushname != 0) { + if (pushname != NULL) { FreeAndNull(pushname); } - if (tok_buf != 0) { + if (tok_buf != NULL) { FreeAndNull(tok_buf); } } diff --git a/ncurses/tinfo/db_iterator.c b/ncurses/tinfo/db_iterator.c index e69e0f34..b428bbd0 100644 --- a/ncurses/tinfo/db_iterator.c +++ b/ncurses/tinfo/db_iterator.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2020,2022 Thomas E. Dickey * + * Copyright 2018-2024,2025 Thomas E. Dickey * * Copyright 2006-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -44,7 +44,7 @@ #include #endif -MODULE_ID("$Id: db_iterator.c,v 1.49 2022/04/23 20:03:15 tom Exp $") +MODULE_ID("$Id: db_iterator.c,v 1.53 2025/01/12 00:41:56 tom Exp $") #define HaveTicDirectory _nc_globals.have_tic_directory #define KeepTicDirectory _nc_globals.keep_tic_directory @@ -124,15 +124,15 @@ update_getenv(const char *name, DBDIRS which) if (which < dbdLAST) { char *value; - char *cached_value = my_vars[which].value; + const char *cached_value = my_vars[which].value; bool same_value; - if ((value = getenv(name)) != 0) { + if ((value = getenv(name)) != NULL) { value = strdup(value); } - same_value = ((value == 0 && cached_value == 0) || - (value != 0 && - cached_value != 0 && + same_value = ((value == NULL && cached_value == NULL) || + (value != NULL && + cached_value != NULL && strcmp(value, cached_value) == 0)); /* Set variable name to enable checks in cache_expired(). */ @@ -153,7 +153,7 @@ update_getenv(const char *name, DBDIRS which) static char * cache_getenv(const char *name, DBDIRS which) { - char *result = 0; + char *result = NULL; (void) update_getenv(name, which); if (which < dbdLAST) { @@ -185,7 +185,7 @@ cache_expired(void) } else { DBDIRS n; for (n = (DBDIRS) 0; n < dbdLAST; ++n) { - if (my_vars[n].name != 0 + if (my_vars[n].name != NULL && update_getenv(my_vars[n].name, n)) { result = TRUE; break; @@ -225,7 +225,7 @@ _nc_tic_dir(const char *path) } else if (HaveTicDirectory == 0) { if (use_terminfo_vars()) { const char *envp; - if ((envp = getenv("TERMINFO")) != 0) + if ((envp = getenv("TERMINFO")) != NULL) return _nc_tic_dir(envp); } } @@ -251,7 +251,7 @@ _nc_keep_tic_dir(const char *path) NCURSES_EXPORT(void) _nc_last_db(void) { - if (my_blob != 0 && cache_expired()) { + if (my_blob != NULL && cache_expired()) { free_cache(); } } @@ -268,14 +268,14 @@ _nc_next_db(DBDIRS * state, int *offset) (void) offset; if ((int) *state < my_size - && my_list != 0 - && my_list[*state] != 0) { + && my_list != NULL + && my_list[*state] != NULL) { result = my_list[*state]; (*state)++; } else { - result = 0; + result = NULL; } - if (result != 0) { + if (result != NULL) { T(("_nc_next_db %d %s", *state, result)); } return result; @@ -293,7 +293,7 @@ _nc_first_db(DBDIRS * state, int *offset) /* build a blob containing all of the strings we will use for a lookup * table. */ - if (my_blob == 0 || (cache_has_expired = cache_expired())) { + if (my_blob == NULL || (cache_has_expired = cache_expired())) { size_t blobsize = 0; const char *values[dbdLAST]; struct stat *my_stat; @@ -303,7 +303,7 @@ _nc_first_db(DBDIRS * state, int *offset) free_cache(); for (j = 0; j < dbdLAST; ++j) - values[j] = 0; + values[j] = NULL; /* * This is the first item in the list, and is used only when tic is @@ -335,22 +335,22 @@ _nc_first_db(DBDIRS * state, int *offset) #if NCURSES_USE_TERMCAP values[dbdEnvOnce2] = cache_getenv("TERMCAP", dbdEnvOnce2); /* only use $TERMCAP if it is an absolute path */ - if (values[dbdEnvOnce2] != 0 + if (values[dbdEnvOnce2] != NULL && *values[dbdEnvOnce2] != '/') { - values[dbdEnvOnce2] = 0; + values[dbdEnvOnce2] = NULL; } values[dbdEnvList2] = cache_getenv("TERMPATH", dbdEnvList2); #endif /* NCURSES_USE_TERMCAP */ } for (j = 0; j < dbdLAST; ++j) { - if (values[j] == 0) + if (values[j] == NULL) values[j] = ""; blobsize += 2 + strlen(values[j]); } my_blob = malloc(blobsize); - if (my_blob != 0) { + if (my_blob != NULL) { *my_blob = '\0'; for (j = 0; j < dbdLAST; ++j) { add_to_blob(values[j], blobsize); @@ -366,7 +366,7 @@ _nc_first_db(DBDIRS * state, int *offset) } my_list = typeCalloc(char *, blobsize); my_stat = typeCalloc(struct stat, blobsize); - if (my_list != 0 && my_stat != 0) { + if (my_list != NULL && my_stat != NULL) { int k = 0; my_list[k++] = my_blob; for (j = 0; my_blob[j] != '\0'; ++j) { @@ -381,17 +381,20 @@ _nc_first_db(DBDIRS * state, int *offset) /* * Eliminate duplicates from the list. */ - for (j = 0; my_list[j] != 0; ++j) { + for (j = 0; my_list[j] != NULL; ++j) { #ifdef TERMINFO - if (*my_list[j] == '\0') - my_list[j] = strdup(TERMINFO); + if (*my_list[j] == '\0') { + char *my_copy = strdup(TERMINFO); + if (my_copy != NULL) + my_list[j] = my_copy; + } #endif trim_formatting(my_list[j]); for (k = 0; k < j; ++k) { if (!strcmp(my_list[j], my_list[k])) { T(("duplicate %s", my_list[j])); k = j - 1; - while ((my_list[j] = my_list[j + 1]) != 0) { + while ((my_list[j] = my_list[j + 1]) != NULL) { ++j; } j = k; @@ -404,7 +407,7 @@ _nc_first_db(DBDIRS * state, int *offset) * Eliminate non-existent databases, and those that happen to * be symlinked to another location. */ - for (j = 0; my_list[j] != 0; ++j) { + for (j = 0; my_list[j] != NULL; ++j) { bool found = check_existence(my_list[j], &my_stat[j]); #if HAVE_LINK if (found) { @@ -420,7 +423,7 @@ _nc_first_db(DBDIRS * state, int *offset) if (!found) { T(("not found %s", my_list[j])); k = j; - while ((my_list[k] = my_list[k + 1]) != 0) { + while ((my_list[k] = my_list[k + 1]) != NULL) { ++k; } --j; @@ -443,14 +446,14 @@ _nc_db_iterator_leaks(void) { DBDIRS which; - if (my_blob != 0) + if (my_blob != NULL) FreeAndNull(my_blob); - if (my_list != 0) + if (my_list != NULL) FreeAndNull(my_list); for (which = 0; (int) which < dbdLAST; ++which) { - my_vars[which].name = 0; + my_vars[which].name = NULL; FreeIfNeeded(my_vars[which].value); - my_vars[which].value = 0; + my_vars[which].value = NULL; } update_tic_dir(NULL); } diff --git a/ncurses/tinfo/doalloc.c b/ncurses/tinfo/doalloc.c index e3b1a2e9..dac28f60 100644 --- a/ncurses/tinfo/doalloc.c +++ b/ncurses/tinfo/doalloc.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020,2021 Thomas E. Dickey * + * Copyright 2020-2021,2024 Thomas E. Dickey * * Copyright 1998-2002,2012 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -40,7 +40,7 @@ #include -MODULE_ID("$Id: doalloc.c,v 1.14 2021/04/24 23:43:39 tom Exp $") +MODULE_ID("$Id: doalloc.c,v 1.15 2024/12/07 20:05:08 tom Exp $") void * _nc_doalloc(void *oldp, size_t amount) @@ -51,7 +51,7 @@ _nc_doalloc(void *oldp, size_t amount) if (amount == 0) { free(oldp); newp = NULL; - } else if ((newp = realloc(oldp, amount)) == 0) { + } else if ((newp = realloc(oldp, amount)) == NULL) { free(oldp); errno = ENOMEM; /* just in case 'free' reset */ } diff --git a/ncurses/tinfo/entries.c b/ncurses/tinfo/entries.c index 8c5e10c0..57272a8f 100644 --- a/ncurses/tinfo/entries.c +++ b/ncurses/tinfo/entries.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2019-2021,2022 Thomas E. Dickey * + * Copyright 2019-2023,2024 Thomas E. Dickey * * Copyright 2006-2012,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -38,7 +38,7 @@ #include -MODULE_ID("$Id: entries.c,v 1.34 2022/08/13 16:57:35 tom Exp $") +MODULE_ID("$Id: entries.c,v 1.39 2024/12/14 23:48:20 tom Exp $") /**************************************************************************** * @@ -61,21 +61,21 @@ MODULE_ID("$Id: entries.c,v 1.34 2022/08/13 16:57:35 tom Exp $") * _nc_head _nc_tail */ -NCURSES_EXPORT_VAR(ENTRY *) _nc_head = 0; -NCURSES_EXPORT_VAR(ENTRY *) _nc_tail = 0; +NCURSES_EXPORT_VAR(ENTRY *) _nc_head = NULL; +NCURSES_EXPORT_VAR(ENTRY *) _nc_tail = NULL; static ENTRY * -_nc_delink_entry(ENTRY * headp, TERMTYPE2 *tterm) +_nc_delink_entry(ENTRY * headp, const TERMTYPE2 *const tterm) /* delink the allocated storage for the given list entry */ { ENTRY *ep, *last; - for (last = 0, ep = headp; ep != 0; last = ep, ep = ep->next) { + for (last = NULL, ep = headp; ep != NULL; last = ep, ep = ep->next) { if (&(ep->tterm) == tterm) { - if (last != 0) { + if (last != NULL) { last->next = ep->next; } - if (ep->next != 0) { + if (ep->next != NULL) { ep->next->last = last; } if (ep == _nc_head) { @@ -91,12 +91,12 @@ _nc_delink_entry(ENTRY * headp, TERMTYPE2 *tterm) } NCURSES_EXPORT(void) -_nc_free_entry(ENTRY * headp, TERMTYPE2 *tterm) +_nc_free_entry(ENTRY * headp, const TERMTYPE2 *tterm) /* free the allocated storage consumed by the given list entry */ { ENTRY *ep; - if ((ep = _nc_delink_entry(headp, tterm)) != 0) { + if ((ep = _nc_delink_entry(headp, tterm)) != NULL) { free(ep); } } @@ -107,7 +107,7 @@ _nc_free_entries(ENTRY * headp) { (void) headp; /* unused - _nc_head is altered here! */ - while (_nc_head != 0) { + while (_nc_head != NULL) { _nc_free_termtype2(&(_nc_head->tterm)); } } @@ -133,7 +133,7 @@ _nc_leaks_tinfo(void) { PRESCREEN_LIST *p; pthread_t id = GetThreadID(); - for (p = _nc_prescreen.allocated; p != 0; p = p->next) { + for (p = _nc_prescreen.allocated; p != NULL; p = p->next) { if (p->id == id && p->sp != CURRENT_SCREEN) { FreeAndNull(p->sp); } @@ -141,7 +141,7 @@ _nc_leaks_tinfo(void) } _nc_unlock_global(screen); #endif - if (TerminalOf(CURRENT_SCREEN) != 0) { + if (TerminalOf(CURRENT_SCREEN) != NULL) { del_curterm(TerminalOf(CURRENT_SCREEN)); } _nc_forget_prescr(); @@ -149,8 +149,8 @@ _nc_leaks_tinfo(void) _nc_comp_captab_leaks(); _nc_comp_userdefs_leaks(); _nc_free_entries(_nc_head); - _nc_get_type(0); - _nc_first_name(0); + _nc_get_type(NULL); + _nc_first_name(NULL); _nc_db_iterator_leaks(); _nc_keyname_leaks(); #if BROKEN_LINKER || USE_REENTRANT @@ -160,7 +160,7 @@ _nc_leaks_tinfo(void) #endif _nc_comp_error_leaks(); - if ((s = _nc_home_terminfo()) != 0) + if ((s = _nc_home_terminfo()) != NULL) free(s); #ifdef TRACE diff --git a/ncurses/tinfo/free_ttype.c b/ncurses/tinfo/free_ttype.c index 9622e0e1..7935152a 100644 --- a/ncurses/tinfo/free_ttype.c +++ b/ncurses/tinfo/free_ttype.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020,2022 Thomas E. Dickey * + * Copyright 2020-2022,2023 Thomas E. Dickey * * Copyright 1999-2011,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -43,7 +43,7 @@ #include -MODULE_ID("$Id: free_ttype.c,v 1.21 2022/05/28 18:02:33 tom Exp $") +MODULE_ID("$Id: free_ttype.c,v 1.22 2023/04/22 15:12:57 tom Exp $") static void really_free_termtype(TERMTYPE2 *ptr, bool freeStrings) @@ -66,9 +66,6 @@ really_free_termtype(TERMTYPE2 *ptr, bool freeStrings) _nc_free_entry(_nc_head, ptr); } -/* - * This entrypoint was used by tack 1.07; deprecated with ncurses 6.2 - */ NCURSES_EXPORT(void) _nc_free_termtype(TERMTYPE *ptr) { diff --git a/ncurses/tinfo/getenv_num.c b/ncurses/tinfo/getenv_num.c index ca179d33..21a25087 100644 --- a/ncurses/tinfo/getenv_num.c +++ b/ncurses/tinfo/getenv_num.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018,2020 Thomas E. Dickey * + * Copyright 2018-2024,2025 Thomas E. Dickey * * Copyright 1998-2012,2013 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -37,16 +37,16 @@ #include -MODULE_ID("$Id: getenv_num.c,v 1.8 2020/02/02 23:34:34 tom Exp $") +MODULE_ID("$Id: getenv_num.c,v 1.11 2025/02/20 01:02:09 tom Exp $") NCURSES_EXPORT(int) _nc_getenv_num(const char *name) { - char *dst = 0; - char *src = getenv(name); + char *dst = NULL; + const char *src = getenv(name); long value; - if ((src == 0) + if ((src == NULL) || (value = strtol(src, &dst, 0)) < 0 || (dst == src) || (*dst != '\0') @@ -59,7 +59,7 @@ _nc_getenv_num(const char *name) NCURSES_EXPORT(void) _nc_setenv_num(const char *name, int value) { - if (name != 0 && value >= 0) { + if (name != NULL && value >= 0) { char buffer[128]; #if HAVE_SETENV _nc_SPRINTF(buffer, _nc_SLIMIT(sizeof(buffer)) "%d", value); @@ -67,7 +67,7 @@ _nc_setenv_num(const char *name, int value) #elif HAVE_PUTENV char *s; _nc_SPRINTF(buffer, _nc_SLIMIT(sizeof(buffer)) "%s=%d", name, value); - if ((s = strdup(buffer)) != 0) + if ((s = strdup(buffer)) != NULL) putenv(s); #else #error expected setenv/putenv functions diff --git a/ncurses/tinfo/hashed_db.c b/ncurses/tinfo/hashed_db.c index b78d98f8..afd1bda8 100644 --- a/ncurses/tinfo/hashed_db.c +++ b/ncurses/tinfo/hashed_db.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2019,2020 Thomas E. Dickey * + * Copyright 2019-2024,2025 Thomas E. Dickey * * Copyright 2006-2011,2013 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -37,7 +37,7 @@ #if USE_HASHED_DB -MODULE_ID("$Id: hashed_db.c,v 1.19 2020/02/02 23:34:34 tom Exp $") +MODULE_ID("$Id: hashed_db.c,v 1.22 2025/01/11 23:52:18 tom Exp $") #if HASHED_DB_API >= 2 static DBC *cursor; @@ -55,7 +55,7 @@ static MYCONN *connections; static void cleanup(void) { - while (connections != 0) { + while (connections != NULL) { _nc_db_close(connections->db); } } @@ -63,10 +63,10 @@ cleanup(void) static DB * find_connection(const char *path, bool modify) { - DB *result = 0; + DB *result = NULL; MYCONN *p; - for (p = connections; p != 0; p = p->next) { + for (p = connections; p != NULL; p = p->next) { if (!strcmp(p->path, path) && p->modify == modify) { result = p->db; break; @@ -81,9 +81,9 @@ drop_connection(DB * db) { MYCONN *p, *q; - for (p = connections, q = 0; p != 0; q = p, p = p->next) { + for (p = connections, q = NULL; p != NULL; q = p, p = p->next) { if (p->db == db) { - if (q != 0) + if (q != NULL) q->next = p->next; else connections = p->next; @@ -94,22 +94,25 @@ drop_connection(DB * db) } } -static void +static bool make_connection(DB * db, const char *path, bool modify) { + bool code = FALSE; MYCONN *p = typeCalloc(MYCONN, 1); - if (p != 0) { - p->db = db; + if (p != NULL) { p->path = strdup(path); - p->modify = modify; - if (p->path != 0) { + if (p->path != NULL) { + p->db = db; + p->modify = modify; p->next = connections; connections = p; + code = TRUE; } else { free(p); } } + return code; } /* @@ -118,13 +121,13 @@ make_connection(DB * db, const char *path, bool modify) NCURSES_EXPORT(DB *) _nc_db_open(const char *path, bool modify) { - DB *result = 0; + DB *result = NULL; int code; - if (connections == 0) + if (connections == NULL) atexit(cleanup); - if ((result = find_connection(path, modify)) == 0) { + if ((result = find_connection(path, modify)) == NULL) { #if HASHED_DB_API >= 4 db_create(&result, NULL, 0); @@ -135,7 +138,7 @@ _nc_db_open(const char *path, bool modify) DB_HASH, modify ? DB_CREATE : DB_RDONLY, 0644)) != 0) { - result = 0; + result = NULL; } #elif HASHED_DB_API >= 3 db_create(&result, NULL, 0); @@ -145,7 +148,7 @@ _nc_db_open(const char *path, bool modify) DB_HASH, modify ? DB_CREATE : DB_RDONLY, 0644)) != 0) { - result = 0; + result = NULL; } #elif HASHED_DB_API >= 2 if ((code = db_open(path, @@ -155,22 +158,24 @@ _nc_db_open(const char *path, bool modify) (DB_ENV *) 0, (DB_INFO *) 0, &result)) != 0) { - result = 0; + result = NULL; } #else if ((result = dbopen(path, modify ? (O_CREAT | O_RDWR) : O_RDONLY, 0644, DB_HASH, - NULL)) == 0) { + NULL)) == NULL) { code = errno; + } else { + code = 0; } #endif - if (result != 0) { - make_connection(result, path, modify); + if (result != NULL && make_connection(result, path, modify)) { T(("opened %s", path)); } else { - T(("cannot open %s: %s", path, strerror(code))); + T(("cannot open %s: (errno %d) %s", path, code, strerror(code))); + errno = code; } } return result; diff --git a/ncurses/tinfo/home_terminfo.c b/ncurses/tinfo/home_terminfo.c index 7e626dfc..7201de46 100644 --- a/ncurses/tinfo/home_terminfo.c +++ b/ncurses/tinfo/home_terminfo.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020 Thomas E. Dickey * + * Copyright 2020,2024 Thomas E. Dickey * * Copyright 1998-2012,2016 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -38,7 +38,7 @@ #include #include -MODULE_ID("$Id: home_terminfo.c,v 1.17 2020/02/02 23:34:34 tom Exp $") +MODULE_ID("$Id: home_terminfo.c,v 1.19 2024/12/07 18:14:49 tom Exp $") /* ncurses extension...fall back on user's private directory */ @@ -47,14 +47,14 @@ MODULE_ID("$Id: home_terminfo.c,v 1.17 2020/02/02 23:34:34 tom Exp $") NCURSES_EXPORT(char *) _nc_home_terminfo(void) { - char *result = 0; + char *result = NULL; #if USE_HOME_TERMINFO if (use_terminfo_vars()) { - if (MyBuffer == 0) { - char *home; + if (MyBuffer == NULL) { + const char *home; - if ((home = getenv("HOME")) != 0) { + if ((home = getenv("HOME")) != NULL) { size_t want = (strlen(home) + sizeof(PRIVATE_INFO)); TYPE_MALLOC(char, want, MyBuffer); _nc_SPRINTF(MyBuffer, _nc_SLIMIT(want) PRIVATE_INFO, home); diff --git a/ncurses/tinfo/init_keytry.c b/ncurses/tinfo/init_keytry.c index 1669c641..78f8b3e4 100644 --- a/ncurses/tinfo/init_keytry.c +++ b/ncurses/tinfo/init_keytry.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020 Thomas E. Dickey * + * Copyright 2020-2023,2024 Thomas E. Dickey * * Copyright 1999-2010,2016 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -30,7 +30,7 @@ #include #include /* struct tinfo_fkeys */ -MODULE_ID("$Id: init_keytry.c,v 1.19 2020/02/02 23:34:34 tom Exp $") +MODULE_ID("$Id: init_keytry.c,v 1.22 2024/12/07 18:14:49 tom Exp $") /* ** _nc_init_keytry() @@ -67,12 +67,14 @@ _nc_tinfo_fkeysf(void) NCURSES_EXPORT(void) _nc_init_keytry(SCREEN *sp) { + T(("_nc_init_keytry(%p)", (void *) sp)); + /* The sp->_keytry value is initialized in newterm(), where the sp * structure is created, because we can not tell where keypad() or * mouse_activate() (which will call keyok()) are first called. */ - if (sp != 0) { + if (sp != NULL) { unsigned n; for (n = 0; _nc_tinfo_fkeys[n].code; n++) { @@ -92,10 +94,10 @@ _nc_init_keytry(SCREEN *sp) TERMTYPE *tp = &(sp->_term->type); for (n = STRCOUNT; n < NUM_STRINGS(tp); ++n) { const char *name = ExtStrname(tp, (int) n, strnames); - char *value = tp->Strings[n]; - if (name != 0 + const char *value = tp->Strings[n]; + if (name != NULL && *name == 'k' - && value != 0 + && VALID_STRING(value) && NCURSES_SP_NAME(key_defined) (NCURSES_SP_ARGx value) == 0) { (void) _nc_add_to_try(&(sp->_keytry), diff --git a/ncurses/tinfo/lib_acs.c b/ncurses/tinfo/lib_acs.c index 4ede53f6..c66c45db 100644 --- a/ncurses/tinfo/lib_acs.c +++ b/ncurses/tinfo/lib_acs.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2019,2020 Thomas E. Dickey * + * Copyright 2018-2020,2024 Thomas E. Dickey * * Copyright 1998-2014,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -40,14 +40,14 @@ #define CUR SP_TERMTYPE #endif -MODULE_ID("$Id: lib_acs.c,v 1.50 2020/02/02 23:34:34 tom Exp $") +MODULE_ID("$Id: lib_acs.c,v 1.52 2024/12/15 00:11:15 tom Exp $") #if BROKEN_LINKER || USE_REENTRANT #define MyBuffer _nc_prescreen.real_acs_map NCURSES_EXPORT(chtype *) NCURSES_PUBLIC_VAR(acs_map) (void) { - if (MyBuffer == 0) + if (MyBuffer == NULL) MyBuffer = typeCalloc(chtype, ACS_LEN); return MyBuffer; } @@ -66,7 +66,7 @@ NCURSES_SP_NAME(_nc_acs_char) (NCURSES_SP_DCLx int c) chtype *map; if (c < 0 || c >= ACS_LEN) return (chtype) 0; - map = (SP_PARM != 0) ? SP_PARM->_acs_map : + map = (SP_PARM != NULL) ? SP_PARM->_acs_map : #if BROKEN_LINKER || USE_REENTRANT _nc_prescreen.real_acs_map #else @@ -81,7 +81,7 @@ NCURSES_EXPORT(void) NCURSES_SP_NAME(_nc_init_acs) (NCURSES_SP_DCL0) { chtype *fake_map = acs_map; - chtype *real_map = SP_PARM != 0 ? SP_PARM->_acs_map : fake_map; + chtype *real_map = SP_PARM != NULL ? SP_PARM->_acs_map : fake_map; int j; T(("initializing ACS map")); @@ -183,7 +183,7 @@ NCURSES_SP_NAME(_nc_init_acs) (NCURSES_SP_DCL0) * * test/blue.c uses this feature. */ -#define PCH_KLUDGE(a,b) (a != 0 && b != 0 && !strcmp(a,b)) +#define PCH_KLUDGE(a,b) (a != NULL && b != NULL && !strcmp(a,b)) if (PCH_KLUDGE(enter_pc_charset_mode, enter_alt_charset_mode) && PCH_KLUDGE(exit_pc_charset_mode, exit_alt_charset_mode)) { size_t i; @@ -191,7 +191,7 @@ NCURSES_SP_NAME(_nc_init_acs) (NCURSES_SP_DCL0) if (real_map[i] == 0) { real_map[i] = (chtype) i; if (real_map != fake_map) { - if (SP != 0) + if (SP != NULL) SP->_screen_acs_map[i] = TRUE; } } @@ -210,7 +210,7 @@ NCURSES_SP_NAME(_nc_init_acs) (NCURSES_SP_DCL0) (int) i, _tracechar(UChar(acs_chars[i])), _tracechtype(real_map[UChar(acs_chars[i])]))); - if (SP != 0) { + if (SP != NULL) { SP->_screen_acs_map[UChar(acs_chars[i])] = TRUE; } } diff --git a/ncurses/tinfo/lib_baudrate.c b/ncurses/tinfo/lib_baudrate.c index 311c41ac..b3a78369 100644 --- a/ncurses/tinfo/lib_baudrate.c +++ b/ncurses/tinfo/lib_baudrate.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020 Thomas E. Dickey * + * Copyright 2020,2024 Thomas E. Dickey * * Copyright 1998-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -84,7 +84,7 @@ #undef USE_OLD_TTY #endif /* USE_OLD_TTY */ -MODULE_ID("$Id: lib_baudrate.c,v 1.45 2020/09/05 21:15:32 tom Exp $") +MODULE_ID("$Id: lib_baudrate.c,v 1.46 2024/12/07 20:05:08 tom Exp $") /* * int @@ -279,7 +279,7 @@ NCURSES_SP_NAME(baudrate) (NCURSES_SP_DCL0) #ifdef TRACE if (IsValidTIScreen(SP_PARM) && !NC_ISATTY(fileno((SP_PARM && SP_PARM->_ofp) ? SP_PARM->_ofp : stdout)) - && getenv("BAUDRATE") != 0) { + && getenv("BAUDRATE") != NULL) { int ret; if ((ret = _nc_getenv_num("BAUDRATE")) <= 0) ret = 9600; diff --git a/ncurses/tinfo/lib_cur_term.c b/ncurses/tinfo/lib_cur_term.c index 1f8db2c1..2911d561 100644 --- a/ncurses/tinfo/lib_cur_term.c +++ b/ncurses/tinfo/lib_cur_term.c @@ -1,5 +1,5 @@ /**************************************************************************** -,* Copyright 2020-2021,2022 Thomas E. Dickey * +,* Copyright 2020-2022,2024 Thomas E. Dickey * * Copyright 1998-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -41,7 +41,7 @@ #include /* ospeed */ #include /* VALID_STRING */ -MODULE_ID("$Id: lib_cur_term.c,v 1.49 2022/05/28 17:56:55 tom Exp $") +MODULE_ID("$Id: lib_cur_term.c,v 1.51 2024/12/14 23:48:20 tom Exp $") #undef CUR #define CUR TerminalType(termp). @@ -51,7 +51,7 @@ MODULE_ID("$Id: lib_cur_term.c,v 1.49 2022/05/28 17:56:55 tom Exp $") NCURSES_EXPORT(TERMINAL *) NCURSES_SP_NAME(_nc_get_cur_term) (NCURSES_SP_DCL0) { - return ((0 != TerminalOf(SP_PARM)) ? TerminalOf(SP_PARM) : CurTerm); + return ((NULL != TerminalOf(SP_PARM)) ? TerminalOf(SP_PARM) : CurTerm); } #if NCURSES_SP_FUNCS @@ -74,7 +74,7 @@ NCURSES_PUBLIC_VAR(cur_term) (void) } #else -NCURSES_EXPORT_VAR(TERMINAL *) cur_term = 0; +NCURSES_EXPORT_VAR(TERMINAL *) cur_term = NULL; #endif NCURSES_EXPORT(TERMINAL *) @@ -93,7 +93,7 @@ NCURSES_SP_NAME(set_curterm) (NCURSES_SP_DCLx TERMINAL *termp) #else cur_term = termp; #endif - if (termp != 0) { + if (termp != NULL) { #ifdef USE_TERM_DRIVER TERMINAL_CONTROL_BLOCK *TCB = (TERMINAL_CONTROL_BLOCK *) termp; ospeed = (NCURSES_OSPEED) _nc_ospeed(termp->_baudrate); @@ -134,7 +134,7 @@ NCURSES_SP_NAME(del_curterm) (NCURSES_SP_DCLx TERMINAL *termp) T((T_CALLED("del_curterm(%p, %p)"), (void *) SP_PARM, (void *) termp)); - if (termp != 0) { + if (termp != NULL) { #ifdef USE_TERM_DRIVER TERMINAL_CONTROL_BLOCK *TCB = (TERMINAL_CONTROL_BLOCK *) termp; #endif @@ -155,11 +155,11 @@ NCURSES_SP_NAME(del_curterm) (NCURSES_SP_DCLx TERMINAL *termp) #endif _nc_free_termtype2(&TerminalType(termp)); if (termp == cur) - NCURSES_SP_NAME(set_curterm) (NCURSES_SP_ARGx 0); + NCURSES_SP_NAME(set_curterm) (NCURSES_SP_ARGx NULL); FreeIfNeeded(termp->_termname); #if USE_HOME_TERMINFO - if (_nc_globals.home_terminfo != 0) { + if (_nc_globals.home_terminfo != NULL) { FreeAndNull(_nc_globals.home_terminfo); } #endif diff --git a/ncurses/tinfo/lib_data.c b/ncurses/tinfo/lib_data.c index 6f6c583a..bad270ce 100644 --- a/ncurses/tinfo/lib_data.c +++ b/ncurses/tinfo/lib_data.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2021,2022 Thomas E. Dickey * + * Copyright 2018-2024,2025 Thomas E. Dickey * * Copyright 1998-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -43,7 +43,7 @@ #include -MODULE_ID("$Id: lib_data.c,v 1.87 2022/07/09 22:03:21 tom Exp $") +MODULE_ID("$Id: lib_data.c,v 1.94 2025/02/20 01:02:09 tom Exp $") /* * OS/2's native linker complains if we don't initialize public data when @@ -53,25 +53,25 @@ MODULE_ID("$Id: lib_data.c,v 1.87 2022/07/09 22:03:21 tom Exp $") NCURSES_EXPORT(WINDOW *) NCURSES_PUBLIC_VAR(stdscr) (void) { - return CURRENT_SCREEN ? StdScreen(CURRENT_SCREEN) : 0; + return CURRENT_SCREEN ? StdScreen(CURRENT_SCREEN) : NULL; } NCURSES_EXPORT(WINDOW *) NCURSES_PUBLIC_VAR(curscr) (void) { - return CURRENT_SCREEN ? CurScreen(CURRENT_SCREEN) : 0; + return CURRENT_SCREEN ? CurScreen(CURRENT_SCREEN) : NULL; } NCURSES_EXPORT(WINDOW *) NCURSES_PUBLIC_VAR(newscr) (void) { - return CURRENT_SCREEN ? NewScreen(CURRENT_SCREEN) : 0; + return CURRENT_SCREEN ? NewScreen(CURRENT_SCREEN) : NULL; } #else -NCURSES_EXPORT_VAR(WINDOW *) stdscr = 0; -NCURSES_EXPORT_VAR(WINDOW *) curscr = 0; -NCURSES_EXPORT_VAR(WINDOW *) newscr = 0; +NCURSES_EXPORT_VAR(WINDOW *) stdscr = NULL; +NCURSES_EXPORT_VAR(WINDOW *) curscr = NULL; +NCURSES_EXPORT_VAR(WINDOW *) newscr = NULL; #endif -NCURSES_EXPORT_VAR(SCREEN *) _nc_screen_chain = 0; +NCURSES_EXPORT_VAR(SCREEN *) _nc_screen_chain = NULL; /* * The variable 'SP' will be defined as a function on systems that cannot link @@ -97,7 +97,7 @@ _nc_alloc_screen(void) { my_screen = _nc_alloc_screen_sp(); T(("_nc_alloc_screen_sp %p", my_screen)); - return (my_screen != 0); + return (my_screen != NULL); } NCURSES_EXPORT(void) @@ -129,7 +129,7 @@ NCURSES_EXPORT_VAR(NCURSES_GLOBALS) _nc_globals = { FALSE, /* have_tic_directory */ FALSE, /* keep_tic_directory */ - 0, /* tic_directory */ + NULL, /* tic_directory */ NULL, /* dbi_list */ 0, /* dbi_size */ @@ -150,11 +150,11 @@ NCURSES_EXPORT_VAR(NCURSES_GLOBALS) _nc_globals = { 0, /* tgetent_sequence */ 0, /* terminal_count */ - 0, /* dbd_blob */ - 0, /* dbd_list */ + NULL, /* dbd_blob */ + NULL, /* dbd_list */ 0, /* dbd_size */ 0, /* dbd_time */ - { { 0, 0 } }, /* dbd_vars */ + { { NULL, NULL } }, /* dbd_vars */ #if HAVE_TSEARCH NULL, /* cached_tparm */ @@ -162,7 +162,7 @@ NCURSES_EXPORT_VAR(NCURSES_GLOBALS) _nc_globals = { #endif /* HAVE_TSEARCH */ #ifdef USE_TERM_DRIVER - 0, /* term_driver */ + NULL, /* term_driver */ #endif #ifndef USE_SP_WINDOWLIST @@ -188,7 +188,7 @@ NCURSES_EXPORT_VAR(NCURSES_GLOBALS) _nc_globals = { 0, /* nested_tracef */ 0, /* use_pthreads */ #if USE_PTHREADS_EINTR - 0, /* read_thread */ + (pthread_t) 0, /* read_thread */ #endif #endif #if USE_WIDEC_SUPPORT @@ -196,7 +196,6 @@ NCURSES_EXPORT_VAR(NCURSES_GLOBALS) _nc_globals = { #endif #ifdef TRACE FALSE, /* trace_opened */ - CHARS_0s, /* trace_fname */ 0, /* trace_level */ NULL, /* trace_fp */ -1, /* trace_fd */ @@ -231,7 +230,7 @@ NCURSES_EXPORT_VAR(NCURSES_GLOBALS) _nc_globals = { #define STACK_FRAME_0s { STACK_FRAME_0 } #define NUM_VARS_0s { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } -#define RIPOFF_0 { 0,0,0 } +#define RIPOFF_0 { NULL,0,NULL } #define RIPOFF_0s { RIPOFF_0 } NCURSES_EXPORT_VAR(NCURSES_PRESCREEN) _nc_prescreen = { @@ -259,7 +258,7 @@ NCURSES_EXPORT_VAR(NCURSES_PRESCREEN) _nc_prescreen = { }, NULL, /* saved_tty */ FALSE, /* use_tioctl */ - 0, /* _outch */ + NULL, /* _outch */ #ifndef USE_SP_RIPOFF RIPOFF_0s, /* ripoff */ NULL, /* rsp */ @@ -273,7 +272,7 @@ NCURSES_EXPORT_VAR(NCURSES_PRESCREEN) _nc_prescreen = { 0, /* COLS */ 8, /* TABSIZE */ 1000, /* ESCDELAY */ - 0, /* cur_term */ + NULL, /* cur_term */ #endif #ifdef TRACE #if BROKEN_LINKER || USE_REENTRANT @@ -292,9 +291,9 @@ NCURSES_EXPORT_VAR(NCURSES_PRESCREEN) _nc_prescreen = { NCURSES_EXPORT(SCREEN *) _nc_screen_of(WINDOW *win) { - SCREEN *sp = 0; + SCREEN *sp = NULL; - if (win != 0) { + if (win != NULL) { sp = WINDOW_EXT(win, screen); } return (sp); diff --git a/ncurses/tinfo/lib_has_cap.c b/ncurses/tinfo/lib_has_cap.c index cbf68b31..9f436675 100644 --- a/ncurses/tinfo/lib_has_cap.c +++ b/ncurses/tinfo/lib_has_cap.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020 Thomas E. Dickey * + * Copyright 2020,2024 Thomas E. Dickey * * Copyright 1998-2009,2013 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -47,7 +47,7 @@ #define CUR SP_TERMTYPE #endif -MODULE_ID("$Id: lib_has_cap.c,v 1.11 2020/02/02 23:34:34 tom Exp $") +MODULE_ID("$Id: lib_has_cap.c,v 1.12 2024/11/23 19:17:15 tom Exp $") NCURSES_EXPORT(bool) NCURSES_SP_NAME(has_ic) (NCURSES_SP_DCL0) @@ -62,7 +62,7 @@ NCURSES_SP_NAME(has_ic) (NCURSES_SP_DCL0) && (delete_character || parm_dch)) ? TRUE : FALSE; } - returnCode(code); + returnBool(code); } #if NCURSES_SP_FUNCS @@ -83,7 +83,7 @@ NCURSES_SP_NAME(has_il) (NCURSES_SP_DCL0) && (delete_line || parm_delete_line)) ? TRUE : FALSE; } - returnCode(code); + returnBool(code); } #if NCURSES_SP_FUNCS diff --git a/ncurses/tinfo/lib_kernel.c b/ncurses/tinfo/lib_kernel.c index f7cbaba5..0cdf3e82 100644 --- a/ncurses/tinfo/lib_kernel.c +++ b/ncurses/tinfo/lib_kernel.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020,2022 Thomas E. Dickey * + * Copyright 2020-2023,2024 Thomas E. Dickey * * Copyright 1998-2009,2010 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -49,7 +49,7 @@ #include -MODULE_ID("$Id: lib_kernel.c,v 1.35 2022/07/28 20:14:51 tom Exp $") +MODULE_ID("$Id: lib_kernel.c,v 1.37 2024/12/07 20:05:08 tom Exp $") #ifdef TERMIOS static int @@ -89,7 +89,7 @@ NCURSES_SP_NAME(erasechar) (NCURSES_SP_DCL0) T((T_CALLED("erasechar(%p)"), (void *) SP_PARM)); - if (termp != 0) { + if (termp != NULL) { #ifdef TERMIOS result = termp->Ottyb.c_cc[VERASE]; if (result == _nc_vdisable()) @@ -126,7 +126,7 @@ NCURSES_SP_NAME(killchar) (NCURSES_SP_DCL0) T((T_CALLED("killchar(%p)"), (void *) SP_PARM)); - if (termp != 0) { + if (termp != NULL) { #ifdef TERMIOS result = termp->Ottyb.c_cc[VKILL]; if (result == _nc_vdisable()) @@ -148,34 +148,40 @@ killchar(void) } #endif +static void +flush_input(int fd) +{ +#ifdef TERMIOS + tcflush(fd, TCIFLUSH); +#else /* !TERMIOS */ + errno = 0; + do { +#if defined(EXP_WIN32_DRIVER) + _nc_console_flush(_nc_console_fd2handle(fd)); +#else + ioctl(fd, TIOCFLUSH, 0); +#endif + } while + (errno == EINTR); +#endif +} + /* * flushinp() * - * Flush any input on cur_term->Filedes - * + * Flush any input on tty */ NCURSES_EXPORT(int) NCURSES_SP_NAME(flushinp) (NCURSES_SP_DCL0) { - TERMINAL *termp = TerminalOf(SP_PARM); - T((T_CALLED("flushinp(%p)"), (void *) SP_PARM)); - if (termp != 0) { -#ifdef TERMIOS - tcflush(termp->Filedes, TCIFLUSH); -#else - errno = 0; - do { -#if defined(EXP_WIN32_DRIVER) - _nc_console_flush(_nc_console_fd2handle(termp->Filedes)); -#else - ioctl(termp->Filedes, TIOCFLUSH, 0); -#endif - } while - (errno == EINTR); -#endif + if (SP_PARM != NULL) { + if (NC_ISATTY(SP_PARM->_ifd)) + flush_input(SP_PARM->_ifd); + else if (NC_ISATTY(SP_PARM->_ofd)) + flush_input(SP_PARM->_ofd); if (SP_PARM) { SP_PARM->_fifohead = -1; SP_PARM->_fifotail = 0; diff --git a/ncurses/tinfo/lib_napms.c b/ncurses/tinfo/lib_napms.c index 3a9fc316..6c742fd9 100644 --- a/ncurses/tinfo/lib_napms.c +++ b/ncurses/tinfo/lib_napms.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020 Thomas E. Dickey * + * Copyright 2020-2023,2024 Thomas E. Dickey * * Copyright 1998-2014,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -52,13 +52,16 @@ #endif #endif -MODULE_ID("$Id: lib_napms.c,v 1.27 2020/08/15 19:45:23 tom Exp $") +MODULE_ID("$Id: lib_napms.c,v 1.30 2024/12/14 23:57:01 tom Exp $") NCURSES_EXPORT(int) NCURSES_SP_NAME(napms) (NCURSES_SP_DCLx int ms) { T((T_CALLED("napms(%d)"), ms)); + if (ms > MAX_DELAY_MSECS) + ms = MAX_DELAY_MSECS; + #ifdef USE_TERM_DRIVER CallDriver_1(SP_PARM, td_nap, ms); #else /* !USE_TERM_DRIVER */ @@ -75,10 +78,10 @@ NCURSES_SP_NAME(napms) (NCURSES_SP_DCLx int ms) request = remaining; } } -#elif defined(_NC_WINDOWS) +#elif defined(_NC_WINDOWS_NATIVE) Sleep((DWORD) ms); #else - _nc_timed_wait(0, 0, ms, (int *) 0 EVENTLIST_2nd(0)); + _nc_timed_wait(NULL, 0, ms, (int *) 0 EVENTLIST_2nd(NULL)); #endif #endif /* !USE_TERM_DRIVER */ diff --git a/ncurses/tinfo/lib_options.c b/ncurses/tinfo/lib_options.c index 017a34aa..1894b28f 100644 --- a/ncurses/tinfo/lib_options.c +++ b/ncurses/tinfo/lib_options.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020,2021 Thomas E. Dickey * + * Copyright 2020-2023,2024 Thomas E. Dickey * * Copyright 1998-2014,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -47,7 +47,7 @@ #define CUR SP_TERMTYPE #endif -MODULE_ID("$Id: lib_options.c,v 1.82 2021/02/14 00:17:35 tom Exp $") +MODULE_ID("$Id: lib_options.c,v 1.85 2024/12/07 18:24:47 tom Exp $") NCURSES_EXPORT(int) idlok(WINDOW *win, bool flag) @@ -57,7 +57,7 @@ idlok(WINDOW *win, bool flag) if (win) { SCREEN *sp = _nc_screen_of(win); - if (sp != 0 + if (sp != NULL #ifdef USE_TERM_DRIVER && IsTermInfo(sp) #endif @@ -92,7 +92,7 @@ NCURSES_SP_NAME(halfdelay) (NCURSES_SP_DCLx int t) returnCode(ERR); NCURSES_SP_NAME(cbreak) (NCURSES_SP_ARG); - SP_PARM->_cbreak = t + 1; + IsCbreak(SP_PARM) = t + 1; returnCode(OK); } @@ -158,14 +158,14 @@ NCURSES_EXPORT(int) meta(WINDOW *win GCC_UNUSED, bool flag) { int result = ERR; - SCREEN *sp = (win == 0) ? CURRENT_SCREEN : _nc_screen_of(win); + SCREEN *sp = (win == NULL) ? CURRENT_SCREEN : _nc_screen_of(win); /* Ok, we stay relaxed and don't signal an error if win is NULL */ T((T_CALLED("meta(%p,%d)"), (void *) win, flag)); /* Ok, we stay relaxed and don't signal an error if win is NULL */ - if (sp != 0) { + if (sp != NULL) { sp->_use_meta = flag; #ifdef USE_TERM_DRIVER if (IsTermInfo(sp)) { @@ -195,7 +195,7 @@ NCURSES_SP_NAME(curs_set) (NCURSES_SP_DCLx int vis) int code = ERR; T((T_CALLED("curs_set(%p,%d)"), (void *) SP_PARM, vis)); - if (SP_PARM != 0 && vis >= 0 && vis <= 2) { + if (SP_PARM != NULL && vis >= 0 && vis <= 2) { int cursor = SP_PARM->_cursor; if (vis == cursor) { code = cursor; @@ -269,7 +269,7 @@ typeahead(int fd) static int has_key_internal(int keycode, TRIES * tp) { - if (tp == 0) + if (tp == NULL) return (FALSE); else if (tp->value == keycode) return (TRUE); @@ -290,7 +290,7 @@ NCURSES_EXPORT(int) NCURSES_SP_NAME(has_key) (NCURSES_SP_DCLx int keycode) { T((T_CALLED("has_key(%p,%d)"), (void *) SP_PARM, keycode)); - returnCode(SP != 0 ? has_key_internal(keycode, SP_PARM->_keytry) : FALSE); + returnCode(SP != NULL ? has_key_internal(keycode, SP_PARM->_keytry) : FALSE); } #if NCURSES_SP_FUNCS @@ -330,11 +330,11 @@ _nc_putp_flush(const char *name, const char *value) * the terminal state _before_ switching modes. */ NCURSES_EXPORT(int) -_nc_keypad(SCREEN *sp, int flag) +_nc_keypad(SCREEN *sp, bool flag) { int rc = ERR; - if (sp != 0) { + if (sp != NULL) { #ifdef USE_PTHREADS /* * We might have this situation in a multithreaded application that diff --git a/ncurses/tinfo/lib_print.c b/ncurses/tinfo/lib_print.c index aa65041c..247397f1 100644 --- a/ncurses/tinfo/lib_print.c +++ b/ncurses/tinfo/lib_print.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2020,2021 Thomas E. Dickey * + * Copyright 2018-2023,2024 Thomas E. Dickey * * Copyright 1998-2011,2012 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -40,14 +40,15 @@ #define CUR SP_TERMTYPE #endif -MODULE_ID("$Id: lib_print.c,v 1.30 2021/04/18 14:58:57 tom Exp $") +MODULE_ID("$Id: lib_print.c,v 1.34 2024/12/07 18:05:04 tom Exp $") NCURSES_EXPORT(int) NCURSES_SP_NAME(mcprint) (NCURSES_SP_DCLx char *data, int len) /* ship binary character data to the printer via mc4/mc5/mc5p */ { int result; - char *mybuf = NULL, *switchon; + char *mybuf = NULL; + const char *switchon; size_t onsize, offsize; size_t need; @@ -71,8 +72,8 @@ NCURSES_SP_NAME(mcprint) (NCURSES_SP_DCLx char *data, int len) need = onsize + (size_t) len + offsize; - if (switchon == 0 - || (mybuf = typeMalloc(char, need + 1)) == 0) { + if (switchon == NULL + || (mybuf = typeMalloc(char, need + 1)) == NULL) { free(mybuf); errno = ENOMEM; return (ERR); @@ -90,14 +91,14 @@ NCURSES_SP_NAME(mcprint) (NCURSES_SP_DCLx char *data, int len) * data has actually been shipped to the terminal. If the write(2) * operation is truly atomic we're protected from this. */ - result = (int) write(TerminalOf(SP_PARM)->Filedes, mybuf, need); + result = (int) write(SP_PARM->_ofd, mybuf, need); /* * By giving up our scheduler slot here we increase the odds that the * kernel will ship the contiguous clist items from the last write * immediately. */ -#ifndef _NC_WINDOWS +#ifndef _NC_WINDOWS_NATIVE (void) sleep(0); #endif free(mybuf); diff --git a/ncurses/tinfo/lib_raw.c b/ncurses/tinfo/lib_raw.c index 1e47f3b6..b4d50bce 100644 --- a/ncurses/tinfo/lib_raw.c +++ b/ncurses/tinfo/lib_raw.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020 Thomas E. Dickey * + * Copyright 2020-2023,2024 Thomas E. Dickey * * Copyright 1998-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -50,7 +50,7 @@ #include -MODULE_ID("$Id: lib_raw.c,v 1.26 2020/11/21 22:07:48 tom Exp $") +MODULE_ID("$Id: lib_raw.c,v 1.32 2024/12/07 18:24:47 tom Exp $") #if HAVE_SYS_TERMIO_H #include /* needed for ISC */ @@ -85,7 +85,7 @@ NCURSES_SP_NAME(raw) (NCURSES_SP_DCL0) TERMINAL *termp; T((T_CALLED("raw(%p)"), (void *) SP_PARM)); - if ((termp = TerminalOf(SP_PARM)) != 0) { + if ((termp = TerminalOf(SP_PARM)) != NULL) { TTY buf; BEFORE("raw"); @@ -116,8 +116,8 @@ NCURSES_SP_NAME(raw) (NCURSES_SP_DCL0) KbdSetStatus(&kbdinfo, 0); #endif if (SP_PARM) { - SP_PARM->_raw = TRUE; - SP_PARM->_cbreak = 1; + IsRaw(SP_PARM) = TRUE; + IsCbreak(SP_PARM) = 1; } termp->Nttyb = buf; } @@ -141,7 +141,7 @@ NCURSES_SP_NAME(cbreak) (NCURSES_SP_DCL0) TERMINAL *termp; T((T_CALLED("cbreak(%p)"), (void *) SP_PARM)); - if ((termp = TerminalOf(SP_PARM)) != 0) { + if ((termp = TerminalOf(SP_PARM)) != NULL) { TTY buf; BEFORE("cbreak"); @@ -151,7 +151,6 @@ NCURSES_SP_NAME(cbreak) (NCURSES_SP_DCL0) #ifdef TERMIOS buf.c_lflag &= (unsigned) ~ICANON; buf.c_iflag &= (unsigned) ~ICRNL; - buf.c_lflag |= ISIG; buf.c_cc[VMIN] = 1; buf.c_cc[VTIME] = 0; #elif defined(EXP_WIN32_DRIVER) @@ -163,7 +162,7 @@ NCURSES_SP_NAME(cbreak) (NCURSES_SP_DCL0) result = NCURSES_SP_NAME(_nc_set_tty_mode) (NCURSES_SP_ARGx &buf); if (result == OK) { if (SP_PARM) { - SP_PARM->_cbreak = 1; + IsCbreak(SP_PARM) = 1; } termp->Nttyb = buf; } @@ -180,17 +179,13 @@ cbreak(void) } #endif -/* - * Note: - * this implementation may be wrong. See the comment under intrflush(). - */ NCURSES_EXPORT(void) NCURSES_SP_NAME(qiflush) (NCURSES_SP_DCL0) { TERMINAL *termp; T((T_CALLED("qiflush(%p)"), (void *) SP_PARM)); - if ((termp = TerminalOf(SP_PARM)) != 0) { + if ((termp = TerminalOf(SP_PARM)) != NULL) { TTY buf; int result; @@ -225,7 +220,7 @@ NCURSES_SP_NAME(noraw) (NCURSES_SP_DCL0) TERMINAL *termp; T((T_CALLED("noraw(%p)"), (void *) SP_PARM)); - if ((termp = TerminalOf(SP_PARM)) != 0) { + if ((termp = TerminalOf(SP_PARM)) != NULL) { TTY buf; BEFORE("noraw"); @@ -255,8 +250,8 @@ NCURSES_SP_NAME(noraw) (NCURSES_SP_DCL0) KbdSetStatus(&kbdinfo, 0); #endif if (SP_PARM) { - SP_PARM->_raw = FALSE; - SP_PARM->_cbreak = 0; + IsRaw(SP_PARM) = FALSE; + IsCbreak(SP_PARM) = 0; } termp->Nttyb = buf; } @@ -280,7 +275,7 @@ NCURSES_SP_NAME(nocbreak) (NCURSES_SP_DCL0) TERMINAL *termp; T((T_CALLED("nocbreak(%p)"), (void *) SP_PARM)); - if ((termp = TerminalOf(SP_PARM)) != 0) { + if ((termp = TerminalOf(SP_PARM)) != NULL) { TTY buf; BEFORE("nocbreak"); @@ -298,7 +293,7 @@ NCURSES_SP_NAME(nocbreak) (NCURSES_SP_DCL0) result = NCURSES_SP_NAME(_nc_set_tty_mode) (NCURSES_SP_ARGx &buf); if (result == OK) { if (SP_PARM) { - SP_PARM->_cbreak = 0; + IsCbreak(SP_PARM) = 0; } termp->Nttyb = buf; } @@ -321,7 +316,7 @@ NCURSES_SP_NAME(noqiflush) (NCURSES_SP_DCL0) TERMINAL *termp; T((T_CALLED("noqiflush(%p)"), (void *) SP_PARM)); - if ((termp = TerminalOf(SP_PARM)) != 0) { + if ((termp = TerminalOf(SP_PARM)) != NULL) { TTY buf; int result; @@ -350,11 +345,7 @@ noqiflush(void) #endif /* - * This call does the same thing as the qiflush()/noqiflush() pair. We know - * for certain that SVr3 intrflush() tweaks the NOFLSH bit; on the other hand, - * the match (in the SVr4 man pages) between the language describing NOFLSH in - * termio(7) and the language describing qiflush()/noqiflush() in - * curs_inopts(3x) is too exact to be coincidence. + * This call does the same thing as the qiflush()/noqiflush() pair. */ NCURSES_EXPORT(int) NCURSES_SP_NAME(intrflush) (NCURSES_SP_DCLx WINDOW *win GCC_UNUSED, bool flag) @@ -363,10 +354,10 @@ NCURSES_SP_NAME(intrflush) (NCURSES_SP_DCLx WINDOW *win GCC_UNUSED, bool flag) TERMINAL *termp; T((T_CALLED("intrflush(%p,%d)"), (void *) SP_PARM, flag)); - if (SP_PARM == 0) + if (SP_PARM == NULL) returnCode(ERR); - if ((termp = TerminalOf(SP_PARM)) != 0) { + if ((termp = TerminalOf(SP_PARM)) != NULL) { TTY buf; BEFORE("intrflush"); @@ -395,3 +386,46 @@ intrflush(WINDOW *win GCC_UNUSED, bool flag) return NCURSES_SP_NAME(intrflush) (CURRENT_SCREEN, win, flag); } #endif + +#if NCURSES_EXT_FUNCS +/* *INDENT-OFF* */ + +/* + * SCREEN is always opaque, but nl/raw/cbreak/echo set properties in it. + * As an extension, provide a way to query the properties. + * + * There are other properties which could be queried, e.g., filter, keypad, + * use_env, use_meta, but these particular properties are saved/restored within + * the wgetnstr() and wgetn_wstr() functions, which requires that the higher + * level curses library knows about the internal state of the lower level + * terminfo library. + */ + +#define is_TEST(show,what) \ + NCURSES_EXPORT(int) \ + NCURSES_SP_NAME(show) (NCURSES_SP_DCL0) \ + { \ + return ((SP_PARM != NULL) ? (what(SP_PARM) ? 1 : 0) : -1); \ + } + +is_TEST(is_nl, IsNl) +is_TEST(is_raw, IsRaw) +is_TEST(is_cbreak, IsCbreak) +is_TEST(is_echo, IsEcho) + +#if NCURSES_SP_FUNCS +#undef is_TEST +#define is_TEST(show) \ + NCURSES_EXPORT(int) \ + show(void) \ + { \ + return NCURSES_SP_NAME(show) (CURRENT_SCREEN); \ + } +is_TEST(is_nl) +is_TEST(is_raw) +is_TEST(is_cbreak) +is_TEST(is_echo) +#endif + +/* *INDENT-ON* */ +#endif /* extensions */ diff --git a/ncurses/tinfo/lib_setup.c b/ncurses/tinfo/lib_setup.c index db93a368..f2a557db 100644 --- a/ncurses/tinfo/lib_setup.c +++ b/ncurses/tinfo/lib_setup.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2021,2022 Thomas E. Dickey * + * Copyright 2018-2024,2025 Thomas E. Dickey * * Copyright 1998-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -49,7 +49,7 @@ #include #endif -MODULE_ID("$Id: lib_setup.c,v 1.218 2022/08/13 18:12:22 tom Exp $") +MODULE_ID("$Id: lib_setup.c,v 1.250 2025/02/20 01:31:35 tom Exp $") /**************************************************************************** * @@ -115,12 +115,12 @@ NCURSES_PUBLIC_VAR(ttytype) (void) #if NCURSES_SP_FUNCS if (CURRENT_SCREEN) { TERMINAL *termp = TerminalOf(CURRENT_SCREEN); - if (termp != 0) { + if (termp != NULL) { result = TerminalType(termp).term_names; } } #else - if (cur_term != 0) { + if (cur_term != NULL) { result = TerminalType(cur_term).term_names; } #endif @@ -272,6 +272,190 @@ use_tioctl(bool f) } #endif +#if !(defined(USE_TERM_DRIVER) || defined(EXP_WIN32_DRIVER)) +static void +_nc_default_screensize(TERMINAL *termp, int *linep, int *colp) +{ + /* if we can't get dynamic info about the size, use static */ + if (*linep <= 0) { + *linep = (int) lines; + } + if (*colp <= 0) { + *colp = (int) columns; + } + + /* the ultimate fallback, assume fixed 24x80 size */ + if (*linep <= 0) { + *linep = 24; + } + if (*colp <= 0) { + *colp = 80; + } +} + +#if defined(USE_CHECK_SIZE) && defined(user6) && defined(user7) +static const char * +skip_csi(const char *value) +{ + if (UChar(*value) == CSI_CHR) { + ++value; + } else if (*value == ESC_CHR && value[1] == L_BLOCK) { + value += 2; + } + return value; +} + +static bool +is_expected(const char *value, const char *expected) +{ + bool result = FALSE; + if (VALID_STRING(value)) { + const char *skipped = skip_csi(value); + if (skipped != value) { + if (!strcmp(skipped, expected)) + result = TRUE; + } + } + return result; +} + +static bool +get_position(const TERMINAL *termp, int fd, int *row, int *col) +{ + bool result = FALSE; + size_t need = strlen(user7); + int have; + + have = (int) write(fd, user7, need); + + if (have == (int) need) { + int y, x; + char buf[20]; + char *s; + char cc; + const char *skipped; + + s = memset(buf, '\0', sizeof(buf)); + do { + size_t ask = (sizeof(buf) - 1 - (size_t) (s - buf)); + int got = (int) read(fd, s, ask); + if (got == 0) + break; + s += got; + *s = '\0'; + } while (strchr(buf, 'R') == NULL && (size_t) (s + 1 - buf) < sizeof(buf)); + T(("CPR response %s", _nc_visbuf(buf))); + skipped = skip_csi(buf); + cc = '\0'; + if (skipped != buf + && *skipped != '\0' + && sscanf(skip_csi(buf), "%d;%d%c", &y, &x, &cc) == 3 + && (cc == 'R')) { + *row = y; + *col = x; + result = TRUE; + } + } + T(("get_position %s %d,%d", result ? "OK" : "ERR", *row, *col)); + return result; +} + +static bool +set_position(NCURSES_SP_DCLx const TERMINAL *termp, int row, int col) +{ + bool result; + const char *actual = TIPARM_2(cursor_address, row, col); + T((T_CALLED("set_position %d,%d)"), row, col)); +#if NCURSES_SP_FUNCS + result = (NCURSES_SP_NAME(_nc_putp) (NCURSES_SP_ARGx "set_position", + actual) == OK); + NCURSES_SP_NAME(_nc_flush) (NCURSES_SP_ARG); +#else + /* This does not support padding because without sp-funcs, we have only + * the interface using stdio, but we are not guaranteed that Filedes + * is the same as fileno(stdout). + */ + result = FALSE; + if (actual != NULL) { + size_t want = strlen(actual); + int have = (int) write(termp->Filedes, actual, want); + result = ((int) want == have); + } +#endif + returnBool(result); +} + +/* + * This is a little more complicated than one might expect, because we do this + * before setting up the terminal modes, etc., and cannot use the timeout or + * buffering functions. + * + * We check if the terminal description has the ECMA-48 CPR (cursor position + * report) in u7 and the response in u6. The two variations of is_expected() + * cover the termcap style and terminfo style, and are equivalent as far as we + * are concerned. For analyzing the response, we wait (a short time) for 'R' + * to be echoed, and then check if we received two integers in the response. + * + * In principle, this could run on "any" ECMA-48 terminal, but in practice, + * there is a scenario using GNU screen where it uses ncurses with a partially + * configured pseudo-terminal, and the CPR response goes to the wrong place. + * So we do a simple check to exclude pseudo-terminals. + */ +static void +_nc_check_screensize(SCREEN *sp, TERMINAL *termp, int *linep, int *colp) +{ + int fd = termp->Filedes; + TTY saved; + const char *name = NULL; + + if (IsRealTty(fd, name) + && VALID_STRING(cursor_address) + && is_expected(user7, "6n") + && (is_expected(user6, "%i%d;%dR") || + is_expected(user6, "%i%p1%d;%p2%dR")) + && GET_TTY(fd, &saved) == OK) { + int current_y = -1, current_x = -1; + int updated_y = -1, updated_x = -1; + TTY alter = saved; + +#if NCURSES_SP_FUNCS + if (sp == NULL) { + sp = new_prescr(); + sp->_term = termp; + NCURSES_SP_NAME(baudrate) (NCURSES_SP_ARG); + } +#else + (void) sp; +#endif + + T(("trying CPR (u7/u6) with %s", name)); + alter.c_lflag &= (unsigned) ~(ECHO | ICANON | ISIG | IEXTEN); + alter.c_iflag &= (unsigned) ~(IXON | BRKINT | PARMRK); + alter.c_cc[VMIN] = 0; + alter.c_cc[VTIME] = 1; + SET_TTY(fd, &alter); + + if (get_position(termp, fd, ¤t_y, ¤t_x) + && set_position(NCURSES_SP_ARGx termp, 9999, 9999) + && get_position(termp, fd, &updated_y, &updated_x)) { + *linep = updated_y; + *colp = updated_x; + set_position(NCURSES_SP_ARGx termp, current_y, current_x); + } + /* restore tty modes */ + SET_TTY(fd, &saved); + } else { + T(("NOT trying CPR with fd %d (%s): %s", + fd, NonNull(name), NC_ISATTY(fd) ? "tty" : "not a tty")); + } + + _nc_default_screensize(termp, linep, colp); +} +#else /* !USE_CHECK_SIZE */ +#define _nc_check_screensize(sp, termp, linep, colp) /* nothing */ +#endif +#endif /* !(defined(USE_TERM_DRIVER) || defined(EXP_WIN32_DRIVER)) */ + NCURSES_EXPORT(void) _nc_get_screensize(SCREEN *sp, #ifdef USE_TERM_DRIVER @@ -284,14 +468,14 @@ _nc_get_screensize(SCREEN *sp, TERMINAL_CONTROL_BLOCK *TCB; int my_tabsize; - assert(termp != 0 && linep != 0 && colp != 0); + assert(termp != NULL && linep != NULL && colp != NULL); TCB = (TERMINAL_CONTROL_BLOCK *) termp; my_tabsize = TCB->info.tabsize; TCB->drv->td_size(TCB, linep, colp); #if USE_REENTRANT - if (sp != 0) { + if (sp != NULL) { sp->_TABSIZE = my_tabsize; } #else @@ -305,6 +489,7 @@ _nc_get_screensize(SCREEN *sp, bool useEnv = _nc_prescreen.use_env; bool useTioctl = _nc_prescreen.use_tioctl; + T((T_CALLED("_nc_get_screensize (%p)"), (void *) sp)); #ifdef EXP_WIN32_DRIVER /* If we are here, then Windows console is used in terminfo mode. We need to figure out the size using the console API @@ -326,6 +511,7 @@ _nc_get_screensize(SCREEN *sp, } #endif + T(("useEnv:%d useTioctl:%d", useEnv, useTioctl)); if (useEnv || useTioctl) { #ifdef __EMX__ { @@ -347,7 +533,7 @@ _nc_get_screensize(SCREEN *sp, errno = 0; do { if (ioctl(cur_term->Filedes, IOCTL_WINSIZE, &size) >= 0) { - *linep = ((sp != 0 && sp->_filtered) + *linep = ((sp != NULL && sp->_filtered) ? 1 : WINSIZE_ROWS(size)); *colp = WINSIZE_COLS(size); @@ -367,7 +553,8 @@ _nc_get_screensize(SCREEN *sp, /* * If environment variables are used, update them. */ - if ((sp == 0 || !sp->_filtered) && _nc_getenv_num("LINES") > 0) { + if ((sp == NULL || !sp->_filtered) && + _nc_getenv_num("LINES") > 0) { _nc_setenv_num("LINES", *linep); } if (_nc_getenv_num("COLUMNS") > 0) { @@ -382,29 +569,17 @@ _nc_get_screensize(SCREEN *sp, * variable. */ if ((value = _nc_getenv_num("LINES")) > 0) { - *linep = value; + *linep = Min(value, MAX_ENV_LINES); T(("screen size: environment LINES = %d", *linep)); } if ((value = _nc_getenv_num("COLUMNS")) > 0) { - *colp = value; + *colp = Min(value, MAX_ENV_COLUMNS); T(("screen size: environment COLUMNS = %d", *colp)); } - } - /* if we can't get dynamic info about the size, use static */ - if (*linep <= 0) { - *linep = (int) lines; - } - if (*colp <= 0) { - *colp = (int) columns; - } - - /* the ultimate fallback, assume fixed 24x80 size */ - if (*linep <= 0) { - *linep = 24; - } - if (*colp <= 0) { - *colp = 80; + _nc_default_screensize(termp, linep, colp); + } else { + _nc_check_screensize(sp, termp, linep, colp); } /* @@ -419,6 +594,8 @@ _nc_get_screensize(SCREEN *sp, OldNumber(termp, lines) = (short) (*linep); OldNumber(termp, columns) = (short) (*colp); #endif + } else { + _nc_check_screensize(sp, termp, linep, colp); } T(("screen size is %dx%d", *linep, *colp)); @@ -429,12 +606,13 @@ _nc_get_screensize(SCREEN *sp, my_tabsize = 8; #if USE_REENTRANT - if (sp != 0) + if (sp != NULL) sp->_TABSIZE = my_tabsize; #else TABSIZE = my_tabsize; #endif T(("TABSIZE = %d", TABSIZE)); + returnVoid; #endif /* USE_TERM_DRIVER */ } @@ -449,7 +627,7 @@ _nc_update_screensize(SCREEN *sp) int old_lines; int old_cols; - assert(sp != 0); + assert(sp != NULL); CallDriver_2(sp, td_getsize, &old_lines, &old_cols); @@ -459,17 +637,17 @@ _nc_update_screensize(SCREEN *sp) int old_cols = columns; #endif - if (sp != 0) { + if (sp != NULL) { TINFO_GET_SIZE(sp, sp->_term, &new_lines, &new_cols); /* * See is_term_resized() and resizeterm(). * We're doing it this way because those functions belong to the upper * ncurses library, while this resides in the lower terminfo library. */ - if (sp->_resize != 0) { + if (sp->_resize != NULL) { if ((new_lines != old_lines) || (new_cols != old_cols)) { sp->_resize(NCURSES_SP_ARGx new_lines, new_cols); - } else if (sp->_sig_winch && (sp->_ungetch != 0)) { + } else if (sp->_sig_winch && (sp->_ungetch != NULL)) { sp->_ungetch(SP_PARM, KEY_RESIZE); /* so application can know this */ } sp->_sig_winch = FALSE; @@ -503,6 +681,7 @@ _nc_setup_tinfo(const char *const tn, TERMTYPE2 *const tp) */ if (status == TGETENT_YES) { unsigned n; + T(("_nc_setup_tinfo - resetting invalid booleans/strings")); for_each_boolean(n, tp) { if (!VALID_BOOLEAN(tp->Booleans[n])) tp->Booleans[n] = FALSE; @@ -517,9 +696,9 @@ _nc_setup_tinfo(const char *const tn, TERMTYPE2 *const tp) #endif /* -** Take the real command character out of the CC environment variable -** and substitute it in for the prototype given in 'command_character'. -*/ + * Take the real command character out of the CC environment variable + * and substitute it in for the prototype given in 'command_character'. + */ void _nc_tinfo_cmdch(TERMINAL *termp, int proto) { @@ -530,14 +709,17 @@ _nc_tinfo_cmdch(TERMINAL *termp, int proto) * since it is fairly common for developers to set the C compiler * name as an environment variable - using the same symbol. */ - if ((tmp = getenv("CC")) != 0 && strlen(tmp) == 1) { + if ((tmp = getenv("CC")) != NULL && strlen(tmp) == 1) { unsigned i; char CC = *tmp; for_each_string(i, &(termp->type)) { - for (tmp = termp->type.Strings[i]; tmp && *tmp; tmp++) { - if (UChar(*tmp) == proto) - *tmp = CC; + tmp = termp->type.Strings[i]; + if (VALID_STRING(tmp)) { + for (; *tmp; ++tmp) { + if (UChar(*tmp) == proto) + *tmp = CC; + } } } } @@ -555,7 +737,7 @@ _nc_get_locale(void) * This is preferable to using getenv() since it ensures that we are using * the locale which was actually initialized by the application. */ - env = setlocale(LC_CTYPE, 0); + env = setlocale(LC_CTYPE, NULL); #else if (((env = getenv("LANG")) != 0 && *env != '\0') || ((env = getenv("LC_CTYPE")) != 0 && *env != '\0') @@ -570,30 +752,35 @@ _nc_get_locale(void) /* * Check if we are running in a UTF-8 locale. */ -NCURSES_EXPORT(int) +NCURSES_EXPORT(bool) _nc_unicode_locale(void) { - int result = 0; -#if defined(_NC_WINDOWS) && USE_WIDEC_SUPPORT - result = 1; + static bool initialized = FALSE; + static bool result = FALSE; + + if (!initialized) { +#if defined(_NC_WINDOWS_NATIVE) && USE_WIDEC_SUPPORT + result = TRUE; #elif HAVE_LANGINFO_CODESET - char *env = nl_langinfo(CODESET); - result = !strcmp(env, "UTF-8"); - T(("_nc_unicode_locale(%s) ->%d", env, result)); + char *env = nl_langinfo(CODESET); + result = !strcmp(env, "UTF-8") ? TRUE : FALSE; + T(("_nc_unicode_locale(%s) ->%d", env, result)); #else - char *env = _nc_get_locale(); - if (env != 0) { - if (strstr(env, ".UTF-8") != 0) { - result = 1; - T(("_nc_unicode_locale(%s) ->%d", env, result)); + char *env = _nc_get_locale(); + if (env != NULL) { + if (strstr(env, ".UTF-8") != NULL) { + result = TRUE; + T(("_nc_unicode_locale(%s) ->%d", env, result)); + } } - } #endif + initialized = TRUE; + } return result; } -#define CONTROL_N(s) ((s) != 0 && strstr(s, "\016") != 0) -#define CONTROL_O(s) ((s) != 0 && strstr(s, "\017") != 0) +#define CONTROL_N(s) ((s) != NULL && strstr(s, "\016") != NULL) +#define CONTROL_O(s) ((s) != NULL && strstr(s, "\017") != NULL) /* * Check for known broken cases where a UTF-8 locale breaks the alternate @@ -608,17 +795,17 @@ _nc_locale_breaks_acs(TERMINAL *termp) int result = 0; T((T_CALLED("_nc_locale_breaks_acs:%d"), result)); - if (getenv(env_name) != 0) { + if (getenv(env_name) != NULL) { result = _nc_getenv_num(env_name); - } else if ((value = tigetnum("U8")) >= 0) { + } else if ((value = tigetnum(UserCap(U8))) >= 0) { result = value; /* use extension feature */ - } else if ((env = getenv("TERM")) != 0) { + } else if ((env = getenv("TERM")) != NULL) { if (strstr(env, "linux")) { result = 1; /* always broken */ - } else if (strstr(env, "screen") != 0 - && ((env = getenv("TERMCAP")) != 0 - && strstr(env, "screen") != 0) - && strstr(env, "hhII00") != 0) { + } else if (strstr(env, "screen") != NULL + && ((env = getenv("TERMCAP")) != NULL + && strstr(env, "screen") != NULL) + && strstr(env, "hhII00") != NULL) { if (CONTROL_N(enter_alt_charset_mode) || CONTROL_O(enter_alt_charset_mode) || CONTROL_N(set_attributes) || @@ -638,10 +825,10 @@ TINFO_SETUP_TERM(TERMINAL **tp, int reuse) { #ifdef USE_TERM_DRIVER - TERMINAL_CONTROL_BLOCK *TCB = 0; + TERMINAL_CONTROL_BLOCK *TCB = NULL; #endif TERMINAL *termp; - SCREEN *sp = 0; + SCREEN *sp = NULL; char *myname; int code = ERR; @@ -651,7 +838,7 @@ TINFO_SETUP_TERM(TERMINAL **tp, T((T_CALLED("_nc_setupterm_ex(%p,%s,%d,%p)"), (void *) tp, _nc_visbuf(tname), Filedes, (void *) errret)); - if (tp == 0) { + if (tp == NULL) { ret_error0(TGETENT_ERR, "Invalid parameter, internal error.\n"); } else @@ -661,7 +848,7 @@ TINFO_SETUP_TERM(TERMINAL **tp, T((T_CALLED("setupterm(%s,%d,%p)"), _nc_visbuf(tname), Filedes, (void *) errret)); #endif - if (tname == 0) { + if (tname == NULL) { tname = getenv("TERM"); #if defined(EXP_WIN32_DRIVER) if (!VALID_TERM_ENV(tname, NO_TERMINAL)) { @@ -679,10 +866,9 @@ TINFO_SETUP_TERM(TERMINAL **tp, #endif } myname = strdup(tname); - - if (strlen(myname) > MAX_NAME_SIZE) { + if (myname == NULL || strlen(myname) > MAX_NAME_SIZE) { ret_error(TGETENT_ERR, - "TERM environment must be <= %d characters.\n", + "TERM environment must be 1..%d characters.\n", MAX_NAME_SIZE, free(myname)); } @@ -717,9 +903,9 @@ TINFO_SETUP_TERM(TERMINAL **tp, * properly with this feature). */ if (reuse - && (termp != 0) + && (termp != NULL) && termp->Filedes == Filedes - && termp->_termname != 0 + && termp->_termname != NULL && !strcmp(termp->_termname, myname) && _nc_name_match(TerminalType(termp).term_names, myname, "|")) { T(("reusing existing terminal information and mode-settings")); @@ -730,15 +916,15 @@ TINFO_SETUP_TERM(TERMINAL **tp, } else { #ifdef USE_TERM_DRIVER TERMINAL_CONTROL_BLOCK *my_tcb; - termp = 0; - if ((my_tcb = typeCalloc(TERMINAL_CONTROL_BLOCK, 1)) != 0) + termp = NULL; + if ((my_tcb = typeCalloc(TERMINAL_CONTROL_BLOCK, 1)) != NULL) termp = &(my_tcb->term); #else int status; termp = typeCalloc(TERMINAL, 1); #endif - if (termp == 0) { + if (termp == NULL) { ret_error1(TGETENT_ERR, "Not enough memory to create terminal structure.\n", myname, free(myname)); @@ -764,10 +950,14 @@ TINFO_SETUP_TERM(TERMINAL **tp, #ifdef USE_TERM_DRIVER INIT_TERM_DRIVER(); + /* + * _nc_get_driver() will call td_CanHandle() for each driver, and win_driver + * needs file descriptor to do the test, so set it before calling. + */ + termp->Filedes = (short) Filedes; TCB = (TERMINAL_CONTROL_BLOCK *) termp; code = _nc_globals.term_driver(TCB, myname, errret); if (code == OK) { - termp->Filedes = (short) Filedes; termp->_termname = strdup(myname); } else { ret_error1(errret ? *errret : TGETENT_ERR, @@ -819,7 +1009,7 @@ TINFO_SETUP_TERM(TERMINAL **tp, set_curterm(termp); - if (command_character) + if (VALID_STRING(command_character)) _nc_tinfo_cmdch(termp, UChar(*command_character)); /* @@ -886,10 +1076,10 @@ TINFO_SETUP_TERM(TERMINAL **tp, NCURSES_EXPORT(SCREEN *) _nc_find_prescr(void) { - SCREEN *result = 0; + SCREEN *result = NULL; PRESCREEN_LIST *p; pthread_t id = GetThreadID(); - for (p = _nc_prescreen.allocated; p != 0; p = p->next) { + for (p = _nc_prescreen.allocated; p != NULL; p = p->next) { if (p->id == id) { result = p->sp; break; @@ -909,7 +1099,7 @@ _nc_forget_prescr(void) PRESCREEN_LIST *p, *q; pthread_t id = GetThreadID(); _nc_lock_global(screen); - for (p = _nc_prescreen.allocated, q = 0; p != 0; q = p, p = p->next) { + for (p = _nc_prescreen.allocated, q = NULL; p != NULL; q = p, p = p->next) { if (p->id == id) { if (q) { q->next = p->next; @@ -940,13 +1130,13 @@ new_prescr(void) T((T_CALLED("new_prescr()"))); _nc_lock_global(screen); - if ((sp = _nc_find_prescr()) == 0) { + if ((sp = _nc_find_prescr()) == NULL) { sp = _nc_alloc_screen_sp(); T(("_nc_alloc_screen_sp %p", (void *) sp)); - if (sp != 0) { + if (sp != NULL) { #ifdef USE_PTHREADS PRESCREEN_LIST *p = typeCalloc(PRESCREEN_LIST, 1); - if (p != 0) { + if (p != NULL) { p->id = GetThreadID(); p->sp = sp; p->next = _nc_prescreen.allocated; @@ -962,7 +1152,7 @@ new_prescr(void) sp->_no_padding = _nc_prescreen._no_padding; #endif sp->slk_format = 0; - sp->_slk = 0; + sp->_slk = NULL; sp->_prescreen = TRUE; SP_PRE_INIT(sp); #if USE_REENTRANT @@ -990,14 +1180,14 @@ _nc_setupterm(const char *tname, int reuse) { int rc = ERR; - TERMINAL *termp = 0; + TERMINAL *termp = NULL; _nc_init_pthreads(); _nc_lock_global(prescreen); START_TRACE(); if (TINFO_SETUP_TERM(&termp, tname, Filedes, errret, reuse) == OK) { _nc_forget_prescr(); - if (NCURSES_SP_NAME(set_curterm) (CURRENT_SCREEN_PRE, termp) != 0) { + if (NCURSES_SP_NAME(set_curterm) (CURRENT_SCREEN_PRE, termp) != NULL) { rc = OK; } } diff --git a/ncurses/tinfo/lib_termcap.c b/ncurses/tinfo/lib_termcap.c index 5ce43a3c..2bfd8a1f 100644 --- a/ncurses/tinfo/lib_termcap.c +++ b/ncurses/tinfo/lib_termcap.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018,2020 Thomas E. Dickey * + * Copyright 2018-2023,2024 Thomas E. Dickey * * Copyright 1998-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -49,10 +49,10 @@ #define CUR SP_TERMTYPE #endif -MODULE_ID("$Id: lib_termcap.c,v 1.88 2020/02/02 23:34:34 tom Exp $") +MODULE_ID("$Id: lib_termcap.c,v 1.92 2024/12/15 00:12:19 tom Exp $") -NCURSES_EXPORT_VAR(char *) UP = 0; -NCURSES_EXPORT_VAR(char *) BC = 0; +NCURSES_EXPORT_VAR(char *) UP = NULL; +NCURSES_EXPORT_VAR(char *) BC = NULL; #define MyCache _nc_globals.tgetent_cache #define CacheInx _nc_globals.tgetent_index @@ -95,7 +95,7 @@ NCURSES_SP_NAME(tgetent) (NCURSES_SP_DCLx char *bufp, const char *name) int n; bool found_cache = FALSE; #ifdef USE_TERM_DRIVER - TERMINAL *termp = 0; + TERMINAL *termp = NULL; #endif START_TRACE(); @@ -104,7 +104,7 @@ NCURSES_SP_NAME(tgetent) (NCURSES_SP_DCLx char *bufp, const char *name) TINFO_SETUP_TERM(&termp, name, STDOUT_FILENO, &rc, TRUE); #ifdef USE_TERM_DRIVER - if (termp == 0 || + if (termp == NULL || !((TERMINAL_CONTROL_BLOCK *) termp)->drv->isTerminfo) returnCode(rc); #endif @@ -125,18 +125,18 @@ NCURSES_SP_NAME(tgetent) (NCURSES_SP_DCLx char *bufp, const char *name) bool same_result = (MyCache[n].last_used && MyCache[n].last_bufp == bufp); if (same_result) { CacheInx = n; - if (FIX_SGR0 != 0) { + if (FIX_SGR0 != NULL) { FreeAndNull(FIX_SGR0); } /* * Also free the terminfo data that we loaded (much bigger leak). */ - if (LAST_TRM != 0 && LAST_TRM != TerminalOf(SP_PARM)) { - TERMINAL *trm = LAST_TRM; + if (LAST_TRM != NULL && LAST_TRM != TerminalOf(SP_PARM)) { + const TERMINAL *trm = LAST_TRM; NCURSES_SP_NAME(del_curterm) (NCURSES_SP_ARGx LAST_TRM); for (CacheInx = 0; CacheInx < TGETENT_MAX; ++CacheInx) if (LAST_TRM == trm) - LAST_TRM = 0; + LAST_TRM = NULL; CacheInx = n; } found_cache = TRUE; @@ -157,13 +157,13 @@ NCURSES_SP_NAME(tgetent) (NCURSES_SP_DCLx char *bufp, const char *name) LAST_TRM = TerminalOf(SP_PARM); LAST_SEQ = ++CacheSeq; } else { - LAST_TRM = 0; + LAST_TRM = NULL; } PC = 0; - UP = 0; - BC = 0; - FIX_SGR0 = 0; /* don't free it - application may still use */ + UP = NULL; + BC = NULL; + FIX_SGR0 = NULL; /* don't free it - application may still use */ if (rc == 1) { @@ -180,12 +180,12 @@ NCURSES_SP_NAME(tgetent) (NCURSES_SP_DCLx char *bufp, const char *name) BC = backspace_if_not_bs; if ((FIX_SGR0 = _nc_trim_sgr0(&TerminalType(TerminalOf(SP_PARM)))) - != 0) { + != NULL) { if (!strcmp(FIX_SGR0, exit_attribute_mode)) { if (FIX_SGR0 != exit_attribute_mode) { free(FIX_SGR0); } - FIX_SGR0 = 0; + FIX_SGR0 = NULL; } } LAST_BUF = bufp; @@ -246,7 +246,7 @@ NCURSES_SP_NAME(tgetflag) (NCURSES_SP_DCLx const char *id) int j = -1; entry_ptr = _nc_find_type_entry(id, BOOLEAN, TRUE); - if (entry_ptr != 0) { + if (entry_ptr != NULL) { j = entry_ptr->nte_index; } #if NCURSES_XNAMES @@ -298,7 +298,7 @@ NCURSES_SP_NAME(tgetnum) (NCURSES_SP_DCLx const char *id) int j = -1; entry_ptr = _nc_find_type_entry(id, NUMBER, TRUE); - if (entry_ptr != 0) { + if (entry_ptr != NULL) { j = entry_ptr->nte_index; } #if NCURSES_XNAMES @@ -350,7 +350,7 @@ NCURSES_SP_NAME(tgetstr) (NCURSES_SP_DCLx const char *id, char **area) int j = -1; entry_ptr = _nc_find_type_entry(id, STRING, TRUE); - if (entry_ptr != 0) { + if (entry_ptr != NULL) { j = entry_ptr->nte_index; } #if NCURSES_XNAMES @@ -371,12 +371,12 @@ NCURSES_SP_NAME(tgetstr) (NCURSES_SP_DCLx const char *id, char **area) /* setupterm forces canceled strings to null */ if (VALID_STRING(result)) { if (result == exit_attribute_mode - && FIX_SGR0 != 0) { + && FIX_SGR0 != NULL) { result = FIX_SGR0; TR(TRACE_DATABASE, ("altered to : %s", _nc_visbuf(result))); } - if (area != 0 - && *area != 0) { + if (area != NULL + && *area != NULL) { _nc_STRCPY(*area, result, 1024); result = *area; *area += strlen(*area) + 1; @@ -399,15 +399,15 @@ tgetstr(const char *id, char **area) #undef CacheInx #define CacheInx num NCURSES_EXPORT(void) -_nc_tgetent_leak(TERMINAL *termp) +_nc_tgetent_leak(const TERMINAL *const termp) { - if (termp != 0) { + if (termp != NULL) { int num; for (CacheInx = 0; CacheInx < TGETENT_MAX; ++CacheInx) { if (LAST_TRM == termp) { FreeAndNull(FIX_SGR0); - if (LAST_TRM != 0) { - LAST_TRM = 0; + if (LAST_TRM != NULL) { + LAST_TRM = NULL; } break; } @@ -420,7 +420,7 @@ _nc_tgetent_leaks(void) { int num; for (CacheInx = 0; CacheInx < TGETENT_MAX; ++CacheInx) { - if (LAST_TRM != 0) { + if (LAST_TRM != NULL) { del_curterm(LAST_TRM); _nc_tgetent_leak(LAST_TRM); } diff --git a/ncurses/tinfo/lib_termname.c b/ncurses/tinfo/lib_termname.c index 2d80bb34..a0dca620 100644 --- a/ncurses/tinfo/lib_termname.c +++ b/ncurses/tinfo/lib_termname.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020 Thomas E. Dickey * + * Copyright 2020-2024,2025 Thomas E. Dickey * * Copyright 1998-2003,2009 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -29,21 +29,21 @@ #include -MODULE_ID("$Id: lib_termname.c,v 1.13 2020/02/02 23:34:34 tom Exp $") +MODULE_ID("$Id: lib_termname.c,v 1.15 2025/01/12 00:41:56 tom Exp $") NCURSES_EXPORT(char *) NCURSES_SP_NAME(termname) (NCURSES_SP_DCL0) { - char *name = 0; + char *name = NULL; T((T_CALLED("termname(%p)"), (void *) SP_PARM)); #if NCURSES_SP_FUNCS - if (TerminalOf(SP_PARM) != 0) { + if (TerminalOf(SP_PARM) != NULL) { name = TerminalOf(SP_PARM)->_termname; } #else - if (cur_term != 0) + if (cur_term != NULL) name = cur_term->_termname; #endif diff --git a/ncurses/tinfo/lib_tgoto.c b/ncurses/tinfo/lib_tgoto.c index 9cf5e100..2f7f63f5 100644 --- a/ncurses/tinfo/lib_tgoto.c +++ b/ncurses/tinfo/lib_tgoto.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2019,2020 Thomas E. Dickey * + * Copyright 2018-2023,2025 Thomas E. Dickey * * Copyright 2000-2008,2012 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -36,7 +36,7 @@ #include #include -MODULE_ID("$Id: lib_tgoto.c,v 1.21 2020/05/27 23:55:56 tom Exp $") +MODULE_ID("$Id: lib_tgoto.c,v 1.24 2025/01/12 00:41:56 tom Exp $") #if !PURE_TERMINFO static bool @@ -44,7 +44,7 @@ is_termcap(const char *string) { bool result = TRUE; - if (string == 0 || *string == '\0') { + if (string == NULL || *string == '\0') { result = FALSE; /* tparm() handles empty strings */ } else { while ((*string != '\0') && result) { @@ -89,13 +89,13 @@ tgoto_internal(const char *string, int x, int y) while (*string != 0) { if ((used + need) > length) { length += (used + need); - if ((result = typeRealloc(char, length, result)) == 0) { + if ((result = typeRealloc(char, length, result)) == NULL) { length = 0; break; } } if (*string == '%') { - const char *fmt = 0; + const char *fmt = NULL; switch (*++string) { case '\0': @@ -122,7 +122,7 @@ tgoto_internal(const char *string, int x, int y) * and \r, but I don't see that it could work -TD */ if (*value == 0) { - if (BC != 0) { + if (BC != NULL) { *value += 1; need_BC = TRUE; } else { @@ -166,11 +166,11 @@ tgoto_internal(const char *string, int x, int y) *value -= 2 * (*value % 16); break; } - if (fmt != 0) { + if (fmt != NULL) { _nc_SPRINTF(result + used, _nc_SLIMIT(length - used) fmt, *value++); used += strlen(result + used); - fmt = 0; + fmt = NULL; } if (value - param > 2) { value = param + 2; @@ -181,7 +181,7 @@ tgoto_internal(const char *string, int x, int y) } string++; } - if (result != 0) { + if (result != NULL) { if (need_BC) { _nc_STRCPY(result + used, BC, length - used); used += strlen(BC); @@ -207,6 +207,16 @@ tgoto(const char *string, int x, int y) result = tgoto_internal(string, x, y); else #endif - result = TIPARM_2(string, y, x); + if ((result = TIPARM_2(string, y, x)) == NULL) { + /* + * Because termcap did not provide a more general solution such as + * tparm(), it was necessary to handle single-parameter capabilities + * using tgoto(). The internal _nc_tiparm() function returns a NULL + * for that case; retry for the single-parameter case. + */ + if ((result = TIPARM_1(string, y)) == NULL) { + result = TIPARM_0(string); + } + } returnPtr(result); } diff --git a/ncurses/tinfo/lib_ti.c b/ncurses/tinfo/lib_ti.c index 5cb77b85..720c7c2e 100644 --- a/ncurses/tinfo/lib_ti.c +++ b/ncurses/tinfo/lib_ti.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018,2020 Thomas E. Dickey * + * Copyright 2018-2020,2024 Thomas E. Dickey * * Copyright 1998-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -37,7 +37,7 @@ #include -MODULE_ID("$Id: lib_ti.c,v 1.34 2020/02/02 23:34:34 tom Exp $") +MODULE_ID("$Id: lib_ti.c,v 1.35 2024/12/07 20:06:49 tom Exp $") #if 0 static bool @@ -63,7 +63,7 @@ NCURSES_SP_NAME(tigetflag) (NCURSES_SP_DCLx const char *str) int j = -1; entry_ptr = _nc_find_type_entry(str, BOOLEAN, FALSE); - if (entry_ptr != 0) { + if (entry_ptr != NULL) { j = entry_ptr->nte_index; } #if NCURSES_XNAMES @@ -108,7 +108,7 @@ NCURSES_SP_NAME(tigetnum) (NCURSES_SP_DCLx const char *str) int j = -1; entry_ptr = _nc_find_type_entry(str, NUMBER, FALSE); - if (entry_ptr != 0) { + if (entry_ptr != NULL) { j = entry_ptr->nte_index; } #if NCURSES_XNAMES @@ -155,7 +155,7 @@ NCURSES_SP_NAME(tigetstr) (NCURSES_SP_DCLx const char *str) int j = -1; entry_ptr = _nc_find_type_entry(str, STRING, FALSE); - if (entry_ptr != 0) { + if (entry_ptr != NULL) { j = entry_ptr->nte_index; } #if NCURSES_XNAMES diff --git a/ncurses/tinfo/lib_tparm.c b/ncurses/tinfo/lib_tparm.c index d9bdfd8f..22eb7f39 100644 --- a/ncurses/tinfo/lib_tparm.c +++ b/ncurses/tinfo/lib_tparm.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2020,2021 Thomas E. Dickey * + * Copyright 2018-2024,2025 Thomas E. Dickey * * Copyright 1998-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -53,7 +53,7 @@ #include #include -MODULE_ID("$Id: lib_tparm.c,v 1.137 2021/11/20 23:29:15 tom Exp $") +MODULE_ID("$Id: lib_tparm.c,v 1.157 2025/02/15 15:20:16 tom Exp $") /* * char * @@ -87,7 +87,7 @@ MODULE_ID("$Id: lib_tparm.c,v 1.137 2021/11/20 23:29:15 tom Exp $") * The ':' is used to avoid making %+ or %- * patterns (see below). * - * %p[1-9] push ith parm + * %p[1-9] push ith param * %P[a-z] set dynamic variable [a-z] to pop() * %g[a-z] get dynamic variable [a-z] and push it * %P[A-Z] set static variable [A-Z] to pop() @@ -102,7 +102,7 @@ MODULE_ID("$Id: lib_tparm.c,v 1.137 2021/11/20 23:29:15 tom Exp $") * %= %> %< logical operations: push(pop() op pop()) * %A %O logical and & or operations for conditionals * %! %~ unary operations push(op pop()) - * %i add 1 to first two parms (for ANSI terminals) + * %i add 1 to first two params (for ANSI terminals) * * %? expr %t thenpart %e elsepart %; * if-then-else, %e elsepart is optional. @@ -177,19 +177,21 @@ _nc_free_tparm(TERMINAL *termp) #if HAVE_TSEARCH if (MyCount != 0) { delete_tparm = typeCalloc(TPARM_DATA *, MyCount); - which_tparm = 0; - twalk(MyCache, visit_nodes); - for (which_tparm = 0; which_tparm < MyCount; ++which_tparm) { - TPARM_DATA *ptr = delete_tparm[which_tparm]; - if (ptr != NULL) { - tdelete(ptr, &MyCache, cmp_format); - free((char *) ptr->format); - free(ptr); + if (delete_tparm != NULL) { + which_tparm = 0; + twalk(MyCache, visit_nodes); + for (which_tparm = 0; which_tparm < MyCount; ++which_tparm) { + TPARM_DATA *ptr = delete_tparm[which_tparm]; + if (ptr != NULL) { + tdelete(ptr, &MyCache, cmp_format); + free((char *) ptr->format); + free(ptr); + } } + which_tparm = 0; + twalk(MyCache, visit_nodes); + FreeAndNull(delete_tparm); } - which_tparm = 0; - twalk(MyCache, visit_nodes); - FreeAndNull(delete_tparm); MyCount = 0; which_tparm = 0; } @@ -341,7 +343,7 @@ static NCURSES_INLINE int #define spop(tps) \ ((TPS(stack_ptr)-- > 0) \ ? ((!TPS(stack)[TPS(stack_ptr)].num_type \ - && TPS(stack)[TPS(stack_ptr)].data.str != 0) \ + && TPS(stack)[TPS(stack_ptr)].data.str != NULL) \ ? TPS(stack)[TPS(stack_ptr)].data.str \ : dummy) \ : (tparm_error(tps, "spop: stack underflow"), \ @@ -359,7 +361,7 @@ static NCURSES_INLINE const char * parse_format(const char *s, char *format, int *len) { *len = 0; - if (format != 0) { + if (format != NULL) { bool done = FALSE; bool allowminus = FALSE; bool dot = FALSE; @@ -473,13 +475,13 @@ _nc_tparm_analyze(TERMINAL *term, const char *string, char **p_is_s, int *popcou int level = -1; const char *cp = string; - if (cp == 0) + if (cp == NULL) return 0; if ((len2 = strlen(cp)) + 2 > TPS(fmt_size)) { TPS(fmt_size) += len2 + 2; TPS(fmt_buff) = typeRealloc(char, TPS(fmt_size), TPS(fmt_buff)); - if (TPS(fmt_buff) == 0) + if (TPS(fmt_buff) == NULL) return 0; } @@ -605,8 +607,8 @@ tparm_setup(TERMINAL *term, const char *string, TPARM_DATA *result) TPS(out_used) = 0; memset(result, 0, sizeof(*result)); - if (string == NULL) { - TR(TRACE_CALLS, ("%s: format is null", TPS(tname))); + if (!VALID_STRING(string)) { + TR(TRACE_CALLS, ("%s: format is invalid", TPS(tname))); rc = ERR; } else { #if HAVE_TSEARCH @@ -614,14 +616,14 @@ tparm_setup(TERMINAL *term, const char *string, TPARM_DATA *result) void *ft; result->format = string; - if ((ft = tfind(result, &MyCache, cmp_format)) != 0) { + if ((ft = tfind(result, &MyCache, cmp_format)) != NULL) { size_t len2; fs = *(TPARM_DATA **) ft; *result = *fs; if ((len2 = strlen(string)) + 2 > TPS(fmt_size)) { TPS(fmt_size) += len2 + 2; TPS(fmt_buff) = typeRealloc(char, TPS(fmt_size), TPS(fmt_buff)); - if (TPS(fmt_buff) == 0) + if (TPS(fmt_buff) == NULL) return ERR; } } else @@ -635,7 +637,7 @@ tparm_setup(TERMINAL *term, const char *string, TPARM_DATA *result) result->num_parsed = _nc_tparm_analyze(term, string, result->p_is_s, &(result->num_popped)); - if (TPS(fmt_buff) == 0) { + if (TPS(fmt_buff) == NULL) { TR(TRACE_CALLS, ("%s: error in analysis", TPS(tname))); rc = ERR; } else { @@ -645,17 +647,17 @@ tparm_setup(TERMINAL *term, const char *string, TPARM_DATA *result) result->num_parsed = NUM_PARM; if (result->num_popped > NUM_PARM) result->num_popped = NUM_PARM; - result->num_actual = max(result->num_popped, result->num_parsed); + result->num_actual = Max(result->num_popped, result->num_parsed); for (n = 0; n < result->num_actual; ++n) { if (result->p_is_s[n]) result->tparm_type |= (1 << n); } #if HAVE_TSEARCH - if ((fs = typeCalloc(TPARM_DATA, 1)) != 0) { + if ((fs = typeCalloc(TPARM_DATA, 1)) != NULL) { *fs = *result; - if ((fs->format = strdup(string)) != 0) { - if (tsearch(fs, &MyCache, cmp_format) != 0) { + if ((fs->format = strdup(string)) != NULL) { + if (tsearch(fs, &MyCache, cmp_format) != NULL) { ++MyCount; } else { free(fs); @@ -688,9 +690,9 @@ tparm_copy_valist(TPARM_DATA *data, int use_TPARM_ARG, va_list ap) int i; for (i = 0; i < data->num_actual; i++) { - if (data->p_is_s[i] != 0) { + if (data->p_is_s[i] != NULL) { char *value = va_arg(ap, char *); - if (value == 0) + if (value == NULL) value = dummy; data->p_is_s[i] = value; data->param[i] = 0; @@ -738,7 +740,7 @@ tparm_trace_call(TPARM_STATE *tps, const char *string, TPARM_DATA *data) if (USE_TRACEF(TRACE_CALLS)) { int i; for (i = 0; i < data->num_actual; i++) { - if (data->p_is_s[i] != 0) { + if (data->p_is_s[i] != NULL) { save_text(tps, ", %s", _nc_visbuf(data->p_is_s[i]), 0); } else if ((long) data->param[i] > MAX_OF_TYPE(NCURSES_INT2) || (long) data->param[i] < 0) { @@ -796,6 +798,11 @@ tparam_internal(TPARM_STATE *tps, const char *string, TPARM_DATA *data) tparm_trace_call(tps, string, data); + if (TPS(fmt_buff) == NULL) { + T((T_RETURN(""))); + return NULL; + } + while ((cp - string) < (int) len2) { if (*cp != '%') { save_char(tps, UChar(*cp)); @@ -996,12 +1003,12 @@ tparam_internal(TPARM_STATE *tps, const char *string, TPARM_DATA *data) */ if (!incremented_two) { incremented_two = TRUE; - if (data->p_is_s[0] == 0) { + if (data->p_is_s[0] == NULL) { data->param[0]++; if (termcap_hack) TPS(stack)[0].data.num = (int) data->param[0]; } - if (data->p_is_s[1] == 0) { + if (data->p_is_s[1] == NULL) { data->param[1]++; if (termcap_hack) TPS(stack)[1].data.num = (int) data->param[1]; @@ -1086,6 +1093,67 @@ tparam_internal(TPARM_STATE *tps, const char *string, TPARM_DATA *data) return (TPS(out_buff)); } +#ifdef CUR +/* + * Only a few standard capabilities accept string parameters. The others that + * are parameterized accept only numeric parameters. + */ +static bool +check_string_caps(const TPARM_DATA *data, const char *string) +{ + bool result = FALSE; + +#define CHECK_CAP(name) (VALID_STRING(name) && !strcmp(name, string)) + + /* + * Disallow string parameters unless we can check them against a terminal + * description. + */ + if (cur_term != NULL) { + int want_type = 0; + + if (CHECK_CAP(pkey_key)) + want_type = 2; /* function key #1, type string #2 */ + else if (CHECK_CAP(pkey_local)) + want_type = 2; /* function key #1, execute string #2 */ + else if (CHECK_CAP(pkey_xmit)) + want_type = 2; /* function key #1, transmit string #2 */ + else if (CHECK_CAP(plab_norm)) + want_type = 2; /* label #1, show string #2 */ +#ifdef pkey_plab + else if (CHECK_CAP(pkey_plab)) + want_type = 6; /* function key #1, type string #2, show string #3 */ +#endif +#if NCURSES_XNAMES + else { + const char *check; + + check = tigetstr(UserCap(Cs)); + if (CHECK_CAP(check)) + want_type = 1; /* style #1 */ + + check = tigetstr(UserCap(Ms)); + if (CHECK_CAP(check)) + want_type = 3; /* storage unit #1, content #2 */ + } +#endif + + if (want_type == data->tparm_type) { + result = TRUE; + } else { + T(("unexpected string-parameter")); + } + } + return result; +} + +#define ValidCap(allow_strings) (myData.tparm_type == 0 || \ + (allow_strings && \ + check_string_caps(&myData, string))) +#else +#define ValidCap(allow_strings) 1 +#endif + #if NCURSES_TPARM_VARARGS NCURSES_EXPORT(char *) @@ -1100,7 +1168,7 @@ tparm(const char *string, ...) tps->tname = "tparm"; #endif /* TRACE */ - if (tparm_setup(cur_term, string, &myData) == OK) { + if (tparm_setup(cur_term, string, &myData) == OK && ValidCap(TRUE)) { va_list ap; va_start(ap, string); @@ -1135,7 +1203,9 @@ tparm(const char *string, tps->tname = "tparm"; #endif /* TRACE */ - if (tparm_setup(cur_term, string, &myData) == OK) { +#define string_ok (sizeof(char*) <= sizeof(TPARM_ARG)) + + if (tparm_setup(cur_term, string, &myData) == OK && ValidCap(string_ok)) { myData.param[0] = a1; myData.param[1] = a2; @@ -1166,7 +1236,7 @@ tiparm(const char *string, ...) tps->tname = "tiparm"; #endif /* TRACE */ - if (tparm_setup(cur_term, string, &myData) == OK) { + if (tparm_setup(cur_term, string, &myData) == OK && ValidCap(TRUE)) { va_list ap; va_start(ap, string); @@ -1179,10 +1249,11 @@ tiparm(const char *string, ...) } /* - * The internal-use flavor ensures that the parameters are numbers, not strings + * Use tparm if the formatting string matches the expected number of parameters + * counting string-parameters. */ NCURSES_EXPORT(char *) -_nc_tiparm(int expected, const char *string, ...) +tiparm_s(int num_expected, int tparm_type, const char *string, ...) { TPARM_STATE *tps = get_tparm_state(cur_term); TPARM_DATA myData; @@ -1190,12 +1261,15 @@ _nc_tiparm(int expected, const char *string, ...) _nc_tparm_err = 0; #ifdef TRACE - tps->tname = "_nc_tiparm"; + tps->tname = "tiparm_s"; #endif /* TRACE */ - - if (tparm_setup(cur_term, string, &myData) == OK - && myData.num_actual <= expected - && myData.tparm_type == 0) { + if (num_expected >= 0 && + num_expected <= 9 && + tparm_type >= 0 && + tparm_type < 7 && /* limit to 2 string parameters */ + tparm_setup(cur_term, string, &myData) == OK && + myData.tparm_type == tparm_type && + myData.num_actual == num_expected) { va_list ap; va_start(ap, string); @@ -1207,6 +1281,121 @@ _nc_tiparm(int expected, const char *string, ...) return result; } +/* + * Analyze the formatting string, return the analysis. + */ +NCURSES_EXPORT(int) +tiscan_s(int *num_expected, int *tparm_type, const char *string) +{ + TPARM_DATA myData; + int result = ERR; + +#ifdef TRACE + TPARM_STATE *tps = get_tparm_state(cur_term); + tps->tname = "tiscan_s"; +#endif /* TRACE */ + + if (tparm_setup(cur_term, string, &myData) == OK) { + *num_expected = myData.num_actual; + *tparm_type = myData.tparm_type; + result = OK; + } + return result; +} + +/* + * The internal-use flavor ensures that parameters are numbers, not strings. + * In addition to ensuring that they are numbers, it ensures that the parameter + * count is consistent with intended usage. + * + * Unlike the general-purpose tparm/tiparm, these internal calls are fairly + * well defined: + * + * expected == 0 - not applicable + * expected == 1 - set color, or vertical/horizontal addressing + * expected == 2 - cursor addressing + * expected == 4 - initialize color or color pair + * expected == 9 - set attributes + * + * Only for the last case (set attributes) should a parameter be optional. + * Also, a capability which calls for more parameters than expected should be + * ignored. + * + * Return a null if the parameter-checks fail. Otherwise, return a pointer to + * the formatted capability string. + */ +NCURSES_EXPORT(char *) +_nc_tiparm(int expected, const char *string, ...) +{ + TPARM_STATE *tps = get_tparm_state(cur_term); + TPARM_DATA myData; + char *result = NULL; + + _nc_tparm_err = 0; + T((T_CALLED("_nc_tiparm(%d, %s, ...)"), expected, _nc_visbuf(string))); +#ifdef TRACE + tps->tname = "_nc_tiparm"; +#endif /* TRACE */ + + if (tparm_setup(cur_term, string, &myData) == OK && ValidCap(FALSE)) { +#ifdef CUR + if (myData.num_actual != expected && cur_term != NULL) { + int needed = expected; + if (CHECK_CAP(to_status_line)) { + needed = 0; /* allow for xterm's status line */ + } else if (CHECK_CAP(set_a_background)) { + needed = 0; /* allow for monochrome fakers */ + } else if (CHECK_CAP(set_a_foreground)) { + needed = 0; + } else if (CHECK_CAP(set_background)) { + needed = 0; + } else if (CHECK_CAP(set_foreground)) { + needed = 0; + } +#if NCURSES_XNAMES + else { + const char *check; + + check = tigetstr(UserCap(xm)); + if (CHECK_CAP(check)) { + needed = 3; + } + check = tigetstr(UserCap(S0)); + if (CHECK_CAP(check)) { + needed = 0; /* used in screen-base */ + } + } +#endif + if (myData.num_actual >= needed && myData.num_actual <= expected) + expected = myData.num_actual; + } +#endif + if (myData.num_actual == 0 && expected) { + T(("missing parameter%s, expected %s%d", + expected > 1 ? "s" : "", + expected == 9 ? "up to " : "", + expected)); + } else if (myData.num_actual > expected) { + T(("too many parameters, have %d, expected %d", + myData.num_actual, + expected)); + } else if (expected != 9 && myData.num_actual != expected) { + T(("expected %d parameters, have %d", + myData.num_actual, + expected)); + } else { + va_list ap; + + va_start(ap, string); + tparm_copy_valist(&myData, FALSE, ap); + va_end(ap); + + result = tparam_internal(tps, string, &myData); + } + } + returnPtr(result); +} + /* * Improve tic's checks by resetting the terminfo "static variables" before * calling functions which may update them. diff --git a/ncurses/tinfo/lib_tputs.c b/ncurses/tinfo/lib_tputs.c index 0e52a401..92232f6e 100644 --- a/ncurses/tinfo/lib_tputs.c +++ b/ncurses/tinfo/lib_tputs.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2021,2022 Thomas E. Dickey * + * Copyright 2018-2024,2025 Thomas E. Dickey * * Copyright 1998-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -52,18 +52,18 @@ #include /* ospeed */ #include -MODULE_ID("$Id: lib_tputs.c,v 1.109 2022/07/21 23:26:34 tom Exp $") +MODULE_ID("$Id: lib_tputs.c,v 1.116 2025/01/12 00:41:56 tom Exp $") NCURSES_EXPORT_VAR(char) PC = 0; /* used by termcap library */ NCURSES_EXPORT_VAR(NCURSES_OSPEED) ospeed = 0; /* used by termcap library */ -NCURSES_EXPORT_VAR(int) _nc_nulls_sent = 0; /* used by 'tack' program */ +NCURSES_EXPORT_VAR(int) _nc_nulls_sent = 0; #if NCURSES_NO_PADDING NCURSES_EXPORT(void) _nc_set_no_padding(SCREEN *sp) { - bool no_padding = (getenv("NCURSES_NO_PADDING") != 0); + bool no_padding = (getenv("NCURSES_NO_PADDING") != NULL); if (sp) sp->_no_padding = no_padding; @@ -89,6 +89,9 @@ NCURSES_SP_NAME(delay_output) (NCURSES_SP_DCLx int ms) { T((T_CALLED("delay_output(%p,%d)"), (void *) SP_PARM, ms)); + if (ms > MAX_DELAY_MSECS) + ms = MAX_DELAY_MSECS; + if (!HasTInfoTerminal(SP_PARM)) returnCode(ERR); @@ -121,7 +124,7 @@ NCURSES_EXPORT(void) NCURSES_SP_NAME(_nc_flush) (NCURSES_SP_DCL0) { T((T_CALLED("_nc_flush(%p)"), (void *) SP_PARM)); - if (SP_PARM != 0 && SP_PARM->_ofd >= 0) { + if (SP_PARM != NULL && SP_PARM->_ofd >= 0) { TR(TRACE_CHARPUT, ("ofd:%d inuse:%lu buffer:%p", SP_PARM->_ofd, (unsigned long) SP_PARM->out_inuse, @@ -146,15 +149,17 @@ NCURSES_SP_NAME(_nc_flush) (NCURSES_SP_DCL0) break; /* an error we can not recover from */ } } - } else if (SP_PARM->out_buffer == 0) { - TR(TRACE_CHARPUT, ("flushing stdout")); + } else if (SP_PARM->out_buffer == NULL) { + TR(TRACE_CHARPUT, ("flushing stdout/stderr")); fflush(stdout); + fflush(stderr); } } else { - TR(TRACE_CHARPUT, ("flushing stdout")); + TR(TRACE_CHARPUT, ("flushing stdout/stderr")); fflush(stdout); + fflush(stderr); } - if (SP_PARM != 0) + if (SP_PARM != NULL) SP_PARM->out_inuse = 0; returnVoid; } @@ -175,8 +180,8 @@ NCURSES_SP_NAME(_nc_outch) (NCURSES_SP_DCLx int ch) COUNT_OUTCHARS(1); if (HasTInfoTerminal(SP_PARM) - && SP_PARM != 0) { - if (SP_PARM->out_buffer != 0) { + && SP_PARM != NULL) { + if (SP_PARM->out_buffer != NULL) { if (SP_PARM->out_inuse + 1 >= SP_PARM->out_limit) NCURSES_SP_NAME(_nc_flush) (NCURSES_SP_ARG); SP_PARM->out_buffer[SP_PARM->out_inuse++] = (char) ch; @@ -254,7 +259,7 @@ NCURSES_SP_NAME(_nc_putp) (NCURSES_SP_DCLx { int rc = ERR; - if (string != 0) { + if (string != NULL) { TPUTS_TRACE(name); rc = NCURSES_SP_NAME(tputs) (NCURSES_SP_ARGx string, 1, NCURSES_SP_NAME(_nc_outch)); @@ -309,12 +314,12 @@ NCURSES_SP_NAME(tputs) (NCURSES_SP_DCLx if (!VALID_STRING(string)) return ERR; - if (SP_PARM != 0 && HasTInfoTerminal(SP_PARM)) { + if (SP_PARM != NULL && HasTInfoTerminal(SP_PARM)) { if ( #if NCURSES_SP_FUNCS - (SP_PARM != 0 && SP_PARM->_term == 0) + (SP_PARM != NULL && SP_PARM->_term == NULL) #else - cur_term == 0 + cur_term == NULL #endif ) { always_delay = FALSE; @@ -439,7 +444,7 @@ NCURSES_SP_NAME(tputs) (NCURSES_SP_DCLx NCURSES_EXPORT(int) _nc_outc_wrapper(SCREEN *sp, int c) { - if (0 == sp) { + if (NULL == sp) { return fputc(c, stdout); } else { return sp->jump(c); diff --git a/ncurses/tinfo/lib_ttyflags.c b/ncurses/tinfo/lib_ttyflags.c index 6363a805..51fe9989 100644 --- a/ncurses/tinfo/lib_ttyflags.c +++ b/ncurses/tinfo/lib_ttyflags.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020 Thomas E. Dickey * + * Copyright 2020,2024 Thomas E. Dickey * * Copyright 1998-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -42,7 +42,7 @@ #define CUR SP_TERMTYPE #endif -MODULE_ID("$Id: lib_ttyflags.c,v 1.36 2020/09/05 22:54:47 tom Exp $") +MODULE_ID("$Id: lib_ttyflags.c,v 1.38 2024/12/15 00:12:19 tom Exp $") NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_get_tty_mode) (NCURSES_SP_DCLx TTY * buf) @@ -50,12 +50,12 @@ NCURSES_SP_NAME(_nc_get_tty_mode) (NCURSES_SP_DCLx TTY * buf) TERMINAL *termp = TerminalOf(SP_PARM); int result = OK; - if (buf == 0 || termp == 0) { + if (buf == NULL || termp == NULL) { result = ERR; } else { #ifdef USE_TERM_DRIVER - if (SP_PARM != 0) { + if (SP_PARM != NULL) { result = CallDriver_2(SP_PARM, td_sgmode, FALSE, buf); } else { result = ERR; @@ -75,7 +75,7 @@ NCURSES_SP_NAME(_nc_get_tty_mode) (NCURSES_SP_DCLx TTY * buf) termp ? termp->Filedes : -1, _nc_trace_ttymode(buf))); } - if (result == ERR && buf != 0) + if (result == ERR && buf != NULL) memset(buf, 0, sizeof(*buf)); return (result); @@ -94,12 +94,12 @@ NCURSES_SP_NAME(_nc_set_tty_mode) (NCURSES_SP_DCLx TTY * buf) { int result = OK; - if (buf == 0 || SP_PARM == 0) { + if (buf == NULL || SP_PARM == NULL) { result = ERR; } else { TERMINAL *termp = TerminalOf(SP_PARM); - if (0 == termp) { + if (NULL == termp) { result = ERR; } else { #ifdef USE_TERM_DRIVER @@ -113,7 +113,7 @@ NCURSES_SP_NAME(_nc_set_tty_mode) (NCURSES_SP_DCLx TTY * buf) ) { if (errno == EINTR) continue; - if ((errno == ENOTTY) && (SP_PARM != 0)) + if ((errno == ENOTTY) && (SP_PARM != NULL)) SP_PARM->_notty = TRUE; result = ERR; } @@ -145,7 +145,7 @@ NCURSES_SP_NAME(def_shell_mode) (NCURSES_SP_DCL0) T((T_CALLED("def_shell_mode(%p) ->term %p"), (void *) SP_PARM, (void *) termp)); - if (termp != 0) { + if (termp != NULL) { #ifdef USE_TERM_DRIVER rc = CallDriver_2(SP_PARM, td_mode, FALSE, TRUE); #else @@ -185,7 +185,7 @@ NCURSES_SP_NAME(def_prog_mode) (NCURSES_SP_DCL0) T((T_CALLED("def_prog_mode(%p) ->term %p"), (void *) SP_PARM, (void *) termp)); - if (termp != 0) { + if (termp != NULL) { #ifdef USE_TERM_DRIVER rc = CallDriver_2(SP_PARM, td_mode, TRUE, TRUE); #else @@ -223,7 +223,7 @@ NCURSES_SP_NAME(reset_prog_mode) (NCURSES_SP_DCL0) T((T_CALLED("reset_prog_mode(%p) ->term %p"), (void *) SP_PARM, (void *) termp)); - if (termp != 0) { + if (termp != NULL) { #ifdef USE_TERM_DRIVER rc = CallDriver_2(SP_PARM, td_mode, TRUE, FALSE); #else @@ -256,7 +256,7 @@ NCURSES_SP_NAME(reset_shell_mode) (NCURSES_SP_DCL0) T((T_CALLED("reset_shell_mode(%p) ->term %p"), (void *) SP_PARM, (void *) termp)); - if (termp != 0) { + if (termp != NULL) { #ifdef USE_TERM_DRIVER rc = CallDriver_2(SP_PARM, td_mode, FALSE, FALSE); #else @@ -281,12 +281,12 @@ reset_shell_mode(void) static TTY * saved_tty(NCURSES_SP_DCL0) { - TTY *result = 0; + TTY *result = NULL; - if (SP_PARM != 0) { + if (SP_PARM != NULL) { result = (TTY *) & (SP_PARM->_saved_tty); } else { - if (_nc_prescreen.saved_tty == 0) { + if (_nc_prescreen.saved_tty == NULL) { _nc_prescreen.saved_tty = typeCalloc(TTY, 1); } result = _nc_prescreen.saved_tty; diff --git a/ncurses/tinfo/lib_win32con.c b/ncurses/tinfo/lib_win32con.c index 49b6cd6a..69abf67d 100644 --- a/ncurses/tinfo/lib_win32con.c +++ b/ncurses/tinfo/lib_win32con.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020-2021,2023 Thomas E. Dickey * + * Copyright 2020-2024,2025 Thomas E. Dickey * * Copyright 1998-2009,2010 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -38,9 +38,9 @@ #include -MODULE_ID("$Id: lib_win32con.c,v 1.12 2023/02/26 19:55:10 tom Exp $") +MODULE_ID("$Id: lib_win32con.c,v 1.18 2025/03/01 14:26:14 tom Exp $") -#ifdef _NC_WINDOWS +#if defined(_NC_WINDOWS) #ifdef _NC_MINGW #include @@ -58,19 +58,7 @@ MODULE_ID("$Id: lib_win32con.c,v 1.12 2023/02/26 19:55:10 tom Exp $") #define read_screen ReadConsoleOutput #endif -static BOOL IsConsoleHandle(HANDLE hdl); -static bool save_original_screen(void); -static bool restore_original_screen(void) GCC_UNUSED; static bool read_screen_data(void); -static int Adjust(int milliseconds, int diff); -static int decode_mouse(SCREEN *sp, int mask); -static bool handle_mouse(SCREEN *sp, MOUSE_EVENT_RECORD mer); -static int rkeycompare(const void *el1, const void *el2); -static int keycompare(const void *el1, const void *el2); -static int MapKey(WORD vKey); -static int AnsiKey(WORD vKey); - -static ULONGLONG tdiff(FILETIME fstart, FILETIME fend); #define GenMap(vKey,key) MAKELONG(key, vKey) static const LONG keylist[] = @@ -416,6 +404,7 @@ save_original_screen(void) return result; } +#if 0 static bool restore_original_screen(void) { @@ -450,6 +439,7 @@ restore_original_screen(void) } return result; } +#endif static bool read_screen_data(void) @@ -641,10 +631,10 @@ Adjust(int milliseconds, int diff) FROM_LEFT_4TH_BUTTON_PRESSED | \ RIGHTMOST_BUTTON_PRESSED) -static int +static mmask_t decode_mouse(SCREEN *sp, int mask) { - int result = 0; + mmask_t result = 0; (void) sp; assert(sp && console_initialized); @@ -699,15 +689,11 @@ handle_mouse(SCREEN *sp, MOUSE_EVENT_RECORD mer) memset(&work, 0, sizeof(work)); if (sp->_drv_mouse_new_buttons) { - work.bstate |= - (mmask_t) decode_mouse(sp, - sp->_drv_mouse_new_buttons); + work.bstate |= decode_mouse(sp, sp->_drv_mouse_new_buttons); } else { /* cf: BUTTON_PRESSED, BUTTON_RELEASED */ - work.bstate |= - (mmask_t) (decode_mouse(sp, - sp->_drv_mouse_old_buttons) - >> 1); + work.bstate |= (decode_mouse(sp, sp->_drv_mouse_old_buttons) + >> 1); result = TRUE; } @@ -901,8 +887,7 @@ _nc_console_twait( goto end; } else { DWORD n = 0; - INPUT_RECORD *pInpRec = - TypeAlloca(INPUT_RECORD, nRead); + MakeArray(pInpRec, INPUT_RECORD, nRead); if (pInpRec != NULL) { DWORD i; BOOL f; @@ -978,7 +963,7 @@ _nc_console_twait( continue; /* e.g., FOCUS_EVENT */ default: - T(("twait:event Tyoe %d", inp_rec.EventType)); + T(("twait:event Type %d", inp_rec.EventType)); CONSUME(); _nc_console_selectActiveHandle(); continue; @@ -1010,7 +995,7 @@ _nc_console_twait( NCURSES_EXPORT(int) _nc_console_testmouse( - SCREEN *sp, + const SCREEN *sp, HANDLE hdl, int delay EVENTLIST_2nd(_nc_eventlist * evl)) diff --git a/ncurses/tinfo/lib_win32util.c b/ncurses/tinfo/lib_win32util.c index b37c19d7..92d9e8a3 100644 --- a/ncurses/tinfo/lib_win32util.c +++ b/ncurses/tinfo/lib_win32util.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020-2021,2023 Thomas E. Dickey * + * Copyright 2020-2023,2024 Thomas E. Dickey * * Copyright 1998-2009,2010 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -34,9 +34,9 @@ #include -MODULE_ID("$Id: lib_win32util.c,v 1.3 2023/02/25 20:07:48 tom Exp $") +MODULE_ID("$Id: lib_win32util.c,v 1.5 2024/08/31 15:55:16 tom Exp $") -#ifdef _NC_WINDOWS +#ifdef _NC_WINDOWS_NATIVE #include #ifdef _NC_CHECK_MINTTY @@ -54,7 +54,7 @@ MODULE_ID("$Id: lib_win32util.c,v 1.3 2023/02/25 20:07:48 tom Exp $") Pipe and can query the server side of the pipe, looking whether or not this is mintty. For now we terminate the program if we discover that situation. - Althogh in theory it would be possible, to remotely manipulate + Although in theory it would be possible, to remotely manipulate the terminal state of mintty, this is out of scope for now and not worth the significant effort. */ @@ -131,4 +131,4 @@ _nc_gettimeofday(struct timeval *tv, void *tz GCC_UNUSED) } #endif // HAVE_GETTIMEOFDAY == 2 -#endif // _NC_WINDOWS +#endif // _NC_WINDOWS_NATIVE diff --git a/ncurses/tinfo/make_hash.c b/ncurses/tinfo/make_hash.c index 9980279b..0c2c5fa3 100644 --- a/ncurses/tinfo/make_hash.c +++ b/ncurses/tinfo/make_hash.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2019,2020 Thomas E. Dickey * + * Copyright 2018-2020,2024 Thomas E. Dickey * * Copyright 2009-2013,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -44,7 +44,7 @@ #include -MODULE_ID("$Id: make_hash.c,v 1.33 2020/02/02 23:34:34 tom Exp $") +MODULE_ID("$Id: make_hash.c,v 1.36 2024/12/07 20:51:15 tom Exp $") /* * _nc_make_hash_table() @@ -79,7 +79,7 @@ strmalloc(char *s) { size_t need = strlen(s) + 1; char *result = malloc(need); - if (result == 0) + if (result == NULL) failed("strmalloc"); _nc_STRCPY(result, s, need); return result; @@ -153,7 +153,7 @@ static int count_columns(char **list) { int result = 0; - if (list != 0) { + if (list != NULL) { while (*list++) { ++result; } @@ -168,17 +168,17 @@ parse_columns(char *buffer) int col = 0; - if (buffer == 0) { + if (buffer == NULL) { free(list); - list = 0; - return 0; + list = NULL; + return NULL; } if (*buffer != '#') { - if (list == 0) { + if (list == NULL) { list = typeCalloc(char *, (MAX_COLUMNS + 1)); - if (list == 0) - return (0); + if (list == NULL) + return (NULL); } while (*buffer != '\0') { char *s; @@ -205,7 +205,7 @@ parse_columns(char *buffer) break; } } - return col ? list : 0; + return col ? list : NULL; } #define SetType(n,t) \ @@ -250,7 +250,7 @@ main(int argc, char **argv) struct user_table_entry *name_table = typeCalloc(struct user_table_entry, tablesize); HashValue *hash_table = typeCalloc(HashValue, HASHTABSIZE); - const char *root_name = ""; + const char *root_name; int column = 0; int bigstring = 0; unsigned n; @@ -272,8 +272,8 @@ main(int argc, char **argv) || (column >= MAX_COLUMNS) || *(root_name = argv[2]) == 0 || (bigstring = atoi(argv[3])) < 0 - || name_table == 0 - || hash_table == 0) { + || name_table == NULL + || hash_table == NULL) { fprintf(stderr, "usage: make_hash column root_name bigstring\n"); exit(EXIT_FAILURE); } @@ -291,7 +291,7 @@ main(int argc, char **argv) else buffer[sizeof(buffer) - 2] = '\0'; list = parse_columns(buffer); - if (list == 0) /* blank or comment */ + if (list == NULL) /* blank or comment */ continue; if (is_user) { if (strcmp(list[0], "userdef")) @@ -382,15 +382,15 @@ main(int argc, char **argv) printf("\t%d,%d,", name_table[n].ute_argc, name_table[n].ute_args); - printf("\t%3d, %3d %s%c\n", + printf("\t%3d, %3d %s%s\n", name_table[n].ute_index, name_table[n].ute_link, R_BRACE, - n < tablesize - 1 ? ',' : ' '); + n < tablesize - 1 ? "," : ""); len += (int) strlen(name_table[n].ute_name) + 1; } printf("%s;\n\n", R_BRACE); - printf("static struct %s_table_entry *_nc_%s_table = 0;\n\n", + printf("static struct %s_table_entry *_nc_%s_table = NULL;\n\n", table_name, root_name); } else { @@ -407,11 +407,11 @@ main(int argc, char **argv) printf("\t%d,%d,", name_table[n].ute_argc, name_table[n].ute_args); - printf("\t%3d, %3d %s%c\n", + printf("\t%3d, %3d %s%s\n", name_table[n].ute_index, name_table[n].ute_link, R_BRACE, - n < tablesize - 1 ? ',' : ' '); + n < tablesize - 1 ? "," : ""); } printf("%s;\n\n", R_BRACE); } @@ -439,7 +439,7 @@ main(int argc, char **argv) free((void *) name_table[n].ute_name); } free(name_table); - parse_columns(0); + parse_columns(NULL); return EXIT_SUCCESS; } diff --git a/ncurses/tinfo/make_keys.c b/ncurses/tinfo/make_keys.c index b8eb9343..8308266e 100644 --- a/ncurses/tinfo/make_keys.c +++ b/ncurses/tinfo/make_keys.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020,2021 Thomas E. Dickey * + * Copyright 2020-2021,2024 Thomas E. Dickey * * Copyright 1998-2011,2015 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -40,7 +40,7 @@ #define USE_TERMLIB 1 #include -MODULE_ID("$Id: make_keys.c,v 1.23 2021/08/18 20:55:25 tom Exp $") +MODULE_ID("$Id: make_keys.c,v 1.24 2024/12/07 20:06:49 tom Exp $") #include @@ -51,10 +51,10 @@ unknown(void) if (result == 0) { unsigned n; - for (n = 0; strnames[n] != 0; n++) { + for (n = 0; strnames[n] != NULL; n++) { ++result; } - for (n = 0; strfnames[n] != 0; n++) { + for (n = 0; strfnames[n] != NULL; n++) { ++result; } } @@ -66,14 +66,14 @@ lookup(const char *name) { unsigned n; bool found = FALSE; - for (n = 0; strnames[n] != 0; n++) { + for (n = 0; strnames[n] != NULL; n++) { if (!strcmp(name, strnames[n])) { found = TRUE; break; } } if (!found) { - for (n = 0; strfnames[n] != 0; n++) { + for (n = 0; strfnames[n] != NULL; n++) { if (!strcmp(name, strfnames[n])) { found = TRUE; break; @@ -93,7 +93,7 @@ make_keys(FILE *ifp, FILE *ofp) unsigned maxlen = 16; int scanned; - while (fgets(buffer, (int) sizeof(buffer), ifp) != 0) { + while (fgets(buffer, (int) sizeof(buffer), ifp) != NULL) { if (*buffer == '#') continue; @@ -119,7 +119,7 @@ make_keys(FILE *ifp, FILE *ofp) static void write_list(FILE *ofp, const char **list) { - while (*list != 0) + while (*list != NULL) fprintf(ofp, "%s\n", *list++); } @@ -139,14 +139,14 @@ main(int argc, char *argv[]) "static", "#endif", "const struct tinfo_fkeys _nc_tinfo_fkeys[] = {", - 0 + NULL }; static const char *suffix[] = { "\t{ 0, 0} };", "", "#endif /* _INIT_KEYTRY_H */", - 0 + NULL }; write_list(stdout, prefix); @@ -154,7 +154,7 @@ main(int argc, char *argv[]) int n; for (n = 1; n < argc; n++) { FILE *fp = fopen(argv[n], "r"); - if (fp != 0) { + if (fp != NULL) { make_keys(fp, stdout); fclose(fp); } diff --git a/ncurses/tinfo/name_match.c b/ncurses/tinfo/name_match.c index 71e584d7..8cdaac79 100644 --- a/ncurses/tinfo/name_match.c +++ b/ncurses/tinfo/name_match.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020 Thomas E. Dickey * + * Copyright 2020-2024,2025 Thomas E. Dickey * * Copyright 1998-2013,2016 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -34,7 +34,7 @@ #include #include -MODULE_ID("$Id: name_match.c,v 1.25 2020/02/02 23:34:34 tom Exp $") +MODULE_ID("$Id: name_match.c,v 1.27 2025/01/12 00:41:56 tom Exp $") #define FirstName _nc_globals.first_name @@ -44,7 +44,7 @@ skip_index(const char *name) { if ((_nc_syntax == SYN_TERMCAP) && _nc_user_definable) { const char *bar = strchr(name, '|'); - if (bar != 0 && (bar - name) == 2) + if (bar != NULL && (bar - name) == 2) name = bar + 1; } return name; @@ -60,17 +60,17 @@ NCURSES_EXPORT(char *) _nc_first_name(const char *const sp) { #if NO_LEAKS - if (sp == 0) { - if (FirstName != 0) { + if (sp == NULL) { + if (FirstName != NULL) { FreeAndNull(FirstName); } } else #endif { - if (FirstName == 0) + if (FirstName == NULL) FirstName = typeMalloc(char, MAX_NAME_SIZE + 1); - if (FirstName != 0) { + if (FirstName != NULL) { unsigned n; const char *src = sp; #if NCURSES_USE_TERMCAP && NCURSES_XNAMES @@ -95,7 +95,7 @@ _nc_name_match(const char *const namelst, const char *const name, const char *co { const char *s; - if ((s = namelst) != 0) { + if ((s = namelst) != NULL) { while (*s != '\0') { const char *d, *t; int code, found; diff --git a/ncurses/tinfo/obsolete.c b/ncurses/tinfo/obsolete.c index 972a9a18..79660b0e 100644 --- a/ncurses/tinfo/obsolete.c +++ b/ncurses/tinfo/obsolete.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020 Thomas E. Dickey * + * Copyright 2020-2024,2025 Thomas E. Dickey * * Copyright 2013-2014,2016 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -37,7 +37,7 @@ #include -MODULE_ID("$Id: obsolete.c,v 1.6 2020/02/02 23:34:34 tom Exp $") +MODULE_ID("$Id: obsolete.c,v 1.13 2025/02/20 01:12:11 tom Exp $") /* * Obsolete entrypoint retained for binary compatibility. @@ -64,11 +64,11 @@ _nc_set_buffer(FILE *ofp, int buffered) NCURSES_EXPORT(char *) _nc_strdup(const char *s) { - char *result = 0; - if (s != 0) { + char *result = NULL; + if (s != NULL) { size_t need = strlen(s); result = malloc(need + 1); - if (result != 0) { + if (result != NULL) { _nc_STRCPY(result, s, need); } } @@ -126,7 +126,7 @@ _nc_conv_to_utf8(unsigned char *target, unsigned source, unsigned limit) rc = 0; } - if (target != 0) { + if (target != NULL) { switch (rc) { case 1: target[0] = CH(0); @@ -225,7 +225,7 @@ _nc_conv_to_utf32(unsigned *target, const char *source, unsigned limit) } } - if (target != 0) { + if (target != NULL) { int shift = 0; *target = 0; for (j = 1; j < rc; j++) { @@ -238,3 +238,98 @@ _nc_conv_to_utf32(unsigned *target, const char *source, unsigned limit) #undef CH } #endif /* EXP_XTERM_1005 */ + +#ifdef EXP_OOM_TESTING +/* + * Out-of-memory testing, suitable for checking if initialization (and limited + * running) recovers from errors due to insufficient memory. In practice, this + * is unlikely except with artificially constructed tests (or poorly behaved + * applications). + */ +#undef malloc +#undef calloc +#undef realloc +#undef free +#undef strdup + +#define TR_OOM(stmt) T(stmt) + +static long oom_limit = -1; +static long oom_count = 0; + +static bool +oom_check(void) +{ + static bool initialized = FALSE; + static bool triggered = FALSE; + bool result = FALSE; + + if (!initialized) { + char *env = getenv("NCURSES_OOM_TESTING"); + initialized = TRUE; + if (env != NULL) { + char *check; + oom_limit = strtol(env, &check, 0); + if (check != NULL && *check != '\0') + oom_limit = 0; + } + } + ++oom_count; + if (oom_limit >= 0) { + result = (oom_count > oom_limit); + if (result && !triggered) { + triggered = TRUE; + TR_OOM(("out-of-memory")); + } + } + return result; +} + +NCURSES_EXPORT(void *) +_nc_oom_malloc(size_t size) +{ + char *result = (oom_check() + ? NULL + : malloc(size)); + TR_OOM(("oom #%ld malloc(%ld) %p", oom_count, size, result)); + return result; +} + +NCURSES_EXPORT(void *) +_nc_oom_calloc(size_t nmemb, size_t size) +{ + char *result = (oom_check() + ? NULL + : calloc(nmemb, size)); + TR_OOM(("oom #%ld calloc(%ld, %ld) %p", oom_count, nmemb, size, result)); + return result; +} + +NCURSES_EXPORT(void *) +_nc_oom_realloc(void *ptr, size_t size) +{ + char *result = (oom_check() + ? NULL + : realloc(ptr, size)); + TR_OOM(("oom #%ld realloc(%p, %ld) %p", oom_count, ptr, size, result)); + return result; +} + +NCURSES_EXPORT(void) +_nc_oom_free(void *ptr) +{ + ++oom_count; + TR_OOM(("oom #%ld free(%p)", oom_count, ptr)); + free(ptr); +} + +NCURSES_EXPORT(char *) +_nc_oom_strdup(const char *ptr) +{ + char *result = (oom_check() + ? NULL + : strdup(ptr)); + TR_OOM(("oom #%ld strdup(%p) %p", oom_count, ptr, result)); + return result; +} +#endif /* EXP_OOM_TESTING */ diff --git a/ncurses/tinfo/parse_entry.c b/ncurses/tinfo/parse_entry.c index 14bcb67e..a2278c07 100644 --- a/ncurses/tinfo/parse_entry.c +++ b/ncurses/tinfo/parse_entry.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2021,2022 Thomas E. Dickey * + * Copyright 2018-2024,2025 Thomas E. Dickey * * Copyright 1998-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -48,7 +48,7 @@ #include #include -MODULE_ID("$Id: parse_entry.c,v 1.107 2022/05/08 00:11:44 tom Exp $") +MODULE_ID("$Id: parse_entry.c,v 1.115 2025/02/20 09:11:49 tom Exp $") #ifdef LINT static short const parametrized[] = @@ -110,7 +110,7 @@ _nc_extend_names(ENTRY * entryp, const char *name, int token_type) /* Well, we are given a cancel for a name that we don't recognize */ return _nc_extend_names(entryp, name, STRING); default: - return 0; + return NULL; } /* Adjust the 'offset' (insertion-point) to keep the lists of extended @@ -142,6 +142,11 @@ _nc_extend_names(ENTRY * entryp, const char *name, int token_type) for (last = (unsigned) (max - 1); last > tindex; last--) if (!found) { + char *saved; + + if ((saved = _nc_save_str(name)) == NULL) + return NULL; + switch (token_type) { case BOOLEAN: tp->ext_Booleans++; @@ -169,7 +174,7 @@ _nc_extend_names(ENTRY * entryp, const char *name, int token_type) TYPE_REALLOC(char *, actual, tp->ext_Names); while (--actual > offset) tp->ext_Names[actual] = tp->ext_Names[actual - 1]; - tp->ext_Names[offset] = _nc_save_str(name); + tp->ext_Names[offset] = saved; } temp.nte_name = tp->ext_Names[offset]; @@ -199,7 +204,7 @@ expected_type(const char *name, int token_type, bool silent) { struct user_table_entry const *entry = _nc_find_user_entry(name); bool result = TRUE; - if ((entry != 0) && (token_type != CANCEL)) { + if ((entry != NULL) && (token_type != CANCEL)) { int have_type = (1 << token_type); if (!(entry->ute_type & have_type)) { if (!silent) @@ -327,7 +332,7 @@ _nc_parse_entry(ENTRY * entryp, int literal, bool silent) entryp->tterm.str_table = entryp->tterm.term_names = _nc_save_str(ptr); - if (entryp->tterm.str_table == 0) + if (entryp->tterm.str_table == NULL) returnDB(ERR); DEBUG(2, ("Starting '%s'", ptr)); @@ -345,7 +350,7 @@ _nc_parse_entry(ENTRY * entryp, int literal, bool silent) _nc_set_type(name); /* check for overly-long names and aliases */ - for (base = entryp->tterm.term_names; (ptr = strchr(base, '|')) != 0; + for (base = entryp->tterm.term_names; (ptr = strchr(base, '|')) != NULL; base = ptr + 1) { if (ptr - base > MAX_ALIAS) { _nc_warning("%s `%.*s' may be too long", @@ -364,6 +369,8 @@ _nc_parse_entry(ENTRY * entryp, int literal, bool silent) bool is_use = (strcmp(_nc_curr_token.tk_name, "use") == 0); bool is_tc = !is_use && (strcmp(_nc_curr_token.tk_name, "tc") == 0); if (is_use || is_tc) { + char *saved; + if (!VALID_STRING(_nc_curr_token.tk_valstring) || _nc_curr_token.tk_valstring[0] == '\0') { _nc_warning("missing name for use-clause"); @@ -372,21 +379,28 @@ _nc_parse_entry(ENTRY * entryp, int literal, bool silent) _nc_warning("invalid name for use-clause \"%s\"", _nc_curr_token.tk_valstring); continue; - } else if (entryp->nuses >= MAX_USES) { + } else if (entryp->nuses >= HARD_MAX_USES) { _nc_warning("too many use-clauses, ignored \"%s\"", _nc_curr_token.tk_valstring); continue; + } else if (entryp->nuses >= WARN_MAX_USES) { + _nc_warning("possibly too many use-clauses (%d vs %d), \"%s\"", + entryp->nuses, + WARN_MAX_USES, + _nc_curr_token.tk_valstring); } - entryp->uses[entryp->nuses].name = _nc_save_str(_nc_curr_token.tk_valstring); - entryp->uses[entryp->nuses].line = _nc_curr_line; - entryp->nuses++; - if (entryp->nuses > 1 && is_tc) { - BAD_TC_USAGE + if ((saved = _nc_save_str(_nc_curr_token.tk_valstring)) != NULL) { + entryp->uses[entryp->nuses].name = saved; + entryp->uses[entryp->nuses].line = _nc_curr_line; + entryp->nuses++; + if (entryp->nuses > 1 && is_tc) { + BAD_TC_USAGE + } } } else { /* normal token lookup */ entry_ptr = _nc_find_entry(_nc_curr_token.tk_name, - _nc_get_hash_table(_nc_syntax)); + _nc_get_hash_table(_nc_syntax == SYN_TERMCAP)); /* * Our kluge to handle aliasing. The reason it is done @@ -450,7 +464,7 @@ _nc_parse_entry(ENTRY * entryp, int literal, bool silent) if (expected_type(_nc_curr_token.tk_name, token_type, silent)) { if ((entry_ptr = _nc_extend_names(entryp, _nc_curr_token.tk_name, - token_type)) != 0) { + token_type)) != NULL) { if (_nc_tracing >= DEBUG_LEVEL(1)) { _nc_warning("extended capability '%s'", _nc_curr_token.tk_name); @@ -478,8 +492,8 @@ _nc_parse_entry(ENTRY * entryp, int literal, bool silent) */ if (!strcmp("ma", _nc_curr_token.tk_name)) { entry_ptr = _nc_find_type_entry("ma", NUMBER, - _nc_syntax != 0); - assert(entry_ptr != 0); + _nc_syntax != SYN_TERMINFO); + assert(entry_ptr != NULL); } } else if (entry_ptr->nte_type != token_type) { /* @@ -496,15 +510,15 @@ _nc_parse_entry(ENTRY * entryp, int literal, bool silent) && !strcmp("ma", _nc_curr_token.tk_name)) { /* tell max_attributes from arrow_key_map */ entry_ptr = _nc_find_type_entry("ma", NUMBER, - _nc_syntax != 0); - assert(entry_ptr != 0); + _nc_syntax != SYN_TERMINFO); + assert(entry_ptr != NULL); } else if (token_type == STRING && !strcmp("MT", _nc_curr_token.tk_name)) { /* map terminfo's string MT to MT */ entry_ptr = _nc_find_type_entry("MT", STRING, - _nc_syntax != 0); - assert(entry_ptr != 0); + _nc_syntax != SYN_TERMINFO); + assert(entry_ptr != NULL); } else if (token_type == BOOLEAN && entry_ptr->nte_type == STRING) { @@ -620,7 +634,7 @@ _nc_parse_entry(ENTRY * entryp, int literal, bool silent) * have picked up defaults via translation. */ for (i = 0; i < entryp->nuses; i++) { - if (entryp->uses[i].name != 0 + if (entryp->uses[i].name != NULL && !strchr(entryp->uses[i].name, '+')) has_base_entry = TRUE; } @@ -686,9 +700,9 @@ _nc_capcmp(const char *s, const char *t) } static void -append_acs0(string_desc * dst, int code, char *src, size_t off) +append_acs0(string_desc * dst, int code, const char *src, size_t off) { - if (src != 0 && off < strlen(src)) { + if (src != NULL && off < strlen(src)) { char temp[3]; temp[0] = (char) code; temp[1] = src[off]; @@ -698,7 +712,7 @@ append_acs0(string_desc * dst, int code, char *src, size_t off) } static void -append_acs(string_desc * dst, int code, char *src) +append_acs(string_desc * dst, int code, const char *src) { if (VALID_STRING(src) && strlen(src) == 1) { append_acs0(dst, code, src, 0); @@ -920,15 +934,15 @@ postprocess_termcap(TERMTYPE2 *tp, bool has_base) /* we're going to use this for a special case later */ dp = strchr(other_non_function_keys, 'i'); - foundim = (dp != 0) && (dp[1] == 'm'); + foundim = (dp != NULL) && (dp[1] == 'm'); /* look at each comma-separated capability in the ko string... */ for (base = other_non_function_keys; - (cp = strchr(base, ',')) != 0; + (cp = strchr(base, ',')) != NULL; base = cp + 1) { size_t len = (unsigned) (cp - base); size_t n; - assoc const *ap = 0; + assoc const *ap = NULL; for (n = 0; n < SIZEOF(ko_xlate); ++n) { if (len == strlen(ko_xlate[n].from) @@ -937,7 +951,7 @@ postprocess_termcap(TERMTYPE2 *tp, bool has_base) break; } } - if (ap == 0) { + if (ap == NULL) { _nc_warning("unknown capability `%.*s' in ko string", (int) len, base); continue; @@ -1134,7 +1148,7 @@ lookup_fullname(const char *find) return NOTFOUND; } - for (count = 0; names[count] != 0; count++) { + for (count = 0; names[count] != NULL; count++) { if (!strcmp(names[count], find)) { struct name_table_entry const *entry_ptr = _nc_get_table(FALSE); while (entry_ptr->nte_type != state diff --git a/ncurses/tinfo/read_entry.c b/ncurses/tinfo/read_entry.c index 2b1875ed..fd5f7716 100644 --- a/ncurses/tinfo/read_entry.c +++ b/ncurses/tinfo/read_entry.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2021,2022 Thomas E. Dickey * + * Copyright 2018-2024,2025 Thomas E. Dickey * * Copyright 1998-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -42,7 +42,7 @@ #include -MODULE_ID("$Id: read_entry.c,v 1.164 2022/05/08 00:11:44 tom Exp $") +MODULE_ID("$Id: read_entry.c,v 1.175 2025/01/11 23:52:18 tom Exp $") #define MyNumber(n) (short) LOW_MSB(n) @@ -51,7 +51,7 @@ MODULE_ID("$Id: read_entry.c,v 1.164 2022/05/08 00:11:44 tom Exp $") #if NCURSES_USE_DATABASE #if NCURSES_EXT_NUMBERS static size_t -convert_16bits(char *buf, NCURSES_INT2 *Numbers, int count) +convert_16bits(const char *buf, NCURSES_INT2 *Numbers, int count) { int i; size_t j; @@ -77,7 +77,7 @@ convert_16bits(char *buf, NCURSES_INT2 *Numbers, int count) } static size_t -convert_32bits(char *buf, NCURSES_INT2 *Numbers, int count) +convert_32bits(const char *buf, NCURSES_INT2 *Numbers, int count) { int i; size_t j; @@ -98,7 +98,7 @@ convert_32bits(char *buf, NCURSES_INT2 *Numbers, int count) } #else static size_t -convert_32bits(char *buf, NCURSES_INT2 *Numbers, int count) +convert_32bits(const char *buf, NCURSES_INT2 *Numbers, int count) { int i, j; unsigned char ch; @@ -122,7 +122,7 @@ convert_32bits(char *buf, NCURSES_INT2 *Numbers, int count) } static size_t -convert_16bits(char *buf, NCURSES_INT2 *Numbers, int count) +convert_16bits(const char *buf, NCURSES_INT2 *Numbers, int count) { int i; for (i = 0; i < count; i++) { @@ -138,12 +138,13 @@ convert_16bits(char *buf, NCURSES_INT2 *Numbers, int count) } #endif -static void -convert_strings(char *buf, char **Strings, int count, int size, char *table) +static bool +convert_strings(char *buf, char **Strings, int count, int size, + char *table, bool always) { int i; char *p; - bool corrupt = FALSE; + bool success = TRUE; for (i = 0; i < count; i++) { if (IS_NEG1(buf + 2 * i)) { @@ -159,13 +160,10 @@ convert_strings(char *buf, char **Strings, int count, int size, char *table) TR(TRACE_DATABASE, ("Strings[%d] = %s", i, _nc_visbuf(Strings[i]))); } else { - if (!corrupt) { - corrupt = TRUE; - TR(TRACE_DATABASE, - ("ignore out-of-range index %d to Strings[]", nn)); - _nc_warning("corrupt data found in convert_strings"); - } - Strings[i] = ABSENT_STRING; + TR(TRACE_DATABASE, + ("found out-of-range index %d to Strings[%d]", nn, i)); + success = FALSE; + break; } } @@ -175,14 +173,29 @@ convert_strings(char *buf, char **Strings, int count, int size, char *table) if (*p == '\0') break; /* if there is no NUL, ignore the string */ - if (p >= table + size) + if (p >= table + size) { Strings[i] = ABSENT_STRING; + } else if (p == Strings[i] && always) { + TR(TRACE_DATABASE, + ("found empty but required Strings[%d]", i)); + success = FALSE; + break; + } + } else if (always) { /* names are always needed */ + TR(TRACE_DATABASE, + ("found invalid but required Strings[%d]", i)); + success = FALSE; + break; } } + if (!success) { + _nc_warning("corrupt data found in convert_strings"); + } + return success; } static int -fake_read(char *src, int *offset, int limit, char *dst, unsigned want) +fake_read(const char *src, int *offset, int limit, char *dst, unsigned want) { int have = (limit - *offset); @@ -224,11 +237,11 @@ _nc_init_termtype(TERMTYPE2 *const tp) tp->ext_Numbers = 0; tp->ext_Strings = 0; #endif - if (tp->Booleans == 0) + if (tp->Booleans == NULL) TYPE_MALLOC(NCURSES_SBOOL, BOOLCOUNT, tp->Booleans); - if (tp->Numbers == 0) + if (tp->Numbers == NULL) TYPE_MALLOC(NCURSES_INT2, NUMCOUNT, tp->Numbers); - if (tp->Strings == 0) + if (tp->Strings == NULL) TYPE_MALLOC(char *, STRCOUNT, tp->Strings); for_each_boolean(i, tp) @@ -272,7 +285,7 @@ _nc_read_termtype(TERMTYPE2 *ptr, char *buffer, int limit) char buf[MAX_ENTRY_SIZE + 2]; char *string_table; unsigned want, have; - size_t (*convert_numbers) (char *, NCURSES_INT2 *, int); + size_t (*convert_numbers) (const char *, NCURSES_INT2 *, int); int size_of_numbers; int max_entry_size = MAX_ENTRY_SIZE; @@ -323,6 +336,9 @@ _nc_read_termtype(TERMTYPE2 *ptr, char *buffer, int limit) || bool_count < 0 || num_count < 0 || str_count < 0 + || bool_count > BOOLCOUNT + || num_count > NUMCOUNT + || str_count > STRCOUNT || str_size < 0) { returnDB(TGETENT_NO); } @@ -330,12 +346,12 @@ _nc_read_termtype(TERMTYPE2 *ptr, char *buffer, int limit) want = (unsigned) (str_size + name_size + 1); /* try to allocate space for the string table */ if (str_count * SIZEOF_SHORT >= max_entry_size - || (string_table = typeMalloc(char, want)) == 0) { + || (string_table = typeMalloc(char, want)) == NULL) { returnDB(TGETENT_NO); } /* grab the name (a null-terminated string) */ - want = min(MAX_NAME_SIZE, (unsigned) name_size); + want = Min(MAX_NAME_SIZE, (unsigned) name_size); ptr->str_table = string_table; ptr->term_names = string_table; if ((have = (unsigned) Read(ptr->term_names, want)) != want) { @@ -348,7 +364,7 @@ _nc_read_termtype(TERMTYPE2 *ptr, char *buffer, int limit) offset = (int) (have - MAX_NAME_SIZE); /* grab the booleans */ - TYPE_CALLOC(NCURSES_SBOOL, max(BOOLCOUNT, bool_count), ptr->Booleans); + TYPE_CALLOC(NCURSES_SBOOL, Max(BOOLCOUNT, bool_count), ptr->Booleans); if (Read(ptr->Booleans, (unsigned) bool_count) < bool_count) { returnDB(TGETENT_NO); } @@ -362,13 +378,13 @@ _nc_read_termtype(TERMTYPE2 *ptr, char *buffer, int limit) even_boundary(name_size + bool_count); /* grab the numbers */ - TYPE_CALLOC(NCURSES_INT2, max(NUMCOUNT, num_count), ptr->Numbers); + TYPE_CALLOC(NCURSES_INT2, Max(NUMCOUNT, num_count), ptr->Numbers); if (!read_numbers(buf, num_count)) { returnDB(TGETENT_NO); } convert_numbers(buf, ptr->Numbers, num_count); - TYPE_CALLOC(char *, max(STRCOUNT, str_count), ptr->Strings); + TYPE_CALLOC(char *, Max(STRCOUNT, str_count), ptr->Strings); if (str_count) { /* grab the string offsets */ @@ -379,7 +395,10 @@ _nc_read_termtype(TERMTYPE2 *ptr, char *buffer, int limit) if (Read(string_table, (unsigned) str_size) != str_size) { returnDB(TGETENT_NO); } - convert_strings(buf, ptr->Strings, str_count, str_size, string_table); + if (!convert_strings(buf, ptr->Strings, str_count, str_size, + string_table, FALSE)) { + returnDB(TGETENT_NO); + } } #if NCURSES_XNAMES @@ -464,7 +483,7 @@ _nc_read_termtype(TERMTYPE2 *ptr, char *buffer, int limit) if (ext_str_limit) { ptr->ext_str_table = typeMalloc(char, (size_t) ext_str_limit); - if (ptr->ext_str_table == 0) { + if (ptr->ext_str_table == NULL) { returnDB(TGETENT_NO); } if (Read(ptr->ext_str_table, (unsigned) ext_str_limit) != ext_str_limit) { @@ -480,8 +499,10 @@ _nc_read_termtype(TERMTYPE2 *ptr, char *buffer, int limit) ("Before computing extended-string capabilities " "str_count=%d, ext_str_count=%d", str_count, ext_str_count)); - convert_strings(buf, ptr->Strings + str_count, ext_str_count, - ext_str_limit, ptr->ext_str_table); + if (!convert_strings(buf, ptr->Strings + str_count, ext_str_count, + ext_str_limit, ptr->ext_str_table, FALSE)) { + returnDB(TGETENT_NO); + } for (i = ext_str_count - 1; i >= 0; i--) { TR(TRACE_DATABASE, ("MOVE from [%d:%d] %s", i, i + str_count, @@ -513,10 +534,13 @@ _nc_read_termtype(TERMTYPE2 *ptr, char *buffer, int limit) TR(TRACE_DATABASE, ("ext_NAMES starting @%d in extended_strings, first = %s", base, _nc_visbuf(ptr->ext_str_table + base))); - convert_strings(buf + (2 * ext_str_count), - ptr->ext_Names, - (int) need, - ext_str_limit, ptr->ext_str_table + base); + if (!convert_strings(buf + (2 * ext_str_count), + ptr->ext_Names, + (int) need, + ext_str_limit, ptr->ext_str_table + base, + TRUE)) { + returnDB(TGETENT_NO); + } } TR(TRACE_DATABASE, @@ -558,24 +582,28 @@ NCURSES_EXPORT(int) _nc_read_file_entry(const char *const filename, TERMTYPE2 *ptr) /* return 1 if read, 0 if not found or garbled */ { - FILE *fp = 0; + FILE *fp = NULL; int code; if (_nc_access(filename, R_OK) < 0 - || (fp = safe_fopen(filename, BIN_R)) == 0) { + || (fp = safe_fopen(filename, BIN_R)) == NULL) { TR(TRACE_DATABASE, ("cannot open terminfo %s (errno=%d)", filename, errno)); code = TGETENT_NO; } else { int limit; char buffer[MAX_ENTRY_SIZE + 1]; - if ((limit = (int) fread(buffer, sizeof(char), sizeof(buffer), fp)) - > 0) { + limit = (int) fread(buffer, sizeof(char), sizeof(buffer), fp); + if (limit > 0) { + const char *old_source = _nc_get_source(); TR(TRACE_DATABASE, ("read terminfo %s", filename)); + if (old_source == NULL) + _nc_set_source(filename); if ((code = _nc_read_termtype(ptr, buffer, limit)) == TGETENT_NO) { _nc_free_termtype2(ptr); } + _nc_set_source(old_source); } else { code = TGETENT_NO; } @@ -700,7 +728,7 @@ decode_hex(const char **source) static int decode_quickdump(char *target, const char *source) { - char *base = target; + const char *base = target; int result = 0; if (!strncmp(source, "b64:", (size_t) 4)) { @@ -769,12 +797,15 @@ _nc_read_tic_entry(char *filename, } else #if USE_HASHED_DB if (make_db_filename(filename, limit, path) - && (capdbp = _nc_db_open(filename, FALSE)) != 0) { + && (capdbp = _nc_db_open(filename, FALSE)) != NULL) { DBT key, data; int reccnt = 0; char *save = strdup(name); + if (save == NULL) + returnDB(code); + memset(&key, 0, sizeof(key)); key.data = save; key.size = strlen(save); @@ -850,7 +881,7 @@ _nc_read_entry2(const char *const name, char *const filename, TERMTYPE2 *const t { int code = TGETENT_NO; - if (name == 0) + if (name == NULL) return _nc_read_entry2("", filename, tp); _nc_SPRINTF(filename, _nc_SLIMIT(PATH_MAX) @@ -860,7 +891,7 @@ _nc_read_entry2(const char *const name, char *const filename, TERMTYPE2 *const t || strcmp(name, ".") == 0 || strcmp(name, "..") == 0 || _nc_pathlast(name) != 0 - || strchr(name, NCURSES_PATHSEP) != 0) { + || strchr(name, NCURSES_PATHSEP) != NULL) { TR(TRACE_DATABASE, ("illegal or missing entry name '%s'", name)); } else { #if NCURSES_USE_DATABASE @@ -870,7 +901,7 @@ _nc_read_entry2(const char *const name, char *const filename, TERMTYPE2 *const t _nc_first_db(&state, &offset); code = TGETENT_ERR; - while ((path = _nc_next_db(&state, &offset)) != 0) { + while ((path = _nc_next_db(&state, &offset)) != NULL) { code = _nc_read_tic_entry(filename, PATH_MAX, path, name, tp); if (code == TGETENT_YES) { _nc_last_db(); @@ -889,9 +920,6 @@ _nc_read_entry2(const char *const name, char *const filename, TERMTYPE2 *const t } #if NCURSES_EXT_NUMBERS -/* - * This entrypoint is used by tack 1.07 - */ NCURSES_EXPORT(int) _nc_read_entry(const char *const name, char *const filename, TERMTYPE *const tp) { diff --git a/ncurses/tinfo/read_termcap.c b/ncurses/tinfo/read_termcap.c index c9696b70..03b96a84 100644 --- a/ncurses/tinfo/read_termcap.c +++ b/ncurses/tinfo/read_termcap.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2020,2021 Thomas E. Dickey * + * Copyright 2018-2023,2025 Thomas E. Dickey * * Copyright 1998-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -57,7 +57,7 @@ #include #include -MODULE_ID("$Id: read_termcap.c,v 1.102 2021/09/04 10:29:15 tom Exp $") +MODULE_ID("$Id: read_termcap.c,v 1.106 2025/02/20 01:27:42 tom Exp $") #if !PURE_TERMINFO @@ -72,7 +72,7 @@ get_termpath(void) { const char *result; - if (!use_terminfo_vars() || (result = getenv("TERMPATH")) == 0) + if (!use_terminfo_vars() || (result = getenv("TERMPATH")) == NULL) result = TERMPATH; TR(TRACE_DATABASE, ("TERMPATH is %s", result)); return result; @@ -275,7 +275,7 @@ _nc_getent( { register char *r_end, *rp; int myfd = FALSE; - char *record = 0; + char *record = NULL; int tc_not_resolved; int current; int lineno; @@ -291,7 +291,7 @@ _nc_getent( * Check if we have a top record from cgetset(). */ if (depth == 0 && toprec != 0 && _nc_cgetmatch(toprec, name) == 0) { - if ((record = DOALLOC(topreclen + BFRAG)) == 0) { + if ((record = DOALLOC(topreclen + BFRAG)) == NULL) { errno = ENOMEM; return (TC_SYS_ERR); } @@ -305,7 +305,7 @@ _nc_getent( /* * Allocate first chunk of memory. */ - if ((record = DOALLOC(BFRAG)) == 0) { + if ((record = DOALLOC(BFRAG)) == NULL) { errno = ENOMEM; return (TC_SYS_ERR); } @@ -315,7 +315,7 @@ _nc_getent( /* * Loop through database array until finding the record. */ - for (current = in_array; db_array[current] != 0; current++) { + for (current = in_array; db_array[current] != NULL; current++) { int eof = FALSE; /* @@ -324,7 +324,7 @@ _nc_getent( if (fd >= 0) { (void) lseek(fd, (off_t) 0, SEEK_SET); } else if ((_nc_access(db_array[current], R_OK) < 0) - || (fd = open(db_array[current], O_RDONLY, 0)) < 0) { + || (fd = safe_open2(db_array[current], O_RDONLY)) < 0) { /* No error on unfound file. */ if (errno == ENOENT) continue; @@ -408,7 +408,7 @@ _nc_getent( pos = (unsigned) (rp - record); newsize = (size_t) (r_end - record + BFRAG); record = DOALLOC(newsize); - if (record == 0) { + if (record == NULL) { if (myfd) (void) close(fd); errno = ENOMEM; @@ -464,7 +464,7 @@ _nc_getent( register int newilen; unsigned ilen; int diff, iret, tclen, oline; - char *icap = 0, *scan, *tc, *tcstart, *tcend; + char *icap = NULL, *scan, *tc, *tcstart, *tcend; /* * Loop invariants: @@ -477,7 +477,7 @@ _nc_getent( scan = record; tc_not_resolved = FALSE; for (;;) { - if ((tc = _nc_cgetcap(scan, "tc", '=')) == 0) { + if ((tc = _nc_cgetcap(scan, "tc", '=')) == NULL) { break; } @@ -548,7 +548,7 @@ _nc_getent( tcpos = (unsigned) (tcstart - record); tcposend = (unsigned) (tcend - record); record = DOALLOC(newsize); - if (record == 0) { + if (record == NULL) { if (myfd) (void) close(fd); free(icap); @@ -586,7 +586,7 @@ _nc_getent( (void) close(fd); *len = (unsigned) (rp - record - 1); /* don't count NUL */ if (r_end > rp) { - if ((record = DOALLOC((size_t) (rp - record))) == 0) { + if ((record = DOALLOC((size_t) (rp - record))) == NULL) { errno = ENOMEM; return (TC_SYS_ERR); } @@ -720,7 +720,7 @@ get_tc_token(char **srcp, int *endp) int ch; bool found = FALSE; char *s, *base; - char *tok = 0; + char *tok = NULL; *endp = TRUE; for (s = base = *srcp; *s != '\0';) { @@ -749,7 +749,7 @@ get_tc_token(char **srcp, int *endp) } /* malformed entry may end without a ':' */ - if (tok == 0 && found) { + if (tok == NULL && found) { tok = base; } @@ -768,7 +768,7 @@ copy_tc_token(char *dst, const char *src, size_t len) continue; } if (--len == 0) { - dst = 0; + dst = NULL; break; } *dst++ = (char) ch; @@ -813,13 +813,13 @@ _nc_tgetent(char *bp, char **sourcename, int *lineno, const char *name) if (cp == NULL) { _nc_safe_strcpy(&desc, get_termpath()); } else if (!_nc_is_abs_path(cp)) { /* TERMCAP holds an entry */ - if ((termpath = get_termpath()) != 0) { + if ((termpath = get_termpath()) != NULL) { _nc_safe_strcat(&desc, termpath); } else { char temp[PBUFSIZ]; temp[0] = 0; - if ((home = getenv("HOME")) != 0 && *home != '\0' - && strchr(home, ' ') == 0 + if ((home = getenv("HOME")) != NULL && *home != '\0' + && strchr(home, ' ') == NULL && strlen(home) < sizeof(temp) - 10) { /* setup path */ _nc_SPRINTF(temp, _nc_SLIMIT(sizeof(temp)) "%s/", home); /* $HOME first */ @@ -850,7 +850,7 @@ _nc_tgetent(char *bp, char **sourcename, int *lineno, const char *name) } } } - *fname = 0; /* mark end of vector */ + *fname = NULL; /* mark end of vector */ #if !HAVE_BSD_CGETENT (void) _nc_cgetset(0); #endif @@ -875,7 +875,7 @@ _nc_tgetent(char *bp, char **sourcename, int *lineno, const char *name) pd = bp; ps = dummy; - while (!endflag && (tok = get_tc_token(&ps, &endflag)) != 0) { + while (!endflag && (tok = get_tc_token(&ps, &endflag)) != NULL) { bool ignore = FALSE; for (n = 1; n < count; n++) { @@ -889,7 +889,7 @@ _nc_tgetent(char *bp, char **sourcename, int *lineno, const char *name) if (ignore != TRUE) { list[count++] = tok; pd = copy_tc_token(pd, tok, (size_t) (TBUFSIZ - (2 + pd - bp))); - if (pd == 0) { + if (pd == NULL) { i = -1; break; } @@ -901,7 +901,7 @@ _nc_tgetent(char *bp, char **sourcename, int *lineno, const char *name) FreeIfNeeded(dummy); FreeIfNeeded(the_source); - the_source = 0; + the_source = NULL; /* This is not related to the BSD cgetent(), but to fake up a suitable * filename for ncurses' error reporting. (If we are not using BSD @@ -917,10 +917,10 @@ _nc_tgetent(char *bp, char **sourcename, int *lineno, const char *name) if (_nc_access(temp, R_OK) == 0) { _nc_safe_strcpy(&desc, pathvec[i]); } - if ((the_source = strdup(temp)) != 0) + if ((the_source = strdup(temp)) != NULL) *sourcename = the_source; #else - if ((the_source = strdup(pathvec[i])) != 0) + if ((the_source = strdup(pathvec[i])) != NULL) *sourcename = the_source; #endif } @@ -941,7 +941,7 @@ static int add_tc(char *termpaths[], char *path, int count) { char *save = strchr(path, NCURSES_PATHSEP); - if (save != 0) + if (save != NULL) *save = '\0'; if (count < MAXPATHS && _nc_access(path, R_OK) == 0) { @@ -949,7 +949,7 @@ add_tc(char *termpaths[], char *path, int count) TR(TRACE_DATABASE, ("Adding termpath %s", path)); } termpaths[count] = 0; - if (save != 0) + if (save != NULL) *save = NCURSES_PATHSEP; return count; } @@ -966,7 +966,7 @@ _nc_read_termcap_entry(const char *const tn, TERMTYPE2 *const tp) #endif #if USE_GETCAP char *p, tc[TBUFSIZ]; - char *tc_buf = 0; + char *tc_buf = NULL; #define MY_SIZE sizeof(tc) - 1 int status; static char *source; @@ -982,7 +982,7 @@ _nc_read_termcap_entry(const char *const tn, TERMTYPE2 *const tp) return TGETENT_NO; } - if (use_terminfo_vars() && (p = getenv("TERMCAP")) != 0 + if (use_terminfo_vars() && (p = getenv("TERMCAP")) != NULL && !_nc_is_abs_path(p) && _nc_name_match(p, tn, "|:")) { /* TERMCAP holds a termcap entry */ tc_buf = strdup(p); @@ -996,7 +996,7 @@ _nc_read_termcap_entry(const char *const tn, TERMTYPE2 *const tp) _nc_set_source(source); tc_buf = tc; } - if (tc_buf == 0) + if (tc_buf == NULL) return (TGETENT_ERR); _nc_read_entry_source((FILE *) 0, tc_buf, FALSE, TRUE, NULLHOOK); if (tc_buf != tc) @@ -1034,20 +1034,20 @@ _nc_read_termcap_entry(const char *const tn, TERMTYPE2 *const tp) int j, k; bool use_buffer = FALSE; bool normal = TRUE; - char *tc_buf = 0; + char *tc_buf = NULL; char pathbuf[PATH_MAX]; - char *copied = 0; + char *copied = NULL; char *cp; struct stat test_stat[MAXPATHS]; - termpaths[filecount] = 0; - if (use_terminfo_vars() && (tc = getenv("TERMCAP")) != 0) { + termpaths[filecount] = NULL; + if (use_terminfo_vars() && (tc = getenv("TERMCAP")) != NULL) { if (_nc_is_abs_path(tc)) { /* interpret as a filename */ ADD_TC(tc, 0); normal = FALSE; } else if (_nc_name_match(tc, tn, "|:")) { /* treat as a capability file */ tc_buf = strdup(tc); - use_buffer = (tc_buf != 0); + use_buffer = (tc_buf != NULL); normal = FALSE; } } @@ -1055,15 +1055,15 @@ _nc_read_termcap_entry(const char *const tn, TERMTYPE2 *const tp) if (normal) { /* normal case */ char envhome[PATH_MAX], *h; - copied = strdup(get_termpath()); - for (cp = copied; *cp; cp++) { - if (*cp == NCURSES_PATHSEP) - *cp = '\0'; - else if (cp == copied || cp[-1] == '\0') { - ADD_TC(cp, filecount); + if ((copied = strdup(get_termpath())) != NULL) { + for (cp = copied; *cp; cp++) { + if (*cp == NCURSES_PATHSEP) + *cp = '\0'; + else if (cp == copied || cp[-1] == '\0') { + ADD_TC(cp, filecount); + } } } - #define PRIVATE_CAP "%.*s/.termcap" if (use_terminfo_vars() && (h = getenv("HOME")) != NULL && *h != '\0' @@ -1140,11 +1140,11 @@ _nc_read_termcap_entry(const char *const tn, TERMTYPE2 *const tp) } } } - if (copied != 0) + if (copied != NULL) free(copied); #endif /* USE_GETCAP */ - if (_nc_head == 0) + if (_nc_head == NULL) return (TGETENT_ERR); /* resolve all use references */ @@ -1153,7 +1153,7 @@ _nc_read_termcap_entry(const char *const tn, TERMTYPE2 *const tp) /* find a terminal matching tn, if we can */ #if USE_GETCAP_CACHE - if (getcwd(cwd_buf, sizeof(cwd_buf)) != 0) { + if (getcwd(cwd_buf, sizeof(cwd_buf)) != NULL) { _nc_set_writedir((char *) 0); /* note: this does a chdir */ #endif for_entry_list(ep) { diff --git a/ncurses/tinfo/strings.c b/ncurses/tinfo/strings.c index a1d8beb6..7ae15e84 100644 --- a/ncurses/tinfo/strings.c +++ b/ncurses/tinfo/strings.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020 Thomas E. Dickey * + * Copyright 2020-2023,2024 Thomas E. Dickey * * Copyright 2000-2012,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -38,7 +38,7 @@ #include #include -MODULE_ID("$Id: strings.c,v 1.10 2020/02/02 23:34:34 tom Exp $") +MODULE_ID("$Id: strings.c,v 1.12 2024/12/07 21:24:18 tom Exp $") /**************************************************************************** * Useful string functions (especially for mvcur) @@ -71,12 +71,12 @@ _nc_strstr(const char *haystack, const char *needle) NCURSES_EXPORT(string_desc *) _nc_str_init(string_desc * dst, char *src, size_t len) { - if (dst != 0) { + if (dst != NULL) { dst->s_head = src; dst->s_tail = src; dst->s_size = len - 1; dst->s_init = dst->s_size; - if (src != 0) + if (src != NULL) *src = 0; } return dst; @@ -88,14 +88,14 @@ _nc_str_init(string_desc * dst, char *src, size_t len) NCURSES_EXPORT(string_desc *) _nc_str_null(string_desc * dst, size_t len) { - return _nc_str_init(dst, 0, len); + return _nc_str_init(dst, NULL, len); } /* * Copy a descriptor */ NCURSES_EXPORT(string_desc *) -_nc_str_copy(string_desc * dst, string_desc * src) +_nc_str_copy(string_desc * dst, const string_desc * const src) { *dst = *src; return dst; @@ -111,7 +111,7 @@ _nc_safe_strcat(string_desc * dst, const char *src) size_t len = strlen(src); if (len < dst->s_size) { - if (dst->s_tail != 0) { + if (dst->s_tail != NULL) { _nc_STRCPY(dst->s_tail, src, dst->s_size); dst->s_tail += len; } @@ -132,7 +132,7 @@ _nc_safe_strcpy(string_desc * dst, const char *src) size_t len = strlen(src); if (len < dst->s_size) { - if (dst->s_head != 0) { + if (dst->s_head != NULL) { _nc_STRCPY(dst->s_head, src, dst->s_size); dst->s_tail = dst->s_head + len; } diff --git a/ncurses/tinfo/tinfo_driver.c b/ncurses/tinfo/tinfo_driver.c index eb4ecb3d..3bdd8124 100644 --- a/ncurses/tinfo/tinfo_driver.c +++ b/ncurses/tinfo/tinfo_driver.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2021,2022 Thomas E. Dickey * + * Copyright 2018-2024,2025 Thomas E. Dickey * * Copyright 2008-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -52,7 +52,7 @@ # endif #endif -MODULE_ID("$Id: tinfo_driver.c,v 1.73 2022/08/13 14:36:43 tom Exp $") +MODULE_ID("$Id: tinfo_driver.c,v 1.79 2025/02/20 01:30:20 tom Exp $") /* * SCO defines TIOCGSIZE and the corresponding struct. Other systems (SunOS, @@ -94,8 +94,8 @@ NCURSES_EXPORT_VAR(int) COLORS = 0; #endif #define TCBMAGIC NCDRV_MAGIC(NCDRV_TINFO) -#define AssertTCB() assert(TCB!=0 && TCB->magic==TCBMAGIC) -#define SetSP() assert(TCB->csp!=0); sp = TCB->csp; (void) sp +#define AssertTCB() assert(TCB != NULL && TCB->magic == TCBMAGIC) +#define SetSP() assert(TCB->csp != NULL); sp = TCB->csp; (void) sp /* * This routine needs to do all the work to make curscr look @@ -163,7 +163,7 @@ drv_CanHandle(TERMINAL_CONTROL_BLOCK * TCB, const char *tname, int *errret) START_TRACE(); T((T_CALLED("tinfo::drv_CanHandle(%p)"), (void *) TCB)); - assert(TCB != 0 && tname != 0); + assert(TCB != NULL && tname != NULL); termp = (TERMINAL *) TCB; sp = TCB->csp; TCB->magic = TCBMAGIC; @@ -206,8 +206,8 @@ drv_CanHandle(TERMINAL_CONTROL_BLOCK * TCB, const char *tname, int *errret) save_ttytype(termp); #endif - if (command_character) - _nc_tinfo_cmdch(termp, *command_character); + if (VALID_STRING(command_character)) + _nc_tinfo_cmdch(termp, UChar(*command_character)); /* * If an application calls setupterm() rather than initscr() or @@ -215,7 +215,7 @@ drv_CanHandle(TERMINAL_CONTROL_BLOCK * TCB, const char *tname, int *errret) * _nc_setupscreen(). Do it now anyway, so we can initialize the * baudrate. */ - if (sp == 0 && NC_ISATTY(termp->Filedes)) { + if (sp == NULL && NC_ISATTY(termp->Filedes)) { get_baudrate(termp); } #if NCURSES_EXT_NUMBERS @@ -323,15 +323,15 @@ drv_defaultcolors(TERMINAL_CONTROL_BLOCK * TCB, int fg, int bg) AssertTCB(); SetSP(); - if (sp != 0 && orig_pair && orig_colors && (initialize_pair != 0)) { + if (sp != NULL && orig_pair && orig_colors && (initialize_pair != NULL)) { #if NCURSES_EXT_FUNCS sp->_default_color = isDefaultColor(fg) || isDefaultColor(bg); sp->_has_sgr_39_49 = (NCURSES_SP_NAME(tigetflag) (NCURSES_SP_ARGx - "AX") + UserCap(AX)) == TRUE); sp->_default_fg = isDefaultColor(fg) ? COLOR_DEFAULT : fg; sp->_default_bg = isDefaultColor(bg) ? COLOR_DEFAULT : bg; - if (sp->_color_pairs != 0) { + if (sp->_color_pairs != NULL) { bool save = sp->_default_color; sp->_default_color = TRUE; NCURSES_SP_NAME(init_pair) (NCURSES_SP_ARGx @@ -391,7 +391,7 @@ drv_rescol(TERMINAL_CONTROL_BLOCK * TCB) AssertTCB(); SetSP(); - if (orig_pair != 0) { + if (orig_pair != NULL) { NCURSES_PUTP2("orig_pair", orig_pair); result = TRUE; } @@ -407,7 +407,7 @@ drv_rescolors(TERMINAL_CONTROL_BLOCK * TCB) AssertTCB(); SetSP(); - if (orig_colors != 0) { + if (orig_colors != NULL) { NCURSES_PUTP2("orig_colors", orig_colors); result = TRUE; } @@ -470,7 +470,7 @@ drv_size(TERMINAL_CONTROL_BLOCK * TCB, int *linep, int *colp) errno = 0; do { if (ioctl(termp->Filedes, IOCTL_WINSIZE, &size) >= 0) { - *linep = ((sp != 0 && sp->_filtered) + *linep = ((sp != NULL && sp->_filtered) ? 1 : WINSIZE_ROWS(size)); *colp = WINSIZE_COLS(size); @@ -489,7 +489,7 @@ drv_size(TERMINAL_CONTROL_BLOCK * TCB, int *linep, int *colp) /* * If environment variables are used, update them. */ - if ((sp == 0 || !sp->_filtered) && _nc_getenv_num("LINES") > 0) { + if ((sp == NULL || !sp->_filtered) && _nc_getenv_num("LINES") > 0) { _nc_setenv_num("LINES", *linep); } if (_nc_getenv_num("COLUMNS") > 0) { @@ -504,11 +504,11 @@ drv_size(TERMINAL_CONTROL_BLOCK * TCB, int *linep, int *colp) * variable. */ if ((value = _nc_getenv_num("LINES")) > 0) { - *linep = value; + *linep = Min(value, MAX_ENV_LINES); T(("screen size: environment LINES = %d", *linep)); } if ((value = _nc_getenv_num("COLUMNS")) > 0) { - *colp = value; + *colp = Min(value, MAX_ENV_COLUMNS); T(("screen size: environment COLUMNS = %d", *colp)); } } @@ -545,7 +545,7 @@ static int drv_getsize(TERMINAL_CONTROL_BLOCK * TCB, int *l, int *c) { AssertTCB(); - assert(l != 0 && c != 0); + assert(l != NULL && c != NULL); *l = lines; *c = columns; return OK; @@ -676,7 +676,7 @@ drv_release(TERMINAL_CONTROL_BLOCK * TCB GCC_UNUSED) { } -# define SGR0_TEST(mode) (mode != 0) && (exit_attribute_mode == 0 || strcmp(mode, exit_attribute_mode)) +# define SGR0_TEST(mode) (mode != NULL) && (exit_attribute_mode == NULL || strcmp(mode, exit_attribute_mode)) static void drv_screen_init(SCREEN *sp) @@ -791,7 +791,7 @@ static int default_fg(SCREEN *sp) { #if NCURSES_EXT_FUNCS - return (sp != 0) ? sp->_default_fg : COLOR_WHITE; + return (sp != NULL) ? sp->_default_fg : COLOR_WHITE; #else return COLOR_WHITE; #endif @@ -801,7 +801,7 @@ static int default_bg(SCREEN *sp) { #if NCURSES_EXT_FUNCS - return sp != 0 ? sp->_default_bg : COLOR_BLACK; + return sp != NULL ? sp->_default_bg : COLOR_BLACK; #else return COLOR_BLACK; #endif @@ -833,7 +833,7 @@ drv_do_color(TERMINAL_CONTROL_BLOCK * TCB, int old_fg, old_bg; AssertTCB(); - if (sp == 0) + if (sp == NULL) return; if (pair < 0 || pair >= COLOR_PAIRS) { @@ -844,13 +844,13 @@ drv_do_color(TERMINAL_CONTROL_BLOCK * TCB, NCURSES_SP_NAME(tputs) (NCURSES_SP_ARGx TIPARM_1(set_color_pair, pair), 1, outc); return; - } else if (sp != 0) { + } else if (sp != NULL) { _nc_pair_content(SP_PARM, pair, &fg, &bg); } } if (old_pair >= 0 - && sp != 0 + && sp != NULL && _nc_pair_content(SP_PARM, old_pair, &old_fg, &old_bg) != ERR) { if ((isDefaultColor(fg) && !isDefaultColor(old_fg)) || (isDefaultColor(bg) && !isDefaultColor(old_bg))) { @@ -907,7 +907,7 @@ static void init_xterm_mouse(SCREEN *sp) { sp->_mouse_type = M_XTERM; - sp->_mouse_xtermcap = NCURSES_SP_NAME(tigetstr) (NCURSES_SP_ARGx "XM"); + sp->_mouse_xtermcap = NCURSES_SP_NAME(tigetstr) (NCURSES_SP_ARGx UserCap(XM)); if (!VALID_STRING(sp->_mouse_xtermcap)) sp->_mouse_xtermcap = "\033[?1000%?%p1%{1}%=%th%el%;"; } @@ -921,10 +921,10 @@ drv_initmouse(TERMINAL_CONTROL_BLOCK * TCB) SetSP(); /* we know how to recognize mouse events under "xterm" */ - if (sp != 0) { + if (sp != NULL) { if (NonEmpty(key_mouse)) { init_xterm_mouse(sp); - } else if (strstr(SP_TERMTYPE term_names, "xterm") != 0) { + } else if (strstr(SP_TERMTYPE term_names, "xterm") != NULL) { if (_nc_add_to_try(&(sp->_keytry), xterm_kmous, KEY_MOUSE) == OK) init_xterm_mouse(sp); } @@ -1076,7 +1076,7 @@ drv_initacs(TERMINAL_CONTROL_BLOCK * TCB, chtype *real_map, chtype *fake_map) SCREEN *sp = TCB->csp; AssertTCB(); - assert(sp != 0); + assert(sp != NULL); if (ena_acs != NULL) { NCURSES_PUTP2("ena_acs", ena_acs); } @@ -1091,7 +1091,7 @@ drv_initacs(TERMINAL_CONTROL_BLOCK * TCB, chtype *real_map, chtype *fake_map) * * test/blue.c uses this feature. */ -#define PCH_KLUDGE(a,b) (a != 0 && b != 0 && !strcmp(a,b)) +#define PCH_KLUDGE(a,b) (a != NULL && b != NULL && !strcmp(a,b)) if (PCH_KLUDGE(enter_pc_charset_mode, enter_alt_charset_mode) && PCH_KLUDGE(exit_pc_charset_mode, exit_alt_charset_mode)) { size_t i; @@ -1099,7 +1099,7 @@ drv_initacs(TERMINAL_CONTROL_BLOCK * TCB, chtype *real_map, chtype *fake_map) if (real_map[i] == 0) { real_map[i] = (chtype) i; if (real_map != fake_map) { - if (sp != 0) + if (sp != NULL) sp->_screen_acs_map[i] = TRUE; } } @@ -1118,7 +1118,7 @@ drv_initacs(TERMINAL_CONTROL_BLOCK * TCB, chtype *real_map, chtype *fake_map) (int) i, _tracechar(UChar(acs_chars[i])), _tracechtype(real_map[UChar(acs_chars[i])]))); - if (sp != 0) { + if (sp != NULL) { sp->_screen_acs_map[UChar(acs_chars[i])] = TRUE; } } @@ -1163,7 +1163,7 @@ _nc_cookie_init(SCREEN *sp) bool support_cookies = USE_XMC_SUPPORT; TERMINAL_CONTROL_BLOCK *TCB = (TERMINAL_CONTROL_BLOCK *) (sp->_term); - if (sp == 0 || !ENSURE_TINFO(sp)) + if (sp == NULL || !ENSURE_TINFO(sp)) return; #if USE_XMC_SUPPORT @@ -1172,7 +1172,7 @@ _nc_cookie_init(SCREEN *sp) * in the environment, reset the support-flag. */ if (magic_cookie_glitch >= 0) { - if (getenv("NCURSES_NO_MAGIC_COOKIE") != 0) { + if (getenv("NCURSES_NO_MAGIC_COOKIE") != NULL) { support_cookies = FALSE; } } @@ -1313,7 +1313,7 @@ drv_nap(TERMINAL_CONTROL_BLOCK * TCB GCC_UNUSED, int ms) #elif defined(EXP_WIN32_DRIVER) Sleep((DWORD) ms); #else - _nc_timed_wait(0, 0, ms, (int *) 0 EVENTLIST_2nd(0)); + _nc_timed_wait(NULL, 0, ms, (int *) 0 EVENTLIST_2nd(NULL)); #endif return OK; } @@ -1380,7 +1380,7 @@ drv_keyok(TERMINAL_CONTROL_BLOCK * TCB, int c, int flag) unsigned ch = (unsigned) c; if (flag) { while ((s = _nc_expand_try(sp->_key_ok, - ch, &count, (size_t) 0)) != 0) { + ch, &count, (size_t) 0)) != NULL) { if (_nc_remove_key(&(sp->_key_ok), ch)) { code = _nc_add_to_try(&(sp->_keytry), s, ch); free(s); @@ -1393,7 +1393,7 @@ drv_keyok(TERMINAL_CONTROL_BLOCK * TCB, int c, int flag) } } else { while ((s = _nc_expand_try(sp->_keytry, - ch, &count, (size_t) 0)) != 0) { + ch, &count, (size_t) 0)) != NULL) { if (_nc_remove_key(&(sp->_keytry), ch)) { code = _nc_add_to_try(&(sp->_key_ok), s, ch); free(s); @@ -1420,7 +1420,7 @@ drv_cursorSet(TERMINAL_CONTROL_BLOCK * TCB, int vis) T((T_CALLED("tinfo:drv_cursorSet(%p,%d)"), (void *) SP_PARM, vis)); - if (SP_PARM != 0 && IsTermInfo(SP_PARM)) { + if (SP_PARM != NULL && IsTermInfo(SP_PARM)) { switch (vis) { case 2: code = NCURSES_PUTP2_FLUSH("cursor_visible", cursor_visible); @@ -1504,7 +1504,7 @@ typedef struct DriverEntry { static DRIVER_ENTRY DriverTable[] = { -#ifdef _NC_WINDOWS +#ifdef USE_WIN32CON_DRIVER {"win32console", &_nc_WIN_DRIVER}, #endif {"tinfo", &_nc_TINFO_DRIVER} /* must be last */ @@ -1516,12 +1516,12 @@ _nc_get_driver(TERMINAL_CONTROL_BLOCK * TCB, const char *name, int *errret) int code = ERR; size_t i; TERM_DRIVER *res = (TERM_DRIVER *) 0; - TERM_DRIVER *use = 0; + TERM_DRIVER *use = NULL; T((T_CALLED("_nc_get_driver(%p, %s, %p)"), (void *) TCB, NonNull(name), (void *) errret)); - assert(TCB != 0); + assert(TCB != NULL); for (i = 0; i < SIZEOF(DriverTable); i++) { res = DriverTable[i].driver; @@ -1532,7 +1532,7 @@ _nc_get_driver(TERMINAL_CONTROL_BLOCK * TCB, const char *name, int *errret) If on Windows td_CanHandle returned FALSE although the terminal name is empty, we default to ms-terminal as tinfo TERM type. */ - if (name == 0 || *name == 0 || (strcmp(name, "unknown") == 0)) { + if (name == NULL || *name == 0 || (strcmp(name, "unknown") == 0)) { name = MS_TERMINAL; T(("Set TERM=%s", name)); } diff --git a/ncurses/tinfo/trim_sgr0.c b/ncurses/tinfo/trim_sgr0.c index 22bc82ff..d9c38d87 100644 --- a/ncurses/tinfo/trim_sgr0.c +++ b/ncurses/tinfo/trim_sgr0.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020,2021 Thomas E. Dickey * + * Copyright 2020-2023,2024 Thomas E. Dickey * * Copyright 2005-2012,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -37,26 +37,91 @@ #include -MODULE_ID("$Id: trim_sgr0.c,v 1.21 2021/06/17 21:20:30 tom Exp $") +MODULE_ID("$Id: trim_sgr0.c,v 1.27 2024/12/21 20:15:26 tom Exp $") #undef CUR #define CUR tp-> -#define CSI 233 -#define ESC 033 /* ^[ */ -#define L_BRACK '[' +/* + * Skip a padding token, e.g., "<5>", "<5.1>", "<5/>", "<5*>", or "<5/>". + * If the pattern does not match, return null. + */ +static char * +skip_padding(char *value) +{ + char *result = NULL; + if (*value++ == '$' && *value++ == '<') { + int ch; + int state = 0; /* 1=integer, 2=decimal, 3=fraction */ + while ((ch = UChar(*value++)) != '\0') { + if (ch == '*' || ch == '/') { + if (!state) + break; + } else if (ch == '>') { + if (state) + result = value; + break; + } else if (ch == '.') { + if (state < 2) { + state = 2; + } else { + break; /* a single decimal point is allowed */ + } + } else if (isdigit(ch)) { + if (state < 2) { + state = 1; + } else if (state == 2) { + state = 3; + } else { + break; /* only a single digit after decimal point */ + } + } else { + break; + } + } + } + return result; +} + +static void +strip_padding(char *value) +{ + char *s = value; + char ch; + + while ((ch = *s) != '\0') { + if (ch == '\\') { + if (*++s == '\0') + break; + ++s; + } else { + char *d = NULL; + if (ch == '$') + d = skip_padding(s); + if (d != NULL) { + char *t = s; + while ((*t++ = *d++) != '\0') ; + } else { + ++s; + } + } + } +} static char * -set_attribute_9(TERMTYPE2 *tp, int flag) +set_attribute_9(const TERMTYPE2 *tp, int flag) { const char *value; char *result; value = TIPARM_9(set_attributes, 0, 0, 0, 0, 0, 0, 0, 0, flag); - if (PRESENT(value)) + if (PRESENT(value)) { result = strdup(value); - else - result = 0; + if (result != NULL) + strip_padding(result); + } else { + result = NULL; + } return result; } @@ -64,10 +129,10 @@ static int is_csi(const char *s) { int result = 0; - if (s != 0) { - if (UChar(s[0]) == CSI) + if (s != NULL) { + if (UChar(s[0]) == CSI_CHR) result = 1; - else if (s[0] == ESC && s[1] == L_BRACK) + else if (s[0] == ESC_CHR && s[1] == L_BLOCK) result = 2; } return result; @@ -103,9 +168,9 @@ skip_delay(const char *s) * to the end of the s-string. */ static bool -rewrite_sgr(char *s, char *attr) +rewrite_sgr(char *s, const char *attr) { - if (s != 0) { + if (s != NULL) { if (PRESENT(attr)) { size_t len_s = strlen(s); size_t len_a = strlen(attr); @@ -129,7 +194,7 @@ static bool similar_sgr(char *a, char *b) { bool result = FALSE; - if (a != 0 && b != 0) { + if (a != NULL && b != NULL) { int csi_a = is_csi(a); int csi_b = is_csi(b); size_t len_a; @@ -241,12 +306,10 @@ _nc_trim_sgr0(TERMTYPE2 *tp) if (PRESENT(exit_attribute_mode) && PRESENT(set_attributes)) { - bool found = FALSE; char *on = set_attribute_9(tp, 1); char *off = set_attribute_9(tp, 0); char *end = strdup(exit_attribute_mode); char *tmp; - size_t i, j, k; TR(TRACE_DATABASE, ("checking if we can trim sgr0 based on sgr")); TR(TRACE_DATABASE, ("sgr0 %s", _nc_visbuf(end))); @@ -259,12 +322,17 @@ _nc_trim_sgr0(TERMTYPE2 *tp) FreeIfNeeded(off); } else if (similar_sgr(off, end) && !similar_sgr(off, on)) { + bool found = FALSE; + size_t i, j; + TR(TRACE_DATABASE, ("adjusting sgr(9:off) : %s", _nc_visbuf(off))); result = off; /* * If rmacs is a substring of sgr(0), remove that chunk. */ if (PRESENT(exit_alt_charset_mode)) { + size_t k; + TR(TRACE_DATABASE, ("scan for rmacs %s", _nc_visbuf(exit_alt_charset_mode))); j = strlen(off); k = strlen(exit_alt_charset_mode); @@ -301,7 +369,7 @@ _nc_trim_sgr0(TERMTYPE2 *tp) } } if (!found - && (tmp = strstr(end, off)) != 0 + && (tmp = strstr(end, off)) != NULL && strcmp(end, off) != 0) { i = (size_t) (tmp - end); j = strlen(off); diff --git a/ncurses/tinfo/write_entry.c b/ncurses/tinfo/write_entry.c index 002b117c..a250677d 100644 --- a/ncurses/tinfo/write_entry.c +++ b/ncurses/tinfo/write_entry.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2022,2023 Thomas E. Dickey * + * Copyright 2018-2023,2024 Thomas E. Dickey * * Copyright 1998-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -42,6 +42,8 @@ #include +MODULE_ID("$Id: write_entry.c,v 1.139 2024/12/21 16:42:33 tom Exp $") + #if 1 #define TRACE_OUT(p) DEBUG(2, p) #define TRACE_NUM(n) if (VALID_NUMERIC(Numbers[n])) { \ @@ -51,7 +53,15 @@ #define TRACE_NUM(n) /* nothing */ #endif -MODULE_ID("$Id: write_entry.c,v 1.121 2023/03/05 18:45:59 tom Exp $") +/* + * FIXME: special case to work around Cygwin bug in link(), which updates + * the target file's timestamp. + */ +#if HAVE_LINK && !USE_SYMLINKS && !MIXEDCASE_FILENAMES && defined(__CYGWIN__) +#define LINK_TOUCHES 1 +#else +#define LINK_TOUCHES 0 +#endif static int total_written; static int total_parts; @@ -72,25 +82,29 @@ write_file(char *filename, TERMTYPE2 *tp) } else { FILE *fp = ((_nc_access(filename, W_OK) == 0) ? safe_fopen(filename, BIN_W) - : 0); + : NULL); size_t actual; - if (fp == 0) { - perror(filename); - _nc_syserr_abort("can't open %s/%s", _nc_tic_dir(0), filename); + if (fp == NULL) { + _nc_syserr_abort("cannot open %s/%s: (errno %d) %s", + _nc_tic_dir(NULL), + filename, + errno, + strerror(errno)); } actual = fwrite(buffer, sizeof(char), (size_t) offset, fp); if (actual != offset) { int myerr = ferror(fp) ? errno : 0; if (myerr) { - _nc_syserr_abort("error writing %s/%s: %s", - _nc_tic_dir(0), + _nc_syserr_abort("error writing %s/%s: (errno %d) %s", + _nc_tic_dir(NULL), filename, + myerr, strerror(myerr)); } else { _nc_syserr_abort("error writing %s/%s: %u bytes vs actual %lu", - _nc_tic_dir(0), + _nc_tic_dir(NULL), filename, offset, (unsigned long) actual); @@ -115,21 +129,23 @@ check_writeable(int code) static const char dirnames[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"; static bool verified[sizeof(dirnames)]; - char dir[sizeof(LEAF_FMT)]; - char *s = 0; - - if (code == 0 || (s = (strchr) (dirnames, code)) == 0) - _nc_err_abort("Illegal terminfo subdirectory \"" LEAF_FMT "\"", code); - - if (verified[s - dirnames]) - return; - - _nc_SPRINTF(dir, _nc_SLIMIT(sizeof(dir)) LEAF_FMT, code); - if (make_db_root(dir) < 0) { - _nc_err_abort("%s/%s: permission denied", _nc_tic_dir(0), dir); + const char *s = NULL; + + if (code == 0 || (s = (strchr) (dirnames, code)) == NULL) { + _nc_err_abort("Illegal terminfo subdirectory \"" LEAF_FMT "\"", UChar(code)); + } else if (!verified[s - dirnames]) { + char dir[sizeof(LEAF_FMT)]; + _nc_SPRINTF(dir, _nc_SLIMIT(sizeof(dir)) LEAF_FMT, UChar(code)); + if (make_db_root(dir) < 0) { + _nc_err_abort("%s/%s: (errno %d) %s", + _nc_tic_dir(NULL), + dir, + errno, + strerror(errno)); + } else { + verified[s - dirnames] = TRUE; + } } - - verified[s - dirnames] = TRUE; } #endif /* !USE_HASHED_DB */ @@ -137,7 +153,7 @@ static int make_db_path(char *dst, const char *src, size_t limit) { int rc = -1; - const char *top = _nc_tic_dir(0); + const char *top = _nc_tic_dir(NULL); if (src == top || _nc_is_abs_path(src)) { if (strlen(src) + 1 <= limit) { @@ -145,8 +161,12 @@ make_db_path(char *dst, const char *src, size_t limit) rc = 0; } } else { - if ((strlen(top) + strlen(src) + 6) <= limit) { - _nc_SPRINTF(dst, _nc_SLIMIT(limit) "%s/%s", top, src); + size_t len_top = strlen(top); + size_t len_src = strlen(src); + if ((len_top + len_src + 6) <= limit) { + _nc_SPRINTF(dst, _nc_SLIMIT(limit) "%.*s/%.*s", + (int) len_top, top, + (int) len_src, src); rc = 0; } } @@ -192,13 +212,14 @@ make_db_root(const char *path) if ((rc = stat(path, &statbuf)) == -1) { rc = mkdir(path -#ifndef _NC_WINDOWS +#ifndef _NC_WINDOWS_NATIVE ,0777 #endif ); } else if (_nc_access(path, R_OK | W_OK | X_OK) < 0) { rc = -1; /* permission denied */ } else if (!(S_ISDIR(statbuf.st_mode))) { + errno = ENOTDIR; rc = -1; /* not a directory */ } #endif @@ -214,26 +235,32 @@ _nc_set_writedir(const char *dir) { const char *destination; char actual[PATH_MAX]; + bool specific = (dir != NULL); - if (dir == 0 -#ifndef USE_ROOT_ENVIRON - && use_terminfo_vars() -#endif - ) + if (!specific && use_terminfo_vars()) dir = getenv("TERMINFO"); - if (dir != 0) + if (dir != NULL) (void) _nc_tic_dir(dir); - destination = _nc_tic_dir(0); + destination = _nc_tic_dir(NULL); if (make_db_root(destination) < 0) { - char *home = _nc_home_terminfo(); + bool success = FALSE; + + if (!specific) { + char *home = _nc_home_terminfo(); - if (home != 0) { - destination = home; - if (make_db_root(destination) < 0) - _nc_err_abort("%s: permission denied (errno %d)", - destination, errno); + if (home != NULL) { + destination = home; + if (make_db_root(destination) == 0) + success = TRUE; + } + } + if (!success) { + _nc_err_abort("%s: (errno %d) %s", + destination, + errno, + strerror(errno)); } } @@ -245,7 +272,7 @@ _nc_set_writedir(const char *dir) make_db_path(actual, destination, sizeof(actual)); #else if (chdir(_nc_tic_dir(destination)) < 0 - || getcwd(actual, sizeof(actual)) == 0) + || getcwd(actual, sizeof(actual)) == NULL) _nc_err_abort("%s: not a directory", destination); #endif _nc_keep_tic_dir(actual); @@ -327,8 +354,9 @@ _nc_write_entry(TERMTYPE2 *const tp) if (ptr != name_list) { *ptr = '\0'; - for (ptr = name_list; *ptr != '\0' && *ptr != '|'; ptr++) - continue; + for (ptr = name_list; *ptr != '\0' && *ptr != '|'; ptr++) { + /* EMPTY */ ; + } if (*ptr == '\0') other_names = ptr; @@ -345,10 +373,10 @@ _nc_write_entry(TERMTYPE2 *const tp) #if USE_HASHED_DB if (_nc_write_object(tp, buffer + 1, &offset, limit - 1) != ERR) { - DB *capdb = _nc_db_open(_nc_tic_dir(0), TRUE); + DB *capdb = _nc_db_open(_nc_tic_dir(NULL), TRUE); DBT key, data; - if (capdb != 0) { + if (capdb != NULL) { buffer[0] = 0; memset(&key, 0, sizeof(key)); @@ -371,7 +399,7 @@ _nc_write_entry(TERMTYPE2 *const tp) sizeof(buffer) - 1); data.size = name_size + 1; - total_size += data.size; + total_size += (int) data.size; total_parts++; _nc_db_put(capdb, &key, &data); @@ -387,7 +415,7 @@ _nc_write_entry(TERMTYPE2 *const tp) key.data = ptr; key.size = strlen(ptr); - total_size += data.size; + total_size += (int) data.size; total_parts++; _nc_db_put(capdb, &key, &data); } @@ -445,7 +473,7 @@ _nc_write_entry(TERMTYPE2 *const tp) if (stat(filename, &statbuf) == -1 || (start_time = statbuf.st_mtime) == 0) { _nc_syserr_abort("error obtaining time from %s/%s", - _nc_tic_dir(0), filename); + _nc_tic_dir(NULL), filename); } } while (*other_names != '\0') { @@ -460,22 +488,26 @@ _nc_write_entry(TERMTYPE2 *const tp) _nc_warning("terminal alias %s too long.", ptr); continue; } - if (strchr(ptr, '/') != 0) { + if (strchr(ptr, '/') != NULL) { _nc_warning("cannot link alias %s.", ptr); continue; } check_writeable(ptr[0]); _nc_SPRINTF(linkname, _nc_SLIMIT(sizeof(linkname)) - LEAF_FMT "/%.*s", ptr[0], + LEAF_FMT "/%.*s", UChar(ptr[0]), (int) sizeof(linkname) - (2 + LEAF_LEN), ptr); if (strcmp(filename, linkname) == 0) { _nc_warning("self-synonym ignored"); - } else if (stat(linkname, &statbuf) >= 0 && - statbuf.st_mtime > start_time) { + } +#if !LINK_TOUCHES + else if (stat(linkname, &statbuf) >= 0 && + statbuf.st_mtime < start_time) { _nc_warning("alias %s multiply defined.", ptr); - } else if (_nc_access(linkname, W_OK) == 0) + } +#endif + else if (_nc_access(linkname, W_OK) == 0) #if HAVE_LINK { int code; @@ -514,9 +546,9 @@ _nc_write_entry(TERMTYPE2 *const tp) write_file(linkname, tp); else { #if MIXEDCASE_FILENAMES - _nc_syserr_abort("can't link %s to %s", filename, linkname); + _nc_syserr_abort("cannot link %s to %s", filename, linkname); #else - _nc_warning("can't link %s to %s (errno=%d)", filename, + _nc_warning("cannot link %s to %s (errno=%d)", filename, linkname, errno); #endif } @@ -535,7 +567,7 @@ static size_t fake_write(char *dst, unsigned *offset, size_t limit, - char *src, + const char *src, size_t want, size_t size) { @@ -641,7 +673,7 @@ convert_32bit(unsigned char *buf, NCURSES_INT2 *Numbers, size_t count) #if NCURSES_XNAMES static unsigned -extended_Booleans(TERMTYPE2 *tp) +extended_Booleans(const TERMTYPE2 *tp) { unsigned result = 0; unsigned i; @@ -654,7 +686,7 @@ extended_Booleans(TERMTYPE2 *tp) } static unsigned -extended_Numbers(TERMTYPE2 *tp) +extended_Numbers(const TERMTYPE2 *tp) { unsigned result = 0; unsigned i; @@ -667,7 +699,7 @@ extended_Numbers(TERMTYPE2 *tp) } static unsigned -extended_Strings(TERMTYPE2 *tp) +extended_Strings(const TERMTYPE2 *tp) { unsigned short result = 0; unsigned short i; @@ -684,7 +716,7 @@ extended_Strings(TERMTYPE2 *tp) * clause - discard the unneeded data. */ static bool -extended_object(TERMTYPE2 *tp) +extended_object(const TERMTYPE2 *tp) { bool result = FALSE; @@ -712,7 +744,7 @@ _nc_write_object(TERMTYPE2 *tp, char *buffer, unsigned *offset, unsigned limit) unsigned last_str = STRWRITE; #if NCURSES_EXT_NUMBERS bool need_ints = FALSE; - size_t (*convert_numbers) (unsigned char *, NCURSES_INT2 *, size_t) = convert_32bit; + size_t (*convert_numbers) (unsigned char *, NCURSES_INT2 *, size_t); #else #define convert_numbers convert_shorts #endif @@ -773,7 +805,8 @@ _nc_write_object(TERMTYPE2 *tp, char *buffer, unsigned *offset, unsigned limit) #else LITTLE_ENDIAN(buf, MAGIC); #endif - LITTLE_ENDIAN(buf + 2, min(namelen, MAX_NAME_SIZE + 1)); + namelen = Min(namelen, MAX_NAME_SIZE + 1); + LITTLE_ENDIAN(buf + 2, namelen); LITTLE_ENDIAN(buf + 4, boolmax); LITTLE_ENDIAN(buf + 6, nummax); LITTLE_ENDIAN(buf + 8, strmax); diff --git a/ncurses/trace/lib_trace.c b/ncurses/trace/lib_trace.c index effd3c1c..a7197b0d 100644 --- a/ncurses/trace/lib_trace.c +++ b/ncurses/trace/lib_trace.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2021,2022 Thomas E. Dickey * + * Copyright 2018-2023,2024 Thomas E. Dickey * * Copyright 1998-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -48,7 +48,7 @@ #include -MODULE_ID("$Id: lib_trace.c,v 1.101 2022/09/17 14:57:02 tom Exp $") +MODULE_ID("$Id: lib_trace.c,v 1.109 2024/12/07 21:02:00 tom Exp $") NCURSES_EXPORT_VAR(unsigned) _nc_tracing = 0; /* always define this */ @@ -89,17 +89,17 @@ NCURSES_EXPORT_VAR(long) _nc_outchars = 0; #define MyFP _nc_globals.trace_fp #define MyFD _nc_globals.trace_fd #define MyInit _nc_globals.trace_opened -#define MyPath _nc_globals.trace_fname #define MyLevel _nc_globals.trace_level #define MyNested _nc_globals.nested_tracef #endif /* TRACE */ #if USE_REENTRANT -#define Locked(statement) { \ +#define Locked(statement) \ + do { \ _nc_lock_global(tst_tracef); \ statement; \ _nc_unlock_global(tst_tracef); \ - } + } while (0) #else #define Locked(statement) statement #endif @@ -135,28 +135,21 @@ curses_trace(unsigned tracelevel) Locked(result = _nc_tracing); - if ((MyFP == 0) && tracelevel) { + if ((MyFP == NULL) && tracelevel) { MyInit = TRUE; if (MyFD >= 0) { MyFP = fdopen(MyFD, BIN_W); } else { - if (MyPath[0] == '\0') { - size_t size = sizeof(MyPath) - 12; - if (getcwd(MyPath, size) == 0) { - perror("curses: Can't get working directory"); - exit(EXIT_FAILURE); - } - MyPath[size] = '\0'; - assert(strlen(MyPath) <= size); - _nc_STRCAT(MyPath, "/trace", sizeof(MyPath)); - if (_nc_is_dir_path(MyPath)) { - _nc_STRCAT(MyPath, ".log", sizeof(MyPath)); - } + char myFile[80]; + + _nc_STRCPY(myFile, "trace", sizeof(myFile)); + if (_nc_is_dir_path(myFile)) { + _nc_STRCAT(myFile, ".log", sizeof(myFile)); } #define SAFE_MODE (O_CREAT | O_EXCL | O_RDWR) - if (_nc_access(MyPath, W_OK) < 0 - || (MyFD = safe_open3(MyPath, SAFE_MODE, 0600)) < 0 - || (MyFP = fdopen(MyFD, BIN_W)) == 0) { + if (_nc_access(myFile, W_OK) < 0 + || (MyFD = safe_open3(myFile, SAFE_MODE, 0600)) < 0 + || (MyFP = fdopen(MyFD, BIN_W)) == NULL) { ; /* EMPTY */ } } @@ -165,7 +158,7 @@ curses_trace(unsigned tracelevel) * so that the trace-output gets flushed automatically at the * end of each line. This is useful in case the program dies. */ - if (MyFP != 0) { + if (MyFP != NULL) { #if HAVE_SETVBUF /* ANSI */ (void) setvbuf(MyFP, (char *) 0, _IOLBF, (size_t) 0); #elif HAVE_SETBUF /* POSIX */ @@ -195,10 +188,10 @@ curses_trace(unsigned tracelevel) _tracef("- DEBUG_LEVEL(%u)", tracelevel >> TRACE_SHIFT); } } else if (tracelevel == 0) { - if (MyFP != 0) { + if (MyFP != NULL) { MyFD = dup(MyFD); /* allow reopen of same file */ fclose(MyFP); - MyFP = 0; + MyFP = NULL; } Locked(_nc_tracing = tracelevel); } else if (_nc_tracing != tracelevel) { @@ -233,7 +226,7 @@ _nc_va_tracef(const char *fmt, va_list ap) #ifdef TRACE /* verbose-trace in the command-line utilities relies on this */ - if (fp == 0 && !MyInit && _nc_tracing >= DEBUG_LEVEL(1)) + if (fp == NULL && !MyInit && _nc_tracing >= DEBUG_LEVEL(1)) fp = stderr; #endif @@ -253,7 +246,7 @@ _nc_va_tracef(const char *fmt, va_list ap) } } - if (doit != 0 && fp != 0) { + if (doit != 0 && fp != NULL) { #ifdef USE_PTHREADS /* * TRACE_ICALLS is "really" needed to show normal use with threaded @@ -267,11 +260,13 @@ _nc_va_tracef(const char *fmt, va_list ap) # if USE_WEAK_SYMBOLS if ((pthread_self)) # endif -#ifdef _NC_WINDOWS - fprintf(fp, "%#lx:", (long) (intptr_t) pthread_self().p); + fprintf(fp, "%#" PRIxPTR ":", +#ifdef _NC_WINDOWS_NATIVE + CASTxPTR(pthread_self().p) #else - fprintf(fp, "%#lx:", (long) (intptr_t) pthread_self()); + CASTxPTR(pthread_self()) #endif + ); #endif if (before || after) { int n; @@ -300,8 +295,8 @@ _tracef(const char *fmt, ...) } /* Trace 'bool' return-values */ -NCURSES_EXPORT(NCURSES_BOOL) -_nc_retrace_bool(int code) +NCURSES_EXPORT(bool) +_nc_retrace_bool(bool code) { T((T_RETURN("%s"), code ? "TRUE" : "FALSE")); return code; diff --git a/ncurses/trace/lib_traceatr.c b/ncurses/trace/lib_traceatr.c index d397fb21..68e22745 100644 --- a/ncurses/trace/lib_traceatr.c +++ b/ncurses/trace/lib_traceatr.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2020,2022 Thomas E. Dickey * + * Copyright 2018-2022,2024 Thomas E. Dickey * * Copyright 1998-2017,2018 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -44,7 +44,7 @@ #define CUR SP_TERMTYPE #endif -MODULE_ID("$Id: lib_traceatr.c,v 1.95 2022/06/11 22:40:56 tom Exp $") +MODULE_ID("$Id: lib_traceatr.c,v 1.98 2024/12/07 21:12:53 tom Exp $") #define COLOR_OF(c) ((c < 0) ? "default" : (c > 7 ? color_of(c) : colors[c].name)) @@ -126,7 +126,7 @@ _traceattr2(int bufnum, chtype newmode) #undef DATA char *result = _nc_trace_buf(bufnum, (size_t) BUFSIZ); - if (result != 0) { + if (result != NULL) { size_t n; unsigned save_nc_tracing = _nc_tracing; @@ -167,7 +167,7 @@ _traceattr2(int bufnum, chtype newmode) } } if (ChAttrOf(newmode) == A_NORMAL) { - if (result != 0 && result[1] != '\0') + if (result != NULL && result[1] != '\0') (void) _nc_trace_bufcat(bufnum, "|"); (void) _nc_trace_bufcat(bufnum, "A_NORMAL"); } @@ -248,14 +248,14 @@ _nc_altcharset_name(attr_t attr, chtype ch) }; #undef DATA - const char *result = 0; + const char *result = NULL; #if NCURSES_SP_FUNCS (void) sp; #endif - if (SP_PARM != 0 && (attr & A_ALTCHARSET) && (acs_chars != 0)) { + if (SP_PARM != NULL && (attr & A_ALTCHARSET) && (acs_chars != NULL)) { char *cp; - char *found = 0; + const char *found = NULL; for (cp = acs_chars; cp[0] && cp[1]; cp += 2) { if (ChCharOf(UChar(cp[1])) == ChCharOf(ch)) { @@ -264,7 +264,7 @@ _nc_altcharset_name(attr_t attr, chtype ch) } } - if (found != 0) { + if (found != NULL) { size_t n; ch = ChCharOf(UChar(*found)); @@ -284,12 +284,12 @@ _tracechtype2(int bufnum, chtype ch) { char *result = _nc_trace_buf(bufnum, (size_t) BUFSIZ); - if (result != 0) { + if (result != NULL) { const char *found; attr_t attr = ChAttrOf(ch); _nc_STRCPY(result, l_brace, TRACE_BUF_SIZE(bufnum)); - if ((found = _nc_altcharset_name(attr, ch)) != 0) { + if ((found = _nc_altcharset_name(attr, ch)) != NULL) { (void) _nc_trace_bufcat(bufnum, found); attr &= ~A_ALTCHARSET; } else @@ -328,13 +328,13 @@ _tracecchar_t2(int bufnum, const cchar_t *ch) { char *result = _nc_trace_buf(bufnum, (size_t) BUFSIZ); - if (result != 0) { + if (result != NULL) { _nc_STRCPY(result, l_brace, TRACE_BUF_SIZE(bufnum)); - if (ch != 0) { + if (ch != NULL) { const char *found; attr_t attr = AttrOfD(ch); - if ((found = _nc_altcharset_name(attr, (chtype) CharOfD(ch))) != 0) { + if ((found = _nc_altcharset_name(attr, (chtype) CharOfD(ch))) != NULL) { (void) _nc_trace_bufcat(bufnum, found); attr &= ~A_ALTCHARSET; } else if (isWidecExt(CHDEREF(ch))) { @@ -343,6 +343,7 @@ _tracecchar_t2(int bufnum, const cchar_t *ch) } else { PUTC_DATA; int n; + int assume_unicode = _nc_unicode_locale()? 128 : 255; (void) _nc_trace_bufcat(bufnum, "{ "); for (PUTC_i = 0; PUTC_i < CCHARW_MAX; ++PUTC_i) { @@ -362,10 +363,10 @@ _tracecchar_t2(int bufnum, const cchar_t *ch) UChar(ch->chars[PUTC_i]))); } break; - } else if (ch->chars[PUTC_i] > 255) { + } else if (ch->chars[PUTC_i] > assume_unicode) { char temp[80]; _nc_SPRINTF(temp, _nc_SLIMIT(sizeof(temp)) - "{%d:\\u%lx}", + "{%d:\\u%04lx}", _nc_wacs_width(ch->chars[PUTC_i]), (unsigned long) ch->chars[PUTC_i]); (void) _nc_trace_bufcat(bufnum, temp); diff --git a/ncurses/trace/lib_tracebits.c b/ncurses/trace/lib_tracebits.c index 4bc50f3b..d2fd7227 100644 --- a/ncurses/trace/lib_tracebits.c +++ b/ncurses/trace/lib_tracebits.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2019,2020 Thomas E. Dickey * + * Copyright 2019-2024,2025 Thomas E. Dickey * * Copyright 1998-2012,2015 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -35,7 +35,7 @@ #include -MODULE_ID("$Id: lib_tracebits.c,v 1.31 2020/11/14 23:38:11 tom Exp $") +MODULE_ID("$Id: lib_tracebits.c,v 1.34 2025/02/20 01:02:09 tom Exp $") #if HAVE_SYS_TERMIO_H #include /* needed for ISC */ @@ -79,14 +79,14 @@ MODULE_ID("$Id: lib_tracebits.c,v 1.31 2020/11/14 23:38:11 tom Exp $") #endif typedef struct { - unsigned int val; + unsigned long val; const char name[BITNAMELEN]; } BITNAMES; #define TRACE_BUF_SIZE(num) (_nc_globals.tracebuf_ptr[num].size) static void -lookup_bits(char *buf, const BITNAMES * table, const char *label, unsigned int val) +lookup_bits(char *buf, const BITNAMES * table, const char *label, unsigned long val) { const BITNAMES *sp; @@ -172,7 +172,7 @@ _nc_trace_ttymode(const TTY * tty) 8 + sizeof(cflags) + 8 + sizeof(lflags) + 8); - if (buf != 0) { + if (buf != NULL) { if (tty->c_iflag & ALLIN) lookup_bits(buf, iflags, "iflags", tty->c_iflag); @@ -244,7 +244,7 @@ _nc_trace_ttymode(const TTY * tty) buf = _nc_trace_buf(0, 8 + sizeof(dwFlagsOut) + 8 + sizeof(dwFlagsIn)); - if (buf != 0) { + if (buf != NULL) { lookup_bits(buf, dwFlagsIn, "dwIn", tty->dwFlagIn); lookup_bits(buf, dwFlagsOut, "dwOut", tty->dwFlagOut); } @@ -284,7 +284,7 @@ _nc_trace_ttymode(const TTY * tty) buf = _nc_trace_buf(0, 8 + sizeof(cflags)); - if (buf != 0) { + if (buf != NULL) { if (tty->sg_flags & ALLCTRL) { lookup_bits(buf, cflags, "cflags", tty->sg_flags); } diff --git a/ncurses/trace/lib_tracechr.c b/ncurses/trace/lib_tracechr.c index 36158d6f..db3cb530 100644 --- a/ncurses/trace/lib_tracechr.c +++ b/ncurses/trace/lib_tracechr.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020 Thomas E. Dickey * + * Copyright 2020,2024 Thomas E. Dickey * * Copyright 1998-2009,2012 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -40,7 +40,7 @@ #include -MODULE_ID("$Id: lib_tracechr.c,v 1.23 2020/02/02 23:34:34 tom Exp $") +MODULE_ID("$Id: lib_tracechr.c,v 1.26 2024/12/07 21:02:00 tom Exp $") #ifdef TRACE @@ -50,30 +50,32 @@ NCURSES_EXPORT(char *) _nc_tracechar(SCREEN *sp, int ch) { NCURSES_CONST char *name; - char *MyBuffer = ((sp != 0) + char *MyBuffer = ((sp != NULL) ? sp->tracechr_buf : _nc_globals.tracechr_buf); - if (ch > KEY_MIN || ch < 0) { + if ((ch > KEY_MIN && !_nc_unicode_locale()) || ch < 0) { name = safe_keyname(SP_PARM, ch); - if (name == 0 || *name == '\0') + if (name == NULL || *name == '\0') name = "NULL"; _nc_SPRINTF(MyBuffer, _nc_SLIMIT(MyBufSize) - "'%.30s' = %#03o", name, ch); - } else if (!is8bits(ch) || !isprint(UChar(ch))) { + "'%.30s' = \\x%02x", name, UChar(ch)); + } else if (!is8bits(ch) + || (_nc_unicode_locale() && !is7bits(ch)) + || !isprint(UChar(ch))) { /* * workaround for glibc bug: * sprintf changes the result from unctrl() to an empty string if it * does not correspond to a valid multibyte sequence. */ _nc_SPRINTF(MyBuffer, _nc_SLIMIT(MyBufSize) - "%#03o", ch); + "\\x%02x", ch); } else { name = safe_unctrl(SP_PARM, (chtype) ch); - if (name == 0 || *name == 0) + if (name == NULL || *name == 0) name = "null"; /* shouldn't happen */ _nc_SPRINTF(MyBuffer, _nc_SLIMIT(MyBufSize) - "'%.30s' = %#03o", name, ch); + "'%.30s' = \\x%02x", name, ch); } return (MyBuffer); } diff --git a/ncurses/trace/lib_tracedmp.c b/ncurses/trace/lib_tracedmp.c index 3b7ea074..218a15e0 100644 --- a/ncurses/trace/lib_tracedmp.c +++ b/ncurses/trace/lib_tracedmp.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020 Thomas E. Dickey * + * Copyright 2020-2023,2024 Thomas E. Dickey * * Copyright 1998-2012,2016 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -40,7 +40,7 @@ #include #include -MODULE_ID("$Id: lib_tracedmp.c,v 1.36 2020/02/02 23:34:34 tom Exp $") +MODULE_ID("$Id: lib_tracedmp.c,v 1.38 2024/12/07 20:06:49 tom Exp $") #ifdef TRACE @@ -71,9 +71,9 @@ _tracedump(const char *name, WINDOW *win) if (++width + 1 > (int) my_length) { my_length = (unsigned) (2 * (width + 1)); my_buffer = typeRealloc(char, my_length, my_buffer); - if (my_buffer == 0) - return; } + if (my_buffer == NULL) + return; for (n = 0; n <= win->_maxy; ++n) { char *ep = my_buffer; @@ -177,7 +177,7 @@ _tracedump(const char *name, WINDOW *win) } #if NO_LEAKS free(my_buffer); - my_buffer = 0; + my_buffer = NULL; my_length = 0; #endif } diff --git a/ncurses/trace/lib_tracemse.c b/ncurses/trace/lib_tracemse.c index 33d4d3d3..bbca18b0 100644 --- a/ncurses/trace/lib_tracemse.c +++ b/ncurses/trace/lib_tracemse.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020 Thomas E. Dickey * + * Copyright 2020,2024 Thomas E. Dickey * * Copyright 1998-2012,2014 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -39,7 +39,7 @@ #include -MODULE_ID("$Id: lib_tracemse.c,v 1.23 2020/02/02 23:34:34 tom Exp $") +MODULE_ID("$Id: lib_tracemse.c,v 1.24 2024/12/07 20:06:49 tom Exp $") #ifdef TRACE @@ -117,9 +117,9 @@ _nc_trace_mmask_t(SCREEN *sp, mmask_t code) NCURSES_EXPORT(char *) _nc_tracemouse(SCREEN *sp, MEVENT const *ep) { - char *result = 0; + char *result = NULL; - if (sp != 0) { + if (sp != NULL) { _nc_SPRINTF(my_buffer, _nc_SLIMIT(sizeof(my_buffer)) TRACEMSE_FMT, ep->id, @@ -138,7 +138,7 @@ _nc_tracemouse(SCREEN *sp, MEVENT const *ep) NCURSES_EXPORT(mmask_t) _nc_retrace_mmask_t(SCREEN *sp, mmask_t code) { - if (sp != 0) { + if (sp != NULL) { *my_buffer = '\0'; T((T_RETURN("{%s}"), _nc_trace_mmask_t(sp, code))); } else { diff --git a/ncurses/trace/trace_buf.c b/ncurses/trace/trace_buf.c index 7e6384b5..0ab258d4 100644 --- a/ncurses/trace/trace_buf.c +++ b/ncurses/trace/trace_buf.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020 Thomas E. Dickey * + * Copyright 2020-2023,2024 Thomas E. Dickey * * Copyright 1998-2011,2012 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -36,7 +36,7 @@ #include -MODULE_ID("$Id: trace_buf.c,v 1.21 2020/02/02 23:34:34 tom Exp $") +MODULE_ID("$Id: trace_buf.c,v 1.23 2024/12/07 21:24:18 tom Exp $") #ifdef TRACE @@ -46,22 +46,22 @@ MODULE_ID("$Id: trace_buf.c,v 1.21 2020/02/02 23:34:34 tom Exp $") static char * _nc_trace_alloc(int bufnum, size_t want) { - char *result = 0; + char *result = NULL; if (bufnum >= 0) { if ((size_t) (bufnum + 1) > MySize) { size_t need = (size_t) (bufnum + 1) * 2; - if ((MyList = typeRealloc(TRACEBUF, need, MyList)) != 0) { + if ((MyList = typeRealloc(TRACEBUF, need, MyList)) != NULL) { while (need > MySize) - MyList[MySize++].text = 0; + MyList[MySize++].text = NULL; } } - if (MyList != 0) { - if (MyList[bufnum].text == 0 + if (MyList != NULL) { + if (MyList[bufnum].text == NULL || want > MyList[bufnum].size) { MyList[bufnum].text = typeRealloc(char, want, MyList[bufnum].text); - if (MyList[bufnum].text != 0) + if (MyList[bufnum].text != NULL) MyList[bufnum].size = want; } result = MyList[bufnum].text; @@ -72,12 +72,12 @@ _nc_trace_alloc(int bufnum, size_t want) if (MySize) { if (MyList) { while (MySize--) { - if (MyList[MySize].text != 0) { + if (MyList[MySize].text != NULL) { free(MyList[MySize].text); } } free(MyList); - MyList = 0; + MyList = NULL; } MySize = 0; } @@ -93,7 +93,7 @@ NCURSES_EXPORT(char *) _nc_trace_buf(int bufnum, size_t want) { char *result = _nc_trace_alloc(bufnum, want); - if (result != 0) + if (result != NULL) *result = '\0'; return result; } @@ -104,13 +104,17 @@ _nc_trace_buf(int bufnum, size_t want) NCURSES_EXPORT(char *) _nc_trace_bufcat(int bufnum, const char *value) { - char *buffer = _nc_trace_alloc(bufnum, (size_t) 0); - if (buffer != 0) { + char *buffer; + + if (value == NULL) + value = ""; + buffer = _nc_trace_alloc(bufnum, (size_t) 0); + if (buffer != NULL) { size_t have = strlen(buffer); size_t need = strlen(value) + have; buffer = _nc_trace_alloc(bufnum, 1 + need); - if (buffer != 0) + if (buffer != NULL) _nc_STRCPY(buffer + have, value, need); } diff --git a/ncurses/trace/trace_tries.c b/ncurses/trace/trace_tries.c index 14f704b4..8d2592aa 100644 --- a/ncurses/trace/trace_tries.c +++ b/ncurses/trace/trace_tries.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020 Thomas E. Dickey * + * Copyright 2020,2024 Thomas E. Dickey * * Copyright 1999-2011,2012 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -36,7 +36,7 @@ #include -MODULE_ID("$Id: trace_tries.c,v 1.18 2020/02/02 23:34:34 tom Exp $") +MODULE_ID("$Id: trace_tries.c,v 1.19 2024/12/07 21:24:18 tom Exp $") #ifdef TRACE #define my_buffer _nc_globals.tracetry_buf @@ -50,8 +50,8 @@ recur_tries(TRIES * tree, unsigned level) my_buffer = (unsigned char *) _nc_doalloc(my_buffer, my_length); } - if (my_buffer != 0) { - while (tree != 0) { + if (my_buffer != NULL) { + while (tree != NULL) { if ((my_buffer[level] = tree->ch) == 0) my_buffer[level] = 128; my_buffer[level + 1] = 0; @@ -69,7 +69,7 @@ recur_tries(TRIES * tree, unsigned level) NCURSES_EXPORT(void) _nc_trace_tries(TRIES * tree) { - if ((my_buffer = typeMalloc(unsigned char, my_length = 80)) != 0) { + if ((my_buffer = typeMalloc(unsigned char, my_length = 80)) != NULL) { _tracef("BEGIN tries %p", (void *) tree); recur_tries(tree, 0); _tracef(". . . tries %p", (void *) tree); diff --git a/ncurses/trace/varargs.c b/ncurses/trace/varargs.c index 9be5fc25..4fa38da8 100644 --- a/ncurses/trace/varargs.c +++ b/ncurses/trace/varargs.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020 Thomas E. Dickey * + * Copyright 2020-2024,2025 Thomas E. Dickey * * Copyright 2001-2008,2012 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -35,7 +35,7 @@ #include -MODULE_ID("$Id: varargs.c,v 1.12 2020/02/02 23:34:34 tom Exp $") +MODULE_ID("$Id: varargs.c,v 1.16 2025/02/15 15:22:14 tom Exp $") #ifdef TRACE @@ -59,38 +59,36 @@ typedef enum { NCURSES_EXPORT(char *) _nc_varargs(const char *fmt, va_list ap) { - static char dummy[] = ""; - char buffer[BUFSIZ]; - const char *param; + const char *value; int n; - if (fmt == 0 || *fmt == '\0') - return dummy; + if (fmt == NULL || *fmt == '\0') + return NULL; if (MyLength == 0) MyBuffer = typeMalloc(char, MyLength = BUFSIZ); - if (MyBuffer == 0) - return dummy; + if (MyBuffer == NULL) + return NULL; *MyBuffer = '\0'; while (*fmt != '\0') { if (*fmt == '%') { - char *pval = 0; /* avoid const-cast */ + const char *pval = NULL; /* avoid const-cast */ const char *sval = ""; double fval = 0.0; int done = FALSE; int ival = 0; int type = 0; - ARGTYPE parm[MAX_PARMS]; - int parms = 0; + ARGTYPE param[MAX_PARMS]; + int params = 0; ARGTYPE used = atUnknown; while (*++fmt != '\0' && !done) { if (*fmt == '*') { VA_INT(int); - if (parms < MAX_PARMS) - parm[parms++] = atInteger; + if (params < MAX_PARMS) + param[params++] = atInteger; } else if (isalpha(UChar(*fmt))) { done = TRUE; switch (*fmt) { @@ -143,11 +141,11 @@ _nc_varargs(const char *fmt, va_list ap) } else if (*fmt == '%') { done = TRUE; } - if (used != atUnknown && parms < MAX_PARMS) { - parm[parms++] = used; - for (n = 0; n < parms; ++n) { - used = parm[n]; - param = buffer; + if (used != atUnknown && params < MAX_PARMS) { + param[params++] = used; + for (n = 0; n < params; ++n) { + used = param[n]; + value = buffer; switch (used) { case atInteger: _nc_SPRINTF(buffer, _nc_SLIMIT(sizeof(buffer)) @@ -162,19 +160,19 @@ _nc_varargs(const char *fmt, va_list ap) "%p", pval); break; case atString: - param = _nc_visbuf2(1, sval); + value = _nc_visbuf2(1, sval); break; case atUnknown: default: _nc_STRCPY(buffer, "?", sizeof(buffer)); break; } - MyLength += strlen(param) + 2; + MyLength += strlen(value) + 2; MyBuffer = typeRealloc(char, MyLength, MyBuffer); - if (MyBuffer != 0) { + if (MyBuffer != NULL) { _nc_SPRINTF(MyBuffer + strlen(MyBuffer), _nc_SLIMIT(MyLength - strlen(MyBuffer)) - ", %s", param); + ", %s", value); } } } @@ -185,7 +183,7 @@ _nc_varargs(const char *fmt, va_list ap) } } - return (MyBuffer ? MyBuffer : dummy); + return (MyBuffer ? MyBuffer : NULL); } #else EMPTY_MODULE(_nc_varargs) diff --git a/ncurses/trace/visbuf.c b/ncurses/trace/visbuf.c index aca8affc..2fdd554c 100644 --- a/ncurses/trace/visbuf.c +++ b/ncurses/trace/visbuf.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2019-2020,2021 Thomas E. Dickey * + * Copyright 2019-2023,2024 Thomas E. Dickey * * Copyright 2001-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -43,7 +43,7 @@ #include #include -MODULE_ID("$Id: visbuf.c,v 1.53 2021/02/27 20:07:57 tom Exp $") +MODULE_ID("$Id: visbuf.c,v 1.56 2024/12/07 21:12:53 tom Exp $") #define NUM_VISBUFS 4 @@ -67,10 +67,12 @@ static const char r_brace[] = StringOf(R_BRACE); static char * _nc_vischar(char *tp, unsigned c LIMIT_ARG) { - if (c == '"' || c == '\\') { + if (tp == NULL) { + return NULL; + } else if (c == '"' || c == '\\') { *tp++ = '\\'; *tp++ = (char) c; - } else if (is7bits((int) c) && (isgraph((int) c) || c == ' ')) { + } else if (is7bits(UChar(c)) && (isgraph(UChar(c)) || c == ' ')) { *tp++ = (char) c; } else if (c == '\n') { *tp++ = '\\'; @@ -107,11 +109,11 @@ _nc_vischar(char *tp, unsigned c LIMIT_ARG) static const char * _nc_visbuf2n(int bufnum, const char *buf, int len) { - const char *vbuf = 0; + const char *vbuf = NULL; char *tp; int count; - if (buf == 0) + if (buf == NULL) return ("(null)"); if (buf == CANCELLED_STRING) return ("(cancelled)"); @@ -138,7 +140,7 @@ _nc_visbuf2n(int bufnum, const char *buf, int len) } } #endif - if (tp != 0) { + if (tp != NULL) { int c; *tp++ = D_QUOTE; @@ -194,7 +196,7 @@ _nc_viswbuf2n(int bufnum, const wchar_t *buf, int len) char *tp; int count; - if (buf == 0) + if (buf == NULL) return ("(null)"); if (len < 0) @@ -210,7 +212,7 @@ _nc_viswbuf2n(int bufnum, const wchar_t *buf, int len) vbuf = tp = mybuf[bufnum]; } #endif - if (tp != 0) { + if (tp != NULL) { wchar_t c; *tp++ = D_QUOTE; @@ -265,12 +267,12 @@ _nc_viswibuf(const wint_t *buf) } if (mylen < ++n) { mylen = n + 80; - if (mybuf != 0) + if (mybuf != NULL) mybuf = typeRealloc(wchar_t, mylen, mybuf); else mybuf = typeMalloc(wchar_t, mylen); } - if (mybuf != 0) { + if (mybuf != NULL) { for (n = 0; buf[n] != 0; ++n) { mybuf[n] = (wchar_t) buf[n]; } @@ -287,7 +289,7 @@ _nc_viscbuf2(int bufnum, const NCURSES_CH_T *buf, int len) { char *result = _nc_trace_buf(bufnum, (size_t) BUFSIZ); - if (result != 0) { + if (result != NULL) { int first = 0; #if USE_WIDEC_SUPPORT @@ -315,7 +317,7 @@ _nc_viscbuf2(int bufnum, const NCURSES_CH_T *buf, int len) for (j = first; j <= last; ++j) { const char *found = _nc_altcharset_name(attr, (chtype) CharOf(buf[j])); - if (found != 0) { + if (found != NULL) { (void) _nc_trace_bufcat(bufnum, found); attr &= ~A_ALTCHARSET; } else diff --git a/ncurses/tty/MKexpanded.sh b/ncurses/tty/MKexpanded.sh index 0072be2c..57695995 100755 --- a/ncurses/tty/MKexpanded.sh +++ b/ncurses/tty/MKexpanded.sh @@ -1,6 +1,6 @@ #! /bin/sh ############################################################################## -# Copyright 2019-2020,2021 Thomas E. Dickey # +# Copyright 2019-2021,2024 Thomas E. Dickey # # Copyright 1998-2015,2017 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # @@ -30,7 +30,7 @@ # # Author: Thomas E. Dickey, 1997-on # -# $Id: MKexpanded.sh,v 1.24 2022/02/05 17:27:18 tom Exp $ +# $Id: MKexpanded.sh,v 1.25 2024/12/07 20:48:46 tom Exp $ # # Script to generate 'expanded.c', a dummy source that contains functions # corresponding to complex macros used in this library. By making functions, @@ -127,7 +127,12 @@ _nc_UpdateAttrs (CARG_CH_T c) EOF $preprocessor $TMP 2>/dev/null | \ - sed -e '1,/^IGNORE$/d' -e 's/^@/#/' -e 's/^#[ ]*if_/#if /' -e "s,$TMP,expanded.c," + sed -e '1,/^IGNORE$/d' \ + -e 's/^@/#/' \ + -e 's/^#[ ]*if_/#if /' \ + -e "s,$TMP,expanded.c," \ + -e 's/[ ][ ]*$//' \ + -e '/^#[ ]*[0-9]/d' cat < -MODULE_ID("$Id: hardscroll.c,v 1.54 2020/02/02 23:34:34 tom Exp $") +MODULE_ID("$Id: hardscroll.c,v 1.61 2025/02/15 15:12:54 tom Exp $") #if defined(SCROLLDEBUG) || defined(HASHDEBUG) @@ -169,7 +169,7 @@ extern NCURSES_EXPORT_VAR(unsigned) _nc_tracing; if OLDNUM(n) == _NEWINDEX, then the line n in new, not shifted from somewhere. */ NCURSES_EXPORT_VAR (int *) - _nc_oldnums = 0; /* obsolete: keep for ABI compat */ + _nc_oldnums = NULL; /* obsolete: keep for ABI compat */ # if USE_HASHMAP # define oldnums(sp) (sp)->_oldnum_list @@ -196,7 +196,7 @@ NCURSES_SP_NAME(_nc_scroll_optimize) (NCURSES_SP_DCL0) /* get enough storage */ assert(OLDNUM_SIZE(SP_PARM) >= 0); assert(screen_lines(SP_PARM) > 0); - if ((oldnums(SP_PARM) == 0) + if ((oldnums(SP_PARM) == NULL) || (OLDNUM_SIZE(SP_PARM) < screen_lines(SP_PARM))) { int need_lines = ((OLDNUM_SIZE(SP_PARM) < screen_lines(SP_PARM)) ? screen_lines(SP_PARM) @@ -204,13 +204,19 @@ NCURSES_SP_NAME(_nc_scroll_optimize) (NCURSES_SP_DCL0) int *new_oldnums = typeRealloc(int, (size_t) need_lines, oldnums(SP_PARM)); - if (!new_oldnums) + if (!new_oldnums) { + TR(TRACE_ICALLS, (T_RETURN(""))); return; + } oldnums(SP_PARM) = new_oldnums; OLDNUM_SIZE(SP_PARM) = need_lines; } /* calculate the indices */ NCURSES_SP_NAME(_nc_hash_map) (NCURSES_SP_ARG); + if (SP_PARM->hashtab_len < screen_lines(SP_PARM)) { + TR(TRACE_ICALLS, (T_RETURN(""))); + return; + } #endif #endif /* !defined(SCROLLDEBUG) && !defined(HASHDEBUG) */ @@ -301,20 +307,27 @@ NCURSES_EXPORT(void) NCURSES_SP_NAME(_nc_linedump) (NCURSES_SP_DCL0) /* dump the state of the real and virtual oldnum fields */ { - char *buf = 0; - size_t want = ((size_t) screen_lines(SP_PARM) + 1) * 4; - (void) SP_PARM; - - if ((buf = typeMalloc(char, want)) != 0) { - int n; - - *buf = '\0'; - for (n = 0; n < screen_lines(SP_PARM); n++) - _nc_SPRINTF(buf + strlen(buf), - _nc_SLIMIT(want - strlen(buf)) - " %02d", OLDNUM(SP_PARM, n)); - TR(TRACE_UPDATE | TRACE_MOVE, ("virt %s", buf)); - free(buf); + if (USE_TRACEF(TRACE_UPDATE | TRACE_MOVE)) { + char *buf = NULL; + size_t want = ((size_t) screen_lines(SP_PARM) + 1) * 4; + (void) SP_PARM; + + if ((buf = typeMalloc(char, want)) != NULL) { + int n; + + *buf = '\0'; + for (n = 0; n < screen_lines(SP_PARM); n++) { + int number = OLDNUM(SP_PARM, n); + if (number >= -99 && number < 999) { + _nc_SPRINTF(buf + strlen(buf), + _nc_SLIMIT(want - strlen(buf)) + " %02d", number); + } else { + _nc_STRCAT(buf, " ??", want - strlen(buf)); + } + } + free(buf); + } } } @@ -358,7 +371,7 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) do { oldnums[n++] = atoi(st); } while - ((st = strtok((char *) NULL, " ")) != 0); + ((st = strtok((char *) NULL, " ")) != NULL); /* display it */ (void) fputs("Initial input:\n", stderr); diff --git a/ncurses/tty/hashmap.c b/ncurses/tty/hashmap.c index 3f124c96..0ee47de5 100644 --- a/ncurses/tty/hashmap.c +++ b/ncurses/tty/hashmap.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2019,2020 Thomas E. Dickey * + * Copyright 2019-2024,2025 Thomas E. Dickey * * Copyright 1998-2015,2016 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -74,7 +74,7 @@ AUTHOR #define CUR SP_TERMTYPE #endif -MODULE_ID("$Id: hashmap.c,v 1.69 2020/05/31 17:50:48 tom Exp $") +MODULE_ID("$Id: hashmap.c,v 1.74 2025/01/12 10:51:43 tom Exp $") #ifdef HASHDEBUG @@ -120,15 +120,14 @@ static NCURSES_CH_T newtext[MAXLINES][TEXTWIDTH(sp)]; static const NCURSES_CH_T blankchar = NewChar(BLANK_TEXT); static NCURSES_INLINE unsigned long -hash(SCREEN *sp, NCURSES_CH_T *text) +hash(SCREEN *sp, const NCURSES_CH_T *text) { int i; - NCURSES_CH_T ch; unsigned long result = 0; (void) sp; for (i = TEXTWIDTH(sp); i > 0; i--) { - ch = *text++; + NCURSES_CH_T ch = *text++; result += (result << 5) + (unsigned long) HASH_VAL(ch); } return result; @@ -312,14 +311,17 @@ NCURSES_SP_NAME(_nc_hash_map) (NCURSES_SP_DCL0) } } else { /* re-hash all */ - if (oldhash(SP_PARM) == 0) + if (oldhash(SP_PARM) == NULL) oldhash(SP_PARM) = typeCalloc(unsigned long, (size_t) screen_lines(SP_PARM)); - if (newhash(SP_PARM) == 0) + if (newhash(SP_PARM) == NULL) newhash(SP_PARM) = typeCalloc(unsigned long, (size_t) screen_lines(SP_PARM)); - if (!oldhash(SP_PARM) || !newhash(SP_PARM)) + if (!oldhash(SP_PARM) || !newhash(SP_PARM)) { + FreeAndNull(oldhash(SP_PARM)); + FreeAndNull(newhash(SP_PARM)); return; /* malloc failure */ + } for (i = 0; i < screen_lines(SP_PARM); i++) { newhash(SP_PARM)[i] = hash(SP_PARM, NEWTEXT(SP_PARM, i)); oldhash(SP_PARM)[i] = hash(SP_PARM, OLDTEXT(SP_PARM, i)); @@ -403,7 +405,7 @@ NCURSES_SP_NAME(_nc_hash_map) (NCURSES_SP_DCL0) && OLDNUM(SP_PARM, i) - i == shift) i++; size = i - start; - if (size < 3 || size + min(size / 8, 2) < abs(shift)) { + if (size < 3 || size + Min(size / 8, 2) < abs(shift)) { while (start < i) { OLDNUM(SP_PARM, start) = _NEWINDEX; start++; @@ -530,7 +532,7 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) do { oldnums[n++] = atoi(st); } while - ((st = strtok((char *) NULL, " ")) != 0); + ((st = strtok((char *) NULL, " ")) != NULL); break; case 'n': /* use following letters as text of new lines */ diff --git a/ncurses/tty/lib_mvcur.c b/ncurses/tty/lib_mvcur.c index ba3ee089..0bde81d1 100644 --- a/ncurses/tty/lib_mvcur.c +++ b/ncurses/tty/lib_mvcur.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2021,2022 Thomas E. Dickey * + * Copyright 2018-2024,2025 Thomas E. Dickey * * Copyright 1998-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -160,7 +160,7 @@ #define CUR SP_TERMTYPE #endif -MODULE_ID("$Id: lib_mvcur.c,v 1.157 2022/08/20 18:28:58 tom Exp $") +MODULE_ID("$Id: lib_mvcur.c,v 1.165 2025/02/01 21:53:19 tom Exp $") #define WANT_CHAR(sp, y, x) NewScreen(sp)->_line[y].text[x] /* desired state */ @@ -222,7 +222,7 @@ NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_msec_cost) (NCURSES_SP_DCLx const char *const cap, int affcnt) /* compute the cost of a given operation */ { - if (cap == 0) + if (cap == NULL) return (INFINITY); else { const char *cp; @@ -232,14 +232,33 @@ NCURSES_SP_NAME(_nc_msec_cost) (NCURSES_SP_DCLx const char *const cap, int affcn /* extract padding, either mandatory or required */ if (cp[0] == '$' && cp[1] == '<' && strchr(cp, '>')) { float number = 0.0; + int state = 0; for (cp += 2; *cp != '>'; cp++) { - if (isdigit(UChar(*cp))) - number = number * 10 + (float) (*cp - '0'); - else if (*cp == '*') - number *= (float) affcnt; - else if (*cp == '.' && (*++cp != '>') && isdigit(UChar(*cp))) - number += (float) ((*cp - '0') / 10.0); + if (isdigit(UChar(*cp))) { + switch (state) { + case 0: + number = number * 10 + (float) (*cp - '0'); + break; + case 2: + number += (float) ((*cp - '0') / 10.0); + ++state; + break; + } + } else if (*cp == '*') { + /* padding is always a suffix */ + if (state < 4) { + number *= (float) affcnt; + state = 4; + } + } else if (*cp == '.') { + /* a single decimal point is allowed */ + state = (state == 0) ? 2 : 3; + } + if (number > MAX_DELAY_MSECS) { + number = MAX_DELAY_MSECS; + break; + } } #if NCURSES_NO_PADDING @@ -345,7 +364,7 @@ NCURSES_SP_NAME(_nc_mvcur_init) (NCURSES_SP_DCL0) SP_PARM->_home_cost = CostOf(cursor_home, 0); SP_PARM->_ll_cost = CostOf(cursor_to_ll, 0); #if USE_HARD_TABS - if (getenv("NCURSES_NO_HARD_TABS") == 0 + if (getenv("NCURSES_NO_HARD_TABS") == NULL && dest_tabs_magic_smso == 0 && HasHardTabs()) { SP_PARM->_ht_cost = CostOf(tab, 0); @@ -432,8 +451,8 @@ NCURSES_SP_NAME(_nc_mvcur_init) (NCURSES_SP_DCL0) 1); SP_PARM->_hpa_ch_cost = NormalizedCost(TIPARM_1(column_address, 23), 1); SP_PARM->_cuf_ch_cost = NormalizedCost(TIPARM_1(parm_right_cursor, 23), 1); - SP_PARM->_inline_cost = min(SP_PARM->_cup_ch_cost, - min(SP_PARM->_hpa_ch_cost, + SP_PARM->_inline_cost = Min(SP_PARM->_cup_ch_cost, + Min(SP_PARM->_hpa_ch_cost, SP_PARM->_cuf_ch_cost)); /* @@ -442,12 +461,12 @@ NCURSES_SP_NAME(_nc_mvcur_init) (NCURSES_SP_DCL0) * nested on the various terminals (vt100, xterm, etc.) which use this * feature. */ - if (save_cursor != 0 - && enter_ca_mode != 0 - && strstr(enter_ca_mode, save_cursor) != 0) { + if (save_cursor != NULL + && enter_ca_mode != NULL + && strstr(enter_ca_mode, save_cursor) != NULL) { T(("...suppressed sc/rc capability due to conflict with smcup/rmcup")); - save_cursor = 0; - restore_cursor = 0; + save_cursor = NULL; + restore_cursor = NULL; } /* @@ -561,7 +580,7 @@ relative_move(NCURSES_SP_DCLx if (to_y != from_y) { vcost = INFINITY; - if (row_address != 0 + if (row_address != NULL && _nc_safe_strcat(target, TIPARM_1(row_address, to_y))) { vcost = SP_PARM->_vpa_cost; } @@ -675,7 +694,7 @@ relative_move(NCURSES_SP_DCLx * and the time the structure WANT_CHAR would access has been * updated. */ - if (ovw) { + if (ovw && to_y >= 0) { int i; for (i = 0; i < n; i++) { @@ -690,7 +709,7 @@ relative_move(NCURSES_SP_DCLx } } } - if (ovw) { + if (ovw && to_y >= 0) { int i; for (i = 0; i < n; i++) @@ -929,8 +948,8 @@ onscreen_mvcur(NCURSES_SP_DCLx nonlocal: #if defined(MAIN) || defined(NCURSES_TEST) gettimeofday(&after, NULL); - diff = after.tv_usec - before.tv_usec - + (after.tv_sec - before.tv_sec) * 1000000; + diff = (float) (after.tv_usec - before.tv_usec + + (after.tv_sec - before.tv_sec) * 1000000); if (!profiling) (void) fprintf(stderr, "onscreen: %d microsec, %f 28.8Kbps char-equivalents\n", @@ -965,7 +984,7 @@ _nc_real_mvcur(NCURSES_SP_DCLx TR(TRACE_CALLS | TRACE_MOVE, (T_CALLED("_nc_real_mvcur(%p,%d,%d,%d,%d)"), (void *) SP_PARM, yold, xold, ynew, xnew)); - if (SP_PARM == 0) { + if (SP_PARM == NULL) { code = ERR; } else if (yold == ynew && xold == xnew) { code = OK; @@ -1060,7 +1079,7 @@ NCURSES_SP_NAME(_nc_mvcur) (NCURSES_SP_DCLx * external calls. Flush the output if the screen has not been * initialized, e.g., when used from low-level terminfo programs. */ - if ((SP_PARM != 0) && (SP_PARM->_endwin == ewInitial)) + if ((SP_PARM != NULL) && (SP_PARM->_endwin == ewInitial)) NCURSES_SP_NAME(_nc_flush) (NCURSES_SP_ARG); return rc; } @@ -1087,7 +1106,7 @@ TINFO_MVCUR(NCURSES_SP_DCLx int yold, int xold, int ynew, int xnew) ynew, xnew, NCURSES_SP_NAME(_nc_outch), TRUE); - if ((SP_PARM != 0) && (SP_PARM->_endwin == ewInitial)) + if ((SP_PARM != NULL) && (SP_PARM->_endwin == ewInitial)) NCURSES_SP_NAME(_nc_flush) (NCURSES_SP_ARG); NCURSES_SP_NAME(_nc_flush) (NCURSES_SP_ARG); return rc; @@ -1208,7 +1227,7 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) if (fputs("> ", stdout) == EOF) break; - if (fgets(buf, sizeof(buf), stdin) == 0) + if (fgets(buf, sizeof(buf), stdin) == NULL) break; #define PUTS(s) (void) puts(s) @@ -1288,7 +1307,7 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) } else if (buf[0] == 'i') { dump_init(NULL, F_TERMINFO, S_TERMINFO, FALSE, 70, 0, 0, FALSE, FALSE, 0); - dump_entry(&TerminalType(cur_term), FALSE, TRUE, 0, 0); + dump_entry(&TerminalType(cur_term), FALSE, TRUE, 0, NULL); putchar('\n'); } else if (buf[0] == 'o') { if (_nc_optimize_enable & OPTIMIZE_MVCUR) { @@ -1319,7 +1338,7 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) * is winning. */ else if (sscanf(buf, "t %d", &n) == 1) { - float cumtime = 0.0, perchar; + double cumtime = 0.0, perchar; int speeds[] = {2400, 9600, 14400, 19200, 28800, 38400, 0}; @@ -1365,14 +1384,14 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) * transmission both. Transmission time is an estimate * assuming 9 bits/char, 8 bits + 1 stop bit. */ - float totalest = cumtime + xmits * 9 * 1e6 / speeds[i]; + double totalest = cumtime + (double) xmits * 9 * 1e6 / speeds[i]; /* * Per-character optimization overhead in character transmits * at the current speed. Round this to the nearest integer * to figure COMPUTE_OVERHEAD for the speed. */ - float overhead = speeds[i] * perchar / 1e6; + double overhead = speeds[i] * perchar / 1e6; (void) printf("%6d bps: %3.2f char-xmits overhead; total estimated time %15.2f\n", diff --git a/ncurses/tty/lib_tstp.c b/ncurses/tty/lib_tstp.c index dd925c7e..3bd872c1 100644 --- a/ncurses/tty/lib_tstp.c +++ b/ncurses/tty/lib_tstp.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020-2021,2022 Thomas E. Dickey * + * Copyright 2020-2024,2025 Thomas E. Dickey * * Copyright 1998-2014,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -43,7 +43,7 @@ #include -MODULE_ID("$Id: lib_tstp.c,v 1.54 2022/12/24 22:22:10 tom Exp $") +MODULE_ID("$Id: lib_tstp.c,v 1.59 2025/02/15 14:52:13 tom Exp $") #if defined(SIGTSTP) && (HAVE_SIGACTION || HAVE_SIGVEC) #define USE_SIGTSTP 1 @@ -159,7 +159,7 @@ handle_SIGTSTP(int dummy GCC_UNUSED) * * Don't do this if we're not in curses - */ - if (sp != 0 && (sp->_endwin == ewRunning)) + if (sp != NULL && (sp->_endwin == ewRunning)) #if HAVE_TCGETPGRP if (tcgetpgrp(STDIN_FILENO) == getpgrp()) #endif @@ -269,7 +269,7 @@ handle_SIGINT(int sig) { SCREEN *scan; for (each_screen(scan)) { - if (scan->_ofp != 0 + if (scan->_ofp != NULL && NC_ISATTY(fileno(scan->_ofp))) { scan->_outch = NCURSES_SP_NAME(_nc_outch); } @@ -294,7 +294,7 @@ _nc_set_read_thread(bool enable) # endif _nc_globals.read_thread = pthread_self(); } else { - _nc_globals.read_thread = 0; + _nc_globals.read_thread = (pthread_t) 0; } _nc_unlock_global(curses); } @@ -310,7 +310,7 @@ handle_SIGWINCH(int sig GCC_UNUSED) if (_nc_globals.read_thread) { if (!pthread_equal(pthread_self(), _nc_globals.read_thread)) pthread_kill(_nc_globals.read_thread, SIGWINCH); - _nc_globals.read_thread = 0; + _nc_globals.read_thread = (pthread_t) 0; } # endif } @@ -367,8 +367,8 @@ CatchIfDefault(int sig, void (*handler) (int)) result = FALSE; } #endif - T(("CatchIfDefault - will %scatch %s", - result ? "" : "not ", signal_name(sig))); + T(("CatchIfDefault - will%s catch %s", + result ? "" : " not", signal_name(sig))); return result; } diff --git a/ncurses/tty/lib_twait.c b/ncurses/tty/lib_twait.c index 407a7203..8bb7d129 100644 --- a/ncurses/tty/lib_twait.c +++ b/ncurses/tty/lib_twait.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2020,2023 Thomas E. Dickey * + * Copyright 2018-2024,2025 Thomas E. Dickey * * Copyright 1998-2015,2016 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -76,7 +76,7 @@ #endif #undef CUR -MODULE_ID("$Id: lib_twait.c,v 1.80 2023/03/04 23:47:00 tom Exp $") +MODULE_ID("$Id: lib_twait.c,v 1.85 2025/03/01 17:07:19 tom Exp $") /* * Returns an elapsed time, in milliseconds (if possible). @@ -120,7 +120,7 @@ _nc_eventlist_timeout(_nc_eventlist * evl) { int event_delay = -1; - if (evl != 0) { + if (evl != NULL) { int n; for (n = 0; n < evl->count; ++n) { @@ -168,7 +168,7 @@ _nc_eventlist_timeout(_nc_eventlist * evl) * descriptors. */ NCURSES_EXPORT(int) -_nc_timed_wait(SCREEN *sp MAYBE_UNUSED, +_nc_timed_wait(const SCREEN *sp MAYBE_UNUSED, int mode MAYBE_UNUSED, int milliseconds, int *timeleft @@ -242,7 +242,7 @@ _nc_timed_wait(SCREEN *sp MAYBE_UNUSED, if ((mode & TW_EVENT) && evl) { if (fds == fd_list) fds = typeMalloc(struct pollfd, MIN_FDS + evl->count); - if (fds == 0) + if (fds == NULL) return TW_NONE; } #endif @@ -273,7 +273,7 @@ _nc_timed_wait(SCREEN *sp MAYBE_UNUSED, } #endif - result = poll(fds, (size_t) count, milliseconds); + result = (int) poll(fds, (size_t) count, milliseconds); #ifdef NCURSES_WGETCH_EVENTS if ((mode & TW_EVENT) && evl) { @@ -360,7 +360,7 @@ _nc_timed_wait(SCREEN *sp MAYBE_UNUSED, if ((mode & TW_MOUSE) && (fd = sp->_mouse_fd) >= 0) { FD_SET(fd, &set); - count = max(fd, count) + 1; + count = Max(fd, count) + 1; } #ifdef NCURSES_WGETCH_EVENTS if ((mode & TW_EVENT) && evl) { @@ -370,7 +370,7 @@ _nc_timed_wait(SCREEN *sp MAYBE_UNUSED, if (ev->type == _NC_EVENT_FILE && (ev->data.fev.flags & _NC_EVENT_FILE_READABLE)) { FD_SET(ev->data.fev.fd, &set); - count = max(ev->data.fev.fd + 1, count); + count = Max(ev->data.fev.fd + 1, count); } } } diff --git a/ncurses/tty/lib_vidattr.c b/ncurses/tty/lib_vidattr.c index 15e7397d..97a599e9 100644 --- a/ncurses/tty/lib_vidattr.c +++ b/ncurses/tty/lib_vidattr.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2019,2020 Thomas E. Dickey * + * Copyright 2018-2023,2024 Thomas E. Dickey * * Copyright 1998-2014,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -70,7 +70,7 @@ #define CUR SP_TERMTYPE #endif -MODULE_ID("$Id: lib_vidattr.c,v 1.78 2020/05/27 23:56:32 tom Exp $") +MODULE_ID("$Id: lib_vidattr.c,v 1.80 2024/12/07 20:08:15 tom Exp $") #define doPut(mode) \ TPUTS_TRACE(#mode); \ @@ -114,9 +114,9 @@ NCURSES_SP_NAME(vidputs) (NCURSES_SP_DCLx attr_t turn_on, turn_off; int pair; bool reverse = FALSE; - bool can_color = (SP_PARM == 0 || SP_PARM->_coloron); + bool can_color = (SP_PARM == NULL || SP_PARM->_coloron); #if NCURSES_EXT_FUNCS - bool fix_pair0 = (SP_PARM != 0 && SP_PARM->_coloron && !SP_PARM->_default_color); + bool fix_pair0 = (SP_PARM != NULL && SP_PARM->_coloron && !SP_PARM->_default_color); #else #define fix_pair0 FALSE #endif @@ -134,7 +134,7 @@ NCURSES_SP_NAME(vidputs) (NCURSES_SP_DCLx TR(TRACE_ATTRS, ("previous attribute was %s", _traceattr(PreviousAttr))); - if ((SP_PARM != 0) + if ((SP_PARM != NULL) && (magic_cookie_glitch > 0)) { #if USE_XMC_SUPPORT static const chtype table[] = @@ -249,6 +249,7 @@ NCURSES_SP_NAME(vidputs) (NCURSES_SP_DCLx TurnOff(A_ITALIC, exit_italics_mode); } #endif + (void) turn_off; } PreviousAttr &= ALL_BUT_COLOR; } @@ -278,6 +279,7 @@ NCURSES_SP_NAME(vidputs) (NCURSES_SP_DCLx } else if (turn_off & A_ITALIC) { TurnOff(A_ITALIC, exit_italics_mode); } + (void) turn_off; } #endif SetColorsIf((pair != 0) || fix_pair0, PreviousAttr); diff --git a/ncurses/tty/tty_update.c b/ncurses/tty/tty_update.c index 80815244..340b8a56 100644 --- a/ncurses/tty/tty_update.c +++ b/ncurses/tty/tty_update.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2021,2022 Thomas E. Dickey * + * Copyright 2018-2023,2024 Thomas E. Dickey * * Copyright 1998-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -85,7 +85,7 @@ #include -MODULE_ID("$Id: tty_update.c,v 1.314 2022/07/23 22:12:59 tom Exp $") +MODULE_ID("$Id: tty_update.c,v 1.317 2024/12/07 18:00:11 tom Exp $") /* * This define controls the line-breakout optimization. Every once in a @@ -256,12 +256,13 @@ PutAttrChar(NCURSES_SP_DCLx CARG_CH_T ch) * not checked. */ if (is8bits(CharOf(CHDEREF(ch))) + && (!is7bits(CharOf(CHDEREF(ch))) && _nc_unicode_locale()) && (isprint(CharOf(CHDEREF(ch))) || (SP_PARM->_legacy_coding > 0 && CharOf(CHDEREF(ch)) >= 160) || (SP_PARM->_legacy_coding > 1 && CharOf(CHDEREF(ch)) >= 128) || (AttrOf(attr) & A_ALTCHARSET && ((CharOfD(ch) < ACS_LEN - && SP_PARM->_acs_map != 0 + && SP_PARM->_acs_map != NULL && SP_PARM->_acs_map[CharOfD(ch)] != 0) || (CharOfD(ch) >= 128))))) { ; @@ -274,7 +275,7 @@ PutAttrChar(NCURSES_SP_DCLx CARG_CH_T ch) #endif if ((AttrOf(attr) & A_ALTCHARSET) - && SP_PARM->_acs_map != 0 + && SP_PARM->_acs_map != NULL && ((CharOfD(ch) < ACS_LEN) #if !NCURSES_WCWIDTH_GRAPHICS || is_wacs_value(CharOfD(ch)) @@ -620,7 +621,7 @@ EmitRange(NCURSES_SP_DCLx const NCURSES_CH_T *ntext, int num) } else { return 1; /* cursor stays in the middle */ } - } else if (repeat_char != 0 && + } else if (repeat_char != NULL && #if BSD_TPUTS !isdigit(UChar(CharOf(ntext0))) && #endif @@ -642,7 +643,7 @@ EmitRange(NCURSES_SP_DCLx const NCURSES_CH_T *ntext, int num) UpdateAttrs(SP_PARM, ntext0); temp = ntext0; if ((AttrOf(temp) & A_ALTCHARSET) && - SP_PARM->_acs_map != 0 && + SP_PARM->_acs_map != NULL && (SP_PARM->_acs_map[CharOf(temp)] & A_CHARTEXT) != 0) { SetChar(temp, (SP_PARM->_acs_map[CharOf(ntext0)] & A_CHARTEXT), @@ -744,7 +745,7 @@ TINFO_DOUPDATE(NCURSES_SP_DCL0) _nc_lock_global(update); - if (SP_PARM == 0) { + if (SP_PARM == NULL) { _nc_unlock_global(update); returnCode(ERR); } @@ -761,7 +762,7 @@ TINFO_DOUPDATE(NCURSES_SP_DCL0) if (SP_PARM == CURRENT_SCREEN) { #endif #define SyncScreens(internal,exported) \ - if (internal == 0) internal = exported; \ + if (internal == NULL) internal = exported; \ if (internal != exported) exported = internal SyncScreens(CurScreen(SP_PARM), curscr); @@ -772,9 +773,9 @@ TINFO_DOUPDATE(NCURSES_SP_DCL0) #endif #endif /* !USE_REENTRANT */ - if (CurScreen(SP_PARM) == 0 - || NewScreen(SP_PARM) == 0 - || StdScreen(SP_PARM) == 0) { + if (CurScreen(SP_PARM) == NULL + || NewScreen(SP_PARM) == NULL + || StdScreen(SP_PARM) == NULL) { _nc_unlock_global(update); returnCode(ERR); } @@ -1004,7 +1005,7 @@ TINFO_DOUPDATE(NCURSES_SP_DCL0) if (check_pending(NCURSES_SP_ARG)) goto cleanup; - nonempty = min(screen_lines(SP_PARM), NewScreen(SP_PARM)->_maxy + 1); + nonempty = Min(screen_lines(SP_PARM), NewScreen(SP_PARM)->_maxy + 1); if (SP_PARM->_scrolling) { NCURSES_SP_NAME(_nc_scroll_optimize) (NCURSES_SP_ARG); @@ -1131,10 +1132,10 @@ static void ClrUpdate(NCURSES_SP_DCL0) { TR(TRACE_UPDATE, (T_CALLED("ClrUpdate"))); - if (0 != SP_PARM) { + if (NULL != SP_PARM) { int i; NCURSES_CH_T blank = ClrBlank(NCURSES_SP_ARGx StdScreen(SP_PARM)); - int nonempty = min(screen_lines(SP_PARM), + int nonempty = Min(screen_lines(SP_PARM), NewScreen(SP_PARM)->_maxy + 1); ClearScreen(NCURSES_SP_ARGx blank); @@ -1158,7 +1159,7 @@ ClrUpdate(NCURSES_SP_DCL0) static void ClrToEOL(NCURSES_SP_DCLx NCURSES_CH_T blank, int needclear) { - if (CurScreen(SP_PARM) != 0 + if (CurScreen(SP_PARM) != NULL && SP_PARM->_cursrow >= 0) { int j; @@ -1233,7 +1234,7 @@ static int ClrBottom(NCURSES_SP_DCLx int total) { int top = total; - int last = min(screen_columns(SP_PARM), NewScreen(SP_PARM)->_maxx + 1); + int last = Min(screen_columns(SP_PARM), NewScreen(SP_PARM)->_maxx + 1); NCURSES_CH_T blank = NewScreen(SP_PARM)->_line[total - 1].text[last - 1]; if (clr_eos && can_clear_with(NCURSES_SP_ARGx CHREF(blank))) { @@ -1293,7 +1294,7 @@ ClrBottom(NCURSES_SP_DCLx int total) ** nLastChar = position of last different character in new line ** ** move to firstChar -** overwrite chars up to min(oLastChar, nLastChar) +** overwrite chars up to Min(oLastChar, nLastChar) ** if oLastChar < nLastChar ** insert newLine[oLastChar+1..nLastChar] ** else @@ -1531,7 +1532,7 @@ TransformLine(NCURSES_SP_DCLx int const lineno) } ClrToEOL(NCURSES_SP_ARGx blank, FALSE); } else { - n = max(nLastChar, oLastChar); + n = Max(nLastChar, oLastChar); PutRange(NCURSES_SP_ARGx oldLine, newLine, @@ -1556,7 +1557,7 @@ TransformLine(NCURSES_SP_DCLx int const lineno) break; } - n = min(oLastChar, nLastChar); + n = Min(oLastChar, nLastChar); if (n >= firstChar) { GoTo(NCURSES_SP_ARGx lineno, firstChar); PutRange(NCURSES_SP_ARGx @@ -1568,7 +1569,7 @@ TransformLine(NCURSES_SP_DCLx int const lineno) } if (oLastChar < nLastChar) { - int m = max(nLastNonblank, oLastNonblank); + int m = Max(nLastNonblank, oLastNonblank); #if USE_WIDEC_SUPPORT if (n) { while (isWidecExt(newLine[n + 1]) && n) { @@ -2222,7 +2223,7 @@ _nc_screen_init(void) NCURSES_EXPORT(void) NCURSES_SP_NAME(_nc_screen_wrap) (NCURSES_SP_DCL0) { - if (SP_PARM != 0) { + if (SP_PARM != NULL) { UpdateAttrs(SP_PARM, normal); #if NCURSES_EXT_FUNCS @@ -2264,7 +2265,7 @@ _nc_screen_wrap(void) NCURSES_EXPORT(void) NCURSES_SP_NAME(_nc_do_xmc_glitch) (NCURSES_SP_DCLx attr_t previous) { - if (SP_PARM != 0) { + if (SP_PARM != NULL) { attr_t chg = XMC_CHANGES(previous ^ AttrOf(SCREEN_ATTRS(SP_PARM))); while (chg != 0) { diff --git a/ncurses/wcwidth.h b/ncurses/wcwidth.h index 76673da6..32518e76 100644 --- a/ncurses/wcwidth.h +++ b/ncurses/wcwidth.h @@ -1,4 +1,57 @@ +/* $Id: wcwidth.h,v 1.8 2024/12/07 16:20:09 tom Exp $ */ + /* + * Copyright 2002-2023,2024 by Thomas E. Dickey + * + * All Rights Reserved + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be included + * in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + * IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the name(s) of the above copyright + * holders shall not be used in advertising or otherwise to promote the + * sale, use or other dealings in this Software without prior written + * authorization. + *----------------------------------------------------------------------------- + * This is an updated version of Markus Kuhn's implementation of wcwidth. + * + * Originally added to xterm in 2000 (patch #141), there were a couple of + * updates from Kuhn until 2005 (patch #202), renaming entrypoints and applying + * data from Unicode.org (e.g., 3.2, 4.0, 4.1.0). The Unicode data is + * transformed into tables in this file by a script "uniset" written by Kuhn. + * + * While Kuhn implemented the original CJK variant, it was unused by xterm + * until Jungshik Shin used it in 2002 to implement the -cjk_width command-line + * option. + * + * Kuhn added a check for the vertical forms block (double-width) in 2007; + * other updates were derived from the Unicode.org data (release 5.0). + * + * Since then, additional updates have been made: + * + data-type fixes + * + new Unicode releases (6.2.0, 9.0.0, etc), + * + additional special symbol blocks have been added to the special cases. + * + soft-hyphen behavior has been made configurable. + * + added table shows when a character is not part of Unicode. + * + * Kuhn's original header follows giving the design information: + *----------------------------------------------------------------------------- * This is an implementation of wcwidth() and wcswidth() (defined in * IEEE Std 1002.1-2001) for Unicode. * @@ -50,13 +103,14 @@ * * http://www.unicode.org/unicode/reports/tr11/ * - * Markus Kuhn -- 2007-05-26 (Unicode 5.0) + * Markus Kuhn -- 2007-05-25 (Unicode 5.0) * * Permission to use, copy, modify, and distribute this software * for any purpose and without fee is hereby granted. The author * disclaims all warranties with regard to this software. * * Latest version: http://www.cl.cam.ac.uk/~mgk25/ucs/wcwidth.c + *----------------------------------------------------------------------------- */ #ifndef _WCWIDTH_H_incl @@ -70,32 +124,45 @@ extern "C" { #include #include +#include struct interval { - int first; - int last; + unsigned long first; + unsigned long last; }; +static int use_latin1 = 1; + /* auxiliary function for binary search in interval table */ -static int bisearch(wchar_t ucs, const struct interval *table, int max) { - int min = 0; - int mid; - - if (ucs < table[0].first || ucs > table[max].last) - return 0; - while (max >= min) { - mid = (min + max) / 2; - if (ucs > table[mid].last) - min = mid + 1; - else if (ucs < table[mid].first) - max = mid - 1; - else - return 1; +static int bisearch(unsigned long ucs, const struct interval *table, int max) +{ + + if (ucs >= table[0].first && ucs <= table[max].last) { + int min = 0; + + while (max >= min) { + int mid; + + mid = (min + max) / 2; + if (ucs > table[mid].last) + min = mid + 1; + else if (ucs < table[mid].first) + max = mid - 1; + else + return 1; + } } return 0; } +/* + * Provide a way to change the behavior of soft-hyphen. + */ +NCURSES_EXPORT(void) mk_wcwidth_init(int mode) +{ + use_latin1 = (mode == 0); +} /* The following two functions define the column width of an ISO 10646 * character as follows: @@ -109,7 +176,10 @@ static int bisearch(wchar_t ucs, const struct interval *table, int max) { * category code Mn or Me in the Unicode database) have a * column width of 0. * - * - SOFT HYPHEN (U+00AD) has a column width of 1. + * - A few spacing combining marks have a column width of 0. + * + * - SOFT HYPHEN (U+00AD) has a column width of 1 in Latin-1, 0 in Unicode. + * An initialization function is used to switch between the two. * * - Other format characters (general category code Cf in the Unicode * database) and ZERO WIDTH SPACE (U+200B) have a column width of 0. @@ -117,115 +187,513 @@ static int bisearch(wchar_t ucs, const struct interval *table, int max) { * - Hangul Jamo medial vowels and final consonants (U+1160-U+11FF) * have a column width of 0. * + * - Hangul Jamo Extended-B medial vowels and final consonants for old + * Korean (U+D7B0-U+D7FF) have a column width of 0. + * * - Spacing characters in the East Asian Wide (W) or East Asian * Full-width (F) category as defined in Unicode Technical - * Report #11 have a column width of 2. + * Report #11 have a column width of 2. In that report, some codes + * were unassigned. Characters in these blocks use a column width of 1: + * 4DC0..4DFF; Yijing Hexagram Symbols + * A960..A97F; Hangul Jamo Extended-A * * - All remaining characters (including all printable * ISO 8859-1 and WGL4 characters, Unicode control characters, * etc.) have a column width of 1. * + * - Codes which do not correspond to a Unicode character have a column + * width of -1. + * * This implementation assumes that wchar_t characters are encoded * in ISO 10646. */ -NCURSES_EXPORT(int) mk_wcwidth(wchar_t ucs) +NCURSES_EXPORT(int) mk_wcwidth(uint32_t ucs) { + unsigned long cmp = (unsigned long) ucs; + + /* sorted list of non-overlapping intervals of formatting characters */ + /* generated by + * uniset +cat=Cf -00AD -0600-0605 -061C -06DD -070F c + */ + /* *INDENT-OFF* */ + /* generated by run-uniset_ctl 1.1 */ + static const struct interval formatting[] = { + { 0x0890, 0x0891 }, { 0x08E2, 0x08E2 }, { 0x180E, 0x180E }, + { 0x200B, 0x200F }, { 0x202A, 0x202E }, { 0x2060, 0x2064 }, + { 0x2066, 0x206F }, { 0xFEFF, 0xFEFF }, { 0xFFF9, 0xFFFB }, + { 0x110BD, 0x110BD }, { 0x110CD, 0x110CD }, { 0x13430, 0x1343F }, + { 0x1BCA0, 0x1BCA3 }, { 0x1D173, 0x1D17A }, { 0xE0001, 0xE0001 }, + { 0xE0020, 0xE007F } + }; + /* *INDENT-OFF* */ + /* sorted list of non-overlapping intervals of non-spacing characters */ - /* generated by "uniset +cat=Me +cat=Mn +cat=Cf -00AD +1160-11FF +200B c" */ + /* generated by + * uniset +cat=Me +cat=Mn +0600-0605 +061C +06DD +070F +1160-11FF +D7B0-D7C6 +D7CB-D7FB c + */ + /* *INDENT-OFF* */ + /* generated by run-uniset 1.9 */ static const struct interval combining[] = { - { 0x0300, 0x036F }, { 0x0483, 0x0486 }, { 0x0488, 0x0489 }, - { 0x0591, 0x05BD }, { 0x05BF, 0x05BF }, { 0x05C1, 0x05C2 }, - { 0x05C4, 0x05C5 }, { 0x05C7, 0x05C7 }, { 0x0600, 0x0603 }, - { 0x0610, 0x0615 }, { 0x064B, 0x065E }, { 0x0670, 0x0670 }, - { 0x06D6, 0x06E4 }, { 0x06E7, 0x06E8 }, { 0x06EA, 0x06ED }, - { 0x070F, 0x070F }, { 0x0711, 0x0711 }, { 0x0730, 0x074A }, - { 0x07A6, 0x07B0 }, { 0x07EB, 0x07F3 }, { 0x0901, 0x0902 }, - { 0x093C, 0x093C }, { 0x0941, 0x0948 }, { 0x094D, 0x094D }, - { 0x0951, 0x0954 }, { 0x0962, 0x0963 }, { 0x0981, 0x0981 }, - { 0x09BC, 0x09BC }, { 0x09C1, 0x09C4 }, { 0x09CD, 0x09CD }, - { 0x09E2, 0x09E3 }, { 0x0A01, 0x0A02 }, { 0x0A3C, 0x0A3C }, - { 0x0A41, 0x0A42 }, { 0x0A47, 0x0A48 }, { 0x0A4B, 0x0A4D }, - { 0x0A70, 0x0A71 }, { 0x0A81, 0x0A82 }, { 0x0ABC, 0x0ABC }, - { 0x0AC1, 0x0AC5 }, { 0x0AC7, 0x0AC8 }, { 0x0ACD, 0x0ACD }, - { 0x0AE2, 0x0AE3 }, { 0x0B01, 0x0B01 }, { 0x0B3C, 0x0B3C }, - { 0x0B3F, 0x0B3F }, { 0x0B41, 0x0B43 }, { 0x0B4D, 0x0B4D }, - { 0x0B56, 0x0B56 }, { 0x0B82, 0x0B82 }, { 0x0BC0, 0x0BC0 }, - { 0x0BCD, 0x0BCD }, { 0x0C3E, 0x0C40 }, { 0x0C46, 0x0C48 }, - { 0x0C4A, 0x0C4D }, { 0x0C55, 0x0C56 }, { 0x0CBC, 0x0CBC }, - { 0x0CBF, 0x0CBF }, { 0x0CC6, 0x0CC6 }, { 0x0CCC, 0x0CCD }, - { 0x0CE2, 0x0CE3 }, { 0x0D41, 0x0D43 }, { 0x0D4D, 0x0D4D }, + { 0x0300, 0x036F }, { 0x0483, 0x0489 }, { 0x0591, 0x05BD }, + { 0x05BF, 0x05BF }, { 0x05C1, 0x05C2 }, { 0x05C4, 0x05C5 }, + { 0x05C7, 0x05C7 }, { 0x0600, 0x0605 }, { 0x0610, 0x061A }, + { 0x061C, 0x061C }, { 0x064B, 0x065F }, { 0x0670, 0x0670 }, + { 0x06D6, 0x06DD }, { 0x06DF, 0x06E4 }, { 0x06E7, 0x06E8 }, + { 0x06EA, 0x06ED }, { 0x070F, 0x070F }, { 0x0711, 0x0711 }, + { 0x0730, 0x074A }, { 0x07A6, 0x07B0 }, { 0x07EB, 0x07F3 }, + { 0x07FD, 0x07FD }, { 0x0816, 0x0819 }, { 0x081B, 0x0823 }, + { 0x0825, 0x0827 }, { 0x0829, 0x082D }, { 0x0859, 0x085B }, + { 0x0898, 0x089F }, { 0x08CA, 0x08E1 }, { 0x08E3, 0x0902 }, + { 0x093A, 0x093A }, { 0x093C, 0x093C }, { 0x0941, 0x0948 }, + { 0x094D, 0x094D }, { 0x0951, 0x0957 }, { 0x0962, 0x0963 }, + { 0x0981, 0x0981 }, { 0x09BC, 0x09BC }, { 0x09C1, 0x09C4 }, + { 0x09CD, 0x09CD }, { 0x09E2, 0x09E3 }, { 0x09FE, 0x09FE }, + { 0x0A01, 0x0A02 }, { 0x0A3C, 0x0A3C }, { 0x0A41, 0x0A42 }, + { 0x0A47, 0x0A48 }, { 0x0A4B, 0x0A4D }, { 0x0A51, 0x0A51 }, + { 0x0A70, 0x0A71 }, { 0x0A75, 0x0A75 }, { 0x0A81, 0x0A82 }, + { 0x0ABC, 0x0ABC }, { 0x0AC1, 0x0AC5 }, { 0x0AC7, 0x0AC8 }, + { 0x0ACD, 0x0ACD }, { 0x0AE2, 0x0AE3 }, { 0x0AFA, 0x0AFF }, + { 0x0B01, 0x0B01 }, { 0x0B3C, 0x0B3C }, { 0x0B3F, 0x0B3F }, + { 0x0B41, 0x0B44 }, { 0x0B4D, 0x0B4D }, { 0x0B55, 0x0B56 }, + { 0x0B62, 0x0B63 }, { 0x0B82, 0x0B82 }, { 0x0BC0, 0x0BC0 }, + { 0x0BCD, 0x0BCD }, { 0x0C00, 0x0C00 }, { 0x0C04, 0x0C04 }, + { 0x0C3C, 0x0C3C }, { 0x0C3E, 0x0C40 }, { 0x0C46, 0x0C48 }, + { 0x0C4A, 0x0C4D }, { 0x0C55, 0x0C56 }, { 0x0C62, 0x0C63 }, + { 0x0C81, 0x0C81 }, { 0x0CBC, 0x0CBC }, { 0x0CBF, 0x0CBF }, + { 0x0CC6, 0x0CC6 }, { 0x0CCC, 0x0CCD }, { 0x0CE2, 0x0CE3 }, + { 0x0D00, 0x0D01 }, { 0x0D3B, 0x0D3C }, { 0x0D41, 0x0D44 }, + { 0x0D4D, 0x0D4D }, { 0x0D62, 0x0D63 }, { 0x0D81, 0x0D81 }, { 0x0DCA, 0x0DCA }, { 0x0DD2, 0x0DD4 }, { 0x0DD6, 0x0DD6 }, { 0x0E31, 0x0E31 }, { 0x0E34, 0x0E3A }, { 0x0E47, 0x0E4E }, - { 0x0EB1, 0x0EB1 }, { 0x0EB4, 0x0EB9 }, { 0x0EBB, 0x0EBC }, - { 0x0EC8, 0x0ECD }, { 0x0F18, 0x0F19 }, { 0x0F35, 0x0F35 }, - { 0x0F37, 0x0F37 }, { 0x0F39, 0x0F39 }, { 0x0F71, 0x0F7E }, - { 0x0F80, 0x0F84 }, { 0x0F86, 0x0F87 }, { 0x0F90, 0x0F97 }, - { 0x0F99, 0x0FBC }, { 0x0FC6, 0x0FC6 }, { 0x102D, 0x1030 }, - { 0x1032, 0x1032 }, { 0x1036, 0x1037 }, { 0x1039, 0x1039 }, - { 0x1058, 0x1059 }, { 0x1160, 0x11FF }, { 0x135F, 0x135F }, - { 0x1712, 0x1714 }, { 0x1732, 0x1734 }, { 0x1752, 0x1753 }, - { 0x1772, 0x1773 }, { 0x17B4, 0x17B5 }, { 0x17B7, 0x17BD }, - { 0x17C6, 0x17C6 }, { 0x17C9, 0x17D3 }, { 0x17DD, 0x17DD }, - { 0x180B, 0x180D }, { 0x18A9, 0x18A9 }, { 0x1920, 0x1922 }, - { 0x1927, 0x1928 }, { 0x1932, 0x1932 }, { 0x1939, 0x193B }, - { 0x1A17, 0x1A18 }, { 0x1B00, 0x1B03 }, { 0x1B34, 0x1B34 }, - { 0x1B36, 0x1B3A }, { 0x1B3C, 0x1B3C }, { 0x1B42, 0x1B42 }, - { 0x1B6B, 0x1B73 }, { 0x1DC0, 0x1DCA }, { 0x1DFE, 0x1DFF }, - { 0x200B, 0x200F }, { 0x202A, 0x202E }, { 0x2060, 0x2063 }, - { 0x206A, 0x206F }, { 0x20D0, 0x20EF }, { 0x302A, 0x302F }, - { 0x3099, 0x309A }, { 0xA806, 0xA806 }, { 0xA80B, 0xA80B }, - { 0xA825, 0xA826 }, { 0xFB1E, 0xFB1E }, { 0xFE00, 0xFE0F }, - { 0xFE20, 0xFE23 }, { 0xFEFF, 0xFEFF }, { 0xFFF9, 0xFFFB }, - { 0x10A01, 0x10A03 }, { 0x10A05, 0x10A06 }, { 0x10A0C, 0x10A0F }, - { 0x10A38, 0x10A3A }, { 0x10A3F, 0x10A3F }, { 0x1D167, 0x1D169 }, - { 0x1D173, 0x1D182 }, { 0x1D185, 0x1D18B }, { 0x1D1AA, 0x1D1AD }, - { 0x1D242, 0x1D244 }, { 0xE0001, 0xE0001 }, { 0xE0020, 0xE007F }, + { 0x0EB1, 0x0EB1 }, { 0x0EB4, 0x0EBC }, { 0x0EC8, 0x0ECE }, + { 0x0F18, 0x0F19 }, { 0x0F35, 0x0F35 }, { 0x0F37, 0x0F37 }, + { 0x0F39, 0x0F39 }, { 0x0F71, 0x0F7E }, { 0x0F80, 0x0F84 }, + { 0x0F86, 0x0F87 }, { 0x0F8D, 0x0F97 }, { 0x0F99, 0x0FBC }, + { 0x0FC6, 0x0FC6 }, { 0x102D, 0x1030 }, { 0x1032, 0x1037 }, + { 0x1039, 0x103A }, { 0x103D, 0x103E }, { 0x1058, 0x1059 }, + { 0x105E, 0x1060 }, { 0x1071, 0x1074 }, { 0x1082, 0x1082 }, + { 0x1085, 0x1086 }, { 0x108D, 0x108D }, { 0x109D, 0x109D }, + { 0x1160, 0x11FF }, { 0x135D, 0x135F }, { 0x1712, 0x1714 }, + { 0x1732, 0x1733 }, { 0x1752, 0x1753 }, { 0x1772, 0x1773 }, + { 0x17B4, 0x17B5 }, { 0x17B7, 0x17BD }, { 0x17C6, 0x17C6 }, + { 0x17C9, 0x17D3 }, { 0x17DD, 0x17DD }, { 0x180B, 0x180D }, + { 0x180F, 0x180F }, { 0x1885, 0x1886 }, { 0x18A9, 0x18A9 }, + { 0x1920, 0x1922 }, { 0x1927, 0x1928 }, { 0x1932, 0x1932 }, + { 0x1939, 0x193B }, { 0x1A17, 0x1A18 }, { 0x1A1B, 0x1A1B }, + { 0x1A56, 0x1A56 }, { 0x1A58, 0x1A5E }, { 0x1A60, 0x1A60 }, + { 0x1A62, 0x1A62 }, { 0x1A65, 0x1A6C }, { 0x1A73, 0x1A7C }, + { 0x1A7F, 0x1A7F }, { 0x1AB0, 0x1ACE }, { 0x1B00, 0x1B03 }, + { 0x1B34, 0x1B34 }, { 0x1B36, 0x1B3A }, { 0x1B3C, 0x1B3C }, + { 0x1B42, 0x1B42 }, { 0x1B6B, 0x1B73 }, { 0x1B80, 0x1B81 }, + { 0x1BA2, 0x1BA5 }, { 0x1BA8, 0x1BA9 }, { 0x1BAB, 0x1BAD }, + { 0x1BE6, 0x1BE6 }, { 0x1BE8, 0x1BE9 }, { 0x1BED, 0x1BED }, + { 0x1BEF, 0x1BF1 }, { 0x1C2C, 0x1C33 }, { 0x1C36, 0x1C37 }, + { 0x1CD0, 0x1CD2 }, { 0x1CD4, 0x1CE0 }, { 0x1CE2, 0x1CE8 }, + { 0x1CED, 0x1CED }, { 0x1CF4, 0x1CF4 }, { 0x1CF8, 0x1CF9 }, + { 0x1DC0, 0x1DFF }, { 0x20D0, 0x20F0 }, { 0x2CEF, 0x2CF1 }, + { 0x2D7F, 0x2D7F }, { 0x2DE0, 0x2DFF }, { 0x302A, 0x302D }, + { 0x3099, 0x309A }, { 0xA66F, 0xA672 }, { 0xA674, 0xA67D }, + { 0xA69E, 0xA69F }, { 0xA6F0, 0xA6F1 }, { 0xA802, 0xA802 }, + { 0xA806, 0xA806 }, { 0xA80B, 0xA80B }, { 0xA825, 0xA826 }, + { 0xA82C, 0xA82C }, { 0xA8C4, 0xA8C5 }, { 0xA8E0, 0xA8F1 }, + { 0xA8FF, 0xA8FF }, { 0xA926, 0xA92D }, { 0xA947, 0xA951 }, + { 0xA980, 0xA982 }, { 0xA9B3, 0xA9B3 }, { 0xA9B6, 0xA9B9 }, + { 0xA9BC, 0xA9BD }, { 0xA9E5, 0xA9E5 }, { 0xAA29, 0xAA2E }, + { 0xAA31, 0xAA32 }, { 0xAA35, 0xAA36 }, { 0xAA43, 0xAA43 }, + { 0xAA4C, 0xAA4C }, { 0xAA7C, 0xAA7C }, { 0xAAB0, 0xAAB0 }, + { 0xAAB2, 0xAAB4 }, { 0xAAB7, 0xAAB8 }, { 0xAABE, 0xAABF }, + { 0xAAC1, 0xAAC1 }, { 0xAAEC, 0xAAED }, { 0xAAF6, 0xAAF6 }, + { 0xABE5, 0xABE5 }, { 0xABE8, 0xABE8 }, { 0xABED, 0xABED }, + { 0xD7B0, 0xD7C6 }, { 0xD7CB, 0xD7FB }, { 0xFB1E, 0xFB1E }, + { 0xFE00, 0xFE0F }, { 0xFE20, 0xFE2F }, { 0x101FD, 0x101FD }, + { 0x102E0, 0x102E0 }, { 0x10376, 0x1037A }, { 0x10A01, 0x10A03 }, + { 0x10A05, 0x10A06 }, { 0x10A0C, 0x10A0F }, { 0x10A38, 0x10A3A }, + { 0x10A3F, 0x10A3F }, { 0x10AE5, 0x10AE6 }, { 0x10D24, 0x10D27 }, + { 0x10EAB, 0x10EAC }, { 0x10EFD, 0x10EFF }, { 0x10F46, 0x10F50 }, + { 0x10F82, 0x10F85 }, { 0x11001, 0x11001 }, { 0x11038, 0x11046 }, + { 0x11070, 0x11070 }, { 0x11073, 0x11074 }, { 0x1107F, 0x11081 }, + { 0x110B3, 0x110B6 }, { 0x110B9, 0x110BA }, { 0x110C2, 0x110C2 }, + { 0x11100, 0x11102 }, { 0x11127, 0x1112B }, { 0x1112D, 0x11134 }, + { 0x11173, 0x11173 }, { 0x11180, 0x11181 }, { 0x111B6, 0x111BE }, + { 0x111C9, 0x111CC }, { 0x111CF, 0x111CF }, { 0x1122F, 0x11231 }, + { 0x11234, 0x11234 }, { 0x11236, 0x11237 }, { 0x1123E, 0x1123E }, + { 0x11241, 0x11241 }, { 0x112DF, 0x112DF }, { 0x112E3, 0x112EA }, + { 0x11300, 0x11301 }, { 0x1133B, 0x1133C }, { 0x11340, 0x11340 }, + { 0x11366, 0x1136C }, { 0x11370, 0x11374 }, { 0x11438, 0x1143F }, + { 0x11442, 0x11444 }, { 0x11446, 0x11446 }, { 0x1145E, 0x1145E }, + { 0x114B3, 0x114B8 }, { 0x114BA, 0x114BA }, { 0x114BF, 0x114C0 }, + { 0x114C2, 0x114C3 }, { 0x115B2, 0x115B5 }, { 0x115BC, 0x115BD }, + { 0x115BF, 0x115C0 }, { 0x115DC, 0x115DD }, { 0x11633, 0x1163A }, + { 0x1163D, 0x1163D }, { 0x1163F, 0x11640 }, { 0x116AB, 0x116AB }, + { 0x116AD, 0x116AD }, { 0x116B0, 0x116B5 }, { 0x116B7, 0x116B7 }, + { 0x1171D, 0x1171F }, { 0x11722, 0x11725 }, { 0x11727, 0x1172B }, + { 0x1182F, 0x11837 }, { 0x11839, 0x1183A }, { 0x1193B, 0x1193C }, + { 0x1193E, 0x1193E }, { 0x11943, 0x11943 }, { 0x119D4, 0x119D7 }, + { 0x119DA, 0x119DB }, { 0x119E0, 0x119E0 }, { 0x11A01, 0x11A0A }, + { 0x11A33, 0x11A38 }, { 0x11A3B, 0x11A3E }, { 0x11A47, 0x11A47 }, + { 0x11A51, 0x11A56 }, { 0x11A59, 0x11A5B }, { 0x11A8A, 0x11A96 }, + { 0x11A98, 0x11A99 }, { 0x11C30, 0x11C36 }, { 0x11C38, 0x11C3D }, + { 0x11C3F, 0x11C3F }, { 0x11C92, 0x11CA7 }, { 0x11CAA, 0x11CB0 }, + { 0x11CB2, 0x11CB3 }, { 0x11CB5, 0x11CB6 }, { 0x11D31, 0x11D36 }, + { 0x11D3A, 0x11D3A }, { 0x11D3C, 0x11D3D }, { 0x11D3F, 0x11D45 }, + { 0x11D47, 0x11D47 }, { 0x11D90, 0x11D91 }, { 0x11D95, 0x11D95 }, + { 0x11D97, 0x11D97 }, { 0x11EF3, 0x11EF4 }, { 0x11F00, 0x11F01 }, + { 0x11F36, 0x11F3A }, { 0x11F40, 0x11F40 }, { 0x11F42, 0x11F42 }, + { 0x13440, 0x13440 }, { 0x13447, 0x13455 }, { 0x16AF0, 0x16AF4 }, + { 0x16B30, 0x16B36 }, { 0x16F4F, 0x16F4F }, { 0x16F8F, 0x16F92 }, + { 0x16FE4, 0x16FE4 }, { 0x1BC9D, 0x1BC9E }, { 0x1CF00, 0x1CF2D }, + { 0x1CF30, 0x1CF46 }, { 0x1D167, 0x1D169 }, { 0x1D17B, 0x1D182 }, + { 0x1D185, 0x1D18B }, { 0x1D1AA, 0x1D1AD }, { 0x1D242, 0x1D244 }, + { 0x1DA00, 0x1DA36 }, { 0x1DA3B, 0x1DA6C }, { 0x1DA75, 0x1DA75 }, + { 0x1DA84, 0x1DA84 }, { 0x1DA9B, 0x1DA9F }, { 0x1DAA1, 0x1DAAF }, + { 0x1E000, 0x1E006 }, { 0x1E008, 0x1E018 }, { 0x1E01B, 0x1E021 }, + { 0x1E023, 0x1E024 }, { 0x1E026, 0x1E02A }, { 0x1E08F, 0x1E08F }, + { 0x1E130, 0x1E136 }, { 0x1E2AE, 0x1E2AE }, { 0x1E2EC, 0x1E2EF }, + { 0x1E4EC, 0x1E4EF }, { 0x1E8D0, 0x1E8D6 }, { 0x1E944, 0x1E94A }, { 0xE0100, 0xE01EF } }; + /* *INDENT-ON* */ + + /* sorted list of non-overlapping intervals of non-characters */ + /* generated by + * uniset +0000..DFFF -4e00..9fd5 +F900..10FFFD unknown +2028..2029 c + */ + /* *INDENT-OFF* */ + /* generated by run-uniset_unk 1.6 */ + static const struct interval unknowns[] = { + { 0x0378, 0x0379 }, { 0x0380, 0x0383 }, { 0x038B, 0x038B }, + { 0x038D, 0x038D }, { 0x03A2, 0x03A2 }, { 0x0530, 0x0530 }, + { 0x0557, 0x0558 }, { 0x058B, 0x058C }, { 0x0590, 0x0590 }, + { 0x05C8, 0x05CF }, { 0x05EB, 0x05EE }, { 0x05F5, 0x05FF }, + { 0x070E, 0x070E }, { 0x074B, 0x074C }, { 0x07B2, 0x07BF }, + { 0x07FB, 0x07FC }, { 0x082E, 0x082F }, { 0x083F, 0x083F }, + { 0x085C, 0x085D }, { 0x085F, 0x085F }, { 0x086B, 0x086F }, + { 0x088F, 0x088F }, { 0x0892, 0x0897 }, { 0x0984, 0x0984 }, + { 0x098D, 0x098E }, { 0x0991, 0x0992 }, { 0x09A9, 0x09A9 }, + { 0x09B1, 0x09B1 }, { 0x09B3, 0x09B5 }, { 0x09BA, 0x09BB }, + { 0x09C5, 0x09C6 }, { 0x09C9, 0x09CA }, { 0x09CF, 0x09D6 }, + { 0x09D8, 0x09DB }, { 0x09DE, 0x09DE }, { 0x09E4, 0x09E5 }, + { 0x09FF, 0x0A00 }, { 0x0A04, 0x0A04 }, { 0x0A0B, 0x0A0E }, + { 0x0A11, 0x0A12 }, { 0x0A29, 0x0A29 }, { 0x0A31, 0x0A31 }, + { 0x0A34, 0x0A34 }, { 0x0A37, 0x0A37 }, { 0x0A3A, 0x0A3B }, + { 0x0A3D, 0x0A3D }, { 0x0A43, 0x0A46 }, { 0x0A49, 0x0A4A }, + { 0x0A4E, 0x0A50 }, { 0x0A52, 0x0A58 }, { 0x0A5D, 0x0A5D }, + { 0x0A5F, 0x0A65 }, { 0x0A77, 0x0A80 }, { 0x0A84, 0x0A84 }, + { 0x0A8E, 0x0A8E }, { 0x0A92, 0x0A92 }, { 0x0AA9, 0x0AA9 }, + { 0x0AB1, 0x0AB1 }, { 0x0AB4, 0x0AB4 }, { 0x0ABA, 0x0ABB }, + { 0x0AC6, 0x0AC6 }, { 0x0ACA, 0x0ACA }, { 0x0ACE, 0x0ACF }, + { 0x0AD1, 0x0ADF }, { 0x0AE4, 0x0AE5 }, { 0x0AF2, 0x0AF8 }, + { 0x0B00, 0x0B00 }, { 0x0B04, 0x0B04 }, { 0x0B0D, 0x0B0E }, + { 0x0B11, 0x0B12 }, { 0x0B29, 0x0B29 }, { 0x0B31, 0x0B31 }, + { 0x0B34, 0x0B34 }, { 0x0B3A, 0x0B3B }, { 0x0B45, 0x0B46 }, + { 0x0B49, 0x0B4A }, { 0x0B4E, 0x0B54 }, { 0x0B58, 0x0B5B }, + { 0x0B5E, 0x0B5E }, { 0x0B64, 0x0B65 }, { 0x0B78, 0x0B81 }, + { 0x0B84, 0x0B84 }, { 0x0B8B, 0x0B8D }, { 0x0B91, 0x0B91 }, + { 0x0B96, 0x0B98 }, { 0x0B9B, 0x0B9B }, { 0x0B9D, 0x0B9D }, + { 0x0BA0, 0x0BA2 }, { 0x0BA5, 0x0BA7 }, { 0x0BAB, 0x0BAD }, + { 0x0BBA, 0x0BBD }, { 0x0BC3, 0x0BC5 }, { 0x0BC9, 0x0BC9 }, + { 0x0BCE, 0x0BCF }, { 0x0BD1, 0x0BD6 }, { 0x0BD8, 0x0BE5 }, + { 0x0BFB, 0x0BFF }, { 0x0C0D, 0x0C0D }, { 0x0C11, 0x0C11 }, + { 0x0C29, 0x0C29 }, { 0x0C3A, 0x0C3B }, { 0x0C45, 0x0C45 }, + { 0x0C49, 0x0C49 }, { 0x0C4E, 0x0C54 }, { 0x0C57, 0x0C57 }, + { 0x0C5B, 0x0C5C }, { 0x0C5E, 0x0C5F }, { 0x0C64, 0x0C65 }, + { 0x0C70, 0x0C76 }, { 0x0C8D, 0x0C8D }, { 0x0C91, 0x0C91 }, + { 0x0CA9, 0x0CA9 }, { 0x0CB4, 0x0CB4 }, { 0x0CBA, 0x0CBB }, + { 0x0CC5, 0x0CC5 }, { 0x0CC9, 0x0CC9 }, { 0x0CCE, 0x0CD4 }, + { 0x0CD7, 0x0CDC }, { 0x0CDF, 0x0CDF }, { 0x0CE4, 0x0CE5 }, + { 0x0CF0, 0x0CF0 }, { 0x0CF4, 0x0CFF }, { 0x0D0D, 0x0D0D }, + { 0x0D11, 0x0D11 }, { 0x0D45, 0x0D45 }, { 0x0D49, 0x0D49 }, + { 0x0D50, 0x0D53 }, { 0x0D64, 0x0D65 }, { 0x0D80, 0x0D80 }, + { 0x0D84, 0x0D84 }, { 0x0D97, 0x0D99 }, { 0x0DB2, 0x0DB2 }, + { 0x0DBC, 0x0DBC }, { 0x0DBE, 0x0DBF }, { 0x0DC7, 0x0DC9 }, + { 0x0DCB, 0x0DCE }, { 0x0DD5, 0x0DD5 }, { 0x0DD7, 0x0DD7 }, + { 0x0DE0, 0x0DE5 }, { 0x0DF0, 0x0DF1 }, { 0x0DF5, 0x0E00 }, + { 0x0E3B, 0x0E3E }, { 0x0E5C, 0x0E80 }, { 0x0E83, 0x0E83 }, + { 0x0E85, 0x0E85 }, { 0x0E8B, 0x0E8B }, { 0x0EA4, 0x0EA4 }, + { 0x0EA6, 0x0EA6 }, { 0x0EBE, 0x0EBF }, { 0x0EC5, 0x0EC5 }, + { 0x0EC7, 0x0EC7 }, { 0x0ECF, 0x0ECF }, { 0x0EDA, 0x0EDB }, + { 0x0EE0, 0x0EFF }, { 0x0F48, 0x0F48 }, { 0x0F6D, 0x0F70 }, + { 0x0F98, 0x0F98 }, { 0x0FBD, 0x0FBD }, { 0x0FCD, 0x0FCD }, + { 0x0FDB, 0x0FFF }, { 0x10C6, 0x10C6 }, { 0x10C8, 0x10CC }, + { 0x10CE, 0x10CF }, { 0x1249, 0x1249 }, { 0x124E, 0x124F }, + { 0x1257, 0x1257 }, { 0x1259, 0x1259 }, { 0x125E, 0x125F }, + { 0x1289, 0x1289 }, { 0x128E, 0x128F }, { 0x12B1, 0x12B1 }, + { 0x12B6, 0x12B7 }, { 0x12BF, 0x12BF }, { 0x12C1, 0x12C1 }, + { 0x12C6, 0x12C7 }, { 0x12D7, 0x12D7 }, { 0x1311, 0x1311 }, + { 0x1316, 0x1317 }, { 0x135B, 0x135C }, { 0x137D, 0x137F }, + { 0x139A, 0x139F }, { 0x13F6, 0x13F7 }, { 0x13FE, 0x13FF }, + { 0x169D, 0x169F }, { 0x16F9, 0x16FF }, { 0x1716, 0x171E }, + { 0x1737, 0x173F }, { 0x1754, 0x175F }, { 0x176D, 0x176D }, + { 0x1771, 0x1771 }, { 0x1774, 0x177F }, { 0x17DE, 0x17DF }, + { 0x17EA, 0x17EF }, { 0x17FA, 0x17FF }, { 0x181A, 0x181F }, + { 0x1879, 0x187F }, { 0x18AB, 0x18AF }, { 0x18F6, 0x18FF }, + { 0x191F, 0x191F }, { 0x192C, 0x192F }, { 0x193C, 0x193F }, + { 0x1941, 0x1943 }, { 0x196E, 0x196F }, { 0x1975, 0x197F }, + { 0x19AC, 0x19AF }, { 0x19CA, 0x19CF }, { 0x19DB, 0x19DD }, + { 0x1A1C, 0x1A1D }, { 0x1A5F, 0x1A5F }, { 0x1A7D, 0x1A7E }, + { 0x1A8A, 0x1A8F }, { 0x1A9A, 0x1A9F }, { 0x1AAE, 0x1AAF }, + { 0x1ACF, 0x1AFF }, { 0x1B4D, 0x1B4F }, { 0x1B7F, 0x1B7F }, + { 0x1BF4, 0x1BFB }, { 0x1C38, 0x1C3A }, { 0x1C4A, 0x1C4C }, + { 0x1C89, 0x1C8F }, { 0x1CBB, 0x1CBC }, { 0x1CC8, 0x1CCF }, + { 0x1CFB, 0x1CFF }, { 0x1F16, 0x1F17 }, { 0x1F1E, 0x1F1F }, + { 0x1F46, 0x1F47 }, { 0x1F4E, 0x1F4F }, { 0x1F58, 0x1F58 }, + { 0x1F5A, 0x1F5A }, { 0x1F5C, 0x1F5C }, { 0x1F5E, 0x1F5E }, + { 0x1F7E, 0x1F7F }, { 0x1FB5, 0x1FB5 }, { 0x1FC5, 0x1FC5 }, + { 0x1FD4, 0x1FD5 }, { 0x1FDC, 0x1FDC }, { 0x1FF0, 0x1FF1 }, + { 0x1FF5, 0x1FF5 }, { 0x1FFF, 0x1FFF }, { 0x2028, 0x2029 }, + { 0x2065, 0x2065 }, { 0x2072, 0x2073 }, { 0x208F, 0x208F }, + { 0x209D, 0x209F }, { 0x20C1, 0x20CF }, { 0x20F1, 0x20FF }, + { 0x218C, 0x218F }, { 0x2427, 0x243F }, { 0x244B, 0x245F }, + { 0x2B74, 0x2B75 }, { 0x2B96, 0x2B96 }, { 0x2CF4, 0x2CF8 }, + { 0x2D26, 0x2D26 }, { 0x2D28, 0x2D2C }, { 0x2D2E, 0x2D2F }, + { 0x2D68, 0x2D6E }, { 0x2D71, 0x2D7E }, { 0x2D97, 0x2D9F }, + { 0x2DA7, 0x2DA7 }, { 0x2DAF, 0x2DAF }, { 0x2DB7, 0x2DB7 }, + { 0x2DBF, 0x2DBF }, { 0x2DC7, 0x2DC7 }, { 0x2DCF, 0x2DCF }, + { 0x2DD7, 0x2DD7 }, { 0x2DDF, 0x2DDF }, { 0x2E5E, 0x2E7F }, + { 0x2E9A, 0x2E9A }, { 0x2EF4, 0x2EFF }, { 0x2FD6, 0x2FEF }, + { 0x3040, 0x3040 }, { 0x3097, 0x3098 }, { 0x3100, 0x3104 }, + { 0x3130, 0x3130 }, { 0x318F, 0x318F }, { 0x31E4, 0x31EE }, + { 0x321F, 0x321F }, { 0x4DB6, 0x4DBF }, { 0x9FD6, 0x9FFF }, + { 0xA48D, 0xA48F }, { 0xA4C7, 0xA4CF }, { 0xA62C, 0xA63F }, + { 0xA6F8, 0xA6FF }, { 0xA7CB, 0xA7CF }, { 0xA7D2, 0xA7D2 }, + { 0xA7D4, 0xA7D4 }, { 0xA7DA, 0xA7F1 }, { 0xA82D, 0xA82F }, + { 0xA83A, 0xA83F }, { 0xA878, 0xA87F }, { 0xA8C6, 0xA8CD }, + { 0xA8DA, 0xA8DF }, { 0xA954, 0xA95E }, { 0xA97D, 0xA97F }, + { 0xA9CE, 0xA9CE }, { 0xA9DA, 0xA9DD }, { 0xA9FF, 0xA9FF }, + { 0xAA37, 0xAA3F }, { 0xAA4E, 0xAA4F }, { 0xAA5A, 0xAA5B }, + { 0xAAC3, 0xAADA }, { 0xAAF7, 0xAB00 }, { 0xAB07, 0xAB08 }, + { 0xAB0F, 0xAB10 }, { 0xAB17, 0xAB1F }, { 0xAB27, 0xAB27 }, + { 0xAB2F, 0xAB2F }, { 0xAB6C, 0xAB6F }, { 0xABEE, 0xABEF }, + { 0xABFA, 0xABFF }, { 0xD7A4, 0xD7AF }, { 0xD7C7, 0xD7CA }, + { 0xD7FC, 0xDFFF }, { 0xFA6E, 0xFA6F }, { 0xFADA, 0xFAFF }, + { 0xFB07, 0xFB12 }, { 0xFB18, 0xFB1C }, { 0xFB37, 0xFB37 }, + { 0xFB3D, 0xFB3D }, { 0xFB3F, 0xFB3F }, { 0xFB42, 0xFB42 }, + { 0xFB45, 0xFB45 }, { 0xFBC3, 0xFBD2 }, { 0xFD90, 0xFD91 }, + { 0xFDC8, 0xFDCE }, { 0xFDD0, 0xFDEF }, { 0xFE1A, 0xFE1F }, + { 0xFE53, 0xFE53 }, { 0xFE67, 0xFE67 }, { 0xFE6C, 0xFE6F }, + { 0xFE75, 0xFE75 }, { 0xFEFD, 0xFEFE }, { 0xFF00, 0xFF00 }, + { 0xFFBF, 0xFFC1 }, { 0xFFC8, 0xFFC9 }, { 0xFFD0, 0xFFD1 }, + { 0xFFD8, 0xFFD9 }, { 0xFFDD, 0xFFDF }, { 0xFFE7, 0xFFE7 }, + { 0xFFEF, 0xFFF8 }, { 0xFFFE, 0xFFFF }, { 0x1000C, 0x1000C }, + { 0x10027, 0x10027 }, { 0x1003B, 0x1003B }, { 0x1003E, 0x1003E }, + { 0x1004E, 0x1004F }, { 0x1005E, 0x1007F }, { 0x100FB, 0x100FF }, + { 0x10103, 0x10106 }, { 0x10134, 0x10136 }, { 0x1018F, 0x1018F }, + { 0x1019D, 0x1019F }, { 0x101A1, 0x101CF }, { 0x101FE, 0x1027F }, + { 0x1029D, 0x1029F }, { 0x102D1, 0x102DF }, { 0x102FC, 0x102FF }, + { 0x10324, 0x1032C }, { 0x1034B, 0x1034F }, { 0x1037B, 0x1037F }, + { 0x1039E, 0x1039E }, { 0x103C4, 0x103C7 }, { 0x103D6, 0x103FF }, + { 0x1049E, 0x1049F }, { 0x104AA, 0x104AF }, { 0x104D4, 0x104D7 }, + { 0x104FC, 0x104FF }, { 0x10528, 0x1052F }, { 0x10564, 0x1056E }, + { 0x1057B, 0x1057B }, { 0x1058B, 0x1058B }, { 0x10593, 0x10593 }, + { 0x10596, 0x10596 }, { 0x105A2, 0x105A2 }, { 0x105B2, 0x105B2 }, + { 0x105BA, 0x105BA }, { 0x105BD, 0x105FF }, { 0x10737, 0x1073F }, + { 0x10756, 0x1075F }, { 0x10768, 0x1077F }, { 0x10786, 0x10786 }, + { 0x107B1, 0x107B1 }, { 0x107BB, 0x107FF }, { 0x10806, 0x10807 }, + { 0x10809, 0x10809 }, { 0x10836, 0x10836 }, { 0x10839, 0x1083B }, + { 0x1083D, 0x1083E }, { 0x10856, 0x10856 }, { 0x1089F, 0x108A6 }, + { 0x108B0, 0x108DF }, { 0x108F3, 0x108F3 }, { 0x108F6, 0x108FA }, + { 0x1091C, 0x1091E }, { 0x1093A, 0x1093E }, { 0x10940, 0x1097F }, + { 0x109B8, 0x109BB }, { 0x109D0, 0x109D1 }, { 0x10A04, 0x10A04 }, + { 0x10A07, 0x10A0B }, { 0x10A14, 0x10A14 }, { 0x10A18, 0x10A18 }, + { 0x10A36, 0x10A37 }, { 0x10A3B, 0x10A3E }, { 0x10A49, 0x10A4F }, + { 0x10A59, 0x10A5F }, { 0x10AA0, 0x10ABF }, { 0x10AE7, 0x10AEA }, + { 0x10AF7, 0x10AFF }, { 0x10B36, 0x10B38 }, { 0x10B56, 0x10B57 }, + { 0x10B73, 0x10B77 }, { 0x10B92, 0x10B98 }, { 0x10B9D, 0x10BA8 }, + { 0x10BB0, 0x10BFF }, { 0x10C49, 0x10C7F }, { 0x10CB3, 0x10CBF }, + { 0x10CF3, 0x10CF9 }, { 0x10D28, 0x10D2F }, { 0x10D3A, 0x10E5F }, + { 0x10E7F, 0x10E7F }, { 0x10EAA, 0x10EAA }, { 0x10EAE, 0x10EAF }, + { 0x10EB2, 0x10EFC }, { 0x10F28, 0x10F2F }, { 0x10F5A, 0x10F6F }, + { 0x10F8A, 0x10FAF }, { 0x10FCC, 0x10FDF }, { 0x10FF7, 0x10FFF }, + { 0x1104E, 0x11051 }, { 0x11076, 0x1107E }, { 0x110C3, 0x110CC }, + { 0x110CE, 0x110CF }, { 0x110E9, 0x110EF }, { 0x110FA, 0x110FF }, + { 0x11135, 0x11135 }, { 0x11148, 0x1114F }, { 0x11177, 0x1117F }, + { 0x111E0, 0x111E0 }, { 0x111F5, 0x111FF }, { 0x11212, 0x11212 }, + { 0x11242, 0x1127F }, { 0x11287, 0x11287 }, { 0x11289, 0x11289 }, + { 0x1128E, 0x1128E }, { 0x1129E, 0x1129E }, { 0x112AA, 0x112AF }, + { 0x112EB, 0x112EF }, { 0x112FA, 0x112FF }, { 0x11304, 0x11304 }, + { 0x1130D, 0x1130E }, { 0x11311, 0x11312 }, { 0x11329, 0x11329 }, + { 0x11331, 0x11331 }, { 0x11334, 0x11334 }, { 0x1133A, 0x1133A }, + { 0x11345, 0x11346 }, { 0x11349, 0x1134A }, { 0x1134E, 0x1134F }, + { 0x11351, 0x11356 }, { 0x11358, 0x1135C }, { 0x11364, 0x11365 }, + { 0x1136D, 0x1136F }, { 0x11375, 0x113FF }, { 0x1145C, 0x1145C }, + { 0x11462, 0x1147F }, { 0x114C8, 0x114CF }, { 0x114DA, 0x1157F }, + { 0x115B6, 0x115B7 }, { 0x115DE, 0x115FF }, { 0x11645, 0x1164F }, + { 0x1165A, 0x1165F }, { 0x1166D, 0x1167F }, { 0x116BA, 0x116BF }, + { 0x116CA, 0x116FF }, { 0x1171B, 0x1171C }, { 0x1172C, 0x1172F }, + { 0x11747, 0x117FF }, { 0x1183C, 0x1189F }, { 0x118F3, 0x118FE }, + { 0x11907, 0x11908 }, { 0x1190A, 0x1190B }, { 0x11914, 0x11914 }, + { 0x11917, 0x11917 }, { 0x11936, 0x11936 }, { 0x11939, 0x1193A }, + { 0x11947, 0x1194F }, { 0x1195A, 0x1199F }, { 0x119A8, 0x119A9 }, + { 0x119D8, 0x119D9 }, { 0x119E5, 0x119FF }, { 0x11A48, 0x11A4F }, + { 0x11AA3, 0x11AAF }, { 0x11AF9, 0x11AFF }, { 0x11B0A, 0x11BFF }, + { 0x11C09, 0x11C09 }, { 0x11C37, 0x11C37 }, { 0x11C46, 0x11C4F }, + { 0x11C6D, 0x11C6F }, { 0x11C90, 0x11C91 }, { 0x11CA8, 0x11CA8 }, + { 0x11CB7, 0x11CFF }, { 0x11D07, 0x11D07 }, { 0x11D0A, 0x11D0A }, + { 0x11D37, 0x11D39 }, { 0x11D3B, 0x11D3B }, { 0x11D3E, 0x11D3E }, + { 0x11D48, 0x11D4F }, { 0x11D5A, 0x11D5F }, { 0x11D66, 0x11D66 }, + { 0x11D69, 0x11D69 }, { 0x11D8F, 0x11D8F }, { 0x11D92, 0x11D92 }, + { 0x11D99, 0x11D9F }, { 0x11DAA, 0x11EDF }, { 0x11EF9, 0x11EFF }, + { 0x11F11, 0x11F11 }, { 0x11F3B, 0x11F3D }, { 0x11F5A, 0x11FAF }, + { 0x11FB1, 0x11FBF }, { 0x11FF2, 0x11FFE }, { 0x1239A, 0x123FF }, + { 0x1246F, 0x1246F }, { 0x12475, 0x1247F }, { 0x12544, 0x12F8F }, + { 0x12FF3, 0x12FFF }, { 0x13456, 0x143FF }, { 0x14647, 0x167FF }, + { 0x16A39, 0x16A3F }, { 0x16A5F, 0x16A5F }, { 0x16A6A, 0x16A6D }, + { 0x16ABF, 0x16ABF }, { 0x16ACA, 0x16ACF }, { 0x16AEE, 0x16AEF }, + { 0x16AF6, 0x16AFF }, { 0x16B46, 0x16B4F }, { 0x16B5A, 0x16B5A }, + { 0x16B62, 0x16B62 }, { 0x16B78, 0x16B7C }, { 0x16B90, 0x16E3F }, + { 0x16E9B, 0x16EFF }, { 0x16F4B, 0x16F4E }, { 0x16F88, 0x16F8E }, + { 0x16FA0, 0x16FDF }, { 0x16FE5, 0x16FEF }, { 0x16FF2, 0x187FF }, + { 0x18CD6, 0x1AFEF }, { 0x1AFF4, 0x1AFF4 }, { 0x1AFFC, 0x1AFFC }, + { 0x1AFFF, 0x1AFFF }, { 0x1B123, 0x1B131 }, { 0x1B133, 0x1B14F }, + { 0x1B153, 0x1B154 }, { 0x1B156, 0x1B163 }, { 0x1B168, 0x1B16F }, + { 0x1B2FC, 0x1BBFF }, { 0x1BC6B, 0x1BC6F }, { 0x1BC7D, 0x1BC7F }, + { 0x1BC89, 0x1BC8F }, { 0x1BC9A, 0x1BC9B }, { 0x1BCA4, 0x1CEFF }, + { 0x1CF2E, 0x1CF2F }, { 0x1CF47, 0x1CF4F }, { 0x1CFC4, 0x1CFFF }, + { 0x1D0F6, 0x1D0FF }, { 0x1D127, 0x1D128 }, { 0x1D1EB, 0x1D1FF }, + { 0x1D246, 0x1D2BF }, { 0x1D2D4, 0x1D2DF }, { 0x1D2F4, 0x1D2FF }, + { 0x1D357, 0x1D35F }, { 0x1D379, 0x1D3FF }, { 0x1D455, 0x1D455 }, + { 0x1D49D, 0x1D49D }, { 0x1D4A0, 0x1D4A1 }, { 0x1D4A3, 0x1D4A4 }, + { 0x1D4A7, 0x1D4A8 }, { 0x1D4AD, 0x1D4AD }, { 0x1D4BA, 0x1D4BA }, + { 0x1D4BC, 0x1D4BC }, { 0x1D4C4, 0x1D4C4 }, { 0x1D506, 0x1D506 }, + { 0x1D50B, 0x1D50C }, { 0x1D515, 0x1D515 }, { 0x1D51D, 0x1D51D }, + { 0x1D53A, 0x1D53A }, { 0x1D53F, 0x1D53F }, { 0x1D545, 0x1D545 }, + { 0x1D547, 0x1D549 }, { 0x1D551, 0x1D551 }, { 0x1D6A6, 0x1D6A7 }, + { 0x1D7CC, 0x1D7CD }, { 0x1DA8C, 0x1DA9A }, { 0x1DAA0, 0x1DAA0 }, + { 0x1DAB0, 0x1DEFF }, { 0x1DF1F, 0x1DF24 }, { 0x1DF2B, 0x1DFFF }, + { 0x1E007, 0x1E007 }, { 0x1E019, 0x1E01A }, { 0x1E022, 0x1E022 }, + { 0x1E025, 0x1E025 }, { 0x1E02B, 0x1E02F }, { 0x1E06E, 0x1E08E }, + { 0x1E090, 0x1E0FF }, { 0x1E12D, 0x1E12F }, { 0x1E13E, 0x1E13F }, + { 0x1E14A, 0x1E14D }, { 0x1E150, 0x1E28F }, { 0x1E2AF, 0x1E2BF }, + { 0x1E2FA, 0x1E2FE }, { 0x1E300, 0x1E4CF }, { 0x1E4FA, 0x1E7DF }, + { 0x1E7E7, 0x1E7E7 }, { 0x1E7EC, 0x1E7EC }, { 0x1E7EF, 0x1E7EF }, + { 0x1E7FF, 0x1E7FF }, { 0x1E8C5, 0x1E8C6 }, { 0x1E8D7, 0x1E8FF }, + { 0x1E94C, 0x1E94F }, { 0x1E95A, 0x1E95D }, { 0x1E960, 0x1EC70 }, + { 0x1ECB5, 0x1ED00 }, { 0x1ED3E, 0x1EDFF }, { 0x1EE04, 0x1EE04 }, + { 0x1EE20, 0x1EE20 }, { 0x1EE23, 0x1EE23 }, { 0x1EE25, 0x1EE26 }, + { 0x1EE28, 0x1EE28 }, { 0x1EE33, 0x1EE33 }, { 0x1EE38, 0x1EE38 }, + { 0x1EE3A, 0x1EE3A }, { 0x1EE3C, 0x1EE41 }, { 0x1EE43, 0x1EE46 }, + { 0x1EE48, 0x1EE48 }, { 0x1EE4A, 0x1EE4A }, { 0x1EE4C, 0x1EE4C }, + { 0x1EE50, 0x1EE50 }, { 0x1EE53, 0x1EE53 }, { 0x1EE55, 0x1EE56 }, + { 0x1EE58, 0x1EE58 }, { 0x1EE5A, 0x1EE5A }, { 0x1EE5C, 0x1EE5C }, + { 0x1EE5E, 0x1EE5E }, { 0x1EE60, 0x1EE60 }, { 0x1EE63, 0x1EE63 }, + { 0x1EE65, 0x1EE66 }, { 0x1EE6B, 0x1EE6B }, { 0x1EE73, 0x1EE73 }, + { 0x1EE78, 0x1EE78 }, { 0x1EE7D, 0x1EE7D }, { 0x1EE7F, 0x1EE7F }, + { 0x1EE8A, 0x1EE8A }, { 0x1EE9C, 0x1EEA0 }, { 0x1EEA4, 0x1EEA4 }, + { 0x1EEAA, 0x1EEAA }, { 0x1EEBC, 0x1EEEF }, { 0x1EEF2, 0x1EFFF }, + { 0x1F02C, 0x1F02F }, { 0x1F094, 0x1F09F }, { 0x1F0AF, 0x1F0B0 }, + { 0x1F0C0, 0x1F0C0 }, { 0x1F0D0, 0x1F0D0 }, { 0x1F0F6, 0x1F0FF }, + { 0x1F1AE, 0x1F1E5 }, { 0x1F203, 0x1F20F }, { 0x1F23C, 0x1F23F }, + { 0x1F249, 0x1F24F }, { 0x1F252, 0x1F25F }, { 0x1F266, 0x1F2FF }, + { 0x1F6D8, 0x1F6DB }, { 0x1F6ED, 0x1F6EF }, { 0x1F6FD, 0x1F6FF }, + { 0x1F777, 0x1F77A }, { 0x1F7DA, 0x1F7DF }, { 0x1F7EC, 0x1F7EF }, + { 0x1F7F1, 0x1F7FF }, { 0x1F80C, 0x1F80F }, { 0x1F848, 0x1F84F }, + { 0x1F85A, 0x1F85F }, { 0x1F888, 0x1F88F }, { 0x1F8AE, 0x1F8AF }, + { 0x1F8B2, 0x1F8FF }, { 0x1FA54, 0x1FA5F }, { 0x1FA6E, 0x1FA6F }, + { 0x1FA7D, 0x1FA7F }, { 0x1FA89, 0x1FA8F }, { 0x1FABE, 0x1FABE }, + { 0x1FAC6, 0x1FACD }, { 0x1FADC, 0x1FADF }, { 0x1FAE9, 0x1FAEF }, + { 0x1FAF9, 0x1FAFF }, { 0x1FB93, 0x1FB93 }, { 0x1FBCB, 0x1FBEF }, + { 0x1FBFA, 0x1FFFF }, { 0x2A6D7, 0x2F7FF }, { 0x2FA1E, 0xE0000 }, + { 0xE0002, 0xE001F }, { 0xE0080, 0xE00FF }, { 0xE01F0, 0x10FFFD } + }; + /* *INDENT-ON* */ + + /* sorted list of non-overlapping intervals of non-characters */ + /* generated by + * uniset +WIDTH-W -cat=Cn -cat=Mn c + */ + /* *INDENT-OFF* */ + /* generated by run-uniset_dbl 1.2 */ + static const struct interval doublewidth[] = { + { 0x1100, 0x115F }, { 0x231A, 0x231B }, { 0x2329, 0x232A }, + { 0x23E9, 0x23EC }, { 0x23F0, 0x23F0 }, { 0x23F3, 0x23F3 }, + { 0x25FD, 0x25FE }, { 0x2614, 0x2615 }, { 0x2648, 0x2653 }, + { 0x267F, 0x267F }, { 0x2693, 0x2693 }, { 0x26A1, 0x26A1 }, + { 0x26AA, 0x26AB }, { 0x26BD, 0x26BE }, { 0x26C4, 0x26C5 }, + { 0x26CE, 0x26CE }, { 0x26D4, 0x26D4 }, { 0x26EA, 0x26EA }, + { 0x26F2, 0x26F3 }, { 0x26F5, 0x26F5 }, { 0x26FA, 0x26FA }, + { 0x26FD, 0x26FD }, { 0x2705, 0x2705 }, { 0x270A, 0x270B }, + { 0x2728, 0x2728 }, { 0x274C, 0x274C }, { 0x274E, 0x274E }, + { 0x2753, 0x2755 }, { 0x2757, 0x2757 }, { 0x2795, 0x2797 }, + { 0x27B0, 0x27B0 }, { 0x27BF, 0x27BF }, { 0x2B1B, 0x2B1C }, + { 0x2B50, 0x2B50 }, { 0x2B55, 0x2B55 }, { 0x2E80, 0x2E99 }, + { 0x2E9B, 0x2EF3 }, { 0x2F00, 0x2FD5 }, { 0x2FF0, 0x3029 }, + { 0x302E, 0x303E }, { 0x3041, 0x3096 }, { 0x309B, 0x30FF }, + { 0x3105, 0x312F }, { 0x3131, 0x318E }, { 0x3190, 0x31E3 }, + { 0x31EF, 0x321E }, { 0x3220, 0x3247 }, { 0x3250, 0x4DBF }, + { 0x4E00, 0xA48C }, { 0xA490, 0xA4C6 }, { 0xA960, 0xA97C }, + { 0xAC00, 0xD7A3 }, { 0xF900, 0xFAFF }, { 0xFE10, 0xFE19 }, + { 0xFE30, 0xFE52 }, { 0xFE54, 0xFE66 }, { 0xFE68, 0xFE6B }, + { 0xFF01, 0xFF60 }, { 0xFFE0, 0xFFE6 }, { 0x16FE0, 0x16FE3 }, + { 0x16FF0, 0x16FF1 }, { 0x17000, 0x187F7 }, { 0x18800, 0x18CD5 }, + { 0x18D00, 0x18D08 }, { 0x1AFF0, 0x1AFF3 }, { 0x1AFF5, 0x1AFFB }, + { 0x1AFFD, 0x1AFFE }, { 0x1B000, 0x1B122 }, { 0x1B132, 0x1B132 }, + { 0x1B150, 0x1B152 }, { 0x1B155, 0x1B155 }, { 0x1B164, 0x1B167 }, + { 0x1B170, 0x1B2FB }, { 0x1F004, 0x1F004 }, { 0x1F0CF, 0x1F0CF }, + { 0x1F18E, 0x1F18E }, { 0x1F191, 0x1F19A }, { 0x1F200, 0x1F202 }, + { 0x1F210, 0x1F23B }, { 0x1F240, 0x1F248 }, { 0x1F250, 0x1F251 }, + { 0x1F260, 0x1F265 }, { 0x1F300, 0x1F320 }, { 0x1F32D, 0x1F335 }, + { 0x1F337, 0x1F37C }, { 0x1F37E, 0x1F393 }, { 0x1F3A0, 0x1F3CA }, + { 0x1F3CF, 0x1F3D3 }, { 0x1F3E0, 0x1F3F0 }, { 0x1F3F4, 0x1F3F4 }, + { 0x1F3F8, 0x1F43E }, { 0x1F440, 0x1F440 }, { 0x1F442, 0x1F4FC }, + { 0x1F4FF, 0x1F53D }, { 0x1F54B, 0x1F54E }, { 0x1F550, 0x1F567 }, + { 0x1F57A, 0x1F57A }, { 0x1F595, 0x1F596 }, { 0x1F5A4, 0x1F5A4 }, + { 0x1F5FB, 0x1F64F }, { 0x1F680, 0x1F6C5 }, { 0x1F6CC, 0x1F6CC }, + { 0x1F6D0, 0x1F6D2 }, { 0x1F6D5, 0x1F6D7 }, { 0x1F6DC, 0x1F6DF }, + { 0x1F6EB, 0x1F6EC }, { 0x1F6F4, 0x1F6FC }, { 0x1F7E0, 0x1F7EB }, + { 0x1F7F0, 0x1F7F0 }, { 0x1F90C, 0x1F93A }, { 0x1F93C, 0x1F945 }, + { 0x1F947, 0x1F9FF }, { 0x1FA70, 0x1FA7C }, { 0x1FA80, 0x1FA88 }, + { 0x1FA90, 0x1FABD }, { 0x1FABF, 0x1FAC5 }, { 0x1FACE, 0x1FADB }, + { 0x1FAE0, 0x1FAE8 }, { 0x1FAF0, 0x1FAF8 }, { 0x20000, 0x2FFFD }, + { 0x30000, 0x3FFFD } + }; + /* *INDENT-ON* */ + + int result; + +#define Lookup(cmp, table) \ + bisearch(cmp, table, \ + (int) (sizeof(table) / sizeof(struct interval) - 1)) /* test for 8-bit control characters */ - if (ucs == 0) - return 0; - if (ucs < 32 || (ucs >= 0x7f && ucs < 0xa0)) - return -1; + if (cmp == 0) { + result = 0; + } else if (cmp < 32 || (cmp >= 0x7f && cmp < 0xa0)) { + result = -1; + } else if (cmp == 0xad) { + result = use_latin1; + } else if (Lookup(cmp, formatting)) { + /* treat formatting characters like control characters */ + result = -1; + } else if (Lookup(cmp, combining)) { + /* binary search in table of non-spacing characters */ + result = 0; + } else { + /* if we arrive here, cmp is not a combining or C0/C1 control character */ + result = 1; - /* binary search in table of non-spacing characters */ - if (bisearch(ucs, combining, - sizeof(combining) / sizeof(struct interval) - 1)) - return 0; - - /* if we arrive here, ucs is not a combining or C0/C1 control character */ - - return 1 + - (ucs >= 0x1100 && - (ucs <= 0x115f || /* Hangul Jamo init. consonants */ - ucs == 0x2329 || ucs == 0x232a || - (ucs >= 0x2e80 && ucs <= 0xa4cf && - ucs != 0x303f) /* CJK ... Yi */ - || (ucs >= 0xac00 && ucs <= 0xd7a3) /* Hangul Syllables */ - || (ucs >= 0xf900 && ucs <= 0xfaff) /* CJK Compatibility Ideographs */ - || (ucs >= 0xfe10 && ucs <= 0xfe19) /* Vertical forms */ - || (ucs >= 0xfe30 && ucs <= 0xfe6f) /* CJK Compatibility Forms */ - || (ucs >= 0xff00 && ucs <= 0xff60) /* Fullwidth Forms */ - || (ucs >= 0xffe0 && ucs <= 0xffe6) -#if !defined(SIZEOF_WCHAR_T) || (SIZEOF_WCHAR_T >= 4) - || (ucs >= 0x20000 && ucs <= 0x2fffd) - || (ucs >= 0x30000 && ucs <= 0x3fffd) -#endif - )); + if (Lookup(cmp, doublewidth)) { + result = 2; + } else if (cmp >= unknowns[0].first && Lookup(cmp, unknowns)) { + result = -1; + } + } + return result; } -NCURSES_EXPORT(int) mk_wcswidth(const wchar_t *pwcs, size_t n) +NCURSES_EXPORT(int) mk_wcswidth(const uint32_t *pwcs, size_t n) { - int w, width = 0; + int width = 0; + + for (; *pwcs && n-- > 0; pwcs++) { + int w; - for (;*pwcs && n-- > 0; pwcs++) if ((w = mk_wcwidth(*pwcs)) < 0) return -1; else width += w; + } return width; } @@ -233,17 +701,31 @@ NCURSES_EXPORT(int) mk_wcswidth(const wchar_t *pwcs, size_t n) /* * The following functions are the same as mk_wcwidth() and - * mk_wcswidth(), except that spacing characters in the East Asian + * mk_wcwidth_cjk(), except that spacing characters in the East Asian * Ambiguous (A) category as defined in Unicode Technical Report #11 * have a column width of 2. This variant might be useful for users of * CJK legacy encodings who want to migrate to UCS without changing * the traditional terminal character-width behaviour. It is not * otherwise recommended for general use. */ -NCURSES_EXPORT(int) mk_wcwidth_cjk(wchar_t ucs) +NCURSES_EXPORT(int) mk_wcwidth_cjk(uint32_t ucs) { /* sorted list of non-overlapping intervals of East Asian Ambiguous - * characters, generated by "uniset +WIDTH-A -cat=Me -cat=Mn -cat=Cf c" */ + * characters, generated by + * + * uniset +WIDTH-A -cat=Me -cat=Mn -cat=Cf \ + * +E000..F8FF \ + * +F0000..FFFFD \ + * +100000..10FFFD c + * + * "WIDTH-A" is a file extracted from EastAsianWidth.txt by selecting + * only those with width "A", and omitting: + * + * 0xAD + * all lines with "COMBINING" + */ + /* *INDENT-OFF* */ + /* generated by run-uniset_cjk 1.5 */ static const struct interval ambiguous[] = { { 0x00A1, 0x00A1 }, { 0x00A4, 0x00A4 }, { 0x00A7, 0x00A8 }, { 0x00AA, 0x00AA }, { 0x00AE, 0x00AE }, { 0x00B0, 0x00B4 }, @@ -274,49 +756,59 @@ NCURSES_EXPORT(int) mk_wcwidth_cjk(wchar_t ucs) { 0x2113, 0x2113 }, { 0x2116, 0x2116 }, { 0x2121, 0x2122 }, { 0x2126, 0x2126 }, { 0x212B, 0x212B }, { 0x2153, 0x2154 }, { 0x215B, 0x215E }, { 0x2160, 0x216B }, { 0x2170, 0x2179 }, - { 0x2190, 0x2199 }, { 0x21B8, 0x21B9 }, { 0x21D2, 0x21D2 }, - { 0x21D4, 0x21D4 }, { 0x21E7, 0x21E7 }, { 0x2200, 0x2200 }, - { 0x2202, 0x2203 }, { 0x2207, 0x2208 }, { 0x220B, 0x220B }, - { 0x220F, 0x220F }, { 0x2211, 0x2211 }, { 0x2215, 0x2215 }, - { 0x221A, 0x221A }, { 0x221D, 0x2220 }, { 0x2223, 0x2223 }, - { 0x2225, 0x2225 }, { 0x2227, 0x222C }, { 0x222E, 0x222E }, - { 0x2234, 0x2237 }, { 0x223C, 0x223D }, { 0x2248, 0x2248 }, - { 0x224C, 0x224C }, { 0x2252, 0x2252 }, { 0x2260, 0x2261 }, - { 0x2264, 0x2267 }, { 0x226A, 0x226B }, { 0x226E, 0x226F }, - { 0x2282, 0x2283 }, { 0x2286, 0x2287 }, { 0x2295, 0x2295 }, - { 0x2299, 0x2299 }, { 0x22A5, 0x22A5 }, { 0x22BF, 0x22BF }, - { 0x2312, 0x2312 }, { 0x2460, 0x24E9 }, { 0x24EB, 0x254B }, - { 0x2550, 0x2573 }, { 0x2580, 0x258F }, { 0x2592, 0x2595 }, - { 0x25A0, 0x25A1 }, { 0x25A3, 0x25A9 }, { 0x25B2, 0x25B3 }, - { 0x25B6, 0x25B7 }, { 0x25BC, 0x25BD }, { 0x25C0, 0x25C1 }, - { 0x25C6, 0x25C8 }, { 0x25CB, 0x25CB }, { 0x25CE, 0x25D1 }, - { 0x25E2, 0x25E5 }, { 0x25EF, 0x25EF }, { 0x2605, 0x2606 }, - { 0x2609, 0x2609 }, { 0x260E, 0x260F }, { 0x2614, 0x2615 }, + { 0x2189, 0x2189 }, { 0x2190, 0x2199 }, { 0x21B8, 0x21B9 }, + { 0x21D2, 0x21D2 }, { 0x21D4, 0x21D4 }, { 0x21E7, 0x21E7 }, + { 0x2200, 0x2200 }, { 0x2202, 0x2203 }, { 0x2207, 0x2208 }, + { 0x220B, 0x220B }, { 0x220F, 0x220F }, { 0x2211, 0x2211 }, + { 0x2215, 0x2215 }, { 0x221A, 0x221A }, { 0x221D, 0x2220 }, + { 0x2223, 0x2223 }, { 0x2225, 0x2225 }, { 0x2227, 0x222C }, + { 0x222E, 0x222E }, { 0x2234, 0x2237 }, { 0x223C, 0x223D }, + { 0x2248, 0x2248 }, { 0x224C, 0x224C }, { 0x2252, 0x2252 }, + { 0x2260, 0x2261 }, { 0x2264, 0x2267 }, { 0x226A, 0x226B }, + { 0x226E, 0x226F }, { 0x2282, 0x2283 }, { 0x2286, 0x2287 }, + { 0x2295, 0x2295 }, { 0x2299, 0x2299 }, { 0x22A5, 0x22A5 }, + { 0x22BF, 0x22BF }, { 0x2312, 0x2312 }, { 0x2460, 0x24E9 }, + { 0x24EB, 0x254B }, { 0x2550, 0x2573 }, { 0x2580, 0x258F }, + { 0x2592, 0x2595 }, { 0x25A0, 0x25A1 }, { 0x25A3, 0x25A9 }, + { 0x25B2, 0x25B3 }, { 0x25B6, 0x25B7 }, { 0x25BC, 0x25BD }, + { 0x25C0, 0x25C1 }, { 0x25C6, 0x25C8 }, { 0x25CB, 0x25CB }, + { 0x25CE, 0x25D1 }, { 0x25E2, 0x25E5 }, { 0x25EF, 0x25EF }, + { 0x2605, 0x2606 }, { 0x2609, 0x2609 }, { 0x260E, 0x260F }, { 0x261C, 0x261C }, { 0x261E, 0x261E }, { 0x2640, 0x2640 }, { 0x2642, 0x2642 }, { 0x2660, 0x2661 }, { 0x2663, 0x2665 }, { 0x2667, 0x266A }, { 0x266C, 0x266D }, { 0x266F, 0x266F }, - { 0x273D, 0x273D }, { 0x2776, 0x277F }, { 0xE000, 0xF8FF }, - { 0xFFFD, 0xFFFD }, { 0xF0000, 0xFFFFD }, { 0x100000, 0x10FFFD } + { 0x269E, 0x269F }, { 0x26BF, 0x26BF }, { 0x26C6, 0x26CD }, + { 0x26CF, 0x26D3 }, { 0x26D5, 0x26E1 }, { 0x26E3, 0x26E3 }, + { 0x26E8, 0x26E9 }, { 0x26EB, 0x26F1 }, { 0x26F4, 0x26F4 }, + { 0x26F6, 0x26F9 }, { 0x26FB, 0x26FC }, { 0x26FE, 0x26FF }, + { 0x273D, 0x273D }, { 0x2776, 0x277F }, { 0x2B56, 0x2B59 }, + { 0x3248, 0x324F }, { 0xE000, 0xF8FF }, { 0xFFFD, 0xFFFD }, + { 0x1F100, 0x1F10A }, { 0x1F110, 0x1F12D }, { 0x1F130, 0x1F169 }, + { 0x1F170, 0x1F18D }, { 0x1F18F, 0x1F190 }, { 0x1F19B, 0x1F1AC }, + { 0xF0000, 0xFFFFD }, { 0x100000, 0x10FFFD } }; + /* *INDENT-ON* */ /* binary search in table of non-spacing characters */ - if (bisearch(ucs, ambiguous, - sizeof(ambiguous) / sizeof(struct interval) - 1)) + if (Lookup((unsigned long) ucs, ambiguous)) return 2; return mk_wcwidth(ucs); } -NCURSES_EXPORT(int) mk_wcswidth_cjk(const wchar_t *pwcs, size_t n) +NCURSES_EXPORT(int) mk_wcswidth_cjk(const uint32_t *pwcs, size_t n) { - int w, width = 0; + int width = 0; + + for (; *pwcs && n-- > 0; pwcs++) { + int w; - for (;*pwcs && n-- > 0; pwcs++) if ((w = mk_wcwidth_cjk(*pwcs)) < 0) return -1; else width += w; + } return width; } diff --git a/ncurses/widechar/lib_add_wch.c b/ncurses/widechar/lib_add_wch.c index b817647c..b72c2c8b 100644 --- a/ncurses/widechar/lib_add_wch.c +++ b/ncurses/widechar/lib_add_wch.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2019-2020,2021 Thomas E. Dickey * + * Copyright 2019-2024,2025 Thomas E. Dickey * * Copyright 2004-2011,2016 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -40,7 +40,7 @@ #include #endif -MODULE_ID("$Id: lib_add_wch.c,v 1.17 2021/06/17 21:26:02 tom Exp $") +MODULE_ID("$Id: lib_add_wch.c,v 1.22 2025/01/19 00:51:54 tom Exp $") /* clone/adapt lib_addch.c */ static const cchar_t blankchar = NewChar(BLANK_TEXT); @@ -115,7 +115,7 @@ render_char(WINDOW *win, cchar_t ch) #endif static bool -newline_forces_scroll(WINDOW *win, NCURSES_SIZE_T *ypos) +newline_forces_scroll(const WINDOW *win, NCURSES_SIZE_T *ypos) { bool result = FALSE; @@ -204,10 +204,16 @@ wadd_wch_literal(WINDOW *win, cchar_t ch) if (len == 0) { /* non-spacing */ if ((x > 0 && y >= 0) || (win->_maxx >= 0 && win->_cury >= 1)) { - if (x > 0 && y >= 0) - chars = (win->_line[y].text[x - 1].chars); - else + if (x > 0 && y >= 0) { + for (j = x - 1; j > 0; --j) { + if (!isWidecExt(win->_line[y].text[j])) { + break; + } + } + chars = (win->_line[y].text[j].chars); + } else { chars = (win->_line[y - 1].text[win->_maxx].chars); + } for (i = 0; i < CCHARW_MAX; ++i) { if (chars[i] == 0) { TR(TRACE_VIRTPUT, @@ -301,7 +307,7 @@ wadd_wch_nosync(WINDOW *win, cchar_t ch) /* the workhorse function -- add a character to the given window */ { NCURSES_SIZE_T x, y; - wchar_t *s; + const wchar_t *s; int tabsize = 8; #if USE_REENTRANT SCREEN *sp = _nc_screen_of(win); @@ -378,7 +384,7 @@ wadd_wch_nosync(WINDOW *win, cchar_t ch) win->_flags &= ~_WRAPPED; break; default: - if ((s = wunctrl(&ch)) != 0) { + if ((s = wunctrl(&ch)) != NULL) { while (*s) { cchar_t sch; SetChar(sch, *s++, AttrOf(ch)); @@ -428,7 +434,7 @@ wecho_wchar(WINDOW *win, const cchar_t *wch) { int code = ERR; - TR(TRACE_VIRTPUT | TRACE_CCALLS, (T_CALLED("wechochar(%p, %s)"), + TR(TRACE_VIRTPUT | TRACE_CCALLS, (T_CALLED("wecho_wchar(%p, %s)"), (void *) win, _tracecchar_t(wch))); diff --git a/ncurses/widechar/lib_box_set.c b/ncurses/widechar/lib_box_set.c index ef2e1a7d..9525cd0a 100644 --- a/ncurses/widechar/lib_box_set.c +++ b/ncurses/widechar/lib_box_set.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020 Thomas E. Dickey * + * Copyright 2020,2024 Thomas E. Dickey * * Copyright 2002-2009,2011 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -40,7 +40,7 @@ #include -MODULE_ID("$Id: lib_box_set.c,v 1.7 2020/02/02 23:34:34 tom Exp $") +MODULE_ID("$Id: lib_box_set.c,v 1.8 2024/12/07 20:08:15 tom Exp $") NCURSES_EXPORT(int) wborder_set(WINDOW *win, @@ -67,7 +67,7 @@ wborder_set(WINDOW *win, if (!win) returnCode(ERR); -#define RENDER_WITH_DEFAULT(ch,def) w ##ch = _nc_render(win, (ch == 0) ? *(const ARG_CH_T)def : *ch) +#define RENDER_WITH_DEFAULT(ch,def) w ##ch = _nc_render(win, (ch == NULL) ? *(const ARG_CH_T)def : *ch) RENDER_WITH_DEFAULT(ls, WACS_VLINE); RENDER_WITH_DEFAULT(rs, WACS_VLINE); diff --git a/ncurses/widechar/lib_cchar.c b/ncurses/widechar/lib_cchar.c index 451c5dcb..b5359461 100644 --- a/ncurses/widechar/lib_cchar.c +++ b/ncurses/widechar/lib_cchar.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2019-2021,2022 Thomas E. Dickey * + * Copyright 2019-2022,2024 Thomas E. Dickey * * Copyright 2001-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -37,7 +37,7 @@ #include #include -MODULE_ID("$Id: lib_cchar.c,v 1.38 2022/07/27 08:03:16 tom Exp $") +MODULE_ID("$Id: lib_cchar.c,v 1.40 2024/12/07 18:07:52 tom Exp $") /* * The SuSv2 description leaves some room for interpretation. We'll assume wch @@ -119,7 +119,7 @@ getcchar(const cchar_t *wcval, } else #endif if (wcval != NULL) { - wchar_t *wp; + const wchar_t *wp; int len; #if HAVE_WMEMCHR @@ -135,7 +135,7 @@ getcchar(const cchar_t *wcval, * If the value is not a null, return the length plus 1 for null. */ code = (len < CCHARW_MAX) ? (len + 1) : CCHARW_MAX; - } else if (attrs == 0 || pair_arg == 0) { + } else if (attrs == NULL || pair_arg == NULL) { code = ERR; } else if (len >= 0) { int color_pair; diff --git a/ncurses/widechar/lib_get_wch.c b/ncurses/widechar/lib_get_wch.c index 9f10d3bc..342022b5 100644 --- a/ncurses/widechar/lib_get_wch.c +++ b/ncurses/widechar/lib_get_wch.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020,2021 Thomas E. Dickey * + * Copyright 2020-2021,2024 Thomas E. Dickey * * Copyright 2002-2011,2016 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -41,7 +41,7 @@ #include #include -MODULE_ID("$Id: lib_get_wch.c,v 1.26 2021/04/17 16:12:54 tom Exp $") +MODULE_ID("$Id: lib_get_wch.c,v 1.27 2024/12/07 20:08:15 tom Exp $") NCURSES_EXPORT(int) wget_wch(WINDOW *win, wint_t *result) @@ -62,7 +62,7 @@ wget_wch(WINDOW *win, wint_t *result) _nc_lock_global(curses); sp = _nc_screen_of(win); - if (sp != 0) { + if (sp != NULL) { size_t count = 0; for (;;) { @@ -112,7 +112,7 @@ wget_wch(WINDOW *win, wint_t *result) code = ERR; } - if (result != 0) + if (result != NULL) *result = (wint_t) value; _nc_unlock_global(curses); diff --git a/ncurses/widechar/lib_get_wstr.c b/ncurses/widechar/lib_get_wstr.c index c4dec5c7..4aa9a0c4 100644 --- a/ncurses/widechar/lib_get_wstr.c +++ b/ncurses/widechar/lib_get_wstr.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2020,2021 Thomas E. Dickey * + * Copyright 2018-2023,2024 Thomas E. Dickey * * Copyright 2002-2009,2011 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -40,10 +40,10 @@ #include -MODULE_ID("$Id: lib_get_wstr.c,v 1.20 2021/10/23 19:02:59 tom Exp $") +MODULE_ID("$Id: lib_get_wstr.c,v 1.22 2024/07/27 19:22:23 tom Exp $") static int -wadd_wint(WINDOW *win, wint_t *src) +wadd_wint(WINDOW *win, const wint_t *src) { cchar_t tmp; wchar_t wch[2]; @@ -59,7 +59,7 @@ wadd_wint(WINDOW *win, wint_t *src) * or other character, and handles reverse wraparound. */ static wint_t * -WipeOut(WINDOW *win, int y, int x, wint_t *first, wint_t *last, int echoed) +WipeOut(WINDOW *win, int y, int x, const wint_t *first, wint_t *last, int echoed) { if (last > first) { *--last = '\0'; @@ -88,7 +88,7 @@ wgetn_wstr(WINDOW *win, wint_t *str, int maxlen) { SCREEN *sp = _nc_screen_of(win); TTY buf; - bool oldnl, oldecho, oldraw, oldcbreak; + TTY_FLAGS save_flags; wchar_t erasec = 0; wchar_t killc = 0; wint_t *oldstr = str; @@ -105,13 +105,11 @@ wgetn_wstr(WINDOW *win, wint_t *str, int maxlen) _nc_get_tty_mode(&buf); - oldnl = sp->_nl; - oldecho = sp->_echo; - oldraw = sp->_raw; - oldcbreak = sp->_cbreak; + save_flags = sp->_tty_flags; NCURSES_SP_NAME(nl) (NCURSES_SP_ARG); NCURSES_SP_NAME(noecho) (NCURSES_SP_ARG); - NCURSES_SP_NAME(raw) (NCURSES_SP_ARG); + if (!save_flags._raw) + NCURSES_SP_NAME(cbreak) (NCURSES_SP_ARG); NCURSES_SP_NAME(erasewchar) (NCURSES_SP_ARGx &erasec); NCURSES_SP_NAME(killwchar) (NCURSES_SP_ARGx &killc); @@ -149,7 +147,7 @@ wgetn_wstr(WINDOW *win, wint_t *str, int maxlen) * *getn_wstr() with \n should work either way. */ if (ch == KEY_DOWN || ch == KEY_ENTER) { - if (oldecho == TRUE + if (save_flags._echo == TRUE && win->_cury == win->_maxy && win->_scroll) wechochar(win, (chtype) '\n'); @@ -157,11 +155,11 @@ wgetn_wstr(WINDOW *win, wint_t *str, int maxlen) } if (ch == KEY_LEFT || ch == KEY_BACKSPACE) { if (tmpstr > oldstr) { - tmpstr = WipeOut(win, y, x, oldstr, tmpstr, oldecho); + tmpstr = WipeOut(win, y, x, oldstr, tmpstr, save_flags._echo); } } else if (ch == KEY_EOL) { while (tmpstr > oldstr) { - tmpstr = WipeOut(win, y, x, oldstr, tmpstr, oldecho); + tmpstr = WipeOut(win, y, x, oldstr, tmpstr, save_flags._echo); } } else { beep(); @@ -171,7 +169,7 @@ wgetn_wstr(WINDOW *win, wint_t *str, int maxlen) } else { *tmpstr++ = ch; *tmpstr = 0; - if (oldecho == TRUE) { + if (save_flags._echo == TRUE) { int oldy = win->_cury; if (wadd_wint(win, tmpstr - 1) == ERR) { @@ -181,7 +179,7 @@ wgetn_wstr(WINDOW *win, wint_t *str, int maxlen) */ win->_flags &= ~_WRAPPED; waddch(win, (chtype) ' '); - tmpstr = WipeOut(win, y, x, oldstr, tmpstr, oldecho); + tmpstr = WipeOut(win, y, x, oldstr, tmpstr, save_flags._echo); continue; } else if (IS_WRAPPED(win)) { /* @@ -211,11 +209,7 @@ wgetn_wstr(WINDOW *win, wint_t *str, int maxlen) /* Restore with a single I/O call, to fix minor asymmetry between * raw/noraw, etc. */ - sp->_nl = oldnl; - sp->_echo = oldecho; - sp->_raw = oldraw; - sp->_cbreak = oldcbreak; - + sp->_tty_flags = save_flags; (void) _nc_set_tty_mode(&buf); *tmpstr = 0; diff --git a/ncurses/widechar/lib_hline_set.c b/ncurses/widechar/lib_hline_set.c index 8d5e0263..3cb59c26 100644 --- a/ncurses/widechar/lib_hline_set.c +++ b/ncurses/widechar/lib_hline_set.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020 Thomas E. Dickey * + * Copyright 2020,2024 Thomas E. Dickey * * Copyright 2002-2010,2016 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -40,7 +40,7 @@ #include -MODULE_ID("$Id: lib_hline_set.c,v 1.6 2020/02/02 23:34:34 tom Exp $") +MODULE_ID("$Id: lib_hline_set.c,v 1.7 2024/12/07 20:08:15 tom Exp $") NCURSES_EXPORT(int) whline_set(WINDOW *win, const cchar_t *ch, int n) @@ -60,7 +60,7 @@ whline_set(WINDOW *win, const cchar_t *ch, int n) CHANGED_RANGE(line, start, end); - if (ch == 0) + if (ch == NULL) wch = *WACS_HLINE; else wch = *ch; diff --git a/ncurses/widechar/lib_in_wch.c b/ncurses/widechar/lib_in_wch.c index 1d273322..a401305d 100644 --- a/ncurses/widechar/lib_in_wch.c +++ b/ncurses/widechar/lib_in_wch.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020 Thomas E. Dickey * + * Copyright 2020,2024 Thomas E. Dickey * * Copyright 2002-2009,2016 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -40,7 +40,7 @@ #include -MODULE_ID("$Id: lib_in_wch.c,v 1.7 2020/02/02 23:34:34 tom Exp $") +MODULE_ID("$Id: lib_in_wch.c,v 1.8 2024/12/07 20:08:15 tom Exp $") NCURSES_EXPORT(int) win_wch(WINDOW *win, cchar_t *wcval) @@ -49,8 +49,8 @@ win_wch(WINDOW *win, cchar_t *wcval) TR(TRACE_CCALLS, (T_CALLED("win_wch(%p,%p)"), (void *) win, (void *) wcval)); - if (win != 0 - && wcval != 0) { + if (win != NULL + && wcval != NULL) { int row, col; getyx(win, row, col); diff --git a/ncurses/widechar/lib_in_wchnstr.c b/ncurses/widechar/lib_in_wchnstr.c index 40a2bb62..6f24888b 100644 --- a/ncurses/widechar/lib_in_wchnstr.c +++ b/ncurses/widechar/lib_in_wchnstr.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020 Thomas E. Dickey * + * Copyright 2020,2024 Thomas E. Dickey * * Copyright 2002-2007,2009 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -40,7 +40,7 @@ #include -MODULE_ID("$Id: lib_in_wchnstr.c,v 1.9 2020/02/02 23:34:34 tom Exp $") +MODULE_ID("$Id: lib_in_wchnstr.c,v 1.11 2024/12/07 18:03:14 tom Exp $") NCURSES_EXPORT(int) win_wchnstr(WINDOW *win, cchar_t *wchstr, int n) @@ -48,9 +48,9 @@ win_wchnstr(WINDOW *win, cchar_t *wchstr, int n) int code = OK; T((T_CALLED("win_wchnstr(%p,%p,%d)"), (void *) win, (void *) wchstr, n)); - if (win != 0 - && wchstr != 0) { - NCURSES_CH_T *src; + if (win != NULL + && wchstr != NULL) { + const NCURSES_CH_T *src; int row, col; int j, k, limit; diff --git a/ncurses/widechar/lib_ins_wch.c b/ncurses/widechar/lib_ins_wch.c index f7536108..4c3cb380 100644 --- a/ncurses/widechar/lib_ins_wch.c +++ b/ncurses/widechar/lib_ins_wch.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2019,2020 Thomas E. Dickey * + * Copyright 2019-2024,2025 Thomas E. Dickey * * Copyright 2002-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -40,7 +40,7 @@ #include -MODULE_ID("$Id: lib_ins_wch.c,v 1.25 2020/12/05 20:04:59 tom Exp $") +MODULE_ID("$Id: lib_ins_wch.c,v 1.32 2025/02/20 01:02:09 tom Exp $") /* * Insert the given character, updating the current location to simplify @@ -63,7 +63,7 @@ _nc_insert_wch(WINDOW *win, const cchar_t *wch) struct ldat *line = &(win->_line[win->_cury]); NCURSES_CH_T *end = &(line->text[win->_curx]); NCURSES_CH_T *temp1 = &(line->text[win->_maxx]); - NCURSES_CH_T *temp2 = temp1 - cells; + const NCURSES_CH_T *temp2 = temp1 - cells; CHANGED_TO_EOL(line, win->_curx, win->_maxx); while (temp1 > end) @@ -87,7 +87,7 @@ wins_wch(WINDOW *win, const cchar_t *wch) T((T_CALLED("wins_wch(%p, %s)"), (void *) win, _tracecchar_t(wch))); - if (win != 0) { + if (win != NULL) { NCURSES_SIZE_T oy = win->_cury; NCURSES_SIZE_T ox = win->_curx; @@ -108,10 +108,12 @@ wins_nwstr(WINDOW *win, const wchar_t *wstr, int n) T((T_CALLED("wins_nwstr(%p,%s,%d)"), (void *) win, _nc_viswbufn(wstr, n), n)); - if (win != 0 - && wstr != 0) { - if (n < 1) + if (win != NULL + && wstr != NULL) { + + if (n < 0) { n = INT_MAX; + } code = OK; if (n > 0) { @@ -120,7 +122,7 @@ wins_nwstr(WINDOW *win, const wchar_t *wstr, int n) NCURSES_SIZE_T oy = win->_cury; NCURSES_SIZE_T ox = win->_curx; - for (cp = wstr; (*cp != L'\0') && ((cp - wstr) < n); cp++) { + for (cp = wstr; ((cp - wstr) < n) && (*cp != L'\0'); cp++) { int len = _nc_wacs_width(*cp); if ((len >= 0 && len != 1) || !is7bits(*cp)) { diff --git a/ncurses/widechar/lib_inwstr.c b/ncurses/widechar/lib_inwstr.c index b2fdaeac..5f82c2ef 100644 --- a/ncurses/widechar/lib_inwstr.c +++ b/ncurses/widechar/lib_inwstr.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020 Thomas E. Dickey * + * Copyright 2020-2024,2025 Thomas E. Dickey * * Copyright 2002-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -34,22 +34,22 @@ /* ** lib_inwstr.c ** -** The routines winnwstr() and winwstr(). +** The routine winnwstr(). ** */ #include -MODULE_ID("$Id: lib_inwstr.c,v 1.9 2020/02/02 23:34:34 tom Exp $") +MODULE_ID("$Id: lib_inwstr.c,v 1.14 2025/01/19 00:51:54 tom Exp $") NCURSES_EXPORT(int) winnwstr(WINDOW *win, wchar_t *wstr, int n) { int count = 0; - cchar_t *text; + const cchar_t *text; T((T_CALLED("winnwstr(%p,%p,%d)"), (void *) win, (void *) wstr, n)); - if (wstr != 0) { + if (wstr != NULL) { if (win) { int row, col; int last = 0; @@ -57,6 +57,9 @@ winnwstr(WINDOW *win, wchar_t *wstr, int n) getyx(win, row, col); + if (n < 0) + n = CCHARW_MAX * (win->_maxx - win->_curx + 1); + text = win->_line[row].text; while (count < n && !done && count != ERR) { @@ -92,23 +95,3 @@ winnwstr(WINDOW *win, wchar_t *wstr, int n) } returnCode(count); } - -/* - * X/Open says winwstr() returns OK if not ERR. If that is not a blunder, it - * must have a null termination on the string (see above). Unlike winnstr(), - * it does not define what happens for a negative count with winnwstr(). - */ -NCURSES_EXPORT(int) -winwstr(WINDOW *win, wchar_t *wstr) -{ - int result = OK; - - T((T_CALLED("winwstr(%p,%p)"), (void *) win, (void *) wstr)); - if (win == 0) { - result = ERR; - } else if (winnwstr(win, wstr, - CCHARW_MAX * (win->_maxx - win->_curx + 1)) == ERR) { - result = ERR; - } - returnCode(result); -} diff --git a/ncurses/widechar/lib_key_name.c b/ncurses/widechar/lib_key_name.c index 8acfe7a2..c85909fe 100644 --- a/ncurses/widechar/lib_key_name.c +++ b/ncurses/widechar/lib_key_name.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020 Thomas E. Dickey * + * Copyright 2020-2023,2024 Thomas E. Dickey * * Copyright 2007-2008,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -36,7 +36,7 @@ #include -MODULE_ID("$Id: lib_key_name.c,v 1.5 2020/02/02 23:34:34 tom Exp $") +MODULE_ID("$Id: lib_key_name.c,v 1.7 2024/07/27 19:23:59 tom Exp $") #define MyData _nc_globals.key_name @@ -44,19 +44,24 @@ NCURSES_EXPORT(NCURSES_CONST char *) key_name(wchar_t c) { cchar_t my_cchar; - wchar_t *my_wchars; + const wchar_t *my_wchars; size_t len; + NCURSES_CONST char *result = NULL; memset(&my_cchar, 0, sizeof(my_cchar)); my_cchar.chars[0] = c; my_cchar.chars[1] = L'\0'; my_wchars = wunctrl(&my_cchar); + /* + * wunctrl() could return a wide character rather than just a "printable" + * representation. Check for that and return a corresponding multibyte + * character string. + */ len = wcstombs(MyData, my_wchars, sizeof(MyData) - 1); - if (isEILSEQ(len) || (len == 0)) { - return 0; + if (!isEILSEQ(len) && (len != 0) && (len <= MB_LEN_MAX)) { + MyData[len] = '\0'; + result = MyData; } - - MyData[len] = '\0'; - return MyData; + return result; } diff --git a/ncurses/widechar/lib_pecho_wchar.c b/ncurses/widechar/lib_pecho_wchar.c index 502967fd..617ee3e4 100644 --- a/ncurses/widechar/lib_pecho_wchar.c +++ b/ncurses/widechar/lib_pecho_wchar.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020,2021 Thomas E. Dickey * + * Copyright 2020-2021,2024 Thomas E. Dickey * * Copyright 2004,2009 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -33,14 +33,14 @@ #include -MODULE_ID("$Id: lib_pecho_wchar.c,v 1.4 2021/10/23 17:07:56 tom Exp $") +MODULE_ID("$Id: lib_pecho_wchar.c,v 1.5 2024/12/07 20:08:15 tom Exp $") NCURSES_EXPORT(int) pecho_wchar(WINDOW *pad, const cchar_t *wch) { T((T_CALLED("pecho_wchar(%p, %s)"), (void *) pad, _tracech_t(wch))); - if (pad == 0) + if (pad == NULL) returnCode(ERR); if (!IS_PAD(pad)) diff --git a/ncurses/widechar/lib_slk_wset.c b/ncurses/widechar/lib_slk_wset.c index 5aa75ff9..eb4c10a1 100644 --- a/ncurses/widechar/lib_slk_wset.c +++ b/ncurses/widechar/lib_slk_wset.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020 Thomas E. Dickey * + * Copyright 2020,2024 Thomas E. Dickey * * Copyright 2003-2011,2016 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -41,7 +41,7 @@ #include #endif -MODULE_ID("$Id: lib_slk_wset.c,v 1.15 2020/02/02 23:34:34 tom Exp $") +MODULE_ID("$Id: lib_slk_wset.c,v 1.16 2024/12/07 20:08:15 tom Exp $") NCURSES_EXPORT(int) slk_wset(int i, const wchar_t *astr, int format) @@ -52,7 +52,7 @@ slk_wset(int i, const wchar_t *astr, int format) T((T_CALLED("slk_wset(%d, %s, %d)"), i, _nc_viswbuf(astr), format)); - if (astr != 0) { + if (astr != NULL) { size_t arglen; init_mb(state); @@ -61,7 +61,7 @@ slk_wset(int i, const wchar_t *astr, int format) if ((arglen = wcsrtombs(NULL, &str, (size_t) 0, &state)) != (size_t) -1) { char *mystr; - if ((mystr = (char *) _nc_doalloc(0, arglen + 1)) != 0) { + if ((mystr = (char *) _nc_doalloc(NULL, arglen + 1)) != NULL) { str = astr; if (wcsrtombs(mystr, &str, arglen, &state) != (size_t) -1) { /* glibc documentation claims that the terminating L'\0' diff --git a/ncurses/widechar/lib_unget_wch.c b/ncurses/widechar/lib_unget_wch.c index 4ea26b60..9f3308bc 100644 --- a/ncurses/widechar/lib_unget_wch.c +++ b/ncurses/widechar/lib_unget_wch.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020 Thomas E. Dickey * + * Copyright 2020-2023,2024 Thomas E. Dickey * * Copyright 2002-2011,2016 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -40,7 +40,7 @@ #include -MODULE_ID("$Id: lib_unget_wch.c,v 1.17 2020/02/02 23:34:34 tom Exp $") +MODULE_ID("$Id: lib_unget_wch.c,v 1.19 2024/12/07 20:08:15 tom Exp $") /* * Wrapper for wcrtomb() which obtains the length needed for the given @@ -51,7 +51,7 @@ _nc_wcrtomb(char *target, wchar_t source, mbstate_t * state) { int result; - if (target == 0) { + if (target == NULL) { wchar_t temp[2]; const wchar_t *tempp = temp; temp[0] = source; @@ -60,7 +60,7 @@ _nc_wcrtomb(char *target, wchar_t source, mbstate_t * state) } else { result = (int) wcrtomb(target, source, state); } - if (!isEILSEQ(result) && (result == 0)) + if (!isEILSEQ(result) && ((result == 0) || (result > MB_LEN_MAX))) result = 1; return (size_t) result; } @@ -75,13 +75,13 @@ NCURSES_SP_NAME(unget_wch) (NCURSES_SP_DCLx const wchar_t wch) T((T_CALLED("unget_wch(%p, %#lx)"), (void *) SP_PARM, (unsigned long) wch)); init_mb(state); - length = _nc_wcrtomb(0, wch, &state); + length = _nc_wcrtomb(NULL, wch, &state); if (length != (size_t) (-1) && length != 0) { char *string; - if ((string = (char *) malloc(length)) != 0) { + if ((string = (char *) malloc(length)) != NULL) { int n; init_mb(state); diff --git a/ncurses/widechar/lib_vid_attr.c b/ncurses/widechar/lib_vid_attr.c index 2d9531f1..864f73e9 100644 --- a/ncurses/widechar/lib_vid_attr.c +++ b/ncurses/widechar/lib_vid_attr.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2019,2020 Thomas E. Dickey * + * Copyright 2018-2023,2024 Thomas E. Dickey * * Copyright 2002-2014,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -37,7 +37,7 @@ #define CUR SP_TERMTYPE #endif -MODULE_ID("$Id: lib_vid_attr.c,v 1.30 2020/05/27 23:54:31 tom Exp $") +MODULE_ID("$Id: lib_vid_attr.c,v 1.32 2024/12/07 20:08:59 tom Exp $") #define doPut(mode) \ TPUTS_TRACE(#mode); \ @@ -87,9 +87,9 @@ NCURSES_SP_NAME(vid_puts) (NCURSES_SP_DCLx attr_t turn_on, turn_off; bool reverse = FALSE; - bool can_color = (SP_PARM == 0 || SP_PARM->_coloron); + bool can_color = (SP_PARM == NULL || SP_PARM->_coloron); #if NCURSES_EXT_FUNCS - bool fix_pair0 = (SP_PARM != 0 && SP_PARM->_coloron && !SP_PARM->_default_color); + bool fix_pair0 = (SP_PARM != NULL && SP_PARM->_coloron && !SP_PARM->_default_color); #else #define fix_pair0 FALSE #endif @@ -181,6 +181,7 @@ NCURSES_SP_NAME(vid_puts) (NCURSES_SP_DCLx TurnOff(A_ITALIC, exit_italics_mode); } #endif + (void) turn_off; } previous_attr &= ALL_BUT_COLOR; previous_pair = 0; @@ -192,15 +193,15 @@ NCURSES_SP_NAME(vid_puts) (NCURSES_SP_DCLx TPUTS_TRACE("set_attributes"); NCURSES_SP_NAME(tputs) (NCURSES_SP_ARGx TIPARM_9(set_attributes, - (newmode & A_STANDOUT) != 0, - (newmode & A_UNDERLINE) != 0, - (newmode & A_REVERSE) != 0, - (newmode & A_BLINK) != 0, - (newmode & A_DIM) != 0, - (newmode & A_BOLD) != 0, - (newmode & A_INVIS) != 0, - (newmode & A_PROTECT) != 0, - (newmode & A_ALTCHARSET) != 0), + (newmode & A_STANDOUT) != 0, + (newmode & A_UNDERLINE) != 0, + (newmode & A_REVERSE) != 0, + (newmode & A_BLINK) != 0, + (newmode & A_DIM) != 0, + (newmode & A_BOLD) != 0, + (newmode & A_INVIS) != 0, + (newmode & A_PROTECT) != 0, + (newmode & A_ALTCHARSET) != 0), 1, outc); previous_attr &= ALL_BUT_COLOR; previous_pair = 0; @@ -212,6 +213,7 @@ NCURSES_SP_NAME(vid_puts) (NCURSES_SP_DCLx } else if (turn_off & A_ITALIC) { TurnOff(A_ITALIC, exit_italics_mode); } + (void) turn_off; } #endif SetColorsIf((color_pair != 0) || fix_pair0, previous_attr, previous_pair); diff --git a/ncurses/widechar/lib_vline_set.c b/ncurses/widechar/lib_vline_set.c index f7bb5819..e7af3bfe 100644 --- a/ncurses/widechar/lib_vline_set.c +++ b/ncurses/widechar/lib_vline_set.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020 Thomas E. Dickey * + * Copyright 2020,2024 Thomas E. Dickey * * Copyright 2002-2010,2016 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -40,7 +40,7 @@ #include -MODULE_ID("$Id: lib_vline_set.c,v 1.6 2020/02/02 23:34:34 tom Exp $") +MODULE_ID("$Id: lib_vline_set.c,v 1.7 2024/12/07 20:08:15 tom Exp $") NCURSES_EXPORT(int) wvline_set(WINDOW *win, const cchar_t *ch, int n) @@ -58,7 +58,7 @@ wvline_set(WINDOW *win, const cchar_t *ch, int n) if (end > win->_maxy) end = win->_maxy; - if (ch == 0) + if (ch == NULL) wch = *WACS_VLINE; else wch = *ch; diff --git a/ncurses/widechar/lib_wacs.c b/ncurses/widechar/lib_wacs.c index 5b6f6da2..d88279af 100644 --- a/ncurses/widechar/lib_wacs.c +++ b/ncurses/widechar/lib_wacs.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018,2020 Thomas E. Dickey * + * Copyright 2018-2020,2024 Thomas E. Dickey * * Copyright 2002-2015,2016 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -33,9 +33,9 @@ #include -MODULE_ID("$Id: lib_wacs.c,v 1.20 2020/02/02 23:34:34 tom Exp $") +MODULE_ID("$Id: lib_wacs.c,v 1.21 2024/12/07 20:08:32 tom Exp $") -NCURSES_EXPORT_VAR(cchar_t) * _nc_wacs = 0; +NCURSES_EXPORT_VAR(cchar_t) * _nc_wacs = NULL; NCURSES_EXPORT(void) _nc_init_wacs(void) @@ -119,7 +119,7 @@ _nc_init_wacs(void) T(("initializing WIDE-ACS map (Unicode is%s active)", active ? "" : " not")); - if ((_nc_wacs = typeCalloc(cchar_t, ACS_LEN)) != 0) { + if ((_nc_wacs = typeCalloc(cchar_t, ACS_LEN)) != NULL) { unsigned n; for (n = 0; n < SIZEOF(table); ++n) { diff --git a/ncurses/widechar/lib_wunctrl.c b/ncurses/widechar/lib_wunctrl.c index 155da229..259b68aa 100644 --- a/ncurses/widechar/lib_wunctrl.c +++ b/ncurses/widechar/lib_wunctrl.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020 Thomas E. Dickey * + * Copyright 2020,2024 Thomas E. Dickey * * Copyright 2001-2011,2012 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -36,17 +36,18 @@ #include -MODULE_ID("$Id: lib_wunctrl.c,v 1.17 2020/02/02 23:34:34 tom Exp $") +MODULE_ID("$Id: lib_wunctrl.c,v 1.19 2024/12/07 18:03:14 tom Exp $") NCURSES_EXPORT(wchar_t *) NCURSES_SP_NAME(wunctrl) (NCURSES_SP_DCLx cchar_t *wc) { - static wchar_t str[CCHARW_MAX + 1], *wsp; + static wchar_t str[CCHARW_MAX + 1]; wchar_t *result; - if (wc == 0) { - result = 0; - } else if (SP_PARM != 0 && Charable(*wc)) { + if (wc == NULL) { + result = NULL; + } else if (SP_PARM != NULL && Charable(*wc)) { + wchar_t *wsp; const char *p = NCURSES_SP_NAME(unctrl) (NCURSES_SP_ARGx (unsigned) _nc_to_char((wint_t)CharOf(*wc))); diff --git a/ncurses/widechar/widechars.c b/ncurses/widechar/widechars.c index d05ba98a..6ea008dd 100644 --- a/ncurses/widechar/widechars.c +++ b/ncurses/widechar/widechars.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018,2020 Thomas E. Dickey * + * Copyright 2018-2024,2025 Thomas E. Dickey * * Copyright 2012,2013 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -31,9 +31,9 @@ #if USE_WIDEC_SUPPORT -MODULE_ID("$Id: widechars.c,v 1.9 2020/08/29 16:22:03 juergen Exp $") +MODULE_ID("$Id: widechars.c,v 1.11 2025/02/20 01:02:09 tom Exp $") -#if (defined(_NC_WINDOWS)) && !defined(_NC_MSC) +#if defined(_NC_MINGW) /* * MinGW has wide-character functions, but they do not work correctly. */ @@ -45,7 +45,7 @@ _nc_mbtowc(wchar_t *pwc, const char *s, size_t n) int count; int try; - if (s != 0 && n != 0) { + if (s != NULL && n != 0) { /* * MultiByteToWideChar() can decide to return more than one * wide-character. We want only one. Ignore any trailing null, both @@ -96,7 +96,7 @@ _nc_mblen(const char *s, size_t n) int count; wchar_t temp; - if (s != 0 && n != 0) { + if (s != NULL && n != 0) { count = _nc_mbtowc(&temp, s, n); if (count == 1) { int check = WideCharToMultiByte(CP_UTF8, @@ -148,6 +148,6 @@ _nc_wctomb(char *s, wchar_t wc) return result; } -#endif /* _NC_WINDOWS */ +#endif /* _NC_MINGW */ #endif /* USE_WIDEC_SUPPORT */ diff --git a/ncurses/win32con/wcwidth.c b/ncurses/win32con/wcwidth.c index 55843662..1a540182 100644 --- a/ncurses/win32con/wcwidth.c +++ b/ncurses/win32con/wcwidth.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020 Thomas E. Dickey * + * Copyright 2020,2024 Thomas E. Dickey * * Copyright 2010 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -28,7 +28,7 @@ ****************************************************************************/ #include -MODULE_ID("$Id: wcwidth.c,v 1.4 2020/07/11 21:02:10 tom Exp $") +MODULE_ID("$Id: wcwidth.c,v 1.5 2024/05/04 18:31:39 tom Exp $") #if USE_WIDEC_SUPPORT #define mk_wcwidth(ucs) _nc_wcwidth(ucs) @@ -36,10 +36,11 @@ MODULE_ID("$Id: wcwidth.c,v 1.4 2020/07/11 21:02:10 tom Exp $") #define mk_wcwidth_cjk(ucs) _nc_wcwidth_cjk(ucs) #define mk_wcswidth_cjk(pwcs, n) _nc_wcswidth_cjk(pwcs, n) -NCURSES_EXPORT(int) mk_wcwidth(wchar_t); -NCURSES_EXPORT(int) mk_wcswidth(const wchar_t *, size_t); -NCURSES_EXPORT(int) mk_wcwidth_cjk(wchar_t); -NCURSES_EXPORT(int) mk_wcswidth_cjk(const wchar_t *, size_t); +NCURSES_EXPORT(void) mk_wcwidth_init(int); +NCURSES_EXPORT(int) mk_wcwidth(uint32_t); +NCURSES_EXPORT(int) mk_wcswidth(const uint32_t *, size_t); +NCURSES_EXPORT(int) mk_wcwidth_cjk(uint32_t); +NCURSES_EXPORT(int) mk_wcswidth_cjk(const uint32_t *, size_t); #include #else diff --git a/ncurses/win32con/win32_driver.c b/ncurses/win32con/win32_driver.c index 45aadf2f..9a62856e 100644 --- a/ncurses/win32con/win32_driver.c +++ b/ncurses/win32con/win32_driver.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018,2020 Thomas E. Dickey * + * Copyright 2018-2023,2025 Thomas E. Dickey * * Copyright 2008-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -48,18 +48,18 @@ #define CUR TerminalType(my_term). -MODULE_ID("$Id: win32_driver.c,v 1.2 2020/11/21 23:35:56 tom Exp $") +MODULE_ID("$Id: win32_driver.c,v 1.7 2025/03/01 14:26:14 tom Exp $") #define WINMAGIC NCDRV_MAGIC(NCDRV_WINCONSOLE) #define EXP_OPTIMIZE 0 static bool console_initialized = FALSE; -#define AssertTCB() assert(TCB != 0 && (TCB->magic == WINMAGIC)) +#define AssertTCB() assert(TCB != NULL && (TCB->magic == WINMAGIC)) #define validateConsoleHandle() (AssertTCB() , console_initialized ||\ (console_initialized=\ _nc_console_checkinit(TRUE,FALSE))) -#define SetSP() assert(TCB->csp != 0); sp = TCB->csp; (void) sp +#define SetSP() assert(TCB->csp != NULL); sp = TCB->csp; (void) sp #define AdjustY() (WINCONSOLE.buffered ?\ 0 : (int) WINCONSOLE.SBI.srWindow.Top) #define RevAttr(attr) (WORD) (((attr) & 0xff00) | \ @@ -171,7 +171,7 @@ con_write16(TERMINAL_CONTROL_BLOCK * TCB, int y, int x, cchar_t *str, int limit) { int actual = 0; - CHAR_INFO *ci = TypeAlloca(CHAR_INFO, limit); + MakeArray(ci, CHAR_INFO, limit); COORD loc, siz; SMALL_RECT rec; int i; @@ -220,7 +220,7 @@ con_write16(TERMINAL_CONTROL_BLOCK * TCB, static BOOL con_write8(TERMINAL_CONTROL_BLOCK * TCB, int y, int x, chtype *str, int n) { - CHAR_INFO *ci = TypeAlloca(CHAR_INFO, n); + MakeArray(ci, CHAR_INFO, n); COORD loc, siz; SMALL_RECT rec; int i; @@ -393,7 +393,7 @@ wcon_doupdate(TERMINAL_CONTROL_BLOCK * TCB) Width = screen_columns(sp); Height = screen_lines(sp); - nonempty = min(Height, NewScreen(sp)->_maxy + 1); + nonempty = Min(Height, NewScreen(sp)->_maxy + 1); T(("... %dx%d clear cur:%d new:%d", Height, Width, @@ -415,16 +415,16 @@ wcon_doupdate(TERMINAL_CONTROL_BLOCK * TCB) if ((CurScreen(sp)->_clear || NewScreen(sp)->_clear)) { int x; #if USE_WIDEC_SUPPORT - cchar_t *empty = TypeAlloca(cchar_t, Width); + MakeArray(empty, cchar_t, Width); wchar_t blank[2] = { L' ', L'\0' }; for (x = 0; x < Width; x++) - setcchar(&empty[x], blank, 0, 0, 0); + setcchar(&empty[x], blank, 0, 0, NULL); #else - chtype *empty = TypeAlloca(chtype, Width); + MakeArray(empty, chtype, Width); for (x = 0; x < Width; x++) empty[x] = ' '; @@ -530,11 +530,11 @@ wcon_CanHandle(TERMINAL_CONTROL_BLOCK * TCB, T((T_CALLED("win32con::wcon_CanHandle(%p)"), TCB)); - assert((TCB != 0) && (tname != 0)); + assert((TCB != NULL) && (tname != NULL)); TCB->magic = WINMAGIC; - if (tname == 0 || *tname == 0) { + if (tname == NULL || *tname == 0) { if (!_nc_console_vt_supported()) code = TRUE; } else if (tname != 0 && *tname == '#') { @@ -551,7 +551,7 @@ wcon_CanHandle(TERMINAL_CONTROL_BLOCK * TCB, || (strncmp(tname + 1, "win32con", n) == 0))) { code = TRUE; } - } else if (tname != 0 && stricmp(tname, "unknown") == 0) { + } else if (tname != NULL && stricmp(tname, "unknown") == 0) { code = TRUE; } @@ -589,8 +589,8 @@ wcon_dobeepflash(TERMINAL_CONTROL_BLOCK * TCB, int max_cells = (high * wide); int i; - CHAR_INFO *this_screen = TypeAlloca(CHAR_INFO, max_cells); - CHAR_INFO *that_screen = TypeAlloca(CHAR_INFO, max_cells); + MakeArray(this_screen, CHAR_INFO, max_cells); + MakeArray(that_screen, CHAR_INFO, max_cells); COORD this_size; SMALL_RECT this_region; COORD bufferCoord; @@ -924,11 +924,14 @@ wcon_initmouse(TERMINAL_CONTROL_BLOCK * TCB) { SCREEN *sp; + T((T_CALLED("win32con::wcon_initmouse(%p)"), TCB)); + if (validateConsoleHandle()) { SetSP(); sp->_mouse_type = M_TERM_DRIVER; } + returnVoid; } static int @@ -939,6 +942,7 @@ wcon_testmouse(TERMINAL_CONTROL_BLOCK * TCB, int rc = 0; SCREEN *sp; + T((T_CALLED("win32con::wcon_testmouse(%p)"), TCB)); if (validateConsoleHandle()) { SetSP(); @@ -953,7 +957,7 @@ wcon_testmouse(TERMINAL_CONTROL_BLOCK * TCB, } } - return rc; + returnCode(rc); } static int @@ -1055,7 +1059,7 @@ wcon_initacs(TERMINAL_CONTROL_BLOCK * TCB, for (n = 0; n < SIZEOF(table); ++n) { real_map[table[n].acs_code] = (chtype) table[n].use_code | A_ALTCHARSET; - if (sp != 0) + if (sp != NULL) sp->_screen_acs_map[table[n].acs_code] = TRUE; } } diff --git a/ncurses/win32con/win_driver.c b/ncurses/win32con/win_driver.c index 9822f125..98714ef1 100644 --- a/ncurses/win32con/win_driver.c +++ b/ncurses/win32con/win_driver.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2021,2023 Thomas E. Dickey * + * Copyright 2018-2024,2025 Thomas E. Dickey * * Copyright 2008-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -55,9 +55,9 @@ #define CUR TerminalType(my_term). -MODULE_ID("$Id: win_driver.c,v 1.70 2023/02/12 00:31:33 tom Exp $") +#define CONTROL_PRESSED (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED) -#define TypeAlloca(type,count) (type*) _alloca(sizeof(type) * (size_t) (count)) +MODULE_ID("$Id: win_driver.c,v 1.81 2025/03/01 17:17:46 tom Exp $") #define WINMAGIC NCDRV_MAGIC(NCDRV_WINCONSOLE) @@ -68,8 +68,8 @@ MODULE_ID("$Id: win_driver.c,v 1.70 2023/02/12 00:31:33 tom Exp $") static bool InitConsole(void); static bool okConsoleHandle(TERMINAL_CONTROL_BLOCK *); -#define AssertTCB() assert(TCB != 0 && (TCB->magic == WINMAGIC)) -#define SetSP() assert(TCB->csp != 0); sp = TCB->csp; (void) sp +#define AssertTCB() assert(TCB != NULL && (TCB->magic == WINMAGIC)) +#define SetSP() assert(TCB->csp != NULL); sp = TCB->csp; (void) sp #define GenMap(vKey,key) MAKELONG(key, vKey) @@ -82,33 +82,36 @@ static bool okConsoleHandle(TERMINAL_CONTROL_BLOCK *); #define write_screen WriteConsoleOutput #define read_screen ReadConsoleOutput #endif - +/* *INDENT-OFF* */ static const LONG keylist[] = { - GenMap(VK_PRIOR, KEY_PPAGE), - GenMap(VK_NEXT, KEY_NPAGE), - GenMap(VK_END, KEY_END), - GenMap(VK_HOME, KEY_HOME), - GenMap(VK_LEFT, KEY_LEFT), - GenMap(VK_UP, KEY_UP), - GenMap(VK_RIGHT, KEY_RIGHT), - GenMap(VK_DOWN, KEY_DOWN), + GenMap(VK_PRIOR, KEY_PPAGE), + GenMap(VK_NEXT, KEY_NPAGE), + GenMap(VK_END, KEY_END), + GenMap(VK_HOME, KEY_HOME), + GenMap(VK_LEFT, KEY_LEFT), + GenMap(VK_UP, KEY_UP), + GenMap(VK_RIGHT, KEY_RIGHT), + GenMap(VK_DOWN, KEY_DOWN), GenMap(VK_DELETE, KEY_DC), - GenMap(VK_INSERT, KEY_IC) + GenMap(VK_INSERT, KEY_IC), + GenMap(VK_TAB, KEY_BTAB) }; static const LONG ansi_keys[] = { - GenMap(VK_PRIOR, 'I'), - GenMap(VK_NEXT, 'Q'), - GenMap(VK_END, 'O'), - GenMap(VK_HOME, 'H'), - GenMap(VK_LEFT, 'K'), - GenMap(VK_UP, 'H'), - GenMap(VK_RIGHT, 'M'), - GenMap(VK_DOWN, 'P'), + GenMap(VK_PRIOR, 'I'), + GenMap(VK_NEXT, 'Q'), + GenMap(VK_END, 'O'), + GenMap(VK_HOME, 'H'), + GenMap(VK_LEFT, 'K'), + GenMap(VK_UP, 'H'), + GenMap(VK_RIGHT, 'M'), + GenMap(VK_DOWN, 'P'), GenMap(VK_DELETE, 'S'), - GenMap(VK_INSERT, 'R') + GenMap(VK_INSERT, 'R'), + GenMap(VK_TAB, 'Z') }; +/* *INDENT-ON* */ #define N_INI ((int)array_length(keylist)) #define FKEYS 24 #define MAPSIZE (FKEYS + N_INI) @@ -123,7 +126,6 @@ static struct { BOOL buffered; BOOL window_only; BOOL progMode; - BOOL isMinTTY; BOOL isTermInfoConsole; HANDLE out; HANDLE inp; @@ -260,7 +262,7 @@ static BOOL con_write16(TERMINAL_CONTROL_BLOCK * TCB, int y, int x, cchar_t *str, int limit) { int actual = 0; - CHAR_INFO *ci = TypeAlloca(CHAR_INFO, limit); + MakeArray(ci, CHAR_INFO, limit); COORD loc, siz; SMALL_RECT rec; int i; @@ -309,7 +311,7 @@ con_write16(TERMINAL_CONTROL_BLOCK * TCB, int y, int x, cchar_t *str, int limit) static BOOL con_write8(TERMINAL_CONTROL_BLOCK * TCB, int y, int x, chtype *str, int n) { - CHAR_INFO *ci = TypeAlloca(CHAR_INFO, n); + MakeArray(ci, CHAR_INFO, n); COORD loc, siz; SMALL_RECT rec; int i; @@ -486,7 +488,7 @@ wcon_doupdate(TERMINAL_CONTROL_BLOCK * TCB) Width = screen_columns(sp); Height = screen_lines(sp); - nonempty = min(Height, NewScreen(sp)->_maxy + 1); + nonempty = Min(Height, NewScreen(sp)->_maxy + 1); T(("... %dx%d clear cur:%d new:%d", Height, Width, @@ -508,16 +510,16 @@ wcon_doupdate(TERMINAL_CONTROL_BLOCK * TCB) if ((CurScreen(sp)->_clear || NewScreen(sp)->_clear)) { int x; #if USE_WIDEC_SUPPORT - cchar_t *empty = TypeAlloca(cchar_t, Width); + MakeArray(empty, cchar_t, Width); wchar_t blank[2] = { L' ', L'\0' }; for (x = 0; x < Width; x++) - setcchar(&empty[x], blank, 0, 0, 0); + setcchar(&empty[x], blank, 0, 0, NULL); #else - chtype *empty = TypeAlloca(chtype, Width); + MakeArray(empty, chtype, Width); for (x = 0; x < Width; x++) empty[x] = ' '; @@ -610,6 +612,12 @@ wcon_doupdate(TERMINAL_CONTROL_BLOCK * TCB) returnCode(result); } +#ifdef __MINGW32__ +#define SysISATTY(fd) _isatty(fd) +#else +#define SysISATTY(fd) isatty(fd) +#endif + static bool wcon_CanHandle(TERMINAL_CONTROL_BLOCK * TCB, const char *tname, @@ -619,13 +627,13 @@ wcon_CanHandle(TERMINAL_CONTROL_BLOCK * TCB, T((T_CALLED("win32con::wcon_CanHandle(%p)"), TCB)); - assert((TCB != 0) && (tname != 0)); + assert((TCB != NULL) && (tname != NULL)); TCB->magic = WINMAGIC; - if (tname == 0 || *tname == 0) + if (tname == NULL || *tname == 0) code = TRUE; - else if (tname != 0 && *tname == '#') { + else if (tname != NULL && *tname == '#') { /* * Use "#" (a character which cannot begin a terminal's name) to * select specific driver from the table. @@ -639,7 +647,9 @@ wcon_CanHandle(TERMINAL_CONTROL_BLOCK * TCB, || (strncmp(tname + 1, "win32con", n) == 0))) { code = TRUE; } - } else if (tname != 0 && stricmp(tname, "unknown") == 0) { + } else if (tname != NULL && stricmp(tname, "unknown") == 0) { + code = TRUE; + } else if (SysISATTY(TCB->term.Filedes)) { code = TRUE; } @@ -673,8 +683,8 @@ wcon_dobeepflash(TERMINAL_CONTROL_BLOCK * TCB, int max_cells = (high * wide); int i; - CHAR_INFO *this_screen = TypeAlloca(CHAR_INFO, max_cells); - CHAR_INFO *that_screen = TypeAlloca(CHAR_INFO, max_cells); + MakeArray(this_screen, CHAR_INFO, max_cells); + MakeArray(that_screen, CHAR_INFO, max_cells); COORD this_size; SMALL_RECT this_region; COORD bufferCoord; @@ -1161,7 +1171,7 @@ read_screen_data(void) want = (size_t) (CON.save_size.X * CON.save_size.Y); - if ((CON.save_screen = malloc(want * sizeof(CHAR_INFO))) != 0) { + if ((CON.save_screen = malloc(want * sizeof(CHAR_INFO))) != NULL) { bufferCoord.X = (SHORT) (CON.window_only ? CON.SBI.srWindow.Left : 0); bufferCoord.Y = (SHORT) (CON.window_only ? CON.SBI.srWindow.Top : 0); @@ -1437,7 +1447,7 @@ wcon_initacs(TERMINAL_CONTROL_BLOCK * TCB, for (n = 0; n < SIZEOF(table); ++n) { real_map[table[n].acs_code] = (chtype) table[n].use_code | A_ALTCHARSET; - if (sp != 0) + if (sp != NULL) sp->_screen_acs_map[table[n].acs_code] = TRUE; } } @@ -1476,10 +1486,10 @@ Adjust(int milliseconds, int diff) FROM_LEFT_4TH_BUTTON_PRESSED | \ RIGHTMOST_BUTTON_PRESSED) -static int +static mmask_t decode_mouse(SCREEN *sp, int mask) { - int result = 0; + mmask_t result = 0; (void) sp; assert(sp && console_initialized); @@ -1668,14 +1678,14 @@ handle_mouse(SCREEN *sp, MOUSE_EVENT_RECORD mer) if (sp->_drv_mouse_new_buttons) { - work.bstate |= (mmask_t) decode_mouse(sp, sp->_drv_mouse_new_buttons); + work.bstate |= decode_mouse(sp, sp->_drv_mouse_new_buttons); } else { /* cf: BUTTON_PRESSED, BUTTON_RELEASED */ - work.bstate |= (mmask_t) (decode_mouse(sp, - sp->_drv_mouse_old_buttons) - >> 1); + work.bstate |= (decode_mouse(sp, + sp->_drv_mouse_old_buttons) + >> 1); result = TRUE; } @@ -1952,16 +1962,11 @@ IsConsoleHandle(HANDLE hdl) a test for mintty. This is called from the NC_ISATTY macro defined in curses.priv.h */ -int +NCURSES_EXPORT(int) _nc_mingw_isatty(int fd) { int result = 0; -#ifdef __MING32__ -#define SysISATTY(fd) _isatty(fd) -#else -#define SysISATTY(fd) isatty(fd) -#endif if (SysISATTY(fd)) { result = 1; } else { @@ -1978,7 +1983,7 @@ _nc_mingw_isatty(int fd) with the terminal escape sequences that are sent by terminfo. */ -int +NCURSES_EXPORT(int) _nc_mingw_isconsole(int fd) { HANDLE hdl = get_handle(fd); @@ -1993,9 +1998,9 @@ _nc_mingw_isconsole(int fd) #define TC_PROLOGUE(fd) \ SCREEN *sp; \ - TERMINAL *term = 0; \ + TERMINAL *term = NULL; \ int code = ERR; \ - if (_nc_screen_chain == 0) \ + if (_nc_screen_chain == NULL) \ return 0; \ for (each_screen(sp)) { \ if (sp->_term && (sp->_term->Filedes == fd)) { \ @@ -2003,9 +2008,9 @@ _nc_mingw_isconsole(int fd) break; \ } \ } \ - assert(term != 0) + assert(term != NULL) -int +NCURSES_EXPORT(int) _nc_mingw_tcsetattr( int fd, int optional_action GCC_UNUSED, @@ -2044,7 +2049,7 @@ _nc_mingw_tcsetattr( return code; } -int +NCURSES_EXPORT(int) _nc_mingw_tcgetattr(int fd, struct termios *arg) { TC_PROLOGUE(fd); @@ -2056,23 +2061,22 @@ _nc_mingw_tcgetattr(int fd, struct termios *arg) return code; } -int +NCURSES_EXPORT(int) _nc_mingw_tcflush(int fd, int queue) { - TC_PROLOGUE(fd); - (void) term; + int code = ERR; if (_nc_mingw_isconsole(fd)) { if (queue == TCIFLUSH) { - BOOL b = FlushConsoleInputBuffer(GetStdHandle(STD_INPUT_HANDLE)); - if (!b) - return (int) GetLastError(); + code = (FlushConsoleInputBuffer(GetStdHandle(STD_INPUT_HANDLE)) + ? OK + : (int) GetLastError()); } } return code; } -int +NCURSES_EXPORT(int) _nc_mingw_testmouse( SCREEN *sp, HANDLE fd, @@ -2096,7 +2100,7 @@ _nc_mingw_testmouse( return rc; } -int +NCURSES_EXPORT(int) _nc_mingw_console_read( SCREEN *sp, HANDLE fd, @@ -2126,9 +2130,9 @@ _nc_mingw_console_read( *buf = (int) inp_rec.Event.KeyEvent.uChar.AsciiChar; vk = inp_rec.Event.KeyEvent.wVirtualKeyCode; /* - * There are 24 virtual function-keys, and typically - * 12 function-keys on a keyboard. Use the shift-modifier - * to provide the remaining 12 keys. + * There are 24 virtual function-keys (defined in winuser.h), + * and typically 12 function-keys on a keyboard. Use the + * shift-modifier to provide the remaining keys. */ if (vk >= VK_F1 && vk <= VK_F12) { if (inp_rec.Event.KeyEvent.dwControlKeyState & SHIFT_PRESSED) { @@ -2145,6 +2149,16 @@ _nc_mingw_console_read( ungetch('\0'); *buf = AnsiKey(vk); } + } else if (vk == VK_BACK) { + if (!(inp_rec.Event.KeyEvent.dwControlKeyState + & (SHIFT_PRESSED | CONTROL_PRESSED))) { + *buf = KEY_BACKSPACE; + } + } else if (vk == VK_TAB) { + if ((inp_rec.Event.KeyEvent.dwControlKeyState + & (SHIFT_PRESSED | CONTROL_PRESSED))) { + *buf = KEY_BTAB; + } } break; } else if (inp_rec.EventType == MOUSE_EVENT) { @@ -2172,9 +2186,6 @@ InitConsole(void) BOOL b; START_TRACE(); - if (_nc_mingw_isatty(0)) { - CON.isMinTTY = TRUE; - } for (i = 0; i < (N_INI + FKEYS); i++) { if (i < N_INI) { @@ -2256,7 +2267,7 @@ InitConsole(void) static bool okConsoleHandle(TERMINAL_CONTROL_BLOCK * TCB) { - return ((TCB != 0) && + return ((TCB != NULL) && (TCB->magic == WINMAGIC) && InitConsole()); } diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog index 858f4c86..b77f699b 100644 --- a/package/debian-mingw/changelog +++ b/package/debian-mingw/changelog @@ -1,8 +1,8 @@ -ncurses6 (6.4+20230311) unstable; urgency=low +ncurses6td (6.5+20250301) unstable; urgency=low * latest weekly patch - -- Thomas E. Dickey Sun, 05 Mar 2023 13:16:04 -0500 + -- Thomas E. Dickey Sat, 22 Feb 2025 20:08:08 -0500 ncurses6 (5.9+20131005) unstable; urgency=low diff --git a/package/debian-mingw/control b/package/debian-mingw/control index 6fb213fd..e442255c 100644 --- a/package/debian-mingw/control +++ b/package/debian-mingw/control @@ -1,4 +1,4 @@ -Source: ncurses6 +Source: ncurses6td Section: libdevel Priority: optional Maintainer: Thomas E. Dickey @@ -9,8 +9,11 @@ Build-Depends: debhelper (>= 7), binutils-mingw-w64-i686 Standards-Version: 4.6.1.0 -Package: mingw32-ncurses6 +Package: mingw32-ncurses6td Architecture: any +Conflicts: mingw32-ncurses6 +Provides: mingw32-ncurses6 +Replaces: mingw32-ncurses6 Depends: ${misc:Depends} Description: shared libraries for terminal handling The ncurses library routines are a terminal-independent method of diff --git a/package/debian-mingw/copyright b/package/debian-mingw/copyright index 3abe75f8..bd7ea56a 100644 --- a/package/debian-mingw/copyright +++ b/package/debian-mingw/copyright @@ -5,12 +5,12 @@ Current ncurses maintainer: Thomas Dickey ------------------------------------------------------------------------------- Files: * -Copyright: 2017-2022,2023 by Thomas E. Dickey +Copyright: 2017-2024,2025 by Thomas E. Dickey Copyright: 1998-2016,2017 Free Software Foundation, Inc. License: X11 Files: aclocal.m4 package -Copyright: 1996-2022,2023 by Thomas E. Dickey +Copyright: 1996-2024,2025 by Thomas E. Dickey License: X11 Files: doc/html/NCURSES-Programming-HOWTO.html diff --git a/package/debian-mingw/mingw32-ncurses6td.lintian-overrides b/package/debian-mingw/mingw32-ncurses6td.lintian-overrides new file mode 100644 index 00000000..8dea2a95 --- /dev/null +++ b/package/debian-mingw/mingw32-ncurses6td.lintian-overrides @@ -0,0 +1,7 @@ +mingw32-ncurses6td: latest-debian-changelog-entry-changed-to-native + +mingw32-ncurses6td: non-standard-dir-in-usr +mingw32-ncurses6td: file-in-unusual-dir + +mingw32-ncurses6td: binary-without-manpage +mingw32-ncurses6td: executable-not-elf-or-script diff --git a/package/debian-mingw/rules b/package/debian-mingw/rules index e5365f9b..aada7641 100755 --- a/package/debian-mingw/rules +++ b/package/debian-mingw/rules @@ -21,7 +21,7 @@ CC_STRICT = $(CC_NORMAL) -W -Wbad-function-cast -Wcast-align -Wcast-qual -Wmissi TARGET = i686-w64-mingw32 MINGW_BIN = /usr/bin MINGW_TOP = /usr/$(TARGET) -MINGW_TMP = $(CURDIR)/debian/mingw32-ncurses$(MY_ABI) +MINGW_TMP = $(CURDIR)/debian/mingw32-ncurses$(MY_ABI)td CFLAGS = $(CC_NORMAL) @@ -49,7 +49,7 @@ CONFIG_OPTIONS = \ --with-abi-version=$(MY_ABI) \ --with-cxx-shared \ --with-develop \ - --with-fallbacks=unknown,rxvt \ + --with-fallbacks=unknown,ms-terminal,xterm-256color \ --with-tic-path=/usr/bin/tic$(MY_ABI) \ --with-infocmp-path=/usr/bin/infocmp$(MY_ABI) \ --with-shared \ @@ -83,7 +83,8 @@ configure-stamp: --target=$(TARGET) \ --prefix=$(MINGW_TOP) \ --with-build-cc=$(BUILD_CC) \ - --with-pc-suffix=$(MY_ABI) \ + --with-config-suffix=td \ + --with-pc-suffix=$(MY_ABI)td \ --with-pkg-config-libdir=/usr/$(TARGET)/lib/pkgconfig \ $(CONFIG_OPTIONS) diff --git a/package/debian-mingw/watch b/package/debian-mingw/watch index f6b3987e..11c22c5a 100644 --- a/package/debian-mingw/watch +++ b/package/debian-mingw/watch @@ -1,4 +1,4 @@ version=3 -opts=passive ftp://ftp.invisible-island.net/ncurses/current/ncurses\.tar.gz \ +opts=passive https://invisible-island.net/archives/ncurses/current/ncurses\.tar.gz \ debian uupdate diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog index 858f4c86..b77f699b 100644 --- a/package/debian-mingw64/changelog +++ b/package/debian-mingw64/changelog @@ -1,8 +1,8 @@ -ncurses6 (6.4+20230311) unstable; urgency=low +ncurses6td (6.5+20250301) unstable; urgency=low * latest weekly patch - -- Thomas E. Dickey Sun, 05 Mar 2023 13:16:04 -0500 + -- Thomas E. Dickey Sat, 22 Feb 2025 20:08:08 -0500 ncurses6 (5.9+20131005) unstable; urgency=low diff --git a/package/debian-mingw64/control b/package/debian-mingw64/control index 74e8136a..7094a176 100644 --- a/package/debian-mingw64/control +++ b/package/debian-mingw64/control @@ -1,4 +1,4 @@ -Source: ncurses6 +Source: ncurses6td Section: libdevel Priority: optional Maintainer: Thomas E. Dickey @@ -9,8 +9,11 @@ Build-Depends: debhelper (>= 7), binutils-mingw-w64-x86-64 Standards-Version: 4.6.1.0 -Package: mingw64-ncurses6 +Package: mingw64-ncurses6td Architecture: any +Conflicts: mingw64-ncurses6 +Provides: mingw64-ncurses6 +Replaces: mingw64-ncurses6 Depends: ${misc:Depends} Description: shared libraries for terminal handling The ncurses library routines are a terminal-independent method of diff --git a/package/debian-mingw64/copyright b/package/debian-mingw64/copyright index 3abe75f8..bd7ea56a 100644 --- a/package/debian-mingw64/copyright +++ b/package/debian-mingw64/copyright @@ -5,12 +5,12 @@ Current ncurses maintainer: Thomas Dickey ------------------------------------------------------------------------------- Files: * -Copyright: 2017-2022,2023 by Thomas E. Dickey +Copyright: 2017-2024,2025 by Thomas E. Dickey Copyright: 1998-2016,2017 Free Software Foundation, Inc. License: X11 Files: aclocal.m4 package -Copyright: 1996-2022,2023 by Thomas E. Dickey +Copyright: 1996-2024,2025 by Thomas E. Dickey License: X11 Files: doc/html/NCURSES-Programming-HOWTO.html diff --git a/package/debian-mingw64/mingw64-ncurses6td.lintian-overrides b/package/debian-mingw64/mingw64-ncurses6td.lintian-overrides new file mode 100644 index 00000000..f475ec0f --- /dev/null +++ b/package/debian-mingw64/mingw64-ncurses6td.lintian-overrides @@ -0,0 +1,7 @@ +mingw64-ncurses6td: latest-debian-changelog-entry-changed-to-native + +mingw64-ncurses6td: non-standard-dir-in-usr +mingw64-ncurses6td: file-in-unusual-dir + +mingw64-ncurses6td: binary-without-manpage +mingw64-ncurses6td: executable-not-elf-or-script diff --git a/package/debian-mingw64/rules b/package/debian-mingw64/rules index d0c4ed8e..29c80b41 100755 --- a/package/debian-mingw64/rules +++ b/package/debian-mingw64/rules @@ -21,7 +21,7 @@ CC_STRICT = $(CC_NORMAL) -W -Wbad-function-cast -Wcast-align -Wcast-qual -Wmissi TARGET = x86_64-w64-mingw32 MINGW_BIN = /usr/bin MINGW_TOP = /usr/$(TARGET) -MINGW_TMP = $(CURDIR)/debian/mingw64-ncurses$(MY_ABI) +MINGW_TMP = $(CURDIR)/debian/mingw64-ncurses$(MY_ABI)td CFLAGS = $(CC_NORMAL) @@ -49,7 +49,7 @@ CONFIG_OPTIONS = \ --with-abi-version=$(MY_ABI) \ --with-cxx-shared \ --with-develop \ - --with-fallbacks=unknown,rxvt \ + --with-fallbacks=unknown,ms-terminal,xterm-256color \ --with-tic-path=/usr/bin/tic$(MY_ABI) \ --with-infocmp-path=/usr/bin/infocmp$(MY_ABI) \ --with-shared \ @@ -83,7 +83,8 @@ configure-stamp: --target=$(TARGET) \ --prefix=$(MINGW_TOP) \ --with-build-cc=$(BUILD_CC) \ - --with-pc-suffix=$(MY_ABI) \ + --with-config-suffix=td \ + --with-pc-suffix=$(MY_ABI)td \ --with-pkg-config-libdir=/usr/$(TARGET)/lib/pkgconfig \ $(CONFIG_OPTIONS) diff --git a/package/debian-mingw64/watch b/package/debian-mingw64/watch index f6b3987e..11c22c5a 100644 --- a/package/debian-mingw64/watch +++ b/package/debian-mingw64/watch @@ -1,4 +1,4 @@ version=3 -opts=passive ftp://ftp.invisible-island.net/ncurses/current/ncurses\.tar.gz \ +opts=passive https://invisible-island.net/archives/ncurses/current/ncurses\.tar.gz \ debian uupdate diff --git a/package/debian/changelog b/package/debian/changelog index a38471b0..cea3300c 100644 --- a/package/debian/changelog +++ b/package/debian/changelog @@ -1,8 +1,8 @@ -ncurses6 (6.4+20230311) unstable; urgency=low +ncurses6td (6.5+20250301) unstable; urgency=low * latest weekly patch - -- Thomas E. Dickey Sun, 05 Mar 2023 13:16:04 -0500 + -- Thomas E. Dickey Sat, 22 Feb 2025 20:08:08 -0500 ncurses6 (5.9+20120608) unstable; urgency=low diff --git a/package/debian/control b/package/debian/control index 35921910..3b99ac17 100644 --- a/package/debian/control +++ b/package/debian/control @@ -1,4 +1,4 @@ -Source: ncurses6 +Source: ncurses6td Section: libdevel Priority: optional Maintainer: Thomas E. Dickey @@ -6,8 +6,11 @@ Homepage: https://invisible-island.net/ncurses/ Build-Depends: debhelper (>= 8.1.3) Standards-Version: 4.6.1.0 -Package: ncurses6 +Package: ncurses6td Architecture: any +Conflicts: ncurses6 (>= 6.5) +Provides: ncurses6 (= 6.5) +Replaces: ncurses6 (>= 6.5) Depends: ${misc:Depends}, libc6 (>= 2.4) Description: shared libraries for terminal handling The ncurses library routines are a terminal-independent method of @@ -15,8 +18,11 @@ Description: shared libraries for terminal handling . This package is used for testing ABI 6. -Package: ncursest6 +Package: ncursest6td Architecture: any +Conflicts: ncursest6 (>= 6.5) +Provides: ncursest6 (= 6.5) +Replaces: ncursest6 (>= 6.5) Depends: ${misc:Depends}, libc6 (>= 2.4) Description: shared libraries for terminal handling The ncurses library routines are a terminal-independent method of @@ -24,9 +30,12 @@ Description: shared libraries for terminal handling . This package is used for testing ABI 6 with pthreads. -Package: ncurses6-doc +Package: ncurses6td-doc Section: doc Architecture: all +Conflicts: ncurses6-doc +Provides: ncurses6-doc +Replaces: ncurses6-doc Depends: groff-base Description: shared libraries for terminal handling The ncurses library routines are a terminal-independent method of @@ -34,9 +43,12 @@ Description: shared libraries for terminal handling . This package is used for testing ncurses6 document packaging. -Package: ncurses6-doc-html +Package: ncurses6td-doc-html Section: doc Architecture: all +Conflicts: ncurses6-doc-html +Provides: ncurses6-doc-html +Replaces: ncurses6-doc-html Description: shared libraries for terminal handling The ncurses library routines are a terminal-independent method of updating character screens with reasonable optimization. diff --git a/package/debian/copyright b/package/debian/copyright index 3abe75f8..bd7ea56a 100644 --- a/package/debian/copyright +++ b/package/debian/copyright @@ -5,12 +5,12 @@ Current ncurses maintainer: Thomas Dickey ------------------------------------------------------------------------------- Files: * -Copyright: 2017-2022,2023 by Thomas E. Dickey +Copyright: 2017-2024,2025 by Thomas E. Dickey Copyright: 1998-2016,2017 Free Software Foundation, Inc. License: X11 Files: aclocal.m4 package -Copyright: 1996-2022,2023 by Thomas E. Dickey +Copyright: 1996-2024,2025 by Thomas E. Dickey License: X11 Files: doc/html/NCURSES-Programming-HOWTO.html diff --git a/package/debian/ncurses6.lintian-overrides b/package/debian/ncurses6.lintian-overrides index 2ce22e4f..20f1159e 100644 --- a/package/debian/ncurses6.lintian-overrides +++ b/package/debian/ncurses6.lintian-overrides @@ -1,17 +1,9 @@ # This is intentional. ncurses6: package-name-doesnt-match-sonames libformw6-6 libmenuw6-6 libncurses++w6-6 libncursesw6-6 libpanelw6-6 libticw6-6 libtinfow6-6 -# This worked around a bug in Debian's build-scripts. -#ncurses6: latest-debian-changelog-entry-changed-to-native - -ncurses6: hardening-no-fortify-functions usr/lib/libncurses++w6.so.6.1 -#ncurses6: hardening-no-fortify-functions usr/lib/libformw6.so.6.1 -ncurses6: hardening-no-fortify-functions usr/lib/libmenuw6.so.6.1 - # This is intentional. ncurses6: binary-without-manpage ncurses6: non-dev-pkg-with-shlib-symlink -ncurses6: embedded-library ncurses usr/lib/libtinfow6.so.6.1 -#ncurses6: postinst-must-call-ldconfig usr/lib/libtinfow6.so.6.1 +ncurses6: embedded-library ncurses [usr/lib/x86_64-linux-gnu/libtinfow6.so.6.5] # vile: confmode diff --git a/package/debian/ncurses6td.lintian-overrides b/package/debian/ncurses6td.lintian-overrides new file mode 100644 index 00000000..dd49fcde --- /dev/null +++ b/package/debian/ncurses6td.lintian-overrides @@ -0,0 +1,9 @@ +# This is intentional. +ncurses6td: package-name-doesnt-match-sonames libformw6-6 libmenuw6-6 libncurses++w6-6 libncursesw6-6 libpanelw6-6 libticw6-6 libtinfow6-6 + +# This is intentional. +ncurses6td: binary-without-manpage +ncurses6td: non-dev-pkg-with-shlib-symlink +ncurses6td: embedded-library ncurses [usr/lib/x86_64-linux-gnu/libtinfow6.so.6.5] + +# vile: confmode diff --git a/package/debian/ncurses6td.triggers b/package/debian/ncurses6td.triggers new file mode 100644 index 00000000..dd866036 --- /dev/null +++ b/package/debian/ncurses6td.triggers @@ -0,0 +1 @@ +activate-noawait ldconfig diff --git a/package/debian/ncursest6.lintian-overrides b/package/debian/ncursest6.lintian-overrides index b3ecaa83..c40acbbf 100644 --- a/package/debian/ncursest6.lintian-overrides +++ b/package/debian/ncursest6.lintian-overrides @@ -1,17 +1,9 @@ # This is intentional. ncursest6: package-name-doesnt-match-sonames libformtw6-6 libmenutw6-6 libncurses++tw6-6 libncursestw6-6 libpaneltw6-6 libtictw6-6 libtinfotw6-6 -# This worked around a bug in Debian's build-scripts. -#ncursest6: latest-debian-changelog-entry-changed-to-native - -ncursest6: hardening-no-fortify-functions usr/lib/libncurses++tw6.so.6.1 -#ncursest6: hardening-no-fortify-functions usr/lib/libformtw6.so.6.1 -ncursest6: hardening-no-fortify-functions usr/lib/libmenutw6.so.6.1 - # This is intentional. ncursest6: binary-without-manpage ncursest6: non-dev-pkg-with-shlib-symlink -ncursest6: embedded-library ncurses usr/lib/libtinfotw6.so.6.1 -#ncursest6: postinst-must-call-ldconfig usr/lib/libtinfotw6.so.6.1 +ncursest6: embedded-library ncurses [usr/lib/x86_64-linux-gnu/libtinfotw6.so.6.5] # vile: confmode diff --git a/package/debian/ncursest6td.lintian-overrides b/package/debian/ncursest6td.lintian-overrides new file mode 100644 index 00000000..0a5eccc1 --- /dev/null +++ b/package/debian/ncursest6td.lintian-overrides @@ -0,0 +1,9 @@ +# This is intentional. +ncursest6td: package-name-doesnt-match-sonames libformtw6-6 libmenutw6-6 libncurses++tw6-6 libncursestw6-6 libpaneltw6-6 libtictw6-6 libtinfotw6-6 + +# This is intentional. +ncursest6td: binary-without-manpage +ncursest6td: non-dev-pkg-with-shlib-symlink +ncursest6td: embedded-library ncurses [usr/lib/x86_64-linux-gnu/libtinfotw6.so.6.5] + +# vile: confmode diff --git a/package/debian/ncursest6td.triggers b/package/debian/ncursest6td.triggers new file mode 100644 index 00000000..dd866036 --- /dev/null +++ b/package/debian/ncursest6td.triggers @@ -0,0 +1 @@ +activate-noawait ldconfig diff --git a/package/debian/rules b/package/debian/rules index 8bd2135d..f1f10fe6 100755 --- a/package/debian/rules +++ b/package/debian/rules @@ -1,12 +1,19 @@ #!/usr/bin/make -f -# $Id: rules,v 1.45 2022/10/22 18:35:38 tom Exp $ +# $Id: rules,v 1.57 2024/06/08 17:51:52 tom Exp $ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +SHELL = /bin/bash +DPKG_EXPORT_BUILDFLAGS = 1 + +export DEB_BUILD_MAINT_OPTIONS = hardening=+all + +include /usr/share/dpkg/buildflags.mk + # packages -PACKAGES.indep = ncurses6-doc ncurses6-doc-html -PACKAGES.arch = ncurses6 ncursest6 +PACKAGES.indep = ncurses6td-doc ncurses6td-doc-html +PACKAGES.arch = ncurses6td ncursest6td # These are used for cross-compiling and for saving the configure script # from having to guess our platform (since we know it already) @@ -25,10 +32,7 @@ MYDATA=/usr/local/ncurses/share/terminfo NORMAL_DIR=$(CURDIR)/debian/ncurses$(MY_ABI) THREAD_DIR=$(CURDIR)/debian/ncursest$(MY_ABI) -CFLAGS = $(shell dpkg-buildflags --get CFLAGS) $(CC_NORMAL) -CXXFLAGS = $(shell dpkg-buildflags --get CXXFLAGS) -CPPFLAGS = $(shell dpkg-buildflags --get CPPFLAGS) -LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS) +CFLAGS += $(CC_NORMAL) ifneq ($(MY_DIR),/usr) RPATH_ENV = RPATH_LIST=../lib:$(LIBDIR) @@ -64,7 +68,10 @@ configure = \ --disable-macros \ --disable-overwrite \ --disable-relink \ + --disable-root-access \ + --disable-root-environ \ --disable-termcap \ + --enable-check-size \ --enable-hard-tabs \ --enable-opaque-curses \ --enable-opaque-form \ @@ -79,7 +86,8 @@ configure = \ --program-suffix=$(MY_ABI) \ --verbose \ --with-abi-version=$(MY_ABI) \ - --with-config-suffix=dev \ + --with-config-suffix=td \ + --with-pc-suffix=td \ --with-cxx-shared \ --with-default-terminfo-dir=$(MYDATA) \ --with-develop \ @@ -93,11 +101,12 @@ configure = \ --with-xterm-kbs=DEL \ --without-ada \ --without-debug \ - --without-manpage-aliases \ + --with-manpage-aliases \ + --with-manpage-symlinks \ --without-normal -NCURSES6_DIR = $(CURDIR)/debian/ncurses6 -NCURSEST6_DIR = $(CURDIR)/debian/ncursest6 +NCURSES6_DIR = $(CURDIR)/debian/ncurses6td +NCURSEST6_DIR = $(CURDIR)/debian/ncursest6td .PHONY: all config build install binary clean config-indep config-arch \ build-indep build-arch install-indep install-arch binary-indep \ @@ -110,6 +119,7 @@ build: build-indep build-arch install: install-indep install-arch binary: binary-indep binary-arch clean: + pwd; ls -l dh_testdir dh_testroot dh_clean $(verbose) @@ -125,7 +135,7 @@ install-indep: $(PACKAGES.indep:%=install-%-stamp) install-arch: $(PACKAGES.arch:%=install-%-stamp) # make the doc-package installable by renaming everything to avoid clashing -patch-ncurses6-stamp: +patch-ncurses6td-stamp: dh_testdir sed -i.bak \ -e 's/-config\.1$$/dev-config.1/;t' \ @@ -139,93 +149,96 @@ patch-ncurses6-stamp: diff -u man/man_db.renames.in.bak man/man_db.renames.in || true touch $@ -config-ncurses6-stamp: patch-ncurses6-stamp +config-ncurses6td-stamp: patch-ncurses6td-stamp dh_testdir - rm -rf t/ncurses6 - mkdir -p t/ncurses6 - cd t/ncurses6; $(configure) + rm -rf t/ncurses6td + mkdir -p t/ncurses6td + cd t/ncurses6td; $(configure) touch $@ -config-ncursest6-stamp: patch-ncurses6-stamp +config-ncursest6td-stamp: patch-ncurses6td-stamp dh_testdir - rm -rf t/ncursest6 - mkdir -p t/ncursest6 - cd t/ncursest6; $(configure) \ + rm -rf t/ncursest6td + mkdir -p t/ncursest6td + cd t/ncursest6td; $(configure) \ --enable-interop \ --enable-sp-funcs \ --program-suffix=t$(MY_ABI) \ --with-pthread touch $@ -config-ncurses6-doc-stamp \ -config-ncurses6-doc-html-stamp: config-ncurses6-stamp +config-ncurses6td-doc-stamp \ +config-ncurses6td-doc-html-stamp: config-ncurses6td-stamp touch $@ -build-ncurses6-stamp: config-ncurses6-stamp +build-ncurses6td-stamp: config-ncurses6td-stamp dh_testdir - $(MAKE) -C t/ncurses6 + $(MAKE) -C t/ncurses6td touch $@ -build-ncursest6-stamp: config-ncursest6-stamp +build-ncursest6td-stamp: config-ncursest6td-stamp dh_testdir - $(MAKE) -C t/ncursest6 + $(MAKE) -C t/ncursest6td touch $@ -build-ncurses6-doc-stamp \ -build-ncurses6-doc-html-stamp: build-ncurses6-stamp +build-ncurses6td-doc-stamp \ +build-ncurses6td-doc-html-stamp: build-ncurses6td-stamp touch $@ -install-ncurses6-stamp: build-ncurses6-stamp +install-ncurses6td-stamp: build-ncurses6td-stamp dh_testdir dh_testroot dh_installdirs $(verbose) - dh_prep $(verbose) -pncurses6 + dh_prep $(verbose) -pncurses6td - $(MAKE) -C t/ncurses6 install.libs install.progs DESTDIR=$(NCURSES6_DIR) - $(MAKE) -C t/ncurses6/test ncurses LOCAL_LIBDIR=$(LIBDIR) + $(MAKE) -C t/ncurses6td install.libs install.progs DESTDIR=$(NCURSES6_DIR) + $(MAKE) -C t/ncurses6td/test ncurses LOCAL_LIBDIR=$(LIBDIR) - mv t/ncurses6/test/ncurses $(NCURSES6_DIR)$(BINDIR)/ncurses$(MY_ABI) + mv t/ncurses6td/test/ncurses $(NCURSES6_DIR)$(BINDIR)/ncurses$(MY_ABI) touch $@ -install-ncursest6-stamp: build-ncursest6-stamp +install-ncursest6td-stamp: build-ncursest6td-stamp dh_testdir dh_testroot dh_installdirs $(verbose) - dh_prep $(verbose) -pncursest6 + dh_prep $(verbose) -pncursest6td - $(MAKE) -C t/ncursest6 install.libs install.progs DESTDIR=$(NCURSEST6_DIR) - $(MAKE) -C t/ncursest6/test ncurses LOCAL_LIBDIR=$(LIBDIR) + $(MAKE) -C t/ncursest6td install.libs install.progs DESTDIR=$(NCURSEST6_DIR) + $(MAKE) -C t/ncursest6td/test ncurses LOCAL_LIBDIR=$(LIBDIR) - mv t/ncursest6/test/ncurses $(NCURSEST6_DIR)$(BINDIR)/ncursest$(MY_ABI) + mv t/ncursest6td/test/ncurses $(NCURSEST6_DIR)$(BINDIR)/ncursest$(MY_ABI) touch $@ -install-ncurses6-doc-stamp: build-ncurses6-stamp +install-ncurses6td-doc-stamp: build-ncurses6td-stamp dh_testdir dh_testroot dh_installdirs $(verbose) - dh_prep $(verbose) -pncurses6-doc + dh_prep $(verbose) -pncurses6td-doc - $(MAKE) -C t/ncurses6 install.man DESTDIR=$(NCURSES6_DIR)-doc + $(MAKE) -C t/ncurses6td install.man DESTDIR=$(NCURSES6_DIR)-doc + find $(NCURSES6_DIR)-doc -name 'ncursesw6-config.*' -print -delete cd $(NCURSES6_DIR)-doc/usr/share/man/man1 && ln -sf tset6.1.gz reset6.1.gz touch $@ -HTML_DESTDIR=$(NCURSES6_DIR)-doc-html/usr/share/ncurses6-doc-html -install-ncurses6-doc-html-stamp: build-ncurses6-stamp +HTML_DESTDIR=$(NCURSES6_DIR)-doc-html/usr/share/doc/ncurses6td-doc-html +install-ncurses6td-doc-html-stamp: build-ncurses6td-stamp dh_testdir dh_testroot dh_installdirs $(verbose) - dh_prep $(verbose) -pncurses6-doc-html + dh_prep $(verbose) -pncurses6td-doc-html cd doc/html && find * -type d | sort | xargs -I{} mkdir -p -v $(HTML_DESTDIR)/{} cd doc/html && find * -type f -name '*.html' | sort | xargs -I{} install -m 644 -p -v -T {} $(HTML_DESTDIR)/{} + find $(HTML_DESTDIR) -type d -empty -delete -print + find $(HTML_DESTDIR) -type d -empty -delete -print touch $@ diff --git a/package/debian/watch b/package/debian/watch index f6b3987e..11c22c5a 100644 --- a/package/debian/watch +++ b/package/debian/watch @@ -1,4 +1,4 @@ version=3 -opts=passive ftp://ftp.invisible-island.net/ncurses/current/ncurses\.tar.gz \ +opts=passive https://invisible-island.net/archives/ncurses/current/ncurses\.tar.gz \ debian uupdate diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi index 6b00844d..e22e351d 100644 --- a/package/mingw-ncurses.nsi +++ b/package/mingw-ncurses.nsi @@ -1,4 +1,4 @@ -; $Id: mingw-ncurses.nsi,v 1.569 2023/03/05 18:16:04 tom Exp $ +; $Id: mingw-ncurses.nsi,v 1.692 2025/02/23 01:08:08 tom Exp $ ; TODO add examples ; TODO bump ABI to 6 @@ -8,9 +8,9 @@ !define EXENAME "ncurses.exe" !define VERSION_MAJOR "6" -!define VERSION_MINOR "4" -!define VERSION_YYYY "2023" -!define VERSION_MMDD "0311" +!define VERSION_MINOR "5" +!define VERSION_YYYY "2025" +!define VERSION_MMDD "0301" !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD} !define MY_ABI "5" diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec index 0fdb0614..59e25695 100644 --- a/package/mingw-ncurses.spec +++ b/package/mingw-ncurses.spec @@ -2,8 +2,8 @@ Summary: shared libraries for terminal handling Name: mingw32-ncurses6 -Version: 6.4 -Release: 20230311 +Version: 6.5 +Release: 20250301 License: X11 Group: Development/Libraries URL: https://invisible-island.net/ncurses/ diff --git a/package/ncurses.map b/package/ncurses.map index 7eb1ed1d..68de9c43 100644 --- a/package/ncurses.map +++ b/package/ncurses.map @@ -1,4 +1,4 @@ -# $Id: ncurses.map,v 1.55 2021/10/10 15:22:33 tom Exp $ +# $Id: ncurses.map,v 1.58 2024/04/27 14:33:24 tom Exp $ # script for shared library symbol-versioning using ld # # This file was generated by ncu-mapsyms @@ -1214,6 +1214,20 @@ NCURSES_TINFO_6.2.20211010 { _nc_safe_fopen; _nc_safe_open3; _nc_tiparm; +} NCURSES_TINFO_6.2.20200212; + +NCURSES_TINFO_6.5.20240427 { + global: + is_cbreak; + is_cbreak_sp; + is_echo; + is_echo_sp; + is_nl; + is_nl_sp; + is_raw; + is_raw_sp; + tiparm_s; + tiscan_s; local: _*; -} NCURSES_TINFO_6.2.20200212; +} NCURSES_TINFO_6.2.20211010; diff --git a/package/ncurses.spec b/package/ncurses.spec index aa4ca9dc..53bad22e 100644 --- a/package/ncurses.spec +++ b/package/ncurses.spec @@ -1,7 +1,7 @@ Summary: shared libraries for terminal handling Name: ncurses6 -Version: 6.4 -Release: 20230311 +Version: 6.5 +Release: 20250301 License: X11 Group: Development/Libraries URL: https://invisible-island.net/ncurses/ @@ -69,15 +69,17 @@ This package is used for testing ABI %{MY_ABI}. --disable-leaks \\\ --disable-macros \\\ --disable-overwrite \\\ - %{_test_relink} \\\ + --disable-root-access \\\ + --disable-root-environ \\\ + --disable-rpath \\\ --disable-termcap \\\ + %{_test_relink} \\\ --enable-hard-tabs \\\ --enable-opaque-curses \\\ --enable-opaque-form \\\ --enable-opaque-menu \\\ --enable-opaque-panel \\\ --enable-pc-files \\\ - --disable-rpath \\\ --enable-stdnoreturn \\\ --enable-warnings \\\ --enable-wgetch-events \\\ diff --git a/package/ncurses.sym b/package/ncurses.sym index d2f6fbc1..aaa1621f 100644 --- a/package/ncurses.sym +++ b/package/ncurses.sym @@ -1,4 +1,4 @@ -# $Id: ncurses.sym,v 1.37 2021/08/19 23:50:26 tom Exp $ +# $Id: ncurses.sym,v 1.39 2023/08/12 15:29:01 tom Exp $ # script for shared library symbol-visibility using libtool # # This file was generated by ncu-mapsyms @@ -441,16 +441,24 @@ insstr instr intrflush intrflush_sp +is_cbreak +is_cbreak_sp is_cleared +is_echo +is_echo_sp is_idcok is_idlok is_immedok is_keypad is_leaveok is_linetouched +is_nl +is_nl_sp is_nodelay is_notimeout is_pad +is_raw +is_raw_sp is_scrollok is_subwin is_syncok @@ -782,6 +790,8 @@ tigetstr tigetstr_sp timeout tiparm +tiparm_s +tiscan_s top_panel top_row touchline diff --git a/package/ncursest.map b/package/ncursest.map index 205265de..1dfbe532 100644 --- a/package/ncursest.map +++ b/package/ncursest.map @@ -1,4 +1,4 @@ -# $Id: ncursest.map,v 1.53 2021/10/10 15:22:33 tom Exp $ +# $Id: ncursest.map,v 1.56 2024/04/27 14:33:24 tom Exp $ # script for shared library symbol-versioning using ld # # This file was generated by ncu-mapsyms @@ -493,9 +493,23 @@ NCURSES_TINFO_6.2.20211010 { _nc_safe_fopen; _nc_safe_open3; _nc_tiparm; +} NCURSES_TINFO_6.2.20200212; + +NCURSES_TINFO_6.5.20240427 { + global: + is_cbreak; + is_cbreak_sp; + is_echo; + is_echo_sp; + is_nl; + is_nl_sp; + is_raw; + is_raw_sp; + tiparm_s; + tiscan_s; local: _*; -} NCURSES_TINFO_6.2.20200212; +} NCURSES_TINFO_6.2.20211010; NCURSEST_5.7.20081102 { global: diff --git a/package/ncursest.spec b/package/ncursest.spec index 56c5bf02..492d4612 100644 --- a/package/ncursest.spec +++ b/package/ncursest.spec @@ -1,7 +1,7 @@ Summary: Curses library with POSIX thread support. Name: ncursest6 -Version: 6.4 -Release: 20230311 +Version: 6.5 +Release: 20250301 License: X11 Group: Development/Libraries Source: ncurses-%{version}-%{release}.tgz diff --git a/package/ncursest.sym b/package/ncursest.sym index f50ce3d0..9423d379 100644 --- a/package/ncursest.sym +++ b/package/ncursest.sym @@ -1,4 +1,4 @@ -# $Id: ncursest.sym,v 1.41 2021/08/19 23:50:26 tom Exp $ +# $Id: ncursest.sym,v 1.43 2023/08/12 15:28:50 tom Exp $ # script for shared library symbol-visibility using libtool # # This file was generated by ncu-mapsyms @@ -450,16 +450,24 @@ insstr instr intrflush intrflush_sp +is_cbreak +is_cbreak_sp is_cleared +is_echo +is_echo_sp is_idcok is_idlok is_immedok is_keypad is_leaveok is_linetouched +is_nl +is_nl_sp is_nodelay is_notimeout is_pad +is_raw +is_raw_sp is_scrollok is_subwin is_syncok @@ -781,6 +789,8 @@ tigetstr tigetstr_sp timeout tiparm +tiparm_s +tiscan_s top_panel top_row touchline diff --git a/package/ncursestw.map b/package/ncursestw.map index f514b97f..116957f5 100644 --- a/package/ncursestw.map +++ b/package/ncursestw.map @@ -1,4 +1,4 @@ -# $Id: ncursestw.map,v 1.56 2021/10/10 15:22:33 tom Exp $ +# $Id: ncursestw.map,v 1.59 2024/04/27 14:33:24 tom Exp $ # script for shared library symbol-versioning using ld # # This file was generated by ncu-mapsyms @@ -501,9 +501,23 @@ NCURSES_TINFO_6.2.20211010 { _nc_safe_open3; erasewchar_sp; killwchar_sp; +} NCURSES_TINFO_6.2.20200212; + +NCURSES_TINFO_6.5.20240427 { + global: + is_cbreak; + is_cbreak_sp; + is_echo; + is_echo_sp; + is_nl; + is_nl_sp; + is_raw; + is_raw_sp; + tiparm_s; + tiscan_s; local: _*; -} NCURSES_TINFO_6.2.20200212; +} NCURSES_TINFO_6.2.20211010; NCURSESTW_5.7.20081102 { global: diff --git a/package/ncursestw.sym b/package/ncursestw.sym index 1668f409..b05baecc 100644 --- a/package/ncursestw.sym +++ b/package/ncursestw.sym @@ -1,4 +1,4 @@ -# $Id: ncursestw.sym,v 1.41 2021/08/19 23:50:26 tom Exp $ +# $Id: ncursestw.sym,v 1.43 2023/08/12 15:29:11 tom Exp $ # script for shared library symbol-visibility using libtool # # This file was generated by ncu-mapsyms @@ -486,16 +486,24 @@ instr intrflush intrflush_sp inwstr +is_cbreak +is_cbreak_sp is_cleared +is_echo +is_echo_sp is_idcok is_idlok is_immedok is_keypad is_leaveok is_linetouched +is_nl +is_nl_sp is_nodelay is_notimeout is_pad +is_raw +is_raw_sp is_scrollok is_subwin is_syncok @@ -863,6 +871,8 @@ tigetstr tigetstr_sp timeout tiparm +tiparm_s +tiscan_s top_panel top_row touchline diff --git a/package/ncursesw.map b/package/ncursesw.map index 13e8faf4..55834182 100644 --- a/package/ncursesw.map +++ b/package/ncursesw.map @@ -1,4 +1,4 @@ -# $Id: ncursesw.map,v 1.59 2021/10/10 15:22:33 tom Exp $ +# $Id: ncursesw.map,v 1.62 2024/04/27 14:33:24 tom Exp $ # script for shared library symbol-versioning using ld # # This file was generated by ncu-mapsyms @@ -495,9 +495,23 @@ NCURSES_TINFO_6.2.20211010 { _nc_safe_open3; erasewchar_sp; killwchar_sp; +} NCURSES_TINFO_6.2.20200212; + +NCURSES_TINFO_6.5.20240427 { + global: + is_cbreak; + is_cbreak_sp; + is_echo; + is_echo_sp; + is_nl; + is_nl_sp; + is_raw; + is_raw_sp; + tiparm_s; + tiscan_s; local: _*; -} NCURSES_TINFO_6.2.20200212; +} NCURSES_TINFO_6.2.20211010; NCURSESW_5.1.20000708 { global: diff --git a/package/ncursesw.sym b/package/ncursesw.sym index a17fd794..8ef771f9 100644 --- a/package/ncursesw.sym +++ b/package/ncursesw.sym @@ -1,4 +1,4 @@ -# $Id: ncursesw.sym,v 1.40 2021/08/19 23:50:26 tom Exp $ +# $Id: ncursesw.sym,v 1.42 2023/08/12 15:28:30 tom Exp $ # script for shared library symbol-visibility using libtool # # This file was generated by ncu-mapsyms @@ -474,16 +474,24 @@ instr intrflush intrflush_sp inwstr +is_cbreak +is_cbreak_sp is_cleared +is_echo +is_echo_sp is_idcok is_idlok is_immedok is_keypad is_leaveok is_linetouched +is_nl +is_nl_sp is_nodelay is_notimeout is_pad +is_raw +is_raw_sp is_scrollok is_subwin is_syncok @@ -859,6 +867,8 @@ tigetstr tigetstr_sp timeout tiparm +tiparm_s +tiscan_s top_panel top_row touchline diff --git a/panel/Makefile.in b/panel/Makefile.in index 380f80cf..8516611d 100644 --- a/panel/Makefile.in +++ b/panel/Makefile.in @@ -1,6 +1,6 @@ -# $Id: Makefile.in,v 1.76 2021/07/03 15:45:33 tom Exp $ +# $Id: Makefile.in,v 1.77 2024/08/10 18:19:45 tom Exp $ ############################################################################## -# Copyright 2020,2021 Thomas E. Dickey # +# Copyright 2020-2021,2024 Thomas E. Dickey # # Copyright 1998-2015,2018 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # @@ -63,7 +63,9 @@ datarootdir = @datarootdir@ datadir = @datadir@ includesubdir = @includesubdir@ -INCLUDEDIR = $(DESTDIR)$(includedir)$(includesubdir) +INCLUDEDIR = $(DESTDIR)$(includedir@MERGE_PREFIX@)$(includesubdir) +BINDIR = $(DESTDIR)$(bindir@MERGE_PREFIX@) +LIBDIR = $(DESTDIR)$(libdir@MERGE_PREFIX@) PACKAGE = @PACKAGE@ @@ -155,8 +157,8 @@ install :: $(AUTO_SRC) $(LIBRARIES) sources: $(AUTO_SRC) -$(DESTDIR)$(bindir) \ -$(DESTDIR)$(libdir) : +$(BINDIR) \ +$(LIBDIR) : mkdir -p $@ # make a copy to simplify include-paths while still keeping panel's include diff --git a/panel/p_above.c b/panel/p_above.c index 2a6fde55..7e30f639 100644 --- a/panel/p_above.c +++ b/panel/p_above.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020 Thomas E. Dickey * + * Copyright 2020,2024 Thomas E. Dickey * * Copyright 1998-2010,2012 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -37,11 +37,11 @@ */ #include "panel.priv.h" -MODULE_ID("$Id: p_above.c,v 1.11 2020/05/24 01:40:20 anonymous.maarten Exp $") +MODULE_ID("$Id: p_above.c,v 1.12 2024/12/07 23:05:20 tom Exp $") #if NCURSES_SP_FUNCS PANEL_EXPORT(PANEL *) -ground_panel(SCREEN * sp) +ground_panel(SCREEN *sp) { T((T_CALLED("ground_panel(%p)"), (void *)sp)); if (sp) @@ -51,12 +51,12 @@ ground_panel(SCREEN * sp) if (_nc_bottom_panel) /* this is the pseudo panel */ returnPanel(_nc_bottom_panel->above); else - returnPanel(0); + returnPanel(NULL); } else { - if (0 == CURRENT_SCREEN) - returnPanel(0); + if (NULL == CURRENT_SCREEN) + returnPanel(NULL); else returnPanel(ground_panel(CURRENT_SCREEN)); } @@ -64,7 +64,7 @@ ground_panel(SCREEN * sp) #endif PANEL_EXPORT(PANEL *) -panel_above(const PANEL * pan) +panel_above(const PANEL *pan) { PANEL *result; @@ -78,7 +78,7 @@ panel_above(const PANEL * pan) #else /* if top and bottom are equal, we have no or only the pseudo panel; if not, we return the panel above the pseudo panel */ - result = EMPTY_STACK()? (PANEL *) 0 : _nc_bottom_panel->above; + result = EMPTY_STACK()? (PANEL *)0 : _nc_bottom_panel->above; #endif } returnPanel(result); diff --git a/panel/p_below.c b/panel/p_below.c index 100393d5..75973942 100644 --- a/panel/p_below.c +++ b/panel/p_below.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020 Thomas E. Dickey * + * Copyright 2020,2024 Thomas E. Dickey * * Copyright 1998-2010,2012 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -37,11 +37,11 @@ */ #include "panel.priv.h" -MODULE_ID("$Id: p_below.c,v 1.11 2020/05/24 01:40:20 anonymous.maarten Exp $") +MODULE_ID("$Id: p_below.c,v 1.12 2024/12/07 23:05:20 tom Exp $") #if NCURSES_SP_FUNCS PANEL_EXPORT(PANEL *) -ceiling_panel(SCREEN * sp) +ceiling_panel(SCREEN *sp) { T((T_CALLED("ceiling_panel(%p)"), (void *)sp)); if (sp) @@ -49,12 +49,12 @@ ceiling_panel(SCREEN * sp) struct panelhook *ph = NCURSES_SP_NAME(_nc_panelhook) (sp); /* if top and bottom are equal, we have no or only the pseudo panel */ - returnPanel(EMPTY_STACK()? (PANEL *) 0 : _nc_top_panel); + returnPanel(EMPTY_STACK()? (PANEL *)0 : _nc_top_panel); } else { - if (0 == CURRENT_SCREEN) - returnPanel(0); + if (NULL == CURRENT_SCREEN) + returnPanel(NULL); else returnPanel(ceiling_panel(CURRENT_SCREEN)); } @@ -62,7 +62,7 @@ ceiling_panel(SCREEN * sp) #endif PANEL_EXPORT(PANEL *) -panel_below(const PANEL * pan) +panel_below(const PANEL *pan) { PANEL *result; @@ -71,7 +71,7 @@ panel_below(const PANEL * pan) { GetHook(pan); /* we must not return the pseudo panel */ - result = Is_Pseudo(pan->below) ? (PANEL *) 0 : pan->below; + result = Is_Pseudo(pan->below) ? (PANEL *)0 : pan->below; } else { @@ -79,7 +79,7 @@ panel_below(const PANEL * pan) result = ceiling_panel(CURRENT_SCREEN); #else /* if top and bottom are equal, we have no or only the pseudo panel */ - result = EMPTY_STACK()? (PANEL *) 0 : _nc_top_panel; + result = EMPTY_STACK()? (PANEL *)0 : _nc_top_panel; #endif } returnPanel(result); diff --git a/panel/p_new.c b/panel/p_new.c index cf116403..b5c198bc 100644 --- a/panel/p_new.c +++ b/panel/p_new.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020,2021 Thomas E. Dickey * + * Copyright 2020-2021,2024 Thomas E. Dickey * * Copyright 1998-2009,2010 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -39,7 +39,7 @@ */ #include "panel.priv.h" -MODULE_ID("$Id: p_new.c,v 1.24 2021/10/23 15:12:06 tom Exp $") +MODULE_ID("$Id: p_new.c,v 1.25 2024/12/07 23:00:37 tom Exp $") #ifdef TRACE static char *stdscr_id; @@ -86,7 +86,7 @@ root_panel(NCURSES_SP_DCL0) ph->destroy = del_panel; #endif _nc_stdscr_pseudo_panel = AllocPanel("root_panel"); - if (_nc_stdscr_pseudo_panel != 0) + if (_nc_stdscr_pseudo_panel != NULL) { PANEL *pan = _nc_stdscr_pseudo_panel; WINDOW *win = SP_PARM->_stdscr; diff --git a/panel/panel.c b/panel/panel.c index 1b2d6e83..39730d45 100644 --- a/panel/panel.c +++ b/panel/panel.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020 Thomas E. Dickey * + * Copyright 2020,2024 Thomas E. Dickey * * Copyright 1998-2010,2012 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -37,14 +37,14 @@ /* panel.c -- implementation of panels library, some core routines */ #include "panel.priv.h" -MODULE_ID("$Id: panel.c,v 1.30 2020/09/26 18:05:17 tom Exp $") +MODULE_ID("$Id: panel.c,v 1.31 2024/12/07 23:05:20 tom Exp $") /*+------------------------------------------------------------------------- _nc_retrace_panel (pan) --------------------------------------------------------------------------*/ #ifdef TRACE PANEL_EXPORT(PANEL *) -_nc_retrace_panel(PANEL * pan) +_nc_retrace_panel(PANEL *pan) { T((T_RETURN("%p"), (void *)pan)); return pan; @@ -61,7 +61,7 @@ _nc_my_visbuf(const void *ptr, int n) { char temp[32]; - if (ptr != 0) + if (ptr != NULL) _nc_SPRINTF(temp, _nc_SLIMIT(sizeof(temp)) "%p", ptr); else _nc_STRCPY(temp, "", sizeof(temp)); @@ -75,7 +75,7 @@ _nc_my_visbuf(const void *ptr, int n) --------------------------------------------------------------------------*/ #ifdef TRACE PANEL_EXPORT(void) -_nc_dPanel(const char *text, const PANEL * pan) +_nc_dPanel(const char *text, const PANEL *pan) { _tracef("%s id=%s b=%s a=%s y=%d x=%d", text, USER_PTR(pan->user, 1), @@ -90,7 +90,7 @@ _nc_dPanel(const char *text, const PANEL * pan) --------------------------------------------------------------------------*/ #ifdef TRACE PANEL_EXPORT(void) -_nc_dStack(const char *fmt, int num, const PANEL * pan) +_nc_dStack(const char *fmt, int num, const PANEL *pan) { char s80[80]; @@ -116,7 +116,7 @@ _nc_dStack(const char *fmt, int num, const PANEL * pan) --------------------------------------------------------------------------*/ #ifdef TRACE PANEL_EXPORT(void) -_nc_Wnoutrefresh(const PANEL * pan) +_nc_Wnoutrefresh(const PANEL *pan) { dPanel("wnoutrefresh", pan); wnoutrefresh(pan->win); @@ -128,7 +128,7 @@ _nc_Wnoutrefresh(const PANEL * pan) --------------------------------------------------------------------------*/ #ifdef TRACE PANEL_EXPORT(void) -_nc_Touchpan(const PANEL * pan) +_nc_Touchpan(const PANEL *pan) { dPanel("Touchpan", pan); touchwin(pan->win); @@ -140,7 +140,7 @@ _nc_Touchpan(const PANEL * pan) --------------------------------------------------------------------------*/ #ifdef TRACE PANEL_EXPORT(void) -_nc_Touchline(const PANEL * pan, int start, int count) +_nc_Touchline(const PANEL *pan, int start, int count) { char s80[80]; diff --git a/panel/panel.priv.h b/panel/panel.priv.h index 029a4f33..49eadf98 100644 --- a/panel/panel.priv.h +++ b/panel/panel.priv.h @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020 Thomas E. Dickey * + * Copyright 2020,2024 Thomas E. Dickey * * Copyright 1998-2014,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ -/* $Id: panel.priv.h,v 1.30 2020/09/26 18:05:32 tom Exp $ */ +/* $Id: panel.priv.h,v 1.31 2024/12/07 23:01:42 tom Exp $ */ #ifndef NCURSES_PANEL_PRIV_H #define NCURSES_PANEL_PRIV_H 1 @@ -86,7 +86,7 @@ struct screen; /* forward declaration */ #define GetScreenHook(sp) \ struct panelhook* ph = NCURSES_SP_NAME(_nc_panelhook)(sp) #define GetPanelHook(pan) \ - GetScreenHook(pan ? _nc_screen_of((pan)->win) : 0) + GetScreenHook(pan ? _nc_screen_of((pan)->win) : NULL) #define GetWindowHook(win) \ SCREEN* sp = _nc_screen_of(win); \ GetScreenHook(sp) diff --git a/progs/Makefile.in b/progs/Makefile.in index d818af4e..82c9940a 100644 --- a/progs/Makefile.in +++ b/progs/Makefile.in @@ -1,6 +1,6 @@ -# $Id: Makefile.in,v 1.111 2021/07/03 15:45:33 tom Exp $ +# $Id: Makefile.in,v 1.117 2024/08/24 22:51:58 tom Exp $ ############################################################################## -# Copyright 2020,2021 Thomas E. Dickey # +# Copyright 2020-2021,2024 Thomas E. Dickey # # Copyright 1998-2016,2018 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # @@ -66,7 +66,8 @@ datarootdir = @datarootdir@ datadir = @datadir@ includesubdir = @includesubdir@ -INCLUDEDIR = $(DESTDIR)$(includedir)$(includesubdir) +INCLUDEDIR = $(DESTDIR)$(includedir@MERGE_PREFIX@)$(includesubdir) +BINDIR = $(DESTDIR)$(bindir@MERGE_PREFIX@) PACKAGE = @PACKAGE@ @@ -93,7 +94,8 @@ CPP = @CPP@ CFLAGS = @CFLAGS@ @EXTRA_CFLAGS@ INCDIR = $(top_srcdir)/include -CPPFLAGS = -DHAVE_CONFIG_H -I../progs @CPPFLAGS@ +NCUDIR = $(top_srcdir)/ncurses +CPPFLAGS = -DHAVE_CONFIG_H -DACTUAL_TIC="\"$(actual_tic)\"" -I../progs -I../ncurses -I$(top_srcdir)/ncurses @CPPFLAGS@ CCFLAGS = $(CPPFLAGS) $(CFLAGS) @@ -145,10 +147,24 @@ PROGS = $(PUT_PROGS) $(GET_PROGS) DEPS_CURSES = ../lib/@LIB_PREFIX@ncurses@DFT_DEP_SUFFIX@ HEADER_DEPS = \ - ../include/curses.h \ + $(INCDIR)/nc_access.h \ + $(INCDIR)/nc_alloc.h \ + $(INCDIR)/nc_panel.h \ + $(INCDIR)/nc_string.h \ + $(INCDIR)/nc_termios.h \ + $(INCDIR)/nc_tparm.h \ $(INCDIR)/term_entry.h \ $(INCDIR)/tic.h \ - $(INCDIR)/nc_alloc.h + $(NCUDIR)/curses.priv.h \ + $(NCUDIR)/new_pair.h \ + $(NCUDIR)/term.priv.h \ + $(srcdir)/progs.priv.h \ + ../include/curses.h \ + ../include/ncurses_cfg.h \ + ../include/ncurses_def.h \ + ../include/ncurses_dll.h \ + ../include/term.h \ + ../include/unctrl.h ################################################################################ @@ -215,37 +231,37 @@ transform.h : echo "#define PROG_INIT \"$(define_init)\"" >>$@ echo "#endif /* __TRANSFORM_H */" >>$@ -install.progs: $(AUTO_SRC) $(PROGS) $(DESTDIR)$(bindir) -@MAKE_TERMINFO@ $(LIBTOOL_INSTALL) $(INSTALL_PROG) tic$x $(DESTDIR)$(bindir)/$(actual_tic) -@MAKE_TERMINFO@ $(LIBTOOL_INSTALL) $(INSTALL_PROG) toe$x $(DESTDIR)$(bindir)/$(actual_toe) +install.progs: $(AUTO_SRC) $(PROGS) $(BINDIR) +@MAKE_TERMINFO@ $(LIBTOOL_INSTALL) $(INSTALL_PROG) tic$x $(BINDIR)/$(actual_tic) +@MAKE_TERMINFO@ $(LIBTOOL_INSTALL) $(INSTALL_PROG) toe$x $(BINDIR)/$(actual_toe) @MAKE_TERMINFO@ @echo "linking $(actual_infotocap) to $(actual_tic)" -@MAKE_TERMINFO@ -@rm -f $(DESTDIR)$(bindir)/$(actual_infotocap) -@MAKE_TERMINFO@ ( cd $(DESTDIR)$(bindir) && $(LN_S) $(actual_tic) $(actual_infotocap) ) +@MAKE_TERMINFO@ -@rm -f $(BINDIR)/$(actual_infotocap) +@MAKE_TERMINFO@ ( cd $(BINDIR) && $(LN_S) $(actual_tic) $(actual_infotocap) ) @MAKE_TERMINFO@ @echo "linking $(actual_captoinfo) to $(actual_tic)" -@MAKE_TERMINFO@ -@rm -f $(DESTDIR)$(bindir)/$(actual_captoinfo) -@MAKE_TERMINFO@ ( cd $(DESTDIR)$(bindir) && $(LN_S) $(actual_tic) $(actual_captoinfo) ) - $(LIBTOOL_INSTALL) $(INSTALL_PROG) infocmp$x $(DESTDIR)$(bindir)/$(actual_infocmp) - $(LIBTOOL_INSTALL) $(INSTALL_PROG) clear$x $(DESTDIR)$(bindir)/$(actual_clear) - $(LIBTOOL_INSTALL) $(INSTALL_PROG) tabs$x $(DESTDIR)$(bindir)/$(actual_tabs) - $(LIBTOOL_INSTALL) $(INSTALL_PROG) tput$x $(DESTDIR)$(bindir)/$(actual_tput) - $(LIBTOOL_INSTALL) $(INSTALL_PROG) tset$x $(DESTDIR)$(bindir)/$(actual_tset) +@MAKE_TERMINFO@ -@rm -f $(BINDIR)/$(actual_captoinfo) +@MAKE_TERMINFO@ ( cd $(BINDIR) && $(LN_S) $(actual_tic) $(actual_captoinfo) ) + $(LIBTOOL_INSTALL) $(INSTALL_PROG) infocmp$x $(BINDIR)/$(actual_infocmp) + $(LIBTOOL_INSTALL) $(INSTALL_PROG) clear$x $(BINDIR)/$(actual_clear) + $(LIBTOOL_INSTALL) $(INSTALL_PROG) tabs$x $(BINDIR)/$(actual_tabs) + $(LIBTOOL_INSTALL) $(INSTALL_PROG) tput$x $(BINDIR)/$(actual_tput) + $(LIBTOOL_INSTALL) $(INSTALL_PROG) tset$x $(BINDIR)/$(actual_tset) @echo "linking $(actual_reset) to $(actual_tset)" - -@rm -f $(DESTDIR)$(bindir)/$(actual_reset) - ( cd $(DESTDIR)$(bindir) && $(LN_S) $(actual_tset) $(actual_reset) ) + -@rm -f $(BINDIR)/$(actual_reset) + ( cd $(BINDIR) && $(LN_S) $(actual_tset) $(actual_reset) ) uninstall.progs: -@MAKE_TERMINFO@ -@$(LIBTOOL_CLEAN) rm -f $(DESTDIR)$(bindir)/$(actual_tic) -@MAKE_TERMINFO@ -@$(LIBTOOL_CLEAN) rm -f $(DESTDIR)$(bindir)/$(actual_toe) -@MAKE_TERMINFO@ -@rm -f $(DESTDIR)$(bindir)/$(actual_captoinfo) -@MAKE_TERMINFO@ -@rm -f $(DESTDIR)$(bindir)/$(actual_infotocap) - -@$(LIBTOOL_CLEAN) rm -f $(DESTDIR)$(bindir)/$(actual_infocmp) - -@$(LIBTOOL_CLEAN) rm -f $(DESTDIR)$(bindir)/$(actual_clear) - -@$(LIBTOOL_CLEAN) rm -f $(DESTDIR)$(bindir)/$(actual_tabs) - -@$(LIBTOOL_CLEAN) rm -f $(DESTDIR)$(bindir)/$(actual_tput) - -@$(LIBTOOL_CLEAN) rm -f $(DESTDIR)$(bindir)/$(actual_tset) - -@rm -f $(DESTDIR)$(bindir)/$(actual_reset) - -$(DESTDIR)$(bindir) : +@MAKE_TERMINFO@ -@$(LIBTOOL_CLEAN) rm -f $(BINDIR)/$(actual_tic) +@MAKE_TERMINFO@ -@$(LIBTOOL_CLEAN) rm -f $(BINDIR)/$(actual_toe) +@MAKE_TERMINFO@ -@rm -f $(BINDIR)/$(actual_captoinfo) +@MAKE_TERMINFO@ -@rm -f $(BINDIR)/$(actual_infotocap) + -@$(LIBTOOL_CLEAN) rm -f $(BINDIR)/$(actual_infocmp) + -@$(LIBTOOL_CLEAN) rm -f $(BINDIR)/$(actual_clear) + -@$(LIBTOOL_CLEAN) rm -f $(BINDIR)/$(actual_tabs) + -@$(LIBTOOL_CLEAN) rm -f $(BINDIR)/$(actual_tput) + -@$(LIBTOOL_CLEAN) rm -f $(BINDIR)/$(actual_tset) + -@rm -f $(BINDIR)/$(actual_reset) + +$(BINDIR) : mkdir -p $@ # diff --git a/progs/clear.c b/progs/clear.c index 97cb0f36..e0de8ce4 100644 --- a/progs/clear.c +++ b/progs/clear.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020,2021 Thomas E. Dickey * + * Copyright 2020-2021,2024 Thomas E. Dickey * * Copyright 1998-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -41,7 +41,7 @@ #include #include -MODULE_ID("$Id: clear.c,v 1.24 2021/03/20 18:23:14 tom Exp $") +MODULE_ID("$Id: clear.c,v 1.25 2024/10/19 22:00:53 tom Exp $") const char *_nc_progname = "clear"; @@ -71,7 +71,7 @@ main( TTY tty_settings; int fd; int c; - char *term; + NCURSES_CONST char *term; bool opt_x = FALSE; /* clear scrollback if possible */ _nc_progname = _nc_rootname(argv[0]); diff --git a/progs/clear.sh b/progs/clear.sh old mode 100644 new mode 100755 diff --git a/progs/clear_cmd.c b/progs/clear_cmd.c index 3d80515c..b174d96e 100644 --- a/progs/clear_cmd.c +++ b/progs/clear_cmd.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018,2020 Thomas E. Dickey * + * Copyright 2018,2020,2025 Thomas E. Dickey * * Copyright 2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -38,7 +38,7 @@ #define USE_LIBTINFO #include -MODULE_ID("$Id: clear_cmd.c,v 1.5 2020/02/02 23:34:34 tom Exp $") +MODULE_ID("$Id: clear_cmd.c,v 1.6 2025/01/18 14:51:58 tom Exp $") static int putch(int c) @@ -52,7 +52,7 @@ clear_cmd(bool legacy) int retval = tputs(clear_screen, lines > 0 ? lines : 1, putch); if (!legacy) { /* Clear the scrollback buffer if possible. */ - char *E3 = tigetstr("E3"); + char *E3 = tigetstr(UserCap(E3)); if (E3) (void) tputs(E3, lines > 0 ? lines : 1, putch); } diff --git a/progs/doit b/progs/doit new file mode 100644 index 00000000..81652c4b --- /dev/null +++ b/progs/doit @@ -0,0 +1,11 @@ +#!/bin/sh +cd ../ncurses +make || exit +cd ../progs +make || exit +export TERMINFO=/tmp/FOO +rm -rf $TERMINFO +mkdir -p $TERMINFO +rm -f trace +shlib ./tic -v2 -x /var/mail/long_name.ti +shlib ./infocmp -x xy diff --git a/progs/dump_entry.c b/progs/dump_entry.c index aad715b9..e2206e81 100644 --- a/progs/dump_entry.c +++ b/progs/dump_entry.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2022,2023 Thomas E. Dickey * + * Copyright 2018-2024,2025 Thomas E. Dickey * * Copyright 1998-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -40,7 +40,7 @@ #include /* this C file is generated */ #include /* so is this */ -MODULE_ID("$Id: dump_entry.c,v 1.195 2023/01/21 21:25:21 tom Exp $") +MODULE_ID("$Id: dump_entry.c,v 1.199 2025/02/08 21:53:40 tom Exp $") #define DISCARD(string) string = ABSENT_STRING #define PRINTF (void) printf @@ -121,7 +121,7 @@ strncpy_DYN(DYNBUF * dst, const char *src, size_t need) if (want > dst->size) { dst->size += (want + 1024); /* be generous */ dst->text = typeRealloc(char, dst->size, dst->text); - if (dst->text == 0) + if (dst->text == NULL) failed("strncpy_DYN"); } _nc_STRNCPY(dst->text + dst->used, src, need + 1); @@ -132,7 +132,7 @@ strncpy_DYN(DYNBUF * dst, const char *src, size_t need) static void strcpy_DYN(DYNBUF * dst, const char *src) { - if (src == 0) { + if (src == NULL) { dst->used = 0; strcpy_DYN(dst, ""); } else { @@ -144,9 +144,9 @@ strcpy_DYN(DYNBUF * dst, const char *src) static void free_DYN(DYNBUF * p) { - if (p->text != 0) + if (p->text != NULL) free(p->text); - p->text = 0; + p->text = NULL; p->size = 0; p->used = 0; } @@ -170,7 +170,7 @@ nametrans(const char *name) { const struct name_table_entry *np; - if ((np = _nc_find_entry(name, _nc_get_hash_table(0))) != 0) { + if ((np = _nc_find_entry(name, _nc_get_hash_table(0))) != NULL) { switch (np->nte_type) { case BOOLEAN: NameTrans(bool_from_termcap, boolcodes); @@ -186,7 +186,7 @@ nametrans(const char *name) } } - return (0); + return (NULL); } void @@ -212,7 +212,7 @@ dump_init(const char *version, did_wrap = (width <= 0); /* versions */ - if (version == 0) + if (version == NULL) tversion = V_ALLCAPS; else if (!strcmp(version, "SVr1") || !strcmp(version, "SVR1") || !strcmp(version, "Ultrix")) @@ -458,7 +458,7 @@ op_length(const char *src, int offset) } n++; } - } else if (strchr("pPg", ch) != 0) { + } else if (strchr("pPg", ch) != NULL) { result += 2; } else { result++; /* ordinary operator */ @@ -526,7 +526,7 @@ fill_spaces(const char *src) const char *fill = "\\s"; size_t need = strlen(src); size_t size = strlen(fill); - char *result = 0; + char *result = NULL; int pass; size_t s, d; for (pass = 0; pass < 2; ++pass) { @@ -550,7 +550,7 @@ fill_spaces(const char *src) result[d] = '\0'; } else { result = calloc(need + 1, sizeof(char)); - if (result == 0) + if (result == NULL) failed("fill_spaces"); } } @@ -598,7 +598,7 @@ wrap_concat(const char *src, int need, unsigned mode) if (TcOutput()) trailer = "\\\n\t "; - if (!TcOutput() && (p = strchr(fill, '=')) != 0) { + if (!TcOutput() && (p = strchr(fill, '=')) != NULL) { base = (int) (p + 1 - fill); if (base > 8) base = 8; @@ -612,7 +612,7 @@ wrap_concat(const char *src, int need, unsigned mode) align[base] = '\0'; } /* "pretty" overrides wrapping if it already split the line */ - if (!pretty || strchr(fill, '\n') == 0) { + if (!pretty || strchr(fill, '\n') == NULL) { int tag = 0; if (TcOutput() && outbuf.used && !wrap_1ST(mode)) { @@ -725,7 +725,7 @@ indent_DYN(DYNBUF * buffer, int level) * given leading text. */ static bool -leading_DYN(DYNBUF * buffer, const char *leading) +leading_DYN(const DYNBUF * buffer, const char *leading) { bool result = FALSE; size_t need = strlen(leading); @@ -841,7 +841,7 @@ fmt_complex(TERMTYPE2 *tterm, const char *capability, char *src, int level) strncpy_DYN(&tmpbuf, src++, (size_t) 1); if (src[0] == '%' && src[1] != '\0' - && (strchr("?e;", src[1])) == 0) { + && (strchr("?e;", src[1])) == NULL) { tmpbuf.text[tmpbuf.used++] = '\n'; indent_DYN(&tmpbuf, level); } @@ -926,12 +926,12 @@ fmt_entry(TERMTYPE2 *tterm, len = 12; /* terminfo file-header */ - if (pred == 0) { + if (pred == NULL) { cur_type = tterm; pred = dump_predicate; } - strcpy_DYN(&outbuf, 0); + strcpy_DYN(&outbuf, NULL); if (content_only) { column = indent; /* workaround to prevent empty lines */ } else { @@ -1118,9 +1118,9 @@ fmt_entry(TERMTYPE2 *tterm, : ((*srccap == 'k') ? 0 : has_params(srccap, FALSE))); - char *cv = _nc_infotocap(name, srccap, params); + const char *cv = _nc_infotocap(name, srccap, params); - if (cv == 0) { + if (cv == NULL) { if (outform == F_TCONVERR) { _nc_SPRINTF(buffer, _nc_SLIMIT(sizeof(buffer)) "%s=!!! %s WILL NOT CONVERT !!!", @@ -1129,7 +1129,8 @@ fmt_entry(TERMTYPE2 *tterm, } else if (suppress_untranslatable) { continue; } else { - char *s = srccap, *d = buffer; + const char *s = srccap; + char *d = buffer; int need = 3 + (int) strlen(name); while ((*d = *s++) != 0) { if ((d - buffer + 2) >= (int) sizeof(buffer)) { @@ -1168,7 +1169,7 @@ fmt_entry(TERMTYPE2 *tterm, char *src = _nc_tic_expand(capability, outform == F_TERMINFO, numbers); - strcpy_DYN(&tmpbuf, 0); + strcpy_DYN(&tmpbuf, NULL); strcpy_DYN(&tmpbuf, name); strcpy_DYN(&tmpbuf, "="); if (pretty @@ -1208,9 +1209,10 @@ fmt_entry(TERMTYPE2 *tterm, } else if (tversion == V_AIX) { if (VALID_STRING(acs_chars)) { bool box_ok = TRUE; - const char *acstrans = "lqkxjmwuvtn"; + static const char acstrans[] = "lqkxjmwuvtn"; const char *cp; - char *tp, *sp, boxchars[11]; + const char *sp; + char *tp, boxchars[sizeof(acstrans)]; tp = boxchars; for (cp = acstrans; *cp; cp++) { @@ -1222,7 +1224,7 @@ fmt_entry(TERMTYPE2 *tterm, break; } } - tp[0] = '\0'; + *tp = '\0'; if (box_ok) { char *tmp = _nc_tic_expand(boxchars, @@ -1311,7 +1313,7 @@ fmt_entry(TERMTYPE2 *tterm, } static bool -kill_string(TERMTYPE2 *tterm, char *cap) +kill_string(TERMTYPE2 *tterm, const char *const cap) { unsigned n; for (n = 0; n < NUM_STRINGS(tterm); ++n) { @@ -1324,7 +1326,7 @@ kill_string(TERMTYPE2 *tterm, char *cap) } static char * -find_string(TERMTYPE2 *tterm, char *name) +find_string(TERMTYPE2 *tterm, const char *name) { PredIdx n; for (n = 0; n < NUM_STRINGS(tterm); ++n) { @@ -1352,7 +1354,7 @@ kill_labels(TERMTYPE2 *tterm, int target) char name[20]; for (n = 0; n <= 10; ++n) { - char *cap; + const char *cap; _nc_SPRINTF(name, _nc_SLIMIT(sizeof(name)) "lf%d", n); cap = find_string(tterm, name); @@ -1379,7 +1381,7 @@ kill_fkeys(TERMTYPE2 *tterm, int target) char name[20]; for (n = 60; n >= 0; --n) { - char *cap; + const char *cap; _nc_SPRINTF(name, _nc_SLIMIT(sizeof(name)) "kf%d", n); cap = find_string(tterm, name); @@ -1398,7 +1400,7 @@ kill_fkeys(TERMTYPE2 *tterm, int target) * Check if the given acsc string is a 1-1 mapping, i.e., just-like-vt100. * Also, since this is for termcap, we only care about the line-drawing map. */ -#define isLine(c) (strchr("lmkjtuvwqxn", c) != 0) +#define isLine(c) (strchr("lmkjtuvwqxn", c) != NULL) static bool one_one_mapping(const char *mapping) @@ -1444,7 +1446,7 @@ purged_acs(TERMTYPE2 *tterm) } static void -encode_b64(char *target, char *source, unsigned state, int *saved) +encode_b64(char *target, const char *source, unsigned state, int *saved) { /* RFC-4648 */ static const char data[] = @@ -1509,7 +1511,7 @@ dump_entry(TERMTYPE2 *tterm, } } if (quickdump & 2) { - static char padding[] = + static const char padding[] = {0, 0}; int value = 0; @@ -1693,7 +1695,7 @@ show_entry(void) outbuf.used = (size_t) j; } else if (!infodump && ch == '\\') { outbuf.used = (size_t) j; - } else if (ch == delim && (j == 0 || outbuf.text[j - 1] != '\\')) { + } else if (ch == delim && (outbuf.text[j - 1] != '\\')) { outbuf.used = (size_t) (j + 1); } else { break; @@ -1701,7 +1703,7 @@ show_entry(void) } outbuf.text[outbuf.used] = '\0'; } - if (outbuf.text != 0) { + if (outbuf.text != NULL) { (void) fputs(outbuf.text, stdout); putchar('\n'); } diff --git a/progs/infocmp.c b/progs/infocmp.c index 171d794d..ff8e25d3 100644 --- a/progs/infocmp.c +++ b/progs/infocmp.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020-2021,2022 Thomas E. Dickey * + * Copyright 2020-2023,2024 Thomas E. Dickey * * Copyright 1998-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -43,7 +43,11 @@ #include -MODULE_ID("$Id: infocmp.c,v 1.156 2022/09/24 10:13:06 tom Exp $") +MODULE_ID("$Id: infocmp.c,v 1.171 2024/12/21 17:02:07 tom Exp $") + +#ifndef ACTUAL_TIC +#define ACTUAL_TIC "tic" +#endif #define MAX_STRING 1024 /* maximum formatted string */ @@ -61,6 +65,9 @@ typedef char path[PATH_MAX]; static ENTRY *entries; /* terminfo entries */ static int termcount; /* count of terminal entries */ +static const char usage_string[] = \ +"Usage: %s [options] [-A directory] [-B directory] [termname...]"; + static bool limited = TRUE; /* "-r" option is not set */ static bool quiet = FALSE; static bool literal = FALSE; @@ -125,7 +132,7 @@ failed(const char *s) } static void -canonical_name(char *source, char *target) +canonical_name(const char *source, char *target) /* extract the terminal type's primary name */ { int limit = NAMESIZE; @@ -158,7 +165,7 @@ no_numeric(int value) } static bool -no_string(char *value) +no_string(const char *const value) { bool result = (value == ABSENT_STRING); if (!strcmp(s_absent, s_cancel)) @@ -187,17 +194,26 @@ capcmp(PredIdx idx, const char *s, const char *t) return (_nc_capcmp(s, t)); } +/* + * Predicate function to use for "use=" decompilation. + * + * Return value is used in fmt_entry: + * FAIL show nothing for this capability. + * FALSE show cancel for booleans (a compromise) + * TRUE show capability + * + * The only difference between FALSE/TRUE returns is in the treatment of + * booleans. + */ static int use_predicate(unsigned type, PredIdx idx) -/* predicate function to use for use decompilation */ { + int result = FAIL; ENTRY *ep; switch (type) { case BOOLEAN: { - int is_set = FALSE; - /* * This assumes that multiple use entries are supposed * to contribute the logical or of their boolean capabilities. @@ -209,69 +225,84 @@ use_predicate(unsigned type, PredIdx idx) * unlike numbers and strings, whose cancelled/absent state is * recorded in the terminfo database. */ - for (ep = &entries[1]; ep < entries + termcount; ep++) - if (ep->tterm.Booleans[idx] == TRUE) { - is_set = entries[0].tterm.Booleans[idx]; - break; + if (idx < NUM_BOOLEANS(&(entries[0].tterm))) { + int is_set = FALSE; + + for (ep = &entries[1]; ep < entries + termcount; ep++) { + if (idx < NUM_BOOLEANS(&(ep->tterm)) + && (is_set = ep->tterm.Booleans[idx])) { + break; + } } - if (is_set != entries[0].tterm.Booleans[idx]) - return (!is_set); - else - return (FAIL); + if (is_set != entries[0].tterm.Booleans[idx]) + result = (!is_set); + } } + break; case NUMBER: { - int value = ABSENT_NUMERIC; - /* * We take the semantics of multiple uses to be 'each * capability gets the first non-default value found * in the sequence of use entries'. */ - for (ep = &entries[1]; ep < entries + termcount; ep++) - if (VALID_NUMERIC(ep->tterm.Numbers[idx])) { - value = ep->tterm.Numbers[idx]; - break; - } + if (idx < NUM_NUMBERS(&(entries[0].tterm))) { + int value = ABSENT_NUMERIC; - if (value != entries[0].tterm.Numbers[idx]) - return (value != ABSENT_NUMERIC); - else - return (FAIL); + for (ep = &entries[1]; ep < entries + termcount; ep++) + if (idx < NUM_NUMBERS(&(ep->tterm)) + && VALID_NUMERIC(ep->tterm.Numbers[idx])) { + value = ep->tterm.Numbers[idx]; + break; + } + + if (value != entries[0].tterm.Numbers[idx]) + result = (value != ABSENT_NUMERIC); + } } + break; case STRING: { - char *termstr, *usestr = ABSENT_STRING; - - termstr = entries[0].tterm.Strings[idx]; + const char *termstr = entries[0].tterm.Strings[idx]; + const char *usestr = ABSENT_STRING; /* * We take the semantics of multiple uses to be 'each * capability gets the first non-default value found * in the sequence of use entries'. */ - for (ep = &entries[1]; ep < entries + termcount; ep++) - if (ep->tterm.Strings[idx]) { - usestr = ep->tterm.Strings[idx]; - break; - } + if (idx < NUM_STRINGS(&(entries[0].tterm))) { + for (ep = &entries[1]; ep < entries + termcount; ep++) + if (idx < NUM_STRINGS(&(ep->tterm)) + && ep->tterm.Strings[idx]) { + usestr = ep->tterm.Strings[idx]; + break; + } - if (usestr == ABSENT_STRING && termstr == ABSENT_STRING) - return (FAIL); - else if (!usestr || !termstr || capcmp(idx, usestr, termstr)) - return (TRUE); - else - return (FAIL); + if (usestr == CANCELLED_STRING && termstr == ABSENT_STRING) + result = (FAIL); + else if (usestr == CANCELLED_STRING && termstr == CANCELLED_STRING) + result = (TRUE); + else if (usestr == ABSENT_STRING && termstr == ABSENT_STRING) + result = (FAIL); + else if (!usestr || !termstr || capcmp(idx, usestr, termstr)) + result = (TRUE); + } } + break; + + default: + result = FALSE; + break; } - return (FALSE); /* pacify compiler */ + return (result); } static bool -useeq(ENTRY * e1, ENTRY * e2) +useeq(const ENTRY * e1, const ENTRY * e2) /* are the use references in two entries equivalent? */ { unsigned i, j; @@ -298,7 +329,7 @@ useeq(ENTRY * e1, ENTRY * e2) } static bool -entryeq(TERMTYPE2 *t1, TERMTYPE2 *t2) +entryeq(const TERMTYPE2 *t1, const TERMTYPE2 *t2) /* are two entries equivalent? */ { unsigned i; @@ -321,7 +352,7 @@ entryeq(TERMTYPE2 *t1, TERMTYPE2 *t2) #define TIC_EXPAND(result) _nc_tic_expand(result, outform==F_TERMINFO, numbers) static void -print_uses(ENTRY * ep, FILE *fp) +print_uses(const ENTRY * ep, FILE *fp) /* print an entry's use references */ { if (!ep->nuses) { @@ -373,7 +404,7 @@ dump_numeric(int val, char *buf) } static void -dump_string(char *val, char *buf) +dump_string(const char *val, char *buf) /* display the value of a string capability */ { if (val == ABSENT_STRING) @@ -448,13 +479,13 @@ static void compare_predicate(PredType type, PredIdx idx, const char *name) /* predicate function to use for entry difference reports */ { - ENTRY *e1 = &entries[0]; - ENTRY *e2 = &entries[1]; + const ENTRY *e1 = &entries[0]; + const ENTRY *e2 = &entries[1]; char buf1[MAX_STRING]; char buf2[MAX_STRING]; int b1, b2; int n1, n2; - char *s1, *s2; + const char *s1, *s2; bool found; int extra = 1; @@ -663,7 +694,7 @@ compare_predicate(PredType type, PredIdx idx, const char *name) #define DATAX() DATA("", "") typedef struct { - const char from[4]; + const char from[8]; const char to[12]; } assoc; @@ -781,10 +812,10 @@ same_param(const char *table, const char *param, size_t length) static char * lookup_params(const assoc * table, char *dst, char *src) { - char *result = 0; + char *result = NULL; const char *ep = strtok(src, ";"); - if (ep != 0) { + if (ep != NULL) { const assoc *ap; do { @@ -804,7 +835,7 @@ lookup_params(const assoc * table, char *dst, char *src) _nc_STRCAT(dst, ep, MAX_TERMINFO_LENGTH); _nc_STRCAT(dst, ";", MAX_TERMINFO_LENGTH); } while - ((ep = strtok((char *) 0, ";"))); + ((ep = strtok((char *) 0, ";")) != NULL); dst[strlen(dst) - 1] = '\0'; @@ -830,12 +861,12 @@ analyze_string(const char *name, const char *cap, TERMTYPE2 *tp) int csi; size_t len = 0; size_t next; - const char *expansion = 0; + const char *expansion = NULL; char buf3[MAX_TERMINFO_LENGTH]; /* first, check other capabilities in this entry */ for (i = 0; i < STRCOUNT; i++) { - char *cp = tp->Strings[i]; + const char *cp = tp->Strings[i]; /* don't use function-key capabilities */ if (strnames[i] == NULL) @@ -1021,14 +1052,14 @@ file_comparison(int argc, char *argv[]) FALSE, 0, 65535, itrace, FALSE, FALSE, FALSE); for (n = 0; n < argc && n < MAXCOMPARE; n++) { - if (freopen(argv[n], "r", stdin) == 0) - _nc_err_abort("Can't open %s", argv[n]); + if (freopen(argv[n], "r", stdin) == NULL) + _nc_err_abort("Can't open %s: %s", argv[n], strerror(errno)); #if NO_LEAKS entered[n].head = _nc_head; entered[n].tail = _nc_tail; #endif - _nc_head = _nc_tail = 0; + _nc_head = _nc_tail = NULL; /* parse entries out of the source file */ _nc_set_source(argv[n]); @@ -1156,7 +1187,7 @@ file_comparison(int argc, char *argv[]) names[0] = name1; names[1] = name2; - names[2] = 0; + names[2] = NULL; entries[0] = *qp; entries[1] = *rp; @@ -1192,7 +1223,6 @@ usage(void) #define DATA(s) s "\n" static const char head[] = { - DATA("Usage: infocmp [options] [-A directory] [-B directory] [termname...]") DATA("") DATA("Options:") }; @@ -1247,14 +1277,16 @@ usage(void) const size_t last = SIZEOF(options); const size_t left = (last + 1) / 2; size_t n; + FILE *fp = stderr; - fputs(head, stderr); + fprintf(fp, usage_string, _nc_progname); + fputs(head, fp); for (n = 0; n < left; n++) { size_t m = n + left; if (m < last) - fprintf(stderr, "%-40.40s%s\n", options[n], options[m]); + fprintf(fp, "%-40.40s%s\n", options[n], options[m]); else - fprintf(stderr, "%s\n", options[n]); + fprintf(fp, "%s\n", options[n]); } ExitProgram(EXIT_FAILURE); } @@ -1266,12 +1298,12 @@ any_initializer(const char *fmt, const char *type) static size_t need; char *s; - if (initializer == 0) { + if (initializer == NULL) { need = (strlen(entries->tterm.term_names) + strlen(type) + strlen(fmt)); initializer = (char *) malloc(need + 1); - if (initializer == 0) + if (initializer == NULL) failed("any_initializer"); } @@ -1299,10 +1331,10 @@ string_variable(const char *type) /* dump C initializers for the terminal type */ static void -dump_initializers(TERMTYPE2 *term) +dump_initializers(const TERMTYPE2 *term) { unsigned n; - const char *str = 0; + const char *str = NULL; printf("\nstatic char %s[] = \"%s\";\n\n", name_initializer("alias"), entries->tterm.term_names); @@ -1312,10 +1344,10 @@ dump_initializers(TERMTYPE2 *term) char buf[MAX_STRING], *sp, *tp; tp = buf; -#define TP_LIMIT ((MAX_STRING - 5) - (size_t)(tp - buf)) +#define TP_LIMIT ((MAX_STRING - 6) - (size_t)(tp - buf)) *tp++ = '"'; for (sp = term->Strings[n]; - *sp != 0 && TP_LIMIT > 2; + *sp != 0 && TP_LIMIT > 5; sp++) { if (isascii(UChar(*sp)) && isprint(UChar(*sp)) @@ -1423,7 +1455,7 @@ dump_initializers(TERMTYPE2 *term) /* dump C initializers for the terminal type */ static void -dump_termtype(TERMTYPE2 *term) +dump_termtype(const TERMTYPE2 *term) { (void) printf("\t%s\n\t\t%s,\n", L_CURL, name_initializer("alias")); (void) printf("\t\t(char *)0,\t/* pointer to string table */\n"); @@ -1464,10 +1496,10 @@ dump_termtype(TERMTYPE2 *term) static int optarg_to_number(void) { - char *temp = 0; + char *temp = NULL; long value = strtol(optarg, &temp, 0); - if (temp == 0 || temp == optarg || *temp != 0) { + if (temp == NULL || temp == optarg || *temp != 0) { fprintf(stderr, "Expected a number, not \"%s\"\n", optarg); ExitProgram(EXIT_FAILURE); } @@ -1479,7 +1511,7 @@ terminal_env(void) { char *terminal; - if ((terminal = getenv("TERM")) == 0) { + if ((terminal = getenv("TERM")) == NULL) { (void) fprintf(stderr, "%s: environment variable TERM not set\n", _nc_progname); @@ -1499,7 +1531,7 @@ show_databases(void) const char *path2; _nc_first_db(&state, &offset); - while ((path2 = _nc_next_db(&state, &offset)) != 0) { + while ((path2 = _nc_next_db(&state, &offset)) != NULL) { printf("%s\n", path2); } _nc_last_db(); @@ -1527,8 +1559,8 @@ main(int argc, char *argv[]) { /* Avoid "local data >32k" error with mwcc */ /* Also avoid overflowing smaller stacks on systems like AmigaOS */ - path *tfile = 0; - char **tname = 0; + path *tfile = NULL; + char **tname = NULL; size_t maxterms; char **myargv; @@ -1544,7 +1576,7 @@ main(int argc, char *argv[]) bool wrap_strings = FALSE; /* where is the terminfo database location going to default to? */ - restdir = firstdir = 0; + restdir = firstdir = NULL; #if NCURSES_XNAMES use_extended_names(FALSE); @@ -1555,7 +1587,7 @@ main(int argc, char *argv[]) /* make sure we have enough space to add two terminal entries */ myargv = typeCalloc(char *, (size_t) (argc + 3)); - if (myargv == 0) + if (myargv == NULL) failed("myargv"); memcpy(myargv, argv, (sizeof(char *) * (size_t) argc)); @@ -1639,7 +1671,7 @@ main(int argc, char *argv[]) outform = F_TERMINFO; if (sortmode == S_DEFAULT) sortmode = S_VARIABLE; - tversion = 0; + tversion = NULL; break; case 'i': @@ -1680,7 +1712,7 @@ main(int argc, char *argv[]) break; case 'r': - tversion = 0; + tversion = NULL; break; case 's': @@ -1748,20 +1780,20 @@ main(int argc, char *argv[]) } maxterms = (size_t) (argc + 2 - optind); - if ((tfile = typeMalloc(path, maxterms)) == 0) + if ((tfile = typeMalloc(path, maxterms)) == NULL) failed("tfile"); - if ((tname = typeCalloc(char *, maxterms)) == 0) + if ((tname = typeCalloc(char *, maxterms)) == NULL) failed("tname"); - if ((entries = typeCalloc(ENTRY, maxterms)) == 0) + if ((entries = typeCalloc(ENTRY, maxterms)) == NULL) failed("entries"); #if NO_LEAKS - if ((entered = typeCalloc(ENTERED, maxterms)) == 0) + if ((entered = typeCalloc(ENTERED, maxterms)) == NULL) failed("entered"); #endif - if (tfile == 0 - || tname == 0 - || entries == 0) { + if (tfile == NULL + || tname == NULL + || entries == NULL) { fprintf(stderr, "%s: not enough memory\n", _nc_progname); ExitProgram(EXIT_FAILURE); } @@ -1846,10 +1878,32 @@ main(int argc, char *argv[]) } if (status <= 0) { - (void) fprintf(stderr, - "%s: couldn't open terminfo file %s.\n", - _nc_progname, - tfile[termcount]); + switch (status) { + case TGETENT_NO: + (void) fprintf(stderr, + "%s: error: no match in terminfo" + " database for terminal type" + " \"%s\"\n", + _nc_progname, + tname[termcount]); + break; + case TGETENT_ERR: + /* + * Several database files might be checked; their + * file names are not exposed via this API. The + * best we can do is report how the final one + * attempted failed. Also, tfile[termcount] is + * deeply misleading when a hashed database is used. + */ + (void) fprintf(stderr, + "%s: error: unable to open terminfo" + " database: %s\n", + _nc_progname, + strerror(errno)); + break; + default: + assert(0 == "unhandled _nc_read_entry2 return"); + } MAIN_LEAKS(); ExitProgram(EXIT_FAILURE); } @@ -1858,8 +1912,16 @@ main(int argc, char *argv[]) } #if NCURSES_XNAMES - if (termcount > 1) - _nc_align_termtype(&entries[0].tterm, &entries[1].tterm); + if (termcount > 1) { + /* + * User-defined capabilities in different terminal descriptions + * may have the same name/type but different indices. Line up + * the names to use comparable indices. We may have more than two + * entries to compare when processing the "-u" option. + */ + for (c = 1; c < termcount; ++c) + _nc_align_termtype(&entries[c].tterm, &entries[0].tterm); + } #endif /* dump as C initializer for the terminal type */ @@ -1901,8 +1963,8 @@ main(int argc, char *argv[]) tname[0]); if (!quiet) (void) - printf("#\tReconstructed via infocmp from file: %s\n", - tfile[0]); + printf("#\tReconstructed via %s from file: %s\n", + _nc_progname, tfile[0]); dump_entry(&entries[0].tterm, suppress_untranslatable, limited, @@ -1948,7 +2010,8 @@ main(int argc, char *argv[]) } else if (compare == C_USEALL) { (void) fprintf(stderr, "Sorry, -u doesn't work with -F\n"); } else if (compare == C_DEFAULT) { - (void) fprintf(stderr, "Use `tic -[CI] ' for this.\n"); + (void) fprintf(stderr, + "Use `" ACTUAL_TIC " -[CI] ' for this.\n"); } else if (argc - optind != 2) { (void) fprintf(stderr, "File comparison needs exactly two file arguments.\n"); diff --git a/progs/modules b/progs/modules index 349061ff..c3689794 100644 --- a/progs/modules +++ b/progs/modules @@ -1,7 +1,7 @@ -# $Id: modules,v 1.25 2021/04/18 17:21:03 tom Exp $ +# $Id: modules,v 1.29 2024/06/15 23:34:33 tom Exp $ # Program modules (some are in ncurses lib!) ############################################################################## -# Copyright 2020,2021 Thomas E. Dickey # +# Copyright 2020-2021,2024 Thomas E. Dickey # # Copyright 1998-2014,2016 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # @@ -33,18 +33,18 @@ # @ base -clear progs $(srcdir) $(HEADER_DEPS) tty_settings.h -tic progs $(srcdir) $(HEADER_DEPS) transform.h $(srcdir)/dump_entry.h $(srcdir)/tparm_type.h -toe progs $(srcdir) $(HEADER_DEPS) $(INCDIR)/hashed_db.h -clear_cmd progs $(srcdir) $(HEADER_DEPS) clear_cmd.h -dump_entry progs $(srcdir) $(HEADER_DEPS) $(srcdir)/dump_entry.h ../include/parametrized.h $(INCDIR)/capdefaults.c termsort.h -infocmp progs $(srcdir) $(HEADER_DEPS) $(srcdir)/dump_entry.h -reset_cmd progs $(srcdir) $(HEADER_DEPS) reset_cmd.h tty_settings.h -tabs progs $(srcdir) $(HEADER_DEPS) -tparm_type progs $(srcdir) $(HEADER_DEPS) $(srcdir)/tparm_type.h -tput progs $(srcdir) $(HEADER_DEPS) transform.h $(srcdir)/tparm_type.h reset_cmd.h tty_settings.h -tset progs $(srcdir) $(HEADER_DEPS) transform.h ../include/termcap.h reset_cmd.h tty_settings.h +clear progs $(srcdir) $(HEADER_DEPS) $(srcdir)/clear_cmd.h $(srcdir)/tty_settings.h +tic progs $(srcdir) $(HEADER_DEPS) $(INCDIR)/hashed_db.h $(srcdir)/dump_entry.h $(srcdir)/tparm_type.h ../include/parametrized.h transform.h +toe progs $(srcdir) $(HEADER_DEPS) $(INCDIR)/hashed_db.h +clear_cmd progs $(srcdir) $(HEADER_DEPS) $(srcdir)/clear_cmd.h +dump_entry progs $(srcdir) $(HEADER_DEPS) $(srcdir)/dump_entry.h ../include/capdefaults.c ../include/parametrized.h termsort.h +infocmp progs $(srcdir) $(HEADER_DEPS) $(srcdir)/dump_entry.h +reset_cmd progs $(srcdir) $(HEADER_DEPS) $(srcdir)/reset_cmd.h $(srcdir)/tty_settings.h +tabs progs $(srcdir) $(HEADER_DEPS) $(srcdir)/tty_settings.h +tparm_type progs $(srcdir) $(HEADER_DEPS) $(srcdir)/tparm_type.h +tput progs $(srcdir) $(HEADER_DEPS) $(srcdir)/clear_cmd.h $(srcdir)/reset_cmd.h $(srcdir)/tparm_type.h $(srcdir)/tty_settings.h transform.h +tset progs $(srcdir) $(HEADER_DEPS) ../include/termcap.h $(srcdir)/reset_cmd.h $(srcdir)/tty_settings.h transform.h transform progs $(srcdir) $(HEADER_DEPS) transform.h -tty_settings progs $(srcdir) $(HEADER_DEPS) tty_settings.h +tty_settings progs $(srcdir) $(HEADER_DEPS) $(srcdir)/tty_settings.h # vile:makemode diff --git a/progs/progs.priv.h b/progs/progs.priv.h index 00b98d0c..fea18b8d 100644 --- a/progs/progs.priv.h +++ b/progs/progs.priv.h @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2019-2021,2022 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.59 2022/09/17 18:58:05 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 +#include -#if USE_RCS_IDS -#define MODULE_ID(id) static const char Ident[] = id; -#else -#define MODULE_ID(id) /*nothing */ -#endif - -#include #include -#include -#include - -#if HAVE_UNISTD_H -#include -#endif - -#if HAVE_LIMITS_H -# include -#elif HAVE_SYS_PARAM_H -# include -#endif #if HAVE_DIRENT_H # include @@ -90,21 +71,6 @@ # endif #endif -#if HAVE_INTTYPES_H -# include -#else -# if HAVE_STDINT_H -# include -# endif -#endif - -#include -#include - -#if DECL_ERRNO -extern int errno; -#endif - #if HAVE_GETOPT_H #include #elif !defined(HAVE_GETOPT_HEADER) @@ -115,28 +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 - -#if !(defined(NCURSES_WGETCH_EVENTS) && defined(NEED_KEY_EVENT)) -#undef KEY_EVENT /* reduce compiler-warnings with Visual C++ */ -#endif - -#include -#include #include -#include - -#include -#include -#include #if HAVE_NC_FREEALL #undef ExitProgram @@ -153,69 +98,6 @@ extern int optind; #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 */ -#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 */ -#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. */ @@ -228,10 +110,6 @@ extern int optind; # endif #endif -#define UChar(c) ((unsigned char)(c)) - -#define SIZEOF(v) (sizeof(v)/sizeof(v[0])) - #define VtoTrace(opt) (unsigned) ((opt > 0) ? opt : (opt == 0)) /* @@ -252,12 +130,8 @@ extern int optind; #define use_verbosity(level) do { set_trace_level(level); } while (0) #endif -#define NCURSES_EXT_NUMBERS (NCURSES_EXT_COLORS && HAVE_INIT_EXTENDED_COLOR) - -#if NCURSES_EXT_NUMBERS -#else -#define _nc_free_termtype2(t) _nc_free_termtype(t) -#define _nc_read_entry2(n,f,t) _nc_read_entry(n,f,t) +#ifndef CUR +#define CUR ((TERMTYPE *)(cur_term))-> #endif #endif /* PROGS_PRIV_H */ diff --git a/progs/reset_cmd.c b/progs/reset_cmd.c index 50bfd2cd..d364592c 100644 --- a/progs/reset_cmd.c +++ b/progs/reset_cmd.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2019-2021,2023 Thomas E. Dickey * + * Copyright 2019-2023,2024 Thomas E. Dickey * * Copyright 2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -53,7 +53,7 @@ #include #endif -MODULE_ID("$Id: reset_cmd.c,v 1.29 2023/01/07 21:50:34 tom Exp $") +MODULE_ID("$Id: reset_cmd.c,v 1.38 2024/12/07 22:12:53 tom Exp $") /* * SCO defines TIOCGSIZE and the corresponding struct. Other systems (SunOS, @@ -75,6 +75,9 @@ MODULE_ID("$Id: reset_cmd.c,v 1.29 2023/01/07 21:50:34 tom Exp $") # endif #endif +#define set_flags(target, mask) target |= mask +#define clear_flags(target, mask) target &= ~((unsigned)(mask)) + static FILE *my_file; static bool use_reset = FALSE; /* invoked as reset */ @@ -101,8 +104,8 @@ cat_file(char *file) char buf[BUFSIZ]; bool sent = FALSE; - if (file != 0) { - if ((fp = safe_fopen(file, "r")) == 0) + if (file != NULL) { + if ((fp = safe_fopen(file, "r")) == NULL) failed(file); while ((nr = fread(buf, sizeof(char), sizeof(buf), fp)) != 0) { @@ -188,6 +191,79 @@ out_char(int c) #define reset_char(item, value) \ tty_settings->c_cc[item] = CHK(tty_settings->c_cc[item], value) +/* + * Simplify ifdefs + */ +#ifndef BSDLY +#define BSDLY 0 +#endif +#ifndef CRDLY +#define CRDLY 0 +#endif +#ifndef ECHOCTL +#define ECHOCTL 0 +#endif +#ifndef ECHOKE +#define ECHOKE 0 +#endif +#ifndef ECHOPRT +#define ECHOPRT 0 +#endif +#ifndef FFDLY +#define FFDLY 0 +#endif +#ifndef IMAXBEL +#define IMAXBEL 0 +#endif +#ifndef IUCLC +#define IUCLC 0 +#endif +#ifndef IXANY +#define IXANY 0 +#endif +#ifndef NLDLY +#define NLDLY 0 +#endif +#ifndef OCRNL +#define OCRNL 0 +#endif +#ifndef OFDEL +#define OFDEL 0 +#endif +#ifndef OFILL +#define OFILL 0 +#endif +#ifndef OLCUC +#define OLCUC 0 +#endif +#ifndef ONLCR +#define ONLCR 0 +#endif +#ifndef ONLRET +#define ONLRET 0 +#endif +#ifndef ONOCR +#define ONOCR 0 +#endif +#ifndef OXTABS +#define OXTABS 0 +#endif +#ifndef TAB3 +#define TAB3 0 +#endif +#ifndef TABDLY +#define TABDLY 0 +#endif +#ifndef TOSTOP +#define TOSTOP 0 +#endif +#ifndef VTDLY +#define VTDLY 0 +#endif +#ifndef XCASE +#define XCASE 0 +#endif + /* * Reset the terminal mode bits to a sensible state. Very useful after * a child program dies in raw mode. @@ -195,6 +271,11 @@ out_char(int c) void reset_tty_settings(int fd, TTY * tty_settings, int noset) { + unsigned mask; +#ifdef TIOCMGET + int modem_bits; +#endif + GET_TTY(fd, tty_settings); #ifdef TERMIOS @@ -231,106 +312,65 @@ reset_tty_settings(int fd, TTY * tty_settings, int noset) reset_char(VWERASE, CWERASE); #endif - tty_settings->c_iflag &= ~((unsigned) (IGNBRK - | PARMRK - | INPCK - | ISTRIP - | INLCR - | IGNCR -#ifdef IUCLC - | IUCLC -#endif -#ifdef IXANY - | IXANY -#endif - | IXOFF)); - - tty_settings->c_iflag |= (BRKINT - | IGNPAR - | ICRNL - | IXON -#ifdef IMAXBEL - | IMAXBEL -#endif - ); - - tty_settings->c_oflag &= ~((unsigned) (0 -#ifdef OLCUC - | OLCUC -#endif -#ifdef OCRNL - | OCRNL -#endif -#ifdef ONOCR - | ONOCR -#endif -#ifdef ONLRET - | ONLRET -#endif -#ifdef OFILL - | OFILL -#endif -#ifdef OFDEL - | OFDEL -#endif -#ifdef NLDLY - | NLDLY -#endif -#ifdef CRDLY - | CRDLY -#endif -#ifdef TABDLY - | TABDLY -#endif -#ifdef BSDLY - | BSDLY -#endif -#ifdef VTDLY - | VTDLY -#endif -#ifdef FFDLY - | FFDLY -#endif - )); - - tty_settings->c_oflag |= (OPOST -#ifdef ONLCR - | ONLCR -#endif - ); - - tty_settings->c_cflag &= ~((unsigned) (CSIZE - | CSTOPB - | PARENB - | PARODD - | CLOCAL)); - tty_settings->c_cflag |= (CS8 | CREAD); - tty_settings->c_lflag &= ~((unsigned) (ECHONL - | NOFLSH -#ifdef TOSTOP - | TOSTOP -#endif -#ifdef ECHOPTR - | ECHOPRT -#endif -#ifdef XCASE - | XCASE -#endif - )); - - tty_settings->c_lflag |= (ISIG - | ICANON - | ECHO - | ECHOE - | ECHOK -#ifdef ECHOCTL - | ECHOCTL -#endif -#ifdef ECHOKE - | ECHOKE -#endif - ); -#endif + clear_flags(tty_settings->c_iflag, (IGNBRK + | PARMRK + | INPCK + | ISTRIP + | INLCR + | IGNCR + | IUCLC + | IXANY + | IXOFF)); + + set_flags(tty_settings->c_iflag, (BRKINT + | IGNPAR + | ICRNL + | IXON + | IMAXBEL)); + + clear_flags(tty_settings->c_oflag, (0 + | OLCUC + | OCRNL + | ONOCR + | ONLRET + | OFILL + | OFDEL + | NLDLY + | CRDLY + | TABDLY + | BSDLY + | VTDLY + | FFDLY)); + + set_flags(tty_settings->c_oflag, (OPOST + | ONLCR)); + + mask = (CSIZE | CSTOPB | PARENB | PARODD); +#ifdef TIOCMGET + /* leave clocal alone if this appears to use a modem */ + if (ioctl(fd, TIOCMGET, &modem_bits) == -1) + mask |= CLOCAL; +#else + /* cannot check - use the behavior from tset */ + mask |= CLOCAL; +#endif + clear_flags(tty_settings->c_cflag, mask); + + set_flags(tty_settings->c_cflag, (CS8 | CREAD)); + clear_flags(tty_settings->c_lflag, (ECHONL + | NOFLSH + | TOSTOP + | ECHOPRT + | XCASE)); + + set_flags(tty_settings->c_lflag, (ISIG + | ICANON + | ECHO + | ECHOE + | ECHOK + | ECHOCTL + | ECHOKE)); +#endif /* TERMIOS */ if (!noset) { SET_TTY(fd, tty_settings); @@ -405,29 +445,23 @@ set_conversions(TTY * tty_settings) #if defined(EXP_WIN32_DRIVER) /* FIXME */ #else -#ifdef ONLCR - tty_settings->c_oflag |= ONLCR; -#endif - tty_settings->c_iflag |= ICRNL; - tty_settings->c_lflag |= ECHO; -#ifdef OXTABS - tty_settings->c_oflag |= OXTABS; -#endif /* OXTABS */ + set_flags(tty_settings->c_oflag, ONLCR); + set_flags(tty_settings->c_iflag, ICRNL); + set_flags(tty_settings->c_lflag, ECHO); + set_flags(tty_settings->c_oflag, OXTABS); /* test used to be tgetflag("NL") */ if (VALID_STRING(newline) && newline[0] == '\n' && !newline[1]) { /* Newline, not linefeed. */ -#ifdef ONLCR - tty_settings->c_oflag &= ~((unsigned) ONLCR); -#endif - tty_settings->c_iflag &= ~((unsigned) ICRNL); + clear_flags(tty_settings->c_oflag, ONLCR); + clear_flags(tty_settings->c_iflag, ICRNL); } -#ifdef OXTABS +#if OXTABS /* test used to be tgetflag("pt") */ if (VALID_STRING(set_tab) && VALID_STRING(clear_all_tabs)) - tty_settings->c_oflag &= ~OXTABS; + clear_flags(tty_settings->c_oflag, OXTABS); #endif /* OXTABS */ - tty_settings->c_lflag |= (ECHOE | ECHOK); + set_flags(tty_settings->c_lflag, (ECHOE | ECHOK)); #endif } @@ -493,8 +527,8 @@ send_init_strings(int fd GCC_UNUSED, TTY * old_settings) bool need_flush = FALSE; (void) old_settings; -#ifdef TAB3 - if (old_settings != 0 && +#if TAB3 + if (old_settings != NULL && old_settings->c_oflag & (TAB3 | ONLCR | OCRNL | ONLRET)) { old_settings->c_oflag &= (TAB3 | ONLCR | OCRNL | ONLRET); SET_TTY(fd, old_settings); @@ -505,32 +539,32 @@ send_init_strings(int fd GCC_UNUSED, TTY * old_settings) IGNORE_RC(system(init_prog)); } - need_flush |= sent_string((use_reset && (reset_1string != 0)) + need_flush |= sent_string((use_reset && (reset_1string != NULL)) ? reset_1string : init_1string); - need_flush |= sent_string((use_reset && (reset_2string != 0)) + need_flush |= sent_string((use_reset && (reset_2string != NULL)) ? reset_2string : init_2string); if (VALID_STRING(clear_margins)) { need_flush |= sent_string(clear_margins); - } else + } #if defined(set_lr_margin) - if (VALID_STRING(set_lr_margin)) { + else if (VALID_STRING(set_lr_margin)) { need_flush |= sent_string(TIPARM_2(set_lr_margin, 0, columns - 1)); - } else + } #endif #if defined(set_left_margin_parm) && defined(set_right_margin_parm) - if (VALID_STRING(set_left_margin_parm) - && VALID_STRING(set_right_margin_parm)) { + else if (VALID_STRING(set_left_margin_parm) + && VALID_STRING(set_right_margin_parm)) { need_flush |= sent_string(TIPARM_1(set_left_margin_parm, 0)); need_flush |= sent_string(TIPARM_1(set_right_margin_parm, columns - 1)); - } else + } #endif - if (VALID_STRING(set_left_margin) - && VALID_STRING(set_right_margin)) { + else if (VALID_STRING(set_left_margin) + && VALID_STRING(set_right_margin)) { need_flush |= to_left_margin(); need_flush |= sent_string(set_left_margin); if (VALID_STRING(parm_right_cursor)) { @@ -550,7 +584,7 @@ send_init_strings(int fd GCC_UNUSED, TTY * old_settings) need_flush |= cat_file((use_reset && reset_file) ? reset_file : init_file); - need_flush |= sent_string((use_reset && (reset_3string != 0)) + need_flush |= sent_string((use_reset && (reset_3string != NULL)) ? reset_3string : init_3string); } @@ -595,7 +629,7 @@ show_tty_change(TTY * old_settings, */ } else if (newer == 0177) { (void) fprintf(stderr, "delete.\n"); - } else if ((p = key_backspace) != 0 + } else if ((p = key_backspace) != NULL && newer == (unsigned char) p[0] && p[1] == '\0') { (void) fprintf(stderr, "backspace.\n"); @@ -621,7 +655,7 @@ reset_start(FILE *fp, bool is_reset, bool is_init) void reset_flush(void) { - if (my_file != 0) + if (my_file != NULL) fflush(my_file); } @@ -643,7 +677,7 @@ print_tty_chars(TTY * old_settings, TTY * new_settings) * size was set. */ void -set_window_size(int fd, short *high, short *wide) +set_window_size(int fd, NCURSES_INT2 *high, NCURSES_INT2 *wide) { STRUCT_WINSIZE win; (void) ioctl(fd, IOCTL_GET_WINSIZE, &win); diff --git a/progs/reset_cmd.h b/progs/reset_cmd.h index 91a637c7..43aee28f 100644 --- a/progs/reset_cmd.h +++ b/progs/reset_cmd.h @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020,2021 Thomas E. Dickey * + * Copyright 2020-2021,2024 Thomas E. Dickey * * Copyright 2016 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -32,7 +32,7 @@ ****************************************************************************/ /* - * $Id: reset_cmd.h,v 1.9 2021/10/02 20:58:58 tom Exp $ + * $Id: reset_cmd.h,v 1.11 2024/04/08 17:29:34 tom Exp $ * * Utility functions for resetting terminal. */ @@ -56,7 +56,7 @@ extern void set_control_chars(TTY * /* tty_settings */, int /* erase */, int /* extern void set_conversions(TTY * /* tty_settings */); #if HAVE_SIZECHANGE -extern void set_window_size(int /* fd */, short * /* high */, short * /* wide */); +extern void set_window_size(int /* fd */, NCURSES_INT2 * /* high */, NCURSES_INT2 * /* wide */); #endif extern const char *_nc_progname; diff --git a/progs/tabs.c b/progs/tabs.c index 7378d116..1716e2b4 100644 --- a/progs/tabs.c +++ b/progs/tabs.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020-2021,2022 Thomas E. Dickey * + * Copyright 2020-2023,2024 Thomas E. Dickey * * Copyright 2008-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -39,7 +39,7 @@ #include #include -MODULE_ID("$Id: tabs.c,v 1.51 2022/02/26 22:44:44 tom Exp $") +MODULE_ID("$Id: tabs.c,v 1.56 2024/12/07 22:10:45 tom Exp $") static GCC_NORETURN void usage(void); @@ -78,7 +78,7 @@ ansi_clear_tabs(void) { bool result = FALSE; if (VALID_STRING(clear_all_tabs)) { - char *param = skip_csi(clear_all_tabs); + const char *param = skip_csi(clear_all_tabs); if (!strcmp(param, "3g")) result = TRUE; } @@ -86,7 +86,7 @@ ansi_clear_tabs(void) } static void -do_tabs(int *tab_list) +do_tabs(const int *tab_list) { int last = 1; int stop; @@ -147,7 +147,7 @@ decode_tabs(const char *tab_list, int margin) "%s: tab-stops are not in increasing order: %d %d\n", _nc_progname, value, result[n - 1]); free(result); - result = 0; + result = NULL; break; } ++n; @@ -159,7 +159,7 @@ decode_tabs(const char *tab_list, int margin) } } - if (result != 0) { + if (result != NULL) { /* * If there is only one value, then it is an option such as "-8". */ @@ -183,7 +183,7 @@ decode_tabs(const char *tab_list, int margin) } static void -print_ruler(int *tab_list, const char *new_line) +print_ruler(const int *const tab_list, const char *new_line) { int last = 0; int n; @@ -229,7 +229,7 @@ print_ruler(int *tab_list, const char *new_line) * ruler. */ static void -write_tabs(int *tab_list, const char *new_line) +write_tabs(const int *tab_list, const char *new_line) { int stop; @@ -250,7 +250,7 @@ static char * trimmed_tab_list(const char *source) { char *result = strdup(source); - if (result != 0) { + if (result != NULL) { int j, k, last; for (j = k = last = 0; result[j] != 0; ++j) { @@ -280,7 +280,7 @@ comma_is_needed(const char *source) { bool result = FALSE; - if (source != 0) { + if (source != NULL) { size_t len = strlen(source); if (len != 0) result = (source[len - 1] != ','); @@ -303,7 +303,7 @@ add_to_tab_list(char **append, const char *value) char *result = *append; char *copied = trimmed_tab_list(value); - if (copied != 0 && *copied != '\0') { + if (copied != NULL && *copied != '\0') { const char *comma = ","; size_t need = 1 + strlen(copied); @@ -313,15 +313,15 @@ add_to_tab_list(char **append, const char *value) comma = ""; need += strlen(comma); - if (*append != 0) + if (*append != NULL) need += strlen(*append); result = malloc(need); - if (result == 0) + if (result == NULL) failed("add_to_tab_list"); *result = '\0'; - if (*append != 0) { + if (*append != NULL) { _nc_STRCPY(result, *append, need); free(*append); } @@ -370,7 +370,9 @@ do_set_margin(int margin, bool no_op) } tputs(set_left_margin, 1, putch); } - } else if (VALID_STRING(set_left_margin_parm)) { + } +#if defined(set_left_margin_parm) && defined(set_right_margin_parm) + else if (VALID_STRING(set_left_margin_parm)) { result = TRUE; if (!no_op) { if (VALID_STRING(set_right_margin_parm)) { @@ -379,12 +381,16 @@ do_set_margin(int margin, bool no_op) tputs(TIPARM_2(set_left_margin_parm, margin, max_cols), 1, putch); } } - } else if (VALID_STRING(set_lr_margin)) { + } +#endif +#if defined(set_lr_margin) + else if (VALID_STRING(set_lr_margin)) { result = TRUE; if (!no_op) { tputs(TIPARM_2(set_lr_margin, margin, max_cols), 1, putch); } } +#endif return result; } @@ -396,7 +402,7 @@ legal_tab_list(const char *tab_list) { bool result = TRUE; - if (tab_list != 0 && *tab_list != '\0') { + if (tab_list != NULL && *tab_list != '\0') { if (comma_is_needed(tab_list)) { int n; @@ -427,7 +433,7 @@ skip_list(char *value) while (*value != '\0' && (isdigit(UChar(*value)) || isspace(UChar(*value)) || - strchr("+,", UChar(*value)) != 0)) { + strchr("+,", UChar(*value)) != NULL)) { ++value; } return value; @@ -439,7 +445,6 @@ usage(void) #define DATA(s) s "\n" static const char msg[] = { - DATA("Usage: tabs [options] [tabstop-list]") DATA("") DATA("Options:") DATA(" -0 reset tabs") @@ -462,9 +467,11 @@ usage(void) DATA("or 1,+10,+10 which is the same.") }; #undef DATA + FILE *fp = stderr; fflush(stdout); - fputs(msg, stderr); + fprintf(fp, "Usage: %s [options] [tabstop-list]\n", _nc_progname); + fputs(msg, fp); ExitProgram(EXIT_FAILURE); } @@ -476,9 +483,9 @@ main(int argc, char *argv[]) bool no_op = FALSE; bool change_tty = FALSE; int n, ch; - NCURSES_CONST char *term_name = 0; - char *append = 0; - const char *tab_list = 0; + NCURSES_CONST char *term_name = NULL; + char *append = NULL; + const char *tab_list = NULL; const char *new_line = "\n"; int margin = -1; TTY tty_settings; @@ -486,7 +493,7 @@ main(int argc, char *argv[]) _nc_progname = _nc_rootname(argv[0]); - if ((term_name = getenv("TERM")) == 0) + if ((term_name = getenv("TERM")) == NULL) term_name = "ansi+tabs"; /* cannot use getopt, since some options are two-character */ @@ -610,11 +617,11 @@ main(int argc, char *argv[]) } break; default: - if (append != 0) { + if (append != NULL) { if (tab_list != (const char *) append) { /* one of the predefined options was used */ free(append); - append = 0; + append = NULL; } } tab_list = add_to_tab_list(&append, option); @@ -649,7 +656,7 @@ main(int argc, char *argv[]) /* set tty modes to -ocrnl to allow \r */ if (isatty(STDOUT_FILENO)) { TTY new_settings = tty_settings; - new_settings.c_oflag &= (unsigned)~OCRNL; + new_settings.c_oflag &= (unsigned) ~OCRNL; update_tty_settings(&tty_settings, &new_settings); change_tty = TRUE; new_line = "\r\n"; @@ -676,7 +683,7 @@ main(int argc, char *argv[]) list = decode_tabs(tab_list, margin); - if (list != 0) { + if (list != NULL) { if (!no_op) do_tabs(list); if (debug) { @@ -697,7 +704,7 @@ main(int argc, char *argv[]) } rc = EXIT_SUCCESS; } - if (append != 0) + if (append != NULL) free(append); ExitProgram(rc); } diff --git a/progs/tic.c b/progs/tic.c index 93a0b491..d9321185 100644 --- a/progs/tic.c +++ b/progs/tic.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2021,2022 Thomas E. Dickey * + * Copyright 2018-2024,2025 Thomas E. Dickey * * Copyright 1998-2017,2018 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -49,7 +49,7 @@ #include #include -MODULE_ID("$Id: tic.c,v 1.320 2022/09/17 18:55:28 tom Exp $") +MODULE_ID("$Id: tic.c,v 1.332 2025/01/11 23:52:18 tom Exp $") #define STDIN_NAME "" @@ -61,7 +61,7 @@ static bool capdump = FALSE; /* running as infotocap? */ static bool infodump = FALSE; /* running as captoinfo? */ static bool showsummary = FALSE; static unsigned debug_level; -static char **namelst = 0; +static char **namelst = NULL; static const char *to_remove; #if NCURSES_XNAMES @@ -104,9 +104,9 @@ source-file\n"; static void free_namelist(char **src) { - if (src != 0) { + if (src != NULL) { int n; - for (n = 0; src[n] != 0; ++n) + for (n = 0; src[n] != NULL; ++n) free(src[n]); free(src); } @@ -120,9 +120,9 @@ cleanup(void) free_namelist(namelst); _nc_leaks_dump_entry(); #endif - if (tmp_fp != 0) + if (tmp_fp != NULL) fclose(tmp_fp); - if (to_remove != 0) { + if (to_remove != NULL) { int rc; #if HAVE_REMOVE @@ -203,7 +203,8 @@ write_it(ENTRY * ep) { unsigned n; int ch; - char *s, *d, *t; + char *s, *d; + const char *t; char result[MAX_ENTRY_SIZE]; /* @@ -213,7 +214,7 @@ write_it(ENTRY * ep) for (n = 0; n < STRCOUNT; n++) { s = ep->tterm.Strings[n]; if (VALID_STRING(s) - && strchr(s, L_BRACE) != 0) { + && strchr(s, L_BRACE) != NULL) { d = result; t = s; while ((ch = *t++) != 0) { @@ -223,14 +224,14 @@ write_it(ENTRY * ep) break; } else if ((ch == '%') && (*t == L_BRACE)) { - char *v = 0; + char *v = NULL; long value = strtol(t + 1, &v, 0); - if (v != 0 + if (v != NULL && *v == R_BRACE && value > 0 && value != '\\' /* FIXME */ && value < 127 - && isprint((int) value)) { + && isprint(UChar(value))) { *d++ = S_QUOTE; *d++ = (char) value; *d++ = S_QUOTE; @@ -333,14 +334,14 @@ put_translate(int c) in_name = FALSE; suffix[0] = '\0'; - if ((up = strchr(namebuf, '#')) != 0 - || (up = strchr(namebuf, '=')) != 0 - || ((up = strchr(namebuf, '@')) != 0 && up[1] == '>')) { + if ((up = strchr(namebuf, '#')) != NULL + || (up = strchr(namebuf, '=')) != NULL + || ((up = strchr(namebuf, '@')) != NULL && up[1] == '>')) { _nc_STRCPY(suffix, up, have); *up = '\0'; } - if ((tp = nametrans(namebuf)) != 0) { + if ((tp = nametrans(namebuf)) != NULL) { (void) putchar(':'); (void) fputs(tp, stdout); (void) fputs(suffix, stdout); @@ -367,7 +368,7 @@ put_translate(int c) static char * stripped(char *src) { - char *dst = 0; + char *dst = NULL; while (isspace(UChar(*src))) src++; @@ -387,7 +388,7 @@ stripped(char *src) static FILE * open_tempfile(char *filename) { - FILE *result = 0; + FILE *result = NULL; _nc_STRCPY(filename, "/tmp/XXXXXX", PATH_MAX); #if HAVE_MKSTEMP @@ -409,9 +410,8 @@ static FILE * copy_input(FILE *source, const char *filename, char *alt_file) { char my_altfile[PATH_MAX]; - FILE *result = 0; + FILE *result = NULL; FILE *target; - int ch; if (alt_file == NULL) alt_file = my_altfile; @@ -423,7 +423,7 @@ copy_input(FILE *source, const char *filename, char *alt_file) } else { clearerr(source); for (;;) { - ch = fgetc(source); + int ch = fgetc(source); if (feof(source)) { break; } else if (ferror(source)) { @@ -459,25 +459,29 @@ open_input(const char *filename, char *alt_file) if (!strcmp(filename, "-")) { fp = copy_input(stdin, STDIN_NAME, alt_file); } else if (stat(filename, &sb) == -1) { - fprintf(stderr, "%s: %s %s\n", _nc_progname, filename, strerror(errno)); + fprintf(stderr, "%s: cannot open '%s': %s\n", _nc_progname, + filename, strerror(errno)); ExitProgram(EXIT_FAILURE); } else if ((mode = (sb.st_mode & S_IFMT)) == S_IFDIR || (mode != S_IFREG && mode != S_IFCHR && mode != S_IFIFO)) { - fprintf(stderr, "%s: %s is not a file\n", _nc_progname, filename); + fprintf(stderr, "%s: cannot open '%s'; it is not a file\n", + _nc_progname, filename); ExitProgram(EXIT_FAILURE); } else { fp = safe_fopen(filename, "r"); if (fp == NULL) { - fprintf(stderr, "%s: Can't open %s\n", _nc_progname, filename); + fprintf(stderr, "%s: cannot open '%s': %s\n", _nc_progname, + filename, strerror(errno)); ExitProgram(EXIT_FAILURE); } if (mode != S_IFREG) { - if (alt_file != 0) { + if (alt_file != NULL) { FILE *fp2 = copy_input(fp, filename, alt_file); fp = fp2; } else { - fprintf(stderr, "%s: %s is not a file\n", _nc_progname, filename); + fprintf(stderr, "%s: cannot open '%s'; it is not a" + " file\n", _nc_progname, filename); ExitProgram(EXIT_FAILURE); } } @@ -489,7 +493,7 @@ open_input(const char *filename, char *alt_file) static char ** make_namelist(char *src) { - char **dst = 0; + char **dst = NULL; char *s, *base; unsigned pass, n, nn; @@ -497,14 +501,14 @@ make_namelist(char *src) if (src == NULL) { /* EMPTY */ ; - } else if (strchr(src, '/') != 0) { /* a filename */ + } else if (strchr(src, '/') != NULL) { /* a filename */ FILE *fp = open_input(src, (char *) 0); for (pass = 1; pass <= 2; pass++) { nn = 0; - while (fgets(buffer, sizeof(buffer), fp) != 0) { - if ((s = stripped(buffer)) != 0) { - if (dst != 0) + while (fgets(buffer, sizeof(buffer), fp) != NULL) { + if ((s = stripped(buffer)) != NULL) { + if (dst != NULL) dst[nn] = s; else free(s); @@ -513,8 +517,10 @@ make_namelist(char *src) } if (pass == 1) { if ((dst = typeCalloc(char *, nn + 1)) == NULL) - failed("make_namelist"); + failed("make_namelist (alloc)"); rewind(fp); + if (errno != 0) + failed("make_namelist (rewind)"); } } fclose(fp); @@ -527,7 +533,7 @@ make_namelist(char *src) nn++; } else { src[n] = '\0'; - if ((s = stripped(base)) != 0) + if ((s = stripped(base)) != NULL) dst[nn++] = s; base = &src[n + 1]; } @@ -541,9 +547,9 @@ make_namelist(char *src) } } } - if (showsummary && (dst != 0)) { + if (showsummary && (dst != NULL)) { fprintf(log_fp, "Entries that will be compiled:\n"); - for (n = 0; dst[n] != 0; n++) + for (n = 0; dst[n] != NULL; n++) fprintf(log_fp, "%u:%s\n", n + 1, dst[n]); } return dst; @@ -555,10 +561,10 @@ matches(char **needle, const char *haystack) { bool code = FALSE; - if (needle != 0) { + if (needle != NULL) { size_t n; - for (n = 0; needle[n] != 0; n++) { + for (n = 0; needle[n] != NULL; n++) { if (_nc_name_match(haystack, needle[n], "|")) { code = TRUE; break; @@ -595,14 +601,14 @@ valid_db_path(const char *nominal) || access(result, R_OK | W_OK) != 0) { DEBUG(1, ("...not a writable file")); free(result); - result = 0; + result = NULL; } #else if (!S_ISDIR(sb.st_mode) || access(result, R_OK | W_OK | X_OK) != 0) { DEBUG(1, ("...not a writable directory")); free(result); - result = 0; + result = NULL; } #endif } else { @@ -620,12 +626,12 @@ valid_db_path(const char *nominal) } else { DEBUG(1, ("...parent directory %s is not writable", result)); free(result); - result = 0; + result = NULL; } } else { DEBUG(1, ("... no parent directory")); free(result); - result = 0; + result = NULL; } } return result; @@ -639,22 +645,22 @@ valid_db_path(const char *nominal) static void show_databases(const char *outdir) { - bool specific = (outdir != 0) || getenv("TERMINFO") != 0; + bool specific = (outdir != NULL) || getenv("TERMINFO") != NULL; char *result; - const char *tried = 0; + const char *tried = NULL; if (outdir == NULL) { outdir = _nc_tic_dir(NULL); } - if ((result = valid_db_path(outdir)) != 0) { + if ((result = valid_db_path(outdir)) != NULL) { printf("%s\n", result); free(result); } else { tried = outdir; } - if ((outdir = _nc_home_terminfo())) { - if ((result = valid_db_path(outdir)) != 0) { + if ((outdir = _nc_home_terminfo()) != NULL) { + if ((result = valid_db_path(outdir)) != NULL) { printf("%s\n", result); free(result); } else if (!specific) { @@ -700,7 +706,7 @@ main(int argc, char *argv[]) bool forceresolve = FALSE; /* force resolution */ bool limited = TRUE; char *tversion = (char *) NULL; - const char *source_file = "terminfo"; + const char *source_file; char *outdir = (char *) NULL; bool check_only = FALSE; bool suppress_untranslatable = FALSE; @@ -918,13 +924,13 @@ main(int argc, char *argv[]) if (infodump == TRUE) { /* captoinfo's no-argument case */ source_file = "/etc/termcap"; - if ((termcap = getenv("TERMCAP")) != 0 - && (namelst = make_namelist(getenv("TERM"))) != 0) { + if ((termcap = getenv("TERMCAP")) != NULL + && (namelst = make_namelist(getenv("TERM"))) != NULL) { if (access(termcap, F_OK) == 0) { /* file exists */ source_file = termcap; } else { - if ((tmp_fp = open_tempfile(my_tmpname)) != 0) { + if ((tmp_fp = open_tempfile(my_tmpname)) != NULL) { source_file = my_tmpname; fprintf(tmp_fp, "%s\n", termcap); fclose(tmp_fp); @@ -1115,7 +1121,7 @@ main(int argc, char *argv[]) * Check if the alternate character-set capabilities are consistent. */ static void -check_acs(TERMTYPE2 *tp) +check_acs(const TERMTYPE2 *tp) { int vt100_smacs = 0; int vt100_rmacs = 0; @@ -1169,6 +1175,7 @@ check_acs(TERMTYPE2 *tp) char *q; memset(mapped, 0, sizeof(mapped)); + memset(missing, 0, sizeof(missing)); for (p = acs_chars; *p != '\0'; p += 2) { if (p[1] == '\0') { _nc_warning("acsc has odd number of characters"); @@ -1327,8 +1334,8 @@ keypad_index(const char *string) if ((ch = keypad_final(string)) != '\0') { const char *list = "PQRSwxymtuvlqrsPpn"; /* app-keypad except "Enter" */ - char *test = (strchr) (list, ch); - if (test != 0) + const char *test = (strchr) (list, ch); + if (test != NULL) result = (long) (test - list); } return result; @@ -1350,8 +1357,7 @@ check_ansi_cursor(char *list[4]) for (j = 0; j < 4; ++j) { skip[j] = FALSE; for (k = 0; k < j; ++k) { - if (j != k - && !strcmp(list[j], list[k])) { + if (!strcmp(list[j], list[k])) { char *value = _nc_tic_expand(list[k], TRUE, 0); _nc_warning("repeated cursor control %s", value); repeated = TRUE; @@ -1359,7 +1365,7 @@ check_ansi_cursor(char *list[4]) } } if (!repeated) { - char *up = list[1]; + const char *up = list[1]; size_t prefix = (size_t) csi_length(up); size_t suffix; @@ -1406,7 +1412,7 @@ check_ansi_cursor(char *list[4]) #define UNEXPECTED(name) if (PRESENT(name)) _nc_warning("unexpected " #name ", for %s", why) static void -check_noaddress(TERMTYPE2 *tp, const char *why) +check_noaddress(const TERMTYPE2 *tp, const char *why) { UNEXPECTED(column_address); UNEXPECTED(cursor_address); @@ -1537,7 +1543,7 @@ check_cursor(TERMTYPE2 *tp) * is mapped inconsistently. */ static void -check_keypad(TERMTYPE2 *tp) +check_keypad(const TERMTYPE2 *tp) { char show[80]; @@ -1706,8 +1712,8 @@ check_printer(TERMTYPE2 *tp) static bool uses_SGR_39_49(const char *value) { - return (strstr(value, "39;49") != 0 - || strstr(value, "49;39") != 0); + return (strstr(value, "39;49") != NULL + || strstr(value, "49;39") != NULL); } /* @@ -1723,7 +1729,7 @@ check_screen(TERMTYPE2 *tp) bool have_kmouse = FALSE; bool use_sgr_39_49 = FALSE; const char *name_39_49 = "orig_pair or orig_colors"; - char *name = _nc_first_name(tp->term_names); + const char *name = _nc_first_name(tp->term_names); bool is_screen = !strncmp(name, "screen", 6); bool screen_base = (is_screen && strchr(name, '.') == NULL); @@ -1891,7 +1897,7 @@ expected_params(const char *name) static struct user_table_entry const * lookup_user_capability(const char *name) { - struct user_table_entry const *result = 0; + struct user_table_entry const *result = NULL; if (*name != 'k') { result = _nc_find_user_entry(name); } @@ -1923,7 +1929,7 @@ is_user_capability(const char *name) #if NCURSES_XNAMES else if (using_extensions) { struct user_table_entry const *p = lookup_user_capability(name); - if (p != 0) { + if (p != NULL) { result = (int) p->ute_argc; } } @@ -1981,7 +1987,7 @@ line_capability(const char *name) * markers. */ static void -check_params(TERMTYPE2 *tp, const char *name, const char *value, int extended) +check_params(const TERMTYPE2 *tp, const char *name, const char *value, int extended) { int expected = expected_params(name); int actual = 0; @@ -2019,7 +2025,7 @@ check_params(TERMTYPE2 *tp, const char *name, const char *value, int extended) _nc_warning("expected character after %% in %s", name); break; } else if (*s == 'p') { - if (*++s == '\0' || !isdigit((int) *s)) { + if (*++s == '\0' || !isdigit(UChar(*s))) { _nc_warning("expected digit after %%p in %s", name); return; } else { @@ -2128,7 +2134,7 @@ static const char * skip_DECSCNM(const char *value, int *flag) { *flag = -1; - if (value != 0) { + if (value != NULL) { int skip = csi_length(value); if (skip > 0 && value[skip++] == '?' && @@ -2145,16 +2151,16 @@ skip_DECSCNM(const char *value, int *flag) } static void -check_delays(TERMTYPE2 *tp, const char *name, const char *value) +check_delays(const TERMTYPE2 *tp, const char *name, const char *value) { const char *p, *q; - const char *first = 0; - const char *last = 0; + const char *first = NULL; + const char *last = NULL; for (p = value; *p != '\0'; ++p) { if (p[0] == '$' && p[1] == '<') { const char *base = p + 2; - const char *mark = 0; + const char *mark = NULL; bool mixed = FALSE; int proportional = 0; int mandatory = 0; @@ -2173,7 +2179,7 @@ check_delays(TERMTYPE2 *tp, const char *name, const char *value) ++mandatory; if (mark == NULL) mark = q; - } else if (!(isalnum(UChar(*q)) || strchr("+-.", *q) != 0)) { + } else if (!(isalnum(UChar(*q)) || strchr("+-.", *q) != NULL)) { break; } else if (proportional || mandatory) { mixed = TRUE; @@ -2209,7 +2215,7 @@ check_delays(TERMTYPE2 *tp, const char *name, const char *value) if (!strcmp(name, "flash") || !strcmp(name, "beep")) { - if (first != 0) { + if (first != NULL) { if (first == value || *last == 0) { /* * Delay is on one end or the other. @@ -2223,9 +2229,9 @@ check_delays(TERMTYPE2 *tp, const char *name, const char *value) * Check for missing delay when using VT100 reverse-video. * A real VT100 might not need this, but terminal emulators do. */ - if ((p = skip_DECSCNM(value, &flag)) != 0 && + if ((p = skip_DECSCNM(value, &flag)) != NULL && flag > 0 && - skip_DECSCNM(p, &flag) != 0 && + skip_DECSCNM(p, &flag) != NULL && flag == 0) { _nc_warning("expected a delay in %s", name); } @@ -2270,9 +2276,15 @@ check_1_infotocap(const char *name, NCURSES_CONST char *value, int count) _nc_reset_tparm(NULL); switch (actual) { + case Str: + result = TPARM_1(value, strings[1]); + break; case Num_Str: result = TPARM_2(value, numbers[1], strings[2]); break; + case Str_Str: + result = TPARM_2(value, strings[1], strings[2]); + break; case Num_Str_Str: result = TPARM_3(value, numbers[1], strings[2], strings[3]); break; @@ -2292,7 +2304,7 @@ check_1_infotocap(const char *name, NCURSES_CONST char *value, int count) break; case Other: default: -#define myParam(n) (p_is_s[n - 1] != 0 ? ((TPARM_ARG) strings[n]) : numbers[n]) +#define myParam(n) (p_is_s[n - 1] != NULL ? ((TPARM_ARG) strings[n]) : numbers[n]) result = TPARM_9(value, myParam(1), myParam(2), @@ -2434,60 +2446,63 @@ static void check_infotocap(TERMTYPE2 *tp, int i, const char *value) { const char *name = ExtStrname(tp, i, strnames); - int params = ((i < (int) SIZEOF(parametrized)) - ? parametrized[i] - : ((*value == 'k') - ? 0 - : has_params(value, FALSE))); char *ti_value = NULL; - char *tc_value; - bool embedded; assert(SIZEOF(parametrized) == STRCOUNT); if (!VALID_STRING(value) || (ti_value = strdup(value)) == NULL) { _nc_warning("tic-expansion of %s failed", name); - } else if ((tc_value = _nc_infotocap(name, ti_value, params)) == ABSENT_STRING) { - _nc_warning("tic-conversion of %s failed", name); - } else if (params > 0) { - int limit = 5; - int count; - bool first = TRUE; - - if (!strcmp(name, "setf") - || !strcmp(name, "setb") - || !strcmp(name, "setaf") - || !strcmp(name, "setab")) { - if ((limit = max_colors) > 256) - limit = 256; - } - for (count = 0; count < limit; ++count) { - char *ti_check = check_1_infotocap(name, ti_value, count); - char *tc_check = check_1_infotocap(name, tc_value, count); - - if (strcmp(ti_check, tc_check)) { - if (first) { - fprintf(stderr, "check_infotocap(%s)\n", name); - fprintf(stderr, "...ti '%s'\n", _nc_visbuf2(0, ti_value)); - fprintf(stderr, "...tc '%s'\n", _nc_visbuf2(0, tc_value)); - first = FALSE; + } else { + char *tc_value; + bool embedded; + int params = ((i < (int) SIZEOF(parametrized)) + ? parametrized[i] + : ((*value == 'k') + ? 0 + : has_params(value, FALSE))); + + if ((tc_value = _nc_infotocap(name, ti_value, params)) == ABSENT_STRING) { + _nc_warning("tic-conversion of %s failed", name); + } else if (params > 0) { + int limit = 5; + int count; + bool first = TRUE; + + if (!strcmp(name, "setf") + || !strcmp(name, "setb") + || !strcmp(name, "setaf") + || !strcmp(name, "setab")) { + if ((limit = max_colors) > 256) + limit = 256; + } + for (count = 0; count < limit; ++count) { + char *ti_check = check_1_infotocap(name, ti_value, count); + char *tc_check = check_1_infotocap(name, tc_value, count); + + if (strcmp(ti_check, tc_check)) { + if (first) { + fprintf(stderr, "check_infotocap(%s)\n", name); + fprintf(stderr, "...ti '%s'\n", _nc_visbuf2(0, ti_value)); + fprintf(stderr, "...tc '%s'\n", _nc_visbuf2(0, tc_value)); + first = FALSE; + } + _nc_warning("tparm-conversion of %s(%d) differs between\n\tterminfo %s\n\ttermcap %s", + name, count, + _nc_visbuf2(0, ti_check), + _nc_visbuf2(1, tc_check)); } - _nc_warning("tparm-conversion of %s(%d) differs between\n\tterminfo %s\n\ttermcap %s", - name, count, - _nc_visbuf2(0, ti_check), - _nc_visbuf2(1, tc_check)); + free(ti_check); + free(tc_check); + } + } else if (params == 0 && !same_ti_tc(ti_value, tc_value, &embedded)) { + if (embedded) { + _nc_warning("termcap equivalent of %s cannot use embedded delay", name); + } else { + _nc_warning("tic-conversion of %s changed value\n\tfrom %s\n\tto %s", + name, ti_value, tc_value); } - free(ti_check); - free(tc_check); - } - } else if (params == 0 && !same_ti_tc(ti_value, tc_value, &embedded)) { - if (embedded) { - _nc_warning("termcap equivalent of %s cannot use embedded delay", name); - } else { - _nc_warning("tic-conversion of %s changed value\n\tfrom %s\n\tto %s", - name, ti_value, tc_value); } + free(ti_value); } - free(ti_value); } static char * @@ -2562,7 +2577,7 @@ static bool similar_sgr(int num, char *a, char *b) { char *base_a = a; - char *base_b = b; + const char *base_b = b; int delaying = 0; while (*b != 0) { @@ -2618,7 +2633,7 @@ check_tparm_err(int num) } static char * -check_sgr(TERMTYPE2 *tp, char *zero, int num, char *cap, const char *name) +check_sgr(const TERMTYPE2 *tp, const char *zero, int num, char *cap, const char *name) { char *test; @@ -2633,7 +2648,7 @@ check_sgr(TERMTYPE2 *tp, char *zero, int num, char *cap, const char *name) num == 7, num == 8, num == 9); - if (test != 0) { + if (test != NULL) { if (PRESENT(cap)) { if (!similar_sgr(num, test, cap)) { _nc_warning("%s differs from sgr(%d)\n\t%s=%s\n\tsgr(%d)=%s", @@ -2718,7 +2733,7 @@ get_fkey_list(TERMTYPE2 *tp) } static void -show_fkey_name(NAME_VALUE * data) +show_fkey_name(const NAME_VALUE * data) { if (data->keycode > 0) { fprintf(stderr, " %s", keyname(data->keycode)); @@ -2853,7 +2868,7 @@ check_conflict(TERMTYPE2 *tp) static void check_exit_attribute(const char *name, char *test, char *trimmed, char *untrimmed) { - if (VALID_STRING(test) && (trimmed != 0)) { + if (VALID_STRING(test) && (trimmed != NULL)) { if (similar_sgr(-1, trimmed, test) || similar_sgr(-1, untrimmed, test)) { _nc_warning("%s matches exit_attribute_mode", name); @@ -2896,7 +2911,7 @@ is_sgr_string(char *value) * Check if the given capability contains a given SGR attribute. */ static void -check_sgr_param(TERMTYPE2 *tp, int code, const char *name, char *value) +check_sgr_param(TERMTYPE2 *tp, int code, const char *name, const char *const value) { if (VALID_STRING(value)) { int ncv = ((code != 0) ? (1 << (code - 1)) : 0); @@ -2948,7 +2963,7 @@ standard_type(const char *name) int result = -1; const struct name_table_entry *np; - if ((np = _nc_find_entry(name, _nc_get_hash_table(0))) != 0) { + if ((np = _nc_find_entry(name, _nc_get_hash_table(0))) != NULL) { result = np->nte_type; } return result; @@ -2975,7 +2990,7 @@ name_of_type(int type) static void check_user_capability_type(const char *name, int actual) { - if (lookup_user_capability(name) == 0) { + if (lookup_user_capability(name) == NULL) { int expected = standard_type(name); if (expected >= 0) { _nc_warning("expected %s to be %s, but actually %s", @@ -3098,7 +3113,7 @@ isValidEscape(const char *value, const char *expect) } static int -guess_ANSI_VTxx(TERMTYPE2 *tp) +guess_ANSI_VTxx(const TERMTYPE2 *tp) { int result = -1; int checks = 0; @@ -3136,11 +3151,12 @@ guess_ANSI_VTxx(TERMTYPE2 *tp) * In particular, any ECMA-48 terminal should support these, though the details * for u9 are implementation dependent. */ +#if defined(user6) && defined(user7) && defined(user8) && defined(user9) static void -check_user_6789(TERMTYPE2 *tp) +check_user_6789(const TERMTYPE2 *tp) { /* - * Check if the terminal is known to not + * Check if the terminal is known to not */ #define NO_QUERY(longname,shortname) \ if (PRESENT(longname)) _nc_warning(#shortname " is not supported") @@ -3171,6 +3187,9 @@ check_user_6789(TERMTYPE2 *tp) break; } } +#else +#define check_user_6789(tp) /* nothing */ +#endif /* other sanity-checks (things that we don't want in the normal * logic that reads a terminfo entry) @@ -3183,7 +3202,7 @@ check_termtype(TERMTYPE2 *tp, bool literal) check_conflict(tp); for_each_string(j, tp) { - char *a = tp->Strings[j]; + const char *a = tp->Strings[j]; if (VALID_STRING(a)) { const char *name = ExtStrname(tp, (int) j, strnames); /* @@ -3253,7 +3272,7 @@ check_termtype(TERMTYPE2 *tp, bool literal) ANDMISSING(clear_all_tabs, set_tab); if (PRESENT(set_attributes)) { - char *zero = 0; + char *zero = NULL; _nc_tparm_err = 0; if (PRESENT(exit_attribute_mode)) { @@ -3263,7 +3282,7 @@ check_termtype(TERMTYPE2 *tp, bool literal) } check_tparm_err(0); - if (zero != 0) { + if (zero != NULL) { CHECK_SGR(1, enter_standout_mode); CHECK_SGR(2, enter_underline_mode); CHECK_SGR(3, enter_reverse_mode); @@ -3349,6 +3368,6 @@ check_termtype(TERMTYPE2 *tp, bool literal) /* * Finally, do the non-verbose checks */ - if (save_check_termtype != 0) + if (save_check_termtype != NULL) save_check_termtype(tp, literal); } diff --git a/progs/toe.c b/progs/toe.c index 7599cfe3..f85c358d 100644 --- a/progs/toe.c +++ b/progs/toe.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2021,2022 Thomas E. Dickey * + * Copyright 2018-2024,2025 Thomas E. Dickey * * Copyright 1998-2013,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -45,7 +45,7 @@ #include #endif -MODULE_ID("$Id: toe.c,v 1.88 2022/09/03 23:29:32 tom Exp $") +MODULE_ID("$Id: toe.c,v 1.94 2025/01/12 00:36:48 tom Exp $") #define isDotname(name) (!strcmp(name, ".") || !strcmp(name, "..")) @@ -86,7 +86,7 @@ static char * strmalloc(const char *value) { char *result = strdup(value); - if (result == 0) { + if (result == NULL) { failed("strmalloc"); } return result; @@ -100,7 +100,7 @@ new_termdata(void) if (want >= len_termdata) { len_termdata = (2 * want) + 10; ptr_termdata = typeRealloc(TERMDATA, len_termdata, ptr_termdata); - if (ptr_termdata == 0) + if (ptr_termdata == NULL) failed("ptr_termdata"); } @@ -200,14 +200,14 @@ show_termdata(int eargc, char **eargv) static void free_termdata(void) { - if (ptr_termdata != 0) { + if (ptr_termdata != NULL) { while (use_termdata != 0) { --use_termdata; free(ptr_termdata[use_termdata].term_name); free(ptr_termdata[use_termdata].description); } free(ptr_termdata); - ptr_termdata = 0; + ptr_termdata = NULL; } use_termdata = 0; len_termdata = 0; @@ -217,7 +217,7 @@ static char ** allocArgv(size_t count) { char **result = typeCalloc(char *, count + 1); - if (result == 0) + if (result == NULL) failed("realloc eargv"); assert(result != 0); @@ -265,15 +265,15 @@ make_db_name(char *dst, const char *src, unsigned limit) typedef void (DescHook) (int /* db_index */ , int /* db_limit */ , const char * /* term_name */ , - TERMTYPE2 * /* term */ ); + const TERMTYPE2 * /* term */ ); static const char * -term_description(TERMTYPE2 *tp) +term_description(const TERMTYPE2 *tp) { const char *desc; - if (tp->term_names == 0 - || (desc = strrchr(tp->term_names, '|')) == 0 + if (tp->term_names == NULL + || (desc = strrchr(tp->term_names, '|')) == NULL || (*++desc == '\0')) { desc = "(No description)"; } @@ -283,7 +283,7 @@ term_description(TERMTYPE2 *tp) /* display a description for the type */ static void -deschook(int db_index, int db_limit, const char *term_name, TERMTYPE2 *tp) +deschook(int db_index, int db_limit, const char *term_name, const TERMTYPE2 *tp) { (void) db_index; (void) db_limit; @@ -307,7 +307,7 @@ string_sum(const char *value) } static unsigned long -checksum_of(TERMTYPE2 *tp) +checksum_of(const TERMTYPE2 *tp) { unsigned long result = string_sum(tp->term_names); unsigned i; @@ -326,7 +326,7 @@ checksum_of(TERMTYPE2 *tp) /* collect data, to sort before display */ static void -sorthook(int db_index, int db_limit, const char *term_name, TERMTYPE2 *tp) +sorthook(int db_index, int db_limit, const char *term_name, const TERMTYPE2 *tp) { TERMDATA *data = new_termdata(); @@ -374,10 +374,10 @@ show_termcap(int db_index, int db_limit, char *buffer, DescHook hook) memset(&data, 0, sizeof(data)); data.term_names = strmalloc(buffer); - while ((next = strtok(list, "|")) != 0) { + while ((next = strtok(list, "|")) != NULL) { if (next != last) hook(db_index, db_limit, next, &data); - list = 0; + list = NULL; } free(data.term_names); } @@ -385,11 +385,11 @@ show_termcap(int db_index, int db_limit, char *buffer, DescHook hook) #if NCURSES_USE_DATABASE static char * -copy_entryname(DIRENT * src) +copy_entryname(const DIRENT * src) { size_t len = NAMLEN(src); char *result = malloc(len + 1); - if (result == 0) + if (result == NULL) failed("copy entryname"); memcpy(result, src->d_name, len); result[len] = '\0'; @@ -409,11 +409,11 @@ typelist(int eargc, char *eargv[], for (i = 0; i < eargc; i++) { #if NCURSES_USE_DATABASE if (_nc_is_dir_path(eargv[i])) { - char *cwd_buf = 0; + char *cwd_buf = NULL; DIR *termdir; - DIRENT *subdir; + const DIRENT *subdir; - if ((termdir = opendir(eargv[i])) == 0) { + if ((termdir = opendir(eargv[i])) == NULL) { (void) fflush(stdout); (void) fprintf(stderr, "%s: can't open terminfo directory %s\n", @@ -424,11 +424,11 @@ typelist(int eargc, char *eargv[], if (verbosity) (void) printf("#\n#%s:\n#\n", eargv[i]); - while ((subdir = readdir(termdir)) != 0) { + while ((subdir = readdir(termdir)) != NULL) { size_t cwd_len; char *name_1; DIR *entrydir; - DIRENT *entry; + const DIRENT *entry; name_1 = copy_entryname(subdir); if (isDotname(name_1)) { @@ -436,9 +436,9 @@ typelist(int eargc, char *eargv[], continue; } - cwd_len = NAMLEN(subdir) + strlen(eargv[i]) + 3; + cwd_len = strlen(name_1) + strlen(eargv[i]) + 3; cwd_buf = typeRealloc(char, cwd_len, cwd_buf); - if (cwd_buf == 0) + if (cwd_buf == NULL) failed("realloc cwd_buf"); assert(cwd_buf != 0); @@ -451,11 +451,11 @@ typelist(int eargc, char *eargv[], continue; entrydir = opendir("."); - if (entrydir == 0) { + if (entrydir == NULL) { perror(cwd_buf); continue; } - while ((entry = readdir(entrydir)) != 0) { + while ((entry = readdir(entrydir)) != NULL) { char *name_2; TERMTYPE2 lterm; char *cn; @@ -489,7 +489,7 @@ typelist(int eargc, char *eargv[], closedir(entrydir); } closedir(termdir); - if (cwd_buf != 0) + if (cwd_buf != NULL) free(cwd_buf); continue; } @@ -502,7 +502,7 @@ typelist(int eargc, char *eargv[], (void) printf("#\n#%s:\n#\n", eargv[i]); if (make_db_name(filename, eargv[i], sizeof(filename))) { - if ((capdbp = _nc_db_open(filename, FALSE)) != 0) { + if ((capdbp = _nc_db_open(filename, FALSE)) != NULL) { DBT key, data; int code; @@ -536,13 +536,13 @@ typelist(int eargc, char *eargv[], #if HAVE_BSD_CGETENT { CGETENT_CONST char *db_array[2]; - char *buffer = 0; + char *buffer = NULL; if (verbosity) (void) printf("#\n#%s:\n#\n", eargv[i]); db_array[0] = eargv[i]; - db_array[1] = 0; + db_array[1] = NULL; if (cgetfirst(&buffer, db_array) > 0) { if (is_termcap(buffer)) { @@ -572,7 +572,7 @@ typelist(int eargc, char *eargv[], break; if (*buffer == '#') continue; - if (isspace(*buffer)) + if (isspace(UChar(*buffer))) continue; show_termcap(i, eargc, buffer, hook); } @@ -605,7 +605,7 @@ main(int argc, char *argv[]) bool direct_dependencies = FALSE; bool invert_dependencies = FALSE; bool header = FALSE; - char *report_file = 0; + const char *report_file = NULL; int code; int this_opt, last_opt = '?'; unsigned v_opt = 0; @@ -660,8 +660,8 @@ main(int argc, char *argv[]) } use_verbosity(v_opt); - if (report_file != 0) { - if (freopen(report_file, "r", stdin) == 0) { + if (report_file != NULL) { + if (freopen(report_file, "r", stdin) == NULL) { (void) fflush(stdout); fprintf(stderr, "%s: can't open %s\n", _nc_progname, report_file); ExitProgram(EXIT_FAILURE); @@ -669,7 +669,7 @@ main(int argc, char *argv[]) /* parse entries out of the source file */ _nc_set_source(report_file); - _nc_read_entry_source(stdin, 0, FALSE, FALSE, NULLHOOK); + _nc_read_entry_source(stdin, NULL, FALSE, FALSE, NULLHOOK); } /* maybe we want a direct-dependency listing? */ @@ -729,7 +729,7 @@ main(int argc, char *argv[]) DBDIRS state; int offset; int pass; - char **eargv = 0; + char **eargv = NULL; code = EXIT_FAILURE; for (pass = 0; pass < 2; ++pass) { @@ -737,7 +737,7 @@ main(int argc, char *argv[]) const char *path; _nc_first_db(&state, &offset); - while ((path = _nc_next_db(&state, &offset)) != 0) { + while ((path = _nc_next_db(&state, &offset)) != NULL) { if (quick_prefix(path)) continue; if (pass) { @@ -747,7 +747,7 @@ main(int argc, char *argv[]) } if (!pass) { eargv = allocArgv(count); - if (eargv == 0) + if (eargv == NULL) failed("eargv"); } else { code = typelist((int) count, eargv, header, hook); @@ -761,10 +761,10 @@ main(int argc, char *argv[]) char **eargv = allocArgv((size_t) 2); size_t count = 0; - if (eargv == 0) + if (eargv == NULL) failed("eargv"); _nc_first_db(&state, &offset); - if ((path = _nc_next_db(&state, &offset)) != 0) { + if ((path = _nc_next_db(&state, &offset)) != NULL) { if (!quick_prefix(path)) eargv[count++] = strmalloc(path); } diff --git a/progs/tparm_type.c b/progs/tparm_type.c index 3da4a077..4fed96a5 100644 --- a/progs/tparm_type.c +++ b/progs/tparm_type.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020 Thomas E. Dickey * + * Copyright 2020,2023 Thomas E. Dickey * * Copyright 2014,2015 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -33,7 +33,7 @@ #include -MODULE_ID("$Id: tparm_type.c,v 1.4 2020/10/24 17:30:32 tom Exp $") +MODULE_ID("$Id: tparm_type.c,v 1.5 2023/04/08 15:57:01 tom Exp $") /* * Lookup the type of call we should make to tparm(). This ignores the actual @@ -47,6 +47,7 @@ tparm_type(const char *name) {code, {longname} }, \ {code, {ti} }, \ {code, {tc} } +#define XD(code, onlyname) TD(code, onlyname, onlyname, onlyname) TParams result = Numbers; /* *INDENT-OFF* */ static const struct { @@ -58,6 +59,10 @@ tparm_type(const char *name) TD(Num_Str, "pkey_xmit", "pfx", "px"), TD(Num_Str, "plab_norm", "pln", "pn"), TD(Num_Str_Str, "pkey_plab", "pfxl", "xl"), +#if NCURSES_XNAMES + XD(Str, "Cs"), + XD(Str_Str, "Ms"), +#endif }; /* *INDENT-ON* */ @@ -80,12 +85,16 @@ guess_tparm_type(int nparam, char **p_is_s) case 1: if (!p_is_s[0]) result = Numbers; + if (p_is_s[0]) + result = Str; break; case 2: if (!p_is_s[0] && !p_is_s[1]) result = Numbers; if (!p_is_s[0] && p_is_s[1]) result = Num_Str; + if (p_is_s[0] && p_is_s[1]) + result = Str_Str; break; case 3: if (!p_is_s[0] && !p_is_s[1] && !p_is_s[2]) diff --git a/progs/tparm_type.h b/progs/tparm_type.h index 7c102a30..2f7bd077 100644 --- a/progs/tparm_type.h +++ b/progs/tparm_type.h @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020 Thomas E. Dickey * + * Copyright 2020,2023 Thomas E. Dickey * * Copyright 2014 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -32,7 +32,7 @@ ****************************************************************************/ /* - * $Id: tparm_type.h,v 1.3 2020/10/24 17:11:33 tom Exp $ + * $Id: tparm_type.h,v 1.4 2023/04/08 15:41:20 tom Exp $ * * determine expected/actual number of parameters to setup for tparm */ @@ -45,8 +45,10 @@ typedef enum { Other = -1 ,Numbers = 0 + ,Str ,Num_Str ,Num_Str_Str + ,Str_Str } TParams; extern TParams tparm_type(const char *name); diff --git a/progs/tput.c b/progs/tput.c index 4cd0c5ba..74e408f2 100644 --- a/progs/tput.c +++ b/progs/tput.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2021,2022 Thomas E. Dickey * + * Copyright 2018-2024,2025 Thomas E. Dickey * * Copyright 1998-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -47,12 +47,15 @@ #include #include -MODULE_ID("$Id: tput.c,v 1.99 2022/02/26 23:19:31 tom Exp $") +MODULE_ID("$Id: tput.c,v 1.110 2025/01/12 00:36:15 tom Exp $") #define PUTS(s) fputs(s, stdout) const char *_nc_progname = "tput"; +static bool opt_v = FALSE; /* quiet, do not show warnings */ +static bool opt_x = FALSE; /* clear scrollback if possible */ + static bool is_init = FALSE; static bool is_reset = FALSE; static bool is_clear = FALSE; @@ -81,6 +84,7 @@ usage(const char *optstring) KEEP(" -S << read commands from standard input") KEEP(" -T TERM use this instead of $TERM") KEEP(" -V print curses-version") + KEEP(" -v verbose, show warnings") KEEP(" -x do not try to clear scrollback") KEEP("") KEEP("Commands:") @@ -116,11 +120,11 @@ check_aliases(char *name, bool program) static char my_clear[] = "clear"; char *result = name; - if ((is_init = same_program(name, program ? PROG_INIT : my_init))) + if ((is_init = same_program(name, program ? PROG_INIT : my_init)) == TRUE) result = my_init; - if ((is_reset = same_program(name, program ? PROG_RESET : my_reset))) + if ((is_reset = same_program(name, program ? PROG_RESET : my_reset)) == TRUE) result = my_reset; - if ((is_clear = same_program(name, program ? PROG_CLEAR : my_clear))) + if ((is_clear = same_program(name, program ? PROG_CLEAR : my_clear)) == TRUE) result = my_clear; return result; } @@ -148,7 +152,7 @@ exit_code(int token, int value) * Returns nonzero on error. */ static int -tput_cmd(int fd, TTY * settings, bool opt_x, int argc, char **argv, int *used) +tput_cmd(int fd, TTY * settings, int argc, char **argv, int *used) { NCURSES_CONST char *name; char *s; @@ -174,7 +178,13 @@ tput_cmd(int fd, TTY * settings, bool opt_x, int argc, char **argv, int *used) } #if HAVE_SIZECHANGE - set_window_size(fd, &lines, &columns); + { + NCURSES_INT2 my_rows = lines; + NCURSES_INT2 my_cols = columns; + set_window_size(fd, &my_rows, &my_cols); + lines = (short) my_rows; + columns = (short) my_cols; + } #else (void) fd; #endif @@ -209,7 +219,7 @@ tput_cmd(int fd, TTY * settings, bool opt_x, int argc, char **argv, int *used) const struct name_table_entry *np; termcap = TRUE; - if ((np = _nc_find_entry(name, _nc_get_hash_table(termcap))) != 0) { + if ((np = _nc_find_entry(name, _nc_get_hash_table(termcap))) != NULL) { switch (np->nte_type) { case BOOLEAN: name = boolnames[np->nte_index]; @@ -229,61 +239,106 @@ tput_cmd(int fd, TTY * settings, bool opt_x, int argc, char **argv, int *used) #endif quit(ErrCapName, "unknown terminfo capability '%s'", name); } else if (VALID_STRING(s)) { - if (argc > 1) { - int k; - int analyzed; - int popcount; - long numbers[1 + NUM_PARM]; - char *strings[1 + NUM_PARM]; - char *p_is_s[NUM_PARM]; - TParams paramType; - - /* Nasty hack time. The tparm function needs to see numeric - * parameters as numbers, not as pointers to their string - * representations - */ - - for (k = 1; (k < argc) && (k <= NUM_PARM); k++) { - char *tmp = 0; - strings[k] = argv[k]; - numbers[k] = strtol(argv[k], &tmp, 0); - if (tmp == 0 || *tmp != 0) - numbers[k] = 0; + TParams paramType; + long numbers[1 + NUM_PARM]; + char *strings[1 + NUM_PARM]; + char *p_is_s[NUM_PARM]; + int k; + int narg; + int analyzed = 0; + int provided = 0; + int popcount = 0; + + paramType = tparm_type(name); +#if NCURSES_XNAMES + /* + * If the capability is an extended one, analyze the string. + */ + if (paramType == Numbers) { + struct name_table_entry const *entry_ptr; + entry_ptr = _nc_find_type_entry(name, STRING, FALSE); + if (entry_ptr == NULL) { + paramType = Other; } - for (k = argc; k <= NUM_PARM; k++) { + } +#endif + /* Nasty hack time. The tparm function needs to see numeric parameters + * as numbers, not as pointers to their string representations + */ + for (k = 1; (k < argc) && (k <= NUM_PARM); k++) { + char *tmp = NULL; + strings[k] = argv[k]; + numbers[k] = strtol(argv[k], &tmp, 0); + if (tmp == NULL || *tmp != 0) numbers[k] = 0; - strings[k] = 0; - } + } + for (k = argc; k <= NUM_PARM; k++) { + numbers[k] = 0; + strings[k] = NULL; + } - paramType = tparm_type(name); -#if NCURSES_XNAMES + switch (paramType) { + case Str: + analyzed = 1; + break; + case Str_Str: + analyzed = 2; + break; + case Num_Str: + analyzed = 2; + break; + case Num_Str_Str: + analyzed = 3; + break; + case Numbers: + case Other: + analyzed = _nc_tparm_analyze(NULL, s, p_is_s, &popcount); + break; + } + if (analyzed < popcount) { + analyzed = popcount; + } + + if (argc > 1) { + _nc_reset_tparm(NULL); /* - * If the capability is an extended one, analyze the string. + * Count the number of numeric parameters which are provided. */ - if (paramType == Numbers) { - struct name_table_entry const *entry_ptr; - entry_ptr = _nc_find_type_entry(name, STRING, FALSE); - if (entry_ptr == NULL) { - paramType = Other; - } + for (narg = 1; narg < argc; ++narg) { + char *ending = NULL; + long check = strtol(argv[narg], &ending, 0); + if (check < 0 || ending == argv[narg] || *ending != '\0') + break; + provided = narg; } -#endif - - popcount = 0; - _nc_reset_tparm(NULL); switch (paramType) { + case Str: + s = TPARM_1(s, strings[1]); + if (provided == 0 && argc >= 1) + provided++; + break; + case Str_Str: + s = TPARM_2(s, strings[1], strings[2]); + if (provided == 0 && argc >= 1) + provided++; + if (provided == 1 && argc >= 2) + provided++; + break; case Num_Str: s = TPARM_2(s, numbers[1], strings[2]); - analyzed = 2; + if (provided == 1 && argc >= 2) + provided++; break; case Num_Str_Str: s = TPARM_3(s, numbers[1], strings[2], strings[3]); - analyzed = 3; + if (provided == 1 && argc >= 2) + provided++; + if (provided == 2 && argc >= 3) + provided++; break; case Numbers: - analyzed = _nc_tparm_analyze(NULL, s, p_is_s, &popcount); #define myParam(n) numbers[n] - s = TIPARM_9(s, + s = TIPARM_N(analyzed, s, myParam(1), myParam(2), myParam(3), @@ -298,25 +353,33 @@ tput_cmd(int fd, TTY * settings, bool opt_x, int argc, char **argv, int *used) case Other: /* FALLTHRU */ default: - analyzed = _nc_tparm_analyze(NULL, s, p_is_s, &popcount); -#define myParam(n) (p_is_s[n - 1] != 0 ? ((TPARM_ARG) strings[n]) : numbers[n]) - s = TPARM_9(s, - myParam(1), - myParam(2), - myParam(3), - myParam(4), - myParam(5), - myParam(6), - myParam(7), - myParam(8), - myParam(9)); +#define myParam(n) (p_is_s[n - 1] != NULL ? ((TPARM_ARG) strings[n]) : numbers[n]) + s = TIPARM_N(analyzed, s, + myParam(1), + myParam(2), + myParam(3), + myParam(4), + myParam(5), + myParam(6), + myParam(7), + myParam(8), + myParam(9)); #undef myParam break; } - if (analyzed < popcount) { - analyzed = popcount; + if (opt_v && (analyzed != provided)) { + fprintf(stderr, "%s: %s parameters for \"%s\"\n", + _nc_progname, + (analyzed < provided ? "extra" : "missing"), + argv[0]); + } + *used += provided; + } else { + if (opt_v) { + fprintf(stderr, "%s: missing parameters for \"%s\"\n", + _nc_progname, + argv[0]); } - *used += analyzed; } /* use putp() in order to perform padding */ @@ -339,7 +402,6 @@ main(int argc, char **argv) int used; TTY old_settings; TTY tty_settings; - bool opt_x = FALSE; /* clear scrollback if possible */ bool is_alias; bool need_tty; @@ -348,7 +410,7 @@ main(int argc, char **argv) term = getenv("TERM"); - while ((c = getopt(argc, argv, is_alias ? "T:Vx" : "ST:Vx")) != -1) { + while ((c = getopt(argc, argv, is_alias ? "T:Vvx" : "ST:Vvx")) != -1) { switch (c) { case 'S': cmdline = FALSE; @@ -361,6 +423,9 @@ main(int argc, char **argv) case 'V': puts(curses_version()); ExitProgram(EXIT_SUCCESS); + case 'v': /* verbose */ + opt_v = TRUE; + break; case 'x': /* do not try to clear scrollback */ opt_x = TRUE; break; @@ -389,7 +454,7 @@ main(int argc, char **argv) argv += optind; } - if (term == 0 || *term == '\0') + if (term == NULL || *term == '\0') quit(ErrUsage, "No value for $TERM and no -T specified"); fd = save_tty_settings(&tty_settings, need_tty); @@ -404,7 +469,7 @@ main(int argc, char **argv) usage(NULL); while (argc > 0) { tty_settings = old_settings; - code = tput_cmd(fd, &tty_settings, opt_x, argc, argv, &used); + code = tput_cmd(fd, &tty_settings, argc, argv, &used); if (code != 0) break; argc -= used; @@ -413,7 +478,7 @@ main(int argc, char **argv) ExitProgram(code); } - while (fgets(buf, sizeof(buf), stdin) != 0) { + while (fgets(buf, sizeof(buf), stdin) != NULL) { size_t need = strlen(buf); char **argvec = typeCalloc(char *, need + 1); char **argnow; @@ -439,7 +504,7 @@ main(int argc, char **argv) while (argnum > 0) { int code; tty_settings = old_settings; - code = tput_cmd(fd, &tty_settings, opt_x, argnum, argnow, &used); + code = tput_cmd(fd, &tty_settings, argnum, argnow, &used); if (code != 0) { if (result == 0) result = ErrSystem(0); /* will return value >4 */ diff --git a/progs/tset.c b/progs/tset.c index 0ba522cb..921a6890 100644 --- a/progs/tset.c +++ b/progs/tset.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020,2021 Thomas E. Dickey * + * Copyright 2020-2021,2024 Thomas E. Dickey * * Copyright 1998-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -98,7 +98,7 @@ char *ttyname(int fd); #endif -MODULE_ID("$Id: tset.c,v 1.131 2021/12/04 23:02:13 tom Exp $") +MODULE_ID("$Id: tset.c,v 1.139 2024/12/07 22:14:46 tom Exp $") #ifndef environ extern char **environ; @@ -185,19 +185,19 @@ askuser(const char *dflt) (void) fprintf(stderr, "Terminal type? "); (void) fflush(stderr); - if (fgets(answer, sizeof(answer), stdin) == 0) { - if (dflt == 0) { + if (fgets(answer, sizeof(answer), stdin) == NULL) { + if (dflt == NULL) { exit_error(); /* NOTREACHED */ } return (dflt); } - if ((p = strchr(answer, '\n')) != 0) + if ((p = strchr(answer, '\n')) != NULL) *p = '\0'; if (answer[0]) return (answer); - if (dflt != 0) + if (dflt != NULL) return (dflt); } } @@ -344,7 +344,7 @@ static const SPEEDS speeds[] = static int tbaudrate(char *rate) { - const SPEEDS *sp = 0; + const SPEEDS *sp = NULL; size_t n; /* The baudrate number can be preceded by a 'B', which is ignored. */ @@ -361,7 +361,7 @@ tbaudrate(char *rate) break; } } - if (sp == 0) + if (sp == NULL) err("unknown baud rate %s", rate); return (sp->speed); } @@ -377,18 +377,18 @@ add_mapping(const char *port, char *arg) MAP *mapp; char *copy, *p; const char *termp; - char *base = 0; + char *base = NULL; copy = strdup(arg); mapp = typeMalloc(MAP, 1); - if (copy == 0 || mapp == 0) + if (copy == NULL || mapp == NULL) failed("malloc"); assert(copy != 0); assert(mapp != 0); - mapp->next = 0; - if (maplist == 0) + mapp->next = NULL; + if (maplist == NULL) cur = maplist = mapp; else { cur->next = mapp; @@ -400,14 +400,14 @@ add_mapping(const char *port, char *arg) arg = strpbrk(arg, "><@=!:"); - if (arg == 0) { /* [?]term */ + if (arg == NULL) { /* [?]term */ mapp->type = mapp->porttype; - mapp->porttype = 0; + mapp->porttype = NULL; goto done; } if (arg == mapp->porttype) /* [><@=! baud]:term */ - termp = mapp->porttype = 0; + termp = mapp->porttype = NULL; else termp = base = arg; @@ -442,7 +442,7 @@ add_mapping(const char *port, char *arg) ++arg; } else { /* Optional baudrate. */ arg = strchr(p = arg, ':'); - if (arg == 0) + if (arg == NULL) goto badmopt; *arg++ = '\0'; mapp->speed = tbaudrate(p); @@ -451,7 +451,7 @@ add_mapping(const char *port, char *arg) mapp->type = arg; /* Terminate porttype, if specified. */ - if (termp != 0) + if (termp != NULL) *base = '\0'; /* If a NOT conditional, reverse the test. */ @@ -499,7 +499,7 @@ mapped(const char *type) int match; for (mapp = maplist; mapp; mapp = mapp->next) - if (mapp->porttype == 0 || !strcmp(mapp->porttype, type)) { + if (mapp->porttype == NULL || !strcmp(mapp->porttype, type)) { switch (mapp->conditional) { case 0: /* No test specified. */ match = TRUE; @@ -543,7 +543,7 @@ static const char * get_termcap_entry(int fd, char *userarg) { int errret; - char *p; + const char *p; const char *ttype; #if HAVE_PATH_TTYS #if HAVE_GETTTYNAM @@ -562,11 +562,11 @@ get_termcap_entry(int fd, char *userarg) } /* Try the environment. */ - if ((ttype = getenv("TERM")) != 0) + if ((ttype = getenv("TERM")) != NULL) goto map; #if HAVE_PATH_TTYS - if ((ttypath = ttyname(fd)) != 0) { + if ((ttypath = ttyname(fd)) != NULL) { p = _nc_basename(ttypath); #if HAVE_GETTTYNAM /* @@ -574,7 +574,7 @@ get_termcap_entry(int fd, char *userarg) * there's an /etc/ttys to look up device-to-type mappings in. * Try ttyname(3); check for dialup or other mapping. */ - if ((t = getttynam(p))) { + if ((t = getttynam(p)) != NULL) { ttype = t->ty_type; goto map; } @@ -616,14 +616,14 @@ get_termcap_entry(int fd, char *userarg) * by out of date stuff in the environment. */ found: - if ((p = getenv("TERMCAP")) != 0 && !_nc_is_abs_path(p)) { + if ((p = getenv("TERMCAP")) != NULL && !_nc_is_abs_path(p)) { /* 'unsetenv("TERMCAP")' is not portable. * The 'environ' array is better. */ int n; - for (n = 0; environ[n] != 0; n++) { + for (n = 0; environ[n] != NULL; n++) { if (!strncmp("TERMCAP=", environ[n], (size_t) 8)) { - while ((environ[n] = environ[n + 1]) != 0) { + while ((environ[n] = environ[n + 1]) != NULL) { n++; } break; @@ -639,7 +639,7 @@ get_termcap_entry(int fd, char *userarg) if (ttype[1] != '\0') ttype = askuser(ttype + 1); else - ttype = askuser(0); + ttype = askuser(NULL); } /* Find the terminfo entry. If it doesn't exist, ask the user. */ while (setupterm((NCURSES_CONST char *) ttype, fd, &errret) @@ -647,12 +647,12 @@ get_termcap_entry(int fd, char *userarg) if (errret == 0) { (void) fprintf(stderr, "%s: unknown terminal type %s\n", _nc_progname, ttype); - ttype = 0; + ttype = NULL; } else { (void) fprintf(stderr, "%s: can't initialize terminal type %s (error %d)\n", _nc_progname, ttype, errret); - ttype = 0; + ttype = NULL; } ttype = askuser(ttype); } @@ -676,7 +676,7 @@ static void obsolete(char **argv) { for (; *argv; ++argv) { - char *parm = argv[0]; + const char *parm = argv[0]; if (parm[0] == '-' && parm[1] == '\0') { argv[0] = strdup("-q"); @@ -713,7 +713,7 @@ print_shell_commands(const char *ttype) * Figure out what shell we're using. A hack, we look for an * environmental variable SHELL ending in "csh". */ - if ((var = getenv("SHELL")) != 0 + if ((var = getenv("SHELL")) != NULL && ((len = (int) strlen(leaf = _nc_basename(var))) >= 3) && !strcmp(leaf + len - 3, "csh")) p = "set noglob;\nsetenv TERM %s;\nunset noglob;\n"; @@ -806,7 +806,7 @@ main(int argc, char **argv) tkillchar = arg_to_char(); break; case 'm': /* map identifier to type */ - add_mapping(0, optarg); + add_mapping(NULL, optarg); break; case 'p': /* OBSOLETE: map identifier to type */ add_mapping("plugboard", optarg); @@ -869,7 +869,11 @@ main(int argc, char **argv) if (!noset) { #if HAVE_SIZECHANGE if (opt_w) { - set_window_size(my_fd, &lines, &columns); + NCURSES_INT2 my_rows = lines; + NCURSES_INT2 my_cols = columns; + set_window_size(my_fd, &my_rows, &my_cols); + lines = (short) my_rows; + columns = (short) my_cols; } #endif if (opt_c) { @@ -878,9 +882,13 @@ main(int argc, char **argv) if (!noinit) { if (send_init_strings(my_fd, &oldmode)) { + const char *name; + (void) putc('\r', stderr); (void) fflush(stderr); - (void) napms(1000); /* Settle the terminal. */ + if (IsRealTty(my_fd, name)) { + (void) napms(1000); /* Settle the terminal. */ + } } } diff --git a/test/Makefile.in b/test/Makefile.in index 1d546285..ac0468c2 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -1,6 +1,6 @@ -# $Id: Makefile.in,v 1.130 2021/12/18 23:00:28 tom Exp $ +# $Id: Makefile.in,v 1.131 2024/08/10 18:19:56 tom Exp $ ############################################################################## -# Copyright 2020,2021 Thomas E. Dickey # +# Copyright 2020-2021,2024 Thomas E. Dickey # # Copyright 1998-2017,2018 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # @@ -61,10 +61,10 @@ datadir = @datadir@ real_bindir = $(libexecdir)/$(PACKAGE) -BINDIR = $(DESTDIR)$(bindir) -LIBEXECDIR = $(DESTDIR)$(libexecdir) -LIBDIR = $(DESTDIR)$(libdir) -DATADIR = $(DESTDIR)$(datadir) +BINDIR = $(DESTDIR)$(bindir@MERGE_PREFIX@) +LIBEXECDIR = $(DESTDIR)$(libexecdir@MERGE_PREFIX@) +LIBDIR = $(DESTDIR)$(libdir@MERGE_PREFIX@) +DATADIR = $(DESTDIR)$(datadir@MERGE_PREFIX@) REAL_BINDIR = $(LIBEXECDIR)/$(PACKAGE) diff --git a/test/README b/test/README index 7844aa7e..885349dd 100644 --- a/test/README +++ b/test/README @@ -1,5 +1,5 @@ ------------------------------------------------------------------------------- --- Copyright 2018-2021,2022 Thomas E. Dickey -- +-- Copyright 2018-2023,2024 Thomas E. Dickey -- -- Copyright 1998-2017,2018 Free Software Foundation, Inc. -- -- -- -- Permission is hereby granted, free of charge, to any person obtaining a -- @@ -26,7 +26,7 @@ -- sale, use or other dealings in this Software without prior written -- -- authorization. -- ------------------------------------------------------------------------------- --- $Id: README,v 1.77 2022/08/13 23:34:33 tom Exp $ +-- $Id: README,v 1.82 2024/04/27 18:35:01 tom Exp $ ------------------------------------------------------------------------------- The programs in this directory are used to test and demonstrate ncurses. @@ -296,8 +296,8 @@ cur_term test: demo_termcap demo_terminfo dots dots_mvcur filter list_keys lrt curs_set test: demo_new_pair echochar firework gdc hanoi lrtest ncurses newdemo picsmap rain savescreen tclock testcurs worm xmas curs_set_sp test: sp_tinfo curscr test: demo_panels knight lrtest ncurses popup_msg savescreen tclock -curses_trace test: demo_menus hashtest lrtest ncurses padview redraw test_sgr test_termattrs test_vid_puts test_vidputs testcurs view worm -curses_version test: ncurses progs: clear infocmp tabs tic toe tput tset +curses_trace test: demo_menus hashtest lrtest ncurses padview redraw test_sgr test_termattrs test_vid_puts test_vidputs testcurs view worm progs: infocmp tic toe +curses_version test: back_ground background blue bs cardfile chgat clip_printw color_content color_set combine demo_altkeys demo_defkey demo_forms demo_keyok demo_menus demo_new_pair demo_panels demo_tabs demo_termcap demo_terminfo ditto dots dots_curses dots_mvcur dots_termcap dots_xcurses dup_field echochar extended_color filter firework firstlast foldkeys form_driver_w gdc hanoi hashtest inch_wide inchs ins_wide insdelln inserts key_names keynames knight list_keys lrtest move_field movewindow ncurses newdemo padview pair_content picsmap railroad rain redraw savescreen sp_tinfo tclock test_add_wchstr test_addchstr test_addstr test_addwstr test_arrays test_delwin test_endwin test_get_wstr test_getstr test_instr test_inwstr test_mouse test_opaque test_setupterm test_sgr test_termattrs test_tparm test_unget_wch test_vid_puts test_vidputs testaddch testcurs testscanw view worm xmas progs: clear infocmp tabs tic toe tput tset def_prog_mode test: bs ncurses def_prog_mode_sp test: sp_tinfo def_shell_mode - @@ -320,14 +320,14 @@ echo test: bs hanoi ncurses test_get_wstr test_getstr testcurs testscanw echo_sp lib: ncurses echo_wchar test: ncurses echochar test: echochar ncurses -endwin test: back_ground background blue bs cardfile chgat clip_printw color_content color_set combine demo_altkeys demo_defkey demo_forms demo_keyok demo_menus demo_new_pair demo_panels demo_tabs ditto dots_curses dots_mvcur dots_xcurses dup_field echochar extended_color filter firework firstlast foldkeys form_driver_w gdc hanoi hashtest inch_wide inchs ins_wide insdelln inserts key_names keynames knight lrtest move_field movewindow ncurses newdemo padview pair_content picsmap rain redraw savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr test_delwin test_get_wstr test_getstr test_instr test_inwstr test_mouse test_opaque test_unget_wch testaddch testcurs testscanw view worm xmas +endwin test: back_ground background blue bs cardfile chgat clip_printw color_content color_set combine demo_altkeys demo_defkey demo_forms demo_keyok demo_menus demo_new_pair demo_panels demo_tabs ditto dots_curses dots_mvcur dots_xcurses dup_field echochar extended_color filter firework firstlast foldkeys form_driver_w gdc hanoi hashtest inch_wide inchs ins_wide insdelln inserts key_names keynames knight lrtest move_field movewindow ncurses newdemo padview pair_content picsmap rain redraw savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr test_delwin test_endwin test_get_wstr test_getstr test_instr test_inwstr test_mouse test_opaque test_unget_wch testaddch testcurs testscanw view worm xmas endwin_sp lib: ncurses erase test: cardfile demo_menus filter firework firstlast hanoi lrtest ncurses picsmap tclock test_opaque testcurs erasechar test: ncurses erasechar_sp test: sp_tinfo erasewchar test: ncurses erasewchar_sp lib: ncurses -exit_curses test: back_ground background blue bs cardfile chgat clip_printw color_content color_set combine demo_altkeys demo_defkey demo_forms demo_keyok demo_menus demo_new_pair demo_panels demo_tabs ditto dots_curses dots_xcurses dup_field echochar extended_color filter firework firstlast foldkeys form_driver_w gdc hanoi hashtest inch_wide inchs ins_wide insdelln inserts key_names keynames knight lrtest move_field movewindow ncurses newdemo padview pair_content picsmap rain redraw savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr test_delwin test_get_wstr test_getstr test_instr test_inwstr test_mouse test_opaque test_setupterm test_termattrs test_unget_wch testaddch testcurs testscanw view worm xmas +exit_curses test: back_ground background blue bs cardfile chgat clip_printw color_content color_set combine demo_altkeys demo_defkey demo_forms demo_keyok demo_menus demo_new_pair demo_panels demo_tabs ditto dots_curses dots_xcurses dup_field echochar extended_color filter firework firstlast foldkeys form_driver_w gdc hanoi hashtest inch_wide inchs ins_wide insdelln inserts key_names keynames knight lrtest move_field movewindow ncurses newdemo padview pair_content picsmap rain redraw savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr test_delwin test_endwin test_get_wstr test_getstr test_instr test_inwstr test_mouse test_opaque test_setupterm test_termattrs test_unget_wch testaddch testcurs testscanw view worm xmas exit_terminfo test: demo_termcap demo_terminfo dots dots_mvcur dots_termcap list_keys railroad sp_tinfo test_arrays test_sgr test_tparm test_vid_puts test_vidputs extended_color_content test: color_content extended_color extended_color_content_sp test: extended_color @@ -355,7 +355,7 @@ getbegy test: chgat clip_printw demo_menus demo_panels dump_window insdelln m getbkgd test: ncurses getbkgrnd test: ncurses getcchar test: demo_new_pair ncurses savescreen view -getch test: back_ground background blue bs chgat color_content color_set combine demo_altkeys demo_new_pair demo_tabs extended_color filter firework firstlast foldkeys hanoi hashtest insdelln lrtest padview pair_content picsmap savescreen tclock test_mouse test_opaque test_unget_wch testaddch testcurs view xmas +getch test: back_ground background blue bs chgat color_content color_set combine demo_altkeys demo_new_pair demo_tabs extended_color filter firework firstlast foldkeys hanoi hashtest insdelln lrtest padview pair_content picsmap savescreen tclock test_endwin test_mouse test_opaque test_unget_wch testaddch testcurs view xmas getcurx test: bs chgat clip_printw combine demo_altkeys demo_defkey demo_panels dump_window extended_color filter firstlast foldkeys insdelln move_field movewindow ncurses redraw savescreen test_get_wstr test_getstr test_opaque testcurs view getcury test: bs chgat clip_printw demo_altkeys demo_defkey demo_panels dump_window extended_color filter firstlast foldkeys insdelln move_field movewindow ncurses popup_msg redraw savescreen test_mouse test_opaque testcurs view getmaxx test: chgat clip_printw demo_panels dump_window firstlast inch_wide inchs insdelln movewindow ncurses newdemo popup_msg redraw test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs @@ -400,7 +400,7 @@ init_extended_pair test: extended_color ncurses pair_content picsmap init_extended_pair_sp test: extended_color init_pair test: back_ground background blue bs cardfile chgat clip_printw color_set demo_forms demo_menus demo_new_pair demo_panels dots_curses dots_xcurses dup_field echochar filter firework gdc hanoi ins_wide insdelln inserts knight move_field ncurses newdemo padview pair_content picsmap rain savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr testaddch testcurs view worm xmas init_pair_sp lib: ncurses -initscr test: back_ground background blue bs cardfile chgat clip_printw color_content color_set combine demo_defkey demo_forms demo_keyok demo_menus demo_panels demo_tabs dots_curses dots_xcurses dup_field echochar filter firework firstlast form_driver_w gdc hanoi hashtest inch_wide inchs ins_wide insdelln inserts knight lrtest move_field movewindow ncurses newdemo padview pair_content picsmap rain savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_mouse test_opaque test_unget_wch testaddch testcurs testscanw view worm xmas +initscr test: back_ground background blue bs cardfile chgat clip_printw color_content color_set combine demo_defkey demo_forms demo_keyok demo_menus demo_panels demo_tabs dots_curses dots_xcurses dup_field echochar filter firework firstlast form_driver_w gdc hanoi hashtest inch_wide inchs ins_wide insdelln inserts knight lrtest move_field movewindow ncurses newdemo padview pair_content picsmap rain savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr test_endwin test_get_wstr test_getstr test_instr test_inwstr test_mouse test_opaque test_unget_wch testaddch testcurs testscanw view worm xmas innstr test: test_instr innwstr test: test_inwstr ins_nwstr test: ins_wide @@ -415,16 +415,24 @@ instr test: test_instr intrflush test: demo_forms dup_field move_field movewindow intrflush_sp test: sp_tinfo inwstr test: test_inwstr +is_cbreak - +is_cbreak_sp - is_cleared test: test_opaque +is_echo - +is_echo_sp - is_idcok test: test_opaque is_idlok test: test_opaque is_immedok test: test_opaque is_keypad test: ncurses test_opaque is_leaveok test: test_opaque is_linetouched lib: form +is_nl - +is_nl_sp - is_nodelay test: test_opaque is_notimeout test: test_opaque is_pad test: test_opaque +is_raw - +is_raw_sp - is_scrollok test: ncurses test_opaque is_subwin test: test_opaque is_syncok test: test_opaque @@ -543,13 +551,13 @@ mvwprintw test: demo_menus demo_panels inch_wide inchs ncurses test_delwin tes mvwscanw test: testcurs mvwvline test: ins_wide inserts movewindow ncurses test_add_wchstr test_addchstr test_addstr test_addwstr mvwvline_set - -napms test: demo_panels ditto dots dots_curses dots_mvcur dots_xcurses echochar extended_color firework firstlast gdc hanoi lrtest ncurses padview picsmap railroad rain tclock test_opaque testcurs view worm xmas progs: tset +napms test: demo_panels ditto dots dots_curses dots_mvcur dots_termcap dots_xcurses echochar extended_color firework firstlast gdc hanoi lrtest ncurses padview picsmap railroad rain tclock test_opaque testcurs view worm xmas progs: tset napms_sp test: sp_tinfo new_prescr test: sp_tinfo newpad test: ncurses padview popup_msg testcurs newpad_sp lib: ncurses newscr lib: ncurses -newterm test: demo_altkeys demo_new_pair ditto dots_mvcur extended_color filter foldkeys gdc key_names keynames redraw test_delwin test_setupterm test_termattrs +newterm test: demo_altkeys demo_new_pair ditto dots_mvcur extended_color filter foldkeys gdc key_names keynames redraw test_delwin test_endwin test_mouse test_setupterm test_termattrs newterm_sp - newwin test: cardfile chgat clip_printw demo_defkey demo_forms demo_keyok demo_menus demo_panels ditto firstlast inch_wide inchs ins_wide insdelln inserts knight movewindow ncurses newdemo popup_msg redraw test_add_wchstr test_addchstr test_addstr test_addwstr test_delwin test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs view xmas newwin_sp lib: ncurses @@ -566,7 +574,7 @@ nonl test: bs demo_forms dup_field hashtest move_field movewindow ncurses pad nonl_sp lib: ncurses noqiflush - noqiflush_sp test: sp_tinfo -noraw test: demo_forms demo_menus dup_field move_field ncurses testcurs +noraw test: demo_forms demo_menus dup_field move_field ncurses test_mouse testcurs noraw_sp test: sp_tinfo notimeout test: ncurses test_opaque numcodes test: demo_termcap test_arrays progs: dump_entry @@ -587,10 +595,10 @@ putp_sp test: sp_tinfo putwin test: ncurses qiflush - qiflush_sp test: sp_tinfo -raw test: demo_forms dup_field move_field ncurses redraw testcurs +raw test: demo_forms dup_field move_field ncurses redraw test_mouse testcurs raw_sp test: sp_tinfo redrawwin test: combine padview redraw view -refresh test: blue bs color_content demo_defkey demo_forms demo_keyok demo_menus demo_panels demo_tabs dots_curses dots_mvcur dots_xcurses dup_field echochar filter firstlast form_driver_w gdc hanoi hashtest lrtest move_field movewindow ncurses pair_content picsmap savescreen tclock test_delwin test_mouse testcurs view xmas +refresh test: blue bs color_content demo_defkey demo_forms demo_keyok demo_menus demo_panels demo_tabs dots_curses dots_mvcur dots_xcurses dup_field echochar filter firstlast form_driver_w gdc hanoi hashtest lrtest move_field movewindow ncurses pair_content picsmap savescreen tclock test_delwin test_endwin test_mouse testcurs view xmas reset_color_pairs test: picsmap reset_color_pairs_sp - reset_prog_mode test: filter ncurses @@ -629,7 +637,7 @@ set_tabsize_sp test: sp_tinfo set_term lib: ncurses setcchar test: back_ground combine demo_new_pair demo_panels ins_wide ncurses picsmap savescreen test_add_wchstr test_addwstr setscrreg test: view -setupterm test: demo_terminfo dots list_keys sp_tinfo test_mouse test_setupterm test_sgr test_termattrs test_tparm test_vid_puts test_vidputs progs: clear tabs tput tset +setupterm test: demo_terminfo dots list_keys sp_tinfo test_setupterm test_sgr test_termattrs test_tparm test_vid_puts test_vidputs progs: clear tabs tput tset slk_attr - slk_attr_off - slk_attr_on - @@ -686,7 +694,7 @@ tgetnum test: demo_termcap dots_termcap railroad tgetnum_sp test: sp_tinfo tgetstr test: demo_termcap dots_termcap railroad tgetstr_sp test: sp_tinfo -tgoto test: dots_termcap railroad progs: tic +tgoto test: dots_termcap railroad test_mouse progs: tic tigetflag test: demo_terminfo savescreen progs: tic tput tigetflag_sp test: sp_tinfo tigetnum test: demo_tabs demo_terminfo dots dots_mvcur ncurses savescreen progs: tput @@ -694,10 +702,12 @@ tigetnum_sp test: sp_tinfo tigetstr test: blue demo_defkey demo_new_pair demo_terminfo foldkeys list_keys savescreen test_mouse test_sgr test_tparm testcurs progs: clear_cmd tic tput tigetstr_sp test: sp_tinfo timeout test: filter rain savescreen -tiparm - +tiparm test: test_tparm +tiparm_s test: test_tparm +tiscan_s test: test_tparm touchline test: chgat clip_printw insdelln touchwin test: chgat clip_printw demo_menus filter firstlast inch_wide inchs ins_wide insdelln inserts movewindow ncurses popup_msg redraw test_add_wchstr test_addchstr test_addstr test_addwstr test_delwin test_get_wstr test_getstr test_instr test_inwstr test_opaque xmas -tparm test: dots dots_mvcur test_mouse test_sgr test_tparm progs: tic tput +tparm test: dots dots_mvcur test_sgr test_tparm progs: tic tput tputs test: dots dots_mvcur dots_termcap railroad test_tparm test_vid_puts test_vidputs progs: clear_cmd reset_cmd tabs tputs_sp test: sp_tinfo trace - @@ -752,8 +762,8 @@ wattr_get test: ncurses wattr_off lib: ncurses wattr_on lib: ncurses wattr_set test: ncurses -wattroff test: demo_forms ncurses testcurs xmas -wattron test: testcurs xmas +wattroff test: clip_printw demo_forms ncurses testcurs xmas +wattron test: clip_printw testcurs xmas wattrset test: clip_printw demo_forms insdelln ncurses newdemo padview test_get_wstr test_getstr testcurs xmas wbkgd test: cardfile demo_forms demo_menus ncurses newdemo padview testcurs wbkgdset test: demo_panels ins_wide inserts ncurses test_add_wchstr test_addchstr test_addstr test_addwstr diff --git a/test/aclocal.m4 b/test/aclocal.m4 index 538ead13..0eb42964 100644 --- a/test/aclocal.m4 +++ b/test/aclocal.m4 @@ -1,5 +1,5 @@ dnl*************************************************************************** -dnl Copyright 2018-2022,2023 Thomas E. Dickey * +dnl Copyright 2018-2024,2025 Thomas E. Dickey * dnl Copyright 2003-2017,2018 Free Software Foundation, Inc. * dnl * dnl Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ dnl sale, use or other dealings in this Software without prior written * dnl authorization. * dnl*************************************************************************** dnl -dnl $Id: aclocal.m4,v 1.213 2023/02/25 13:45:56 tom Exp $ +dnl $Id: aclocal.m4,v 1.232 2025/01/12 18:41:15 tom Exp $ dnl dnl Author: Thomas E. Dickey dnl @@ -697,7 +697,7 @@ if test "x$ifelse([$2],,CLANG_COMPILER,[$2])" = "xyes" ; then fi ]) dnl --------------------------------------------------------------------------- -dnl CF_CONST_X_STRING version: 7 updated: 2021/06/07 17:39:17 +dnl CF_CONST_X_STRING version: 9 updated: 2024/12/04 03:49:57 dnl ----------------- dnl The X11R4-X11R6 Xt specification uses an ambiguous String type for most dnl character-strings. @@ -724,7 +724,7 @@ CF_SAVE_XTRA_FLAGS([CF_CONST_X_STRING]) AC_TRY_COMPILE( [ -#include +$ac_includes_default #include ], [String foo = malloc(1); free((void*)foo)],[ @@ -732,9 +732,10 @@ AC_TRY_COMPILE( AC_CACHE_CHECK(for X11/Xt const-feature,cf_cv_const_x_string,[ AC_TRY_COMPILE( [ +#undef _CONST_X_STRING #define _CONST_X_STRING /* X11R7.8 (perhaps) */ #undef XTSTRINGDEFINES /* X11R5 and later */ -#include +$ac_includes_default #include ],[String foo = malloc(1); *foo = 0],[ cf_cv_const_x_string=no @@ -900,15 +901,22 @@ CF_CURSES_HEADER CF_TERM_HEADER ])dnl dnl --------------------------------------------------------------------------- -dnl CF_CURSES_FUNCS version: 20 updated: 2020/12/31 20:19:42 +dnl CF_CURSES_FUNCS version: 21 updated: 2024/06/11 20:24:35 dnl --------------- dnl Curses-functions are a little complicated, since a lot of them are macros. +dnl +dnl $1 is a list of functions to test AC_DEFUN([CF_CURSES_FUNCS], [ AC_REQUIRE([CF_CURSES_CPPFLAGS])dnl AC_REQUIRE([CF_XOPEN_CURSES]) AC_REQUIRE([CF_CURSES_TERM_H]) AC_REQUIRE([CF_CURSES_UNCTRL_H]) + +AC_FOREACH([AC_Func], [$1], + [AH_TEMPLATE(AS_TR_CPP(HAVE_[]AC_Func), + [Define if you have the `]AC_Func[' function.])])dnl + for cf_func in $1 do CF_UPPER(cf_tr_func,$cf_func) @@ -1097,7 +1105,7 @@ fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_CURSES_TERM_H version: 15 updated: 2021/01/02 09:31:20 +dnl CF_CURSES_TERM_H version: 16 updated: 2024/01/07 06:34:16 dnl ---------------- dnl SVr4 curses should have term.h as well (where it puts the definitions of dnl the low-level interface). This may not be true in old/broken implementations, @@ -1143,7 +1151,7 @@ case "$cf_cv_term_header" in #ifdef NCURSES_VERSION #include <${cf_header}> #else -make an error +#error expected NCURSES_VERSION to be defined #endif], [WINDOW *x; (void)x], [cf_cv_term_header=$cf_header @@ -1684,19 +1692,36 @@ rm -f core]) test "$cf_cv_func_curses_version" = yes && AC_DEFINE(HAVE_CURSES_VERSION,1,[Define to 1 if we have curses_version function]) ]) dnl --------------------------------------------------------------------------- -dnl CF_FUNC_GETTIME version: 2 updated: 2023/02/25 08:45:56 +dnl CF_FUNC_GETTIME version: 3 updated: 2024/05/11 13:40:02 dnl --------------- dnl Check for gettimeofday or clock_gettime. In 2023, the former is still more dnl widely supported, but "deprecated" (2008), so we will use the latter if it dnl is available, to reduce compiler warnings. AC_DEFUN([CF_FUNC_GETTIME],[ -AC_CACHE_CHECK(for clock_gettime,cf_cv_func_clock_gettime,[ - AC_TRY_LINK([#include ], +cf_save_libs="$LIBS" +AC_CHECK_FUNC(clock_gettime, + cf_cv_test_clock_gettime=yes, + AC_CHECK_LIB(rt, clock_gettime, + [LIBS="-lrt $LIBS" + cf_cv_test_clock_gettime=yes], + cf_cv_test_clock_gettime=no)) + +if test "$cf_cv_test_clock_gettime" = yes ; then +AC_CACHE_CHECK(if clock_gettime links,cf_cv_func_clock_gettime,[ + AC_TRY_LINK([ +$ac_includes_default +#include + ], [struct timespec ts; - int rc = clock_gettime(CLOCK_REALTIME, &ts); (void) rc; (void)ts], + int rc = clock_gettime(CLOCK_REALTIME, &ts) + + clock_gettime(CLOCK_MONOTONIC, &ts); + (void) rc; (void)ts], [cf_cv_func_clock_gettime=yes], [cf_cv_func_clock_gettime=no]) ]) +else + cf_cv_func_clock_gettime=no +fi if test "$cf_cv_func_clock_gettime" = yes then @@ -1711,7 +1736,7 @@ AC_CHECK_LIB(bsd, gettimeofday, fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_FUNC_OPENPTY version: 6 updated: 2021/01/01 13:31:04 +dnl CF_FUNC_OPENPTY version: 7 updated: 2023/12/03 09:21:34 dnl --------------- dnl Check for openpty() function, along with header. It may need the dnl "util" library as well. @@ -1728,6 +1753,7 @@ AC_CACHE_CHECK(for openpty header,cf_cv_func_openpty,[ ],[ int x = openpty((int *)0, (int *)0, (char *)0, (struct termios *)0, (struct winsize *)0); + (void)x; ],[ cf_cv_func_openpty=$cf_header break @@ -1852,7 +1878,7 @@ rm -rf ./conftest* fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_GCC_VERSION version: 8 updated: 2019/09/07 13:38:36 +dnl CF_GCC_VERSION version: 9 updated: 2023/03/05 14:30:13 dnl -------------- dnl Find version of gcc, and (because icc/clang pretend to be gcc without being dnl compatible), attempt to determine if icc/clang is actually used. @@ -1861,7 +1887,7 @@ AC_REQUIRE([AC_PROG_CC]) GCC_VERSION=none if test "$GCC" = yes ; then AC_MSG_CHECKING(version of $CC) - GCC_VERSION="`${CC} --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(GCC[[^)]]*) //' -e 's/^.*(Debian[[^)]]*) //' -e 's/^[[^0-9.]]*//' -e 's/[[^0-9.]].*//'`" + GCC_VERSION="`${CC} --version 2>/dev/null | sed -e '2,$d' -e 's/^[[^(]]*([[^)]][[^)]]*) //' -e 's/^[[^0-9.]]*//' -e 's/[[^0-9.]].*//'`" test -z "$GCC_VERSION" && GCC_VERSION=unknown AC_MSG_RESULT($GCC_VERSION) fi @@ -1869,7 +1895,7 @@ CF_INTEL_COMPILER(GCC,INTEL_COMPILER,CFLAGS) CF_CLANG_COMPILER(GCC,CLANG_COMPILER,CFLAGS) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_GCC_WARNINGS version: 41 updated: 2021/01/01 16:53:59 +dnl CF_GCC_WARNINGS version: 43 updated: 2024/12/21 08:44:12 dnl --------------- dnl Check if the compiler supports useful warning options. There's a few that dnl we don't use, simply because they're too noisy: @@ -1983,13 +2009,14 @@ rm -rf ./conftest* AC_SUBST(EXTRA_CFLAGS) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_GETOPT_HEADER version: 8 updated: 2021/06/19 19:16:16 +dnl CF_GETOPT_HEADER version: 9 updated: 2024/08/10 10:30:39 dnl ---------------- dnl Check for getopt's variables which are commonly defined in stdlib.h, dnl unistd.h or (nonstandard) in getopt.h AC_DEFUN([CF_GETOPT_HEADER], -[ -AC_HAVE_HEADERS(unistd.h getopt.h) +[AC_REQUIRE([AC_HEADER_STDC]) + +AC_CHECK_HEADERS(getopt.h) AC_CACHE_CHECK(for header declaring getopt variables,cf_cv_getopt_header,[ cf_cv_getopt_header=none for cf_header in stdio.h stdlib.h unistd.h getopt.h @@ -2009,6 +2036,26 @@ if test "$cf_cv_getopt_header" = getopt.h ; then fi ])dnl dnl --------------------------------------------------------------------------- +dnl CF_GLOB_FULLPATH version: 2 updated: 2024/08/03 12:34:02 +dnl ---------------- +dnl Use this in case-statements to check for pathname syntax, i.e., absolute +dnl pathnames. The "x" is assumed since we provide an alternate form for DOS. +AC_DEFUN([CF_GLOB_FULLPATH],[ +AC_REQUIRE([CF_WITH_SYSTYPE])dnl +case "$cf_cv_system_name" in +(cygwin*|msys*|mingw32*|mingw64|os2*) + GLOB_FULLPATH_POSIX='/*' + GLOB_FULLPATH_OTHER='[[a-zA-Z]]:[[\\/]]*' + ;; +(*) + GLOB_FULLPATH_POSIX='/*' + GLOB_FULLPATH_OTHER=$GLOB_FULLPATH_POSIX + ;; +esac +AC_SUBST(GLOB_FULLPATH_POSIX) +AC_SUBST(GLOB_FULLPATH_OTHER) +])dnl +dnl --------------------------------------------------------------------------- dnl CF_GNU_SOURCE version: 10 updated: 2018/12/10 20:09:41 dnl ------------- dnl Check if we must define _GNU_SOURCE to get a reasonable value for @@ -2182,7 +2229,7 @@ AC_DEFUN([CF_INHERIT_SCRIPT], test -f $1 || ( test -f ../$1 && cp ../$1 ./ ) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_INSTALL_OPTS version: 2 updated: 2018/08/18 12:19:21 +dnl CF_INSTALL_OPTS version: 3 updated: 2023/06/03 15:17:30 dnl --------------- dnl prompt for/fill-in useful install-program options AC_DEFUN([CF_INSTALL_OPTS], @@ -2190,6 +2237,7 @@ AC_DEFUN([CF_INSTALL_OPTS], CF_INSTALL_OPT_S CF_INSTALL_OPT_P CF_INSTALL_OPT_O +CF_INSTALL_OPT_STRIP_PROG ])dnl dnl --------------------------------------------------------------------------- dnl CF_INSTALL_OPT_O version: 3 updated: 2020/12/31 20:19:42 @@ -2276,6 +2324,106 @@ fi AC_SUBST(INSTALL_OPT_S) ])dnl dnl --------------------------------------------------------------------------- +dnl CF_INSTALL_OPT_STRIP_PROG version: 1 updated: 2023/06/03 15:17:30 +dnl ------------------------- +dnl Provide an option for overriding the strip program used in install "-s" +dnl +dnl coreutils install provides a --strip-program option +dnl FreeBSD uses STRIPBIN environment variable, while NetBSD and OpenBSD use +dnl STRIP environment variable. Other versions of install do not support this. +AC_DEFUN([CF_INSTALL_OPT_STRIP_PROG], +[ +AC_REQUIRE([CF_INSTALL_OPT_S]) +if test -n "$INSTALL_OPT_S" +then + AC_MSG_CHECKING(if you want to specify strip-program) + AC_ARG_WITH(strip-program, + [ --with-strip-program=XX specify program to use when stripping in install], + [with_strip_program=$withval], + [with_strip_program=no]) + AC_MSG_RESULT($with_strip_program) + if test "$with_strip_program" != no + then + AC_MSG_CHECKING(if strip-program is supported with this installer) + cf_install_program=`echo "$INSTALL" | sed -e 's%[[ ]]*[[ ]]-.%%'` + check_install_strip=no + if test -f "$cf_install_program" + then + check_install_version=`"$cf_install_program" --version 2>/dev/null | head -n 1 | grep coreutils` + if test -n "$check_install_version" + then + check_install_strip="option" + else + for check_strip_variable in STRIPBIN STRIP + do + if strings "$cf_install_program" | grep "^$check_strip_variable[$]" >/dev/null + then + check_install_strip="environ" + break + fi + done + fi + fi + AC_MSG_RESULT($check_install_strip) + case "$check_install_strip" in + (no) + AC_MSG_WARN($cf_install_program does not support strip program option) + with_strip_program=no + ;; + (environ) + cat >install.tmp <<-CF_EOF + #! $SHELL + STRIPBIN="$with_strip_program" \\ + STRIP="$with_strip_program" \\ + $INSTALL "[$]@" + CF_EOF + INSTALL="`pwd`/install.tmp" + chmod +x "$INSTALL" + CF_VERBOSE(created $INSTALL) + ;; + (option) + INSTALL_OPT_S="$INSTALL_OPT_S --strip-program=\"$with_strip_program\"" + ;; + esac + fi +fi +AC_SUBST(INSTALL_OPT_S) +])dnl +dnl --------------------------------------------------------------------------- +dnl CF_INSTALL_PREFIX version: 1 updated: 2024/08/10 20:16:32 +dnl ----------------- +dnl Special option for use by system-builders: the install-prefix is used to +dnl adjust the location into which the actual install is done, so that an +dnl archive can be built without modifying the host system's configuration. +AC_DEFUN([CF_INSTALL_PREFIX],[ +AC_MSG_CHECKING(for an installation directory prefix) +AC_ARG_WITH(install-prefix, + [ --with-install-prefix=DESTDIR use DESTDIR as installation directory prefix], + [case "x$withval" in + (xyes|xno) + ;; + (*) DESTDIR="$withval" + ;; + esac]) +AC_MSG_RESULT([${DESTDIR:-(none)}]) +AC_SUBST(DESTDIR) + +AC_MSG_CHECKING(if installation directory prefix should be merged) +CF_ARG_ENABLE(install-prefix, + [ --enable-install-prefix merge DESTDIR with installation prefix], + cf_install_prefix=yes, + cf_install_prefix=no) +AC_MSG_RESULT($cf_install_prefix) + +if test "$cf_install_prefix" = yes ; then + MERGE_PREFIX=':$(prefix)%=%' +else + MERGE_PREFIX='' +fi + +AC_SUBST(MERGE_PREFIX) +])dnl +dnl --------------------------------------------------------------------------- dnl CF_INTEL_COMPILER version: 9 updated: 2023/02/18 17:41:25 dnl ----------------- dnl Check if the given compiler is really the Intel compiler for Linux. It @@ -2640,7 +2788,7 @@ printf("old\\n"); ,[$1=no]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_NCURSES_CONFIG version: 28 updated: 2021/08/28 15:20:37 +dnl CF_NCURSES_CONFIG version: 29 updated: 2025/01/10 19:55:54 dnl ----------------- dnl Tie together the configure-script macros for ncurses, preferring these in dnl order: @@ -2701,6 +2849,7 @@ if test "x${PKG_CONFIG:=none}" != xnone; then ;; esac + CF_REQUIRE_PKG($cf_ncuconfig_root) CF_APPEND_CFLAGS($cf_pkg_cflags) CF_ADD_LIBS($cf_pkg_libs) @@ -2990,13 +3139,12 @@ CF_UPPER(cf_nculib_ROOT,HAVE_LIB$cf_nculib_root) AC_DEFINE_UNQUOTED($cf_nculib_ROOT) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_NCURSES_PTHREADS version: 2 updated: 2016/04/22 05:07:41 +dnl CF_NCURSES_PTHREADS version: 3 updated: 2024/07/06 13:57:42 dnl ------------------- -dnl Use this followup check to ensure that we link with pthreads if ncurses -dnl uses it. +dnl Use this followup check, e.g., in CF_WITH_NCURSES_ETC, to ensure that we +dnl link with pthreads if ncurses uses it. AC_DEFUN([CF_NCURSES_PTHREADS],[ -: ${cf_nculib_root:=ifelse($1,,ncurses,$1)} -AC_CHECK_LIB($cf_nculib_root,_nc_init_pthreads, +AC_CHECK_FUNC(_nc_init_pthreads, cf_cv_ncurses_pthreads=yes, cf_cv_ncurses_pthreads=no) if test "$cf_cv_ncurses_pthreads" = yes @@ -3005,7 +3153,7 @@ then fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_NCURSES_VERSION version: 17 updated: 2023/01/05 18:54:02 +dnl CF_NCURSES_VERSION version: 18 updated: 2024/01/07 06:34:16 dnl ------------------ dnl Check for the version of ncurses, to aid in reporting bugs, etc. dnl Call CF_CURSES_CPPFLAGS first, or CF_NCURSES_CPPFLAGS. We don't use @@ -3035,7 +3183,7 @@ int main(void) # ifdef __NCURSES_H fprintf(fp, "old\\n"); # else - make an error + #error expected ncurses header to define __NCURSES_H # endif #endif ${cf_cv_main_return:-return}(0); @@ -3163,35 +3311,35 @@ case ".$with_cflags" in esac ])dnl dnl --------------------------------------------------------------------------- -dnl CF_PATH_SYNTAX version: 18 updated: 2020/12/31 18:40:20 +dnl CF_PATH_SYNTAX version: 19 updated: 2024/08/03 13:08:58 dnl -------------- dnl Check the argument to see that it looks like a pathname. Rewrite it if it dnl begins with one of the prefix/exec_prefix variables, and then again if the dnl result begins with 'NONE'. This is necessary to work around autoconf's dnl delayed evaluation of those symbols. AC_DEFUN([CF_PATH_SYNTAX],[ +AC_REQUIRE([CF_GLOB_FULLPATH])dnl + if test "x$prefix" != xNONE; then cf_path_syntax="$prefix" else cf_path_syntax="$ac_default_prefix" fi -case ".[$]$1" in -(.\[$]\(*\)*|.\'*\'*) - ;; -(..|./*|.\\*) +case "x[$]$1" in +(x\[$]\(*\)*|x\'*\'*) ;; -(.[[a-zA-Z]]:[[\\/]]*) # OS/2 EMX +(x.|x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER) ;; -(.\[$]\{*prefix\}*|.\[$]\{*dir\}*) +(x\[$]\{*prefix\}*|x\[$]\{*dir\}*) eval $1="[$]$1" - case ".[$]$1" in - (.NONE/*) + case "x[$]$1" in + (xNONE/*) $1=`echo "[$]$1" | sed -e s%NONE%$cf_path_syntax%` ;; esac ;; -(.no|.NONE/*) +(xno|xNONE/*) $1=`echo "[$]$1" | sed -e s%NONE%$cf_path_syntax%` ;; (*) @@ -3245,7 +3393,7 @@ else fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_PKG_CONFIG version: 12 updated: 2021/10/10 20:18:09 +dnl CF_PKG_CONFIG version: 13 updated: 2023/10/28 11:59:01 dnl ------------- dnl Check for the package-config program, unless disabled by command-line. dnl @@ -3254,7 +3402,7 @@ AC_DEFUN([CF_PKG_CONFIG], [ AC_MSG_CHECKING(if you want to use pkg-config) AC_ARG_WITH(pkg-config, - [ --with-pkg-config{=path} enable/disable use of pkg-config], + [[ --with-pkg-config[=CMD] enable/disable use of pkg-config and its name CMD]], [cf_pkg_config=$withval], [cf_pkg_config=yes]) AC_MSG_RESULT($cf_pkg_config) @@ -3430,15 +3578,16 @@ CF_ACVERSION_CHECK(2.52, CF_CC_ENV_FLAGS ])dnl dnl --------------------------------------------------------------------------- -dnl CF_PROG_INSTALL version: 10 updated: 2021/01/04 19:33:05 +dnl CF_PROG_INSTALL version: 11 updated: 2024/08/03 13:08:58 dnl --------------- dnl Force $INSTALL to be an absolute-path. Otherwise, edit_man.sh and the dnl misc/tabset install won't work properly. Usually this happens only when dnl using the fallback mkinstalldirs script AC_DEFUN([CF_PROG_INSTALL], [AC_PROG_INSTALL -case $INSTALL in -(/*) +AC_REQUIRE([CF_GLOB_FULLPATH])dnl +case x$INSTALL in +(x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER) ;; (*) CF_DIRNAME(cf_dir,$INSTALL) @@ -3448,14 +3597,17 @@ case $INSTALL in esac ])dnl dnl --------------------------------------------------------------------------- -dnl CF_PROG_LINT version: 5 updated: 2022/08/20 15:44:13 +dnl CF_PROG_LINT version: 7 updated: 2024/11/30 14:37:45 dnl ------------ AC_DEFUN([CF_PROG_LINT], [ AC_CHECK_PROGS(LINT, lint cppcheck splint) case "x$LINT" in +(xlint|x*/lint) # NetBSD 10 + test -z "$LINT_OPTS" && LINT_OPTS="-chapbrxzgFS -v -Ac11" + ;; (xcppcheck|x*/cppcheck) - test -z "$LINT_OPTS" && LINT_OPTS="--enable=all" + test -z "$LINT_OPTS" && LINT_OPTS="--enable=all -D__CPPCHECK__" ;; esac AC_SUBST(LINT_OPTS) @@ -3497,6 +3649,30 @@ $1=`echo "$2" | \ -e 's/-[[UD]]'"$3"'\(=[[^ ]]*\)\?[$]//g'` ])dnl dnl --------------------------------------------------------------------------- +dnl CF_REQUIRE_PKG version: 1 updated: 2025/01/10 19:55:54 +dnl -------------- +dnl Update $REQUIRE_PKG, which lists the known required packages for this +dnl program. +dnl +dnl $1 = package(s) to require, e.g., in the generated ".pc" file +define([CF_REQUIRE_PKG], +[ +for cf_required in $1 +do + # check for duplicates + for cf_require_pkg in $REQUIRE_PKG + do + if test "$cf_required" = "$cf_require_pkg" + then + cf_required= + break + fi + done + test -n "$cf_required" && REQUIRE_PKG="$REQUIRE_PKG $cf_required" +done +AC_SUBST(REQUIRE_PKG) +])dnl +dnl --------------------------------------------------------------------------- dnl CF_RESTORE_XTRA_FLAGS version: 1 updated: 2020/01/11 16:47:45 dnl --------------------- dnl Restore flags saved in CF_SAVE_XTRA_FLAGS @@ -3909,7 +4085,7 @@ AC_DEFUN([CF_TRIM_X_LIBS],[ done ]) dnl --------------------------------------------------------------------------- -dnl CF_TRY_PKG_CONFIG version: 6 updated: 2020/12/31 10:54:15 +dnl CF_TRY_PKG_CONFIG version: 7 updated: 2025/01/10 19:55:54 dnl ----------------- dnl This is a simple wrapper to use for pkg-config, for libraries which may be dnl available in that form. @@ -3926,6 +4102,7 @@ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "$1"; then cf_pkgconfig_libs="`$PKG_CONFIG --libs "$1" 2>/dev/null`" CF_VERBOSE(package $1 CFLAGS: $cf_pkgconfig_incs) CF_VERBOSE(package $1 LIBS: $cf_pkgconfig_libs) + CF_REQUIRE_PKG($1) CF_ADD_CFLAGS($cf_pkgconfig_incs) CF_ADD_LIBS($cf_pkgconfig_libs) ifelse([$2],,:,[$2]) @@ -3970,12 +4147,12 @@ AC_DEFUN([CF_UPPER], $1=`echo "$2" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` ])dnl dnl --------------------------------------------------------------------------- -dnl CF_UTF8_LIB version: 10 updated: 2023/01/11 04:05:23 +dnl CF_UTF8_LIB version: 11 updated: 2024/08/10 10:23:45 dnl ----------- dnl Check for multibyte support, and if not found, utf8 compatibility library AC_DEFUN([CF_UTF8_LIB], [ -AC_HAVE_HEADERS(wchar.h) +AC_CHECK_HEADERS(wchar.h) AC_CACHE_CHECK(for multibyte character support,cf_cv_utf8_lib,[ cf_save_LIBS="$LIBS" AC_TRY_LINK([ @@ -4009,7 +4186,7 @@ AC_DEFUN([CF_VERBOSE], CF_MSG_LOG([$1]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_WCHAR_TYPE version: 4 updated: 2012/10/06 16:39:58 +dnl CF_WCHAR_TYPE version: 5 updated: 2023/12/03 09:21:34 dnl ------------- dnl Check if type wide-character type $1 is declared, and if so, which header dnl file is needed. The second parameter is used to set a shell variable when @@ -4026,7 +4203,7 @@ AC_TRY_COMPILE([ #ifdef HAVE_LIBUTF8_H #include #endif], - [$1 state], + [$1 state; (void)state], [cf_cv_$1=no], [AC_TRY_COMPILE([ #include @@ -4036,7 +4213,7 @@ AC_TRY_COMPILE([ #ifdef HAVE_LIBUTF8_H #include #endif], - [$1 value], + [$1 value; (void) value], [cf_cv_$1=yes], [cf_cv_$1=unknown])])]) @@ -4113,7 +4290,7 @@ if test "$with_dmalloc" = yes ; then fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_WITH_LIB_BASENAME version: 1 updated: 2020/03/07 20:05:14 +dnl CF_WITH_LIB_BASENAME version: 2 updated: 2023/11/22 20:48:30 dnl -------------------- dnl Allow for overriding the basename of a library, i.e., the part to which dnl prefixes/suffixes are attached. @@ -4125,7 +4302,7 @@ AC_DEFUN([CF_WITH_LIB_BASENAME], [ AC_MSG_CHECKING(for desired basename for $2 library) AC_ARG_WITH($2-libname, - [ --with-$2-libname=XXX override ifelse($3,,$2,$3) basename of library], + [[ --with-$2-libname[=XXX] override ifelse($3,,$2,$3) basename of library]], [with_lib_basename=$withval], [with_lib_basename=ifelse($3,,$2,$3)]) $1="$with_lib_basename" @@ -4142,7 +4319,7 @@ AC_MSG_RESULT([$]$1) AC_SUBST($1) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_WITH_NCURSES_ETC version: 6 updated: 2023/01/16 10:10:06 +dnl CF_WITH_NCURSES_ETC version: 7 updated: 2025/01/12 13:41:15 dnl ------------------- dnl Use this macro for programs which use any variant of "curses", e.g., dnl "ncurses", and "PDCurses". Programs that can use curses and some unrelated @@ -4193,7 +4370,7 @@ case $cf_cv_screen in (ncurses*) CF_NCURSES_CONFIG($cf_cv_screen) ;; -(pdcurses) +(pdcurses*) CF_PDCURSES_X11 ;; (*) @@ -4223,6 +4400,26 @@ then fi ])dnl dnl --------------------------------------------------------------------------- +dnl CF_WITH_SYSTYPE version: 1 updated: 2013/01/26 16:26:12 +dnl --------------- +dnl For testing, override the derived host system-type which is used to decide +dnl things such as the linker commands used to build shared libraries. This is +dnl normally chosen automatically based on the type of system which you are +dnl building on. We use it for testing the configure script. +dnl +dnl This is different from the --host option: it is used only for testing parts +dnl of the configure script which would not be reachable with --host since that +dnl relies on the build environment being real, rather than mocked up. +AC_DEFUN([CF_WITH_SYSTYPE],[ +CF_CHECK_CACHE([AC_CANONICAL_SYSTEM]) +AC_ARG_WITH(system-type, + [ --with-system-type=XXX test: override derived host system-type], +[AC_MSG_WARN(overriding system type to $withval) + cf_cv_system_name=$withval + host_os=$withval +]) +])dnl +dnl --------------------------------------------------------------------------- dnl CF_WITH_VALGRIND version: 1 updated: 2006/12/14 18:00:21 dnl ---------------- AC_DEFUN([CF_WITH_VALGRIND],[ @@ -4231,7 +4428,7 @@ CF_NO_LEAKS_OPTION(valgrind, [USE_VALGRIND]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_WITH_X11_RGB version: 2 updated: 2019/12/31 08:53:54 +dnl CF_WITH_X11_RGB version: 3 updated: 2023/10/28 11:59:01 dnl --------------- dnl Handle configure option "--with-x11-rgb", setting these shell dnl variables: @@ -4271,7 +4468,7 @@ dnl /usr/X11/lib/X11/rgb.txt AC_DEFUN([CF_WITH_X11_RGB],[ AC_MSG_CHECKING(for X11 rgb file) AC_ARG_WITH(x11-rgb, - [ --with-x11-rgb=FILE file containing X11 rgb information (EPREFIX/lib/X11/rgb.txt)], + [ --with-x11-rgb=FILE obtain X11 color definitions from FILE (default: EPREFIX/lib/X11/rgb.txt)], [RGB_PATH=$withval], [RGB_PATH=auto]) @@ -4317,7 +4514,7 @@ fi AC_SUBST(no_x11_rgb) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_XOPEN_CURSES version: 18 updated: 2023/01/11 04:05:23 +dnl CF_XOPEN_CURSES version: 20 updated: 2024/01/07 06:54:12 dnl --------------- dnl Test if we should define X/Open source for curses, needed on Digital Unix dnl 4.x, to see the extended functions, but breaks on IRIX 6.x. @@ -4334,15 +4531,16 @@ $ac_includes_default #include <${cf_cv_ncurses_header:-curses.h}>],[ #if defined(NCURSES_VERSION_PATCH) #if (NCURSES_VERSION_PATCH < 20100501) && (NCURSES_VERSION_PATCH >= 20100403) - make an error + #error disallow ncurses versions between 2020/04/03 and 2010/05/01 #endif #endif #ifdef NCURSES_WIDECHAR -make an error /* prefer to fall-through on the second checks */ +#error prefer to fall-through on the second checks #endif + static char dummy[10]; cchar_t check; int check2 = curs_set((int)sizeof(check)); - long x = winnstr(stdscr, "", 0); + long x = winnstr(stdscr, dummy, 5); int x1, y1; (void)check2; getbegyx(stdscr, y1, x1); @@ -4358,9 +4556,10 @@ make an error /* prefer to fall-through on the second checks */ #define $cf_try_xopen_extension 1 $ac_includes_default #include <${cf_cv_ncurses_header:-curses.h}>],[ + static char dummy[10]; cchar_t check; int check2 = curs_set((int)sizeof(check)); - long x = winnstr(stdscr, "", 0); + long x = winnstr(stdscr, dummy, 5); int x1, y1; getbegyx(stdscr, y1, x1); (void)check2; @@ -4381,7 +4580,7 @@ esac ])dnl dnl --------------------------------------------------------------------------- -dnl CF_XOPEN_SOURCE version: 64 updated: 2023/02/18 17:41:25 +dnl CF_XOPEN_SOURCE version: 68 updated: 2024/11/09 18:07:29 dnl --------------- dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions, dnl or adapt to the vendor's definitions to get equivalent functionality, @@ -4390,6 +4589,18 @@ dnl dnl Parameters: dnl $1 is the nominal value for _XOPEN_SOURCE dnl $2 is the nominal value for _POSIX_C_SOURCE +dnl +dnl The default case prefers _XOPEN_SOURCE over _POSIX_C_SOURCE if the +dnl implementation predefines it, because X/Open and most implementations agree +dnl that the latter is a legacy or "aligned" value. +dnl +dnl Because _XOPEN_SOURCE is preferred, if defining _POSIX_C_SOURCE turns +dnl that off, then refrain from setting _POSIX_C_SOURCE explicitly. +dnl +dnl References: +dnl https://pubs.opengroup.org/onlinepubs/007904975/functions/xsh_chap02_02.html +dnl https://docs.oracle.com/cd/E19253-01/816-5175/standards-5/index.html +dnl https://www.gnu.org/software/libc/manual/html_node/Feature-Test-Macros.html AC_DEFUN([CF_XOPEN_SOURCE],[ AC_REQUIRE([AC_CANONICAL_HOST]) AC_REQUIRE([CF_POSIX_VISIBLE]) @@ -4429,9 +4640,12 @@ case "$host_os" in cf_xopen_source="-D_SGI_SOURCE" cf_XOPEN_SOURCE= ;; -(linux*gnu|linux*gnuabi64|linux*gnuabin32|linux*gnueabi|linux*gnueabihf|linux*gnux32|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys) +(linux*gnu|linux*gnuabi64|linux*gnuabin32|linux*gnueabi|linux*gnueabihf|linux*gnux32|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys|mingw*|linux*uclibc) CF_GNU_SOURCE($cf_XOPEN_SOURCE) ;; +linux*musl) + cf_xopen_source="-D_BSD_SOURCE" + ;; (minix*) cf_xopen_source="-D_NETBSD_SOURCE" # POSIX.1-2001 features are ifdef'd with this... ;; @@ -4481,8 +4695,8 @@ case "$host_os" in cf_save_xopen_cppflags="$CPPFLAGS" CF_POSIX_C_SOURCE($cf_POSIX_C_SOURCE) # Some of these niche implementations use copy/paste, double-check... - if test "$cf_cv_xopen_source" != no ; then - CF_VERBOSE(checking if _POSIX_C_SOURCE inteferes) + if test "$cf_cv_xopen_source" = no ; then + CF_VERBOSE(checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE) AC_TRY_COMPILE(CF__XOPEN_SOURCE_HEAD,CF__XOPEN_SOURCE_BODY,,[ AC_MSG_WARN(_POSIX_C_SOURCE definition is not usable) CPPFLAGS="$cf_save_xopen_cppflags"]) diff --git a/test/back_ground.c b/test/back_ground.c index c53c2a36..71a16057 100644 --- a/test/back_ground.c +++ b/test/back_ground.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2021,2022 Thomas E. Dickey * + * Copyright 2021-2022,2024 Thomas E. Dickey * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -26,7 +26,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: back_ground.c,v 1.9 2022/12/10 22:28:50 tom Exp $ + * $Id: back_ground.c,v 1.14 2024/11/30 18:36:56 tom Exp $ */ #include @@ -40,7 +40,7 @@ static int default_bg = COLOR_BLACK; static int default_fg = COLOR_WHITE; -static wchar_t wide_fill = L' '; +static wchar_t fill_char = L' '; static wchar_t decode_wchar(const char *value) @@ -78,7 +78,7 @@ test_background(void) } dump_window(stdscr); - blank[0] = wide_fill; + blank[0] = fill_char; blank[1] = L'\0'; printw("Initializing pair 1 to red/%s\n", color_name(default_bg)); @@ -182,11 +182,12 @@ usage(int ok) ," -a invoke assume_default_colors, repeat to use in init_pair" #endif ," -b XXX specify background color" + ," -B XXX specify background character" #if HAVE_USE_DEFAULT_COLORS ," -d invoke use_default_colors, repeat to use in init_pair" #endif ," -f XXX specify foreground color" - ," -l FILE log window-dumps to this file" + ," -L FILE log window-dumps to this file" ," -w fill background with stipple pattern" ," -W CODE fill background with this Unicode value" }; @@ -214,7 +215,7 @@ main(int argc, char *argv[]) setlocale(LC_ALL, ""); - while ((ch = getopt(argc, argv, OPTS_COMMON "ab:df:l:wW:")) != -1) { + while ((ch = getopt(argc, argv, OPTS_COMMON "B:L:W:ab:df:w")) != -1) { switch (ch) { #if HAVE_ASSUME_DEFAULT_COLORS case 'a': @@ -224,6 +225,17 @@ main(int argc, char *argv[]) case 'b': default_bg = color_code(optarg); break; + case 'B': + if (strlen(optarg) > 1) { + char *check = NULL; + long value = strtol(optarg, &check, 0); + if (*check != '\0') + usage(FALSE); + fill_char = (wchar_t) value; + } else { + fill_char = (wchar_t) *optarg; + } + break; #if HAVE_USE_DEFAULT_COLORS case 'd': ++d_option; @@ -232,15 +244,15 @@ main(int argc, char *argv[]) case 'f': default_fg = color_code(optarg); break; - case 'l': + case 'L': if (!open_dump(optarg)) usage(FALSE); break; case 'w': - wide_fill = L'\u2591'; + fill_char = L'\u2591'; break; case 'W': - wide_fill = decode_wchar(optarg); + fill_char = decode_wchar(optarg); break; case OPTS_VERSION: show_version(argv); diff --git a/test/background.c b/test/background.c index 5942debb..0e9f3bc7 100644 --- a/test/background.c +++ b/test/background.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2021,2022 Thomas E. Dickey * + * Copyright 2018-2022,2024 Thomas E. Dickey * * Copyright 2003-2014,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: background.c,v 1.24 2022/12/10 22:28:50 tom Exp $ + * $Id: background.c,v 1.29 2024/11/30 18:37:15 tom Exp $ */ #define NEED_COLOR_CODE 1 @@ -37,6 +37,7 @@ static int default_bg = COLOR_BLACK; static int default_fg = COLOR_WHITE; +static unsigned char fill_char = ' '; static void test_background(void) @@ -45,6 +46,7 @@ test_background(void) int row; int chr; + printw("Background character %#x\n", fill_char); if (pair_content(0, &f, &b) == ERR) { printw("pair 0 contains no data\n"); } else { @@ -54,13 +56,13 @@ test_background(void) printw("Initializing pair 1 to red/%s\n", color_name(default_bg)); init_pair(1, COLOR_RED, (NCURSES_COLOR_T) default_bg); - bkgdset((chtype) (' ' | COLOR_PAIR(1))); + bkgdset((chtype) (fill_char | COLOR_PAIR(1))); printw("RED/BLACK\n"); dump_window(stdscr); printw("Initializing pair 2 to %s/blue\n", color_name(default_fg)); init_pair(2, (NCURSES_COLOR_T) default_fg, COLOR_BLUE); - bkgdset((chtype) (' ' | COLOR_PAIR(2))); + bkgdset((chtype) (fill_char | COLOR_PAIR(2))); printw("This line should be %s/blue\n", color_name(default_fg)); dump_window(stdscr); @@ -98,33 +100,33 @@ test_background(void) printw("j\n"); dump_window(stdscr); - bkgdset((chtype) (' ' | COLOR_PAIR(0))); + bkgdset((chtype) (fill_char | COLOR_PAIR(0))); printw("Default Colors\n"); dump_window(stdscr); printw("Resetting colors to pair 1\n"); - bkgdset((chtype) (' ' | COLOR_PAIR(1))); + bkgdset((chtype) (fill_char | COLOR_PAIR(1))); printw("This line should be red/%s\n", color_name(default_bg)); dump_window(stdscr); printw("Setting screen to pair 0\n"); - bkgd((chtype) (' ' | COLOR_PAIR(0))); + bkgd((chtype) (fill_char | COLOR_PAIR(0))); dump_window(stdscr); printw("Setting screen to pair 1\n"); - bkgd((chtype) (' ' | COLOR_PAIR(1))); + bkgd((chtype) (fill_char | COLOR_PAIR(1))); dump_window(stdscr); printw("Setting screen to pair 2\n"); - bkgd((chtype) (' ' | COLOR_PAIR(2))); + bkgd((chtype) (fill_char | COLOR_PAIR(2))); dump_window(stdscr); printw("Setting screen to pair 3\n"); - bkgd((chtype) (' ' | COLOR_PAIR(3))); + bkgd((chtype) (fill_char | COLOR_PAIR(3))); dump_window(stdscr); printw("Setting screen to pair 0\n"); - bkgd((chtype) (' ' | COLOR_PAIR(0))); + bkgd((chtype) (fill_char | COLOR_PAIR(0))); dump_window(stdscr); } @@ -141,11 +143,12 @@ usage(int ok) ," -a invoke assume_default_colors, repeat to use in init_pair" #endif ," -b XXX specify background color" + ," -B XXX specify background character" #if HAVE_USE_DEFAULT_COLORS ," -d invoke use_default_colors, repeat to use in init_pair" #endif ," -f XXX specify foreground color" - ," -l FILE log window-dumps to this file" + ," -L FILE log window-dumps to this file" }; size_t n; @@ -171,7 +174,7 @@ main(int argc, char *argv[]) setlocale(LC_ALL, ""); - while ((ch = getopt(argc, argv, OPTS_COMMON "ab:df:l:")) != -1) { + while ((ch = getopt(argc, argv, OPTS_COMMON "B:L:ab:df:")) != -1) { switch (ch) { #if HAVE_ASSUME_DEFAULT_COLORS case 'a': @@ -181,6 +184,17 @@ main(int argc, char *argv[]) case 'b': default_bg = color_code(optarg); break; + case 'B': + if (strlen(optarg) > 1) { + char *check = NULL; + long value = strtol(optarg, &check, 0); + if (*check != '\0') + usage(FALSE); + fill_char = (unsigned char) value; + } else { + fill_char = (unsigned char) *optarg; + } + break; #if HAVE_USE_DEFAULT_COLORS case 'd': ++d_option; @@ -189,7 +203,7 @@ main(int argc, char *argv[]) case 'f': default_fg = color_code(optarg); break; - case 'l': + case 'L': if (!open_dump(optarg)) usage(FALSE); break; diff --git a/test/blue.c b/test/blue.c index 90f240b6..8f6f8bcb 100644 --- a/test/blue.c +++ b/test/blue.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2019-2021,2022 Thomas E. Dickey * + * Copyright 2019-2022,2024 Thomas E. Dickey * * Copyright 1998-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -37,7 +37,7 @@ *****************************************************************************/ /* - * $Id: blue.c,v 1.55 2022/12/10 23:31:31 tom Exp $ + * $Id: blue.c,v 1.57 2024/12/07 22:27:13 tom Exp $ */ #include @@ -437,7 +437,7 @@ game_finished(int deal) static void use_pc_display(void) { - char *check = nl_langinfo(CODESET); + const char *check = nl_langinfo(CODESET); if (!strcmp(check, "UTF-8")) { #if USE_WIDEC_SUPPORT suits = uglyphs; @@ -448,13 +448,13 @@ use_pc_display(void) !strcmp(check, "CP437") || !strcmp(check, "IBM850") || !strcmp(check, "CP850")) { - char *smacs = tigetstr("smacs"); - char *smpch = tigetstr("smpch"); + const char *smacs = tigetstr("smacs"); + const char *smpch = tigetstr("smpch"); /* * The ncurses library makes this check to decide whether to allow * the alternate character set for the (normally) nonprinting codes. */ - if (smacs != 0 && smpch != 0 && !strcmp(smacs, smpch)) { + if (smacs != NULL && smpch != NULL && !strcmp(smacs, smpch)) { suits = glyphs; } } diff --git a/test/bs.6 b/test/bs.6 index 3bb1f10b..03021f65 100644 --- a/test/bs.6 +++ b/test/bs.6 @@ -1,5 +1,5 @@ .\"*************************************************************************** -.\" Copyright 2020,2021 Thomas E. Dickey * +.\" Copyright 2020-2021,2024 Thomas E. Dickey * .\" Copyright 1998,2006 Free Software Foundation, Inc. * .\" * .\" Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,46 +27,69 @@ .\" authorization. * .\"*************************************************************************** .\" -.\" $Id: bs.6,v 1.4 2021/06/17 21:20:30 tom Exp $ -.TH BATTLESHIPS 6 "Aug 23, 1989" +.\" $Id: bs.6,v 1.8 2024/06/15 20:32:28 tom Exp $ +.TH BATTLESHIPS 6 2024-06-15 ncurses-examples Games +.ie \n(.g \{\ +.ds `` \(lq +.ds '' \(rq +.\} +.el \{\ +.ie t .ds `` `` +.el .ds `` "" +.ie t .ds '' '' +.el .ds '' "" +.\} .SH NAME -bs \- battleships game +bs \- +battleships game .SH SYNOPSIS -battle [ -b | -s ] [ -c ] +battle [ \-b | \-s ] [ \-c ] .SH DESCRIPTION This program allows you to play the familiar Battleships game against the -computer on a 10x10 board. The interface is visual and largely -self-explanatory; you place your ships and pick your shots by moving the -cursor around the `sea' with the rogue/hack motion keys hjklyubn. +computer on a 10x10 board. +The interface is visual and largely self-explanatory; +you place your ships and pick your shots by moving the +cursor around the \*(``sea\*('' with the rogue/hack motion keys hjklyubn. .PP -Note that when selecting a ship to place, you must type the capital letter -(these are, after all, capital ships). During ship placement, the `r' command +Note that when selecting a ship to place, +you must type the capital letter +(these are, after all, capital ships). +During ship placement, +the \*(``r\*('' command may be used to ignore the current position and randomly place your currently -selected ship. The `R' command will place all remaining ships randomly. The ^L -command (form feed, ASCII 12) will force a screen redraw). +selected ship. +The \*(``R\*('' command will place all remaining ships randomly. +The ^L command (form feed, +ASCII 12) will force a screen redraw). .PP The command-line arguments control game modes. .nf - -b selects a `blitz' variant - -s selects a `salvo' variant - -c permits ships to be placed adjacently + \-b selects a \*(``blitz\*('' variant + \-s selects a \*(``salvo\*('' variant + \-c permits ships to be placed adjacently .fi -The `blitz' variant allows a side to shoot for as long as it continues to -score hits. +The \*(``blitz\*('' variant allows a side to shoot +for as long as it continues to score hits. .PP -The `salvo' game allows a player one shot per turn for each of his/her ships -still afloat. This puts a premium scoring hits early and knocking out some +The \*(``salvo\*('' game allows a player one shot per turn +for each of his/her ships still afloat. +This puts a premium scoring hits early and knocking out some ships and also makes much harder the situation where you face a superior force with only your PT-boat. .PP -Normally, ships must be separated by at least one square of open water. The --c option disables this check and allows them to close-pack. +Normally, ships must be separated by at least one square of open water. +The \-c option disables this check and allows them to close-pack. .PP -The algorithm the computer uses once it has found a ship to sink is provably -optimal. The dispersion criterion for the random-fire algorithm may not be. +The algorithm the computer uses +once it has found a ship to sink is provably optimal. +The dispersion criterion for the random-fire algorithm may not be. .SH AUTHORS -Originally written by one Bruce Holloway in 1986. Salvo mode added by Chuck A. -DeGaul (cbosgd!cad). Visual user interface, `closepack' option, code rewrite -and manual page by Eric S. Raymond August 1989. +Originally written by Bruce Holloway in 1986. +Salvo mode added by Chuck A. DeGaul (cbosgd!cad). +Visual user interface, +\*(``closepack\*('' option, +code rewrite, +and manual page by Eric S. Raymond + August 1989. diff --git a/test/bs.c b/test/bs.c index 3e773317..41f252aa 100644 --- a/test/bs.c +++ b/test/bs.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2021,2022 Thomas E. Dickey * + * Copyright 2018-2023,2024 Thomas E. Dickey * * Copyright 1998-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -35,7 +35,7 @@ * v2.0 featuring strict ANSI/POSIX conformance, November 1993. * v2.1 with ncurses mouse support, September 1995 * - * $Id: bs.c,v 1.78 2022/12/11 00:18:37 tom Exp $ + * $Id: bs.c,v 1.82 2024/12/07 22:18:28 tom Exp $ */ #include @@ -147,7 +147,7 @@ typedef struct { bool placed; /* has it been placed on the board? */ } ship_t; -static bool checkplace(int b, ship_t * ss, int vis); +static bool checkplace(int b, const ship_t * ss, int vis); #define SHIPIT(name, symbol, length) { name, 0, symbol, length, 0,0, 0, FALSE } @@ -224,12 +224,12 @@ intro(void) { const char *tmpname; - srand((unsigned) (time(0L) + getpid())); /* Kick the random number generator */ + srand((unsigned) (time(NULL) + getpid())); /* Kick the random number generator */ InitAndCatch(initscr(), uninitgame); - if ((tmpname = getlogin()) != 0 && - (your_name = strdup(tmpname)) != 0) { + if ((tmpname = getlogin()) != NULL && + (your_name = strdup(tmpname)) != NULL) { your_name[0] = (char) toupper(UChar(your_name[0])); } else { your_name = strdup(dftname); @@ -475,7 +475,7 @@ initgame(void) } else if (c == FF) { (void) clearok(stdscr, TRUE); (void) refresh(); - } else if (ss == 0) { + } else if (ss == NULL) { beep(); /* simple to verify, unlikely to happen */ } else if (c == 'r') { prompt(1, "Random-placing your %s", ss->name); @@ -686,7 +686,7 @@ collidecheck(int b, int y, int x) } static bool -checkplace(int b, ship_t * ss, int vis) +checkplace(int b, const ship_t * ss, int vis) { int l, xend, yend; @@ -877,7 +877,7 @@ plyturn(void) m = " You'll pick up survivors from my %s, I hope...!"; break; } - if (m != 0) { + if (m != NULL) { (void) printw(m, ss->name); } (void) beep(); @@ -898,8 +898,9 @@ sgetc(const char *s) ch = toupper(ch); if (is_QUIT(ch)) uninitgame(0); - for (s1 = s; *s1 && ch != *s1; ++s1) - continue; + for (s1 = s; *s1 && ch != *s1; ++s1) { + /* EMPTY */ ; + } if (*s1) { AddCh(ch); (void) refresh(); @@ -1192,7 +1193,7 @@ usage(int ok) ,USAGE_COMMON ,"Options:" ," -b play a blitz game" - ," -c ships may be adjacent" + ," -p ships may be packed/adjacent" ," -s play a salvo game" }; size_t n; @@ -1211,7 +1212,7 @@ main(int argc, char *argv[]) { int ch; - while ((ch = getopt(argc, argv, OPTS_COMMON "bcs")) != -1) { + while ((ch = getopt(argc, argv, OPTS_COMMON "bps")) != -1) { switch (ch) { case 'b': blitz = 1; @@ -1229,7 +1230,7 @@ main(int argc, char *argv[]) ExitProgram(EXIT_FAILURE); } break; - case 'c': + case 'p': closepack = 1; break; case OPTS_VERSION: @@ -1270,8 +1271,9 @@ main(int argc, char *argv[]) } } } else - while ((turn ? cputurn() : plyturn()) && awinna() == -1) - continue; + while ((turn ? cputurn() : plyturn()) && awinna() == -1) { + /* EMPTY */ ; + } turn = OTHER; } } while diff --git a/test/cardfile.c b/test/cardfile.c index 092483b0..d85800dd 100644 --- a/test/cardfile.c +++ b/test/cardfile.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2019-2021,2022 Thomas E. Dickey * + * Copyright 2019-2022,2024 Thomas E. Dickey * * Copyright 1999-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -30,7 +30,7 @@ /* * Author: Thomas E. Dickey * - * $Id: cardfile.c,v 1.51 2022/12/04 00:40:11 tom Exp $ + * $Id: cardfile.c,v 1.54 2024/12/07 22:27:13 tom Exp $ * * File format: text beginning in column 1 is a title; other text is content. */ @@ -47,7 +47,7 @@ #define pair_1 1 #define pair_2 2 -#define isVisible(cardp) ((cardp)->panel != 0) +#define isVisible(cardp) ((cardp)->panel != NULL) enum { MY_CTRL_x = MAX_FORM_COMMAND @@ -100,7 +100,7 @@ add_title(const char *title) { CARD *card, *p, *q; - for (p = all_cards, q = 0; p != 0; q = p, p = p->link) { + for (p = all_cards, q = NULL; p != NULL; q = p, p = p->link) { int cmp = strcmp(p->title, title); if (cmp == 0) return p; @@ -112,7 +112,7 @@ add_title(const char *title) card->title = strdup(title); card->content = strdup(""); - if (q == 0) { + if (q == NULL) { card->link = all_cards; all_cards = card; } else { @@ -132,7 +132,7 @@ add_content(CARD * card, const char *content) if ((total = strlen(content)) != 0) { size_t offset; - if (card->content != 0 && (offset = strlen(card->content)) != 0) { + if (card->content != NULL && (offset = strlen(card->content)) != 0) { total += 1 + offset; card->content = typeRealloc(char, total + 1, card->content); if (card->content) { @@ -141,7 +141,7 @@ add_content(CARD * card, const char *content) } } else { offset = 0; - if (card->content != 0) + if (card->content != NULL) free(card->content); card->content = typeMalloc(char, total + 1); } @@ -161,11 +161,11 @@ new_card(void) } static CARD * -find_card(char *title) +find_card(const char *title) { CARD *card; - for (card = all_cards; card != 0; card = card->link) + for (card = all_cards; card != NULL; card = card->link) if (!strcmp(card->title, title)) break; @@ -173,21 +173,21 @@ find_card(char *title) } static void -read_data(char *fname) +read_data(const char *fname) { FILE *fp; - if ((fp = fopen(fname, "r")) != 0) { - CARD *card = 0; + if ((fp = fopen(fname, "r")) != NULL) { + CARD *card = NULL; char buffer[BUFSIZ]; while (fgets(buffer, sizeof(buffer), fp)) { trim(buffer); if (isspace(UChar(*buffer))) { - if (card == 0) + if (card == NULL) card = add_title(""); add_content(card, buffer); - } else if ((card = find_card(buffer)) == 0) { + } else if ((card = find_card(buffer)) == NULL) { card = add_title(buffer); } } @@ -205,17 +205,17 @@ write_data(const char *fname) if (!strcmp(fname, default_name)) fname = "cardfile.out"; - if ((fp = fopen(fname, "w")) != 0) { - CARD *p = 0; + if ((fp = fopen(fname, "w")) != NULL) { + CARD *p = NULL; - for (p = all_cards; p != 0; p = p->link) { + for (p = all_cards; p != NULL; p = p->link) { FIELD **f = form_fields(p->form); int n; - for (n = 0; f[n] != 0; n++) { + for (n = 0; f[n] != NULL; n++) { char *s = field_buffer(f[n], 0); - if (s != 0 - && (s = strdup(s)) != 0) { + if (s != NULL + && (s = strdup(s)) != NULL) { trim(s); fprintf(fp, "%s%s\n", n ? "\t" : "", s); free(s); @@ -237,7 +237,7 @@ count_cards(void) CARD *p; int count = 0; - for (p = all_cards; p != 0; p = p->link) + for (p = all_cards; p != NULL; p = p->link) count++; return count; @@ -263,7 +263,7 @@ order_cards(CARD * first, int depth) static CARD * next_card(CARD * now) { - if (now->link != 0) { + if (now->link != NULL) { CARD *tst = now->link; if (isVisible(tst)) now = tst; @@ -280,7 +280,7 @@ static CARD * prev_card(CARD * now) { CARD *p; - for (p = all_cards; p != 0; p = p->link) { + for (p = all_cards; p != NULL; p = p->link) { if (p->link == now) { if (!isVisible(p)) p = prev_card(p); @@ -341,7 +341,7 @@ form_virtualize(WINDOW *w) } static FIELD ** -make_fields(CARD * p, int form_high, int form_wide) +make_fields(const CARD * p, int form_high, int form_wide) { FIELD **f = typeCalloc(FIELD *, (size_t) 3); @@ -355,7 +355,7 @@ make_fields(CARD * p, int form_high, int form_wide) set_field_just(f[1], JUSTIFY_LEFT); field_opts_off(f[1], O_BLANK); - f[2] = 0; + f[2] = NULL; return f; } @@ -375,7 +375,7 @@ free_form_fields(FIELD **f) { int n; - for (n = 0; f[n] != 0; ++n) { + for (n = 0; f[n] != NULL; ++n) { free_field(f[n]); } free(f); @@ -385,7 +385,7 @@ free_form_fields(FIELD **f) /*******************************************************************************/ static void -cardfile(char *fname) +cardfile(const char *fname) { WINDOW *win; CARD *p; @@ -414,9 +414,9 @@ cardfile(char *fname) x = 0; /* make a panel for each CARD */ - for (p = all_cards; p != 0; p = p->link) { + for (p = all_cards; p != NULL; p = p->link) { - if ((win = newwin(panel_high, panel_wide, y, x)) == 0) + if ((win = newwin(panel_high, panel_wide, y, x)) == NULL) break; wbkgd(win, (chtype) COLOR_PAIR(pair_2)); @@ -478,7 +478,7 @@ cardfile(char *fname) x = 0; show_legend(); - for (p = all_cards; p != 0; p = p->link) { + for (p = all_cards; p != NULL; p = p->link) { FIELD **oldf = form_fields(p->form); WINDOW *olds = form_sub(p->form); @@ -528,7 +528,7 @@ cardfile(char *fname) } } #if NO_LEAKS - while (all_cards != 0) { + while (all_cards != NULL) { p = all_cards; all_cards = all_cards->link; @@ -558,7 +558,7 @@ usage(int ok) ,"" ,USAGE_COMMON ,"Options:" - ," -c use color if terminal supports it" + ," -C use color if terminal supports it" }; size_t n; for (n = 0; n < SIZEOF(msg); n++) @@ -578,9 +578,9 @@ main(int argc, char *argv[]) setlocale(LC_ALL, ""); - while ((ch = getopt(argc, argv, OPTS_COMMON "c")) != -1) { + while ((ch = getopt(argc, argv, OPTS_COMMON "C")) != -1) { switch (ch) { - case 'c': + case 'C': try_color = TRUE; break; case OPTS_VERSION: diff --git a/test/chgat.c b/test/chgat.c index 2c2b5391..ebbe0dd9 100644 --- a/test/chgat.c +++ b/test/chgat.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2019-2020,2022 Thomas E. Dickey * + * Copyright 2019-2022,2024 Thomas E. Dickey * * Copyright 2006-2012,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,16 +27,17 @@ * authorization. * ****************************************************************************/ /* - * $Id: chgat.c,v 1.20 2022/12/10 23:31:31 tom Exp $ + * $Id: chgat.c,v 1.24 2024/12/07 22:27:13 tom Exp $ * * test-driver for chgat/wchgat/mvchgat/mvwchgat */ #include -#include #if HAVE_CHGAT +#include + #define SHOW(n) ((n) == ERR ? "ERR" : "OK") #define COLOR_DEFAULT (-1) @@ -76,7 +77,7 @@ color_params(size_t state, short *pair) }; /* *INDENT-ON* */ - const char *result = 0; + const char *result = NULL; if (has_colors()) { static bool first = TRUE; @@ -113,7 +114,7 @@ video_params(size_t state, attr_t *attr) }; /* *INDENT-ON* */ - const char *result = 0; + const char *result = NULL; if (state < SIZEOF(table)) { *attr = table[state].attr; @@ -150,24 +151,24 @@ show_status(WINDOW *win, STATUS * sp) getyx(win, y, x); wmove(win, 0, 0); wprintw(win, "Count %d", sp->count); - if (sp->v_msg != 0) + if (sp->v_msg != NULL) wprintw(win, " Video %s", sp->v_msg); - if (sp->c_msg != 0) + if (sp->c_msg != NULL) wprintw(win, " Color %s", sp->c_msg); wclrtoeol(win); wmove(win, y, x); } static void -do_subwindow(WINDOW *win, STATUS * sp, void func(WINDOW *)) +do_subwindow(WINDOW *win, const STATUS * sp, void func(WINDOW *)) { WINDOW *win1 = newwin(sp->y_max - 2, sp->x_max - 2, sp->y_beg + 1, sp->x_beg + 1); - if (win1 != 0 && sp->y_max > 4 && sp->x_max > 4) { + if (win1 != NULL && sp->y_max > 4 && sp->x_max > 4) { WINDOW *win2 = derwin(win1, sp->y_max - 4, sp->x_max - 4, 1, 1); - if (win2 != 0) { + if (win2 != NULL) { box(win1, 0, 0); wrefresh(win1); func(win2); @@ -179,7 +180,7 @@ do_subwindow(WINDOW *win, STATUS * sp, void func(WINDOW *)) delwin(win1); touchwin(win); } else { - if (win1 != 0) + if (win1 != NULL) delwin(win1); beep(); } @@ -203,7 +204,7 @@ init_status(WINDOW *win, STATUS * sp) static void show_help(WINDOW *win) { - static const char *msgs[] = + static NCURSES_CONST char *msgs[] = { "Basic commands:" ,"Use h/j/k/l or arrow keys to move the cursor." @@ -217,7 +218,7 @@ show_help(WINDOW *win) ,"= resets count to zero." ,"- negates count." ,"? shows this help-window" - ,0 + ,NULL }; popup_msg(win, msgs); @@ -229,14 +230,14 @@ update_status(WINDOW *win, STATUS * sp) switch (sp->ch) { case ' ': /* next test-iteration */ if (has_colors()) { - if ((sp->c_msg = color_params(++(sp->c), &(sp->pair))) == 0) { + if ((sp->c_msg = color_params(++(sp->c), &(sp->pair))) == NULL) { sp->c_msg = color_params(sp->c = 0, &(sp->pair)); - if ((sp->v_msg = video_params(++(sp->v), &(sp->attr))) == 0) { + if ((sp->v_msg = video_params(++(sp->v), &(sp->attr))) == NULL) { sp->v_msg = video_params(sp->v = 0, &(sp->attr)); } } } else { - if ((sp->v_msg = video_params(++(sp->v), &(sp->attr))) == 0) { + if ((sp->v_msg = video_params(++(sp->v), &(sp->attr))) == NULL) { sp->v_msg = video_params(sp->v = 0, &(sp->attr)); } } diff --git a/test/clip_printw.c b/test/clip_printw.c index 49d67c53..2ceac4d3 100644 --- a/test/clip_printw.c +++ b/test/clip_printw.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2019-2020,2022 Thomas E. Dickey * + * Copyright 2019-2023,2024 Thomas E. Dickey * * Copyright 2008-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,9 +27,9 @@ * authorization. * ****************************************************************************/ /* - * $Id: clip_printw.c,v 1.21 2022/12/10 23:31:31 tom Exp $ + * $Id: clip_printw.c,v 1.26 2024/12/07 22:22:51 tom Exp $ * - * demonstrate how to use printw without wrapping. + * demonstrate how to use printw with/without wrapping. */ #include @@ -40,9 +40,15 @@ #define SHOW(n) ((n) == ERR ? "ERR" : "OK") #define COLOR_DEFAULT (-1) +#define X_BASE 0 +#define Y_BASE 1 +#define MARGIN 1 +#define Y_TOP (Y_BASE + MARGIN) + typedef struct { unsigned c; unsigned v; + bool single; int status; int pair; attr_t attr; @@ -57,21 +63,29 @@ typedef struct { } STATUS; static int -clip_wprintw(WINDOW *win, NCURSES_CONST char *fmt, ...) +clip_wprintw(WINDOW *win, bool single, NCURSES_CONST char *fmt, ...) { int y0, x0, y1, x1, width; WINDOW *sub; va_list ap; int rc; - /* - * Allocate a single-line derived window extending from the current - * cursor position to the end of the current line in the given window. - * Disable scrolling in the derived window. - */ getyx(win, y0, x0); width = getmaxx(win) - x0; - sub = derwin(win, 1, width, y0, x0); + if (single) { + /* + * Allocate a single-line derived window extending from the current + * cursor position to the end of the current line in the given window. + * Disable scrolling in the derived window. + */ + sub = derwin(win, 1, width, y0, x0); + } else { + /* + * Allow printw to wrap through the entire window. + */ + sub = derwin(win, getmaxy(win), getmaxx(win), 0, 0); + wmove(sub, y0, x0); + } scrollok(sub, FALSE); /* @@ -84,7 +98,11 @@ clip_wprintw(WINDOW *win, NCURSES_CONST char *fmt, ...) getyx(sub, y1, x1); delwin(sub); - wmove(win, y1 + y0, x1 + x0); + if (single) { + wmove(win, y1 + y0, x1 + x0); + } else { + wmove(win, y1, x1); + } return rc; } @@ -104,7 +122,7 @@ color_params(unsigned state, int *pair) }; /* *INDENT-ON* */ - const char *result = 0; + const char *result = NULL; if (has_colors()) { static bool first = TRUE; @@ -143,7 +161,7 @@ video_params(unsigned state, attr_t *attr) }; /* *INDENT-ON* */ - const char *result = 0; + const char *result = NULL; if (state < SIZEOF(table)) { *attr = table[state].attr; @@ -156,11 +174,12 @@ video_params(unsigned state, attr_t *attr) static void fill_window(WINDOW *win) { + int y_top = (win == stdscr) ? Y_BASE : MARGIN; int y, x; int y0 = -1, x0 = -1; getyx(win, y, x); - wmove(win, 0, 0); + wmove(win, y_top, 0); while (waddstr(win, "0123456789 abcdefghijklmnopqrstuvwxyz ") != ERR) { int y1, x1; getyx(win, y1, x1); @@ -178,27 +197,36 @@ show_status(WINDOW *win, STATUS * sp) int y, x; getyx(win, y, x); + wattron(win, A_REVERSE); wmove(win, 0, 0); - wprintw(win, "Count %d", sp->count); - if (sp->v_msg != 0) + wprintw(win, "Clip %s", sp->single ? "line" : "window"); + wprintw(win, " Count %d", sp->count); + if (sp->v_msg != NULL) wprintw(win, " Video %s", sp->v_msg); - if (sp->c_msg != 0) + if (sp->c_msg != NULL) wprintw(win, " Color %s", sp->c_msg); wprintw(win, " (%d)", sp->status); wclrtoeol(win); + wattroff(win, A_REVERSE); wmove(win, y, x); } static void -do_subwindow(WINDOW *win, STATUS * sp, void func(WINDOW *)) +do_subwindow(WINDOW *win, const STATUS * sp, void func(WINDOW *)) { - WINDOW *win1 = newwin(sp->y_max - 2, sp->x_max - 2, - sp->y_beg + 1, sp->x_beg + 1); - - if (win1 != 0 && sp->y_max > 4 && sp->x_max > 4) { - WINDOW *win2 = derwin(win1, sp->y_max - 4, sp->x_max - 4, 1, 1); - - if (win2 != 0) { + WINDOW *win1 = newwin(sp->y_max - (2 * MARGIN), + sp->x_max - (2 * MARGIN), + sp->y_beg + MARGIN, + sp->x_beg + MARGIN); + + if (win1 != NULL && sp->y_max > 4 && sp->x_max > 4) { + WINDOW *win2 = derwin(win1, + sp->y_max - (2 * MARGIN) - 2, + sp->x_max - (2 * MARGIN) - 2, + (win == stdscr) ? Y_BASE : Y_BASE, + MARGIN); + + if (win2 != NULL) { box(win1, 0, 0); wrefresh(win1); func(win2); @@ -216,10 +244,14 @@ do_subwindow(WINDOW *win, STATUS * sp, void func(WINDOW *)) } } +/* + * The status line is within the same window as the test-data. + */ static void init_status(WINDOW *win, STATUS * sp) { memset(sp, 0, sizeof(*sp)); + sp->single = TRUE; sp->c = 99; sp->v = 99; sp->ch = ' '; @@ -229,12 +261,14 @@ init_status(WINDOW *win, STATUS * sp) getbegyx(win, sp->y_beg, sp->x_beg); getmaxyx(win, sp->y_max, sp->x_max); + + wmove(win, sp->y_val = Y_BASE, sp->x_val = 0); } static void show_help(WINDOW *win) { - static const char *msgs[] = + static NCURSES_CONST char *msgs[] = { "Basic commands:" ,"Use h/j/k/l or arrow keys to move the cursor." @@ -242,11 +276,14 @@ show_help(WINDOW *win) ,"" ,"Other commands:" ,"space toggles through the set of video attributes and colors." + ,"q exit subwindow, quit if last window." + ,"s toggles single-line updates versus entire windows." ,"t touches (forces repaint) of the current line." + ,"w create subwindow." ,". calls vw_printw at the current position with the given count." ,"= resets count to zero." ,"? shows this help-window" - ,0 + ,NULL }; popup_msg(win, msgs); @@ -255,41 +292,59 @@ show_help(WINDOW *win) static void update_status(WINDOW *win, STATUS * sp) { + int margin = 0; + switch (sp->ch) { case ' ': /* next test-iteration */ if (has_colors()) { - if ((sp->c_msg = color_params(++(sp->c), &(sp->pair))) == 0) { + if ((sp->c_msg = color_params(++(sp->c), &(sp->pair))) == NULL) { sp->c_msg = color_params(sp->c = 0, &(sp->pair)); - if ((sp->v_msg = video_params(++(sp->v), &(sp->attr))) == 0) { + if ((sp->v_msg = video_params(++(sp->v), &(sp->attr))) == NULL) { sp->v_msg = video_params(sp->v = 0, &(sp->attr)); } } } else { - if ((sp->v_msg = video_params(++(sp->v), &(sp->attr))) == 0) { + if ((sp->v_msg = video_params(++(sp->v), &(sp->attr))) == NULL) { sp->v_msg = video_params(sp->v = 0, &(sp->attr)); } } sp->count = 0; show_status(win, sp); break; + case KEY_HOME: + case '^': + wmove(win, sp->y_val, sp->x_val = margin); + break; + case KEY_END: + case '$': + wmove(win, sp->y_val, sp->x_val = (sp->x_max - margin - 1)); + break; + case KEY_PPAGE: + case CTRL('B'): + wmove(win, sp->y_val = Y_BASE, sp->x_val); + break; + case KEY_NPAGE: + case CTRL('F'): + wmove(win, sp->y_val = (sp->y_max - margin - 1), sp->x_val); + break; case KEY_LEFT: case 'h': - if (sp->x_val > 0) + if (sp->x_val > margin) wmove(win, sp->y_val, --(sp->x_val)); break; case KEY_DOWN: case 'j': - if (sp->y_val < sp->y_max) + if (sp->y_val < (sp->y_max - margin)) wmove(win, ++(sp->y_val), sp->x_val); break; case KEY_UP: case 'k': - if (sp->y_val > 0) + if (sp->y_val > Y_BASE) wmove(win, --(sp->y_val), sp->x_val); break; case KEY_RIGHT: case 'l': - if (sp->x_val < sp->x_max) + if (sp->x_val < (sp->x_max - margin)) wmove(win, sp->y_val, ++(sp->x_val)); break; case 't': @@ -299,6 +354,10 @@ update_status(WINDOW *win, STATUS * sp) sp->count = 0; show_status(win, sp); break; + case 's': + sp->single = !sp->single; + show_status(win, sp); + break; case HELP_KEY_1: show_help(win); break; @@ -337,12 +396,12 @@ test_clipping(WINDOW *win) need = (unsigned) want - 1; _nc_STRCPY(fmt, "%c%s%c", sizeof(fmt)); } - if ((buffer = typeMalloc(char, need + 1)) != 0) { + if ((buffer = typeMalloc(char, need + 1)) != NULL) { for (j = 0; j < need; ++j) { buffer[j] = (char) ('A' + (j % 26)); } buffer[need - 1] = '\0'; - st.status = clip_wprintw(win, fmt, '[', buffer, ']'); + st.status = clip_wprintw(win, st.single, fmt, '[', buffer, ']'); free(buffer); } break; diff --git a/test/color_content.c b/test/color_content.c index d08dffb0..4927d2de 100644 --- a/test/color_content.c +++ b/test/color_content.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2022,2023 Thomas E. Dickey * + * Copyright 2018-2023,2024 Thomas E. Dickey * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -26,7 +26,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: color_content.c,v 1.19 2023/02/25 16:48:02 tom Exp $ + * $Id: color_content.c,v 1.22 2024/12/07 22:22:51 tom Exp $ */ #define NEED_TIME_H @@ -186,7 +186,7 @@ run_test(void) my_color_t g; my_color_t b; if (ColorContent(color, &r, &g, &b) == OK) { - if (expected != 0) { + if (expected != NULL) { if (r != expected[color].r) success = FALSE; if (g != expected[color].g) @@ -220,10 +220,10 @@ usage(int ok) ,"Options:" ," -f COLOR first color value to test (default: 0)" ," -i interactive, showing test-progress" - ," -l COLOR last color value to test (default: max_colors-1)" + ," -F COLOR last color value to test (default: max_colors-1)" ," -n do not initialize color pairs" ," -p print data for color content instead of testing" - ," -r COUNT repeat for given count" + ," -r NUM repeat tests NUM times" ," -s initialize pairs sequentially rather than random" #if USE_EXTENDED_COLOR ," -x use extended color pairs/values" @@ -243,7 +243,7 @@ main(int argc, char *argv[]) { int ch; - while ((ch = getopt(argc, argv, OPTS_COMMON "f:il:npr:sx")) != -1) { + while ((ch = getopt(argc, argv, OPTS_COMMON "f:iF:npr:sx")) != -1) { switch (ch) { case 'f': if ((f_opt = atoi(optarg)) <= 0) @@ -252,7 +252,7 @@ main(int argc, char *argv[]) case 'i': i_opt = 1; break; - case 'l': + case 'F': if ((l_opt = atoi(optarg)) <= 0) usage(FALSE); break; diff --git a/test/color_name.h b/test/color_name.h index 867396ca..6f884a34 100644 --- a/test/color_name.h +++ b/test/color_name.h @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2020,2021 Thomas E. Dickey * + * Copyright 2018-2021,2024 Thomas E. Dickey * * Copyright 2011-2012,2016 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: color_name.h,v 1.9 2021/04/24 23:25:29 tom Exp $ + * $Id: color_name.h,v 1.11 2024/12/07 22:17:24 tom Exp $ */ #ifndef __COLORNAME_H @@ -62,15 +62,15 @@ static int color_code(const char *color) { int result = 0; - char *endp = 0; - size_t n; + char *endp = NULL; if ((result = (int) strtol(color, &endp, 0)) >= 0 - && (endp == 0 || *endp == 0)) { + && (endp == NULL || *endp == 0)) { ; } else if (!strcmp(color, "default")) { result = -1; } else { + size_t n; for (n = 0; n < SIZEOF(the_color_names); ++n) { if (!strcmp(the_color_names[n], color)) { result = (int) n; @@ -87,7 +87,7 @@ static const char * color_name(int color) { static char temp[20]; - const char *result = 0; + const char *result = NULL; if (color >= (int) SIZEOF(the_color_names)) { _nc_SPRINTF(temp, _nc_SLIMIT(sizeof(temp)) "%d", color); diff --git a/test/combine.c b/test/combine.c index eca72b80..ade17798 100644 --- a/test/combine.c +++ b/test/combine.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2021,2022 Thomas E. Dickey * +,* Copyright 2021-2022,2024 Thomas E. Dickey * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -26,7 +26,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: combine.c,v 1.23 2022/12/10 22:28:50 tom Exp $ + * $Id: combine.c,v 1.26 2024/12/07 22:22:51 tom Exp $ */ #include @@ -37,7 +37,7 @@ #include #include -static int c_opt; +static int k_opt; static int r_opt; static int @@ -68,7 +68,7 @@ do_row(int row, int base_ch, int over_ch) move(row, col); printw("[U+%04X]", over_ch); do { - if (c_opt) { + if (k_opt) { wchar_t source[2]; cchar_t target; attr_t attr = reverse ? A_REVERSE : A_NORMAL; @@ -174,7 +174,7 @@ show_help(WINDOW *current) ++d; } popup_msg2(current, msgs); - for (s = 0; msgs[s] != 0; ++s) { + for (s = 0; msgs[s] != NULL; ++s) { free(msgs[s]); } free(msgs); @@ -191,8 +191,8 @@ usage(int ok) ,"Demonstrate combining-characters." ,"" ,"Options:" - ," -c use cchar_t data rather than wchar_t string" - ," -l FILE log window-dumps to this file" + ," -k use cchar_t data rather than wchar_t string" + ," -L FILE log window-dumps to this file" ," -r draw even-numbered rows in reverse-video" }; unsigned n; @@ -215,12 +215,12 @@ main(int argc, char *argv[]) bool log_option = FALSE; const char *dump_log = "combine.log"; - while ((ch = getopt(argc, argv, OPTS_COMMON "cl:r")) != -1) { + while ((ch = getopt(argc, argv, OPTS_COMMON "kL:r")) != -1) { switch (ch) { - case 'c': - c_opt = TRUE; + case 'k': + k_opt = TRUE; break; - case 'l': + case 'L': log_option = TRUE; if (!open_dump(optarg)) usage(FALSE); @@ -273,7 +273,7 @@ main(int argc, char *argv[]) left_at = next_char(left_at); break; case 'c': - c_opt = !c_opt; + k_opt = !k_opt; break; case 'r': r_opt = !r_opt; diff --git a/test/configure b/test/configure index aac2dedd..194fe231 100755 --- a/test/configure +++ b/test/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by Autoconf 2.52.20230114. +# Generated by Autoconf 2.52.20240618. # # Copyright 2003-2022,2023 Thomas E. Dickey # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 @@ -480,6 +480,10 @@ do | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) x_libraries=$ac_optarg ;; + -*dir | -dvi* | -doc* | -html* | -local* | -pdf* | -ps* ) + echo "$as_me: WARNING: unsupported option: $ac_option" >&2 + ;; + -*) { echo "$as_me: error: unrecognized option: $ac_option Try \`$0 --help' for more information." >&2 { (exit 1); exit 1; }; } @@ -676,11 +680,6 @@ EOF cat <<\EOF -Program names: - --program-prefix=PREFIX prepend PREFIX to installed program names - --program-suffix=SUFFIX append SUFFIX to installed program names - --program-transform-name=PROGRAM run sed PROGRAM on installed program names - X features: --x-includes=DIR X include files are in DIR --x-libraries=DIR X library files are in DIR @@ -688,6 +687,7 @@ X features: System types: --build=BUILD configure for building on BUILD [guessed] --host=HOST build programs to run on HOST [BUILD] + --target=TARGET configure for building compilers for TARGET [HOST] EOF fi @@ -695,20 +695,24 @@ if test -n "$ac_init_help"; then cat <<\EOF -Optional Features: - --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) - --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) +Optional Features: + --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) + --enable-FEATURE[=ARG] include FEATURE [ARG=yes] + General Options: + --with-system-type=XXX test: override derived host system-type --disable-stripping do not strip (debug info) installed executables + --with-strip-program=XX specify program to use when stripping in install --enable-stdnoreturn enable C11 _Noreturn feature for diagnostics --enable-string-hacks work around bogus compiler/loader warnings - --with-pkg-config{=path} enable/disable use of pkg-config + --with-pkg-config[=CMD] enable/disable use of pkg-config and its name CMD --disable-echo do not display "compiling" commands + --with-install-prefix=DESTDIR use DESTDIR as installation directory prefix + --enable-install-prefix merge DESTDIR with installation prefix Curses Version-dependent Options: --with-ncurses-wrap-prefix naming-prefix for ncurses wrapped-variables --disable-widec disable checks for wide-character functions @@ -724,10 +728,10 @@ Curses Version-dependent Options: --with-neXtaw link with neXT Athena library --with-XawPlus link with Athena-Plus library --with-x use the X Window System - --with-x11-rgb=FILE file containing X11 rgb information (EPREFIX/lib/X11/rgb.txt) - --with-form-libname=XXX override form basename of library - --with-menu-libname=XXX override menu basename of library - --with-panel-libname=XXX override panel basename of library + --with-x11-rgb=FILE obtain X11 color definitions from FILE (default: EPREFIX/lib/X11/rgb.txt) + --with-form-libname[=XXX] override ifelse(,,form,) basename of library + --with-menu-libname[=XXX] override ifelse(,,menu,) basename of library + --with-panel-libname[=XXX] override ifelse(,,panel,) basename of library --disable-panel disable checks for panel functions --disable-menu disable checks for menu functions --disable-form disable checks for form functions @@ -808,7 +812,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was -generated by GNU Autoconf 2.52.20230114. Invocation command line was +generated by GNU Autoconf 2.52.20240618. Invocation command line was $ $0 $@ @@ -932,7 +936,7 @@ if test -z "$CONFIG_SITE"; then fi for ac_site_file in $CONFIG_SITE; do if test -r "$ac_site_file"; then - { echo "$as_me:935: loading site script $ac_site_file" >&5 + { echo "$as_me:939: loading site script $ac_site_file" >&5 echo "$as_me: loading site script $ac_site_file" >&6;} cat "$ac_site_file" >&5 . "$ac_site_file" @@ -943,7 +947,7 @@ if test -r "$cache_file"; then # Some versions of bash will fail to source /dev/null (special # files actually), so we avoid doing that. if test -f "$cache_file"; then - { echo "$as_me:946: loading cache $cache_file" >&5 + { echo "$as_me:950: loading cache $cache_file" >&5 echo "$as_me: loading cache $cache_file" >&6;} case $cache_file in [\\/]* | ?:[\\/]* ) . $cache_file;; @@ -951,7 +955,7 @@ echo "$as_me: loading cache $cache_file" >&6;} esac fi else - { echo "$as_me:954: creating cache $cache_file" >&5 + { echo "$as_me:958: creating cache $cache_file" >&5 echo "$as_me: creating cache $cache_file" >&6;} >$cache_file fi @@ -967,21 +971,21 @@ for ac_var in `(set) 2>&1 | eval ac_new_val="\$ac_env_${ac_var}_value" case "$ac_old_set,$ac_new_set" in set,) - { echo "$as_me:970: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 + { echo "$as_me:974: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} ac_cache_corrupted=: ;; ,set) - { echo "$as_me:974: error: \`$ac_var' was not set in the previous run" >&5 + { echo "$as_me:978: error: \`$ac_var' was not set in the previous run" >&5 echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_cache_corrupted=: ;; ,);; *) if test "x$ac_old_val" != "x$ac_new_val"; then - { echo "$as_me:980: error: \`$ac_var' has changed since the previous run:" >&5 + { echo "$as_me:984: error: \`$ac_var' has changed since the previous run:" >&5 echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} - { echo "$as_me:982: former value: $ac_old_val" >&5 + { echo "$as_me:986: former value: $ac_old_val" >&5 echo "$as_me: former value: $ac_old_val" >&2;} - { echo "$as_me:984: current value: $ac_new_val" >&5 + { echo "$as_me:988: current value: $ac_new_val" >&5 echo "$as_me: current value: $ac_new_val" >&2;} ac_cache_corrupted=: fi;; @@ -1000,9 +1004,9 @@ echo "$as_me: current value: $ac_new_val" >&2;} fi done if "$ac_cache_corrupted"; then - { echo "$as_me:1003: error: changes in the environment can compromise the build" >&5 + { echo "$as_me:1007: error: changes in the environment can compromise the build" >&5 echo "$as_me: error: changes in the environment can compromise the build" >&2;} - { { echo "$as_me:1005: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 + { { echo "$as_me:1009: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} { (exit 1); exit 1; }; } fi @@ -1031,10 +1035,10 @@ esac echo "#! $SHELL" >conftest.sh echo "exit 0" >>conftest.sh chmod +x conftest.sh -if { (echo "$as_me:1034: PATH=\".;.\"; conftest.sh") >&5 +if { (echo "$as_me:1038: PATH=\".;.\"; conftest.sh") >&5 (PATH=".;."; conftest.sh) 2>&5 ac_status=$? - echo "$as_me:1037: \$? = $ac_status" >&5 + echo "$as_me:1041: \$? = $ac_status" >&5 (exit "$ac_status"); }; then ac_path_separator=';' else @@ -1066,7 +1070,7 @@ for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do fi done if test -z "$ac_aux_dir"; then - { { echo "$as_me:1069: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 + { { echo "$as_me:1073: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;} { (exit 1); exit 1; }; } fi @@ -1076,11 +1080,11 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. # Make sure we can run config.sub. $ac_config_sub sun4 >/dev/null 2>&1 || - { { echo "$as_me:1079: error: cannot run $ac_config_sub" >&5 + { { echo "$as_me:1083: error: cannot run $ac_config_sub" >&5 echo "$as_me: error: cannot run $ac_config_sub" >&2;} { (exit 1); exit 1; }; } -echo "$as_me:1083: checking build system type" >&5 +echo "$as_me:1087: checking build system type" >&5 echo $ECHO_N "checking build system type... $ECHO_C" >&6 if test "${ac_cv_build+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1089,24 +1093,23 @@ else test -z "$ac_cv_build_alias" && ac_cv_build_alias=`$ac_config_guess` test -z "$ac_cv_build_alias" && - { { echo "$as_me:1092: error: cannot guess build type; you must specify one" >&5 + { { echo "$as_me:1096: error: cannot guess build type; you must specify one" >&5 echo "$as_me: error: cannot guess build type; you must specify one" >&2;} { (exit 1); exit 1; }; } ac_cv_build=`$ac_config_sub "$ac_cv_build_alias"` || - { { echo "$as_me:1096: error: $ac_config_sub $ac_cv_build_alias failed." >&5 + { { echo "$as_me:1100: error: $ac_config_sub $ac_cv_build_alias failed." >&5 echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:1101: result: $ac_cv_build" >&5 +echo "$as_me:1105: result: $ac_cv_build" >&5 echo "${ECHO_T}$ac_cv_build" >&6 build=$ac_cv_build build_cpu=`echo "$ac_cv_build" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` build_vendor=`echo "$ac_cv_build" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` build_os=`echo "$ac_cv_build" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -if test -f "$srcdir/config.guess" || test -f "$ac_aux_dir/config.guess" ; then - echo "$as_me:1109: checking host system type" >&5 +echo "$as_me:1112: checking host system type" >&5 echo $ECHO_N "checking host system type... $ECHO_C" >&6 if test "${ac_cv_host+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1115,18 +1118,46 @@ else test -z "$ac_cv_host_alias" && ac_cv_host_alias=$ac_cv_build_alias ac_cv_host=`$ac_config_sub "$ac_cv_host_alias"` || - { { echo "$as_me:1118: error: $ac_config_sub $ac_cv_host_alias failed" >&5 + { { echo "$as_me:1121: error: $ac_config_sub $ac_cv_host_alias failed" >&5 echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:1123: result: $ac_cv_host" >&5 +echo "$as_me:1126: result: $ac_cv_host" >&5 echo "${ECHO_T}$ac_cv_host" >&6 host=$ac_cv_host host_cpu=`echo "$ac_cv_host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` host_vendor=`echo "$ac_cv_host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` host_os=`echo "$ac_cv_host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` +if test -f "$srcdir/config.guess" || test -f "$ac_aux_dir/config.guess" ; then + echo "$as_me:1134: checking target system type" >&5 +echo $ECHO_N "checking target system type... $ECHO_C" >&6 +if test "${ac_cv_target+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_target_alias=$target_alias +test "x$ac_cv_target_alias" = "x" && + ac_cv_target_alias=$ac_cv_host_alias +ac_cv_target=`$ac_config_sub "$ac_cv_target_alias"` || + { { echo "$as_me:1143: error: $ac_config_sub $ac_cv_target_alias failed" >&5 +echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;} + { (exit 1); exit 1; }; } + +fi +echo "$as_me:1148: result: $ac_cv_target" >&5 +echo "${ECHO_T}$ac_cv_target" >&6 +target=$ac_cv_target +target_cpu=`echo "$ac_cv_target" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +target_vendor=`echo "$ac_cv_target" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` +target_os=`echo "$ac_cv_target" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` + +# The aliases save the names the user supplied, while $host etc. +# will get canonicalized. +test -n "$target_alias" && + test "$program_prefix$program_suffix$program_transform_name" = \ + NONENONEs,x,x, && + program_prefix=${target_alias}- system_name="$host_os" else system_name="`(uname -s -r) 2>/dev/null`" @@ -1146,31 +1177,28 @@ else fi test -z "$system_name" && system_name="$cf_cv_system_name" -test -n "$cf_cv_system_name" && echo "$as_me:1149: result: Configuring for $cf_cv_system_name" >&5 +test -n "$cf_cv_system_name" && echo "$as_me:1180: result: Configuring for $cf_cv_system_name" >&5 echo "${ECHO_T}Configuring for $cf_cv_system_name" >&6 if test ".$system_name" != ".$cf_cv_system_name" ; then - echo "$as_me:1153: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5 + echo "$as_me:1184: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5 echo "${ECHO_T}Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&6 - { { echo "$as_me:1155: error: \"Please remove config.cache and try again.\"" >&5 + { { echo "$as_me:1186: error: \"Please remove config.cache and try again.\"" >&5 echo "$as_me: error: \"Please remove config.cache and try again.\"" >&2;} { (exit 1); exit 1; }; } fi -test "$program_prefix" != NONE && - program_transform_name="s,^,$program_prefix,;$program_transform_name" -# Use a double $ so make ignores it. -test "$program_suffix" != NONE && - program_transform_name="s,\$,$program_suffix,;$program_transform_name" -# Double any \ or $. echo might interpret backslashes. -# By default was `s,x,x', remove it if useless. -cat <<\_ACEOF >conftest.sed -s/[\\$]/&&/g;s/;s,x,x,$// -_ACEOF -program_transform_name=`echo $program_transform_name | sed -f conftest.sed` -rm conftest.sed +# Check whether --with-system-type or --without-system-type was given. +if test "${with_system_type+set}" = set; then + withval="$with_system_type" + { echo "$as_me:1194: WARNING: overriding system type to $withval" >&5 +echo "$as_me: WARNING: overriding system type to $withval" >&2;} + cf_cv_system_name=$withval + host_os=$withval -echo "$as_me:1173: checking whether ${MAKE-make} sets \${MAKE}" >&5 +fi; + +echo "$as_me:1201: checking whether ${MAKE-make} sets \${MAKE}" >&5 echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'` if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then @@ -1190,11 +1218,11 @@ fi rm -f conftest.make fi if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then - echo "$as_me:1193: result: yes" >&5 + echo "$as_me:1221: result: yes" >&5 echo "${ECHO_T}yes" >&6 SET_MAKE= else - echo "$as_me:1197: result: no" >&5 + echo "$as_me:1225: result: no" >&5 echo "${ECHO_T}no" >&6 SET_MAKE="MAKE=${MAKE-make}" fi @@ -1208,7 +1236,7 @@ ac_main_return="return" if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 -echo "$as_me:1211: checking for $ac_word" >&5 +echo "$as_me:1239: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1223,7 +1251,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_CC="${ac_tool_prefix}gcc" -echo "$as_me:1226: found $ac_dir/$ac_word" >&5 +echo "$as_me:1254: found $ac_dir/$ac_word" >&5 break done @@ -1231,10 +1259,10 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1234: result: $CC" >&5 + echo "$as_me:1262: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1237: result: no" >&5 + echo "$as_me:1265: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1243,7 +1271,7 @@ if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 -echo "$as_me:1246: checking for $ac_word" >&5 +echo "$as_me:1274: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1258,7 +1286,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_CC="gcc" -echo "$as_me:1261: found $ac_dir/$ac_word" >&5 +echo "$as_me:1289: found $ac_dir/$ac_word" >&5 break done @@ -1266,10 +1294,10 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1269: result: $ac_ct_CC" >&5 + echo "$as_me:1297: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1272: result: no" >&5 + echo "$as_me:1300: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1282,7 +1310,7 @@ if test -z "$CC"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 -echo "$as_me:1285: checking for $ac_word" >&5 +echo "$as_me:1313: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1297,7 +1325,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_CC="${ac_tool_prefix}cc" -echo "$as_me:1300: found $ac_dir/$ac_word" >&5 +echo "$as_me:1328: found $ac_dir/$ac_word" >&5 break done @@ -1305,10 +1333,10 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1308: result: $CC" >&5 + echo "$as_me:1336: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1311: result: no" >&5 + echo "$as_me:1339: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1317,7 +1345,7 @@ if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -echo "$as_me:1320: checking for $ac_word" >&5 +echo "$as_me:1348: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1332,7 +1360,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_CC="cc" -echo "$as_me:1335: found $ac_dir/$ac_word" >&5 +echo "$as_me:1363: found $ac_dir/$ac_word" >&5 break done @@ -1340,10 +1368,10 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1343: result: $ac_ct_CC" >&5 + echo "$as_me:1371: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1346: result: no" >&5 + echo "$as_me:1374: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1356,7 +1384,7 @@ fi if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -echo "$as_me:1359: checking for $ac_word" >&5 +echo "$as_me:1387: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1376,7 +1404,7 @@ if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then continue fi ac_cv_prog_CC="cc" -echo "$as_me:1379: found $ac_dir/$ac_word" >&5 +echo "$as_me:1407: found $ac_dir/$ac_word" >&5 break done @@ -1398,10 +1426,10 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1401: result: $CC" >&5 + echo "$as_me:1429: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1404: result: no" >&5 + echo "$as_me:1432: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1412,7 +1440,7 @@ if test -z "$CC"; then do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:1415: checking for $ac_word" >&5 +echo "$as_me:1443: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1427,7 +1455,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_CC="$ac_tool_prefix$ac_prog" -echo "$as_me:1430: found $ac_dir/$ac_word" >&5 +echo "$as_me:1458: found $ac_dir/$ac_word" >&5 break done @@ -1435,10 +1463,10 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1438: result: $CC" >&5 + echo "$as_me:1466: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1441: result: no" >&5 + echo "$as_me:1469: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1451,7 +1479,7 @@ if test -z "$CC"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:1454: checking for $ac_word" >&5 +echo "$as_me:1482: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1466,7 +1494,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_CC="$ac_prog" -echo "$as_me:1469: found $ac_dir/$ac_word" >&5 +echo "$as_me:1497: found $ac_dir/$ac_word" >&5 break done @@ -1474,10 +1502,10 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1477: result: $ac_ct_CC" >&5 + echo "$as_me:1505: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1480: result: no" >&5 + echo "$as_me:1508: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1489,32 +1517,32 @@ fi fi -test -z "$CC" && { { echo "$as_me:1492: error: no acceptable cc found in \$PATH" >&5 +test -z "$CC" && { { echo "$as_me:1520: error: no acceptable cc found in \$PATH" >&5 echo "$as_me: error: no acceptable cc found in \$PATH" >&2;} { (exit 1); exit 1; }; } # Provide some information about the compiler. -echo "$as_me:1497:" \ +echo "$as_me:1525:" \ "checking for C compiler version" >&5 ac_compiler=`set X $ac_compile; echo "$2"` -{ (eval echo "$as_me:1500: \"$ac_compiler --version &5\"") >&5 +{ (eval echo "$as_me:1528: \"$ac_compiler --version &5\"") >&5 (eval $ac_compiler --version &5) 2>&5 ac_status=$? - echo "$as_me:1503: \$? = $ac_status" >&5 + echo "$as_me:1531: \$? = $ac_status" >&5 (exit "$ac_status"); } -{ (eval echo "$as_me:1505: \"$ac_compiler -v &5\"") >&5 +{ (eval echo "$as_me:1533: \"$ac_compiler -v &5\"") >&5 (eval $ac_compiler -v &5) 2>&5 ac_status=$? - echo "$as_me:1508: \$? = $ac_status" >&5 + echo "$as_me:1536: \$? = $ac_status" >&5 (exit "$ac_status"); } -{ (eval echo "$as_me:1510: \"$ac_compiler -V &5\"") >&5 +{ (eval echo "$as_me:1538: \"$ac_compiler -V &5\"") >&5 (eval $ac_compiler -V &5) 2>&5 ac_status=$? - echo "$as_me:1513: \$? = $ac_status" >&5 + echo "$as_me:1541: \$? = $ac_status" >&5 (exit "$ac_status"); } cat >"conftest.$ac_ext" <<_ACEOF -#line 1517 "configure" +#line 1545 "configure" #include "confdefs.h" int @@ -1530,13 +1558,13 @@ ac_clean_files="$ac_clean_files a.out a.exe" # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. -echo "$as_me:1533: checking for C compiler default output" >&5 +echo "$as_me:1561: checking for C compiler default output" >&5 echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6 ac_link_default=`echo "$ac_link" | sed 's/ -o *"conftest[^"]*"//'` -if { (eval echo "$as_me:1536: \"$ac_link_default\"") >&5 +if { (eval echo "$as_me:1564: \"$ac_link_default\"") >&5 (eval $ac_link_default) 2>&5 ac_status=$? - echo "$as_me:1539: \$? = $ac_status" >&5 + echo "$as_me:1567: \$? = $ac_status" >&5 (exit "$ac_status"); }; then # Find the output, starting from the most likely. This scheme is # not robust to junk in `.', hence go to wildcards (a.*) only as a last @@ -1559,34 +1587,34 @@ done else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 -{ { echo "$as_me:1562: error: C compiler cannot create executables" >&5 +{ { echo "$as_me:1590: error: C compiler cannot create executables" >&5 echo "$as_me: error: C compiler cannot create executables" >&2;} { (exit 77); exit 77; }; } fi ac_exeext=$ac_cv_exeext -echo "$as_me:1568: result: $ac_file" >&5 +echo "$as_me:1596: result: $ac_file" >&5 echo "${ECHO_T}$ac_file" >&6 # Check the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -echo "$as_me:1573: checking whether the C compiler works" >&5 +echo "$as_me:1601: checking whether the C compiler works" >&5 echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0 # If not cross compiling, check that we can run a simple program. if test "$cross_compiling" != yes; then if { ac_try='./$ac_file' - { (eval echo "$as_me:1579: \"$ac_try\"") >&5 + { (eval echo "$as_me:1607: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1582: \$? = $ac_status" >&5 + echo "$as_me:1610: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cross_compiling=no else if test "$cross_compiling" = maybe; then cross_compiling=yes else - { { echo "$as_me:1589: error: cannot run C compiled programs. + { { echo "$as_me:1617: error: cannot run C compiled programs. If you meant to cross compile, use \`--host'." >&5 echo "$as_me: error: cannot run C compiled programs. If you meant to cross compile, use \`--host'." >&2;} @@ -1594,24 +1622,24 @@ If you meant to cross compile, use \`--host'." >&2;} fi fi fi -echo "$as_me:1597: result: yes" >&5 +echo "$as_me:1625: result: yes" >&5 echo "${ECHO_T}yes" >&6 rm -f a.out a.exe "conftest$ac_cv_exeext" ac_clean_files=$ac_clean_files_save # Check the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -echo "$as_me:1604: checking whether we are cross compiling" >&5 +echo "$as_me:1632: checking whether we are cross compiling" >&5 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 -echo "$as_me:1606: result: $cross_compiling" >&5 +echo "$as_me:1634: result: $cross_compiling" >&5 echo "${ECHO_T}$cross_compiling" >&6 -echo "$as_me:1609: checking for executable suffix" >&5 +echo "$as_me:1637: checking for executable suffix" >&5 echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6 -if { (eval echo "$as_me:1611: \"$ac_link\"") >&5 +if { (eval echo "$as_me:1639: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:1614: \$? = $ac_status" >&5 + echo "$as_me:1642: \$? = $ac_status" >&5 (exit "$ac_status"); }; then # If both `conftest.exe' and `conftest' are `present' (well, observable) # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will @@ -1627,25 +1655,25 @@ for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do esac done else - { { echo "$as_me:1630: error: cannot compute EXEEXT: cannot compile and link" >&5 + { { echo "$as_me:1658: error: cannot compute EXEEXT: cannot compile and link" >&5 echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;} { (exit 1); exit 1; }; } fi rm -f "conftest$ac_cv_exeext" -echo "$as_me:1636: result: $ac_cv_exeext" >&5 +echo "$as_me:1664: result: $ac_cv_exeext" >&5 echo "${ECHO_T}$ac_cv_exeext" >&6 rm -f "conftest.$ac_ext" EXEEXT=$ac_cv_exeext ac_exeext=$EXEEXT -echo "$as_me:1642: checking for object suffix" >&5 +echo "$as_me:1670: checking for object suffix" >&5 echo $ECHO_N "checking for object suffix... $ECHO_C" >&6 if test "${ac_cv_objext+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 1648 "configure" +#line 1676 "configure" #include "confdefs.h" int @@ -1657,10 +1685,10 @@ main (void) } _ACEOF rm -f conftest.o conftest.obj -if { (eval echo "$as_me:1660: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1688: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1663: \$? = $ac_status" >&5 + echo "$as_me:1691: \$? = $ac_status" >&5 (exit "$ac_status"); }; then for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do case $ac_file in @@ -1672,24 +1700,24 @@ done else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 -{ { echo "$as_me:1675: error: cannot compute OBJEXT: cannot compile" >&5 +{ { echo "$as_me:1703: error: cannot compute OBJEXT: cannot compile" >&5 echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;} { (exit 1); exit 1; }; } fi rm -f "conftest.$ac_cv_objext" "conftest.$ac_ext" fi -echo "$as_me:1682: result: $ac_cv_objext" >&5 +echo "$as_me:1710: result: $ac_cv_objext" >&5 echo "${ECHO_T}$ac_cv_objext" >&6 OBJEXT=$ac_cv_objext ac_objext=$OBJEXT -echo "$as_me:1686: checking whether we are using the GNU C compiler" >&5 +echo "$as_me:1714: checking whether we are using the GNU C compiler" >&5 echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 if test "${ac_cv_c_compiler_gnu+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 1692 "configure" +#line 1720 "configure" #include "confdefs.h" int @@ -1704,16 +1732,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:1707: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1735: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1710: \$? = $ac_status" >&5 + echo "$as_me:1738: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:1713: \"$ac_try\"") >&5 + { (eval echo "$as_me:1741: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1716: \$? = $ac_status" >&5 + echo "$as_me:1744: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_compiler_gnu=yes else @@ -1725,19 +1753,19 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -echo "$as_me:1728: result: $ac_cv_c_compiler_gnu" >&5 +echo "$as_me:1756: result: $ac_cv_c_compiler_gnu" >&5 echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 GCC=`test $ac_compiler_gnu = yes && echo yes` ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS CFLAGS="-g" -echo "$as_me:1734: checking whether $CC accepts -g" >&5 +echo "$as_me:1762: checking whether $CC accepts -g" >&5 echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 if test "${ac_cv_prog_cc_g+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 1740 "configure" +#line 1768 "configure" #include "confdefs.h" int @@ -1749,16 +1777,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:1752: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1780: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1755: \$? = $ac_status" >&5 + echo "$as_me:1783: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:1758: \"$ac_try\"") >&5 + { (eval echo "$as_me:1786: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1761: \$? = $ac_status" >&5 + echo "$as_me:1789: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_prog_cc_g=yes else @@ -1768,7 +1796,7 @@ ac_cv_prog_cc_g=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:1771: result: $ac_cv_prog_cc_g" >&5 +echo "$as_me:1799: result: $ac_cv_prog_cc_g" >&5 echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS @@ -1795,16 +1823,16 @@ cat >"conftest.$ac_ext" <<_ACEOF #endif _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:1798: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1826: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1801: \$? = $ac_status" >&5 + echo "$as_me:1829: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:1804: \"$ac_try\"") >&5 + { (eval echo "$as_me:1832: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1807: \$? = $ac_status" >&5 + echo "$as_me:1835: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then for ac_declaration in \ ''\ @@ -1816,7 +1844,7 @@ if { (eval echo "$as_me:1798: \"$ac_compile\"") >&5 'void exit (int);' do cat >"conftest.$ac_ext" <<_ACEOF -#line 1819 "configure" +#line 1847 "configure" #include "confdefs.h" #include $ac_declaration @@ -1829,16 +1857,16 @@ exit (42); } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:1832: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1860: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1835: \$? = $ac_status" >&5 + echo "$as_me:1863: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:1838: \"$ac_try\"") >&5 + { (eval echo "$as_me:1866: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1841: \$? = $ac_status" >&5 + echo "$as_me:1869: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -1848,7 +1876,7 @@ continue fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" cat >"conftest.$ac_ext" <<_ACEOF -#line 1851 "configure" +#line 1879 "configure" #include "confdefs.h" $ac_declaration int @@ -1860,16 +1888,16 @@ exit (42); } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:1863: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1891: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1866: \$? = $ac_status" >&5 + echo "$as_me:1894: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:1869: \"$ac_try\"") >&5 + { (eval echo "$as_me:1897: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1872: \$? = $ac_status" >&5 + echo "$as_me:1900: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then break else @@ -1899,11 +1927,11 @@ ac_main_return="return" GCC_VERSION=none if test "$GCC" = yes ; then - echo "$as_me:1902: checking version of $CC" >&5 + echo "$as_me:1930: checking version of $CC" >&5 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6 - GCC_VERSION="`${CC} --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(GCC[^)]*) //' -e 's/^.*(Debian[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`" + GCC_VERSION="`${CC} --version 2>/dev/null | sed -e '2,$d' -e 's/^[^(]*([^)][^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`" test -z "$GCC_VERSION" && GCC_VERSION=unknown - echo "$as_me:1906: result: $GCC_VERSION" >&5 + echo "$as_me:1934: result: $GCC_VERSION" >&5 echo "${ECHO_T}$GCC_VERSION" >&6 fi @@ -1912,12 +1940,12 @@ INTEL_COMPILER=no if test "$GCC" = yes ; then case "$host_os" in (linux*|gnu*) - echo "$as_me:1915: checking if this is really Intel C compiler" >&5 + echo "$as_me:1943: checking if this is really Intel C compiler" >&5 echo $ECHO_N "checking if this is really Intel C compiler... $ECHO_C" >&6 cf_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -no-gcc" cat >"conftest.$ac_ext" <<_ACEOF -#line 1920 "configure" +#line 1948 "configure" #include "confdefs.h" int @@ -1934,16 +1962,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:1937: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1965: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1940: \$? = $ac_status" >&5 + echo "$as_me:1968: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:1943: \"$ac_try\"") >&5 + { (eval echo "$as_me:1971: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1946: \$? = $ac_status" >&5 + echo "$as_me:1974: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then INTEL_COMPILER=yes cf_save_CFLAGS="$cf_save_CFLAGS -we147" @@ -1954,7 +1982,7 @@ cat "conftest.$ac_ext" >&5 fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" CFLAGS="$cf_save_CFLAGS" - echo "$as_me:1957: result: $INTEL_COMPILER" >&5 + echo "$as_me:1985: result: $INTEL_COMPILER" >&5 echo "${ECHO_T}$INTEL_COMPILER" >&6 ;; esac @@ -1963,11 +1991,11 @@ fi CLANG_COMPILER=no if test "$GCC" = yes ; then - echo "$as_me:1966: checking if this is really Clang C compiler" >&5 + echo "$as_me:1994: checking if this is really Clang C compiler" >&5 echo $ECHO_N "checking if this is really Clang C compiler... $ECHO_C" >&6 cf_save_CFLAGS="$CFLAGS" cat >"conftest.$ac_ext" <<_ACEOF -#line 1970 "configure" +#line 1998 "configure" #include "confdefs.h" int @@ -1984,16 +2012,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:1987: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2015: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1990: \$? = $ac_status" >&5 + echo "$as_me:2018: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:1993: \"$ac_try\"") >&5 + { (eval echo "$as_me:2021: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1996: \$? = $ac_status" >&5 + echo "$as_me:2024: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then CLANG_COMPILER=yes @@ -2003,7 +2031,7 @@ cat "conftest.$ac_ext" >&5 fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" CFLAGS="$cf_save_CFLAGS" - echo "$as_me:2006: result: $CLANG_COMPILER" >&5 + echo "$as_me:2034: result: $CLANG_COMPILER" >&5 echo "${ECHO_T}$CLANG_COMPILER" >&6 fi @@ -2012,30 +2040,30 @@ CLANG_VERSION=none if test "x$CLANG_COMPILER" = "xyes" ; then case "$CC" in (c[1-9][0-9]|*/c[1-9][0-9]) - { echo "$as_me:2015: WARNING: replacing broken compiler alias $CC" >&5 + { echo "$as_me:2043: WARNING: replacing broken compiler alias $CC" >&5 echo "$as_me: WARNING: replacing broken compiler alias $CC" >&2;} CFLAGS="$CFLAGS -std=`echo "$CC" | sed -e 's%.*/%%'`" CC=clang ;; esac - echo "$as_me:2022: checking version of $CC" >&5 + echo "$as_me:2050: checking version of $CC" >&5 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6 CLANG_VERSION="`$CC --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(CLANG[^)]*) //' -e 's/^.*(Debian[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`" test -z "$CLANG_VERSION" && CLANG_VERSION=unknown - echo "$as_me:2026: result: $CLANG_VERSION" >&5 + echo "$as_me:2054: result: $CLANG_VERSION" >&5 echo "${ECHO_T}$CLANG_VERSION" >&6 for cf_clang_opt in \ -Qunused-arguments \ -Wno-error=implicit-function-declaration do - echo "$as_me:2033: checking if option $cf_clang_opt works" >&5 + echo "$as_me:2061: checking if option $cf_clang_opt works" >&5 echo $ECHO_N "checking if option $cf_clang_opt works... $ECHO_C" >&6 cf_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $cf_clang_opt" cat >"conftest.$ac_ext" <<_ACEOF -#line 2038 "configure" +#line 2066 "configure" #include "confdefs.h" #include @@ -2049,16 +2077,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:2052: \"$ac_link\"") >&5 +if { (eval echo "$as_me:2080: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:2055: \$? = $ac_status" >&5 + echo "$as_me:2083: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:2058: \"$ac_try\"") >&5 + { (eval echo "$as_me:2086: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2061: \$? = $ac_status" >&5 + echo "$as_me:2089: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_clang_optok=yes @@ -2069,13 +2097,13 @@ cat "conftest.$ac_ext" >&5 cf_clang_optok=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - echo "$as_me:2072: result: $cf_clang_optok" >&5 + echo "$as_me:2100: result: $cf_clang_optok" >&5 echo "${ECHO_T}$cf_clang_optok" >&6 CFLAGS="$cf_save_CFLAGS" if test "$cf_clang_optok" = yes; then test -n "$verbose" && echo " adding option $cf_clang_opt" 1>&6 -echo "${as_me:-configure}:2078: testing adding option $cf_clang_opt ..." 1>&5 +echo "${as_me:-configure}:2106: testing adding option $cf_clang_opt ..." 1>&5 test -n "$CFLAGS" && CFLAGS="$CFLAGS " CFLAGS="${CFLAGS}$cf_clang_opt" @@ -2084,7 +2112,7 @@ echo "${as_me:-configure}:2078: testing adding option $cf_clang_opt ..." 1>&5 done fi -echo "$as_me:2087: checking for $CC option to accept ANSI C" >&5 +echo "$as_me:2115: checking for $CC option to accept ANSI C" >&5 echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 if test "${ac_cv_prog_cc_stdc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2092,7 +2120,7 @@ else ac_cv_prog_cc_stdc=no ac_save_CC=$CC cat >"conftest.$ac_ext" <<_ACEOF -#line 2095 "configure" +#line 2123 "configure" #include "confdefs.h" #include #include @@ -2139,16 +2167,16 @@ for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIO do CC="$ac_save_CC $ac_arg" rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:2142: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2170: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2145: \$? = $ac_status" >&5 + echo "$as_me:2173: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:2148: \"$ac_try\"") >&5 + { (eval echo "$as_me:2176: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2151: \$? = $ac_status" >&5 + echo "$as_me:2179: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_prog_cc_stdc=$ac_arg break @@ -2165,10 +2193,10 @@ fi case "x$ac_cv_prog_cc_stdc" in x|xno) - echo "$as_me:2168: result: none needed" >&5 + echo "$as_me:2196: result: none needed" >&5 echo "${ECHO_T}none needed" >&6 ;; *) - echo "$as_me:2171: result: $ac_cv_prog_cc_stdc" >&5 + echo "$as_me:2199: result: $ac_cv_prog_cc_stdc" >&5 echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 CC="$CC $ac_cv_prog_cc_stdc" ;; esac @@ -2176,13 +2204,13 @@ esac # This should have been defined by AC_PROG_CC : "${CC:=cc}" -echo "$as_me:2179: checking \$CFLAGS variable" >&5 +echo "$as_me:2207: checking \$CFLAGS variable" >&5 echo $ECHO_N "checking \$CFLAGS variable... $ECHO_C" >&6 case "x$CFLAGS" in (*-[IUD]*) - echo "$as_me:2183: result: broken" >&5 + echo "$as_me:2211: result: broken" >&5 echo "${ECHO_T}broken" >&6 - { echo "$as_me:2185: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5 + { echo "$as_me:2213: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5 echo "$as_me: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&2;} cf_flags="$CFLAGS" CFLAGS= @@ -2290,18 +2318,18 @@ fi done ;; (*) - echo "$as_me:2293: result: ok" >&5 + echo "$as_me:2321: result: ok" >&5 echo "${ECHO_T}ok" >&6 ;; esac -echo "$as_me:2298: checking \$CC variable" >&5 +echo "$as_me:2326: checking \$CC variable" >&5 echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6 case "$CC" in (*[\ \ ]-*) - echo "$as_me:2302: result: broken" >&5 + echo "$as_me:2330: result: broken" >&5 echo "${ECHO_T}broken" >&6 - { echo "$as_me:2304: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5 + { echo "$as_me:2332: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5 echo "$as_me: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&2;} # humor him... cf_prog=`echo "$CC" | sed -e 's/ / /g' -e 's/[ ]* / /g' -e 's/[ ]*[ ]-[^ ].*//'` @@ -2418,24 +2446,24 @@ fi done test -n "$verbose" && echo " resulting CC: '$CC'" 1>&6 -echo "${as_me:-configure}:2421: testing resulting CC: '$CC' ..." 1>&5 +echo "${as_me:-configure}:2449: testing resulting CC: '$CC' ..." 1>&5 test -n "$verbose" && echo " resulting CFLAGS: '$CFLAGS'" 1>&6 -echo "${as_me:-configure}:2425: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5 +echo "${as_me:-configure}:2453: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5 test -n "$verbose" && echo " resulting CPPFLAGS: '$CPPFLAGS'" 1>&6 -echo "${as_me:-configure}:2429: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5 +echo "${as_me:-configure}:2457: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5 ;; (*) - echo "$as_me:2433: result: ok" >&5 + echo "$as_me:2461: result: ok" >&5 echo "${ECHO_T}ok" >&6 ;; esac -echo "$as_me:2438: checking for inline" >&5 +echo "$as_me:2466: checking for inline" >&5 echo $ECHO_N "checking for inline... $ECHO_C" >&6 if test "${ac_cv_c_inline+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2443,25 +2471,25 @@ else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat >"conftest.$ac_ext" <<_ACEOF -#line 2446 "configure" +#line 2474 "configure" #include "confdefs.h" #ifndef __cplusplus -static $ac_kw int static_foo () {return 0; } -$ac_kw int foo () {return 0; } +static $ac_kw int static_foo (void) {return 0; } +$ac_kw int foo (void) {return 0; } #endif _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:2455: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2483: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2458: \$? = $ac_status" >&5 + echo "$as_me:2486: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:2461: \"$ac_try\"") >&5 + { (eval echo "$as_me:2489: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2464: \$? = $ac_status" >&5 + echo "$as_me:2492: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_c_inline=$ac_kw; break else @@ -2472,7 +2500,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:2475: result: $ac_cv_c_inline" >&5 +echo "$as_me:2503: result: $ac_cv_c_inline" >&5 echo "${ECHO_T}$ac_cv_c_inline" >&6 case $ac_cv_c_inline in inline | yes) ;; @@ -2491,7 +2519,7 @@ for ac_prog in ggrep grep do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:2494: checking for $ac_word" >&5 +echo "$as_me:2522: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_GREP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2506,7 +2534,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_GREP="$ac_prog" -echo "$as_me:2509: found $ac_dir/$ac_word" >&5 +echo "$as_me:2537: found $ac_dir/$ac_word" >&5 break done @@ -2514,10 +2542,10 @@ fi fi GREP=$ac_cv_prog_GREP if test -n "$GREP"; then - echo "$as_me:2517: result: $GREP" >&5 + echo "$as_me:2545: result: $GREP" >&5 echo "${ECHO_T}$GREP" >&6 else - echo "$as_me:2520: result: no" >&5 + echo "$as_me:2548: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2525,7 +2553,7 @@ fi done test -n "$GREP" || GREP=": " -echo "$as_me:2528: checking for egrep" >&5 +echo "$as_me:2556: checking for egrep" >&5 echo $ECHO_N "checking for egrep... $ECHO_C" >&6 if test "${ac_cv_path_EGREP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2537,7 +2565,7 @@ else do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:2540: checking for $ac_word" >&5 +echo "$as_me:2568: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_EGREP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2554,7 +2582,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_EGREP="$ac_dir/$ac_word" - echo "$as_me:2557: found $ac_dir/$ac_word" >&5 + echo "$as_me:2585: found $ac_dir/$ac_word" >&5 break fi done @@ -2565,10 +2593,10 @@ fi EGREP=$ac_cv_path_EGREP if test -n "$EGREP"; then - echo "$as_me:2568: result: $EGREP" >&5 + echo "$as_me:2596: result: $EGREP" >&5 echo "${ECHO_T}$EGREP" >&6 else - echo "$as_me:2571: result: no" >&5 + echo "$as_me:2599: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2576,12 +2604,12 @@ fi done test -n "$EGREP" || EGREP=": " - test "x$ac_cv_path_EGREP" = "x:" && { { echo "$as_me:2579: error: cannot find workable egrep" >&5 + test "x$ac_cv_path_EGREP" = "x:" && { { echo "$as_me:2607: error: cannot find workable egrep" >&5 echo "$as_me: error: cannot find workable egrep" >&2;} { (exit 1); exit 1; }; } fi fi -echo "$as_me:2584: result: $ac_cv_path_EGREP" >&5 +echo "$as_me:2612: result: $ac_cv_path_EGREP" >&5 echo "${ECHO_T}$ac_cv_path_EGREP" >&6 EGREP="$ac_cv_path_EGREP" @@ -2591,7 +2619,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS "conftest.$ac_ext" >&5' ac_link='$CC -o "conftest$ac_exeext" $CFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac_ext" $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu ac_main_return="return" -echo "$as_me:2594: checking how to run the C preprocessor" >&5 +echo "$as_me:2622: checking how to run the C preprocessor" >&5 echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then @@ -2612,18 +2640,18 @@ do # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >"conftest.$ac_ext" <<_ACEOF -#line 2615 "configure" +#line 2643 "configure" #include "confdefs.h" #include Syntax error _ACEOF -if { (eval echo "$as_me:2620: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:2648: \"$ac_cpp "conftest.$ac_ext"\"") >&5 (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:2626: \$? = $ac_status" >&5 + echo "$as_me:2654: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -2646,17 +2674,17 @@ rm -f conftest.err "conftest.$ac_ext" # OK, works on sane cases. Now check whether non-existent headers # can be detected and how. cat >"conftest.$ac_ext" <<_ACEOF -#line 2649 "configure" +#line 2677 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:2653: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:2681: \"$ac_cpp "conftest.$ac_ext"\"") >&5 (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:2659: \$? = $ac_status" >&5 + echo "$as_me:2687: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -2693,7 +2721,7 @@ fi else ac_cv_prog_CPP=$CPP fi -echo "$as_me:2696: result: $CPP" >&5 +echo "$as_me:2724: result: $CPP" >&5 echo "${ECHO_T}$CPP" >&6 ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes @@ -2703,18 +2731,18 @@ do # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >"conftest.$ac_ext" <<_ACEOF -#line 2706 "configure" +#line 2734 "configure" #include "confdefs.h" #include Syntax error _ACEOF -if { (eval echo "$as_me:2711: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:2739: \"$ac_cpp "conftest.$ac_ext"\"") >&5 (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:2717: \$? = $ac_status" >&5 + echo "$as_me:2745: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -2737,17 +2765,17 @@ rm -f conftest.err "conftest.$ac_ext" # OK, works on sane cases. Now check whether non-existent headers # can be detected and how. cat >"conftest.$ac_ext" <<_ACEOF -#line 2740 "configure" +#line 2768 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:2744: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:2772: \"$ac_cpp "conftest.$ac_ext"\"") >&5 (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:2750: \$? = $ac_status" >&5 + echo "$as_me:2778: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -2775,7 +2803,7 @@ rm -f conftest.err "conftest.$ac_ext" if $ac_preproc_ok; then : else - { { echo "$as_me:2778: error: C preprocessor \"$CPP\" fails sanity check" >&5 + { { echo "$as_me:2806: error: C preprocessor \"$CPP\" fails sanity check" >&5 echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;} { (exit 1); exit 1; }; } fi @@ -2791,7 +2819,7 @@ for ac_prog in mawk gawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:2794: checking for $ac_word" >&5 +echo "$as_me:2822: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_AWK+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2806,7 +2834,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_AWK="$ac_prog" -echo "$as_me:2809: found $ac_dir/$ac_word" >&5 +echo "$as_me:2837: found $ac_dir/$ac_word" >&5 break done @@ -2814,16 +2842,27 @@ fi fi AWK=$ac_cv_prog_AWK if test -n "$AWK"; then - echo "$as_me:2817: result: $AWK" >&5 + echo "$as_me:2845: result: $AWK" >&5 echo "${ECHO_T}$AWK" >&6 else - echo "$as_me:2820: result: no" >&5 + echo "$as_me:2848: result: no" >&5 echo "${ECHO_T}no" >&6 fi test -n "$AWK" && break done +case "$cf_cv_system_name" in +(cygwin*|msys*|mingw32*|mingw64|os2*) + GLOB_FULLPATH_POSIX='/*' + GLOB_FULLPATH_OTHER='[a-zA-Z]:[\\/]*' + ;; +(*) + GLOB_FULLPATH_POSIX='/*' + GLOB_FULLPATH_OTHER=$GLOB_FULLPATH_POSIX + ;; +esac + # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or # incompatible versions: @@ -2836,7 +2875,7 @@ done # AFS /usr/afsws/bin/install, which mishandles nonexistent args # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. -echo "$as_me:2839: checking for a BSD compatible install" >&5 +echo "$as_me:2878: checking for a BSD compatible install" >&5 echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6 if test -z "$INSTALL"; then if test "${ac_cv_path_install+set}" = set; then @@ -2885,7 +2924,7 @@ fi INSTALL=$ac_install_sh fi fi -echo "$as_me:2888: result: $INSTALL" >&5 +echo "$as_me:2927: result: $INSTALL" >&5 echo "${ECHO_T}$INSTALL" >&6 # Use test -z because SunOS4 sh mishandles braces in ${var-val}. @@ -2896,8 +2935,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -case $INSTALL in -(/*) +case x$INSTALL in +(x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER) ;; (*) cf_dir=`echo "$INSTALL" | sed -e 's%/[^/]*$%%'` @@ -2906,7 +2945,7 @@ case $INSTALL in ;; esac -echo "$as_me:2909: checking if you want to install stripped executables" >&5 +echo "$as_me:2948: checking if you want to install stripped executables" >&5 echo $ECHO_N "checking if you want to install stripped executables... $ECHO_C" >&6 # Check whether --enable-stripping or --disable-stripping was given. @@ -2923,7 +2962,7 @@ else enable_stripping=yes fi; -echo "$as_me:2926: result: $enable_stripping" >&5 +echo "$as_me:2965: result: $enable_stripping" >&5 echo "${ECHO_T}$enable_stripping" >&6 if test "$enable_stripping" = yes @@ -2934,7 +2973,7 @@ else fi : "${INSTALL:=install}" -echo "$as_me:2937: checking if install accepts -p option" >&5 +echo "$as_me:2976: checking if install accepts -p option" >&5 echo $ECHO_N "checking if install accepts -p option... $ECHO_C" >&6 if test "${cf_cv_install_p+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2965,10 +3004,10 @@ else rm -rf ./conftest* fi -echo "$as_me:2968: result: $cf_cv_install_p" >&5 +echo "$as_me:3007: result: $cf_cv_install_p" >&5 echo "${ECHO_T}$cf_cv_install_p" >&6 -echo "$as_me:2971: checking if install needs to be told about ownership" >&5 +echo "$as_me:3010: checking if install needs to be told about ownership" >&5 echo $ECHO_N "checking if install needs to be told about ownership... $ECHO_C" >&6 case `$ac_config_guess` in (*minix) @@ -2979,7 +3018,7 @@ case `$ac_config_guess` in ;; esac -echo "$as_me:2982: result: $with_install_o" >&5 +echo "$as_me:3021: result: $with_install_o" >&5 echo "${ECHO_T}$with_install_o" >&6 if test "x$with_install_o" = xyes then @@ -2988,11 +3027,77 @@ else INSTALL_OPT_O= fi +if test -n "$INSTALL_OPT_S" +then + echo "$as_me:3032: checking if you want to specify strip-program" >&5 +echo $ECHO_N "checking if you want to specify strip-program... $ECHO_C" >&6 + +# Check whether --with-strip-program or --without-strip-program was given. +if test "${with_strip_program+set}" = set; then + withval="$with_strip_program" + with_strip_program=$withval +else + with_strip_program=no +fi; + echo "$as_me:3042: result: $with_strip_program" >&5 +echo "${ECHO_T}$with_strip_program" >&6 + if test "$with_strip_program" != no + then + echo "$as_me:3046: checking if strip-program is supported with this installer" >&5 +echo $ECHO_N "checking if strip-program is supported with this installer... $ECHO_C" >&6 + cf_install_program=`echo "$INSTALL" | sed -e 's%[ ]*[ ]-.%%'` + check_install_strip=no + if test -f "$cf_install_program" + then + check_install_version=`"$cf_install_program" --version 2>/dev/null | head -n 1 | grep coreutils` + if test -n "$check_install_version" + then + check_install_strip="option" + else + for check_strip_variable in STRIPBIN STRIP + do + if strings "$cf_install_program" | grep "^$check_strip_variable$" >/dev/null + then + check_install_strip="environ" + break + fi + done + fi + fi + echo "$as_me:3067: result: $check_install_strip" >&5 +echo "${ECHO_T}$check_install_strip" >&6 + case "$check_install_strip" in + (no) + { echo "$as_me:3071: WARNING: $cf_install_program does not support strip program option" >&5 +echo "$as_me: WARNING: $cf_install_program does not support strip program option" >&2;} + with_strip_program=no + ;; + (environ) + cat >install.tmp <<-CF_EOF + #! $SHELL + STRIPBIN="$with_strip_program" \\ + STRIP="$with_strip_program" \\ + $INSTALL "$@" + CF_EOF + INSTALL="`pwd`/install.tmp" + chmod +x "$INSTALL" + test -n "$verbose" && echo " created $INSTALL" 1>&6 + +echo "${as_me:-configure}:3086: testing created $INSTALL ..." 1>&5 + + ;; + (option) + INSTALL_OPT_S="$INSTALL_OPT_S --strip-program=\"$with_strip_program\"" + ;; + esac + fi +fi + for ac_prog in lint cppcheck splint do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:2995: checking for $ac_word" >&5 +echo "$as_me:3100: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_LINT+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3007,7 +3112,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_LINT="$ac_prog" -echo "$as_me:3010: found $ac_dir/$ac_word" >&5 +echo "$as_me:3115: found $ac_dir/$ac_word" >&5 break done @@ -3015,10 +3120,10 @@ fi fi LINT=$ac_cv_prog_LINT if test -n "$LINT"; then - echo "$as_me:3018: result: $LINT" >&5 + echo "$as_me:3123: result: $LINT" >&5 echo "${ECHO_T}$LINT" >&6 else - echo "$as_me:3021: result: no" >&5 + echo "$as_me:3126: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3026,12 +3131,15 @@ fi done case "x$LINT" in +(xlint|x*/lint) # NetBSD 10 + test -z "$LINT_OPTS" && LINT_OPTS="-chapbrxzgFS -v -Ac11" + ;; (xcppcheck|x*/cppcheck) - test -z "$LINT_OPTS" && LINT_OPTS="--enable=all" + test -z "$LINT_OPTS" && LINT_OPTS="--enable=all -D__CPPCHECK__" ;; esac -echo "$as_me:3034: checking for \".PHONY\" make-support" >&5 +echo "$as_me:3142: checking for \".PHONY\" make-support" >&5 echo $ECHO_N "checking for \".PHONY\" make-support... $ECHO_C" >&6 if test "${cf_cv_make_PHONY+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3086,14 +3194,14 @@ CF_EOF rm -rf conftest* fi -echo "$as_me:3089: result: $cf_cv_make_PHONY" >&5 +echo "$as_me:3197: result: $cf_cv_make_PHONY" >&5 echo "${ECHO_T}$cf_cv_make_PHONY" >&6 MAKE_NO_PHONY="#" MAKE_PHONY="#" test "x$cf_cv_make_PHONY" = xyes && MAKE_PHONY= test "x$cf_cv_make_PHONY" != xyes && MAKE_NO_PHONY= -echo "$as_me:3096: checking if filesystem supports mixed-case filenames" >&5 +echo "$as_me:3204: checking if filesystem supports mixed-case filenames" >&5 echo $ECHO_N "checking if filesystem supports mixed-case filenames... $ECHO_C" >&6 if test "${cf_cv_mixedcase+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3120,7 +3228,7 @@ else fi fi -echo "$as_me:3123: result: $cf_cv_mixedcase" >&5 +echo "$as_me:3231: result: $cf_cv_mixedcase" >&5 echo "${ECHO_T}$cf_cv_mixedcase" >&6 test "$cf_cv_mixedcase" = yes && cat >>confdefs.h <<\EOF @@ -3131,7 +3239,7 @@ for ac_prog in exctags ctags do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:3134: checking for $ac_word" >&5 +echo "$as_me:3242: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CTAGS+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3146,7 +3254,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_CTAGS="$ac_prog" -echo "$as_me:3149: found $ac_dir/$ac_word" >&5 +echo "$as_me:3257: found $ac_dir/$ac_word" >&5 break done @@ -3154,10 +3262,10 @@ fi fi CTAGS=$ac_cv_prog_CTAGS if test -n "$CTAGS"; then - echo "$as_me:3157: result: $CTAGS" >&5 + echo "$as_me:3265: result: $CTAGS" >&5 echo "${ECHO_T}$CTAGS" >&6 else - echo "$as_me:3160: result: no" >&5 + echo "$as_me:3268: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3168,7 +3276,7 @@ for ac_prog in exetags etags do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:3171: checking for $ac_word" >&5 +echo "$as_me:3279: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ETAGS+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3183,7 +3291,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ETAGS="$ac_prog" -echo "$as_me:3186: found $ac_dir/$ac_word" >&5 +echo "$as_me:3294: found $ac_dir/$ac_word" >&5 break done @@ -3191,10 +3299,10 @@ fi fi ETAGS=$ac_cv_prog_ETAGS if test -n "$ETAGS"; then - echo "$as_me:3194: result: $ETAGS" >&5 + echo "$as_me:3302: result: $ETAGS" >&5 echo "${ECHO_T}$ETAGS" >&6 else - echo "$as_me:3197: result: no" >&5 + echo "$as_me:3305: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3203,7 +3311,7 @@ done # Extract the first word of "${CTAGS:-ctags}", so it can be a program name with args. set dummy ${CTAGS:-ctags}; ac_word=$2 -echo "$as_me:3206: checking for $ac_word" >&5 +echo "$as_me:3314: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_MAKE_LOWER_TAGS+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3218,7 +3326,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_MAKE_LOWER_TAGS="yes" -echo "$as_me:3221: found $ac_dir/$ac_word" >&5 +echo "$as_me:3329: found $ac_dir/$ac_word" >&5 break done @@ -3227,17 +3335,17 @@ fi fi MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS if test -n "$MAKE_LOWER_TAGS"; then - echo "$as_me:3230: result: $MAKE_LOWER_TAGS" >&5 + echo "$as_me:3338: result: $MAKE_LOWER_TAGS" >&5 echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6 else - echo "$as_me:3233: result: no" >&5 + echo "$as_me:3341: result: no" >&5 echo "${ECHO_T}no" >&6 fi if test "$cf_cv_mixedcase" = yes ; then # Extract the first word of "${ETAGS:-etags}", so it can be a program name with args. set dummy ${ETAGS:-etags}; ac_word=$2 -echo "$as_me:3240: checking for $ac_word" >&5 +echo "$as_me:3348: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_MAKE_UPPER_TAGS+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3252,7 +3360,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_MAKE_UPPER_TAGS="yes" -echo "$as_me:3255: found $ac_dir/$ac_word" >&5 +echo "$as_me:3363: found $ac_dir/$ac_word" >&5 break done @@ -3261,10 +3369,10 @@ fi fi MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS if test -n "$MAKE_UPPER_TAGS"; then - echo "$as_me:3264: result: $MAKE_UPPER_TAGS" >&5 + echo "$as_me:3372: result: $MAKE_UPPER_TAGS" >&5 echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6 else - echo "$as_me:3267: result: no" >&5 + echo "$as_me:3375: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3284,14 +3392,14 @@ else MAKE_LOWER_TAGS="#" fi -echo "$as_me:3287: checking if -lm needed for math functions" >&5 +echo "$as_me:3395: checking if -lm needed for math functions" >&5 echo $ECHO_N "checking if -lm needed for math functions... $ECHO_C" >&6 if test "${cf_cv_need_libm+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 3294 "configure" +#line 3402 "configure" #include "confdefs.h" #include @@ -3307,16 +3415,16 @@ double x = rand(); printf("result = %g\\n", pow(sin(x),x)) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:3310: \"$ac_link\"") >&5 +if { (eval echo "$as_me:3418: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:3313: \$? = $ac_status" >&5 + echo "$as_me:3421: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:3316: \"$ac_try\"") >&5 + { (eval echo "$as_me:3424: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3319: \$? = $ac_status" >&5 + echo "$as_me:3427: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_need_libm=no else @@ -3326,7 +3434,7 @@ cf_cv_need_libm=yes fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:3329: result: $cf_cv_need_libm" >&5 +echo "$as_me:3437: result: $cf_cv_need_libm" >&5 echo "${ECHO_T}$cf_cv_need_libm" >&6 if test "$cf_cv_need_libm" = yes @@ -3334,14 +3442,14 @@ then cf_save_LIBS="$LIBS" LIBS="$LIBS -lm" - echo "$as_me:3337: checking if -lm is available for math functions" >&5 + echo "$as_me:3445: checking if -lm is available for math functions" >&5 echo $ECHO_N "checking if -lm is available for math functions... $ECHO_C" >&6 if test "${cf_cv_have_libm+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 3344 "configure" +#line 3452 "configure" #include "confdefs.h" #include @@ -3357,16 +3465,16 @@ double x = rand(); printf("result = %g\\n", pow(sin(x),x)) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:3360: \"$ac_link\"") >&5 +if { (eval echo "$as_me:3468: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:3363: \$? = $ac_status" >&5 + echo "$as_me:3471: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:3366: \"$ac_try\"") >&5 + { (eval echo "$as_me:3474: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3369: \$? = $ac_status" >&5 + echo "$as_me:3477: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_have_libm=yes else @@ -3376,7 +3484,7 @@ cf_cv_have_libm=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:3379: result: $cf_cv_have_libm" >&5 +echo "$as_me:3487: result: $cf_cv_have_libm" >&5 echo "${ECHO_T}$cf_cv_have_libm" >&6 LIBS="$cf_save_LIBS" @@ -3431,7 +3539,7 @@ includesubdir="" cf_cv_screen=curses cf_cv_libtype= -echo "$as_me:3434: checking for fgrep" >&5 +echo "$as_me:3542: checking for fgrep" >&5 echo $ECHO_N "checking for fgrep... $ECHO_C" >&6 if test "${ac_cv_path_FGREP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3443,7 +3551,7 @@ else do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:3446: checking for $ac_word" >&5 +echo "$as_me:3554: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_FGREP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3460,7 +3568,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_FGREP="$ac_dir/$ac_word" - echo "$as_me:3463: found $ac_dir/$ac_word" >&5 + echo "$as_me:3571: found $ac_dir/$ac_word" >&5 break fi done @@ -3471,10 +3579,10 @@ fi FGREP=$ac_cv_path_FGREP if test -n "$FGREP"; then - echo "$as_me:3474: result: $FGREP" >&5 + echo "$as_me:3582: result: $FGREP" >&5 echo "${ECHO_T}$FGREP" >&6 else - echo "$as_me:3477: result: no" >&5 + echo "$as_me:3585: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3482,16 +3590,16 @@ fi done test -n "$FGREP" || FGREP=": " - test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:3485: error: cannot find workable fgrep" >&5 + test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:3593: error: cannot find workable fgrep" >&5 echo "$as_me: error: cannot find workable fgrep" >&2;} { (exit 1); exit 1; }; } fi fi -echo "$as_me:3490: result: $ac_cv_path_FGREP" >&5 +echo "$as_me:3598: result: $ac_cv_path_FGREP" >&5 echo "${ECHO_T}$ac_cv_path_FGREP" >&6 FGREP="$ac_cv_path_FGREP" -echo "$as_me:3494: checking if you want to use C11 _Noreturn feature" >&5 +echo "$as_me:3602: checking if you want to use C11 _Noreturn feature" >&5 echo $ECHO_N "checking if you want to use C11 _Noreturn feature... $ECHO_C" >&6 # Check whether --enable-stdnoreturn or --disable-stdnoreturn was given. @@ -3508,17 +3616,17 @@ else enable_stdnoreturn=no fi; -echo "$as_me:3511: result: $enable_stdnoreturn" >&5 +echo "$as_me:3619: result: $enable_stdnoreturn" >&5 echo "${ECHO_T}$enable_stdnoreturn" >&6 if test $enable_stdnoreturn = yes; then -echo "$as_me:3515: checking for C11 _Noreturn feature" >&5 +echo "$as_me:3623: checking for C11 _Noreturn feature" >&5 echo $ECHO_N "checking for C11 _Noreturn feature... $ECHO_C" >&6 if test "${cf_cv_c11_noreturn+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 3521 "configure" +#line 3629 "configure" #include "confdefs.h" $ac_includes_default @@ -3534,16 +3642,16 @@ if (feof(stdin)) giveup() } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:3537: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3645: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3540: \$? = $ac_status" >&5 + echo "$as_me:3648: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:3543: \"$ac_try\"") >&5 + { (eval echo "$as_me:3651: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3546: \$? = $ac_status" >&5 + echo "$as_me:3654: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_c11_noreturn=yes else @@ -3554,7 +3662,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:3557: result: $cf_cv_c11_noreturn" >&5 +echo "$as_me:3665: result: $cf_cv_c11_noreturn" >&5 echo "${ECHO_T}$cf_cv_c11_noreturn" >&6 else cf_cv_c11_noreturn=no, @@ -3593,10 +3701,10 @@ cat > conftest.i <&5 + { echo "$as_me:3704: checking for $CC __attribute__ directives..." >&5 echo "$as_me: checking for $CC __attribute__ directives..." >&6;} cat > "conftest.$ac_ext" < #include "confdefs.h" #include "conftest.h" @@ -3646,12 +3754,12 @@ EOF ;; esac - if { (eval echo "$as_me:3649: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:3757: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3652: \$? = $ac_status" >&5 + echo "$as_me:3760: \$? = $ac_status" >&5 (exit "$ac_status"); }; then - test -n "$verbose" && echo "$as_me:3654: result: ... $cf_attribute" >&5 + test -n "$verbose" && echo "$as_me:3762: result: ... $cf_attribute" >&5 echo "${ECHO_T}... $cf_attribute" >&6 cat conftest.h >>confdefs.h case "$cf_attribute" in @@ -3710,7 +3818,7 @@ fi rm -rf ./conftest* fi -echo "$as_me:3713: checking if you want to work around bogus compiler/loader warnings" >&5 +echo "$as_me:3821: checking if you want to work around bogus compiler/loader warnings" >&5 echo $ECHO_N "checking if you want to work around bogus compiler/loader warnings... $ECHO_C" >&6 # Check whether --enable-string-hacks or --disable-string-hacks was given. @@ -3720,7 +3828,7 @@ if test "${enable_string_hacks+set}" = set; then else enable_string_hacks=no fi; -echo "$as_me:3723: result: $enable_string_hacks" >&5 +echo "$as_me:3831: result: $enable_string_hacks" >&5 echo "${ECHO_T}$enable_string_hacks" >&6 if test "x$enable_string_hacks" = "xyes"; then @@ -3729,15 +3837,15 @@ cat >>confdefs.h <<\EOF #define USE_STRING_HACKS 1 EOF - { echo "$as_me:3732: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5 + { echo "$as_me:3840: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5 echo "$as_me: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&2;} - echo "$as_me:3734: checking for strlcat" >&5 + echo "$as_me:3842: checking for strlcat" >&5 echo $ECHO_N "checking for strlcat... $ECHO_C" >&6 if test "${ac_cv_func_strlcat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 3740 "configure" +#line 3848 "configure" #include "confdefs.h" #define strlcat autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -3768,16 +3876,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:3771: \"$ac_link\"") >&5 +if { (eval echo "$as_me:3879: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:3774: \$? = $ac_status" >&5 + echo "$as_me:3882: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:3777: \"$ac_try\"") >&5 + { (eval echo "$as_me:3885: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3780: \$? = $ac_status" >&5 + echo "$as_me:3888: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_strlcat=yes else @@ -3787,7 +3895,7 @@ ac_cv_func_strlcat=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:3790: result: $ac_cv_func_strlcat" >&5 +echo "$as_me:3898: result: $ac_cv_func_strlcat" >&5 echo "${ECHO_T}$ac_cv_func_strlcat" >&6 if test "$ac_cv_func_strlcat" = yes; then @@ -3797,7 +3905,7 @@ EOF else - echo "$as_me:3800: checking for strlcat in -lbsd" >&5 + echo "$as_me:3908: checking for strlcat in -lbsd" >&5 echo $ECHO_N "checking for strlcat in -lbsd... $ECHO_C" >&6 if test "${ac_cv_lib_bsd_strlcat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3805,7 +3913,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lbsd $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 3808 "configure" +#line 3916 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -3814,7 +3922,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char strlcat (); +char strlcat (void); int main (void) { @@ -3824,16 +3932,16 @@ strlcat (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:3827: \"$ac_link\"") >&5 +if { (eval echo "$as_me:3935: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:3830: \$? = $ac_status" >&5 + echo "$as_me:3938: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:3833: \"$ac_try\"") >&5 + { (eval echo "$as_me:3941: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3836: \$? = $ac_status" >&5 + echo "$as_me:3944: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_bsd_strlcat=yes else @@ -3844,7 +3952,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:3847: result: $ac_cv_lib_bsd_strlcat" >&5 +echo "$as_me:3955: result: $ac_cv_lib_bsd_strlcat" >&5 echo "${ECHO_T}$ac_cv_lib_bsd_strlcat" >&6 if test "$ac_cv_lib_bsd_strlcat" = yes; then @@ -3867,23 +3975,23 @@ LIBS="$cf_add_libs" for ac_header in bsd/string.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:3870: checking for $ac_header" >&5 +echo "$as_me:3978: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 3876 "configure" +#line 3984 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:3880: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:3988: \"$ac_cpp "conftest.$ac_ext"\"") >&5 (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:3886: \$? = $ac_status" >&5 + echo "$as_me:3994: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -3902,7 +4010,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:3905: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:4013: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then cat >>confdefs.h <&5 +echo "$as_me:4034: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 3932 "configure" +#line 4040 "configure" #include "confdefs.h" #define $ac_func autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -3960,16 +4068,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:3963: \"$ac_link\"") >&5 +if { (eval echo "$as_me:4071: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:3966: \$? = $ac_status" >&5 + echo "$as_me:4074: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:3969: \"$ac_try\"") >&5 + { (eval echo "$as_me:4077: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3972: \$? = $ac_status" >&5 + echo "$as_me:4080: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then eval "$as_ac_var=yes" else @@ -3979,7 +4087,7 @@ eval "$as_ac_var=no" fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:3982: result: `eval echo '${'"$as_ac_var"'}'`" >&5 +echo "$as_me:4090: result: `eval echo '${'"$as_ac_var"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then cat >>confdefs.h <&5 +echo "$as_me:4102: checking if the POSIX test-macros are already defined" >&5 echo $ECHO_N "checking if the POSIX test-macros are already defined... $ECHO_C" >&6 if test "${cf_cv_posix_visible+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 4001 "configure" +#line 4109 "configure" #include "confdefs.h" #include int @@ -4017,16 +4125,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:4020: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4128: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4023: \$? = $ac_status" >&5 + echo "$as_me:4131: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:4026: \"$ac_try\"") >&5 + { (eval echo "$as_me:4134: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4029: \$? = $ac_status" >&5 + echo "$as_me:4137: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_posix_visible=no else @@ -4037,7 +4145,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:4040: result: $cf_cv_posix_visible" >&5 +echo "$as_me:4148: result: $cf_cv_posix_visible" >&5 echo "${ECHO_T}$cf_cv_posix_visible" >&6 if test "$cf_cv_posix_visible" = no; then @@ -4075,18 +4183,18 @@ case "$host_os" in cf_xopen_source="-D_SGI_SOURCE" cf_XOPEN_SOURCE= ;; -(linux*gnu|linux*gnuabi64|linux*gnuabin32|linux*gnueabi|linux*gnueabihf|linux*gnux32|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys) +(linux*gnu|linux*gnuabi64|linux*gnuabin32|linux*gnueabi|linux*gnueabihf|linux*gnux32|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys|mingw*|linux*uclibc) cf_gnu_xopen_source=$cf_XOPEN_SOURCE -echo "$as_me:4082: checking if this is the GNU C library" >&5 +echo "$as_me:4190: checking if this is the GNU C library" >&5 echo $ECHO_N "checking if this is the GNU C library... $ECHO_C" >&6 if test "${cf_cv_gnu_library+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 4089 "configure" +#line 4197 "configure" #include "confdefs.h" #include int @@ -4105,16 +4213,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:4108: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4216: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4111: \$? = $ac_status" >&5 + echo "$as_me:4219: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:4114: \"$ac_try\"") >&5 + { (eval echo "$as_me:4222: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4117: \$? = $ac_status" >&5 + echo "$as_me:4225: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_gnu_library=yes else @@ -4125,7 +4233,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:4128: result: $cf_cv_gnu_library" >&5 +echo "$as_me:4236: result: $cf_cv_gnu_library" >&5 echo "${ECHO_T}$cf_cv_gnu_library" >&6 if test x$cf_cv_gnu_library = xyes; then @@ -4133,7 +4241,7 @@ if test x$cf_cv_gnu_library = xyes; then # With glibc 2.19 (13 years after this check was begun), _DEFAULT_SOURCE # was changed to help a little. newlib incorporated the change about 4 # years later. - echo "$as_me:4136: checking if _DEFAULT_SOURCE can be used as a basis" >&5 + echo "$as_me:4244: checking if _DEFAULT_SOURCE can be used as a basis" >&5 echo $ECHO_N "checking if _DEFAULT_SOURCE can be used as a basis... $ECHO_C" >&6 if test "${cf_cv_gnu_library_219+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4145,7 +4253,7 @@ else CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE" cat >"conftest.$ac_ext" <<_ACEOF -#line 4148 "configure" +#line 4256 "configure" #include "confdefs.h" #include int @@ -4164,16 +4272,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:4167: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4275: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4170: \$? = $ac_status" >&5 + echo "$as_me:4278: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:4173: \"$ac_try\"") >&5 + { (eval echo "$as_me:4281: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4176: \$? = $ac_status" >&5 + echo "$as_me:4284: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_gnu_library_219=yes else @@ -4185,12 +4293,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" CPPFLAGS="$cf_save" fi -echo "$as_me:4188: result: $cf_cv_gnu_library_219" >&5 +echo "$as_me:4296: result: $cf_cv_gnu_library_219" >&5 echo "${ECHO_T}$cf_cv_gnu_library_219" >&6 if test "x$cf_cv_gnu_library_219" = xyes; then cf_save="$CPPFLAGS" - echo "$as_me:4193: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5 + echo "$as_me:4301: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5 echo $ECHO_N "checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE... $ECHO_C" >&6 if test "${cf_cv_gnu_dftsrc_219+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4295,7 +4403,7 @@ if test -n "$cf_new_extra_cppflags" ; then fi cat >"conftest.$ac_ext" <<_ACEOF -#line 4298 "configure" +#line 4406 "configure" #include "confdefs.h" #include @@ -4315,16 +4423,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:4318: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4426: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4321: \$? = $ac_status" >&5 + echo "$as_me:4429: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:4324: \"$ac_try\"") >&5 + { (eval echo "$as_me:4432: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4327: \$? = $ac_status" >&5 + echo "$as_me:4435: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_gnu_dftsrc_219=yes else @@ -4335,7 +4443,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:4338: result: $cf_cv_gnu_dftsrc_219" >&5 +echo "$as_me:4446: result: $cf_cv_gnu_dftsrc_219" >&5 echo "${ECHO_T}$cf_cv_gnu_dftsrc_219" >&6 test "x$cf_cv_gnu_dftsrc_219" = "xyes" || CPPFLAGS="$cf_save" else @@ -4344,14 +4452,14 @@ echo "${ECHO_T}$cf_cv_gnu_dftsrc_219" >&6 if test "x$cf_cv_gnu_dftsrc_219" != xyes; then - echo "$as_me:4347: checking if we must define _GNU_SOURCE" >&5 + echo "$as_me:4455: checking if we must define _GNU_SOURCE" >&5 echo $ECHO_N "checking if we must define _GNU_SOURCE... $ECHO_C" >&6 if test "${cf_cv_gnu_source+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 4354 "configure" +#line 4462 "configure" #include "confdefs.h" #include int @@ -4366,16 +4474,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:4369: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4477: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4372: \$? = $ac_status" >&5 + echo "$as_me:4480: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:4375: \"$ac_try\"") >&5 + { (eval echo "$as_me:4483: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4378: \$? = $ac_status" >&5 + echo "$as_me:4486: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_gnu_source=no else @@ -4482,7 +4590,7 @@ if test -n "$cf_new_extra_cppflags" ; then fi cat >"conftest.$ac_ext" <<_ACEOF -#line 4485 "configure" +#line 4593 "configure" #include "confdefs.h" #include int @@ -4497,16 +4605,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:4500: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4608: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4503: \$? = $ac_status" >&5 + echo "$as_me:4611: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:4506: \"$ac_try\"") >&5 + { (eval echo "$as_me:4614: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4509: \$? = $ac_status" >&5 + echo "$as_me:4617: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_gnu_source=no else @@ -4521,12 +4629,12 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:4524: result: $cf_cv_gnu_source" >&5 +echo "$as_me:4632: result: $cf_cv_gnu_source" >&5 echo "${ECHO_T}$cf_cv_gnu_source" >&6 if test "$cf_cv_gnu_source" = yes then - echo "$as_me:4529: checking if we should also define _DEFAULT_SOURCE" >&5 + echo "$as_me:4637: checking if we should also define _DEFAULT_SOURCE" >&5 echo $ECHO_N "checking if we should also define _DEFAULT_SOURCE... $ECHO_C" >&6 if test "${cf_cv_default_source+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4536,7 +4644,7 @@ else CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE" cat >"conftest.$ac_ext" <<_ACEOF -#line 4539 "configure" +#line 4647 "configure" #include "confdefs.h" #include int @@ -4551,16 +4659,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:4554: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4662: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4557: \$? = $ac_status" >&5 + echo "$as_me:4665: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:4560: \"$ac_try\"") >&5 + { (eval echo "$as_me:4668: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4563: \$? = $ac_status" >&5 + echo "$as_me:4671: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_default_source=no else @@ -4571,7 +4679,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:4574: result: $cf_cv_default_source" >&5 +echo "$as_me:4682: result: $cf_cv_default_source" >&5 echo "${ECHO_T}$cf_cv_default_source" >&6 if test "$cf_cv_default_source" = yes then @@ -4585,6 +4693,9 @@ echo "${ECHO_T}$cf_cv_default_source" >&6 fi + ;; +linux*musl) + cf_xopen_source="-D_BSD_SOURCE" ;; (minix*) cf_xopen_source="-D_NETBSD_SOURCE" # POSIX.1-2001 features are ifdef'd with this... @@ -4608,16 +4719,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \ sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'` -echo "$as_me:4611: checking if we should define _POSIX_C_SOURCE" >&5 +echo "$as_me:4722: checking if we should define _POSIX_C_SOURCE" >&5 echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6 if test "${cf_cv_posix_c_source+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -echo "${as_me:-configure}:4617: testing if the symbol is already defined go no further ..." 1>&5 +echo "${as_me:-configure}:4728: testing if the symbol is already defined go no further ..." 1>&5 cat >"conftest.$ac_ext" <<_ACEOF -#line 4620 "configure" +#line 4731 "configure" #include "confdefs.h" #include int @@ -4632,16 +4743,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:4635: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4746: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4638: \$? = $ac_status" >&5 + echo "$as_me:4749: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:4641: \"$ac_try\"") >&5 + { (eval echo "$as_me:4752: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4644: \$? = $ac_status" >&5 + echo "$as_me:4755: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_posix_c_source=no else @@ -4662,7 +4773,7 @@ cf_want_posix_source=no esac if test "$cf_want_posix_source" = yes ; then cat >"conftest.$ac_ext" <<_ACEOF -#line 4665 "configure" +#line 4776 "configure" #include "confdefs.h" #include int @@ -4677,16 +4788,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:4680: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4791: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4683: \$? = $ac_status" >&5 + echo "$as_me:4794: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:4686: \"$ac_try\"") >&5 + { (eval echo "$as_me:4797: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4689: \$? = $ac_status" >&5 + echo "$as_me:4800: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -4697,7 +4808,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "${as_me:-configure}:4700: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 +echo "${as_me:-configure}:4811: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 CFLAGS="$cf_trim_CFLAGS" CPPFLAGS="$cf_trim_CPPFLAGS" @@ -4705,10 +4816,10 @@ echo "${as_me:-configure}:4700: testing ifdef from value $cf_POSIX_C_SOURCE ..." test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source" -echo "${as_me:-configure}:4708: testing if the second compile does not leave our definition intact error ..." 1>&5 +echo "${as_me:-configure}:4819: testing if the second compile does not leave our definition intact error ..." 1>&5 cat >"conftest.$ac_ext" <<_ACEOF -#line 4711 "configure" +#line 4822 "configure" #include "confdefs.h" #include int @@ -4723,16 +4834,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:4726: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4837: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4729: \$? = $ac_status" >&5 + echo "$as_me:4840: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:4732: \"$ac_try\"") >&5 + { (eval echo "$as_me:4843: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4735: \$? = $ac_status" >&5 + echo "$as_me:4846: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -4748,7 +4859,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:4751: result: $cf_cv_posix_c_source" >&5 +echo "$as_me:4862: result: $cf_cv_posix_c_source" >&5 echo "${ECHO_T}$cf_cv_posix_c_source" >&6 if test "$cf_cv_posix_c_source" != no ; then @@ -4865,7 +4976,7 @@ fi # cf_cv_posix_visible # OpenBSD 6.x has broken locale support, both compile-time and runtime. # see https://www.mail-archive.com/bugs@openbsd.org/msg13200.html # Abusing the conformance level is a workaround. - { echo "$as_me:4868: WARNING: this system does not provide usable locale support" >&5 + { echo "$as_me:4979: WARNING: this system does not provide usable locale support" >&5 echo "$as_me: WARNING: this system does not provide usable locale support" >&2;} cf_xopen_source="-D_BSD_SOURCE" cf_XOPEN_SOURCE=700 @@ -4897,14 +5008,14 @@ echo "$as_me: WARNING: this system does not provide usable locale support" >&2;} ;; (*) -echo "$as_me:4900: checking if we should define _XOPEN_SOURCE" >&5 +echo "$as_me:5011: checking if we should define _XOPEN_SOURCE" >&5 echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6 if test "${cf_cv_xopen_source+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 4907 "configure" +#line 5018 "configure" #include "confdefs.h" $ac_includes_default @@ -4922,16 +5033,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:4925: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5036: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4928: \$? = $ac_status" >&5 + echo "$as_me:5039: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:4931: \"$ac_try\"") >&5 + { (eval echo "$as_me:5042: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4934: \$? = $ac_status" >&5 + echo "$as_me:5045: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_xopen_source=no else @@ -4943,7 +5054,7 @@ cf_save="$CPPFLAGS" CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" cat >"conftest.$ac_ext" <<_ACEOF -#line 4946 "configure" +#line 5057 "configure" #include "confdefs.h" $ac_includes_default @@ -4961,16 +5072,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:4964: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5075: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4967: \$? = $ac_status" >&5 + echo "$as_me:5078: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:4970: \"$ac_try\"") >&5 + { (eval echo "$as_me:5081: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4973: \$? = $ac_status" >&5 + echo "$as_me:5084: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_xopen_source=no else @@ -4985,7 +5096,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:4988: result: $cf_cv_xopen_source" >&5 +echo "$as_me:5099: result: $cf_cv_xopen_source" >&5 echo "${ECHO_T}$cf_cv_xopen_source" >&6 if test "$cf_cv_xopen_source" != no ; then @@ -5145,16 +5256,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \ sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'` -echo "$as_me:5148: checking if we should define _POSIX_C_SOURCE" >&5 +echo "$as_me:5259: checking if we should define _POSIX_C_SOURCE" >&5 echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6 if test "${cf_cv_posix_c_source+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -echo "${as_me:-configure}:5154: testing if the symbol is already defined go no further ..." 1>&5 +echo "${as_me:-configure}:5265: testing if the symbol is already defined go no further ..." 1>&5 cat >"conftest.$ac_ext" <<_ACEOF -#line 5157 "configure" +#line 5268 "configure" #include "confdefs.h" #include int @@ -5169,16 +5280,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:5172: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5283: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5175: \$? = $ac_status" >&5 + echo "$as_me:5286: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:5178: \"$ac_try\"") >&5 + { (eval echo "$as_me:5289: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5181: \$? = $ac_status" >&5 + echo "$as_me:5292: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_posix_c_source=no else @@ -5199,7 +5310,7 @@ cf_want_posix_source=no esac if test "$cf_want_posix_source" = yes ; then cat >"conftest.$ac_ext" <<_ACEOF -#line 5202 "configure" +#line 5313 "configure" #include "confdefs.h" #include int @@ -5214,16 +5325,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:5217: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5328: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5220: \$? = $ac_status" >&5 + echo "$as_me:5331: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:5223: \"$ac_try\"") >&5 + { (eval echo "$as_me:5334: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5226: \$? = $ac_status" >&5 + echo "$as_me:5337: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -5234,7 +5345,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "${as_me:-configure}:5237: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 +echo "${as_me:-configure}:5348: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 CFLAGS="$cf_trim_CFLAGS" CPPFLAGS="$cf_trim_CPPFLAGS" @@ -5242,10 +5353,10 @@ echo "${as_me:-configure}:5237: testing ifdef from value $cf_POSIX_C_SOURCE ..." test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source" -echo "${as_me:-configure}:5245: testing if the second compile does not leave our definition intact error ..." 1>&5 +echo "${as_me:-configure}:5356: testing if the second compile does not leave our definition intact error ..." 1>&5 cat >"conftest.$ac_ext" <<_ACEOF -#line 5248 "configure" +#line 5359 "configure" #include "confdefs.h" #include int @@ -5260,16 +5371,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:5263: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5374: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5266: \$? = $ac_status" >&5 + echo "$as_me:5377: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:5269: \"$ac_try\"") >&5 + { (eval echo "$as_me:5380: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5272: \$? = $ac_status" >&5 + echo "$as_me:5383: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -5285,7 +5396,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:5288: result: $cf_cv_posix_c_source" >&5 +echo "$as_me:5399: result: $cf_cv_posix_c_source" >&5 echo "${ECHO_T}$cf_cv_posix_c_source" >&6 if test "$cf_cv_posix_c_source" != no ; then @@ -5395,13 +5506,13 @@ fi fi # cf_cv_posix_visible # Some of these niche implementations use copy/paste, double-check... - if test "$cf_cv_xopen_source" != no ; then - test -n "$verbose" && echo " checking if _POSIX_C_SOURCE inteferes" 1>&6 + if test "$cf_cv_xopen_source" = no ; then + test -n "$verbose" && echo " checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE" 1>&6 -echo "${as_me:-configure}:5401: testing checking if _POSIX_C_SOURCE inteferes ..." 1>&5 +echo "${as_me:-configure}:5512: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5 cat >"conftest.$ac_ext" <<_ACEOF -#line 5404 "configure" +#line 5515 "configure" #include "confdefs.h" $ac_includes_default @@ -5419,23 +5530,23 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:5422: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5533: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5425: \$? = $ac_status" >&5 + echo "$as_me:5536: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:5428: \"$ac_try\"") >&5 + { (eval echo "$as_me:5539: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5431: \$? = $ac_status" >&5 + echo "$as_me:5542: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 - { echo "$as_me:5438: WARNING: _POSIX_C_SOURCE definition is not usable" >&5 + { echo "$as_me:5549: WARNING: _POSIX_C_SOURCE definition is not usable" >&5 echo "$as_me: WARNING: _POSIX_C_SOURCE definition is not usable" >&2;} CPPFLAGS="$cf_save_xopen_cppflags" fi @@ -5458,7 +5569,7 @@ do test "$CFLAGS" != "$cf_old_cflag" || break test -n "$verbose" && echo " removing old option $cf_add_cflags from CFLAGS" 1>&6 -echo "${as_me:-configure}:5461: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5 +echo "${as_me:-configure}:5572: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5 CFLAGS="$cf_old_cflag" done @@ -5470,7 +5581,7 @@ do test "$CPPFLAGS" != "$cf_old_cflag" || break test -n "$verbose" && echo " removing old option $cf_add_cflags from CPPFLAGS" 1>&6 -echo "${as_me:-configure}:5473: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5 +echo "${as_me:-configure}:5584: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5 CPPFLAGS="$cf_old_cflag" done @@ -5558,7 +5669,7 @@ done if test -n "$cf_new_cflags" ; then test -n "$verbose" && echo " add to \$CFLAGS $cf_new_cflags" 1>&6 -echo "${as_me:-configure}:5561: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 +echo "${as_me:-configure}:5672: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 test -n "$CFLAGS" && CFLAGS="$CFLAGS " CFLAGS="${CFLAGS}$cf_new_cflags" @@ -5568,7 +5679,7 @@ fi if test -n "$cf_new_cppflags" ; then test -n "$verbose" && echo " add to \$CPPFLAGS $cf_new_cppflags" 1>&6 -echo "${as_me:-configure}:5571: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 +echo "${as_me:-configure}:5682: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" @@ -5578,7 +5689,7 @@ fi if test -n "$cf_new_extra_cppflags" ; then test -n "$verbose" && echo " add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6 -echo "${as_me:-configure}:5581: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 +echo "${as_me:-configure}:5692: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" @@ -5590,10 +5701,10 @@ done fi if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then - echo "$as_me:5593: checking if _XOPEN_SOURCE really is set" >&5 + echo "$as_me:5704: checking if _XOPEN_SOURCE really is set" >&5 echo $ECHO_N "checking if _XOPEN_SOURCE really is set... $ECHO_C" >&6 cat >"conftest.$ac_ext" <<_ACEOF -#line 5596 "configure" +#line 5707 "configure" #include "confdefs.h" #include int @@ -5608,16 +5719,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:5611: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5722: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5614: \$? = $ac_status" >&5 + echo "$as_me:5725: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:5617: \"$ac_try\"") >&5 + { (eval echo "$as_me:5728: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5620: \$? = $ac_status" >&5 + echo "$as_me:5731: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_XOPEN_SOURCE_set=yes else @@ -5626,12 +5737,12 @@ cat "conftest.$ac_ext" >&5 cf_XOPEN_SOURCE_set=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" - echo "$as_me:5629: result: $cf_XOPEN_SOURCE_set" >&5 + echo "$as_me:5740: result: $cf_XOPEN_SOURCE_set" >&5 echo "${ECHO_T}$cf_XOPEN_SOURCE_set" >&6 if test "$cf_XOPEN_SOURCE_set" = yes then cat >"conftest.$ac_ext" <<_ACEOF -#line 5634 "configure" +#line 5745 "configure" #include "confdefs.h" #include int @@ -5646,16 +5757,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:5649: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5760: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5652: \$? = $ac_status" >&5 + echo "$as_me:5763: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:5655: \"$ac_try\"") >&5 + { (eval echo "$as_me:5766: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5658: \$? = $ac_status" >&5 + echo "$as_me:5769: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_XOPEN_SOURCE_set_ok=yes else @@ -5666,19 +5777,19 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_XOPEN_SOURCE_set_ok" = no then - { echo "$as_me:5669: WARNING: _XOPEN_SOURCE is lower than requested" >&5 + { echo "$as_me:5780: WARNING: _XOPEN_SOURCE is lower than requested" >&5 echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;} fi else -echo "$as_me:5674: checking if we should define _XOPEN_SOURCE" >&5 +echo "$as_me:5785: checking if we should define _XOPEN_SOURCE" >&5 echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6 if test "${cf_cv_xopen_source+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 5681 "configure" +#line 5792 "configure" #include "confdefs.h" $ac_includes_default @@ -5696,16 +5807,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:5699: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5810: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5702: \$? = $ac_status" >&5 + echo "$as_me:5813: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:5705: \"$ac_try\"") >&5 + { (eval echo "$as_me:5816: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5708: \$? = $ac_status" >&5 + echo "$as_me:5819: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_xopen_source=no else @@ -5717,7 +5828,7 @@ cf_save="$CPPFLAGS" CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" cat >"conftest.$ac_ext" <<_ACEOF -#line 5720 "configure" +#line 5831 "configure" #include "confdefs.h" $ac_includes_default @@ -5735,16 +5846,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:5738: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5849: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5741: \$? = $ac_status" >&5 + echo "$as_me:5852: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:5744: \"$ac_try\"") >&5 + { (eval echo "$as_me:5855: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5747: \$? = $ac_status" >&5 + echo "$as_me:5858: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_xopen_source=no else @@ -5759,7 +5870,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:5762: result: $cf_cv_xopen_source" >&5 +echo "$as_me:5873: result: $cf_cv_xopen_source" >&5 echo "${ECHO_T}$cf_cv_xopen_source" >&6 if test "$cf_cv_xopen_source" != no ; then @@ -5906,13 +6017,13 @@ fi fi fi # cf_cv_posix_visible -echo "$as_me:5909: checking for ANSI C header files" >&5 +echo "$as_me:6020: checking for ANSI C header files" >&5 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 if test "${ac_cv_header_stdc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 5915 "configure" +#line 6026 "configure" #include "confdefs.h" #include #include @@ -5920,13 +6031,13 @@ else #include _ACEOF -if { (eval echo "$as_me:5923: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:6034: \"$ac_cpp "conftest.$ac_ext"\"") >&5 (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:5929: \$? = $ac_status" >&5 + echo "$as_me:6040: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -5948,7 +6059,7 @@ rm -f conftest.err "conftest.$ac_ext" if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat >"conftest.$ac_ext" <<_ACEOF -#line 5951 "configure" +#line 6062 "configure" #include "confdefs.h" #include @@ -5966,7 +6077,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat >"conftest.$ac_ext" <<_ACEOF -#line 5969 "configure" +#line 6080 "configure" #include "confdefs.h" #include @@ -5987,7 +6098,7 @@ if test $ac_cv_header_stdc = yes; then : else cat >"conftest.$ac_ext" <<_ACEOF -#line 5990 "configure" +#line 6101 "configure" #include "confdefs.h" #include #if ((' ' & 0x0FF) == 0x020) @@ -6013,15 +6124,15 @@ main (void) } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:6016: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6127: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6019: \$? = $ac_status" >&5 + echo "$as_me:6130: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:6021: \"$ac_try\"") >&5 + { (eval echo "$as_me:6132: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6024: \$? = $ac_status" >&5 + echo "$as_me:6135: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -6034,7 +6145,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes fi fi fi -echo "$as_me:6037: result: $ac_cv_header_stdc" >&5 +echo "$as_me:6148: result: $ac_cv_header_stdc" >&5 echo "${ECHO_T}$ac_cv_header_stdc" >&6 if test $ac_cv_header_stdc = yes; then @@ -6050,28 +6161,28 @@ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ inttypes.h stdint.h unistd.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:6053: checking for $ac_header" >&5 +echo "$as_me:6164: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 6059 "configure" +#line 6170 "configure" #include "confdefs.h" $ac_includes_default #include <$ac_header> _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:6065: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6176: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6068: \$? = $ac_status" >&5 + echo "$as_me:6179: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:6071: \"$ac_try\"") >&5 + { (eval echo "$as_me:6182: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6074: \$? = $ac_status" >&5 + echo "$as_me:6185: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then eval "$as_ac_Header=yes" else @@ -6081,7 +6192,7 @@ eval "$as_ac_Header=no" fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:6084: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:6195: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then cat >>confdefs.h <&5 +echo "$as_me:6205: checking whether exit is declared" >&5 echo $ECHO_N "checking whether exit is declared... $ECHO_C" >&6 if test "${ac_cv_have_decl_exit+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 6100 "configure" +#line 6211 "configure" #include "confdefs.h" $ac_includes_default int main (void) { #ifndef exit - char *p = (char *) exit; (void) p; + (void) exit; #endif ; @@ -6112,16 +6223,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:6115: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6226: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6118: \$? = $ac_status" >&5 + echo "$as_me:6229: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:6121: \"$ac_try\"") >&5 + { (eval echo "$as_me:6232: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6124: \$? = $ac_status" >&5 + echo "$as_me:6235: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_have_decl_exit=yes else @@ -6131,10 +6242,10 @@ ac_cv_have_decl_exit=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:6134: result: $ac_cv_have_decl_exit" >&5 +echo "$as_me:6245: result: $ac_cv_have_decl_exit" >&5 echo "${ECHO_T}$ac_cv_have_decl_exit" >&6 -echo "$as_me:6137: checking for signal global datatype" >&5 +echo "$as_me:6248: checking for signal global datatype" >&5 echo $ECHO_N "checking for signal global datatype... $ECHO_C" >&6 if test "${cf_cv_sig_atomic_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6146,7 +6257,7 @@ else "int" do cat >"conftest.$ac_ext" <<_ACEOF -#line 6149 "configure" +#line 6260 "configure" #include "confdefs.h" #include @@ -6170,16 +6281,16 @@ signal(SIGINT, handler); } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:6173: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6284: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6176: \$? = $ac_status" >&5 + echo "$as_me:6287: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:6179: \"$ac_try\"") >&5 + { (eval echo "$as_me:6290: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6182: \$? = $ac_status" >&5 + echo "$as_me:6293: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_sig_atomic_t=$cf_type else @@ -6193,7 +6304,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:6196: result: $cf_cv_sig_atomic_t" >&5 +echo "$as_me:6307: result: $cf_cv_sig_atomic_t" >&5 echo "${ECHO_T}$cf_cv_sig_atomic_t" >&6 test "$cf_cv_sig_atomic_t" != no && cat >>confdefs.h <&5 +echo "$as_me:6316: checking if SIGWINCH is defined" >&5 echo $ECHO_N "checking if SIGWINCH is defined... $ECHO_C" >&6 if test "${cf_cv_define_sigwinch+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 6212 "configure" +#line 6323 "configure" #include "confdefs.h" #include @@ -6224,23 +6335,23 @@ int x = SIGWINCH; (void)x } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:6227: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6338: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6230: \$? = $ac_status" >&5 + echo "$as_me:6341: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:6233: \"$ac_try\"") >&5 + { (eval echo "$as_me:6344: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6236: \$? = $ac_status" >&5 + echo "$as_me:6347: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_define_sigwinch=yes else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 cat >"conftest.$ac_ext" <<_ACEOF -#line 6243 "configure" +#line 6354 "configure" #include "confdefs.h" #undef _XOPEN_SOURCE @@ -6258,16 +6369,16 @@ int x = SIGWINCH; (void)x } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:6261: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6372: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6264: \$? = $ac_status" >&5 + echo "$as_me:6375: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:6267: \"$ac_try\"") >&5 + { (eval echo "$as_me:6378: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6270: \$? = $ac_status" >&5 + echo "$as_me:6381: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_define_sigwinch=maybe else @@ -6281,11 +6392,11 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:6284: result: $cf_cv_define_sigwinch" >&5 +echo "$as_me:6395: result: $cf_cv_define_sigwinch" >&5 echo "${ECHO_T}$cf_cv_define_sigwinch" >&6 if test "$cf_cv_define_sigwinch" = maybe ; then -echo "$as_me:6288: checking for actual SIGWINCH definition" >&5 +echo "$as_me:6399: checking for actual SIGWINCH definition" >&5 echo $ECHO_N "checking for actual SIGWINCH definition... $ECHO_C" >&6 if test "${cf_cv_fixup_sigwinch+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6296,7 +6407,7 @@ cf_sigwinch=32 while test "$cf_sigwinch" != 1 do cat >"conftest.$ac_ext" <<_ACEOF -#line 6299 "configure" +#line 6410 "configure" #include "confdefs.h" #undef _XOPEN_SOURCE @@ -6318,16 +6429,16 @@ int x = SIGWINCH; (void)x } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:6321: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6432: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6324: \$? = $ac_status" >&5 + echo "$as_me:6435: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:6327: \"$ac_try\"") >&5 + { (eval echo "$as_me:6438: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6330: \$? = $ac_status" >&5 + echo "$as_me:6441: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_fixup_sigwinch=$cf_sigwinch break @@ -6341,7 +6452,7 @@ cf_sigwinch="`expr "$cf_sigwinch" - 1`" done fi -echo "$as_me:6344: result: $cf_cv_fixup_sigwinch" >&5 +echo "$as_me:6455: result: $cf_cv_fixup_sigwinch" >&5 echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6 if test "$cf_cv_fixup_sigwinch" != unknown ; then @@ -6351,13 +6462,13 @@ fi # Checks for CODESET support. -echo "$as_me:6354: checking for nl_langinfo and CODESET" >&5 +echo "$as_me:6465: checking for nl_langinfo and CODESET" >&5 echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6 if test "${am_cv_langinfo_codeset+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 6360 "configure" +#line 6471 "configure" #include "confdefs.h" $ac_includes_default @@ -6371,16 +6482,16 @@ char* cs = nl_langinfo(CODESET); (void)cs } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:6374: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6485: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6377: \$? = $ac_status" >&5 + echo "$as_me:6488: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:6380: \"$ac_try\"") >&5 + { (eval echo "$as_me:6491: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6383: \$? = $ac_status" >&5 + echo "$as_me:6494: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then am_cv_langinfo_codeset=yes else @@ -6391,7 +6502,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:6394: result: $am_cv_langinfo_codeset" >&5 +echo "$as_me:6505: result: $am_cv_langinfo_codeset" >&5 echo "${ECHO_T}$am_cv_langinfo_codeset" >&6 if test "$am_cv_langinfo_codeset" = yes; then @@ -6401,7 +6512,7 @@ EOF fi -echo "$as_me:6404: checking if you want to use pkg-config" >&5 +echo "$as_me:6515: checking if you want to use pkg-config" >&5 echo $ECHO_N "checking if you want to use pkg-config... $ECHO_C" >&6 # Check whether --with-pkg-config or --without-pkg-config was given. @@ -6411,7 +6522,7 @@ if test "${with_pkg_config+set}" = set; then else cf_pkg_config=yes fi; -echo "$as_me:6414: result: $cf_pkg_config" >&5 +echo "$as_me:6525: result: $cf_pkg_config" >&5 echo "${ECHO_T}$cf_pkg_config" >&6 case "$cf_pkg_config" in @@ -6423,7 +6534,7 @@ case "$cf_pkg_config" in if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 -echo "$as_me:6426: checking for $ac_word" >&5 +echo "$as_me:6537: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_PKG_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6440,7 +6551,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word" - echo "$as_me:6443: found $ac_dir/$ac_word" >&5 + echo "$as_me:6554: found $ac_dir/$ac_word" >&5 break fi done @@ -6451,10 +6562,10 @@ fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then - echo "$as_me:6454: result: $PKG_CONFIG" >&5 + echo "$as_me:6565: result: $PKG_CONFIG" >&5 echo "${ECHO_T}$PKG_CONFIG" >&6 else - echo "$as_me:6457: result: no" >&5 + echo "$as_me:6568: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -6463,7 +6574,7 @@ if test -z "$ac_cv_path_PKG_CONFIG"; then ac_pt_PKG_CONFIG=$PKG_CONFIG # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -echo "$as_me:6466: checking for $ac_word" >&5 +echo "$as_me:6577: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6480,7 +6591,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_ac_pt_PKG_CONFIG="$ac_dir/$ac_word" - echo "$as_me:6483: found $ac_dir/$ac_word" >&5 + echo "$as_me:6594: found $ac_dir/$ac_word" >&5 break fi done @@ -6492,10 +6603,10 @@ fi ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG if test -n "$ac_pt_PKG_CONFIG"; then - echo "$as_me:6495: result: $ac_pt_PKG_CONFIG" >&5 + echo "$as_me:6606: result: $ac_pt_PKG_CONFIG" >&5 echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6 else - echo "$as_me:6498: result: no" >&5 + echo "$as_me:6609: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -6519,37 +6630,35 @@ else cf_path_syntax="$ac_default_prefix" fi -case ".$PKG_CONFIG" in -(.\$\(*\)*|.\'*\'*) - ;; -(..|./*|.\\*) +case "x$PKG_CONFIG" in +(x\$\(*\)*|x\'*\'*) ;; -(.[a-zA-Z]:[\\/]*) # OS/2 EMX +(x.|x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER) ;; -(.\$\{*prefix\}*|.\$\{*dir\}*) +(x\$\{*prefix\}*|x\$\{*dir\}*) eval PKG_CONFIG="$PKG_CONFIG" - case ".$PKG_CONFIG" in - (.NONE/*) + case "x$PKG_CONFIG" in + (xNONE/*) PKG_CONFIG=`echo "$PKG_CONFIG" | sed -e s%NONE%$cf_path_syntax%` ;; esac ;; -(.no|.NONE/*) +(xno|xNONE/*) PKG_CONFIG=`echo "$PKG_CONFIG" | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { { echo "$as_me:6541: error: expected a pathname, not \"$PKG_CONFIG\"" >&5 + { { echo "$as_me:6650: error: expected a pathname, not \"$PKG_CONFIG\"" >&5 echo "$as_me: error: expected a pathname, not \"$PKG_CONFIG\"" >&2;} { (exit 1); exit 1; }; } ;; esac elif test "x$cf_pkg_config" != xno ; then - { echo "$as_me:6548: WARNING: pkg-config is not installed" >&5 + { echo "$as_me:6657: WARNING: pkg-config is not installed" >&5 echo "$as_me: WARNING: pkg-config is not installed" >&2;} fi -echo "$as_me:6552: checking if you want to see long compiling messages" >&5 +echo "$as_me:6661: checking if you want to see long compiling messages" >&5 echo $ECHO_N "checking if you want to see long compiling messages... $ECHO_C" >&6 # Check whether --enable-echo or --disable-echo was given. @@ -6583,10 +6692,52 @@ else ECHO_CC='' fi; -echo "$as_me:6586: result: $enableval" >&5 +echo "$as_me:6695: result: $enableval" >&5 echo "${ECHO_T}$enableval" >&6 -echo "$as_me:6589: checking for ncurses wrap-prefix" >&5 +echo "$as_me:6698: checking for an installation directory prefix" >&5 +echo $ECHO_N "checking for an installation directory prefix... $ECHO_C" >&6 + +# Check whether --with-install-prefix or --without-install-prefix was given. +if test "${with_install_prefix+set}" = set; then + withval="$with_install_prefix" + case "x$withval" in + (xyes|xno) + ;; + (*) DESTDIR="$withval" + ;; + esac +fi; +echo "$as_me:6711: result: ${DESTDIR:-(none)}" >&5 +echo "${ECHO_T}${DESTDIR:-(none)}" >&6 + +echo "$as_me:6714: checking if installation directory prefix should be merged" >&5 +echo $ECHO_N "checking if installation directory prefix should be merged... $ECHO_C" >&6 + +# Check whether --enable-install-prefix or --disable-install-prefix was given. +if test "${enable_install_prefix+set}" = set; then + enableval="$enable_install_prefix" + test "$enableval" != yes && enableval=no + if test "$enableval" != "no" ; then + cf_install_prefix=yes + else + cf_install_prefix=no + fi +else + enableval=no + cf_install_prefix=no + +fi; +echo "$as_me:6731: result: $cf_install_prefix" >&5 +echo "${ECHO_T}$cf_install_prefix" >&6 + +if test "$cf_install_prefix" = yes ; then + MERGE_PREFIX=':$(prefix)%=%' +else + MERGE_PREFIX='' +fi + +echo "$as_me:6740: checking for ncurses wrap-prefix" >&5 echo $ECHO_N "checking for ncurses wrap-prefix... $ECHO_C" >&6 # Check whether --with-ncurses-wrap-prefix or --without-ncurses-wrap-prefix was given. @@ -6596,10 +6747,10 @@ if test "${with_ncurses_wrap_prefix+set}" = set; then else NCURSES_WRAP_PREFIX=_nc_ fi; -echo "$as_me:6599: result: $NCURSES_WRAP_PREFIX" >&5 +echo "$as_me:6750: result: $NCURSES_WRAP_PREFIX" >&5 echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6 -echo "$as_me:6602: checking if you want to check for wide-character functions" >&5 +echo "$as_me:6753: checking if you want to check for wide-character functions" >&5 echo $ECHO_N "checking if you want to check for wide-character functions... $ECHO_C" >&6 # Check whether --enable-widec or --disable-widec was given. @@ -6616,10 +6767,10 @@ else cf_enable_widec=yes fi; -echo "$as_me:6619: result: $cf_enable_widec" >&5 +echo "$as_me:6770: result: $cf_enable_widec" >&5 echo "${ECHO_T}$cf_enable_widec" >&6 -echo "$as_me:6622: checking for specific curses-directory" >&5 +echo "$as_me:6773: checking for specific curses-directory" >&5 echo $ECHO_N "checking for specific curses-directory... $ECHO_C" >&6 # Check whether --with-curses-dir or --without-curses-dir was given. @@ -6629,7 +6780,7 @@ if test "${with_curses_dir+set}" = set; then else cf_cv_curses_dir=no fi; -echo "$as_me:6632: result: $cf_cv_curses_dir" >&5 +echo "$as_me:6783: result: $cf_cv_curses_dir" >&5 echo "${ECHO_T}$cf_cv_curses_dir" >&6 if test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" @@ -6641,26 +6792,24 @@ else cf_path_syntax="$ac_default_prefix" fi -case ".$withval" in -(.\$\(*\)*|.\'*\'*) - ;; -(..|./*|.\\*) +case "x$withval" in +(x\$\(*\)*|x\'*\'*) ;; -(.[a-zA-Z]:[\\/]*) # OS/2 EMX +(x.|x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER) ;; -(.\$\{*prefix\}*|.\$\{*dir\}*) +(x\$\{*prefix\}*|x\$\{*dir\}*) eval withval="$withval" - case ".$withval" in - (.NONE/*) + case "x$withval" in + (xNONE/*) withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%` ;; esac ;; -(.no|.NONE/*) +(xno|xNONE/*) withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { { echo "$as_me:6663: error: expected a pathname, not \"$withval\"" >&5 + { { echo "$as_me:6812: error: expected a pathname, not \"$withval\"" >&5 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -6696,7 +6845,7 @@ if test -n "$cf_cv_curses_dir/include" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 6699 "configure" +#line 6848 "configure" #include "confdefs.h" #include int @@ -6708,16 +6857,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:6711: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6860: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6714: \$? = $ac_status" >&5 + echo "$as_me:6863: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:6717: \"$ac_try\"") >&5 + { (eval echo "$as_me:6866: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6720: \$? = $ac_status" >&5 + echo "$as_me:6869: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -6734,7 +6883,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:6737: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:6886: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -6770,7 +6919,7 @@ if test -n "$cf_cv_curses_dir/lib" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:6773: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:6922: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -6783,7 +6932,7 @@ fi cf_cv_screen=curses -echo "$as_me:6786: checking for specified curses library type" >&5 +echo "$as_me:6935: checking for specified curses library type" >&5 echo $ECHO_N "checking for specified curses library type... $ECHO_C" >&6 # Check whether --with-screen or --without-screen was given. @@ -6827,13 +6976,13 @@ fi; fi; fi; -echo "$as_me:6830: result: $cf_cv_screen" >&5 +echo "$as_me:6979: result: $cf_cv_screen" >&5 echo "${ECHO_T}$cf_cv_screen" >&6 case $cf_cv_screen in (curses|curses_*) -echo "$as_me:6836: checking for extra include directories" >&5 +echo "$as_me:6985: checking for extra include directories" >&5 echo $ECHO_N "checking for extra include directories... $ECHO_C" >&6 if test "${cf_cv_curses_incdir+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6859,7 +7008,7 @@ case "$host_os" in esac fi -echo "$as_me:6862: result: $cf_cv_curses_incdir" >&5 +echo "$as_me:7011: result: $cf_cv_curses_incdir" >&5 echo "${ECHO_T}$cf_cv_curses_incdir" >&6 if test "$cf_cv_curses_incdir" != no then @@ -6869,7 +7018,7 @@ then fi -echo "$as_me:6872: checking if we have identified curses headers" >&5 +echo "$as_me:7021: checking if we have identified curses headers" >&5 echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6 if test "${cf_cv_ncurses_header+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6881,7 +7030,7 @@ for cf_header in \ curses.h ncurses/ncurses.h ncurses/curses.h do cat >"conftest.$ac_ext" <<_ACEOF -#line 6884 "configure" +#line 7033 "configure" #include "confdefs.h" #include <${cf_header}> int @@ -6893,16 +7042,16 @@ initscr(); endwin() } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:6896: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:7045: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6899: \$? = $ac_status" >&5 + echo "$as_me:7048: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:6902: \"$ac_try\"") >&5 + { (eval echo "$as_me:7051: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6905: \$? = $ac_status" >&5 + echo "$as_me:7054: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_header=$cf_header; break else @@ -6913,11 +7062,11 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:6916: result: $cf_cv_ncurses_header" >&5 +echo "$as_me:7065: result: $cf_cv_ncurses_header" >&5 echo "${ECHO_T}$cf_cv_ncurses_header" >&6 if test "$cf_cv_ncurses_header" = none ; then - { { echo "$as_me:6920: error: No curses header-files found" >&5 + { { echo "$as_me:7069: error: No curses header-files found" >&5 echo "$as_me: error: No curses header-files found" >&2;} { (exit 1); exit 1; }; } fi @@ -6927,23 +7076,23 @@ fi for ac_header in $cf_cv_ncurses_header do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:6930: checking for $ac_header" >&5 +echo "$as_me:7079: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 6936 "configure" +#line 7085 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:6940: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:7089: \"$ac_cpp "conftest.$ac_ext"\"") >&5 (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:6946: \$? = $ac_status" >&5 + echo "$as_me:7095: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -6962,7 +7111,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:6965: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:7114: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then cat >>confdefs.h <&5 +echo "$as_me:7124: checking for terminfo header" >&5 echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6 if test "${cf_cv_term_header+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6990,7 +7139,7 @@ esac for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do cat >"conftest.$ac_ext" <<_ACEOF -#line 6993 "configure" +#line 7142 "configure" #include "confdefs.h" #include #include <${cf_cv_ncurses_header:-curses.h}> @@ -7005,16 +7154,16 @@ int x = auto_left_margin; (void)x } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:7008: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:7157: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7011: \$? = $ac_status" >&5 + echo "$as_me:7160: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:7014: \"$ac_try\"") >&5 + { (eval echo "$as_me:7163: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7017: \$? = $ac_status" >&5 + echo "$as_me:7166: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_term_header="$cf_test" @@ -7030,7 +7179,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:7033: result: $cf_cv_term_header" >&5 +echo "$as_me:7182: result: $cf_cv_term_header" >&5 echo "${ECHO_T}$cf_cv_term_header" >&6 # Set definitions to allow ifdef'ing to accommodate subdirectories @@ -7062,7 +7211,7 @@ EOF ;; esac -echo "$as_me:7065: checking for ncurses version" >&5 +echo "$as_me:7214: checking for ncurses version" >&5 echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6 if test "${cf_cv_ncurses_version+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7088,10 +7237,10 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo "$as_me:7091: \"$cf_try\"") >&5 + { (eval echo "$as_me:7240: \"$cf_try\"") >&5 (eval $cf_try) 2>&5 ac_status=$? - echo "$as_me:7094: \$? = $ac_status" >&5 + echo "$as_me:7243: \$? = $ac_status" >&5 (exit "$ac_status"); } if test -f conftest.out ; then cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out` @@ -7101,7 +7250,7 @@ EOF else cat >"conftest.$ac_ext" <<_ACEOF -#line 7104 "configure" +#line 7253 "configure" #include "confdefs.h" $ac_includes_default @@ -7121,22 +7270,22 @@ int main(void) # ifdef __NCURSES_H fprintf(fp, "old\\n"); # else - make an error + #error expected ncurses header to define __NCURSES_H # endif #endif ${cf_cv_main_return:-return}(0); } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:7131: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7280: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7134: \$? = $ac_status" >&5 + echo "$as_me:7283: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:7136: \"$ac_try\"") >&5 + { (eval echo "$as_me:7285: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7139: \$? = $ac_status" >&5 + echo "$as_me:7288: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_version=`cat $cf_tempfile` @@ -7150,17 +7299,17 @@ fi rm -f "$cf_tempfile" fi -echo "$as_me:7153: result: $cf_cv_ncurses_version" >&5 +echo "$as_me:7302: result: $cf_cv_ncurses_version" >&5 echo "${ECHO_T}$cf_cv_ncurses_version" >&6 test "$cf_cv_ncurses_version" = no || cat >>confdefs.h <<\EOF #define NCURSES 1 EOF -echo "$as_me:7160: checking if we have identified curses libraries" >&5 +echo "$as_me:7309: checking if we have identified curses libraries" >&5 echo $ECHO_N "checking if we have identified curses libraries... $ECHO_C" >&6 cat >"conftest.$ac_ext" <<_ACEOF -#line 7163 "configure" +#line 7312 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -7172,16 +7321,16 @@ initscr(); endwin() } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:7175: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7324: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7178: \$? = $ac_status" >&5 + echo "$as_me:7327: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:7181: \"$ac_try\"") >&5 + { (eval echo "$as_me:7330: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7184: \$? = $ac_status" >&5 + echo "$as_me:7333: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_result=yes else @@ -7190,13 +7339,13 @@ cat "conftest.$ac_ext" >&5 cf_result=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" -echo "$as_me:7193: result: $cf_result" >&5 +echo "$as_me:7342: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" = no ; then case "$host_os" in (freebsd*) - echo "$as_me:7199: checking for tgoto in -lmytinfo" >&5 + echo "$as_me:7348: checking for tgoto in -lmytinfo" >&5 echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6 if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7204,7 +7353,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lmytinfo $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 7207 "configure" +#line 7356 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -7213,7 +7362,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char tgoto (); +char tgoto (void); int main (void) { @@ -7223,16 +7372,16 @@ tgoto (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:7226: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7375: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7229: \$? = $ac_status" >&5 + echo "$as_me:7378: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:7232: \"$ac_try\"") >&5 + { (eval echo "$as_me:7381: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7235: \$? = $ac_status" >&5 + echo "$as_me:7384: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_mytinfo_tgoto=yes else @@ -7243,7 +7392,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:7246: result: $ac_cv_lib_mytinfo_tgoto" >&5 +echo "$as_me:7395: result: $ac_cv_lib_mytinfo_tgoto" >&5 echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6 if test "$ac_cv_lib_mytinfo_tgoto" = yes; then @@ -7273,7 +7422,7 @@ fi # term.h) for cur_colr if test "x$cf_cv_screen" = "xcurses_colr" then - echo "$as_me:7276: checking for initscr in -lcur_colr" >&5 + echo "$as_me:7425: checking for initscr in -lcur_colr" >&5 echo $ECHO_N "checking for initscr in -lcur_colr... $ECHO_C" >&6 if test "${ac_cv_lib_cur_colr_initscr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7281,7 +7430,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lcur_colr $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 7284 "configure" +#line 7433 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -7290,7 +7439,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char initscr (); +char initscr (void); int main (void) { @@ -7300,16 +7449,16 @@ initscr (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:7303: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7452: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7306: \$? = $ac_status" >&5 + echo "$as_me:7455: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:7309: \"$ac_try\"") >&5 + { (eval echo "$as_me:7458: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7312: \$? = $ac_status" >&5 + echo "$as_me:7461: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_cur_colr_initscr=yes else @@ -7320,7 +7469,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:7323: result: $ac_cv_lib_cur_colr_initscr" >&5 +echo "$as_me:7472: result: $ac_cv_lib_cur_colr_initscr" >&5 echo "${ECHO_T}$ac_cv_lib_cur_colr_initscr" >&6 if test "$ac_cv_lib_cur_colr_initscr" = yes; then @@ -7344,7 +7493,7 @@ LIBS="$cf_add_libs" else - echo "$as_me:7347: checking for initscr in -lHcurses" >&5 + echo "$as_me:7496: checking for initscr in -lHcurses" >&5 echo $ECHO_N "checking for initscr in -lHcurses... $ECHO_C" >&6 if test "${ac_cv_lib_Hcurses_initscr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7352,7 +7501,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lHcurses $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 7355 "configure" +#line 7504 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -7361,7 +7510,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char initscr (); +char initscr (void); int main (void) { @@ -7371,16 +7520,16 @@ initscr (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:7374: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7523: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7377: \$? = $ac_status" >&5 + echo "$as_me:7526: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:7380: \"$ac_try\"") >&5 + { (eval echo "$as_me:7529: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7383: \$? = $ac_status" >&5 + echo "$as_me:7532: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_Hcurses_initscr=yes else @@ -7391,7 +7540,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:7394: result: $ac_cv_lib_Hcurses_initscr" >&5 +echo "$as_me:7543: result: $ac_cv_lib_Hcurses_initscr" >&5 echo "${ECHO_T}$ac_cv_lib_Hcurses_initscr" >&6 if test "$ac_cv_lib_Hcurses_initscr" = yes; then @@ -7449,7 +7598,7 @@ if test -n "/lib64" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:7452: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:7601: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -7478,7 +7627,7 @@ if test -n "/lib" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:7481: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:7630: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -7509,7 +7658,7 @@ if test -n "/lib" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:7512: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:7661: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -7544,7 +7693,7 @@ if test -n "/usr/5lib" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:7547: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:7696: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -7588,13 +7737,13 @@ if test ".$ac_cv_func_initscr" != .yes ; then # because it may be needed to link the test-case for initscr. if test "x$cf_term_lib" = x then - echo "$as_me:7591: checking for tgoto" >&5 + echo "$as_me:7740: checking for tgoto" >&5 echo $ECHO_N "checking for tgoto... $ECHO_C" >&6 if test "${ac_cv_func_tgoto+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 7597 "configure" +#line 7746 "configure" #include "confdefs.h" #define tgoto autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -7625,16 +7774,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:7628: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7777: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7631: \$? = $ac_status" >&5 + echo "$as_me:7780: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:7634: \"$ac_try\"") >&5 + { (eval echo "$as_me:7783: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7637: \$? = $ac_status" >&5 + echo "$as_me:7786: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_tgoto=yes else @@ -7644,7 +7793,7 @@ ac_cv_func_tgoto=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:7647: result: $ac_cv_func_tgoto" >&5 +echo "$as_me:7796: result: $ac_cv_func_tgoto" >&5 echo "${ECHO_T}$ac_cv_func_tgoto" >&6 if test "$ac_cv_func_tgoto" = yes; then cf_term_lib=predefined @@ -7653,7 +7802,7 @@ else for cf_term_lib in $cf_check_list otermcap termcap tinfo termlib unknown do as_ac_Lib=`echo "ac_cv_lib_$cf_term_lib''_tgoto" | $as_tr_sh` -echo "$as_me:7656: checking for tgoto in -l$cf_term_lib" >&5 +echo "$as_me:7805: checking for tgoto in -l$cf_term_lib" >&5 echo $ECHO_N "checking for tgoto in -l$cf_term_lib... $ECHO_C" >&6 if eval "test \"\${$as_ac_Lib+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7661,7 +7810,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-l$cf_term_lib $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 7664 "configure" +#line 7813 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -7670,7 +7819,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char tgoto (); +char tgoto (void); int main (void) { @@ -7680,16 +7829,16 @@ tgoto (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:7683: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7832: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7686: \$? = $ac_status" >&5 + echo "$as_me:7835: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:7689: \"$ac_try\"") >&5 + { (eval echo "$as_me:7838: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7692: \$? = $ac_status" >&5 + echo "$as_me:7841: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then eval "$as_ac_Lib=yes" else @@ -7700,7 +7849,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:7703: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5 +echo "$as_me:7852: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_Lib"'}'`" >&6 if test "`eval echo '${'"$as_ac_Lib"'}'`" = yes; then @@ -7723,10 +7872,10 @@ fi do LIBS="-l$cf_curs_lib $cf_save_LIBS" if test "$cf_term_lib" = unknown || test "$cf_term_lib" = "$cf_curs_lib" ; then - echo "$as_me:7726: checking if we can link with $cf_curs_lib library" >&5 + echo "$as_me:7875: checking if we can link with $cf_curs_lib library" >&5 echo $ECHO_N "checking if we can link with $cf_curs_lib library... $ECHO_C" >&6 cat >"conftest.$ac_ext" <<_ACEOF -#line 7729 "configure" +#line 7878 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -7738,16 +7887,16 @@ initscr() } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:7741: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7890: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7744: \$? = $ac_status" >&5 + echo "$as_me:7893: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:7747: \"$ac_try\"") >&5 + { (eval echo "$as_me:7896: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7750: \$? = $ac_status" >&5 + echo "$as_me:7899: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_result=yes else @@ -7756,16 +7905,16 @@ cat "conftest.$ac_ext" >&5 cf_result=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - echo "$as_me:7759: result: $cf_result" >&5 + echo "$as_me:7908: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 test "$cf_result" = yes && break elif test "$cf_curs_lib" = "$cf_term_lib" ; then cf_result=no elif test "$cf_term_lib" != predefined ; then - echo "$as_me:7765: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5 + echo "$as_me:7914: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5 echo $ECHO_N "checking if we need both $cf_curs_lib and $cf_term_lib libraries... $ECHO_C" >&6 cat >"conftest.$ac_ext" <<_ACEOF -#line 7768 "configure" +#line 7917 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -7777,16 +7926,16 @@ initscr(); endwin(); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:7780: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7929: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7783: \$? = $ac_status" >&5 + echo "$as_me:7932: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:7786: \"$ac_try\"") >&5 + { (eval echo "$as_me:7935: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7789: \$? = $ac_status" >&5 + echo "$as_me:7938: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_result=no else @@ -7795,7 +7944,7 @@ cat "conftest.$ac_ext" >&5 LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 7798 "configure" +#line 7947 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -7807,16 +7956,16 @@ initscr() } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:7810: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7959: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7813: \$? = $ac_status" >&5 + echo "$as_me:7962: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:7816: \"$ac_try\"") >&5 + { (eval echo "$as_me:7965: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7819: \$? = $ac_status" >&5 + echo "$as_me:7968: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_result=yes else @@ -7828,13 +7977,13 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - echo "$as_me:7831: result: $cf_result" >&5 + echo "$as_me:7980: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 test "$cf_result" != error && break fi done fi - test "$cf_curs_lib" = unknown && { { echo "$as_me:7837: error: no curses library found" >&5 + test "$cf_curs_lib" = unknown && { { echo "$as_me:7986: error: no curses library found" >&5 echo "$as_me: error: no curses library found" >&2;} { (exit 1); exit 1; }; } fi @@ -7846,23 +7995,23 @@ fi for ac_header in wchar.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:7849: checking for $ac_header" >&5 +echo "$as_me:7998: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 7855 "configure" +#line 8004 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:7859: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:8008: \"$ac_cpp "conftest.$ac_ext"\"") >&5 (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:7865: \$? = $ac_status" >&5 + echo "$as_me:8014: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -7881,7 +8030,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:7884: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:8033: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then cat >>confdefs.h <&5 +echo "$as_me:8043: checking for multibyte character support" >&5 echo $ECHO_N "checking for multibyte character support... $ECHO_C" >&6 if test "${cf_cv_utf8_lib+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7899,7 +8048,7 @@ else cf_save_LIBS="$LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 7902 "configure" +#line 8051 "configure" #include "confdefs.h" $ac_includes_default @@ -7916,16 +8065,16 @@ putwc(0,0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:7919: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8068: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7922: \$? = $ac_status" >&5 + echo "$as_me:8071: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:7925: \"$ac_try\"") >&5 + { (eval echo "$as_me:8074: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7928: \$? = $ac_status" >&5 + echo "$as_me:8077: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_utf8_lib=yes else @@ -7937,12 +8086,12 @@ cat "conftest.$ac_ext" >&5 cf_cv_header_path_utf8= cf_cv_library_path_utf8= -echo "${as_me:-configure}:7940: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5 +echo "${as_me:-configure}:8089: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5 cf_save_LIBS="$LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 7945 "configure" +#line 8094 "configure" #include "confdefs.h" #include @@ -7955,16 +8104,16 @@ putwc(0,0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:7958: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8107: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7961: \$? = $ac_status" >&5 + echo "$as_me:8110: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:7964: \"$ac_try\"") >&5 + { (eval echo "$as_me:8113: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7967: \$? = $ac_status" >&5 + echo "$as_me:8116: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_find_linkage_utf8=yes @@ -7978,7 +8127,7 @@ cat "conftest.$ac_ext" >&5 LIBS="-lutf8 $cf_save_LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 7981 "configure" +#line 8130 "configure" #include "confdefs.h" #include @@ -7991,16 +8140,16 @@ putwc(0,0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:7994: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8143: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7997: \$? = $ac_status" >&5 + echo "$as_me:8146: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:8000: \"$ac_try\"") >&5 + { (eval echo "$as_me:8149: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8003: \$? = $ac_status" >&5 + echo "$as_me:8152: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_find_linkage_utf8=yes @@ -8017,9 +8166,9 @@ cat "conftest.$ac_ext" >&5 test -n "$verbose" && echo " find linkage for utf8 library" 1>&6 -echo "${as_me:-configure}:8020: testing find linkage for utf8 library ..." 1>&5 +echo "${as_me:-configure}:8169: testing find linkage for utf8 library ..." 1>&5 -echo "${as_me:-configure}:8022: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5 +echo "${as_me:-configure}:8171: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5 cf_save_CPPFLAGS="$CPPFLAGS" cf_test_CPPFLAGS="$CPPFLAGS" @@ -8110,7 +8259,7 @@ cf_search="$cf_search $cf_header_path_list" if test -d "$cf_cv_header_path_utf8" ; then test -n "$verbose" && echo " ... testing $cf_cv_header_path_utf8" 1>&6 -echo "${as_me:-configure}:8113: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5 +echo "${as_me:-configure}:8262: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5 CPPFLAGS="$cf_save_CPPFLAGS" @@ -8118,7 +8267,7 @@ echo "${as_me:-configure}:8113: testing ... testing $cf_cv_header_path_utf8 ..." CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8" cat >"conftest.$ac_ext" <<_ACEOF -#line 8121 "configure" +#line 8270 "configure" #include "confdefs.h" #include @@ -8131,21 +8280,21 @@ putwc(0,0); } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:8134: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8283: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8137: \$? = $ac_status" >&5 + echo "$as_me:8286: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:8140: \"$ac_try\"") >&5 + { (eval echo "$as_me:8289: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8143: \$? = $ac_status" >&5 + echo "$as_me:8292: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then test -n "$verbose" && echo " ... found utf8 headers in $cf_cv_header_path_utf8" 1>&6 -echo "${as_me:-configure}:8148: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5 +echo "${as_me:-configure}:8297: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5 cf_cv_find_linkage_utf8=maybe cf_test_CPPFLAGS="$CPPFLAGS" @@ -8163,7 +8312,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_cv_find_linkage_utf8" = maybe ; then -echo "${as_me:-configure}:8166: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5 +echo "${as_me:-configure}:8315: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5 cf_save_LIBS="$LIBS" cf_save_LDFLAGS="$LDFLAGS" @@ -8238,13 +8387,13 @@ cf_search="$cf_library_path_list $cf_search" if test -d "$cf_cv_library_path_utf8" ; then test -n "$verbose" && echo " ... testing $cf_cv_library_path_utf8" 1>&6 -echo "${as_me:-configure}:8241: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5 +echo "${as_me:-configure}:8390: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5 CPPFLAGS="$cf_test_CPPFLAGS" LIBS="-lutf8 $cf_save_LIBS" LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_utf8" cat >"conftest.$ac_ext" <<_ACEOF -#line 8247 "configure" +#line 8396 "configure" #include "confdefs.h" #include @@ -8257,21 +8406,21 @@ putwc(0,0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:8260: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8409: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8263: \$? = $ac_status" >&5 + echo "$as_me:8412: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:8266: \"$ac_try\"") >&5 + { (eval echo "$as_me:8415: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8269: \$? = $ac_status" >&5 + echo "$as_me:8418: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then test -n "$verbose" && echo " ... found utf8 library in $cf_cv_library_path_utf8" 1>&6 -echo "${as_me:-configure}:8274: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5 +echo "${as_me:-configure}:8423: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5 cf_cv_find_linkage_utf8=yes cf_cv_library_file_utf8="-lutf8" @@ -8313,7 +8462,7 @@ fi fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:8316: result: $cf_cv_utf8_lib" >&5 +echo "$as_me:8465: result: $cf_cv_utf8_lib" >&5 echo "${ECHO_T}$cf_cv_utf8_lib" >&6 # HAVE_LIBUTF8_H is used by ncurses if curses.h is shared between @@ -8351,7 +8500,7 @@ if test -n "$cf_cv_header_path_utf8" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 8354 "configure" +#line 8503 "configure" #include "confdefs.h" #include int @@ -8363,16 +8512,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:8366: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8515: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8369: \$? = $ac_status" >&5 + echo "$as_me:8518: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:8372: \"$ac_try\"") >&5 + { (eval echo "$as_me:8521: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8375: \$? = $ac_status" >&5 + echo "$as_me:8524: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -8389,7 +8538,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:8392: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:8541: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -8425,7 +8574,7 @@ if test -n "$cf_cv_library_path_utf8" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:8428: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:8577: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -8455,13 +8604,13 @@ cf_ncuconfig_root=$cf_cv_screen cf_have_ncuconfig=no if test "x${PKG_CONFIG:=none}" != xnone; then - echo "$as_me:8458: checking pkg-config for $cf_ncuconfig_root" >&5 + echo "$as_me:8607: checking pkg-config for $cf_ncuconfig_root" >&5 echo $ECHO_N "checking pkg-config for $cf_ncuconfig_root... $ECHO_C" >&6 if "$PKG_CONFIG" --exists $cf_ncuconfig_root ; then - echo "$as_me:8461: result: yes" >&5 + echo "$as_me:8610: result: yes" >&5 echo "${ECHO_T}yes" >&6 - echo "$as_me:8464: checking if the $cf_ncuconfig_root package files work" >&5 + echo "$as_me:8613: checking if the $cf_ncuconfig_root package files work" >&5 echo $ECHO_N "checking if the $cf_ncuconfig_root package files work... $ECHO_C" >&6 cf_have_ncuconfig=unknown @@ -8594,7 +8743,7 @@ done LIBS="$cf_add_libs" cat >"conftest.$ac_ext" <<_ACEOF -#line 8597 "configure" +#line 8746 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -8606,37 +8755,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:8609: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8758: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8612: \$? = $ac_status" >&5 + echo "$as_me:8761: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:8615: \"$ac_try\"") >&5 + { (eval echo "$as_me:8764: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8618: \$? = $ac_status" >&5 + echo "$as_me:8767: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then if test "$cross_compiling" = yes; then cf_test_ncuconfig=maybe else cat >"conftest.$ac_ext" <<_ACEOF -#line 8624 "configure" +#line 8773 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int main(void) { const char *xx = curses_version(); return (xx == 0); } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:8631: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8780: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8634: \$? = $ac_status" >&5 + echo "$as_me:8783: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:8636: \"$ac_try\"") >&5 + { (eval echo "$as_me:8785: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8639: \$? = $ac_status" >&5 + echo "$as_me:8788: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_test_ncuconfig=yes else @@ -8667,6 +8816,20 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" ;; esac +for cf_required in $cf_ncuconfig_root +do + # check for duplicates + for cf_require_pkg in $REQUIRE_PKG + do + if test "$cf_required" = "$cf_require_pkg" + then + cf_required= + break + fi + done + test -n "$cf_required" && REQUIRE_PKG="$REQUIRE_PKG $cf_required" +done + for cf_add_cflags in $cf_pkg_cflags do case "x$cf_add_cflags" in @@ -8810,7 +8973,7 @@ done LIBS="$cf_add_libs" cat >"conftest.$ac_ext" <<_ACEOF -#line 8813 "configure" +#line 8976 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -8822,37 +8985,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:8825: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8988: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8828: \$? = $ac_status" >&5 + echo "$as_me:8991: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:8831: \"$ac_try\"") >&5 + { (eval echo "$as_me:8994: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8834: \$? = $ac_status" >&5 + echo "$as_me:8997: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then if test "$cross_compiling" = yes; then cf_have_ncuconfig=maybe else cat >"conftest.$ac_ext" <<_ACEOF -#line 8840 "configure" +#line 9003 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int main(void) { const char *xx = curses_version(); return (xx == 0); } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:8847: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9010: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8850: \$? = $ac_status" >&5 + echo "$as_me:9013: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:8852: \"$ac_try\"") >&5 + { (eval echo "$as_me:9015: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8855: \$? = $ac_status" >&5 + echo "$as_me:9018: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_have_ncuconfig=yes else @@ -8869,7 +9032,7 @@ cat "conftest.$ac_ext" >&5 cf_have_ncuconfig=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - echo "$as_me:8872: result: $cf_have_ncuconfig" >&5 + echo "$as_me:9035: result: $cf_have_ncuconfig" >&5 echo "${ECHO_T}$cf_have_ncuconfig" >&6 test "$cf_have_ncuconfig" = maybe && cf_have_ncuconfig=yes if test "$cf_have_ncuconfig" != "yes" @@ -8885,7 +9048,7 @@ EOF NCURSES_CONFIG_PKG=$cf_ncuconfig_root -echo "$as_me:8888: checking for terminfo header" >&5 +echo "$as_me:9051: checking for terminfo header" >&5 echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6 if test "${cf_cv_term_header+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -8903,7 +9066,7 @@ esac for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do cat >"conftest.$ac_ext" <<_ACEOF -#line 8906 "configure" +#line 9069 "configure" #include "confdefs.h" #include #include <${cf_cv_ncurses_header:-curses.h}> @@ -8918,16 +9081,16 @@ int x = auto_left_margin; (void)x } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:8921: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9084: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8924: \$? = $ac_status" >&5 + echo "$as_me:9087: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:8927: \"$ac_try\"") >&5 + { (eval echo "$as_me:9090: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8930: \$? = $ac_status" >&5 + echo "$as_me:9093: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_term_header="$cf_test" @@ -8943,7 +9106,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:8946: result: $cf_cv_term_header" >&5 +echo "$as_me:9109: result: $cf_cv_term_header" >&5 echo "${ECHO_T}$cf_cv_term_header" >&6 # Set definitions to allow ifdef'ing to accommodate subdirectories @@ -8978,7 +9141,7 @@ esac fi else - echo "$as_me:8981: result: no" >&5 + echo "$as_me:9144: result: no" >&5 echo "${ECHO_T}no" >&6 NCURSES_CONFIG_PKG=none fi @@ -8994,7 +9157,7 @@ if test -n "$ac_tool_prefix"; then do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:8997: checking for $ac_word" >&5 +echo "$as_me:9160: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_NCURSES_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9009,7 +9172,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog" -echo "$as_me:9012: found $ac_dir/$ac_word" >&5 +echo "$as_me:9175: found $ac_dir/$ac_word" >&5 break done @@ -9017,10 +9180,10 @@ fi fi NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG if test -n "$NCURSES_CONFIG"; then - echo "$as_me:9020: result: $NCURSES_CONFIG" >&5 + echo "$as_me:9183: result: $NCURSES_CONFIG" >&5 echo "${ECHO_T}$NCURSES_CONFIG" >&6 else - echo "$as_me:9023: result: no" >&5 + echo "$as_me:9186: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -9033,7 +9196,7 @@ if test -z "$NCURSES_CONFIG"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:9036: checking for $ac_word" >&5 +echo "$as_me:9199: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_NCURSES_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9048,7 +9211,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog" -echo "$as_me:9051: found $ac_dir/$ac_word" >&5 +echo "$as_me:9214: found $ac_dir/$ac_word" >&5 break done @@ -9056,10 +9219,10 @@ fi fi ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG if test -n "$ac_ct_NCURSES_CONFIG"; then - echo "$as_me:9059: result: $ac_ct_NCURSES_CONFIG" >&5 + echo "$as_me:9222: result: $ac_ct_NCURSES_CONFIG" >&5 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6 else - echo "$as_me:9062: result: no" >&5 + echo "$as_me:9225: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -9216,7 +9379,7 @@ LIBS="$cf_add_libs" # even with config script, some packages use no-override for curses.h -echo "$as_me:9219: checking if we have identified curses headers" >&5 +echo "$as_me:9382: checking if we have identified curses headers" >&5 echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6 if test "${cf_cv_ncurses_header+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9228,7 +9391,7 @@ for cf_header in \ curses.h $cf_cv_screen/curses.h do cat >"conftest.$ac_ext" <<_ACEOF -#line 9231 "configure" +#line 9394 "configure" #include "confdefs.h" #include <${cf_header}> int @@ -9240,16 +9403,16 @@ initscr(); endwin() } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:9243: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9406: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9246: \$? = $ac_status" >&5 + echo "$as_me:9409: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:9249: \"$ac_try\"") >&5 + { (eval echo "$as_me:9412: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9252: \$? = $ac_status" >&5 + echo "$as_me:9415: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_header=$cf_header; break else @@ -9260,11 +9423,11 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:9263: result: $cf_cv_ncurses_header" >&5 +echo "$as_me:9426: result: $cf_cv_ncurses_header" >&5 echo "${ECHO_T}$cf_cv_ncurses_header" >&6 if test "$cf_cv_ncurses_header" = none ; then - { { echo "$as_me:9267: error: No curses header-files found" >&5 + { { echo "$as_me:9430: error: No curses header-files found" >&5 echo "$as_me: error: No curses header-files found" >&2;} { (exit 1); exit 1; }; } fi @@ -9274,23 +9437,23 @@ fi for ac_header in $cf_cv_ncurses_header do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:9277: checking for $ac_header" >&5 +echo "$as_me:9440: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 9283 "configure" +#line 9446 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:9287: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:9450: \"$ac_cpp "conftest.$ac_ext"\"") >&5 (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:9293: \$? = $ac_status" >&5 + echo "$as_me:9456: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -9309,7 +9472,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:9312: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:9475: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then cat >>confdefs.h <"conftest.$ac_ext" <<_ACEOF -#line 9368 "configure" +#line 9531 "configure" #include "confdefs.h" #include int @@ -9377,16 +9540,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:9380: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9543: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9383: \$? = $ac_status" >&5 + echo "$as_me:9546: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:9386: \"$ac_try\"") >&5 + { (eval echo "$as_me:9549: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9389: \$? = $ac_status" >&5 + echo "$as_me:9552: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -9403,7 +9566,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:9406: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:9569: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -9422,7 +9585,7 @@ fi } -echo "$as_me:9425: checking for $cf_ncuhdr_root header in include-path" >&5 +echo "$as_me:9588: checking for $cf_ncuhdr_root header in include-path" >&5 echo $ECHO_N "checking for $cf_ncuhdr_root header in include-path... $ECHO_C" >&6 if test "${cf_cv_ncurses_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9434,7 +9597,7 @@ else do cat >"conftest.$ac_ext" <<_ACEOF -#line 9437 "configure" +#line 9600 "configure" #include "confdefs.h" #include <$cf_header> @@ -9458,16 +9621,16 @@ printf("old\\n"); } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:9461: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9624: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9464: \$? = $ac_status" >&5 + echo "$as_me:9627: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:9467: \"$ac_try\"") >&5 + { (eval echo "$as_me:9630: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9470: \$? = $ac_status" >&5 + echo "$as_me:9633: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_h=$cf_header @@ -9482,14 +9645,14 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:9485: result: $cf_cv_ncurses_h" >&5 +echo "$as_me:9648: result: $cf_cv_ncurses_h" >&5 echo "${ECHO_T}$cf_cv_ncurses_h" >&6 if test "$cf_cv_ncurses_h" != no ; then cf_cv_ncurses_header=$cf_cv_ncurses_h else -echo "$as_me:9492: checking for $cf_ncuhdr_root include-path" >&5 +echo "$as_me:9655: checking for $cf_ncuhdr_root include-path" >&5 echo $ECHO_N "checking for $cf_ncuhdr_root include-path... $ECHO_C" >&6 if test "${cf_cv_ncurses_h2+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9610,7 +9773,7 @@ if test -n "$cf_incdir" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 9613 "configure" +#line 9776 "configure" #include "confdefs.h" #include int @@ -9622,16 +9785,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:9625: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9788: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9628: \$? = $ac_status" >&5 + echo "$as_me:9791: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:9631: \"$ac_try\"") >&5 + { (eval echo "$as_me:9794: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9634: \$? = $ac_status" >&5 + echo "$as_me:9797: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -9648,7 +9811,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:9651: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:9814: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -9671,7 +9834,7 @@ fi do cat >"conftest.$ac_ext" <<_ACEOF -#line 9674 "configure" +#line 9837 "configure" #include "confdefs.h" #include <$cf_header> @@ -9695,16 +9858,16 @@ printf("old\\n"); } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:9698: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9861: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9701: \$? = $ac_status" >&5 + echo "$as_me:9864: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:9704: \"$ac_try\"") >&5 + { (eval echo "$as_me:9867: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9707: \$? = $ac_status" >&5 + echo "$as_me:9870: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_h2=$cf_header @@ -9725,12 +9888,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" CPPFLAGS="$cf_save2_CPPFLAGS" test "$cf_cv_ncurses_h2" != no && break done - test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:9728: error: not found" >&5 + test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:9891: error: not found" >&5 echo "$as_me: error: not found" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:9733: result: $cf_cv_ncurses_h2" >&5 +echo "$as_me:9896: result: $cf_cv_ncurses_h2" >&5 echo "${ECHO_T}$cf_cv_ncurses_h2" >&6 cf_1st_incdir=`echo "$cf_cv_ncurses_h2" | sed -e 's%/[^/]*$%%'` @@ -9766,7 +9929,7 @@ if test -n "$cf_1st_incdir" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 9769 "configure" +#line 9932 "configure" #include "confdefs.h" #include int @@ -9778,16 +9941,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:9781: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9944: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9784: \$? = $ac_status" >&5 + echo "$as_me:9947: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:9787: \"$ac_try\"") >&5 + { (eval echo "$as_me:9950: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9790: \$? = $ac_status" >&5 + echo "$as_me:9953: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -9804,7 +9967,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:9807: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:9970: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -9852,7 +10015,7 @@ EOF ;; esac -echo "$as_me:9855: checking for terminfo header" >&5 +echo "$as_me:10018: checking for terminfo header" >&5 echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6 if test "${cf_cv_term_header+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9870,7 +10033,7 @@ esac for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do cat >"conftest.$ac_ext" <<_ACEOF -#line 9873 "configure" +#line 10036 "configure" #include "confdefs.h" #include #include <${cf_cv_ncurses_header:-curses.h}> @@ -9885,16 +10048,16 @@ int x = auto_left_margin; (void)x } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:9888: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10051: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9891: \$? = $ac_status" >&5 + echo "$as_me:10054: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:9894: \"$ac_try\"") >&5 + { (eval echo "$as_me:10057: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9897: \$? = $ac_status" >&5 + echo "$as_me:10060: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_term_header="$cf_test" @@ -9910,7 +10073,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:9913: result: $cf_cv_term_header" >&5 +echo "$as_me:10076: result: $cf_cv_term_header" >&5 echo "${ECHO_T}$cf_cv_term_header" >&6 # Set definitions to allow ifdef'ing to accommodate subdirectories @@ -9948,7 +10111,7 @@ cat >>confdefs.h <<\EOF #define NCURSES 1 EOF -echo "$as_me:9951: checking for ncurses version" >&5 +echo "$as_me:10114: checking for ncurses version" >&5 echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6 if test "${cf_cv_ncurses_version+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9974,10 +10137,10 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo "$as_me:9977: \"$cf_try\"") >&5 + { (eval echo "$as_me:10140: \"$cf_try\"") >&5 (eval $cf_try) 2>&5 ac_status=$? - echo "$as_me:9980: \$? = $ac_status" >&5 + echo "$as_me:10143: \$? = $ac_status" >&5 (exit "$ac_status"); } if test -f conftest.out ; then cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out` @@ -9987,7 +10150,7 @@ EOF else cat >"conftest.$ac_ext" <<_ACEOF -#line 9990 "configure" +#line 10153 "configure" #include "confdefs.h" $ac_includes_default @@ -10007,22 +10170,22 @@ int main(void) # ifdef __NCURSES_H fprintf(fp, "old\\n"); # else - make an error + #error expected ncurses header to define __NCURSES_H # endif #endif ${cf_cv_main_return:-return}(0); } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:10017: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10180: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10020: \$? = $ac_status" >&5 + echo "$as_me:10183: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:10022: \"$ac_try\"") >&5 + { (eval echo "$as_me:10185: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10025: \$? = $ac_status" >&5 + echo "$as_me:10188: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_version=`cat $cf_tempfile` @@ -10036,7 +10199,7 @@ fi rm -f "$cf_tempfile" fi -echo "$as_me:10039: result: $cf_cv_ncurses_version" >&5 +echo "$as_me:10202: result: $cf_cv_ncurses_version" >&5 echo "${ECHO_T}$cf_cv_ncurses_version" >&6 test "$cf_cv_ncurses_version" = no || cat >>confdefs.h <<\EOF @@ -10049,7 +10212,7 @@ cf_nculib_root=$cf_cv_screen # to link gpm. cf_ncurses_LIBS="" cf_ncurses_SAVE="$LIBS" -echo "$as_me:10052: checking for Gpm_Open in -lgpm" >&5 +echo "$as_me:10215: checking for Gpm_Open in -lgpm" >&5 echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6 if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -10057,7 +10220,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 10060 "configure" +#line 10223 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -10066,7 +10229,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char Gpm_Open (); +char Gpm_Open (void); int main (void) { @@ -10076,16 +10239,16 @@ Gpm_Open (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:10079: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10242: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10082: \$? = $ac_status" >&5 + echo "$as_me:10245: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:10085: \"$ac_try\"") >&5 + { (eval echo "$as_me:10248: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10088: \$? = $ac_status" >&5 + echo "$as_me:10251: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_gpm_Gpm_Open=yes else @@ -10096,10 +10259,10 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:10099: result: $ac_cv_lib_gpm_Gpm_Open" >&5 +echo "$as_me:10262: result: $ac_cv_lib_gpm_Gpm_Open" >&5 echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6 if test "$ac_cv_lib_gpm_Gpm_Open" = yes; then - echo "$as_me:10102: checking for initscr in -lgpm" >&5 + echo "$as_me:10265: checking for initscr in -lgpm" >&5 echo $ECHO_N "checking for initscr in -lgpm... $ECHO_C" >&6 if test "${ac_cv_lib_gpm_initscr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -10107,7 +10270,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 10110 "configure" +#line 10273 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -10116,7 +10279,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char initscr (); +char initscr (void); int main (void) { @@ -10126,16 +10289,16 @@ initscr (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:10129: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10292: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10132: \$? = $ac_status" >&5 + echo "$as_me:10295: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:10135: \"$ac_try\"") >&5 + { (eval echo "$as_me:10298: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10138: \$? = $ac_status" >&5 + echo "$as_me:10301: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_gpm_initscr=yes else @@ -10146,7 +10309,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:10149: result: $ac_cv_lib_gpm_initscr" >&5 +echo "$as_me:10312: result: $ac_cv_lib_gpm_initscr" >&5 echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6 if test "$ac_cv_lib_gpm_initscr" = yes; then LIBS="$cf_ncurses_SAVE" @@ -10161,7 +10324,7 @@ case "$host_os" in # This is only necessary if you are linking against an obsolete # version of ncurses (but it should do no harm, since it is static). if test "$cf_nculib_root" = ncurses ; then - echo "$as_me:10164: checking for tgoto in -lmytinfo" >&5 + echo "$as_me:10327: checking for tgoto in -lmytinfo" >&5 echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6 if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -10169,7 +10332,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lmytinfo $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 10172 "configure" +#line 10335 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -10178,7 +10341,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char tgoto (); +char tgoto (void); int main (void) { @@ -10188,16 +10351,16 @@ tgoto (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:10191: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10354: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10194: \$? = $ac_status" >&5 + echo "$as_me:10357: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:10197: \"$ac_try\"") >&5 + { (eval echo "$as_me:10360: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10200: \$? = $ac_status" >&5 + echo "$as_me:10363: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_mytinfo_tgoto=yes else @@ -10208,7 +10371,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:10211: result: $ac_cv_lib_mytinfo_tgoto" >&5 +echo "$as_me:10374: result: $ac_cv_lib_mytinfo_tgoto" >&5 echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6 if test "$ac_cv_lib_mytinfo_tgoto" = yes; then cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS" @@ -10257,13 +10420,13 @@ else eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no' cf_libdir="" - echo "$as_me:10260: checking for initscr" >&5 + echo "$as_me:10423: checking for initscr" >&5 echo $ECHO_N "checking for initscr... $ECHO_C" >&6 if test "${ac_cv_func_initscr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 10266 "configure" +#line 10429 "configure" #include "confdefs.h" #define initscr autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -10294,16 +10457,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:10297: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10460: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10300: \$? = $ac_status" >&5 + echo "$as_me:10463: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:10303: \"$ac_try\"") >&5 + { (eval echo "$as_me:10466: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10306: \$? = $ac_status" >&5 + echo "$as_me:10469: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_initscr=yes else @@ -10313,18 +10476,18 @@ ac_cv_func_initscr=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:10316: result: $ac_cv_func_initscr" >&5 +echo "$as_me:10479: result: $ac_cv_func_initscr" >&5 echo "${ECHO_T}$ac_cv_func_initscr" >&6 if test "$ac_cv_func_initscr" = yes; then eval 'cf_cv_have_lib_'"$cf_nculib_root"'=yes' else cf_save_LIBS="$LIBS" - echo "$as_me:10323: checking for initscr in -l$cf_nculib_root" >&5 + echo "$as_me:10486: checking for initscr in -l$cf_nculib_root" >&5 echo $ECHO_N "checking for initscr in -l$cf_nculib_root... $ECHO_C" >&6 LIBS="-l$cf_nculib_root $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 10327 "configure" +#line 10490 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -10336,25 +10499,25 @@ initscr() } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:10339: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10502: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10342: \$? = $ac_status" >&5 + echo "$as_me:10505: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:10345: \"$ac_try\"") >&5 + { (eval echo "$as_me:10508: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10348: \$? = $ac_status" >&5 + echo "$as_me:10511: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - echo "$as_me:10350: result: yes" >&5 + echo "$as_me:10513: result: yes" >&5 echo "${ECHO_T}yes" >&6 eval 'cf_cv_have_lib_'"$cf_nculib_root"'=yes' else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 -echo "$as_me:10357: result: no" >&5 +echo "$as_me:10520: result: no" >&5 echo "${ECHO_T}no" >&6 cf_search= @@ -10422,11 +10585,11 @@ cf_search="$cf_library_path_list $cf_search" for cf_libdir in $cf_search do - echo "$as_me:10425: checking for -l$cf_nculib_root in $cf_libdir" >&5 + echo "$as_me:10588: checking for -l$cf_nculib_root in $cf_libdir" >&5 echo $ECHO_N "checking for -l$cf_nculib_root in $cf_libdir... $ECHO_C" >&6 LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 10429 "configure" +#line 10592 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -10438,25 +10601,25 @@ initscr() } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:10441: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10604: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10444: \$? = $ac_status" >&5 + echo "$as_me:10607: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:10447: \"$ac_try\"") >&5 + { (eval echo "$as_me:10610: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10450: \$? = $ac_status" >&5 + echo "$as_me:10613: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - echo "$as_me:10452: result: yes" >&5 + echo "$as_me:10615: result: yes" >&5 echo "${ECHO_T}yes" >&6 eval 'cf_cv_have_lib_'"$cf_nculib_root"'=yes' break else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 -echo "$as_me:10459: result: no" >&5 +echo "$as_me:10622: result: no" >&5 echo "${ECHO_T}no" >&6 LIBS="$cf_save_LIBS" fi @@ -10471,7 +10634,7 @@ fi eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\" if test "$cf_found_library" = no ; then - { { echo "$as_me:10474: error: Cannot link $cf_nculib_root library" >&5 + { { echo "$as_me:10637: error: Cannot link $cf_nculib_root library" >&5 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;} { (exit 1); exit 1; }; } fi @@ -10479,7 +10642,7 @@ fi fi if test -n "$cf_ncurses_LIBS" ; then - echo "$as_me:10482: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 + echo "$as_me:10645: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS... $ECHO_C" >&6 cf_ncurses_SAVE="$LIBS" for p in $cf_ncurses_LIBS ; do @@ -10489,7 +10652,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS.. fi done cat >"conftest.$ac_ext" <<_ACEOF -#line 10492 "configure" +#line 10655 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -10501,23 +10664,23 @@ initscr(); mousemask(0,0); tigetstr((char *)0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:10504: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10667: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10507: \$? = $ac_status" >&5 + echo "$as_me:10670: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:10510: \"$ac_try\"") >&5 + { (eval echo "$as_me:10673: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10513: \$? = $ac_status" >&5 + echo "$as_me:10676: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - echo "$as_me:10515: result: yes" >&5 + echo "$as_me:10678: result: yes" >&5 echo "${ECHO_T}yes" >&6 else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 -echo "$as_me:10520: result: no" >&5 +echo "$as_me:10683: result: no" >&5 echo "${ECHO_T}no" >&6 LIBS="$cf_ncurses_SAVE" fi @@ -10542,13 +10705,13 @@ cf_ncuconfig_root=$cf_cv_screen cf_have_ncuconfig=no if test "x${PKG_CONFIG:=none}" != xnone; then - echo "$as_me:10545: checking pkg-config for $cf_ncuconfig_root" >&5 + echo "$as_me:10708: checking pkg-config for $cf_ncuconfig_root" >&5 echo $ECHO_N "checking pkg-config for $cf_ncuconfig_root... $ECHO_C" >&6 if "$PKG_CONFIG" --exists $cf_ncuconfig_root ; then - echo "$as_me:10548: result: yes" >&5 + echo "$as_me:10711: result: yes" >&5 echo "${ECHO_T}yes" >&6 - echo "$as_me:10551: checking if the $cf_ncuconfig_root package files work" >&5 + echo "$as_me:10714: checking if the $cf_ncuconfig_root package files work" >&5 echo $ECHO_N "checking if the $cf_ncuconfig_root package files work... $ECHO_C" >&6 cf_have_ncuconfig=unknown @@ -10681,7 +10844,7 @@ done LIBS="$cf_add_libs" cat >"conftest.$ac_ext" <<_ACEOF -#line 10684 "configure" +#line 10847 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -10693,37 +10856,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:10696: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10859: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10699: \$? = $ac_status" >&5 + echo "$as_me:10862: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:10702: \"$ac_try\"") >&5 + { (eval echo "$as_me:10865: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10705: \$? = $ac_status" >&5 + echo "$as_me:10868: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then if test "$cross_compiling" = yes; then cf_test_ncuconfig=maybe else cat >"conftest.$ac_ext" <<_ACEOF -#line 10711 "configure" +#line 10874 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int main(void) { const char *xx = curses_version(); return (xx == 0); } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:10718: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10881: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10721: \$? = $ac_status" >&5 + echo "$as_me:10884: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:10723: \"$ac_try\"") >&5 + { (eval echo "$as_me:10886: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10726: \$? = $ac_status" >&5 + echo "$as_me:10889: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_test_ncuconfig=yes else @@ -10754,6 +10917,20 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" ;; esac +for cf_required in $cf_ncuconfig_root +do + # check for duplicates + for cf_require_pkg in $REQUIRE_PKG + do + if test "$cf_required" = "$cf_require_pkg" + then + cf_required= + break + fi + done + test -n "$cf_required" && REQUIRE_PKG="$REQUIRE_PKG $cf_required" +done + for cf_add_cflags in $cf_pkg_cflags do case "x$cf_add_cflags" in @@ -10897,7 +11074,7 @@ done LIBS="$cf_add_libs" cat >"conftest.$ac_ext" <<_ACEOF -#line 10900 "configure" +#line 11077 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -10909,37 +11086,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:10912: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11089: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10915: \$? = $ac_status" >&5 + echo "$as_me:11092: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:10918: \"$ac_try\"") >&5 + { (eval echo "$as_me:11095: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10921: \$? = $ac_status" >&5 + echo "$as_me:11098: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then if test "$cross_compiling" = yes; then cf_have_ncuconfig=maybe else cat >"conftest.$ac_ext" <<_ACEOF -#line 10927 "configure" +#line 11104 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int main(void) { const char *xx = curses_version(); return (xx == 0); } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:10934: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11111: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10937: \$? = $ac_status" >&5 + echo "$as_me:11114: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:10939: \"$ac_try\"") >&5 + { (eval echo "$as_me:11116: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10942: \$? = $ac_status" >&5 + echo "$as_me:11119: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_have_ncuconfig=yes else @@ -10956,7 +11133,7 @@ cat "conftest.$ac_ext" >&5 cf_have_ncuconfig=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - echo "$as_me:10959: result: $cf_have_ncuconfig" >&5 + echo "$as_me:11136: result: $cf_have_ncuconfig" >&5 echo "${ECHO_T}$cf_have_ncuconfig" >&6 test "$cf_have_ncuconfig" = maybe && cf_have_ncuconfig=yes if test "$cf_have_ncuconfig" != "yes" @@ -10972,7 +11149,7 @@ EOF NCURSES_CONFIG_PKG=$cf_ncuconfig_root -echo "$as_me:10975: checking for terminfo header" >&5 +echo "$as_me:11152: checking for terminfo header" >&5 echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6 if test "${cf_cv_term_header+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -10990,7 +11167,7 @@ esac for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do cat >"conftest.$ac_ext" <<_ACEOF -#line 10993 "configure" +#line 11170 "configure" #include "confdefs.h" #include #include <${cf_cv_ncurses_header:-curses.h}> @@ -11005,16 +11182,16 @@ int x = auto_left_margin; (void)x } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:11008: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11185: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11011: \$? = $ac_status" >&5 + echo "$as_me:11188: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:11014: \"$ac_try\"") >&5 + { (eval echo "$as_me:11191: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11017: \$? = $ac_status" >&5 + echo "$as_me:11194: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_term_header="$cf_test" @@ -11030,7 +11207,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:11033: result: $cf_cv_term_header" >&5 +echo "$as_me:11210: result: $cf_cv_term_header" >&5 echo "${ECHO_T}$cf_cv_term_header" >&6 # Set definitions to allow ifdef'ing to accommodate subdirectories @@ -11065,7 +11242,7 @@ esac fi else - echo "$as_me:11068: result: no" >&5 + echo "$as_me:11245: result: no" >&5 echo "${ECHO_T}no" >&6 NCURSES_CONFIG_PKG=none fi @@ -11081,7 +11258,7 @@ if test -n "$ac_tool_prefix"; then do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:11084: checking for $ac_word" >&5 +echo "$as_me:11261: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_NCURSES_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -11096,7 +11273,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog" -echo "$as_me:11099: found $ac_dir/$ac_word" >&5 +echo "$as_me:11276: found $ac_dir/$ac_word" >&5 break done @@ -11104,10 +11281,10 @@ fi fi NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG if test -n "$NCURSES_CONFIG"; then - echo "$as_me:11107: result: $NCURSES_CONFIG" >&5 + echo "$as_me:11284: result: $NCURSES_CONFIG" >&5 echo "${ECHO_T}$NCURSES_CONFIG" >&6 else - echo "$as_me:11110: result: no" >&5 + echo "$as_me:11287: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -11120,7 +11297,7 @@ if test -z "$NCURSES_CONFIG"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:11123: checking for $ac_word" >&5 +echo "$as_me:11300: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_NCURSES_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -11135,7 +11312,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog" -echo "$as_me:11138: found $ac_dir/$ac_word" >&5 +echo "$as_me:11315: found $ac_dir/$ac_word" >&5 break done @@ -11143,10 +11320,10 @@ fi fi ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG if test -n "$ac_ct_NCURSES_CONFIG"; then - echo "$as_me:11146: result: $ac_ct_NCURSES_CONFIG" >&5 + echo "$as_me:11323: result: $ac_ct_NCURSES_CONFIG" >&5 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6 else - echo "$as_me:11149: result: no" >&5 + echo "$as_me:11326: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -11303,7 +11480,7 @@ LIBS="$cf_add_libs" # even with config script, some packages use no-override for curses.h -echo "$as_me:11306: checking if we have identified curses headers" >&5 +echo "$as_me:11483: checking if we have identified curses headers" >&5 echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6 if test "${cf_cv_ncurses_header+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -11315,7 +11492,7 @@ for cf_header in \ curses.h $cf_cv_screen/curses.h do cat >"conftest.$ac_ext" <<_ACEOF -#line 11318 "configure" +#line 11495 "configure" #include "confdefs.h" #include <${cf_header}> int @@ -11327,16 +11504,16 @@ initscr(); endwin() } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:11330: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11507: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11333: \$? = $ac_status" >&5 + echo "$as_me:11510: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:11336: \"$ac_try\"") >&5 + { (eval echo "$as_me:11513: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11339: \$? = $ac_status" >&5 + echo "$as_me:11516: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_header=$cf_header; break else @@ -11347,11 +11524,11 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:11350: result: $cf_cv_ncurses_header" >&5 +echo "$as_me:11527: result: $cf_cv_ncurses_header" >&5 echo "${ECHO_T}$cf_cv_ncurses_header" >&6 if test "$cf_cv_ncurses_header" = none ; then - { { echo "$as_me:11354: error: No curses header-files found" >&5 + { { echo "$as_me:11531: error: No curses header-files found" >&5 echo "$as_me: error: No curses header-files found" >&2;} { (exit 1); exit 1; }; } fi @@ -11361,23 +11538,23 @@ fi for ac_header in $cf_cv_ncurses_header do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:11364: checking for $ac_header" >&5 +echo "$as_me:11541: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 11370 "configure" +#line 11547 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:11374: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:11551: \"$ac_cpp "conftest.$ac_ext"\"") >&5 (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:11380: \$? = $ac_status" >&5 + echo "$as_me:11557: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -11396,7 +11573,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:11399: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:11576: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then cat >>confdefs.h <"conftest.$ac_ext" <<_ACEOF -#line 11455 "configure" +#line 11632 "configure" #include "confdefs.h" #include int @@ -11464,16 +11641,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:11467: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11644: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11470: \$? = $ac_status" >&5 + echo "$as_me:11647: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:11473: \"$ac_try\"") >&5 + { (eval echo "$as_me:11650: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11476: \$? = $ac_status" >&5 + echo "$as_me:11653: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -11490,7 +11667,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:11493: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:11670: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -11509,7 +11686,7 @@ fi } -echo "$as_me:11512: checking for $cf_ncuhdr_root header in include-path" >&5 +echo "$as_me:11689: checking for $cf_ncuhdr_root header in include-path" >&5 echo $ECHO_N "checking for $cf_ncuhdr_root header in include-path... $ECHO_C" >&6 if test "${cf_cv_ncurses_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -11521,7 +11698,7 @@ else do cat >"conftest.$ac_ext" <<_ACEOF -#line 11524 "configure" +#line 11701 "configure" #include "confdefs.h" #include <$cf_header> @@ -11545,16 +11722,16 @@ printf("old\\n"); } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:11548: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11725: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11551: \$? = $ac_status" >&5 + echo "$as_me:11728: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:11554: \"$ac_try\"") >&5 + { (eval echo "$as_me:11731: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11557: \$? = $ac_status" >&5 + echo "$as_me:11734: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_h=$cf_header @@ -11569,14 +11746,14 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:11572: result: $cf_cv_ncurses_h" >&5 +echo "$as_me:11749: result: $cf_cv_ncurses_h" >&5 echo "${ECHO_T}$cf_cv_ncurses_h" >&6 if test "$cf_cv_ncurses_h" != no ; then cf_cv_ncurses_header=$cf_cv_ncurses_h else -echo "$as_me:11579: checking for $cf_ncuhdr_root include-path" >&5 +echo "$as_me:11756: checking for $cf_ncuhdr_root include-path" >&5 echo $ECHO_N "checking for $cf_ncuhdr_root include-path... $ECHO_C" >&6 if test "${cf_cv_ncurses_h2+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -11697,7 +11874,7 @@ if test -n "$cf_incdir" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 11700 "configure" +#line 11877 "configure" #include "confdefs.h" #include int @@ -11709,16 +11886,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:11712: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11889: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11715: \$? = $ac_status" >&5 + echo "$as_me:11892: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:11718: \"$ac_try\"") >&5 + { (eval echo "$as_me:11895: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11721: \$? = $ac_status" >&5 + echo "$as_me:11898: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -11735,7 +11912,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:11738: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:11915: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -11758,7 +11935,7 @@ fi do cat >"conftest.$ac_ext" <<_ACEOF -#line 11761 "configure" +#line 11938 "configure" #include "confdefs.h" #include <$cf_header> @@ -11782,16 +11959,16 @@ printf("old\\n"); } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:11785: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11962: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11788: \$? = $ac_status" >&5 + echo "$as_me:11965: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:11791: \"$ac_try\"") >&5 + { (eval echo "$as_me:11968: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11794: \$? = $ac_status" >&5 + echo "$as_me:11971: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_h2=$cf_header @@ -11812,12 +11989,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" CPPFLAGS="$cf_save2_CPPFLAGS" test "$cf_cv_ncurses_h2" != no && break done - test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:11815: error: not found" >&5 + test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:11992: error: not found" >&5 echo "$as_me: error: not found" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:11820: result: $cf_cv_ncurses_h2" >&5 +echo "$as_me:11997: result: $cf_cv_ncurses_h2" >&5 echo "${ECHO_T}$cf_cv_ncurses_h2" >&6 cf_1st_incdir=`echo "$cf_cv_ncurses_h2" | sed -e 's%/[^/]*$%%'` @@ -11853,7 +12030,7 @@ if test -n "$cf_1st_incdir" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 11856 "configure" +#line 12033 "configure" #include "confdefs.h" #include int @@ -11865,16 +12042,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:11868: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12045: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11871: \$? = $ac_status" >&5 + echo "$as_me:12048: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:11874: \"$ac_try\"") >&5 + { (eval echo "$as_me:12051: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11877: \$? = $ac_status" >&5 + echo "$as_me:12054: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -11891,7 +12068,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:11894: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:12071: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -11939,7 +12116,7 @@ EOF ;; esac -echo "$as_me:11942: checking for terminfo header" >&5 +echo "$as_me:12119: checking for terminfo header" >&5 echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6 if test "${cf_cv_term_header+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -11957,7 +12134,7 @@ esac for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do cat >"conftest.$ac_ext" <<_ACEOF -#line 11960 "configure" +#line 12137 "configure" #include "confdefs.h" #include #include <${cf_cv_ncurses_header:-curses.h}> @@ -11972,16 +12149,16 @@ int x = auto_left_margin; (void)x } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:11975: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12152: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11978: \$? = $ac_status" >&5 + echo "$as_me:12155: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:11981: \"$ac_try\"") >&5 + { (eval echo "$as_me:12158: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11984: \$? = $ac_status" >&5 + echo "$as_me:12161: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_term_header="$cf_test" @@ -11997,7 +12174,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:12000: result: $cf_cv_term_header" >&5 +echo "$as_me:12177: result: $cf_cv_term_header" >&5 echo "${ECHO_T}$cf_cv_term_header" >&6 # Set definitions to allow ifdef'ing to accommodate subdirectories @@ -12035,7 +12212,7 @@ cat >>confdefs.h <<\EOF #define NCURSES 1 EOF -echo "$as_me:12038: checking for ncurses version" >&5 +echo "$as_me:12215: checking for ncurses version" >&5 echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6 if test "${cf_cv_ncurses_version+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -12061,10 +12238,10 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo "$as_me:12064: \"$cf_try\"") >&5 + { (eval echo "$as_me:12241: \"$cf_try\"") >&5 (eval $cf_try) 2>&5 ac_status=$? - echo "$as_me:12067: \$? = $ac_status" >&5 + echo "$as_me:12244: \$? = $ac_status" >&5 (exit "$ac_status"); } if test -f conftest.out ; then cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out` @@ -12074,7 +12251,7 @@ EOF else cat >"conftest.$ac_ext" <<_ACEOF -#line 12077 "configure" +#line 12254 "configure" #include "confdefs.h" $ac_includes_default @@ -12094,22 +12271,22 @@ int main(void) # ifdef __NCURSES_H fprintf(fp, "old\\n"); # else - make an error + #error expected ncurses header to define __NCURSES_H # endif #endif ${cf_cv_main_return:-return}(0); } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:12104: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12281: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12107: \$? = $ac_status" >&5 + echo "$as_me:12284: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:12109: \"$ac_try\"") >&5 + { (eval echo "$as_me:12286: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12112: \$? = $ac_status" >&5 + echo "$as_me:12289: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_version=`cat $cf_tempfile` @@ -12123,7 +12300,7 @@ fi rm -f "$cf_tempfile" fi -echo "$as_me:12126: result: $cf_cv_ncurses_version" >&5 +echo "$as_me:12303: result: $cf_cv_ncurses_version" >&5 echo "${ECHO_T}$cf_cv_ncurses_version" >&6 test "$cf_cv_ncurses_version" = no || cat >>confdefs.h <<\EOF @@ -12136,7 +12313,7 @@ cf_nculib_root=$cf_cv_screen # to link gpm. cf_ncurses_LIBS="" cf_ncurses_SAVE="$LIBS" -echo "$as_me:12139: checking for Gpm_Open in -lgpm" >&5 +echo "$as_me:12316: checking for Gpm_Open in -lgpm" >&5 echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6 if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -12144,7 +12321,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 12147 "configure" +#line 12324 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -12153,7 +12330,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char Gpm_Open (); +char Gpm_Open (void); int main (void) { @@ -12163,16 +12340,16 @@ Gpm_Open (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:12166: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12343: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12169: \$? = $ac_status" >&5 + echo "$as_me:12346: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:12172: \"$ac_try\"") >&5 + { (eval echo "$as_me:12349: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12175: \$? = $ac_status" >&5 + echo "$as_me:12352: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_gpm_Gpm_Open=yes else @@ -12183,10 +12360,10 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:12186: result: $ac_cv_lib_gpm_Gpm_Open" >&5 +echo "$as_me:12363: result: $ac_cv_lib_gpm_Gpm_Open" >&5 echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6 if test "$ac_cv_lib_gpm_Gpm_Open" = yes; then - echo "$as_me:12189: checking for initscr in -lgpm" >&5 + echo "$as_me:12366: checking for initscr in -lgpm" >&5 echo $ECHO_N "checking for initscr in -lgpm... $ECHO_C" >&6 if test "${ac_cv_lib_gpm_initscr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -12194,7 +12371,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 12197 "configure" +#line 12374 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -12203,7 +12380,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char initscr (); +char initscr (void); int main (void) { @@ -12213,16 +12390,16 @@ initscr (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:12216: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12393: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12219: \$? = $ac_status" >&5 + echo "$as_me:12396: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:12222: \"$ac_try\"") >&5 + { (eval echo "$as_me:12399: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12225: \$? = $ac_status" >&5 + echo "$as_me:12402: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_gpm_initscr=yes else @@ -12233,7 +12410,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:12236: result: $ac_cv_lib_gpm_initscr" >&5 +echo "$as_me:12413: result: $ac_cv_lib_gpm_initscr" >&5 echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6 if test "$ac_cv_lib_gpm_initscr" = yes; then LIBS="$cf_ncurses_SAVE" @@ -12248,7 +12425,7 @@ case "$host_os" in # This is only necessary if you are linking against an obsolete # version of ncurses (but it should do no harm, since it is static). if test "$cf_nculib_root" = ncurses ; then - echo "$as_me:12251: checking for tgoto in -lmytinfo" >&5 + echo "$as_me:12428: checking for tgoto in -lmytinfo" >&5 echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6 if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -12256,7 +12433,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lmytinfo $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 12259 "configure" +#line 12436 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -12265,7 +12442,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char tgoto (); +char tgoto (void); int main (void) { @@ -12275,16 +12452,16 @@ tgoto (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:12278: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12455: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12281: \$? = $ac_status" >&5 + echo "$as_me:12458: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:12284: \"$ac_try\"") >&5 + { (eval echo "$as_me:12461: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12287: \$? = $ac_status" >&5 + echo "$as_me:12464: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_mytinfo_tgoto=yes else @@ -12295,7 +12472,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:12298: result: $ac_cv_lib_mytinfo_tgoto" >&5 +echo "$as_me:12475: result: $ac_cv_lib_mytinfo_tgoto" >&5 echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6 if test "$ac_cv_lib_mytinfo_tgoto" = yes; then cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS" @@ -12344,13 +12521,13 @@ else eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no' cf_libdir="" - echo "$as_me:12347: checking for initscr" >&5 + echo "$as_me:12524: checking for initscr" >&5 echo $ECHO_N "checking for initscr... $ECHO_C" >&6 if test "${ac_cv_func_initscr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 12353 "configure" +#line 12530 "configure" #include "confdefs.h" #define initscr autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -12381,16 +12558,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:12384: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12561: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12387: \$? = $ac_status" >&5 + echo "$as_me:12564: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:12390: \"$ac_try\"") >&5 + { (eval echo "$as_me:12567: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12393: \$? = $ac_status" >&5 + echo "$as_me:12570: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_initscr=yes else @@ -12400,18 +12577,18 @@ ac_cv_func_initscr=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:12403: result: $ac_cv_func_initscr" >&5 +echo "$as_me:12580: result: $ac_cv_func_initscr" >&5 echo "${ECHO_T}$ac_cv_func_initscr" >&6 if test "$ac_cv_func_initscr" = yes; then eval 'cf_cv_have_lib_'"$cf_nculib_root"'=yes' else cf_save_LIBS="$LIBS" - echo "$as_me:12410: checking for initscr in -l$cf_nculib_root" >&5 + echo "$as_me:12587: checking for initscr in -l$cf_nculib_root" >&5 echo $ECHO_N "checking for initscr in -l$cf_nculib_root... $ECHO_C" >&6 LIBS="-l$cf_nculib_root $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 12414 "configure" +#line 12591 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -12423,25 +12600,25 @@ initscr() } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:12426: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12603: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12429: \$? = $ac_status" >&5 + echo "$as_me:12606: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:12432: \"$ac_try\"") >&5 + { (eval echo "$as_me:12609: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12435: \$? = $ac_status" >&5 + echo "$as_me:12612: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - echo "$as_me:12437: result: yes" >&5 + echo "$as_me:12614: result: yes" >&5 echo "${ECHO_T}yes" >&6 eval 'cf_cv_have_lib_'"$cf_nculib_root"'=yes' else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 -echo "$as_me:12444: result: no" >&5 +echo "$as_me:12621: result: no" >&5 echo "${ECHO_T}no" >&6 cf_search= @@ -12509,11 +12686,11 @@ cf_search="$cf_library_path_list $cf_search" for cf_libdir in $cf_search do - echo "$as_me:12512: checking for -l$cf_nculib_root in $cf_libdir" >&5 + echo "$as_me:12689: checking for -l$cf_nculib_root in $cf_libdir" >&5 echo $ECHO_N "checking for -l$cf_nculib_root in $cf_libdir... $ECHO_C" >&6 LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 12516 "configure" +#line 12693 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -12525,25 +12702,25 @@ initscr() } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:12528: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12705: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12531: \$? = $ac_status" >&5 + echo "$as_me:12708: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:12534: \"$ac_try\"") >&5 + { (eval echo "$as_me:12711: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12537: \$? = $ac_status" >&5 + echo "$as_me:12714: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - echo "$as_me:12539: result: yes" >&5 + echo "$as_me:12716: result: yes" >&5 echo "${ECHO_T}yes" >&6 eval 'cf_cv_have_lib_'"$cf_nculib_root"'=yes' break else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 -echo "$as_me:12546: result: no" >&5 +echo "$as_me:12723: result: no" >&5 echo "${ECHO_T}no" >&6 LIBS="$cf_save_LIBS" fi @@ -12558,7 +12735,7 @@ fi eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\" if test "$cf_found_library" = no ; then - { { echo "$as_me:12561: error: Cannot link $cf_nculib_root library" >&5 + { { echo "$as_me:12738: error: Cannot link $cf_nculib_root library" >&5 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;} { (exit 1); exit 1; }; } fi @@ -12566,7 +12743,7 @@ fi fi if test -n "$cf_ncurses_LIBS" ; then - echo "$as_me:12569: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 + echo "$as_me:12746: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS... $ECHO_C" >&6 cf_ncurses_SAVE="$LIBS" for p in $cf_ncurses_LIBS ; do @@ -12576,7 +12753,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS.. fi done cat >"conftest.$ac_ext" <<_ACEOF -#line 12579 "configure" +#line 12756 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -12588,23 +12765,23 @@ initscr(); mousemask(0,0); tigetstr((char *)0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:12591: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12768: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12594: \$? = $ac_status" >&5 + echo "$as_me:12771: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:12597: \"$ac_try\"") >&5 + { (eval echo "$as_me:12774: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12600: \$? = $ac_status" >&5 + echo "$as_me:12777: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - echo "$as_me:12602: result: yes" >&5 + echo "$as_me:12779: result: yes" >&5 echo "${ECHO_T}yes" >&6 else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 -echo "$as_me:12607: result: no" >&5 +echo "$as_me:12784: result: no" >&5 echo "${ECHO_T}no" >&6 LIBS="$cf_ncurses_SAVE" fi @@ -12623,8 +12800,8 @@ else fi ;; -(pdcurses) - echo "$as_me:12627: checking for X" >&5 +(pdcurses*) + echo "$as_me:12804: checking for X" >&5 echo $ECHO_N "checking for X... $ECHO_C" >&6 # Check whether --with-x or --without-x was given. @@ -12728,17 +12905,17 @@ if test "$ac_x_includes" = no; then # Guess where to find include files, by looking for Intrinsic.h. # First, try using that file with no special directory specified. cat >"conftest.$ac_ext" <<_ACEOF -#line 12731 "configure" +#line 12908 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:12735: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:12912: \"$ac_cpp "conftest.$ac_ext"\"") >&5 (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:12741: \$? = $ac_status" >&5 + echo "$as_me:12918: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -12771,7 +12948,7 @@ if test "$ac_x_libraries" = no; then ac_save_LIBS=$LIBS LIBS="-lXt $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 12774 "configure" +#line 12951 "configure" #include "confdefs.h" #include int @@ -12783,16 +12960,16 @@ XtMalloc (0) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:12786: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12963: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12789: \$? = $ac_status" >&5 + echo "$as_me:12966: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:12792: \"$ac_try\"") >&5 + { (eval echo "$as_me:12969: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12795: \$? = $ac_status" >&5 + echo "$as_me:12972: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then LIBS=$ac_save_LIBS # We can link X programs with no special library path. @@ -12830,7 +13007,7 @@ fi fi # $with_x != no if test "$have_x" != yes; then - echo "$as_me:12833: result: $have_x" >&5 + echo "$as_me:13010: result: $have_x" >&5 echo "${ECHO_T}$have_x" >&6 no_x=yes else @@ -12840,7 +13017,7 @@ else # Update the cache value to reflect the command line values. ac_cv_have_x="have_x=yes \ ac_x_includes=$x_includes ac_x_libraries=$x_libraries" - echo "$as_me:12843: result: libraries $x_libraries, headers $x_includes" >&5 + echo "$as_me:13020: result: libraries $x_libraries, headers $x_includes" >&5 echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6 fi @@ -12867,11 +13044,11 @@ else # others require no space. Words are not sufficient . . . . case `(uname -sr) 2>/dev/null` in "SunOS 5"*) - echo "$as_me:12870: checking whether -R must be followed by a space" >&5 + echo "$as_me:13047: checking whether -R must be followed by a space" >&5 echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6 ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries" cat >"conftest.$ac_ext" <<_ACEOF -#line 12874 "configure" +#line 13051 "configure" #include "confdefs.h" int @@ -12883,16 +13060,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:12886: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13063: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12889: \$? = $ac_status" >&5 + echo "$as_me:13066: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:12892: \"$ac_try\"") >&5 + { (eval echo "$as_me:13069: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12895: \$? = $ac_status" >&5 + echo "$as_me:13072: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_R_nospace=yes else @@ -12902,13 +13079,13 @@ ac_R_nospace=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" if test $ac_R_nospace = yes; then - echo "$as_me:12905: result: no" >&5 + echo "$as_me:13082: result: no" >&5 echo "${ECHO_T}no" >&6 X_LIBS="$X_LIBS -R$x_libraries" else LIBS="$ac_xsave_LIBS -R $x_libraries" cat >"conftest.$ac_ext" <<_ACEOF -#line 12911 "configure" +#line 13088 "configure" #include "confdefs.h" int @@ -12920,16 +13097,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:12923: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13100: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12926: \$? = $ac_status" >&5 + echo "$as_me:13103: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:12929: \"$ac_try\"") >&5 + { (eval echo "$as_me:13106: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12932: \$? = $ac_status" >&5 + echo "$as_me:13109: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_R_space=yes else @@ -12939,11 +13116,11 @@ ac_R_space=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" if test $ac_R_space = yes; then - echo "$as_me:12942: result: yes" >&5 + echo "$as_me:13119: result: yes" >&5 echo "${ECHO_T}yes" >&6 X_LIBS="$X_LIBS -R $x_libraries" else - echo "$as_me:12946: result: neither works" >&5 + echo "$as_me:13123: result: neither works" >&5 echo "${ECHO_T}neither works" >&6 fi fi @@ -12963,7 +13140,7 @@ echo "${ECHO_T}neither works" >&6 # the Alpha needs dnet_stub (dnet does not exist). ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11" cat >"conftest.$ac_ext" <<_ACEOF -#line 12966 "configure" +#line 13143 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -12972,7 +13149,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char XOpenDisplay (); +char XOpenDisplay (void); int main (void) { @@ -12982,22 +13159,22 @@ XOpenDisplay (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:12985: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13162: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12988: \$? = $ac_status" >&5 + echo "$as_me:13165: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:12991: \"$ac_try\"") >&5 + { (eval echo "$as_me:13168: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12994: \$? = $ac_status" >&5 + echo "$as_me:13171: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 -echo "$as_me:13000: checking for dnet_ntoa in -ldnet" >&5 +echo "$as_me:13177: checking for dnet_ntoa in -ldnet" >&5 echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6 if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -13005,7 +13182,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldnet $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 13008 "configure" +#line 13185 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -13014,7 +13191,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char dnet_ntoa (); +char dnet_ntoa (void); int main (void) { @@ -13024,16 +13201,16 @@ dnet_ntoa (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:13027: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13204: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13030: \$? = $ac_status" >&5 + echo "$as_me:13207: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:13033: \"$ac_try\"") >&5 + { (eval echo "$as_me:13210: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13036: \$? = $ac_status" >&5 + echo "$as_me:13213: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_dnet_dnet_ntoa=yes else @@ -13044,14 +13221,14 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:13047: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 +echo "$as_me:13224: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6 if test "$ac_cv_lib_dnet_dnet_ntoa" = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" fi if test $ac_cv_lib_dnet_dnet_ntoa = no; then - echo "$as_me:13054: checking for dnet_ntoa in -ldnet_stub" >&5 + echo "$as_me:13231: checking for dnet_ntoa in -ldnet_stub" >&5 echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6 if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -13059,7 +13236,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldnet_stub $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 13062 "configure" +#line 13239 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -13068,7 +13245,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char dnet_ntoa (); +char dnet_ntoa (void); int main (void) { @@ -13078,16 +13255,16 @@ dnet_ntoa (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:13081: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13258: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13084: \$? = $ac_status" >&5 + echo "$as_me:13261: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:13087: \"$ac_try\"") >&5 + { (eval echo "$as_me:13264: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13090: \$? = $ac_status" >&5 + echo "$as_me:13267: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_dnet_stub_dnet_ntoa=yes else @@ -13098,7 +13275,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:13101: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 +echo "$as_me:13278: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6 if test "$ac_cv_lib_dnet_stub_dnet_ntoa" = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" @@ -13117,13 +13294,13 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" # on Irix 5.2, according to T.E. Dickey. # The functions gethostbyname, getservbyname, and inet_addr are # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking. - echo "$as_me:13120: checking for gethostbyname" >&5 + echo "$as_me:13297: checking for gethostbyname" >&5 echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6 if test "${ac_cv_func_gethostbyname+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 13126 "configure" +#line 13303 "configure" #include "confdefs.h" #define gethostbyname autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -13154,16 +13331,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:13157: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13334: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13160: \$? = $ac_status" >&5 + echo "$as_me:13337: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:13163: \"$ac_try\"") >&5 + { (eval echo "$as_me:13340: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13166: \$? = $ac_status" >&5 + echo "$as_me:13343: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_gethostbyname=yes else @@ -13173,11 +13350,11 @@ ac_cv_func_gethostbyname=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:13176: result: $ac_cv_func_gethostbyname" >&5 +echo "$as_me:13353: result: $ac_cv_func_gethostbyname" >&5 echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6 if test $ac_cv_func_gethostbyname = no; then - echo "$as_me:13180: checking for gethostbyname in -lnsl" >&5 + echo "$as_me:13357: checking for gethostbyname in -lnsl" >&5 echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6 if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -13185,7 +13362,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lnsl $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 13188 "configure" +#line 13365 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -13194,7 +13371,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char gethostbyname (); +char gethostbyname (void); int main (void) { @@ -13204,16 +13381,16 @@ gethostbyname (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:13207: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13384: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13210: \$? = $ac_status" >&5 + echo "$as_me:13387: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:13213: \"$ac_try\"") >&5 + { (eval echo "$as_me:13390: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13216: \$? = $ac_status" >&5 + echo "$as_me:13393: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_nsl_gethostbyname=yes else @@ -13224,14 +13401,14 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:13227: result: $ac_cv_lib_nsl_gethostbyname" >&5 +echo "$as_me:13404: result: $ac_cv_lib_nsl_gethostbyname" >&5 echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6 if test "$ac_cv_lib_nsl_gethostbyname" = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" fi if test $ac_cv_lib_nsl_gethostbyname = no; then - echo "$as_me:13234: checking for gethostbyname in -lbsd" >&5 + echo "$as_me:13411: checking for gethostbyname in -lbsd" >&5 echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6 if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -13239,7 +13416,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lbsd $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 13242 "configure" +#line 13419 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -13248,7 +13425,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char gethostbyname (); +char gethostbyname (void); int main (void) { @@ -13258,16 +13435,16 @@ gethostbyname (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:13261: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13438: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13264: \$? = $ac_status" >&5 + echo "$as_me:13441: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:13267: \"$ac_try\"") >&5 + { (eval echo "$as_me:13444: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13270: \$? = $ac_status" >&5 + echo "$as_me:13447: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_bsd_gethostbyname=yes else @@ -13278,7 +13455,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:13281: result: $ac_cv_lib_bsd_gethostbyname" >&5 +echo "$as_me:13458: result: $ac_cv_lib_bsd_gethostbyname" >&5 echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6 if test "$ac_cv_lib_bsd_gethostbyname" = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd" @@ -13294,13 +13471,13 @@ fi # variants that don't use the nameserver (or something). -lsocket # must be given before -lnsl if both are needed. We assume that # if connect needs -lnsl, so does gethostbyname. - echo "$as_me:13297: checking for connect" >&5 + echo "$as_me:13474: checking for connect" >&5 echo $ECHO_N "checking for connect... $ECHO_C" >&6 if test "${ac_cv_func_connect+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 13303 "configure" +#line 13480 "configure" #include "confdefs.h" #define connect autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -13331,16 +13508,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:13334: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13511: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13337: \$? = $ac_status" >&5 + echo "$as_me:13514: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:13340: \"$ac_try\"") >&5 + { (eval echo "$as_me:13517: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13343: \$? = $ac_status" >&5 + echo "$as_me:13520: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_connect=yes else @@ -13350,11 +13527,11 @@ ac_cv_func_connect=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:13353: result: $ac_cv_func_connect" >&5 +echo "$as_me:13530: result: $ac_cv_func_connect" >&5 echo "${ECHO_T}$ac_cv_func_connect" >&6 if test $ac_cv_func_connect = no; then - echo "$as_me:13357: checking for connect in -lsocket" >&5 + echo "$as_me:13534: checking for connect in -lsocket" >&5 echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6 if test "${ac_cv_lib_socket_connect+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -13362,7 +13539,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lsocket $X_EXTRA_LIBS $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 13365 "configure" +#line 13542 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -13371,7 +13548,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char connect (); +char connect (void); int main (void) { @@ -13381,16 +13558,16 @@ connect (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:13384: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13561: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13387: \$? = $ac_status" >&5 + echo "$as_me:13564: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:13390: \"$ac_try\"") >&5 + { (eval echo "$as_me:13567: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13393: \$? = $ac_status" >&5 + echo "$as_me:13570: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_socket_connect=yes else @@ -13401,7 +13578,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:13404: result: $ac_cv_lib_socket_connect" >&5 +echo "$as_me:13581: result: $ac_cv_lib_socket_connect" >&5 echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6 if test "$ac_cv_lib_socket_connect" = yes; then X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" @@ -13410,13 +13587,13 @@ fi fi # Guillermo Gomez says -lposix is necessary on A/UX. - echo "$as_me:13413: checking for remove" >&5 + echo "$as_me:13590: checking for remove" >&5 echo $ECHO_N "checking for remove... $ECHO_C" >&6 if test "${ac_cv_func_remove+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 13419 "configure" +#line 13596 "configure" #include "confdefs.h" #define remove autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -13447,16 +13624,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:13450: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13627: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13453: \$? = $ac_status" >&5 + echo "$as_me:13630: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:13456: \"$ac_try\"") >&5 + { (eval echo "$as_me:13633: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13459: \$? = $ac_status" >&5 + echo "$as_me:13636: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_remove=yes else @@ -13466,11 +13643,11 @@ ac_cv_func_remove=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:13469: result: $ac_cv_func_remove" >&5 +echo "$as_me:13646: result: $ac_cv_func_remove" >&5 echo "${ECHO_T}$ac_cv_func_remove" >&6 if test $ac_cv_func_remove = no; then - echo "$as_me:13473: checking for remove in -lposix" >&5 + echo "$as_me:13650: checking for remove in -lposix" >&5 echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6 if test "${ac_cv_lib_posix_remove+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -13478,7 +13655,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lposix $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 13481 "configure" +#line 13658 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -13487,7 +13664,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char remove (); +char remove (void); int main (void) { @@ -13497,16 +13674,16 @@ remove (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:13500: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13677: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13503: \$? = $ac_status" >&5 + echo "$as_me:13680: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:13506: \"$ac_try\"") >&5 + { (eval echo "$as_me:13683: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13509: \$? = $ac_status" >&5 + echo "$as_me:13686: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_posix_remove=yes else @@ -13517,7 +13694,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:13520: result: $ac_cv_lib_posix_remove" >&5 +echo "$as_me:13697: result: $ac_cv_lib_posix_remove" >&5 echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6 if test "$ac_cv_lib_posix_remove" = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" @@ -13526,13 +13703,13 @@ fi fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. - echo "$as_me:13529: checking for shmat" >&5 + echo "$as_me:13706: checking for shmat" >&5 echo $ECHO_N "checking for shmat... $ECHO_C" >&6 if test "${ac_cv_func_shmat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 13535 "configure" +#line 13712 "configure" #include "confdefs.h" #define shmat autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -13563,16 +13740,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:13566: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13743: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13569: \$? = $ac_status" >&5 + echo "$as_me:13746: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:13572: \"$ac_try\"") >&5 + { (eval echo "$as_me:13749: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13575: \$? = $ac_status" >&5 + echo "$as_me:13752: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_shmat=yes else @@ -13582,11 +13759,11 @@ ac_cv_func_shmat=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:13585: result: $ac_cv_func_shmat" >&5 +echo "$as_me:13762: result: $ac_cv_func_shmat" >&5 echo "${ECHO_T}$ac_cv_func_shmat" >&6 if test $ac_cv_func_shmat = no; then - echo "$as_me:13589: checking for shmat in -lipc" >&5 + echo "$as_me:13766: checking for shmat in -lipc" >&5 echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6 if test "${ac_cv_lib_ipc_shmat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -13594,7 +13771,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lipc $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 13597 "configure" +#line 13774 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -13603,7 +13780,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char shmat (); +char shmat (void); int main (void) { @@ -13613,16 +13790,16 @@ shmat (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:13616: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13793: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13619: \$? = $ac_status" >&5 + echo "$as_me:13796: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:13622: \"$ac_try\"") >&5 + { (eval echo "$as_me:13799: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13625: \$? = $ac_status" >&5 + echo "$as_me:13802: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_ipc_shmat=yes else @@ -13633,7 +13810,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:13636: result: $ac_cv_lib_ipc_shmat" >&5 +echo "$as_me:13813: result: $ac_cv_lib_ipc_shmat" >&5 echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6 if test "$ac_cv_lib_ipc_shmat" = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" @@ -13651,7 +13828,7 @@ fi # These have to be linked with before -lX11, unlike the other # libraries we check for below, so use a different variable. # John Interrante, Karl Berry - echo "$as_me:13654: checking for IceConnectionNumber in -lICE" >&5 + echo "$as_me:13831: checking for IceConnectionNumber in -lICE" >&5 echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6 if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -13659,7 +13836,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lICE $X_EXTRA_LIBS $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 13662 "configure" +#line 13839 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -13668,7 +13845,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char IceConnectionNumber (); +char IceConnectionNumber (void); int main (void) { @@ -13678,16 +13855,16 @@ IceConnectionNumber (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:13681: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13858: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13684: \$? = $ac_status" >&5 + echo "$as_me:13861: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:13687: \"$ac_try\"") >&5 + { (eval echo "$as_me:13864: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13690: \$? = $ac_status" >&5 + echo "$as_me:13867: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_ICE_IceConnectionNumber=yes else @@ -13698,7 +13875,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:13701: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 +echo "$as_me:13878: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6 if test "$ac_cv_lib_ICE_IceConnectionNumber" = yes; then X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" @@ -13710,7 +13887,7 @@ fi cf_x_athena=${cf_x_athena:-Xaw} -echo "$as_me:13713: checking if you want to link with Xaw 3d library" >&5 +echo "$as_me:13890: checking if you want to link with Xaw 3d library" >&5 echo $ECHO_N "checking if you want to link with Xaw 3d library... $ECHO_C" >&6 withval= @@ -13721,14 +13898,14 @@ if test "${with_Xaw3d+set}" = set; then fi; if test "$withval" = yes ; then cf_x_athena=Xaw3d - echo "$as_me:13724: result: yes" >&5 + echo "$as_me:13901: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:13727: result: no" >&5 + echo "$as_me:13904: result: no" >&5 echo "${ECHO_T}no" >&6 fi -echo "$as_me:13731: checking if you want to link with Xaw 3d xft library" >&5 +echo "$as_me:13908: checking if you want to link with Xaw 3d xft library" >&5 echo $ECHO_N "checking if you want to link with Xaw 3d xft library... $ECHO_C" >&6 withval= @@ -13739,14 +13916,14 @@ if test "${with_Xaw3dxft+set}" = set; then fi; if test "$withval" = yes ; then cf_x_athena=Xaw3dxft - echo "$as_me:13742: result: yes" >&5 + echo "$as_me:13919: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:13745: result: no" >&5 + echo "$as_me:13922: result: no" >&5 echo "${ECHO_T}no" >&6 fi -echo "$as_me:13749: checking if you want to link with neXT Athena library" >&5 +echo "$as_me:13926: checking if you want to link with neXT Athena library" >&5 echo $ECHO_N "checking if you want to link with neXT Athena library... $ECHO_C" >&6 withval= @@ -13757,14 +13934,14 @@ if test "${with_neXtaw+set}" = set; then fi; if test "$withval" = yes ; then cf_x_athena=neXtaw - echo "$as_me:13760: result: yes" >&5 + echo "$as_me:13937: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:13763: result: no" >&5 + echo "$as_me:13940: result: no" >&5 echo "${ECHO_T}no" >&6 fi -echo "$as_me:13767: checking if you want to link with Athena-Plus library" >&5 +echo "$as_me:13944: checking if you want to link with Athena-Plus library" >&5 echo $ECHO_N "checking if you want to link with Athena-Plus library... $ECHO_C" >&6 withval= @@ -13775,10 +13952,10 @@ if test "${with_XawPlus+set}" = set; then fi; if test "$withval" = yes ; then cf_x_athena=XawPlus - echo "$as_me:13778: result: yes" >&5 + echo "$as_me:13955: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:13781: result: no" >&5 + echo "$as_me:13958: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -13798,17 +13975,31 @@ if test "$PKG_CONFIG" != none ; then if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "$cf_athena_pkg"; then test -n "$verbose" && echo " found package $cf_athena_pkg" 1>&6 -echo "${as_me:-configure}:13801: testing found package $cf_athena_pkg ..." 1>&5 +echo "${as_me:-configure}:13978: testing found package $cf_athena_pkg ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags "$cf_athena_pkg" 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs "$cf_athena_pkg" 2>/dev/null`" test -n "$verbose" && echo " package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:13807: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:13984: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package $cf_athena_pkg LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:13811: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:13988: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5 + +for cf_required in $cf_athena_pkg +do + # check for duplicates + for cf_require_pkg in $REQUIRE_PKG + do + if test "$cf_required" = "$cf_require_pkg" + then + cf_required= + break + fi + done + test -n "$cf_required" && REQUIRE_PKG="$REQUIRE_PKG $cf_required" +done cf_fix_cppflags=no cf_new_cflags= @@ -13939,20 +14130,20 @@ EOF LIBS=`echo "$LIBS " | sed -e 's/ / /g' -e 's%-l'"$cf_trim_lib"' %%' -e 's/ $//'` test -n "$verbose" && echo " ..trimmed $LIBS" 1>&6 -echo "${as_me:-configure}:13942: testing ..trimmed $LIBS ..." 1>&5 +echo "${as_me:-configure}:14133: testing ..trimmed $LIBS ..." 1>&5 ;; esac done -echo "$as_me:13948: checking for usable $cf_x_athena/Xmu package" >&5 +echo "$as_me:14139: checking for usable $cf_x_athena/Xmu package" >&5 echo $ECHO_N "checking for usable $cf_x_athena/Xmu package... $ECHO_C" >&6 if test "${cf_cv_xaw_compat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 13955 "configure" +#line 14146 "configure" #include "confdefs.h" $ac_includes_default @@ -13970,16 +14161,16 @@ int check = XmuCompareISOLatin1("big", "small"); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:13973: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14164: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13976: \$? = $ac_status" >&5 + echo "$as_me:14167: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:13979: \"$ac_try\"") >&5 + { (eval echo "$as_me:14170: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13982: \$? = $ac_status" >&5 + echo "$as_me:14173: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_xaw_compat=yes else @@ -13989,7 +14180,7 @@ cf_cv_xaw_compat=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:13992: result: $cf_cv_xaw_compat" >&5 +echo "$as_me:14183: result: $cf_cv_xaw_compat" >&5 echo "${ECHO_T}$cf_cv_xaw_compat" >&6 if test "$cf_cv_xaw_compat" = no @@ -14001,7 +14192,7 @@ echo "${ECHO_T}$cf_cv_xaw_compat" >&6 (*) test -n "$verbose" && echo " work around broken package" 1>&6 -echo "${as_me:-configure}:14004: testing work around broken package ..." 1>&5 +echo "${as_me:-configure}:14195: testing work around broken package ..." 1>&5 cf_save_xmu="$LIBS" cf_first_lib=`echo "$cf_save_xmu" | sed -e 's/^ *//' -e 's/ .*//'` @@ -14009,17 +14200,31 @@ echo "${as_me:-configure}:14004: testing work around broken package ..." 1>&5 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "xmu"; then test -n "$verbose" && echo " found package xmu" 1>&6 -echo "${as_me:-configure}:14012: testing found package xmu ..." 1>&5 +echo "${as_me:-configure}:14203: testing found package xmu ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags "xmu" 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs "xmu" 2>/dev/null`" test -n "$verbose" && echo " package xmu CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:14018: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:14209: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package xmu LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:14022: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:14213: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5 + +for cf_required in xmu +do + # check for duplicates + for cf_require_pkg in $REQUIRE_PKG + do + if test "$cf_required" = "$cf_require_pkg" + then + cf_required= + break + fi + done + test -n "$cf_required" && REQUIRE_PKG="$REQUIRE_PKG $cf_required" +done cf_fix_cppflags=no cf_new_cflags= @@ -14139,12 +14344,12 @@ LIBS="$cf_add_libs" test -n "$verbose" && echo " ...before $LIBS" 1>&6 -echo "${as_me:-configure}:14142: testing ...before $LIBS ..." 1>&5 +echo "${as_me:-configure}:14347: testing ...before $LIBS ..." 1>&5 LIBS=`echo "$LIBS" | sed -e "s/[ ][ ]*/ /g" -e "s%$cf_first_lib %$cf_first_lib $cf_pkgconfig_libs %" -e 's% % %g'` test -n "$verbose" && echo " ...after $LIBS" 1>&6 -echo "${as_me:-configure}:14147: testing ...after $LIBS ..." 1>&5 +echo "${as_me:-configure}:14352: testing ...after $LIBS ..." 1>&5 else cf_pkgconfig_incs= @@ -14152,12 +14357,12 @@ else test -n "$verbose" && echo " ...before $LIBS" 1>&6 -echo "${as_me:-configure}:14155: testing ...before $LIBS ..." 1>&5 +echo "${as_me:-configure}:14360: testing ...before $LIBS ..." 1>&5 LIBS=`echo "$LIBS" | sed -e "s/[ ][ ]*/ /g" -e "s%$cf_first_lib %$cf_first_lib -lXmu %" -e 's% % %g'` test -n "$verbose" && echo " ...after $LIBS" 1>&6 -echo "${as_me:-configure}:14160: testing ...after $LIBS ..." 1>&5 +echo "${as_me:-configure}:14365: testing ...after $LIBS ..." 1>&5 fi @@ -14168,7 +14373,7 @@ fi LIBS=`echo "$LIBS " | sed -e 's/ / /g' -e 's%-l'"$cf_trim_lib"' %%' -e 's/ $//'` test -n "$verbose" && echo " ..trimmed $LIBS" 1>&6 -echo "${as_me:-configure}:14171: testing ..trimmed $LIBS ..." 1>&5 +echo "${as_me:-configure}:14376: testing ..trimmed $LIBS ..." 1>&5 ;; esac @@ -14193,17 +14398,31 @@ if test -z "$cf_x_athena_lib" ; then if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "Xext"; then test -n "$verbose" && echo " found package Xext" 1>&6 -echo "${as_me:-configure}:14196: testing found package Xext ..." 1>&5 +echo "${as_me:-configure}:14401: testing found package Xext ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags "Xext" 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs "Xext" 2>/dev/null`" test -n "$verbose" && echo " package Xext CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:14202: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:14407: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package Xext LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:14206: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:14411: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5 + +for cf_required in Xext +do + # check for duplicates + for cf_require_pkg in $REQUIRE_PKG + do + if test "$cf_required" = "$cf_require_pkg" + then + cf_required= + break + fi + done + test -n "$cf_required" && REQUIRE_PKG="$REQUIRE_PKG $cf_required" +done cf_fix_cppflags=no cf_new_cflags= @@ -14324,7 +14543,7 @@ else cf_pkgconfig_incs= cf_pkgconfig_libs= - echo "$as_me:14327: checking for XextCreateExtension in -lXext" >&5 + echo "$as_me:14546: checking for XextCreateExtension in -lXext" >&5 echo $ECHO_N "checking for XextCreateExtension in -lXext... $ECHO_C" >&6 if test "${ac_cv_lib_Xext_XextCreateExtension+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -14332,7 +14551,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lXext $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 14335 "configure" +#line 14554 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -14341,7 +14560,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char XextCreateExtension (); +char XextCreateExtension (void); int main (void) { @@ -14351,16 +14570,16 @@ XextCreateExtension (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:14354: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14573: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14357: \$? = $ac_status" >&5 + echo "$as_me:14576: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:14360: \"$ac_try\"") >&5 + { (eval echo "$as_me:14579: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14363: \$? = $ac_status" >&5 + echo "$as_me:14582: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_Xext_XextCreateExtension=yes else @@ -14371,7 +14590,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:14374: result: $ac_cv_lib_Xext_XextCreateExtension" >&5 +echo "$as_me:14593: result: $ac_cv_lib_Xext_XextCreateExtension" >&5 echo "${ECHO_T}$ac_cv_lib_Xext_XextCreateExtension" >&6 if test "$ac_cv_lib_Xext_XextCreateExtension" = yes; then @@ -14407,17 +14626,31 @@ then if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "x11"; then test -n "$verbose" && echo " found package x11" 1>&6 -echo "${as_me:-configure}:14410: testing found package x11 ..." 1>&5 +echo "${as_me:-configure}:14629: testing found package x11 ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags "x11" 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs "x11" 2>/dev/null`" test -n "$verbose" && echo " package x11 CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:14416: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:14635: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package x11 LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:14420: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:14639: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5 + +for cf_required in x11 +do + # check for duplicates + for cf_require_pkg in $REQUIRE_PKG + do + if test "$cf_required" = "$cf_require_pkg" + then + cf_required= + break + fi + done + test -n "$cf_required" && REQUIRE_PKG="$REQUIRE_PKG $cf_required" +done cf_fix_cppflags=no cf_new_cflags= @@ -14537,24 +14770,38 @@ LIBS="$cf_add_libs" else cf_pkgconfig_incs= cf_pkgconfig_libs= - { echo "$as_me:14540: WARNING: unable to find X11 library" >&5 + { echo "$as_me:14773: WARNING: unable to find X11 library" >&5 echo "$as_me: WARNING: unable to find X11 library" >&2;} fi if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "ice"; then test -n "$verbose" && echo " found package ice" 1>&6 -echo "${as_me:-configure}:14547: testing found package ice ..." 1>&5 +echo "${as_me:-configure}:14780: testing found package ice ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags "ice" 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs "ice" 2>/dev/null`" test -n "$verbose" && echo " package ice CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:14553: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:14786: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package ice LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:14557: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:14790: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5 + +for cf_required in ice +do + # check for duplicates + for cf_require_pkg in $REQUIRE_PKG + do + if test "$cf_required" = "$cf_require_pkg" + then + cf_required= + break + fi + done + test -n "$cf_required" && REQUIRE_PKG="$REQUIRE_PKG $cf_required" +done cf_fix_cppflags=no cf_new_cflags= @@ -14674,24 +14921,38 @@ LIBS="$cf_add_libs" else cf_pkgconfig_incs= cf_pkgconfig_libs= - { echo "$as_me:14677: WARNING: unable to find ICE library" >&5 + { echo "$as_me:14924: WARNING: unable to find ICE library" >&5 echo "$as_me: WARNING: unable to find ICE library" >&2;} fi if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "sm"; then test -n "$verbose" && echo " found package sm" 1>&6 -echo "${as_me:-configure}:14684: testing found package sm ..." 1>&5 +echo "${as_me:-configure}:14931: testing found package sm ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags "sm" 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs "sm" 2>/dev/null`" test -n "$verbose" && echo " package sm CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:14690: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:14937: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package sm LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:14694: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:14941: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5 + +for cf_required in sm +do + # check for duplicates + for cf_require_pkg in $REQUIRE_PKG + do + if test "$cf_required" = "$cf_require_pkg" + then + cf_required= + break + fi + done + test -n "$cf_required" && REQUIRE_PKG="$REQUIRE_PKG $cf_required" +done cf_fix_cppflags=no cf_new_cflags= @@ -14811,24 +15072,38 @@ LIBS="$cf_add_libs" else cf_pkgconfig_incs= cf_pkgconfig_libs= - { echo "$as_me:14814: WARNING: unable to find SM library" >&5 + { echo "$as_me:15075: WARNING: unable to find SM library" >&5 echo "$as_me: WARNING: unable to find SM library" >&2;} fi if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "xt"; then test -n "$verbose" && echo " found package xt" 1>&6 -echo "${as_me:-configure}:14821: testing found package xt ..." 1>&5 +echo "${as_me:-configure}:15082: testing found package xt ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags "xt" 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs "xt" 2>/dev/null`" test -n "$verbose" && echo " package xt CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:14827: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:15088: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package xt LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:14831: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:15092: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5 + +for cf_required in xt +do + # check for duplicates + for cf_require_pkg in $REQUIRE_PKG + do + if test "$cf_required" = "$cf_require_pkg" + then + cf_required= + break + fi + done + test -n "$cf_required" && REQUIRE_PKG="$REQUIRE_PKG $cf_required" +done cf_fix_cppflags=no cf_new_cflags= @@ -14948,7 +15223,7 @@ LIBS="$cf_add_libs" else cf_pkgconfig_incs= cf_pkgconfig_libs= - { echo "$as_me:14951: WARNING: unable to find Xt library" >&5 + { echo "$as_me:15226: WARNING: unable to find Xt library" >&5 echo "$as_me: WARNING: unable to find Xt library" >&2;} fi @@ -14961,17 +15236,31 @@ cf_have_X_LIBS=no if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "xt"; then test -n "$verbose" && echo " found package xt" 1>&6 -echo "${as_me:-configure}:14964: testing found package xt ..." 1>&5 +echo "${as_me:-configure}:15239: testing found package xt ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags "xt" 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs "xt" 2>/dev/null`" test -n "$verbose" && echo " package xt CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:14970: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:15245: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package xt LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:14974: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:15249: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5 + +for cf_required in xt +do + # check for duplicates + for cf_require_pkg in $REQUIRE_PKG + do + if test "$cf_required" = "$cf_require_pkg" + then + cf_required= + break + fi + done + test -n "$cf_required" && REQUIRE_PKG="$REQUIRE_PKG $cf_required" +done cf_fix_cppflags=no cf_new_cflags= @@ -15092,14 +15381,14 @@ LIBS="$cf_add_libs" ;; (*) # we have an "xt" package, but it may omit Xt's dependency on X11 -echo "$as_me:15095: checking for usable X dependency" >&5 +echo "$as_me:15384: checking for usable X dependency" >&5 echo $ECHO_N "checking for usable X dependency... $ECHO_C" >&6 if test "${cf_cv_xt_x11_compat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 15102 "configure" +#line 15391 "configure" #include "confdefs.h" $ac_includes_default @@ -15119,16 +15408,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:15122: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15411: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15125: \$? = $ac_status" >&5 + echo "$as_me:15414: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:15128: \"$ac_try\"") >&5 + { (eval echo "$as_me:15417: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15131: \$? = $ac_status" >&5 + echo "$as_me:15420: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_xt_x11_compat=yes else @@ -15138,30 +15427,44 @@ cf_cv_xt_x11_compat=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:15141: result: $cf_cv_xt_x11_compat" >&5 +echo "$as_me:15430: result: $cf_cv_xt_x11_compat" >&5 echo "${ECHO_T}$cf_cv_xt_x11_compat" >&6 if test "$cf_cv_xt_x11_compat" = no then test -n "$verbose" && echo " work around broken X11 dependency" 1>&6 -echo "${as_me:-configure}:15147: testing work around broken X11 dependency ..." 1>&5 +echo "${as_me:-configure}:15436: testing work around broken X11 dependency ..." 1>&5 # 2010/11/19 - good enough until a working Xt on Xcb is delivered. if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "x11"; then test -n "$verbose" && echo " found package x11" 1>&6 -echo "${as_me:-configure}:15154: testing found package x11 ..." 1>&5 +echo "${as_me:-configure}:15443: testing found package x11 ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags "x11" 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs "x11" 2>/dev/null`" test -n "$verbose" && echo " package x11 CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:15160: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:15449: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package x11 LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:15164: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:15453: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5 + +for cf_required in x11 +do + # check for duplicates + for cf_require_pkg in $REQUIRE_PKG + do + if test "$cf_required" = "$cf_require_pkg" + then + cf_required= + break + fi + done + test -n "$cf_required" && REQUIRE_PKG="$REQUIRE_PKG $cf_required" +done cf_fix_cppflags=no cf_new_cflags= @@ -15284,12 +15587,12 @@ else test -n "$verbose" && echo " ...before $LIBS" 1>&6 -echo "${as_me:-configure}:15287: testing ...before $LIBS ..." 1>&5 +echo "${as_me:-configure}:15590: testing ...before $LIBS ..." 1>&5 LIBS=`echo "$LIBS" | sed -e "s/[ ][ ]*/ /g" -e "s%-lXt %-lXt -lX11 %" -e 's% % %g'` test -n "$verbose" && echo " ...after $LIBS" 1>&6 -echo "${as_me:-configure}:15292: testing ...after $LIBS ..." 1>&5 +echo "${as_me:-configure}:15595: testing ...after $LIBS ..." 1>&5 fi @@ -15297,14 +15600,14 @@ fi ;; esac -echo "$as_me:15300: checking for usable X Toolkit package" >&5 +echo "$as_me:15603: checking for usable X Toolkit package" >&5 echo $ECHO_N "checking for usable X Toolkit package... $ECHO_C" >&6 if test "${cf_cv_xt_ice_compat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 15307 "configure" +#line 15610 "configure" #include "confdefs.h" $ac_includes_default @@ -15320,16 +15623,16 @@ int num = IceConnectionNumber(0); (void) num } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:15323: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15626: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15326: \$? = $ac_status" >&5 + echo "$as_me:15629: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:15329: \"$ac_try\"") >&5 + { (eval echo "$as_me:15632: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15332: \$? = $ac_status" >&5 + echo "$as_me:15635: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_xt_ice_compat=yes else @@ -15339,7 +15642,7 @@ cf_cv_xt_ice_compat=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:15342: result: $cf_cv_xt_ice_compat" >&5 +echo "$as_me:15645: result: $cf_cv_xt_ice_compat" >&5 echo "${ECHO_T}$cf_cv_xt_ice_compat" >&6 if test "$cf_cv_xt_ice_compat" = no @@ -15353,22 +15656,36 @@ echo "${ECHO_T}$cf_cv_xt_ice_compat" >&6 (*) test -n "$verbose" && echo " work around broken ICE dependency" 1>&6 -echo "${as_me:-configure}:15356: testing work around broken ICE dependency ..." 1>&5 +echo "${as_me:-configure}:15659: testing work around broken ICE dependency ..." 1>&5 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "ice"; then test -n "$verbose" && echo " found package ice" 1>&6 -echo "${as_me:-configure}:15361: testing found package ice ..." 1>&5 +echo "${as_me:-configure}:15664: testing found package ice ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags "ice" 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs "ice" 2>/dev/null`" test -n "$verbose" && echo " package ice CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:15367: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:15670: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package ice LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:15371: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:15674: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5 + +for cf_required in ice +do + # check for duplicates + for cf_require_pkg in $REQUIRE_PKG + do + if test "$cf_required" = "$cf_require_pkg" + then + cf_required= + break + fi + done + test -n "$cf_required" && REQUIRE_PKG="$REQUIRE_PKG $cf_required" +done cf_fix_cppflags=no cf_new_cflags= @@ -15487,17 +15804,31 @@ LIBS="$cf_add_libs" if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "sm"; then test -n "$verbose" && echo " found package sm" 1>&6 -echo "${as_me:-configure}:15490: testing found package sm ..." 1>&5 +echo "${as_me:-configure}:15807: testing found package sm ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags "sm" 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs "sm" 2>/dev/null`" test -n "$verbose" && echo " package sm CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:15496: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:15813: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package sm LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:15500: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:15817: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5 + +for cf_required in sm +do + # check for duplicates + for cf_require_pkg in $REQUIRE_PKG + do + if test "$cf_required" = "$cf_require_pkg" + then + cf_required= + break + fi + done + test -n "$cf_required" && REQUIRE_PKG="$REQUIRE_PKG $cf_required" +done cf_fix_cppflags=no cf_new_cflags= @@ -15626,12 +15957,12 @@ else test -n "$verbose" && echo " ...before $LIBS" 1>&6 -echo "${as_me:-configure}:15629: testing ...before $LIBS ..." 1>&5 +echo "${as_me:-configure}:15960: testing ...before $LIBS ..." 1>&5 LIBS=`echo "$LIBS" | sed -e "s/[ ][ ]*/ /g" -e "s%-lXt %-lXt $X_PRE_LIBS %" -e 's% % %g'` test -n "$verbose" && echo " ...after $LIBS" 1>&6 -echo "${as_me:-configure}:15634: testing ...after $LIBS ..." 1>&5 +echo "${as_me:-configure}:15965: testing ...after $LIBS ..." 1>&5 fi @@ -15651,7 +15982,7 @@ else test -n "$verbose" && echo " checking additions to CFLAGS" 1>&6 -echo "${as_me:-configure}:15654: testing checking additions to CFLAGS ..." 1>&5 +echo "${as_me:-configure}:15985: testing checking additions to CFLAGS ..." 1>&5 cf_check_cflags="$CFLAGS" cf_check_cppflags="$CPPFLAGS" @@ -15736,7 +16067,7 @@ done if test -n "$cf_new_cflags" ; then test -n "$verbose" && echo " add to \$CFLAGS $cf_new_cflags" 1>&6 -echo "${as_me:-configure}:15739: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 +echo "${as_me:-configure}:16070: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 test -n "$CFLAGS" && CFLAGS="$CFLAGS " CFLAGS="${CFLAGS}$cf_new_cflags" @@ -15746,7 +16077,7 @@ fi if test -n "$cf_new_cppflags" ; then test -n "$verbose" && echo " add to \$CPPFLAGS $cf_new_cppflags" 1>&6 -echo "${as_me:-configure}:15749: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 +echo "${as_me:-configure}:16080: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" @@ -15756,7 +16087,7 @@ fi if test -n "$cf_new_extra_cppflags" ; then test -n "$verbose" && echo " add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6 -echo "${as_me:-configure}:15759: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 +echo "${as_me:-configure}:16090: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" @@ -15765,7 +16096,7 @@ fi if test "x$cf_check_cflags" != "x$CFLAGS" ; then cat >"conftest.$ac_ext" <<_ACEOF -#line 15768 "configure" +#line 16099 "configure" #include "confdefs.h" #include int @@ -15777,16 +16108,16 @@ printf("Hello world"); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:15780: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16111: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15783: \$? = $ac_status" >&5 + echo "$as_me:16114: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:15786: \"$ac_try\"") >&5 + { (eval echo "$as_me:16117: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15789: \$? = $ac_status" >&5 + echo "$as_me:16120: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -15794,12 +16125,12 @@ else cat "conftest.$ac_ext" >&5 test -n "$verbose" && echo " test-compile failed. Undoing change to \$CFLAGS" 1>&6 -echo "${as_me:-configure}:15797: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5 +echo "${as_me:-configure}:16128: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5 if test "x$cf_check_cppflags" != "x$CPPFLAGS" ; then test -n "$verbose" && echo " but keeping change to \$CPPFLAGS" 1>&6 -echo "${as_me:-configure}:15802: testing but keeping change to \$CPPFLAGS ..." 1>&5 +echo "${as_me:-configure}:16133: testing but keeping change to \$CPPFLAGS ..." 1>&5 fi CFLAGS="$cf_check_cflags" @@ -15807,13 +16138,13 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi - echo "$as_me:15810: checking for XOpenDisplay" >&5 + echo "$as_me:16141: checking for XOpenDisplay" >&5 echo $ECHO_N "checking for XOpenDisplay... $ECHO_C" >&6 if test "${ac_cv_func_XOpenDisplay+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 15816 "configure" +#line 16147 "configure" #include "confdefs.h" #define XOpenDisplay autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -15844,16 +16175,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:15847: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16178: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15850: \$? = $ac_status" >&5 + echo "$as_me:16181: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:15853: \"$ac_try\"") >&5 + { (eval echo "$as_me:16184: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15856: \$? = $ac_status" >&5 + echo "$as_me:16187: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_XOpenDisplay=yes else @@ -15863,13 +16194,13 @@ ac_cv_func_XOpenDisplay=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:15866: result: $ac_cv_func_XOpenDisplay" >&5 +echo "$as_me:16197: result: $ac_cv_func_XOpenDisplay" >&5 echo "${ECHO_T}$ac_cv_func_XOpenDisplay" >&6 if test "$ac_cv_func_XOpenDisplay" = yes; then : else - echo "$as_me:15872: checking for XOpenDisplay in -lX11" >&5 + echo "$as_me:16203: checking for XOpenDisplay in -lX11" >&5 echo $ECHO_N "checking for XOpenDisplay in -lX11... $ECHO_C" >&6 if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -15877,7 +16208,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lX11 $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 15880 "configure" +#line 16211 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -15886,7 +16217,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char XOpenDisplay (); +char XOpenDisplay (void); int main (void) { @@ -15896,16 +16227,16 @@ XOpenDisplay (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:15899: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16230: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15902: \$? = $ac_status" >&5 + echo "$as_me:16233: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:15905: \"$ac_try\"") >&5 + { (eval echo "$as_me:16236: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15908: \$? = $ac_status" >&5 + echo "$as_me:16239: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_X11_XOpenDisplay=yes else @@ -15916,7 +16247,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:15919: result: $ac_cv_lib_X11_XOpenDisplay" >&5 +echo "$as_me:16250: result: $ac_cv_lib_X11_XOpenDisplay" >&5 echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6 if test "$ac_cv_lib_X11_XOpenDisplay" = yes; then @@ -15940,13 +16271,13 @@ fi fi - echo "$as_me:15943: checking for XtAppInitialize" >&5 + echo "$as_me:16274: checking for XtAppInitialize" >&5 echo $ECHO_N "checking for XtAppInitialize... $ECHO_C" >&6 if test "${ac_cv_func_XtAppInitialize+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 15949 "configure" +#line 16280 "configure" #include "confdefs.h" #define XtAppInitialize autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -15977,16 +16308,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:15980: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16311: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15983: \$? = $ac_status" >&5 + echo "$as_me:16314: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:15986: \"$ac_try\"") >&5 + { (eval echo "$as_me:16317: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15989: \$? = $ac_status" >&5 + echo "$as_me:16320: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_XtAppInitialize=yes else @@ -15996,13 +16327,13 @@ ac_cv_func_XtAppInitialize=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:15999: result: $ac_cv_func_XtAppInitialize" >&5 +echo "$as_me:16330: result: $ac_cv_func_XtAppInitialize" >&5 echo "${ECHO_T}$ac_cv_func_XtAppInitialize" >&6 if test "$ac_cv_func_XtAppInitialize" = yes; then : else - echo "$as_me:16005: checking for XtAppInitialize in -lXt" >&5 + echo "$as_me:16336: checking for XtAppInitialize in -lXt" >&5 echo $ECHO_N "checking for XtAppInitialize in -lXt... $ECHO_C" >&6 if test "${ac_cv_lib_Xt_XtAppInitialize+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -16010,7 +16341,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lXt $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 16013 "configure" +#line 16344 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -16019,7 +16350,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char XtAppInitialize (); +char XtAppInitialize (void); int main (void) { @@ -16029,16 +16360,16 @@ XtAppInitialize (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:16032: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16363: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16035: \$? = $ac_status" >&5 + echo "$as_me:16366: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:16038: \"$ac_try\"") >&5 + { (eval echo "$as_me:16369: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16041: \$? = $ac_status" >&5 + echo "$as_me:16372: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_Xt_XtAppInitialize=yes else @@ -16049,7 +16380,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:16052: result: $ac_cv_lib_Xt_XtAppInitialize" >&5 +echo "$as_me:16383: result: $ac_cv_lib_Xt_XtAppInitialize" >&5 echo "${ECHO_T}$ac_cv_lib_Xt_XtAppInitialize" >&6 if test "$ac_cv_lib_Xt_XtAppInitialize" = yes; then @@ -16066,7 +16397,7 @@ fi fi if test "$cf_have_X_LIBS" = no ; then - { echo "$as_me:16069: WARNING: Unable to successfully link X Toolkit library (-lXt) with + { echo "$as_me:16400: WARNING: Unable to successfully link X Toolkit library (-lXt) with test program. You will have to check and add the proper libraries by hand to makefile." >&5 echo "$as_me: WARNING: Unable to successfully link X Toolkit library (-lXt) with @@ -16107,14 +16438,14 @@ done test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}-I$cf_path/include" - echo "$as_me:16110: checking for $cf_test in $cf_path" >&5 + echo "$as_me:16441: checking for $cf_test in $cf_path" >&5 echo $ECHO_N "checking for $cf_test in $cf_path... $ECHO_C" >&6 else - echo "$as_me:16113: checking for $cf_test" >&5 + echo "$as_me:16444: checking for $cf_test" >&5 echo $ECHO_N "checking for $cf_test... $ECHO_C" >&6 fi cat >"conftest.$ac_ext" <<_ACEOF -#line 16117 "configure" +#line 16448 "configure" #include "confdefs.h" #include @@ -16128,16 +16459,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:16131: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16462: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16134: \$? = $ac_status" >&5 + echo "$as_me:16465: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:16137: \"$ac_try\"") >&5 + { (eval echo "$as_me:16468: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16140: \$? = $ac_status" >&5 + echo "$as_me:16471: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_result=yes else @@ -16146,7 +16477,7 @@ cat "conftest.$ac_ext" >&5 cf_result=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" - echo "$as_me:16149: result: $cf_result" >&5 + echo "$as_me:16480: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 LIBS="$cf_save_LIBS_CF_X_ATHENA_CPPFLAGS" @@ -16162,7 +16493,7 @@ CPPFLAGS="$cf_save_CPPFLAGS_CF_X_ATHENA_CPPFLAGS" done if test -z "$cf_x_athena_inc" ; then - { echo "$as_me:16165: WARNING: Unable to find Athena header files" >&5 + { echo "$as_me:16496: WARNING: Unable to find Athena header files" >&5 echo "$as_me: WARNING: Unable to find Athena header files" >&2;} elif test "$cf_x_athena_inc" != default ; then @@ -16227,10 +16558,10 @@ for cf_add_1lib in $cf_add_0lib; do done LIBS="$cf_add_libs" - echo "$as_me:16230: checking for $cf_test in $cf_libs" >&5 + echo "$as_me:16561: checking for $cf_test in $cf_libs" >&5 echo $ECHO_N "checking for $cf_test in $cf_libs... $ECHO_C" >&6 cat >"conftest.$ac_ext" <<_ACEOF -#line 16233 "configure" +#line 16564 "configure" #include "confdefs.h" $ac_includes_default @@ -16247,16 +16578,16 @@ $cf_test((XtAppContext) 0) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:16250: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16581: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16253: \$? = $ac_status" >&5 + echo "$as_me:16584: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:16256: \"$ac_try\"") >&5 + { (eval echo "$as_me:16587: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16259: \$? = $ac_status" >&5 + echo "$as_me:16590: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_result=yes else @@ -16265,7 +16596,7 @@ cat "conftest.$ac_ext" >&5 cf_result=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - echo "$as_me:16268: result: $cf_result" >&5 + echo "$as_me:16599: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 LIBS="$cf_save_LIBS_CF_X_ATHENA_LIBS" @@ -16282,7 +16613,7 @@ CPPFLAGS="$cf_save_CPPFLAGS_CF_X_ATHENA_LIBS" done if test -z "$cf_x_athena_lib" ; then - { { echo "$as_me:16285: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5 + { { echo "$as_me:16616: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5 echo "$as_me: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&2;} { (exit 1); exit 1; }; } fi @@ -16316,7 +16647,7 @@ if test -n "$ac_tool_prefix"; then do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:16319: checking for $ac_word" >&5 +echo "$as_me:16650: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_XCURSES_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -16331,7 +16662,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_XCURSES_CONFIG="$ac_tool_prefix$ac_prog" -echo "$as_me:16334: found $ac_dir/$ac_word" >&5 +echo "$as_me:16665: found $ac_dir/$ac_word" >&5 break done @@ -16339,10 +16670,10 @@ fi fi XCURSES_CONFIG=$ac_cv_prog_XCURSES_CONFIG if test -n "$XCURSES_CONFIG"; then - echo "$as_me:16342: result: $XCURSES_CONFIG" >&5 + echo "$as_me:16673: result: $XCURSES_CONFIG" >&5 echo "${ECHO_T}$XCURSES_CONFIG" >&6 else - echo "$as_me:16345: result: no" >&5 + echo "$as_me:16676: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -16355,7 +16686,7 @@ if test -z "$XCURSES_CONFIG"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:16358: checking for $ac_word" >&5 +echo "$as_me:16689: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_XCURSES_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -16370,7 +16701,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_XCURSES_CONFIG="$ac_prog" -echo "$as_me:16373: found $ac_dir/$ac_word" >&5 +echo "$as_me:16704: found $ac_dir/$ac_word" >&5 break done @@ -16378,10 +16709,10 @@ fi fi ac_ct_XCURSES_CONFIG=$ac_cv_prog_ac_ct_XCURSES_CONFIG if test -n "$ac_ct_XCURSES_CONFIG"; then - echo "$as_me:16381: result: $ac_ct_XCURSES_CONFIG" >&5 + echo "$as_me:16712: result: $ac_ct_XCURSES_CONFIG" >&5 echo "${ECHO_T}$ac_ct_XCURSES_CONFIG" >&6 else - echo "$as_me:16384: result: no" >&5 + echo "$as_me:16715: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -16516,7 +16847,7 @@ LDFLAGS="$LDFLAGS $X_LIBS" test -n "$verbose" && echo " checking additions to CFLAGS" 1>&6 -echo "${as_me:-configure}:16519: testing checking additions to CFLAGS ..." 1>&5 +echo "${as_me:-configure}:16850: testing checking additions to CFLAGS ..." 1>&5 cf_check_cflags="$CFLAGS" cf_check_cppflags="$CPPFLAGS" @@ -16601,7 +16932,7 @@ done if test -n "$cf_new_cflags" ; then test -n "$verbose" && echo " add to \$CFLAGS $cf_new_cflags" 1>&6 -echo "${as_me:-configure}:16604: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 +echo "${as_me:-configure}:16935: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 test -n "$CFLAGS" && CFLAGS="$CFLAGS " CFLAGS="${CFLAGS}$cf_new_cflags" @@ -16611,7 +16942,7 @@ fi if test -n "$cf_new_cppflags" ; then test -n "$verbose" && echo " add to \$CPPFLAGS $cf_new_cppflags" 1>&6 -echo "${as_me:-configure}:16614: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 +echo "${as_me:-configure}:16945: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" @@ -16621,7 +16952,7 @@ fi if test -n "$cf_new_extra_cppflags" ; then test -n "$verbose" && echo " add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6 -echo "${as_me:-configure}:16624: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 +echo "${as_me:-configure}:16955: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" @@ -16630,7 +16961,7 @@ fi if test "x$cf_check_cflags" != "x$CFLAGS" ; then cat >"conftest.$ac_ext" <<_ACEOF -#line 16633 "configure" +#line 16964 "configure" #include "confdefs.h" #include int @@ -16642,16 +16973,16 @@ printf("Hello world"); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:16645: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16976: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16648: \$? = $ac_status" >&5 + echo "$as_me:16979: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:16651: \"$ac_try\"") >&5 + { (eval echo "$as_me:16982: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16654: \$? = $ac_status" >&5 + echo "$as_me:16985: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -16659,12 +16990,12 @@ else cat "conftest.$ac_ext" >&5 test -n "$verbose" && echo " test-compile failed. Undoing change to \$CFLAGS" 1>&6 -echo "${as_me:-configure}:16662: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5 +echo "${as_me:-configure}:16993: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5 if test "x$cf_check_cppflags" != "x$CPPFLAGS" ; then test -n "$verbose" && echo " but keeping change to \$CPPFLAGS" 1>&6 -echo "${as_me:-configure}:16667: testing but keeping change to \$CPPFLAGS ..." 1>&5 +echo "${as_me:-configure}:16998: testing but keeping change to \$CPPFLAGS ..." 1>&5 fi CFLAGS="$cf_check_cflags" @@ -16672,7 +17003,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:16675: checking for XOpenDisplay in -lX11" >&5 +echo "$as_me:17006: checking for XOpenDisplay in -lX11" >&5 echo $ECHO_N "checking for XOpenDisplay in -lX11... $ECHO_C" >&6 if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -16680,7 +17011,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 16683 "configure" +#line 17014 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -16689,7 +17020,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char XOpenDisplay (); +char XOpenDisplay (void); int main (void) { @@ -16699,16 +17030,16 @@ XOpenDisplay (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:16702: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17033: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16705: \$? = $ac_status" >&5 + echo "$as_me:17036: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:16708: \"$ac_try\"") >&5 + { (eval echo "$as_me:17039: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16711: \$? = $ac_status" >&5 + echo "$as_me:17042: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_X11_XOpenDisplay=yes else @@ -16719,7 +17050,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:16722: result: $ac_cv_lib_X11_XOpenDisplay" >&5 +echo "$as_me:17053: result: $ac_cv_lib_X11_XOpenDisplay" >&5 echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6 if test "$ac_cv_lib_X11_XOpenDisplay" = yes; then @@ -16741,7 +17072,7 @@ LIBS="$cf_add_libs" fi -echo "$as_me:16744: checking for XCurses library" >&5 +echo "$as_me:17075: checking for XCurses library" >&5 echo $ECHO_N "checking for XCurses library... $ECHO_C" >&6 if test "${cf_cv_lib_XCurses+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -16764,7 +17095,7 @@ done LIBS="$cf_add_libs" cat >"conftest.$ac_ext" <<_ACEOF -#line 16767 "configure" +#line 17098 "configure" #include "confdefs.h" #include @@ -16779,16 +17110,16 @@ XCursesExit(); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:16782: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17113: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16785: \$? = $ac_status" >&5 + echo "$as_me:17116: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:16788: \"$ac_try\"") >&5 + { (eval echo "$as_me:17119: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16791: \$? = $ac_status" >&5 + echo "$as_me:17122: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_lib_XCurses=yes else @@ -16799,7 +17130,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:16802: result: $cf_cv_lib_XCurses" >&5 +echo "$as_me:17133: result: $cf_cv_lib_XCurses" >&5 echo "${ECHO_T}$cf_cv_lib_XCurses" >&6 fi @@ -16814,23 +17145,23 @@ cat >>confdefs.h <<\EOF #define XCURSES 1 EOF - echo "$as_me:16817: checking for xcurses.h" >&5 + echo "$as_me:17148: checking for xcurses.h" >&5 echo $ECHO_N "checking for xcurses.h... $ECHO_C" >&6 if test "${ac_cv_header_xcurses_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 16823 "configure" +#line 17154 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:16827: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:17158: \"$ac_cpp "conftest.$ac_ext"\"") >&5 (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:16833: \$? = $ac_status" >&5 + echo "$as_me:17164: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -16849,7 +17180,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:16852: result: $ac_cv_header_xcurses_h" >&5 +echo "$as_me:17183: result: $ac_cv_header_xcurses_h" >&5 echo "${ECHO_T}$ac_cv_header_xcurses_h" >&6 if test "$ac_cv_header_xcurses_h" = yes; then @@ -16860,71 +17191,78 @@ EOF fi else - { { echo "$as_me:16863: error: Cannot link with XCurses" >&5 + { { echo "$as_me:17194: error: Cannot link with XCurses" >&5 echo "$as_me: error: Cannot link with XCurses" >&2;} { (exit 1); exit 1; }; } fi ;; (*) - { { echo "$as_me:16870: error: unexpected screen-value: $cf_cv_screen" >&5 + { { echo "$as_me:17201: error: unexpected screen-value: $cf_cv_screen" >&5 echo "$as_me: error: unexpected screen-value: $cf_cv_screen" >&2;} { (exit 1); exit 1; }; } ;; esac -: ${cf_nculib_root:=$cf_cv_screen} -as_ac_Lib=`echo "ac_cv_lib_$cf_nculib_root''__nc_init_pthreads" | $as_tr_sh` -echo "$as_me:16878: checking for _nc_init_pthreads in -l$cf_nculib_root" >&5 -echo $ECHO_N "checking for _nc_init_pthreads in -l$cf_nculib_root... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Lib+set}\" = set"; then +echo "$as_me:17207: checking for _nc_init_pthreads" >&5 +echo $ECHO_N "checking for _nc_init_pthreads... $ECHO_C" >&6 +if test "${ac_cv_func__nc_init_pthreads+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-l$cf_nculib_root $LIBS" -cat >"conftest.$ac_ext" <<_ACEOF -#line 16886 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 17213 "configure" #include "confdefs.h" +#define _nc_init_pthreads autoconf_temporary +#include /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef _nc_init_pthreads -/* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif + /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char _nc_init_pthreads (); +char _nc_init_pthreads (void); + int main (void) { -_nc_init_pthreads (); + +/* The GNU C library defines stubs for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub__nc_init_pthreads) || defined (__stub____nc_init_pthreads) +#error found stub for _nc_init_pthreads +#endif + + return _nc_init_pthreads (); ; return 0; } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:16905: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17244: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16908: \$? = $ac_status" >&5 + echo "$as_me:17247: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:16911: \"$ac_try\"") >&5 + { (eval echo "$as_me:17250: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16914: \$? = $ac_status" >&5 + echo "$as_me:17253: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - eval "$as_ac_Lib=yes" + ac_cv_func__nc_init_pthreads=yes else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 -eval "$as_ac_Lib=no" +ac_cv_func__nc_init_pthreads=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" -LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:16925: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5 -echo "${ECHO_T}`eval echo '${'"$as_ac_Lib"'}'`" >&6 -if test "`eval echo '${'"$as_ac_Lib"'}'`" = yes; then +echo "$as_me:17263: result: $ac_cv_func__nc_init_pthreads" >&5 +echo "${ECHO_T}$ac_cv_func__nc_init_pthreads" >&6 +if test "$ac_cv_func__nc_init_pthreads" = yes; then cf_cv_ncurses_pthreads=yes else cf_cv_ncurses_pthreads=no @@ -16957,7 +17295,7 @@ case $cf_cv_screen in ;; esac -echo "$as_me:16960: checking for X11 rgb file" >&5 +echo "$as_me:17298: checking for X11 rgb file" >&5 echo $ECHO_N "checking for X11 rgb file... $ECHO_C" >&6 # Check whether --with-x11-rgb or --without-x11-rgb was given. @@ -17002,26 +17340,24 @@ else cf_path_syntax="$ac_default_prefix" fi -case ".$cf_path" in -(.\$\(*\)*|.\'*\'*) +case "x$cf_path" in +(x\$\(*\)*|x\'*\'*) ;; -(..|./*|.\\*) +(x.|x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER) ;; -(.[a-zA-Z]:[\\/]*) # OS/2 EMX - ;; -(.\$\{*prefix\}*|.\$\{*dir\}*) +(x\$\{*prefix\}*|x\$\{*dir\}*) eval cf_path="$cf_path" - case ".$cf_path" in - (.NONE/*) + case "x$cf_path" in + (xNONE/*) cf_path=`echo "$cf_path" | sed -e s%NONE%$cf_path_syntax%` ;; esac ;; -(.no|.NONE/*) +(xno|xNONE/*) cf_path=`echo "$cf_path" | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { { echo "$as_me:17024: error: expected a pathname, not \"$cf_path\"" >&5 + { { echo "$as_me:17360: error: expected a pathname, not \"$cf_path\"" >&5 echo "$as_me: error: expected a pathname, not \"$cf_path\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -17029,7 +17365,7 @@ esac fi -echo "$as_me:17032: result: $RGB_PATH" >&5 +echo "$as_me:17368: result: $RGB_PATH" >&5 echo "${ECHO_T}$RGB_PATH" >&6 cat >>confdefs.h <&5 +echo "$as_me:17409: checking for desired basename for form library" >&5 echo $ECHO_N "checking for desired basename for form library... $ECHO_C" >&6 # Check whether --with-form-libname or --without-form-libname was given. @@ -17090,10 +17426,10 @@ case "x$FORM_NAME" in ;; esac -echo "$as_me:17093: result: $FORM_NAME" >&5 +echo "$as_me:17429: result: $FORM_NAME" >&5 echo "${ECHO_T}$FORM_NAME" >&6 -echo "$as_me:17096: checking for desired basename for menu library" >&5 +echo "$as_me:17432: checking for desired basename for menu library" >&5 echo $ECHO_N "checking for desired basename for menu library... $ECHO_C" >&6 # Check whether --with-menu-libname or --without-menu-libname was given. @@ -17113,10 +17449,10 @@ case "x$MENU_NAME" in ;; esac -echo "$as_me:17116: result: $MENU_NAME" >&5 +echo "$as_me:17452: result: $MENU_NAME" >&5 echo "${ECHO_T}$MENU_NAME" >&6 -echo "$as_me:17119: checking for desired basename for panel library" >&5 +echo "$as_me:17455: checking for desired basename for panel library" >&5 echo $ECHO_N "checking for desired basename for panel library... $ECHO_C" >&6 # Check whether --with-panel-libname or --without-panel-libname was given. @@ -17136,10 +17472,10 @@ case "x$PANEL_NAME" in ;; esac -echo "$as_me:17139: result: $PANEL_NAME" >&5 +echo "$as_me:17475: result: $PANEL_NAME" >&5 echo "${ECHO_T}$PANEL_NAME" >&6 -echo "$as_me:17142: checking if you want to check for panel functions" >&5 +echo "$as_me:17478: checking if you want to check for panel functions" >&5 echo $ECHO_N "checking if you want to check for panel functions... $ECHO_C" >&6 # Check whether --enable-panel or --disable-panel was given. @@ -17156,7 +17492,7 @@ else cf_enable_panel=$cf_default_panel fi; -echo "$as_me:17159: result: $cf_enable_panel" >&5 +echo "$as_me:17495: result: $cf_enable_panel" >&5 echo "${ECHO_T}$cf_enable_panel" >&6 if test $cf_enable_panel = yes then @@ -17167,13 +17503,13 @@ cf_have_curses_lib=no if test "x${NCURSES_CONFIG_PKG}" = xnone; then : elif test "x${PKG_CONFIG:=none}" != xnone; then - echo "$as_me:17170: checking pkg-config for $PANEL_NAME$cf_cv_libtype" >&5 + echo "$as_me:17506: checking pkg-config for $PANEL_NAME$cf_cv_libtype" >&5 echo $ECHO_N "checking pkg-config for $PANEL_NAME$cf_cv_libtype... $ECHO_C" >&6 if "$PKG_CONFIG" --exists "$PANEL_NAME$cf_cv_libtype" ; then - echo "$as_me:17173: result: yes" >&5 + echo "$as_me:17509: result: yes" >&5 echo "${ECHO_T}yes" >&6 - echo "$as_me:17176: checking if the $PANEL_NAME$cf_cv_libtype package files work" >&5 + echo "$as_me:17512: checking if the $PANEL_NAME$cf_cv_libtype package files work" >&5 echo $ECHO_N "checking if the $PANEL_NAME$cf_cv_libtype package files work... $ECHO_C" >&6 cf_save_CFLAGS="$CFLAGS" @@ -17323,7 +17659,7 @@ done LIBS="$cf_add_libs" cat >"conftest.$ac_ext" <<_ACEOF -#line 17326 "configure" +#line 17662 "configure" #include "confdefs.h" #include <$PANEL_NAME.h> int @@ -17335,37 +17671,37 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:17338: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17674: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17341: \$? = $ac_status" >&5 + echo "$as_me:17677: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:17344: \"$ac_try\"") >&5 + { (eval echo "$as_me:17680: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17347: \$? = $ac_status" >&5 + echo "$as_me:17683: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then if test "$cross_compiling" = yes; then cf_have_curses_lib=maybe else cat >"conftest.$ac_ext" <<_ACEOF -#line 17353 "configure" +#line 17689 "configure" #include "confdefs.h" #include <$PANEL_NAME.h> int main(void) { (void) new_panel ( 0 ); return 0; } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:17360: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17696: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17363: \$? = $ac_status" >&5 + echo "$as_me:17699: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:17365: \"$ac_try\"") >&5 + { (eval echo "$as_me:17701: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17368: \$? = $ac_status" >&5 + echo "$as_me:17704: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_have_curses_lib=yes else @@ -17382,7 +17718,7 @@ cat "conftest.$ac_ext" >&5 cf_have_curses_lib=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - echo "$as_me:17385: result: $cf_have_curses_lib" >&5 + echo "$as_me:17721: result: $cf_have_curses_lib" >&5 echo "${ECHO_T}$cf_have_curses_lib" >&6 test "$cf_have_curses_lib" = maybe && cf_have_curses_lib=yes if test "$cf_have_curses_lib" = "yes" @@ -17403,7 +17739,7 @@ EOF fi if test "$cf_have_curses_lib" = no; then as_ac_Lib=`echo "ac_cv_lib_$PANEL_NAME$cf_cv_libtype''_new_panel" | $as_tr_sh` -echo "$as_me:17406: checking for new_panel in -l$PANEL_NAME$cf_cv_libtype" >&5 +echo "$as_me:17742: checking for new_panel in -l$PANEL_NAME$cf_cv_libtype" >&5 echo $ECHO_N "checking for new_panel in -l$PANEL_NAME$cf_cv_libtype... $ECHO_C" >&6 if eval "test \"\${$as_ac_Lib+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -17411,7 +17747,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-l$PANEL_NAME$cf_cv_libtype $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 17414 "configure" +#line 17750 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -17420,7 +17756,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char new_panel (); +char new_panel (void); int main (void) { @@ -17430,16 +17766,16 @@ new_panel (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:17433: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17769: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17436: \$? = $ac_status" >&5 + echo "$as_me:17772: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:17439: \"$ac_try\"") >&5 + { (eval echo "$as_me:17775: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17442: \$? = $ac_status" >&5 + echo "$as_me:17778: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then eval "$as_ac_Lib=yes" else @@ -17450,7 +17786,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:17453: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5 +echo "$as_me:17789: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_Lib"'}'`" >&6 if test "`eval echo '${'"$as_ac_Lib"'}'`" = yes; then @@ -17483,7 +17819,7 @@ fi cf_curses_headers="$cf_curses_headers panel.h" fi -echo "$as_me:17486: checking if you want to check for menu functions" >&5 +echo "$as_me:17822: checking if you want to check for menu functions" >&5 echo $ECHO_N "checking if you want to check for menu functions... $ECHO_C" >&6 # Check whether --enable-menu or --disable-menu was given. @@ -17500,7 +17836,7 @@ else cf_enable_menu=$cf_default_menu fi; -echo "$as_me:17503: result: $cf_enable_menu" >&5 +echo "$as_me:17839: result: $cf_enable_menu" >&5 echo "${ECHO_T}$cf_enable_menu" >&6 if test $cf_enable_menu = yes then @@ -17509,14 +17845,14 @@ then ;; (curses*) -echo "$as_me:17512: checking for NetBSD menu.h" >&5 +echo "$as_me:17848: checking for NetBSD menu.h" >&5 echo $ECHO_N "checking for NetBSD menu.h... $ECHO_C" >&6 if test "${cf_cv_netbsd_menu_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 17519 "configure" +#line 17855 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -17534,16 +17870,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:17537: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:17873: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17540: \$? = $ac_status" >&5 + echo "$as_me:17876: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:17543: \"$ac_try\"") >&5 + { (eval echo "$as_me:17879: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17546: \$? = $ac_status" >&5 + echo "$as_me:17882: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_netbsd_menu_h=yes @@ -17555,7 +17891,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:17558: result: $cf_cv_netbsd_menu_h" >&5 +echo "$as_me:17894: result: $cf_cv_netbsd_menu_h" >&5 echo "${ECHO_T}$cf_cv_netbsd_menu_h" >&6 test "$cf_cv_netbsd_menu_h" = yes && @@ -17572,13 +17908,13 @@ cf_have_curses_lib=no if test "x${NCURSES_CONFIG_PKG}" = xnone; then : elif test "x${PKG_CONFIG:=none}" != xnone; then - echo "$as_me:17575: checking pkg-config for $MENU_NAME$cf_cv_libtype" >&5 + echo "$as_me:17911: checking pkg-config for $MENU_NAME$cf_cv_libtype" >&5 echo $ECHO_N "checking pkg-config for $MENU_NAME$cf_cv_libtype... $ECHO_C" >&6 if "$PKG_CONFIG" --exists "$MENU_NAME$cf_cv_libtype" ; then - echo "$as_me:17578: result: yes" >&5 + echo "$as_me:17914: result: yes" >&5 echo "${ECHO_T}yes" >&6 - echo "$as_me:17581: checking if the $MENU_NAME$cf_cv_libtype package files work" >&5 + echo "$as_me:17917: checking if the $MENU_NAME$cf_cv_libtype package files work" >&5 echo $ECHO_N "checking if the $MENU_NAME$cf_cv_libtype package files work... $ECHO_C" >&6 cf_save_CFLAGS="$CFLAGS" @@ -17728,7 +18064,7 @@ done LIBS="$cf_add_libs" cat >"conftest.$ac_ext" <<_ACEOF -#line 17731 "configure" +#line 18067 "configure" #include "confdefs.h" #include <$MENU_NAME.h> int @@ -17740,37 +18076,37 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:17743: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18079: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17746: \$? = $ac_status" >&5 + echo "$as_me:18082: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:17749: \"$ac_try\"") >&5 + { (eval echo "$as_me:18085: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17752: \$? = $ac_status" >&5 + echo "$as_me:18088: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then if test "$cross_compiling" = yes; then cf_have_curses_lib=maybe else cat >"conftest.$ac_ext" <<_ACEOF -#line 17758 "configure" +#line 18094 "configure" #include "confdefs.h" #include <$MENU_NAME.h> int main(void) { (void) menu_driver ( 0,0 ); return 0; } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:17765: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18101: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17768: \$? = $ac_status" >&5 + echo "$as_me:18104: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:17770: \"$ac_try\"") >&5 + { (eval echo "$as_me:18106: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17773: \$? = $ac_status" >&5 + echo "$as_me:18109: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_have_curses_lib=yes else @@ -17787,7 +18123,7 @@ cat "conftest.$ac_ext" >&5 cf_have_curses_lib=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - echo "$as_me:17790: result: $cf_have_curses_lib" >&5 + echo "$as_me:18126: result: $cf_have_curses_lib" >&5 echo "${ECHO_T}$cf_have_curses_lib" >&6 test "$cf_have_curses_lib" = maybe && cf_have_curses_lib=yes if test "$cf_have_curses_lib" = "yes" @@ -17808,7 +18144,7 @@ EOF fi if test "$cf_have_curses_lib" = no; then as_ac_Lib=`echo "ac_cv_lib_$MENU_NAME$cf_cv_libtype''_menu_driver" | $as_tr_sh` -echo "$as_me:17811: checking for menu_driver in -l$MENU_NAME$cf_cv_libtype" >&5 +echo "$as_me:18147: checking for menu_driver in -l$MENU_NAME$cf_cv_libtype" >&5 echo $ECHO_N "checking for menu_driver in -l$MENU_NAME$cf_cv_libtype... $ECHO_C" >&6 if eval "test \"\${$as_ac_Lib+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -17816,7 +18152,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-l$MENU_NAME$cf_cv_libtype $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 17819 "configure" +#line 18155 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -17825,7 +18161,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char menu_driver (); +char menu_driver (void); int main (void) { @@ -17835,16 +18171,16 @@ menu_driver (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:17838: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18174: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17841: \$? = $ac_status" >&5 + echo "$as_me:18177: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:17844: \"$ac_try\"") >&5 + { (eval echo "$as_me:18180: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17847: \$? = $ac_status" >&5 + echo "$as_me:18183: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then eval "$as_ac_Lib=yes" else @@ -17855,7 +18191,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:17858: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5 +echo "$as_me:18194: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_Lib"'}'`" >&6 if test "`eval echo '${'"$as_ac_Lib"'}'`" = yes; then @@ -17888,7 +18224,7 @@ fi cf_curses_headers="$cf_curses_headers menu.h" fi -echo "$as_me:17891: checking if you want to check for form functions" >&5 +echo "$as_me:18227: checking if you want to check for form functions" >&5 echo $ECHO_N "checking if you want to check for form functions... $ECHO_C" >&6 # Check whether --enable-form or --disable-form was given. @@ -17905,7 +18241,7 @@ else cf_enable_form=$cf_default_form fi; -echo "$as_me:17908: result: $cf_enable_form" >&5 +echo "$as_me:18244: result: $cf_enable_form" >&5 echo "${ECHO_T}$cf_enable_form" >&6 if test $cf_enable_form = yes then @@ -17914,14 +18250,14 @@ then ;; (curses*) -echo "$as_me:17917: checking for NetBSD form.h" >&5 +echo "$as_me:18253: checking for NetBSD form.h" >&5 echo $ECHO_N "checking for NetBSD form.h... $ECHO_C" >&6 if test "${cf_cv_netbsd_form_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 17924 "configure" +#line 18260 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -17940,16 +18276,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:17943: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:18279: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17946: \$? = $ac_status" >&5 + echo "$as_me:18282: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:17949: \"$ac_try\"") >&5 + { (eval echo "$as_me:18285: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17952: \$? = $ac_status" >&5 + echo "$as_me:18288: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_netbsd_form_h=yes @@ -17961,7 +18297,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:17964: result: $cf_cv_netbsd_form_h" >&5 +echo "$as_me:18300: result: $cf_cv_netbsd_form_h" >&5 echo "${ECHO_T}$cf_cv_netbsd_form_h" >&6 test "$cf_cv_netbsd_form_h" = yes && @@ -17978,13 +18314,13 @@ cf_have_curses_lib=no if test "x${NCURSES_CONFIG_PKG}" = xnone; then : elif test "x${PKG_CONFIG:=none}" != xnone; then - echo "$as_me:17981: checking pkg-config for $FORM_NAME$cf_cv_libtype" >&5 + echo "$as_me:18317: checking pkg-config for $FORM_NAME$cf_cv_libtype" >&5 echo $ECHO_N "checking pkg-config for $FORM_NAME$cf_cv_libtype... $ECHO_C" >&6 if "$PKG_CONFIG" --exists "$FORM_NAME$cf_cv_libtype" ; then - echo "$as_me:17984: result: yes" >&5 + echo "$as_me:18320: result: yes" >&5 echo "${ECHO_T}yes" >&6 - echo "$as_me:17987: checking if the $FORM_NAME$cf_cv_libtype package files work" >&5 + echo "$as_me:18323: checking if the $FORM_NAME$cf_cv_libtype package files work" >&5 echo $ECHO_N "checking if the $FORM_NAME$cf_cv_libtype package files work... $ECHO_C" >&6 cf_save_CFLAGS="$CFLAGS" @@ -18134,7 +18470,7 @@ done LIBS="$cf_add_libs" cat >"conftest.$ac_ext" <<_ACEOF -#line 18137 "configure" +#line 18473 "configure" #include "confdefs.h" #include <$FORM_NAME.h> int @@ -18146,37 +18482,37 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:18149: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18485: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18152: \$? = $ac_status" >&5 + echo "$as_me:18488: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:18155: \"$ac_try\"") >&5 + { (eval echo "$as_me:18491: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18158: \$? = $ac_status" >&5 + echo "$as_me:18494: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then if test "$cross_compiling" = yes; then cf_have_curses_lib=maybe else cat >"conftest.$ac_ext" <<_ACEOF -#line 18164 "configure" +#line 18500 "configure" #include "confdefs.h" #include <$FORM_NAME.h> int main(void) { (void) form_driver ( 0,0 ); return 0; } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:18171: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18507: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18174: \$? = $ac_status" >&5 + echo "$as_me:18510: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:18176: \"$ac_try\"") >&5 + { (eval echo "$as_me:18512: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18179: \$? = $ac_status" >&5 + echo "$as_me:18515: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_have_curses_lib=yes else @@ -18193,7 +18529,7 @@ cat "conftest.$ac_ext" >&5 cf_have_curses_lib=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - echo "$as_me:18196: result: $cf_have_curses_lib" >&5 + echo "$as_me:18532: result: $cf_have_curses_lib" >&5 echo "${ECHO_T}$cf_have_curses_lib" >&6 test "$cf_have_curses_lib" = maybe && cf_have_curses_lib=yes if test "$cf_have_curses_lib" = "yes" @@ -18214,7 +18550,7 @@ EOF fi if test "$cf_have_curses_lib" = no; then as_ac_Lib=`echo "ac_cv_lib_$FORM_NAME$cf_cv_libtype''_form_driver" | $as_tr_sh` -echo "$as_me:18217: checking for form_driver in -l$FORM_NAME$cf_cv_libtype" >&5 +echo "$as_me:18553: checking for form_driver in -l$FORM_NAME$cf_cv_libtype" >&5 echo $ECHO_N "checking for form_driver in -l$FORM_NAME$cf_cv_libtype... $ECHO_C" >&6 if eval "test \"\${$as_ac_Lib+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -18222,7 +18558,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-l$FORM_NAME$cf_cv_libtype $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 18225 "configure" +#line 18561 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -18231,7 +18567,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char form_driver (); +char form_driver (void); int main (void) { @@ -18241,16 +18577,16 @@ form_driver (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:18244: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18580: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18247: \$? = $ac_status" >&5 + echo "$as_me:18583: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:18250: \"$ac_try\"") >&5 + { (eval echo "$as_me:18586: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18253: \$? = $ac_status" >&5 + echo "$as_me:18589: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then eval "$as_ac_Lib=yes" else @@ -18261,7 +18597,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:18264: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5 +echo "$as_me:18600: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_Lib"'}'`" >&6 if test "`eval echo '${'"$as_ac_Lib"'}'`" = yes; then @@ -18299,23 +18635,23 @@ fi for ac_header in $cf_curses_headers do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:18302: checking for $ac_header" >&5 +echo "$as_me:18638: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 18308 "configure" +#line 18644 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:18312: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:18648: \"$ac_cpp "conftest.$ac_ext"\"") >&5 (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:18318: \$? = $ac_status" >&5 + echo "$as_me:18654: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -18334,7 +18670,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:18337: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:18673: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then cat >>confdefs.h <&5 +echo "$as_me:18683: checking whether time.h and sys/time.h may both be included" >&5 echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6 if test "${ac_cv_header_time+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 18353 "configure" +#line 18689 "configure" #include "confdefs.h" #include #include @@ -18366,16 +18702,16 @@ return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:18369: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:18705: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18372: \$? = $ac_status" >&5 + echo "$as_me:18708: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:18375: \"$ac_try\"") >&5 + { (eval echo "$as_me:18711: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18378: \$? = $ac_status" >&5 + echo "$as_me:18714: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_header_time=yes else @@ -18385,7 +18721,7 @@ ac_cv_header_time=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:18388: result: $ac_cv_header_time" >&5 +echo "$as_me:18724: result: $ac_cv_header_time" >&5 echo "${ECHO_T}$ac_cv_header_time" >&6 if test $ac_cv_header_time = yes; then @@ -18396,7 +18732,6 @@ EOF fi for ac_header in \ -getopt.h \ locale.h \ math.h \ stdarg.h \ @@ -18404,27 +18739,26 @@ sys/ioctl.h \ sys/select.h \ sys/time.h \ termios.h \ -unistd.h \ do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:18411: checking for $ac_header" >&5 +echo "$as_me:18745: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 18417 "configure" +#line 18751 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:18421: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:18755: \"$ac_cpp "conftest.$ac_ext"\"") >&5 (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:18427: \$? = $ac_status" >&5 + echo "$as_me:18761: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -18443,7 +18777,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:18446: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:18780: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then cat >>confdefs.h <&5 +echo "$as_me:18793: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 18465 "configure" +#line 18799 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:18469: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:18803: \"$ac_cpp "conftest.$ac_ext"\"") >&5 (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:18475: \$? = $ac_status" >&5 + echo "$as_me:18809: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -18491,7 +18825,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:18494: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:18828: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then cat >>confdefs.h <&5 +echo "$as_me:18838: checking for header declaring getopt variables" >&5 echo $ECHO_N "checking for header declaring getopt variables... $ECHO_C" >&6 if test "${cf_cv_getopt_header+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -18511,7 +18845,7 @@ cf_cv_getopt_header=none for cf_header in stdio.h stdlib.h unistd.h getopt.h do cat >"conftest.$ac_ext" <<_ACEOF -#line 18514 "configure" +#line 18848 "configure" #include "confdefs.h" #include <$cf_header> @@ -18524,16 +18858,16 @@ int x = optind; char *y = optarg; (void)x; (void)y } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:18527: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:18861: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18530: \$? = $ac_status" >&5 + echo "$as_me:18864: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:18533: \"$ac_try\"") >&5 + { (eval echo "$as_me:18867: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18536: \$? = $ac_status" >&5 + echo "$as_me:18870: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_getopt_header=$cf_header break @@ -18545,7 +18879,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:18548: result: $cf_cv_getopt_header" >&5 +echo "$as_me:18882: result: $cf_cv_getopt_header" >&5 echo "${ECHO_T}$cf_cv_getopt_header" >&6 if test "$cf_cv_getopt_header" != none ; then @@ -18562,36 +18896,162 @@ EOF fi -echo "$as_me:18565: checking for clock_gettime" >&5 +cf_save_libs="$LIBS" +echo "$as_me:18900: checking for clock_gettime" >&5 echo $ECHO_N "checking for clock_gettime... $ECHO_C" >&6 +if test "${ac_cv_func_clock_gettime+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >"conftest.$ac_ext" <<_ACEOF +#line 18906 "configure" +#include "confdefs.h" +#define clock_gettime autoconf_temporary +#include /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef clock_gettime + +#ifdef __cplusplus +extern "C" +#endif + +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char clock_gettime (void); + +int +main (void) +{ + +/* The GNU C library defines stubs for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_clock_gettime) || defined (__stub___clock_gettime) +#error found stub for clock_gettime +#endif + + return clock_gettime (); + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:18937: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:18940: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:18943: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:18946: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_clock_gettime=yes +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +ac_cv_func_clock_gettime=no +fi +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" +fi +echo "$as_me:18956: result: $ac_cv_func_clock_gettime" >&5 +echo "${ECHO_T}$ac_cv_func_clock_gettime" >&6 +if test "$ac_cv_func_clock_gettime" = yes; then + cf_cv_test_clock_gettime=yes +else + echo "$as_me:18961: checking for clock_gettime in -lrt" >&5 +echo $ECHO_N "checking for clock_gettime in -lrt... $ECHO_C" >&6 +if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lrt $LIBS" +cat >"conftest.$ac_ext" <<_ACEOF +#line 18969 "configure" +#include "confdefs.h" + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char clock_gettime (void); +int +main (void) +{ +clock_gettime (); + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:18988: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:18991: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:18994: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:18997: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_rt_clock_gettime=yes +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +ac_cv_lib_rt_clock_gettime=no +fi +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:19008: result: $ac_cv_lib_rt_clock_gettime" >&5 +echo "${ECHO_T}$ac_cv_lib_rt_clock_gettime" >&6 +if test "$ac_cv_lib_rt_clock_gettime" = yes; then + LIBS="-lrt $LIBS" + cf_cv_test_clock_gettime=yes +else + cf_cv_test_clock_gettime=no +fi + +fi + +if test "$cf_cv_test_clock_gettime" = yes ; then +echo "$as_me:19020: checking if clock_gettime links" >&5 +echo $ECHO_N "checking if clock_gettime links... $ECHO_C" >&6 if test "${cf_cv_func_clock_gettime+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 18572 "configure" +#line 19027 "configure" #include "confdefs.h" + +$ac_includes_default #include + int main (void) { struct timespec ts; - int rc = clock_gettime(CLOCK_REALTIME, &ts); (void) rc; (void)ts + int rc = clock_gettime(CLOCK_REALTIME, &ts) + + clock_gettime(CLOCK_MONOTONIC, &ts); + (void) rc; (void)ts ; return 0; } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:18585: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19045: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18588: \$? = $ac_status" >&5 + echo "$as_me:19048: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:18591: \"$ac_try\"") >&5 + { (eval echo "$as_me:19051: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18594: \$? = $ac_status" >&5 + echo "$as_me:19054: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_func_clock_gettime=yes else @@ -18602,8 +19062,11 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:18605: result: $cf_cv_func_clock_gettime" >&5 +echo "$as_me:19065: result: $cf_cv_func_clock_gettime" >&5 echo "${ECHO_T}$cf_cv_func_clock_gettime" >&6 +else + cf_cv_func_clock_gettime=no +fi if test "$cf_cv_func_clock_gettime" = yes then @@ -18613,13 +19076,13 @@ cat >>confdefs.h <<\EOF EOF else -echo "$as_me:18616: checking for gettimeofday" >&5 +echo "$as_me:19079: checking for gettimeofday" >&5 echo $ECHO_N "checking for gettimeofday... $ECHO_C" >&6 if test "${ac_cv_func_gettimeofday+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 18622 "configure" +#line 19085 "configure" #include "confdefs.h" #define gettimeofday autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -18650,16 +19113,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:18653: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19116: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18656: \$? = $ac_status" >&5 + echo "$as_me:19119: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:18659: \"$ac_try\"") >&5 + { (eval echo "$as_me:19122: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18662: \$? = $ac_status" >&5 + echo "$as_me:19125: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_gettimeofday=yes else @@ -18669,7 +19132,7 @@ ac_cv_func_gettimeofday=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:18672: result: $ac_cv_func_gettimeofday" >&5 +echo "$as_me:19135: result: $ac_cv_func_gettimeofday" >&5 echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6 if test "$ac_cv_func_gettimeofday" = yes; then @@ -18679,7 +19142,7 @@ EOF else -echo "$as_me:18682: checking for gettimeofday in -lbsd" >&5 +echo "$as_me:19145: checking for gettimeofday in -lbsd" >&5 echo $ECHO_N "checking for gettimeofday in -lbsd... $ECHO_C" >&6 if test "${ac_cv_lib_bsd_gettimeofday+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -18687,7 +19150,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lbsd $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 18690 "configure" +#line 19153 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -18696,7 +19159,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char gettimeofday (); +char gettimeofday (void); int main (void) { @@ -18706,16 +19169,16 @@ gettimeofday (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:18709: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19172: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18712: \$? = $ac_status" >&5 + echo "$as_me:19175: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:18715: \"$ac_try\"") >&5 + { (eval echo "$as_me:19178: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18718: \$? = $ac_status" >&5 + echo "$as_me:19181: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_bsd_gettimeofday=yes else @@ -18726,7 +19189,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:18729: result: $ac_cv_lib_bsd_gettimeofday" >&5 +echo "$as_me:19192: result: $ac_cv_lib_bsd_gettimeofday" >&5 echo "${ECHO_T}$ac_cv_lib_bsd_gettimeofday" >&6 if test "$ac_cv_lib_bsd_gettimeofday" = yes; then @@ -18756,7 +19219,6 @@ fi fi for ac_func in \ -cfmakeraw \ getopt \ snprintf \ strdup \ @@ -18765,13 +19227,13 @@ tsearch \ do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:18768: checking for $ac_func" >&5 +echo "$as_me:19230: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 18774 "configure" +#line 19236 "configure" #include "confdefs.h" #define $ac_func autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -18802,16 +19264,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:18805: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19267: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18808: \$? = $ac_status" >&5 + echo "$as_me:19270: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:18811: \"$ac_try\"") >&5 + { (eval echo "$as_me:19273: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18814: \$? = $ac_status" >&5 + echo "$as_me:19276: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then eval "$as_ac_var=yes" else @@ -18821,7 +19283,7 @@ eval "$as_ac_var=no" fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:18824: result: `eval echo '${'"$as_ac_var"'}'`" >&5 +echo "$as_me:19286: result: `eval echo '${'"$as_ac_var"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then cat >>confdefs.h <&5 +echo "$as_me:19297: checking if we can use termcap.h" >&5 echo $ECHO_N "checking if we can use termcap.h... $ECHO_C" >&6 if test "${cf_cv_have_termcap_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 18842 "configure" +#line 19304 "configure" #include "confdefs.h" #include @@ -18860,16 +19322,16 @@ return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:18863: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:19325: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18866: \$? = $ac_status" >&5 + echo "$as_me:19328: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:18869: \"$ac_try\"") >&5 + { (eval echo "$as_me:19331: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18872: \$? = $ac_status" >&5 + echo "$as_me:19334: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_have_termcap_h=yes else @@ -18879,7 +19341,7 @@ cf_cv_have_termcap_h=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:18882: result: $cf_cv_have_termcap_h" >&5 +echo "$as_me:19344: result: $cf_cv_have_termcap_h" >&5 echo "${ECHO_T}$cf_cv_have_termcap_h" >&6 if test "x$cf_cv_have_termcap_h" = xyes then @@ -18889,14 +19351,14 @@ cat >>confdefs.h <<\EOF EOF else -echo "$as_me:18892: checking if we can use ncurses/termcap.h" >&5 +echo "$as_me:19354: checking if we can use ncurses/termcap.h" >&5 echo $ECHO_N "checking if we can use ncurses/termcap.h... $ECHO_C" >&6 if test "${cf_cv_have_ncurses_termcap_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 18899 "configure" +#line 19361 "configure" #include "confdefs.h" #include @@ -18917,16 +19379,16 @@ return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:18920: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:19382: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18923: \$? = $ac_status" >&5 + echo "$as_me:19385: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:18926: \"$ac_try\"") >&5 + { (eval echo "$as_me:19388: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18929: \$? = $ac_status" >&5 + echo "$as_me:19391: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_have_ncurses_termcap_h=yes else @@ -18936,7 +19398,7 @@ cf_cv_have_ncurses_termcap_h=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:18939: result: $cf_cv_have_ncurses_termcap_h" >&5 +echo "$as_me:19401: result: $cf_cv_have_ncurses_termcap_h" >&5 echo "${ECHO_T}$cf_cv_have_ncurses_termcap_h" >&6 test "x$cf_cv_have_ncurses_termcap_h" = xyes && cat >>confdefs.h <<\EOF @@ -18946,7 +19408,7 @@ EOF fi if test "x$ac_cv_func_getopt" = xno; then - { { echo "$as_me:18949: error: getopt is required for building programs" >&5 + { { echo "$as_me:19411: error: getopt is required for building programs" >&5 echo "$as_me: error: getopt is required for building programs" >&2;} { (exit 1); exit 1; }; } fi @@ -18965,13 +19427,13 @@ wcstombs \ do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:18968: checking for $ac_func" >&5 +echo "$as_me:19430: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 18974 "configure" +#line 19436 "configure" #include "confdefs.h" #define $ac_func autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -19002,16 +19464,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:19005: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19467: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19008: \$? = $ac_status" >&5 + echo "$as_me:19470: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:19011: \"$ac_try\"") >&5 + { (eval echo "$as_me:19473: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19014: \$? = $ac_status" >&5 + echo "$as_me:19476: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then eval "$as_ac_var=yes" else @@ -19021,7 +19483,7 @@ eval "$as_ac_var=no" fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:19024: result: `eval echo '${'"$as_ac_var"'}'`" >&5 +echo "$as_me:19486: result: `eval echo '${'"$as_ac_var"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then cat >>confdefs.h <&5 +echo "$as_me:19498: checking definition to turn on extended curses functions" >&5 echo $ECHO_N "checking definition to turn on extended curses functions... $ECHO_C" >&6 if test "${cf_cv_need_xopen_extension+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -19041,7 +19503,7 @@ else cf_cv_need_xopen_extension=unknown cat >"conftest.$ac_ext" <<_ACEOF -#line 19044 "configure" +#line 19506 "configure" #include "confdefs.h" $ac_includes_default @@ -19052,15 +19514,16 @@ main (void) #if defined(NCURSES_VERSION_PATCH) #if (NCURSES_VERSION_PATCH < 20100501) && (NCURSES_VERSION_PATCH >= 20100403) - make an error + #error disallow ncurses versions between 2020/04/03 and 2010/05/01 #endif #endif #ifdef NCURSES_WIDECHAR -make an error /* prefer to fall-through on the second checks */ +#error prefer to fall-through on the second checks #endif + static char dummy[10]; cchar_t check; int check2 = curs_set((int)sizeof(check)); - long x = winnstr(stdscr, "", 0); + long x = winnstr(stdscr, dummy, 5); int x1, y1; (void)check2; getbegyx(stdscr, y1, x1); @@ -19073,16 +19536,16 @@ make an error /* prefer to fall-through on the second checks */ } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:19076: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19539: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19079: \$? = $ac_status" >&5 + echo "$as_me:19542: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:19082: \"$ac_try\"") >&5 + { (eval echo "$as_me:19545: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19085: \$? = $ac_status" >&5 + echo "$as_me:19548: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_need_xopen_extension=none else @@ -19092,7 +19555,7 @@ cat "conftest.$ac_ext" >&5 for cf_try_xopen_extension in _XOPEN_SOURCE_EXTENDED NCURSES_WIDECHAR do cat >"conftest.$ac_ext" <<_ACEOF -#line 19095 "configure" +#line 19558 "configure" #include "confdefs.h" #define $cf_try_xopen_extension 1 @@ -19102,9 +19565,10 @@ int main (void) { + static char dummy[10]; cchar_t check; int check2 = curs_set((int)sizeof(check)); - long x = winnstr(stdscr, "", 0); + long x = winnstr(stdscr, dummy, 5); int x1, y1; getbegyx(stdscr, y1, x1); (void)check2; @@ -19117,16 +19581,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:19120: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19584: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19123: \$? = $ac_status" >&5 + echo "$as_me:19587: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:19126: \"$ac_try\"") >&5 + { (eval echo "$as_me:19590: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19129: \$? = $ac_status" >&5 + echo "$as_me:19593: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_need_xopen_extension=$cf_try_xopen_extension; break else @@ -19140,7 +19604,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:19143: result: $cf_cv_need_xopen_extension" >&5 +echo "$as_me:19607: result: $cf_cv_need_xopen_extension" >&5 echo "${ECHO_T}$cf_cv_need_xopen_extension" >&6 case "$cf_cv_need_xopen_extension" in @@ -19152,7 +19616,7 @@ case "$cf_cv_need_xopen_extension" in ;; esac -echo "$as_me:19155: checking for term.h" >&5 +echo "$as_me:19619: checking for term.h" >&5 echo $ECHO_N "checking for term.h... $ECHO_C" >&6 if test "${cf_cv_term_header+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -19173,7 +19637,7 @@ esac for cf_header in $cf_header_list do cat >"conftest.$ac_ext" <<_ACEOF -#line 19176 "configure" +#line 19640 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -19187,16 +19651,16 @@ WINDOW *x; (void)x } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:19190: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:19654: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19193: \$? = $ac_status" >&5 + echo "$as_me:19657: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:19196: \"$ac_try\"") >&5 + { (eval echo "$as_me:19660: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19199: \$? = $ac_status" >&5 + echo "$as_me:19663: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_term_header=$cf_header break @@ -19215,14 +19679,14 @@ case "$cf_cv_term_header" in for cf_header in ncurses/term.h ncursesw/term.h do cat >"conftest.$ac_ext" <<_ACEOF -#line 19218 "configure" +#line 19682 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> #ifdef NCURSES_VERSION #include <${cf_header}> #else -make an error +#error expected NCURSES_VERSION to be defined #endif int main (void) @@ -19233,16 +19697,16 @@ WINDOW *x; (void)x } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:19236: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:19700: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19239: \$? = $ac_status" >&5 + echo "$as_me:19703: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:19242: \"$ac_try\"") >&5 + { (eval echo "$as_me:19706: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19245: \$? = $ac_status" >&5 + echo "$as_me:19709: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_term_header=$cf_header break @@ -19257,7 +19721,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" esac fi -echo "$as_me:19260: result: $cf_cv_term_header" >&5 +echo "$as_me:19724: result: $cf_cv_term_header" >&5 echo "${ECHO_T}$cf_cv_term_header" >&6 case "$cf_cv_term_header" in @@ -19284,7 +19748,7 @@ EOF ;; esac -echo "$as_me:19287: checking for unctrl.h" >&5 +echo "$as_me:19751: checking for unctrl.h" >&5 echo $ECHO_N "checking for unctrl.h... $ECHO_C" >&6 if test "${cf_cv_unctrl_header+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -19305,7 +19769,7 @@ esac for cf_header in $cf_header_list do cat >"conftest.$ac_ext" <<_ACEOF -#line 19308 "configure" +#line 19772 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -19319,16 +19783,16 @@ WINDOW *x; (void)x } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:19322: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:19786: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19325: \$? = $ac_status" >&5 + echo "$as_me:19789: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:19328: \"$ac_try\"") >&5 + { (eval echo "$as_me:19792: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19331: \$? = $ac_status" >&5 + echo "$as_me:19795: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_unctrl_header=$cf_header break @@ -19341,12 +19805,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:19344: result: $cf_cv_unctrl_header" >&5 +echo "$as_me:19808: result: $cf_cv_unctrl_header" >&5 echo "${ECHO_T}$cf_cv_unctrl_header" >&6 case "$cf_cv_unctrl_header" in (no) - { echo "$as_me:19349: WARNING: unctrl.h header not found" >&5 + { echo "$as_me:19813: WARNING: unctrl.h header not found" >&5 echo "$as_me: WARNING: unctrl.h header not found" >&2;} ;; esac @@ -19376,6 +19840,8 @@ EOF esac for cf_func in \ +_nc_tparm_analyze \ +_tracef \ alloc_pair \ assume_default_colors \ chgat \ @@ -19417,6 +19883,9 @@ termname \ tgetent \ tigetnum \ tigetstr \ +tiparm \ +tiparm_s \ +tiscan_s \ tputs_sp \ typeahead \ unget_wch \ @@ -19434,16 +19903,15 @@ winsdelln \ winsstr \ wresize \ wsyncdown \ -_tracef \ do cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` - echo "$as_me:19443: checking for ${cf_func}" >&5 + echo "$as_me:19911: checking for ${cf_func}" >&5 echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6 -echo "${as_me:-configure}:19446: testing ${cf_func} ..." 1>&5 +echo "${as_me:-configure}:19914: testing ${cf_func} ..." 1>&5 if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -19452,7 +19920,7 @@ else eval cf_result='$ac_cv_func_'$cf_func if test ".$cf_result" != ".no"; then cat >"conftest.$ac_ext" <<_ACEOF -#line 19455 "configure" +#line 19923 "configure" #include "confdefs.h" #ifdef HAVE_XCURSES @@ -19485,16 +19953,16 @@ if (foo + 1234L > 5678L) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:19488: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19956: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19491: \$? = $ac_status" >&5 + echo "$as_me:19959: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:19494: \"$ac_try\"") >&5 + { (eval echo "$as_me:19962: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19497: \$? = $ac_status" >&5 + echo "$as_me:19965: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_result=yes else @@ -19510,7 +19978,7 @@ fi # use the computed/retrieved cache-value: eval 'cf_result=$cf_cv_func_'$cf_func - echo "$as_me:19513: result: $cf_result" >&5 + echo "$as_me:19981: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" != no; then cat >>confdefs.h <&5 + echo "$as_me:19996: checking for ${cf_func}" >&5 echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6 -echo "${as_me:-configure}:19531: testing ${cf_func} ..." 1>&5 +echo "${as_me:-configure}:19999: testing ${cf_func} ..." 1>&5 if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -19537,7 +20005,7 @@ else eval cf_result='$ac_cv_func_'$cf_func if test ".$cf_result" != ".no"; then cat >"conftest.$ac_ext" <<_ACEOF -#line 19540 "configure" +#line 20008 "configure" #include "confdefs.h" #ifdef HAVE_XCURSES @@ -19570,16 +20038,16 @@ if (foo + 1234L > 5678L) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:19573: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20041: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19576: \$? = $ac_status" >&5 + echo "$as_me:20044: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:19579: \"$ac_try\"") >&5 + { (eval echo "$as_me:20047: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19582: \$? = $ac_status" >&5 + echo "$as_me:20050: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_result=yes else @@ -19595,7 +20063,7 @@ fi # use the computed/retrieved cache-value: eval 'cf_result=$cf_cv_func_'$cf_func - echo "$as_me:19598: result: $cf_result" >&5 + echo "$as_me:20066: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" != no; then cat >>confdefs.h <"conftest.$ac_ext" <<_ACEOF -#line 19622 "configure" +#line 20090 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -19639,21 +20107,21 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:19642: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:20110: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19645: \$? = $ac_status" >&5 + echo "$as_me:20113: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:19648: \"$ac_try\"") >&5 + { (eval echo "$as_me:20116: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19651: \$? = $ac_status" >&5 + echo "$as_me:20119: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then test -n "$verbose" && echo " prototype $cf_ret func($cf_arg value)" 1>&6 -echo "${as_me:-configure}:19656: testing prototype $cf_ret func($cf_arg value) ..." 1>&5 +echo "${as_me:-configure}:20124: testing prototype $cf_ret func($cf_arg value) ..." 1>&5 cat >>confdefs.h <&5 +echo "$as_me:20144: checking for ncurses extended functions" >&5 echo $ECHO_N "checking for ncurses extended functions... $ECHO_C" >&6 if test "${cf_cv_ncurses_ext_funcs+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 19683 "configure" +#line 20151 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -19695,16 +20163,16 @@ int x = NCURSES_EXT_FUNCS } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:19698: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:20166: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19701: \$? = $ac_status" >&5 + echo "$as_me:20169: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:19704: \"$ac_try\"") >&5 + { (eval echo "$as_me:20172: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19707: \$? = $ac_status" >&5 + echo "$as_me:20175: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_ext_funcs=defined else @@ -19712,7 +20180,7 @@ else cat "conftest.$ac_ext" >&5 cat >"conftest.$ac_ext" <<_ACEOF -#line 19715 "configure" +#line 20183 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -19737,16 +20205,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:19740: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20208: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19743: \$? = $ac_status" >&5 + echo "$as_me:20211: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:19746: \"$ac_try\"") >&5 + { (eval echo "$as_me:20214: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19749: \$? = $ac_status" >&5 + echo "$as_me:20217: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_ext_funcs=yes else @@ -19760,7 +20228,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:19763: result: $cf_cv_ncurses_ext_funcs" >&5 +echo "$as_me:20231: result: $cf_cv_ncurses_ext_funcs" >&5 echo "${ECHO_T}$cf_cv_ncurses_ext_funcs" >&6 test "$cf_cv_ncurses_ext_funcs" = yes && cat >>confdefs.h <<\EOF @@ -19774,11 +20242,11 @@ then if test -n "$cf_cv_ncurses_version" && test "x$cf_cv_ncurses_version" != xno then cf_define_xpg5=no - echo "$as_me:19777: checking if _XPG5 should be defined to enable wide-characters" >&5 + echo "$as_me:20245: checking if _XPG5 should be defined to enable wide-characters" >&5 echo $ECHO_N "checking if _XPG5 should be defined to enable wide-characters... $ECHO_C" >&6 cat >"conftest.$ac_ext" <<_ACEOF -#line 19781 "configure" +#line 20249 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -19791,16 +20259,16 @@ int x = _XPG5 } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:19794: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:20262: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19797: \$? = $ac_status" >&5 + echo "$as_me:20265: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:19800: \"$ac_try\"") >&5 + { (eval echo "$as_me:20268: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19803: \$? = $ac_status" >&5 + echo "$as_me:20271: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -19809,7 +20277,7 @@ cat "conftest.$ac_ext" >&5 cf_save_cppflags="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -D_XPG5" cat >"conftest.$ac_ext" <<_ACEOF -#line 19812 "configure" +#line 20280 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -19822,16 +20290,16 @@ int x = _XPG5 } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:19825: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:20293: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19828: \$? = $ac_status" >&5 + echo "$as_me:20296: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:19831: \"$ac_try\"") >&5 + { (eval echo "$as_me:20299: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19834: \$? = $ac_status" >&5 + echo "$as_me:20302: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_define_xpg5=yes else @@ -19842,7 +20310,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" CPPFLAGS="$cf_save_cppflags" fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" - echo "$as_me:19845: result: $cf_define_xpg5" >&5 + echo "$as_me:20313: result: $cf_define_xpg5" >&5 echo "${ECHO_T}$cf_define_xpg5" >&6 if test "$cf_define_xpg5" = yes @@ -19851,14 +20319,14 @@ echo "${ECHO_T}$cf_define_xpg5" >&6 fi fi - echo "$as_me:19854: checking for wide-character functions" >&5 + echo "$as_me:20322: checking for wide-character functions" >&5 echo $ECHO_N "checking for wide-character functions... $ECHO_C" >&6 if test "${cf_cv_widechar_funcs+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 19861 "configure" +#line 20329 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -19875,16 +20343,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:19878: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20346: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19881: \$? = $ac_status" >&5 + echo "$as_me:20349: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:19884: \"$ac_try\"") >&5 + { (eval echo "$as_me:20352: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19887: \$? = $ac_status" >&5 + echo "$as_me:20355: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_widechar_funcs=yes else @@ -19895,7 +20363,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:19898: result: $cf_cv_widechar_funcs" >&5 +echo "$as_me:20366: result: $cf_cv_widechar_funcs" >&5 echo "${ECHO_T}$cf_cv_widechar_funcs" >&6 if test "$cf_cv_widechar_funcs" != no ; then @@ -19916,14 +20384,14 @@ EOF fi -echo "$as_me:19919: checking if $cf_cv_screen library uses pthreads" >&5 +echo "$as_me:20387: checking if $cf_cv_screen library uses pthreads" >&5 echo $ECHO_N "checking if $cf_cv_screen library uses pthreads... $ECHO_C" >&6 if test "${cf_cv_use_pthreads+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 19926 "configure" +#line 20394 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -19941,16 +20409,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:19944: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20412: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19947: \$? = $ac_status" >&5 + echo "$as_me:20415: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:19950: \"$ac_try\"") >&5 + { (eval echo "$as_me:20418: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19953: \$? = $ac_status" >&5 + echo "$as_me:20421: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_use_pthreads=yes else @@ -19961,21 +20429,21 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:19964: result: $cf_cv_use_pthreads" >&5 +echo "$as_me:20432: result: $cf_cv_use_pthreads" >&5 echo "${ECHO_T}$cf_cv_use_pthreads" >&6 test $cf_cv_use_pthreads = yes && cat >>confdefs.h <<\EOF #define USE_PTHREADS 1 EOF -echo "$as_me:19971: checking if sys/time.h works with sys/select.h" >&5 +echo "$as_me:20439: checking if sys/time.h works with sys/select.h" >&5 echo $ECHO_N "checking if sys/time.h works with sys/select.h... $ECHO_C" >&6 if test "${cf_cv_sys_time_select+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 19978 "configure" +#line 20446 "configure" #include "confdefs.h" #include @@ -19995,16 +20463,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:19998: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:20466: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20001: \$? = $ac_status" >&5 + echo "$as_me:20469: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:20004: \"$ac_try\"") >&5 + { (eval echo "$as_me:20472: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20007: \$? = $ac_status" >&5 + echo "$as_me:20475: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_sys_time_select=yes else @@ -20016,7 +20484,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:20019: result: $cf_cv_sys_time_select" >&5 +echo "$as_me:20487: result: $cf_cv_sys_time_select" >&5 echo "${ECHO_T}$cf_cv_sys_time_select" >&6 test "$cf_cv_sys_time_select" = yes && cat >>confdefs.h <<\EOF @@ -20025,7 +20493,7 @@ EOF # special check for test/ditto.c -echo "$as_me:20028: checking for openpty in -lutil" >&5 +echo "$as_me:20496: checking for openpty in -lutil" >&5 echo $ECHO_N "checking for openpty in -lutil... $ECHO_C" >&6 if test "${ac_cv_lib_util_openpty+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -20033,7 +20501,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lutil $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 20036 "configure" +#line 20504 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -20042,7 +20510,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char openpty (); +char openpty (void); int main (void) { @@ -20052,16 +20520,16 @@ openpty (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:20055: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20523: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20058: \$? = $ac_status" >&5 + echo "$as_me:20526: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:20061: \"$ac_try\"") >&5 + { (eval echo "$as_me:20529: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20064: \$? = $ac_status" >&5 + echo "$as_me:20532: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_util_openpty=yes else @@ -20072,7 +20540,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:20075: result: $ac_cv_lib_util_openpty" >&5 +echo "$as_me:20543: result: $ac_cv_lib_util_openpty" >&5 echo "${ECHO_T}$ac_cv_lib_util_openpty" >&6 if test "$ac_cv_lib_util_openpty" = yes; then cf_cv_lib_util=yes @@ -20080,7 +20548,7 @@ else cf_cv_lib_util=no fi -echo "$as_me:20083: checking for openpty header" >&5 +echo "$as_me:20551: checking for openpty header" >&5 echo $ECHO_N "checking for openpty header... $ECHO_C" >&6 if test "${cf_cv_func_openpty+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -20107,7 +20575,7 @@ LIBS="$cf_add_libs" for cf_header in pty.h libutil.h util.h do cat >"conftest.$ac_ext" <<_ACEOF -#line 20110 "configure" +#line 20578 "configure" #include "confdefs.h" #include <$cf_header> @@ -20118,22 +20586,23 @@ main (void) int x = openpty((int *)0, (int *)0, (char *)0, (struct termios *)0, (struct winsize *)0); + (void)x; ; return 0; } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:20127: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20596: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20130: \$? = $ac_status" >&5 + echo "$as_me:20599: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:20133: \"$ac_try\"") >&5 + { (eval echo "$as_me:20602: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20136: \$? = $ac_status" >&5 + echo "$as_me:20605: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_func_openpty=$cf_header @@ -20151,7 +20620,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS="$cf_save_LIBS" fi -echo "$as_me:20154: result: $cf_cv_func_openpty" >&5 +echo "$as_me:20623: result: $cf_cv_func_openpty" >&5 echo "${ECHO_T}$cf_cv_func_openpty" >&6 if test "$cf_cv_func_openpty" != no ; then @@ -20185,7 +20654,7 @@ TEST_LIBS="$cf_add_libs" fi fi -echo "$as_me:20188: checking for function curses_version" >&5 +echo "$as_me:20657: checking for function curses_version" >&5 echo $ECHO_N "checking for function curses_version... $ECHO_C" >&6 if test "${cf_cv_func_curses_version+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -20195,7 +20664,7 @@ if test "$cross_compiling" = yes; then cf_cv_func_curses_version=unknown else cat >"conftest.$ac_ext" <<_ACEOF -#line 20198 "configure" +#line 20667 "configure" #include "confdefs.h" $ac_includes_default @@ -20211,15 +20680,15 @@ int main(void) _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:20214: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20683: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20217: \$? = $ac_status" >&5 + echo "$as_me:20686: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:20219: \"$ac_try\"") >&5 + { (eval echo "$as_me:20688: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20222: \$? = $ac_status" >&5 + echo "$as_me:20691: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_func_curses_version=yes @@ -20234,14 +20703,14 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes fi rm -f core fi -echo "$as_me:20237: result: $cf_cv_func_curses_version" >&5 +echo "$as_me:20706: result: $cf_cv_func_curses_version" >&5 echo "${ECHO_T}$cf_cv_func_curses_version" >&6 test "$cf_cv_func_curses_version" = yes && cat >>confdefs.h <<\EOF #define HAVE_CURSES_VERSION 1 EOF -echo "$as_me:20244: checking for alternate character set array" >&5 +echo "$as_me:20713: checking for alternate character set array" >&5 echo $ECHO_N "checking for alternate character set array... $ECHO_C" >&6 if test "${cf_cv_curses_acs_map+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -20251,7 +20720,7 @@ cf_cv_curses_acs_map=unknown for name in acs_map _acs_map __acs_map ${NCURSES_WRAP_PREFIX}acs_map do cat >"conftest.$ac_ext" <<_ACEOF -#line 20254 "configure" +#line 20723 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -20267,16 +20736,16 @@ ${name}['k'] = ACS_PLUS } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:20270: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20739: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20273: \$? = $ac_status" >&5 + echo "$as_me:20742: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:20276: \"$ac_try\"") >&5 + { (eval echo "$as_me:20745: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20279: \$? = $ac_status" >&5 + echo "$as_me:20748: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_curses_acs_map=$name; break else @@ -20287,7 +20756,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" done fi -echo "$as_me:20290: result: $cf_cv_curses_acs_map" >&5 +echo "$as_me:20759: result: $cf_cv_curses_acs_map" >&5 echo "${ECHO_T}$cf_cv_curses_acs_map" >&6 test "$cf_cv_curses_acs_map" != unknown && @@ -20297,7 +20766,7 @@ EOF if test "$cf_enable_widec" = yes; then -echo "$as_me:20300: checking for wide alternate character set array" >&5 +echo "$as_me:20769: checking for wide alternate character set array" >&5 echo $ECHO_N "checking for wide alternate character set array... $ECHO_C" >&6 if test "${cf_cv_curses_wacs_map+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -20307,7 +20776,7 @@ else for name in wacs_map _wacs_map __wacs_map _nc_wacs _wacs_char do cat >"conftest.$ac_ext" <<_ACEOF -#line 20310 "configure" +#line 20779 "configure" #include "confdefs.h" #ifndef _XOPEN_SOURCE_EXTENDED @@ -20323,16 +20792,16 @@ void *foo = &(${name}['k']); (void)foo } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:20326: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20795: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20329: \$? = $ac_status" >&5 + echo "$as_me:20798: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:20332: \"$ac_try\"") >&5 + { (eval echo "$as_me:20801: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20335: \$? = $ac_status" >&5 + echo "$as_me:20804: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_curses_wacs_map=$name break @@ -20343,7 +20812,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" done fi -echo "$as_me:20346: result: $cf_cv_curses_wacs_map" >&5 +echo "$as_me:20815: result: $cf_cv_curses_wacs_map" >&5 echo "${ECHO_T}$cf_cv_curses_wacs_map" >&6 test "$cf_cv_curses_wacs_map" != unknown && @@ -20351,7 +20820,7 @@ cat >>confdefs.h <&5 +echo "$as_me:20823: checking for wide alternate character constants" >&5 echo $ECHO_N "checking for wide alternate character constants... $ECHO_C" >&6 if test "${cf_cv_curses_wacs_symbols+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -20361,7 +20830,7 @@ cf_cv_curses_wacs_symbols=no if test "$cf_cv_curses_wacs_map" != unknown then cat >"conftest.$ac_ext" <<_ACEOF -#line 20364 "configure" +#line 20833 "configure" #include "confdefs.h" #ifndef _XOPEN_SOURCE_EXTENDED @@ -20378,16 +20847,16 @@ cchar_t *foo = WACS_PLUS; } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:20381: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20850: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20384: \$? = $ac_status" >&5 + echo "$as_me:20853: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:20387: \"$ac_try\"") >&5 + { (eval echo "$as_me:20856: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20390: \$? = $ac_status" >&5 + echo "$as_me:20859: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_curses_wacs_symbols=yes else @@ -20397,7 +20866,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" else cat >"conftest.$ac_ext" <<_ACEOF -#line 20400 "configure" +#line 20869 "configure" #include "confdefs.h" #ifndef _XOPEN_SOURCE_EXTENDED @@ -20413,16 +20882,16 @@ cchar_t *foo = WACS_PLUS; (void)foo } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:20416: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20885: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20419: \$? = $ac_status" >&5 + echo "$as_me:20888: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:20422: \"$ac_try\"") >&5 + { (eval echo "$as_me:20891: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20425: \$? = $ac_status" >&5 + echo "$as_me:20894: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_curses_wacs_symbols=yes else @@ -20433,7 +20902,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi fi -echo "$as_me:20436: result: $cf_cv_curses_wacs_symbols" >&5 +echo "$as_me:20905: result: $cf_cv_curses_wacs_symbols" >&5 echo "${ECHO_T}$cf_cv_curses_wacs_symbols" >&6 test "$cf_cv_curses_wacs_symbols" != no && @@ -20443,10 +20912,10 @@ EOF fi -echo "$as_me:20446: checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}" >&5 +echo "$as_me:20915: checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}" >&5 echo $ECHO_N "checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6 cat >"conftest.$ac_ext" <<_ACEOF -#line 20449 "configure" +#line 20918 "configure" #include "confdefs.h" #ifndef _XOPEN_SOURCE_EXTENDED @@ -20464,16 +20933,16 @@ attr_t foo } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:20467: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:20936: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20470: \$? = $ac_status" >&5 + echo "$as_me:20939: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:20473: \"$ac_try\"") >&5 + { (eval echo "$as_me:20942: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20476: \$? = $ac_status" >&5 + echo "$as_me:20945: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_result=yes else @@ -20482,7 +20951,7 @@ cat "conftest.$ac_ext" >&5 cf_result=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" -echo "$as_me:20485: result: $cf_result" >&5 +echo "$as_me:20954: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" = yes ; then @@ -20503,14 +20972,14 @@ fi if test "$cf_enable_widec" = yes; then # This is needed on Tru64 5.0 to declare mbstate_t -echo "$as_me:20506: checking if we must include wchar.h to declare mbstate_t" >&5 +echo "$as_me:20975: checking if we must include wchar.h to declare mbstate_t" >&5 echo $ECHO_N "checking if we must include wchar.h to declare mbstate_t... $ECHO_C" >&6 if test "${cf_cv_mbstate_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 20513 "configure" +#line 20982 "configure" #include "confdefs.h" #include @@ -20522,29 +20991,29 @@ cat >"conftest.$ac_ext" <<_ACEOF int main (void) { -mbstate_t state +mbstate_t state; (void)state ; return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:20531: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:21000: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20534: \$? = $ac_status" >&5 + echo "$as_me:21003: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:20537: \"$ac_try\"") >&5 + { (eval echo "$as_me:21006: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20540: \$? = $ac_status" >&5 + echo "$as_me:21009: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_mbstate_t=no else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 cat >"conftest.$ac_ext" <<_ACEOF -#line 20547 "configure" +#line 21016 "configure" #include "confdefs.h" #include @@ -20557,22 +21026,22 @@ cat >"conftest.$ac_ext" <<_ACEOF int main (void) { -mbstate_t value +mbstate_t value; (void) value ; return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:20566: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:21035: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20569: \$? = $ac_status" >&5 + echo "$as_me:21038: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:20572: \"$ac_try\"") >&5 + { (eval echo "$as_me:21041: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20575: \$? = $ac_status" >&5 + echo "$as_me:21044: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_mbstate_t=yes else @@ -20584,7 +21053,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:20587: result: $cf_cv_mbstate_t" >&5 +echo "$as_me:21056: result: $cf_cv_mbstate_t" >&5 echo "${ECHO_T}$cf_cv_mbstate_t" >&6 if test "$cf_cv_mbstate_t" = yes ; then @@ -20607,14 +21076,14 @@ if test "$cf_cv_mbstate_t" != unknown ; then fi # This is needed on Tru64 5.0 to declare wchar_t -echo "$as_me:20610: checking if we must include wchar.h to declare wchar_t" >&5 +echo "$as_me:21079: checking if we must include wchar.h to declare wchar_t" >&5 echo $ECHO_N "checking if we must include wchar.h to declare wchar_t... $ECHO_C" >&6 if test "${cf_cv_wchar_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 20617 "configure" +#line 21086 "configure" #include "confdefs.h" #include @@ -20626,29 +21095,29 @@ cat >"conftest.$ac_ext" <<_ACEOF int main (void) { -wchar_t state +wchar_t state; (void)state ; return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:20635: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:21104: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20638: \$? = $ac_status" >&5 + echo "$as_me:21107: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:20641: \"$ac_try\"") >&5 + { (eval echo "$as_me:21110: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20644: \$? = $ac_status" >&5 + echo "$as_me:21113: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_wchar_t=no else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 cat >"conftest.$ac_ext" <<_ACEOF -#line 20651 "configure" +#line 21120 "configure" #include "confdefs.h" #include @@ -20661,22 +21130,22 @@ cat >"conftest.$ac_ext" <<_ACEOF int main (void) { -wchar_t value +wchar_t value; (void) value ; return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:20670: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:21139: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20673: \$? = $ac_status" >&5 + echo "$as_me:21142: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:20676: \"$ac_try\"") >&5 + { (eval echo "$as_me:21145: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20679: \$? = $ac_status" >&5 + echo "$as_me:21148: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_wchar_t=yes else @@ -20688,7 +21157,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:20691: result: $cf_cv_wchar_t" >&5 +echo "$as_me:21160: result: $cf_cv_wchar_t" >&5 echo "${ECHO_T}$cf_cv_wchar_t" >&6 if test "$cf_cv_wchar_t" = yes ; then @@ -20711,14 +21180,14 @@ if test "$cf_cv_wchar_t" != unknown ; then fi # This is needed on Tru64 5.0 to declare wint_t -echo "$as_me:20714: checking if we must include wchar.h to declare wint_t" >&5 +echo "$as_me:21183: checking if we must include wchar.h to declare wint_t" >&5 echo $ECHO_N "checking if we must include wchar.h to declare wint_t... $ECHO_C" >&6 if test "${cf_cv_wint_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 20721 "configure" +#line 21190 "configure" #include "confdefs.h" #include @@ -20730,29 +21199,29 @@ cat >"conftest.$ac_ext" <<_ACEOF int main (void) { -wint_t state +wint_t state; (void)state ; return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:20739: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:21208: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20742: \$? = $ac_status" >&5 + echo "$as_me:21211: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:20745: \"$ac_try\"") >&5 + { (eval echo "$as_me:21214: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20748: \$? = $ac_status" >&5 + echo "$as_me:21217: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_wint_t=no else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 cat >"conftest.$ac_ext" <<_ACEOF -#line 20755 "configure" +#line 21224 "configure" #include "confdefs.h" #include @@ -20765,22 +21234,22 @@ cat >"conftest.$ac_ext" <<_ACEOF int main (void) { -wint_t value +wint_t value; (void) value ; return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:20774: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:21243: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20777: \$? = $ac_status" >&5 + echo "$as_me:21246: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:20780: \"$ac_try\"") >&5 + { (eval echo "$as_me:21249: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20783: \$? = $ac_status" >&5 + echo "$as_me:21252: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_wint_t=yes else @@ -20792,7 +21261,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:20795: result: $cf_cv_wint_t" >&5 +echo "$as_me:21264: result: $cf_cv_wint_t" >&5 echo "${ECHO_T}$cf_cv_wint_t" >&6 if test "$cf_cv_wint_t" = yes ; then @@ -20816,10 +21285,10 @@ fi if test "$NCURSES_OK_MBSTATE_T" = 0 ; then -echo "$as_me:20819: checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}" >&5 +echo "$as_me:21288: checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}" >&5 echo $ECHO_N "checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6 cat >"conftest.$ac_ext" <<_ACEOF -#line 20822 "configure" +#line 21291 "configure" #include "confdefs.h" #ifndef _XOPEN_SOURCE_EXTENDED @@ -20837,16 +21306,16 @@ mbstate_t foo } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:20840: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:21309: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20843: \$? = $ac_status" >&5 + echo "$as_me:21312: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:20846: \"$ac_try\"") >&5 + { (eval echo "$as_me:21315: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20849: \$? = $ac_status" >&5 + echo "$as_me:21318: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_result=yes else @@ -20855,7 +21324,7 @@ cat "conftest.$ac_ext" >&5 cf_result=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" -echo "$as_me:20858: result: $cf_result" >&5 +echo "$as_me:21327: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" = yes ; then @@ -20877,10 +21346,10 @@ fi if test "$NCURSES_OK_WCHAR_T" = 0 ; then -echo "$as_me:20880: checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}" >&5 +echo "$as_me:21349: checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}" >&5 echo $ECHO_N "checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6 cat >"conftest.$ac_ext" <<_ACEOF -#line 20883 "configure" +#line 21352 "configure" #include "confdefs.h" #ifndef _XOPEN_SOURCE_EXTENDED @@ -20898,16 +21367,16 @@ wchar_t foo } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:20901: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:21370: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20904: \$? = $ac_status" >&5 + echo "$as_me:21373: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:20907: \"$ac_try\"") >&5 + { (eval echo "$as_me:21376: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20910: \$? = $ac_status" >&5 + echo "$as_me:21379: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_result=yes else @@ -20916,7 +21385,7 @@ cat "conftest.$ac_ext" >&5 cf_result=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" -echo "$as_me:20919: result: $cf_result" >&5 +echo "$as_me:21388: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" = yes ; then @@ -20938,10 +21407,10 @@ fi if test "$NCURSES_OK_WINT_T" = 0 ; then -echo "$as_me:20941: checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}" >&5 +echo "$as_me:21410: checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}" >&5 echo $ECHO_N "checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6 cat >"conftest.$ac_ext" <<_ACEOF -#line 20944 "configure" +#line 21413 "configure" #include "confdefs.h" #ifndef _XOPEN_SOURCE_EXTENDED @@ -20959,16 +21428,16 @@ wint_t foo } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:20962: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:21431: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20965: \$? = $ac_status" >&5 + echo "$as_me:21434: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:20968: \"$ac_try\"") >&5 + { (eval echo "$as_me:21437: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20971: \$? = $ac_status" >&5 + echo "$as_me:21440: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_result=yes else @@ -20977,7 +21446,7 @@ cat "conftest.$ac_ext" >&5 cf_result=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" -echo "$as_me:20980: result: $cf_result" >&5 +echo "$as_me:21449: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" = yes ; then @@ -21006,11 +21475,11 @@ boolnames \ boolfnames \ ttytype do -echo "$as_me:21009: checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}" >&5 +echo "$as_me:21478: checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}" >&5 echo $ECHO_N "checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6 cat >"conftest.$ac_ext" <<_ACEOF -#line 21013 "configure" +#line 21482 "configure" #include "confdefs.h" #ifdef HAVE_XCURSES @@ -21043,16 +21512,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:21046: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:21515: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:21049: \$? = $ac_status" >&5 + echo "$as_me:21518: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:21052: \"$ac_try\"") >&5 + { (eval echo "$as_me:21521: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21055: \$? = $ac_status" >&5 + echo "$as_me:21524: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_result=yes @@ -21062,7 +21531,7 @@ cat "conftest.$ac_ext" >&5 cf_result=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" -echo "$as_me:21065: result: $cf_result" >&5 +echo "$as_me:21534: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" = yes ; then @@ -21074,14 +21543,14 @@ cf_result=`echo "have_curses_data_$cf_data" | sed y%abcdefghijklmnopqrstuvwxyz./ EOF else - echo "$as_me:21077: checking for data $cf_data in library" >&5 + echo "$as_me:21546: checking for data $cf_data in library" >&5 echo $ECHO_N "checking for data $cf_data in library... $ECHO_C" >&6 # BSD linkers insist on making weak linkage, but resolve at runtime. if test "$cross_compiling" = yes; then # cross-compiling cat >"conftest.$ac_ext" <<_ACEOF -#line 21084 "configure" +#line 21553 "configure" #include "confdefs.h" #ifdef HAVE_XCURSES @@ -21120,16 +21589,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:21123: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21592: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21126: \$? = $ac_status" >&5 + echo "$as_me:21595: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:21129: \"$ac_try\"") >&5 + { (eval echo "$as_me:21598: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21132: \$? = $ac_status" >&5 + echo "$as_me:21601: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_result=yes else @@ -21141,7 +21610,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" else cat >"conftest.$ac_ext" <<_ACEOF -#line 21144 "configure" +#line 21613 "configure" #include "confdefs.h" #ifdef HAVE_XCURSES @@ -21173,15 +21642,15 @@ int main(void) } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:21176: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21645: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21179: \$? = $ac_status" >&5 + echo "$as_me:21648: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:21181: \"$ac_try\"") >&5 + { (eval echo "$as_me:21650: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21184: \$? = $ac_status" >&5 + echo "$as_me:21653: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_result=yes @@ -21193,7 +21662,7 @@ cf_result=no fi rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext" fi - echo "$as_me:21196: result: $cf_result" >&5 + echo "$as_me:21665: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" = yes ; then @@ -21210,7 +21679,7 @@ done if test -n "$with_screen" && test "x$with_screen" = "xpdcurses" then - echo "$as_me:21213: checking for X" >&5 + echo "$as_me:21682: checking for X" >&5 echo $ECHO_N "checking for X... $ECHO_C" >&6 # Check whether --with-x or --without-x was given. @@ -21314,17 +21783,17 @@ if test "$ac_x_includes" = no; then # Guess where to find include files, by looking for Intrinsic.h. # First, try using that file with no special directory specified. cat >"conftest.$ac_ext" <<_ACEOF -#line 21317 "configure" +#line 21786 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:21321: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:21790: \"$ac_cpp "conftest.$ac_ext"\"") >&5 (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:21327: \$? = $ac_status" >&5 + echo "$as_me:21796: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -21357,7 +21826,7 @@ if test "$ac_x_libraries" = no; then ac_save_LIBS=$LIBS LIBS="-lXt $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 21360 "configure" +#line 21829 "configure" #include "confdefs.h" #include int @@ -21369,16 +21838,16 @@ XtMalloc (0) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:21372: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21841: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21375: \$? = $ac_status" >&5 + echo "$as_me:21844: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:21378: \"$ac_try\"") >&5 + { (eval echo "$as_me:21847: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21381: \$? = $ac_status" >&5 + echo "$as_me:21850: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then LIBS=$ac_save_LIBS # We can link X programs with no special library path. @@ -21416,7 +21885,7 @@ fi fi # $with_x != no if test "$have_x" != yes; then - echo "$as_me:21419: result: $have_x" >&5 + echo "$as_me:21888: result: $have_x" >&5 echo "${ECHO_T}$have_x" >&6 no_x=yes else @@ -21426,7 +21895,7 @@ else # Update the cache value to reflect the command line values. ac_cv_have_x="have_x=yes \ ac_x_includes=$x_includes ac_x_libraries=$x_libraries" - echo "$as_me:21429: result: libraries $x_libraries, headers $x_includes" >&5 + echo "$as_me:21898: result: libraries $x_libraries, headers $x_includes" >&5 echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6 fi @@ -21453,11 +21922,11 @@ else # others require no space. Words are not sufficient . . . . case `(uname -sr) 2>/dev/null` in "SunOS 5"*) - echo "$as_me:21456: checking whether -R must be followed by a space" >&5 + echo "$as_me:21925: checking whether -R must be followed by a space" >&5 echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6 ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries" cat >"conftest.$ac_ext" <<_ACEOF -#line 21460 "configure" +#line 21929 "configure" #include "confdefs.h" int @@ -21469,16 +21938,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:21472: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21941: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21475: \$? = $ac_status" >&5 + echo "$as_me:21944: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:21478: \"$ac_try\"") >&5 + { (eval echo "$as_me:21947: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21481: \$? = $ac_status" >&5 + echo "$as_me:21950: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_R_nospace=yes else @@ -21488,13 +21957,13 @@ ac_R_nospace=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" if test $ac_R_nospace = yes; then - echo "$as_me:21491: result: no" >&5 + echo "$as_me:21960: result: no" >&5 echo "${ECHO_T}no" >&6 X_LIBS="$X_LIBS -R$x_libraries" else LIBS="$ac_xsave_LIBS -R $x_libraries" cat >"conftest.$ac_ext" <<_ACEOF -#line 21497 "configure" +#line 21966 "configure" #include "confdefs.h" int @@ -21506,16 +21975,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:21509: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21978: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21512: \$? = $ac_status" >&5 + echo "$as_me:21981: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:21515: \"$ac_try\"") >&5 + { (eval echo "$as_me:21984: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21518: \$? = $ac_status" >&5 + echo "$as_me:21987: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_R_space=yes else @@ -21525,11 +21994,11 @@ ac_R_space=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" if test $ac_R_space = yes; then - echo "$as_me:21528: result: yes" >&5 + echo "$as_me:21997: result: yes" >&5 echo "${ECHO_T}yes" >&6 X_LIBS="$X_LIBS -R $x_libraries" else - echo "$as_me:21532: result: neither works" >&5 + echo "$as_me:22001: result: neither works" >&5 echo "${ECHO_T}neither works" >&6 fi fi @@ -21549,7 +22018,7 @@ echo "${ECHO_T}neither works" >&6 # the Alpha needs dnet_stub (dnet does not exist). ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11" cat >"conftest.$ac_ext" <<_ACEOF -#line 21552 "configure" +#line 22021 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -21558,7 +22027,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char XOpenDisplay (); +char XOpenDisplay (void); int main (void) { @@ -21568,22 +22037,22 @@ XOpenDisplay (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:21571: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22040: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21574: \$? = $ac_status" >&5 + echo "$as_me:22043: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:21577: \"$ac_try\"") >&5 + { (eval echo "$as_me:22046: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21580: \$? = $ac_status" >&5 + echo "$as_me:22049: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 -echo "$as_me:21586: checking for dnet_ntoa in -ldnet" >&5 +echo "$as_me:22055: checking for dnet_ntoa in -ldnet" >&5 echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6 if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -21591,7 +22060,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldnet $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 21594 "configure" +#line 22063 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -21600,7 +22069,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char dnet_ntoa (); +char dnet_ntoa (void); int main (void) { @@ -21610,16 +22079,16 @@ dnet_ntoa (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:21613: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22082: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21616: \$? = $ac_status" >&5 + echo "$as_me:22085: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:21619: \"$ac_try\"") >&5 + { (eval echo "$as_me:22088: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21622: \$? = $ac_status" >&5 + echo "$as_me:22091: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_dnet_dnet_ntoa=yes else @@ -21630,14 +22099,14 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:21633: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 +echo "$as_me:22102: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6 if test "$ac_cv_lib_dnet_dnet_ntoa" = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" fi if test $ac_cv_lib_dnet_dnet_ntoa = no; then - echo "$as_me:21640: checking for dnet_ntoa in -ldnet_stub" >&5 + echo "$as_me:22109: checking for dnet_ntoa in -ldnet_stub" >&5 echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6 if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -21645,7 +22114,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldnet_stub $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 21648 "configure" +#line 22117 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -21654,7 +22123,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char dnet_ntoa (); +char dnet_ntoa (void); int main (void) { @@ -21664,16 +22133,16 @@ dnet_ntoa (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:21667: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22136: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21670: \$? = $ac_status" >&5 + echo "$as_me:22139: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:21673: \"$ac_try\"") >&5 + { (eval echo "$as_me:22142: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21676: \$? = $ac_status" >&5 + echo "$as_me:22145: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_dnet_stub_dnet_ntoa=yes else @@ -21684,7 +22153,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:21687: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 +echo "$as_me:22156: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6 if test "$ac_cv_lib_dnet_stub_dnet_ntoa" = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" @@ -21703,13 +22172,13 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" # on Irix 5.2, according to T.E. Dickey. # The functions gethostbyname, getservbyname, and inet_addr are # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking. - echo "$as_me:21706: checking for gethostbyname" >&5 + echo "$as_me:22175: checking for gethostbyname" >&5 echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6 if test "${ac_cv_func_gethostbyname+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 21712 "configure" +#line 22181 "configure" #include "confdefs.h" #define gethostbyname autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -21740,16 +22209,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:21743: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22212: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21746: \$? = $ac_status" >&5 + echo "$as_me:22215: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:21749: \"$ac_try\"") >&5 + { (eval echo "$as_me:22218: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21752: \$? = $ac_status" >&5 + echo "$as_me:22221: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_gethostbyname=yes else @@ -21759,11 +22228,11 @@ ac_cv_func_gethostbyname=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:21762: result: $ac_cv_func_gethostbyname" >&5 +echo "$as_me:22231: result: $ac_cv_func_gethostbyname" >&5 echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6 if test $ac_cv_func_gethostbyname = no; then - echo "$as_me:21766: checking for gethostbyname in -lnsl" >&5 + echo "$as_me:22235: checking for gethostbyname in -lnsl" >&5 echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6 if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -21771,7 +22240,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lnsl $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 21774 "configure" +#line 22243 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -21780,7 +22249,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char gethostbyname (); +char gethostbyname (void); int main (void) { @@ -21790,16 +22259,16 @@ gethostbyname (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:21793: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22262: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21796: \$? = $ac_status" >&5 + echo "$as_me:22265: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:21799: \"$ac_try\"") >&5 + { (eval echo "$as_me:22268: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21802: \$? = $ac_status" >&5 + echo "$as_me:22271: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_nsl_gethostbyname=yes else @@ -21810,14 +22279,14 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:21813: result: $ac_cv_lib_nsl_gethostbyname" >&5 +echo "$as_me:22282: result: $ac_cv_lib_nsl_gethostbyname" >&5 echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6 if test "$ac_cv_lib_nsl_gethostbyname" = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" fi if test $ac_cv_lib_nsl_gethostbyname = no; then - echo "$as_me:21820: checking for gethostbyname in -lbsd" >&5 + echo "$as_me:22289: checking for gethostbyname in -lbsd" >&5 echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6 if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -21825,7 +22294,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lbsd $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 21828 "configure" +#line 22297 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -21834,7 +22303,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char gethostbyname (); +char gethostbyname (void); int main (void) { @@ -21844,16 +22313,16 @@ gethostbyname (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:21847: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22316: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21850: \$? = $ac_status" >&5 + echo "$as_me:22319: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:21853: \"$ac_try\"") >&5 + { (eval echo "$as_me:22322: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21856: \$? = $ac_status" >&5 + echo "$as_me:22325: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_bsd_gethostbyname=yes else @@ -21864,7 +22333,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:21867: result: $ac_cv_lib_bsd_gethostbyname" >&5 +echo "$as_me:22336: result: $ac_cv_lib_bsd_gethostbyname" >&5 echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6 if test "$ac_cv_lib_bsd_gethostbyname" = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd" @@ -21880,13 +22349,13 @@ fi # variants that don't use the nameserver (or something). -lsocket # must be given before -lnsl if both are needed. We assume that # if connect needs -lnsl, so does gethostbyname. - echo "$as_me:21883: checking for connect" >&5 + echo "$as_me:22352: checking for connect" >&5 echo $ECHO_N "checking for connect... $ECHO_C" >&6 if test "${ac_cv_func_connect+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 21889 "configure" +#line 22358 "configure" #include "confdefs.h" #define connect autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -21917,16 +22386,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:21920: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22389: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21923: \$? = $ac_status" >&5 + echo "$as_me:22392: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:21926: \"$ac_try\"") >&5 + { (eval echo "$as_me:22395: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21929: \$? = $ac_status" >&5 + echo "$as_me:22398: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_connect=yes else @@ -21936,11 +22405,11 @@ ac_cv_func_connect=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:21939: result: $ac_cv_func_connect" >&5 +echo "$as_me:22408: result: $ac_cv_func_connect" >&5 echo "${ECHO_T}$ac_cv_func_connect" >&6 if test $ac_cv_func_connect = no; then - echo "$as_me:21943: checking for connect in -lsocket" >&5 + echo "$as_me:22412: checking for connect in -lsocket" >&5 echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6 if test "${ac_cv_lib_socket_connect+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -21948,7 +22417,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lsocket $X_EXTRA_LIBS $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 21951 "configure" +#line 22420 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -21957,7 +22426,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char connect (); +char connect (void); int main (void) { @@ -21967,16 +22436,16 @@ connect (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:21970: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22439: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21973: \$? = $ac_status" >&5 + echo "$as_me:22442: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:21976: \"$ac_try\"") >&5 + { (eval echo "$as_me:22445: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21979: \$? = $ac_status" >&5 + echo "$as_me:22448: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_socket_connect=yes else @@ -21987,7 +22456,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:21990: result: $ac_cv_lib_socket_connect" >&5 +echo "$as_me:22459: result: $ac_cv_lib_socket_connect" >&5 echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6 if test "$ac_cv_lib_socket_connect" = yes; then X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" @@ -21996,13 +22465,13 @@ fi fi # Guillermo Gomez says -lposix is necessary on A/UX. - echo "$as_me:21999: checking for remove" >&5 + echo "$as_me:22468: checking for remove" >&5 echo $ECHO_N "checking for remove... $ECHO_C" >&6 if test "${ac_cv_func_remove+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 22005 "configure" +#line 22474 "configure" #include "confdefs.h" #define remove autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -22033,16 +22502,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:22036: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22505: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22039: \$? = $ac_status" >&5 + echo "$as_me:22508: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:22042: \"$ac_try\"") >&5 + { (eval echo "$as_me:22511: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22045: \$? = $ac_status" >&5 + echo "$as_me:22514: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_remove=yes else @@ -22052,11 +22521,11 @@ ac_cv_func_remove=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:22055: result: $ac_cv_func_remove" >&5 +echo "$as_me:22524: result: $ac_cv_func_remove" >&5 echo "${ECHO_T}$ac_cv_func_remove" >&6 if test $ac_cv_func_remove = no; then - echo "$as_me:22059: checking for remove in -lposix" >&5 + echo "$as_me:22528: checking for remove in -lposix" >&5 echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6 if test "${ac_cv_lib_posix_remove+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -22064,7 +22533,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lposix $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 22067 "configure" +#line 22536 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -22073,7 +22542,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char remove (); +char remove (void); int main (void) { @@ -22083,16 +22552,16 @@ remove (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:22086: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22555: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22089: \$? = $ac_status" >&5 + echo "$as_me:22558: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:22092: \"$ac_try\"") >&5 + { (eval echo "$as_me:22561: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22095: \$? = $ac_status" >&5 + echo "$as_me:22564: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_posix_remove=yes else @@ -22103,7 +22572,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:22106: result: $ac_cv_lib_posix_remove" >&5 +echo "$as_me:22575: result: $ac_cv_lib_posix_remove" >&5 echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6 if test "$ac_cv_lib_posix_remove" = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" @@ -22112,13 +22581,13 @@ fi fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. - echo "$as_me:22115: checking for shmat" >&5 + echo "$as_me:22584: checking for shmat" >&5 echo $ECHO_N "checking for shmat... $ECHO_C" >&6 if test "${ac_cv_func_shmat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 22121 "configure" +#line 22590 "configure" #include "confdefs.h" #define shmat autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -22149,16 +22618,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:22152: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22621: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22155: \$? = $ac_status" >&5 + echo "$as_me:22624: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:22158: \"$ac_try\"") >&5 + { (eval echo "$as_me:22627: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22161: \$? = $ac_status" >&5 + echo "$as_me:22630: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_shmat=yes else @@ -22168,11 +22637,11 @@ ac_cv_func_shmat=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:22171: result: $ac_cv_func_shmat" >&5 +echo "$as_me:22640: result: $ac_cv_func_shmat" >&5 echo "${ECHO_T}$ac_cv_func_shmat" >&6 if test $ac_cv_func_shmat = no; then - echo "$as_me:22175: checking for shmat in -lipc" >&5 + echo "$as_me:22644: checking for shmat in -lipc" >&5 echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6 if test "${ac_cv_lib_ipc_shmat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -22180,7 +22649,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lipc $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 22183 "configure" +#line 22652 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -22189,7 +22658,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char shmat (); +char shmat (void); int main (void) { @@ -22199,16 +22668,16 @@ shmat (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:22202: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22671: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22205: \$? = $ac_status" >&5 + echo "$as_me:22674: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:22208: \"$ac_try\"") >&5 + { (eval echo "$as_me:22677: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22211: \$? = $ac_status" >&5 + echo "$as_me:22680: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_ipc_shmat=yes else @@ -22219,7 +22688,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:22222: result: $ac_cv_lib_ipc_shmat" >&5 +echo "$as_me:22691: result: $ac_cv_lib_ipc_shmat" >&5 echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6 if test "$ac_cv_lib_ipc_shmat" = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" @@ -22237,7 +22706,7 @@ fi # These have to be linked with before -lX11, unlike the other # libraries we check for below, so use a different variable. # John Interrante, Karl Berry - echo "$as_me:22240: checking for IceConnectionNumber in -lICE" >&5 + echo "$as_me:22709: checking for IceConnectionNumber in -lICE" >&5 echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6 if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -22245,7 +22714,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lICE $X_EXTRA_LIBS $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 22248 "configure" +#line 22717 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -22254,7 +22723,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char IceConnectionNumber (); +char IceConnectionNumber (void); int main (void) { @@ -22264,16 +22733,16 @@ IceConnectionNumber (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:22267: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22736: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22270: \$? = $ac_status" >&5 + echo "$as_me:22739: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:22273: \"$ac_try\"") >&5 + { (eval echo "$as_me:22742: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22276: \$? = $ac_status" >&5 + echo "$as_me:22745: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_ICE_IceConnectionNumber=yes else @@ -22284,7 +22753,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:22287: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 +echo "$as_me:22756: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6 if test "$ac_cv_lib_ICE_IceConnectionNumber" = yes; then X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" @@ -22331,16 +22800,16 @@ then then test -n "$verbose" && echo " repairing CFLAGS: $CFLAGS" 1>&6 -echo "${as_me:-configure}:22334: testing repairing CFLAGS: $CFLAGS ..." 1>&5 +echo "${as_me:-configure}:22803: testing repairing CFLAGS: $CFLAGS ..." 1>&5 CFLAGS="$cf_temp_flags" test -n "$verbose" && echo " ... fixed $CFLAGS" 1>&6 -echo "${as_me:-configure}:22339: testing ... fixed $CFLAGS ..." 1>&5 +echo "${as_me:-configure}:22808: testing ... fixed $CFLAGS ..." 1>&5 test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 -echo "${as_me:-configure}:22343: testing ... extra $EXTRA_CFLAGS ..." 1>&5 +echo "${as_me:-configure}:22812: testing ... extra $EXTRA_CFLAGS ..." 1>&5 fi ;; @@ -22379,16 +22848,16 @@ then then test -n "$verbose" && echo " repairing CPPFLAGS: $CPPFLAGS" 1>&6 -echo "${as_me:-configure}:22382: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5 +echo "${as_me:-configure}:22851: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5 CPPFLAGS="$cf_temp_flags" test -n "$verbose" && echo " ... fixed $CPPFLAGS" 1>&6 -echo "${as_me:-configure}:22387: testing ... fixed $CPPFLAGS ..." 1>&5 +echo "${as_me:-configure}:22856: testing ... fixed $CPPFLAGS ..." 1>&5 test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 -echo "${as_me:-configure}:22391: testing ... extra $EXTRA_CFLAGS ..." 1>&5 +echo "${as_me:-configure}:22860: testing ... extra $EXTRA_CFLAGS ..." 1>&5 fi ;; @@ -22427,23 +22896,23 @@ then then test -n "$verbose" && echo " repairing LDFLAGS: $LDFLAGS" 1>&6 -echo "${as_me:-configure}:22430: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:22899: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5 LDFLAGS="$cf_temp_flags" test -n "$verbose" && echo " ... fixed $LDFLAGS" 1>&6 -echo "${as_me:-configure}:22435: testing ... fixed $LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:22904: testing ... fixed $LDFLAGS ..." 1>&5 test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 -echo "${as_me:-configure}:22439: testing ... extra $EXTRA_CFLAGS ..." 1>&5 +echo "${as_me:-configure}:22908: testing ... extra $EXTRA_CFLAGS ..." 1>&5 fi ;; esac fi -echo "$as_me:22446: checking if you want to turn on gcc warnings" >&5 +echo "$as_me:22915: checking if you want to turn on gcc warnings" >&5 echo $ECHO_N "checking if you want to turn on gcc warnings... $ECHO_C" >&6 # Check whether --enable-warnings or --disable-warnings was given. @@ -22460,7 +22929,7 @@ else enable_warnings=no fi; -echo "$as_me:22463: result: $enable_warnings" >&5 +echo "$as_me:22932: result: $enable_warnings" >&5 echo "${ECHO_T}$enable_warnings" >&6 if test "$enable_warnings" = "yes" then @@ -22483,10 +22952,10 @@ cat > conftest.i <&5 + { echo "$as_me:22955: checking for $CC __attribute__ directives..." >&5 echo "$as_me: checking for $CC __attribute__ directives..." >&6;} cat > "conftest.$ac_ext" < #include "confdefs.h" #include "conftest.h" @@ -22536,12 +23005,12 @@ EOF ;; esac - if { (eval echo "$as_me:22539: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:23008: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:22542: \$? = $ac_status" >&5 + echo "$as_me:23011: \$? = $ac_status" >&5 (exit "$ac_status"); }; then - test -n "$verbose" && echo "$as_me:22544: result: ... $cf_attribute" >&5 + test -n "$verbose" && echo "$as_me:23013: result: ... $cf_attribute" >&5 echo "${ECHO_T}... $cf_attribute" >&6 cat conftest.h >>confdefs.h case "$cf_attribute" in @@ -22619,10 +23088,10 @@ do done cat >"conftest.$ac_ext" <<_ACEOF -#line 22622 "configure" +#line 23091 "configure" #include "confdefs.h" -#include +$ac_includes_default #include int @@ -22634,31 +23103,32 @@ String foo = malloc(1); free((void*)foo) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:22637: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:23106: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:22640: \$? = $ac_status" >&5 + echo "$as_me:23109: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:22643: \"$ac_try\"") >&5 + { (eval echo "$as_me:23112: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22646: \$? = $ac_status" >&5 + echo "$as_me:23115: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then -echo "$as_me:22649: checking for X11/Xt const-feature" >&5 +echo "$as_me:23118: checking for X11/Xt const-feature" >&5 echo $ECHO_N "checking for X11/Xt const-feature... $ECHO_C" >&6 if test "${cf_cv_const_x_string+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 22656 "configure" +#line 23125 "configure" #include "confdefs.h" +#undef _CONST_X_STRING #define _CONST_X_STRING /* X11R7.8 (perhaps) */ #undef XTSTRINGDEFINES /* X11R5 and later */ -#include +$ac_includes_default #include int @@ -22670,16 +23140,16 @@ String foo = malloc(1); *foo = 0 } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:22673: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:23143: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:22676: \$? = $ac_status" >&5 + echo "$as_me:23146: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:22679: \"$ac_try\"") >&5 + { (eval echo "$as_me:23149: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22682: \$? = $ac_status" >&5 + echo "$as_me:23152: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_const_x_string=no @@ -22694,7 +23164,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:22697: result: $cf_cv_const_x_string" >&5 +echo "$as_me:23167: result: $cf_cv_const_x_string" >&5 echo "${ECHO_T}$cf_cv_const_x_string" >&6 LIBS="$cf_save_LIBS_CF_CONST_X_STRING" @@ -22723,7 +23193,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi cat > "conftest.$ac_ext" <&5 + { echo "$as_me:23212: checking for $CC warning options..." >&5 echo "$as_me: checking for $CC warning options..." >&6;} cf_save_CFLAGS="$CFLAGS" EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall" @@ -22755,12 +23225,12 @@ echo "$as_me: checking for $CC warning options..." >&6;} wd981 do CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" - if { (eval echo "$as_me:22758: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:23228: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:22761: \$? = $ac_status" >&5 + echo "$as_me:23231: \$? = $ac_status" >&5 (exit "$ac_status"); }; then - test -n "$verbose" && echo "$as_me:22763: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:23233: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt" fi @@ -22768,7 +23238,7 @@ echo "${ECHO_T}... -$cf_opt" >&6 CFLAGS="$cf_save_CFLAGS" elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown" then - { echo "$as_me:22771: checking for $CC warning options..." >&5 + { echo "$as_me:23241: checking for $CC warning options..." >&5 echo "$as_me: checking for $CC warning options..." >&6;} cf_save_CFLAGS="$CFLAGS" cf_warn_CONST="" @@ -22791,12 +23261,12 @@ echo "$as_me: checking for $CC warning options..." >&6;} Wundef Wno-inline $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas do CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" - if { (eval echo "$as_me:22794: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:23264: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:22797: \$? = $ac_status" >&5 + echo "$as_me:23267: \$? = $ac_status" >&5 (exit "$ac_status"); }; then - test -n "$verbose" && echo "$as_me:22799: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:23269: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 case "$cf_opt" in (Winline) @@ -22804,7 +23274,7 @@ echo "${ECHO_T}... -$cf_opt" >&6 ([34].*) test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6 -echo "${as_me:-configure}:22807: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 +echo "${as_me:-configure}:23277: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 continue;; esac @@ -22814,7 +23284,7 @@ echo "${as_me:-configure}:22807: testing feature is broken in gcc $GCC_VERSION . ([12].*) test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6 -echo "${as_me:-configure}:22817: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 +echo "${as_me:-configure}:23287: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 continue;; esac @@ -22831,7 +23301,7 @@ fi fi -echo "$as_me:22834: checking if you want to use dmalloc for testing" >&5 +echo "$as_me:23304: checking if you want to use dmalloc for testing" >&5 echo $ECHO_N "checking if you want to use dmalloc for testing... $ECHO_C" >&6 # Check whether --with-dmalloc or --without-dmalloc was given. @@ -22853,7 +23323,7 @@ EOF else with_dmalloc= fi; -echo "$as_me:22856: result: ${with_dmalloc:-no}" >&5 +echo "$as_me:23326: result: ${with_dmalloc:-no}" >&5 echo "${ECHO_T}${with_dmalloc:-no}" >&6 case ".$with_cflags" in @@ -22967,23 +23437,23 @@ fi esac if test "$with_dmalloc" = yes ; then - echo "$as_me:22970: checking for dmalloc.h" >&5 + echo "$as_me:23440: checking for dmalloc.h" >&5 echo $ECHO_N "checking for dmalloc.h... $ECHO_C" >&6 if test "${ac_cv_header_dmalloc_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 22976 "configure" +#line 23446 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:22980: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:23450: \"$ac_cpp "conftest.$ac_ext"\"") >&5 (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:22986: \$? = $ac_status" >&5 + echo "$as_me:23456: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -23002,11 +23472,11 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:23005: result: $ac_cv_header_dmalloc_h" >&5 +echo "$as_me:23475: result: $ac_cv_header_dmalloc_h" >&5 echo "${ECHO_T}$ac_cv_header_dmalloc_h" >&6 if test "$ac_cv_header_dmalloc_h" = yes; then -echo "$as_me:23009: checking for dmalloc_debug in -ldmalloc" >&5 +echo "$as_me:23479: checking for dmalloc_debug in -ldmalloc" >&5 echo $ECHO_N "checking for dmalloc_debug in -ldmalloc... $ECHO_C" >&6 if test "${ac_cv_lib_dmalloc_dmalloc_debug+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -23014,7 +23484,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldmalloc $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 23017 "configure" +#line 23487 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -23023,7 +23493,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char dmalloc_debug (); +char dmalloc_debug (void); int main (void) { @@ -23033,16 +23503,16 @@ dmalloc_debug (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:23036: \"$ac_link\"") >&5 +if { (eval echo "$as_me:23506: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:23039: \$? = $ac_status" >&5 + echo "$as_me:23509: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:23042: \"$ac_try\"") >&5 + { (eval echo "$as_me:23512: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23045: \$? = $ac_status" >&5 + echo "$as_me:23515: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_dmalloc_dmalloc_debug=yes else @@ -23053,7 +23523,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:23056: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5 +echo "$as_me:23526: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5 echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6 if test "$ac_cv_lib_dmalloc_dmalloc_debug" = yes; then cat >>confdefs.h <&5 +echo "$as_me:23541: checking if you want to use dbmalloc for testing" >&5 echo $ECHO_N "checking if you want to use dbmalloc for testing... $ECHO_C" >&6 # Check whether --with-dbmalloc or --without-dbmalloc was given. @@ -23090,7 +23560,7 @@ EOF else with_dbmalloc= fi; -echo "$as_me:23093: result: ${with_dbmalloc:-no}" >&5 +echo "$as_me:23563: result: ${with_dbmalloc:-no}" >&5 echo "${ECHO_T}${with_dbmalloc:-no}" >&6 case ".$with_cflags" in @@ -23204,23 +23674,23 @@ fi esac if test "$with_dbmalloc" = yes ; then - echo "$as_me:23207: checking for dbmalloc.h" >&5 + echo "$as_me:23677: checking for dbmalloc.h" >&5 echo $ECHO_N "checking for dbmalloc.h... $ECHO_C" >&6 if test "${ac_cv_header_dbmalloc_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 23213 "configure" +#line 23683 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:23217: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:23687: \"$ac_cpp "conftest.$ac_ext"\"") >&5 (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:23223: \$? = $ac_status" >&5 + echo "$as_me:23693: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -23239,11 +23709,11 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:23242: result: $ac_cv_header_dbmalloc_h" >&5 +echo "$as_me:23712: result: $ac_cv_header_dbmalloc_h" >&5 echo "${ECHO_T}$ac_cv_header_dbmalloc_h" >&6 if test "$ac_cv_header_dbmalloc_h" = yes; then -echo "$as_me:23246: checking for debug_malloc in -ldbmalloc" >&5 +echo "$as_me:23716: checking for debug_malloc in -ldbmalloc" >&5 echo $ECHO_N "checking for debug_malloc in -ldbmalloc... $ECHO_C" >&6 if test "${ac_cv_lib_dbmalloc_debug_malloc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -23251,7 +23721,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldbmalloc $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 23254 "configure" +#line 23724 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -23260,7 +23730,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char debug_malloc (); +char debug_malloc (void); int main (void) { @@ -23270,16 +23740,16 @@ debug_malloc (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:23273: \"$ac_link\"") >&5 +if { (eval echo "$as_me:23743: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:23276: \$? = $ac_status" >&5 + echo "$as_me:23746: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:23279: \"$ac_try\"") >&5 + { (eval echo "$as_me:23749: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23282: \$? = $ac_status" >&5 + echo "$as_me:23752: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_dbmalloc_debug_malloc=yes else @@ -23290,7 +23760,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:23293: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5 +echo "$as_me:23763: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5 echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6 if test "$ac_cv_lib_dbmalloc_debug_malloc" = yes; then cat >>confdefs.h <&5 +echo "$as_me:23778: checking if you want to use valgrind for testing" >&5 echo $ECHO_N "checking if you want to use valgrind for testing... $ECHO_C" >&6 # Check whether --with-valgrind or --without-valgrind was given. @@ -23327,7 +23797,7 @@ EOF else with_valgrind= fi; -echo "$as_me:23330: result: ${with_valgrind:-no}" >&5 +echo "$as_me:23800: result: ${with_valgrind:-no}" >&5 echo "${ECHO_T}${with_valgrind:-no}" >&6 case ".$with_cflags" in @@ -23440,7 +23910,7 @@ fi ;; esac -echo "$as_me:23443: checking if you want to perform memory-leak testing" >&5 +echo "$as_me:23913: checking if you want to perform memory-leak testing" >&5 echo $ECHO_N "checking if you want to perform memory-leak testing... $ECHO_C" >&6 # Check whether --enable-leaks or --disable-leaks was given. @@ -23451,7 +23921,7 @@ else enable_leaks=yes fi; if test "x$enable_leaks" = xno; then with_no_leaks=yes; else with_no_leaks=no; fi -echo "$as_me:23454: result: $with_no_leaks" >&5 +echo "$as_me:23924: result: $with_no_leaks" >&5 echo "${ECHO_T}$with_no_leaks" >&6 if test "$enable_leaks" = no ; then @@ -23469,7 +23939,7 @@ fi LD_RPATH_OPT= if test "x$cf_cv_enable_rpath" != xno then - echo "$as_me:23472: checking for an rpath option" >&5 + echo "$as_me:23942: checking for an rpath option" >&5 echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6 case "$cf_cv_system_name" in (irix*) @@ -23500,12 +23970,12 @@ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6 (*) ;; esac - echo "$as_me:23503: result: $LD_RPATH_OPT" >&5 + echo "$as_me:23973: result: $LD_RPATH_OPT" >&5 echo "${ECHO_T}$LD_RPATH_OPT" >&6 case "x$LD_RPATH_OPT" in (x-R*) - echo "$as_me:23508: checking if we need a space after rpath option" >&5 + echo "$as_me:23978: checking if we need a space after rpath option" >&5 echo $ECHO_N "checking if we need a space after rpath option... $ECHO_C" >&6 cf_save_LIBS="$LIBS" @@ -23526,7 +23996,7 @@ done LIBS="$cf_add_libs" cat >"conftest.$ac_ext" <<_ACEOF -#line 23529 "configure" +#line 23999 "configure" #include "confdefs.h" int @@ -23538,16 +24008,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:23541: \"$ac_link\"") >&5 +if { (eval echo "$as_me:24011: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:23544: \$? = $ac_status" >&5 + echo "$as_me:24014: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:23547: \"$ac_try\"") >&5 + { (eval echo "$as_me:24017: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23550: \$? = $ac_status" >&5 + echo "$as_me:24020: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_rpath_space=no else @@ -23557,14 +24027,14 @@ cf_rpath_space=yes fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS="$cf_save_LIBS" - echo "$as_me:23560: result: $cf_rpath_space" >&5 + echo "$as_me:24030: result: $cf_rpath_space" >&5 echo "${ECHO_T}$cf_rpath_space" >&6 test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT " ;; esac fi -echo "$as_me:23567: checking if rpath-hack should be disabled" >&5 +echo "$as_me:24037: checking if rpath-hack should be disabled" >&5 echo $ECHO_N "checking if rpath-hack should be disabled... $ECHO_C" >&6 # Check whether --enable-rpath-hack or --disable-rpath-hack was given. @@ -23582,22 +24052,22 @@ else fi; if test "x$enable_rpath_hack" = xno; then cf_disable_rpath_hack=yes; else cf_disable_rpath_hack=no; fi -echo "$as_me:23585: result: $cf_disable_rpath_hack" >&5 +echo "$as_me:24055: result: $cf_disable_rpath_hack" >&5 echo "${ECHO_T}$cf_disable_rpath_hack" >&6 if test "$enable_rpath_hack" = yes ; then -echo "$as_me:23590: checking for updated LDFLAGS" >&5 +echo "$as_me:24060: checking for updated LDFLAGS" >&5 echo $ECHO_N "checking for updated LDFLAGS... $ECHO_C" >&6 if test -n "$LD_RPATH_OPT" ; then - echo "$as_me:23593: result: maybe" >&5 + echo "$as_me:24063: result: maybe" >&5 echo "${ECHO_T}maybe" >&6 for ac_prog in ldd do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:23600: checking for $ac_word" >&5 +echo "$as_me:24070: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_cf_ldd_prog+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -23612,7 +24082,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_cf_ldd_prog="$ac_prog" -echo "$as_me:23615: found $ac_dir/$ac_word" >&5 +echo "$as_me:24085: found $ac_dir/$ac_word" >&5 break done @@ -23620,10 +24090,10 @@ fi fi cf_ldd_prog=$ac_cv_prog_cf_ldd_prog if test -n "$cf_ldd_prog"; then - echo "$as_me:23623: result: $cf_ldd_prog" >&5 + echo "$as_me:24093: result: $cf_ldd_prog" >&5 echo "${ECHO_T}$cf_ldd_prog" >&6 else - echo "$as_me:23626: result: no" >&5 + echo "$as_me:24096: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -23637,7 +24107,7 @@ test -n "$cf_ldd_prog" || cf_ldd_prog="no" cf_rpath_oops= cat >"conftest.$ac_ext" <<_ACEOF -#line 23640 "configure" +#line 24110 "configure" #include "confdefs.h" #include int @@ -23649,16 +24119,16 @@ printf("Hello"); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:23652: \"$ac_link\"") >&5 +if { (eval echo "$as_me:24122: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:23655: \$? = $ac_status" >&5 + echo "$as_me:24125: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:23658: \"$ac_try\"") >&5 + { (eval echo "$as_me:24128: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23661: \$? = $ac_status" >&5 + echo "$as_me:24131: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_rpath_oops=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} ' not found' | sed -e 's% =>.*$%%' |sort | uniq` cf_rpath_list=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} / | sed -e 's%^.*[ ]/%/%' -e 's%/[^/][^/]*$%%' |sort | uniq` @@ -23686,7 +24156,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" then test -n "$verbose" && echo " ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6 -echo "${as_me:-configure}:23689: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5 +echo "${as_me:-configure}:24159: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5 LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib" break @@ -23698,11 +24168,11 @@ echo "${as_me:-configure}:23689: testing ...adding -L$cf_rpath_dir/lib to LDFLAG test -n "$verbose" && echo " ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6 -echo "${as_me:-configure}:23701: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:24171: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 test -n "$verbose" && echo " ...checking LDFLAGS $LDFLAGS" 1>&6 -echo "${as_me:-configure}:23705: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:24175: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5 cf_rpath_dst= for cf_rpath_src in $LDFLAGS @@ -23739,7 +24209,7 @@ do then test -n "$verbose" && echo " ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6 -echo "${as_me:-configure}:23742: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 +echo "${as_me:-configure}:24212: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS" fi @@ -23752,11 +24222,11 @@ LDFLAGS=$cf_rpath_dst test -n "$verbose" && echo " ...checked LDFLAGS $LDFLAGS" 1>&6 -echo "${as_me:-configure}:23755: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:24225: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5 test -n "$verbose" && echo " ...checking LIBS $LIBS" 1>&6 -echo "${as_me:-configure}:23759: testing ...checking LIBS $LIBS ..." 1>&5 +echo "${as_me:-configure}:24229: testing ...checking LIBS $LIBS ..." 1>&5 cf_rpath_dst= for cf_rpath_src in $LIBS @@ -23793,7 +24263,7 @@ do then test -n "$verbose" && echo " ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6 -echo "${as_me:-configure}:23796: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 +echo "${as_me:-configure}:24266: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS" fi @@ -23806,14 +24276,14 @@ LIBS=$cf_rpath_dst test -n "$verbose" && echo " ...checked LIBS $LIBS" 1>&6 -echo "${as_me:-configure}:23809: testing ...checked LIBS $LIBS ..." 1>&5 +echo "${as_me:-configure}:24279: testing ...checked LIBS $LIBS ..." 1>&5 test -n "$verbose" && echo " ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6 -echo "${as_me:-configure}:23813: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:24283: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 else - echo "$as_me:23816: result: no" >&5 + echo "$as_me:24286: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -23834,7 +24304,7 @@ cat >confcache <<\_ACEOF # config.status only pays attention to the cache file if you give it # the --recheck option to rerun configure. # -# `ac_cv_env_foo' variables (set or unset) will be overriden when +# `ac_cv_env_foo' variables (set or unset) will be overridden when # loading this file, other *unset* `ac_cv_foo' will be assigned the # following values. @@ -23903,7 +24373,7 @@ DEFS=-DHAVE_CONFIG_H : "${CONFIG_STATUS=./config.status}" ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ echo "$as_me:23906: creating $CONFIG_STATUS" >&5 +{ echo "$as_me:24376: creating $CONFIG_STATUS" >&5 echo "$as_me: creating $CONFIG_STATUS" >&6;} cat >"$CONFIG_STATUS" <<_ACEOF #! $SHELL @@ -24039,7 +24509,7 @@ EOF cat >>"$CONFIG_STATUS" <>"$CONFIG_STATUS" <<\EOF echo "$ac_cs_version"; exit 0 ;; --he | --h) # Conflict between --help and --header - { { echo "$as_me:24087: error: ambiguous option: $1 + { { echo "$as_me:24557: error: ambiguous option: $1 Try \`$0 --help' for more information." >&5 echo "$as_me: error: ambiguous option: $1 Try \`$0 --help' for more information." >&2;} @@ -24103,7 +24573,7 @@ Try \`$0 --help' for more information." >&2;} ac_need_defaults=false;; # This is an error. - -*) { { echo "$as_me:24106: error: unrecognized option: $1 + -*) { { echo "$as_me:24576: error: unrecognized option: $1 Try \`$0 --help' for more information." >&5 echo "$as_me: error: unrecognized option: $1 Try \`$0 --help' for more information." >&2;} @@ -24122,7 +24592,7 @@ cat >&5 << _ACEOF ## Running config.status. ## ## ----------------------- ## -This file was extended by $as_me 2.52.20230114, executed with +This file was extended by $as_me 2.52.20240618, executed with CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS CONFIG_LINKS = $CONFIG_LINKS @@ -24153,7 +24623,7 @@ do "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; "ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS ncurses_cfg.h:ncurses_tst.hin" ;; - *) { { echo "$as_me:24156: error: invalid argument: $ac_config_target" >&5 + *) { { echo "$as_me:24626: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac @@ -24245,6 +24715,10 @@ s,@host@,$host,;t t s,@host_cpu@,$host_cpu,;t t s,@host_vendor@,$host_vendor,;t t s,@host_os@,$host_os,;t t +s,@target@,$target,;t t +s,@target_cpu@,$target_cpu,;t t +s,@target_vendor@,$target_vendor,;t t +s,@target_os@,$target_os,;t t s,@SET_MAKE@,$SET_MAKE,;t t s,@CC@,$CC,;t t s,@CFLAGS@,$CFLAGS,;t t @@ -24261,6 +24735,8 @@ s,@AWK@,$AWK,;t t s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t s,@INSTALL_DATA@,$INSTALL_DATA,;t t +s,@GLOB_FULLPATH_POSIX@,$GLOB_FULLPATH_POSIX,;t t +s,@GLOB_FULLPATH_OTHER@,$GLOB_FULLPATH_OTHER,;t t s,@INSTALL_OPT_S@,$INSTALL_OPT_S,;t t s,@INSTALL_OPT_O@,$INSTALL_OPT_O,;t t s,@LINT@,$LINT,;t t @@ -24311,7 +24787,10 @@ s,@ECHO_LD@,$ECHO_LD,;t t s,@RULE_CC@,$RULE_CC,;t t s,@SHOW_CC@,$SHOW_CC,;t t s,@ECHO_CC@,$ECHO_CC,;t t +s,@DESTDIR@,$DESTDIR,;t t +s,@MERGE_PREFIX@,$MERGE_PREFIX,;t t s,@NCURSES_WRAP_PREFIX@,$NCURSES_WRAP_PREFIX,;t t +s,@REQUIRE_PKG@,$REQUIRE_PKG,;t t s,@NCURSES_CONFIG@,$NCURSES_CONFIG,;t t s,@ac_ct_NCURSES_CONFIG@,$ac_ct_NCURSES_CONFIG,;t t s,@X_CFLAGS@,$X_CFLAGS,;t t @@ -24356,14 +24835,14 @@ EOF # is no need to browse any of the substitutions). # These are the two extra sed commands mentioned above. (echo ':t - /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat "$tmp"/subs.frag) >"$tmp"/subs-$ac_sed_frag.sed + /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && sed -e 's/\\\\*$//g' -e 's/$/\\/' -e 's/;t t\\/;t t/' -e 't' -e '3,'$ac_max_sed_lines's/$/\\/' "$tmp"/subs.frag) >"$tmp"/subs-$ac_sed_frag.sed # It is possible to make a multiline substitution using escaped newlines. # Ensure that we do not split the substitution between script fragments. ac_BEG=$ac_end ac_END=`expr "$ac_end" + "$ac_max_sed_lines"` sed "1,${ac_BEG}d; ${ac_END}p; q" "$tmp"/subs.sed >"$tmp"/subs.next if test -s "$tmp"/subs.next; then - grep '^s,@[^@,][^@,]*@,.*\\$' "$tmp"/subs.next >"$tmp"/subs.edit + grep '^s,@[^@,][^@,]*@,.*$' "$tmp"/subs.next | grep -v '^s,@.*;t t$' >"$tmp"/subs.edit if test ! -s "$tmp"/subs.edit; then grep "^s,@[^@,][^@,]*@,.*,;t t$" "$tmp"/subs.next >"$tmp"/subs.edit if test ! -s "$tmp"/subs.edit; then @@ -24461,7 +24940,7 @@ done; } esac if test x"$ac_file" != x-; then - { echo "$as_me:24464: creating $ac_file" >&5 + { echo "$as_me:24943: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} rm -f "$ac_file" fi @@ -24479,7 +24958,7 @@ echo "$as_me: creating $ac_file" >&6;} -) echo "$tmp"/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:24482: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:24961: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo "$f";; @@ -24492,7 +24971,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo "$srcdir/$f" else # /dev/null tree - { { echo "$as_me:24495: error: cannot find input file: $f" >&5 + { { echo "$as_me:24974: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -24508,7 +24987,7 @@ cat >>"$CONFIG_STATUS" <<\EOF if test -n "$ac_seen"; then ac_used=`grep '@datarootdir@' "$ac_item"` if test -z "$ac_used"; then - { echo "$as_me:24511: WARNING: datarootdir was used implicitly but not set: + { echo "$as_me:24990: WARNING: datarootdir was used implicitly but not set: $ac_seen" >&5 echo "$as_me: WARNING: datarootdir was used implicitly but not set: $ac_seen" >&2;} @@ -24517,7 +24996,7 @@ $ac_seen" >&2;} fi ac_seen=`grep '${datarootdir}' "$ac_item"` if test -n "$ac_seen"; then - { echo "$as_me:24520: WARNING: datarootdir was used explicitly but not set: + { echo "$as_me:24999: WARNING: datarootdir was used explicitly but not set: $ac_seen" >&5 echo "$as_me: WARNING: datarootdir was used explicitly but not set: $ac_seen" >&2;} @@ -24545,11 +25024,11 @@ s,@INSTALL@,$ac_INSTALL,;t t " $ac_file_inputs | (eval "$ac_sed_cmds") >"$tmp"/out rm -f "$tmp"/stdin EOF -: "${FGREP:=grep -F}" -: "${EGREP:=grep -E}" +test -n "${FGREP}" || FGREP="grep -F" +test -n "${EGREP}" || EGREP="grep -E" cat >>"$CONFIG_STATUS" <>"$CONFIG_STATUS" <<\EOF if test x"$ac_file" != x-; then @@ -24562,7 +25041,7 @@ cat >>"$CONFIG_STATUS" <<\EOF ac_init=`$EGREP '[ ]*'$ac_name'[ ]*=' "$ac_file"` if test -z "$ac_init"; then ac_seen=`echo "$ac_seen" |sed -e 's,^,'"$ac_file"':,'` - { echo "$as_me:24565: WARNING: Variable $ac_name is used but was not set: + { echo "$as_me:25044: WARNING: Variable $ac_name is used but was not set: $ac_seen" >&5 echo "$as_me: WARNING: Variable $ac_name is used but was not set: $ac_seen" >&2;} @@ -24573,7 +25052,7 @@ $ac_seen" >&2;} $EGREP -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>"$tmp"/out if test -s "$tmp"/out; then ac_seen=`sed -e 's,^,'"$ac_file"':,' < "$tmp"/out` - { echo "$as_me:24576: WARNING: Some variables may not be substituted: + { echo "$as_me:25055: WARNING: Some variables may not be substituted: $ac_seen" >&5 echo "$as_me: WARNING: Some variables may not be substituted: $ac_seen" >&2;} @@ -24622,7 +25101,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue * ) ac_file_in=$ac_file.in ;; esac - test x"$ac_file" != x- && { echo "$as_me:24625: creating $ac_file" >&5 + test x"$ac_file" != x- && { echo "$as_me:25104: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} # First look for the input files in the build tree, otherwise in the @@ -24633,7 +25112,7 @@ echo "$as_me: creating $ac_file" >&6;} -) echo "$tmp"/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:24636: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:25115: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -24646,7 +25125,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo "$srcdir/$f" else # /dev/null tree - { { echo "$as_me:24649: error: cannot find input file: $f" >&5 + { { echo "$as_me:25128: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -24704,7 +25183,7 @@ cat >>"$CONFIG_STATUS" <<\EOF rm -f "$tmp"/in if test x"$ac_file" != x-; then if cmp -s "$ac_file" "$tmp/config.h" 2>/dev/null; then - { echo "$as_me:24707: $ac_file is unchanged" >&5 + { echo "$as_me:25186: $ac_file is unchanged" >&5 echo "$as_me: $ac_file is unchanged" >&6;} else ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ diff --git a/test/configure.in b/test/configure.in index 1af04e04..5f5c279a 100644 --- a/test/configure.in +++ b/test/configure.in @@ -1,5 +1,5 @@ dnl*************************************************************************** -dnl Copyright 2018-2022,2023 Thomas E. Dickey * +dnl Copyright 2018-2023,2024 Thomas E. Dickey * dnl Copyright 1998-2017,2018 Free Software Foundation, Inc. * dnl * dnl Permission is hereby granted, free of charge, to any person obtaining a * @@ -29,7 +29,7 @@ dnl*************************************************************************** dnl dnl Author: Thomas E. Dickey 1996-on dnl -dnl $Id: configure.in,v 1.169 2023/02/18 22:35:55 tom Exp $ +dnl $Id: configure.in,v 1.178 2024/08/11 09:08:54 tom Exp $ dnl This is a simple configuration-script for the ncurses test programs that dnl allows the test-directory to be separately configured against a reference dnl system (i.e., sysvr4 curses) @@ -48,12 +48,10 @@ AC_CONFIG_HEADER(ncurses_cfg.h:ncurses_tst.hin) CF_INHERIT_SCRIPT(config.guess) CF_INHERIT_SCRIPT(config.sub) -CF_CHECK_CACHE - -AC_ARG_PROGRAM CF_HELP_MESSAGE(General Options:) +CF_WITH_SYSTYPE AC_PROG_MAKE_SET CF_PROG_CC AC_C_INLINE @@ -120,6 +118,7 @@ AM_LANGINFO_CODESET dnl --------------------------------------------------------------------------- CF_PKG_CONFIG CF_DISABLE_ECHO +CF_INSTALL_PREFIX dnl --------------------------------------------------------------------------- CF_HELP_MESSAGE(Curses Version-dependent Options:) @@ -240,7 +239,6 @@ AC_CHECK_HEADERS( $cf_curses_headers ) AC_HEADER_TIME AC_CHECK_HEADERS( \ -getopt.h \ locale.h \ math.h \ stdarg.h \ @@ -248,14 +246,12 @@ sys/ioctl.h \ sys/select.h \ sys/time.h \ termios.h \ -unistd.h \ ) CF_GETOPT_HEADER CF_FUNC_GETTIME AC_CHECK_FUNCS( \ -cfmakeraw \ getopt \ snprintf \ strdup \ @@ -317,6 +313,8 @@ wcstombs \ fi CF_CURSES_FUNCS( \ +_nc_tparm_analyze \ +_tracef \ alloc_pair \ assume_default_colors \ chgat \ @@ -358,6 +356,9 @@ termname \ tgetent \ tigetnum \ tigetstr \ +tiparm \ +tiparm_s \ +tiscan_s \ tputs_sp \ typeahead \ unget_wch \ @@ -375,7 +376,6 @@ winsdelln \ winsstr \ wresize \ wsyncdown \ -_tracef \ ) CF_TPUTS_PROTO diff --git a/test/demo_altkeys.c b/test/demo_altkeys.c index ea6a7e64..73557b3a 100644 --- a/test/demo_altkeys.c +++ b/test/demo_altkeys.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2022,2023 Thomas E. Dickey * + * Copyright 2018-2024,2025 Thomas E. Dickey * * Copyright 2005-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: demo_altkeys.c,v 1.17 2023/02/25 18:08:02 tom Exp $ + * $Id: demo_altkeys.c,v 1.19 2025/01/11 14:54:49 tom Exp $ * * Demonstrate the define_key() function. * Thomas Dickey - 2005/10/22 @@ -49,7 +49,7 @@ log_last_line(WINDOW *win) { FILE *fp; - if ((fp = fopen(MY_LOGFILE, "a")) != 0) { + if ((fp = fopen(MY_LOGFILE, "a")) != NULL) { char temp[256]; int y, x, n; int need = sizeof(temp) - 1; @@ -114,7 +114,7 @@ main(int argc, char *argv[]) unlink(MY_LOGFILE); setlocale(LC_ALL, ""); - if (newterm(0, stdout, stdin) == 0) { + if (newterm(NULL, stdout, stdin) == NULL) { fprintf(stderr, "Cannot initialize terminal\n"); ExitProgram(EXIT_FAILURE); } @@ -135,12 +135,14 @@ main(int argc, char *argv[]) } for (n = KEY_MIN; n < KEY_MAX; ++n) { char *value; - if ((value = keybound(n, 0)) != 0) { + if ((value = keybound(n, 0)) != NULL) { size_t need = strlen(value) + 2; char *temp = typeMalloc(char, need); - _nc_SPRINTF(temp, _nc_SLIMIT(need) "\033%s", value); - define_key(temp, n + MY_KEYS); - free(temp); + if (temp != NULL) { + _nc_SPRINTF(temp, _nc_SLIMIT(need) "\033%s", value); + define_key(temp, n + MY_KEYS); + free(temp); + } free(value); } } @@ -158,7 +160,7 @@ main(int argc, char *argv[]) printw("Keycode %d, name %s%s\n", ch, escaped ? "ESC-" : "", - name != 0 ? name : ""); + name != NULL ? name : ""); log_last_line(stdscr); clrtoeol(); if (ch == 'q') diff --git a/test/demo_defkey.c b/test/demo_defkey.c index 44d60dc9..da03cace 100644 --- a/test/demo_defkey.c +++ b/test/demo_defkey.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2020,2022 Thomas E. Dickey * + * Copyright 2018-2023,2024 Thomas E. Dickey * * Copyright 2002-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: demo_defkey.c,v 1.33 2022/12/10 23:31:31 tom Exp $ + * $Id: demo_defkey.c,v 1.37 2024/12/07 22:22:51 tom Exp $ * * Demonstrate the define_key() function. * Thomas Dickey - 2002/11/23 @@ -47,7 +47,7 @@ log_last_line(WINDOW *win) { FILE *fp; - if ((fp = fopen(MY_LOGFILE, "a")) != 0) { + if ((fp = fopen(MY_LOGFILE, "a")) != NULL) { char temp[256]; int y, x, n; int need = sizeof(temp) - 1; @@ -98,9 +98,9 @@ visichar(int ch) static char * visible(const char *string) { - char *result = 0; + char *result = NULL; - if (string != 0 && *string != '\0') { + if (VALID_STRING(string) && *string != '\0') { int pass; int n; size_t need = 1; @@ -130,15 +130,15 @@ really_define_key(WINDOW *win, const char *new_string, int code) int rc; const char *code_name = keyname(code); char *old_string; - char *vis_string = 0; + char *vis_string = NULL; char temp[80]; - if (code_name == 0) { + if (code_name == NULL) { _nc_SPRINTF(temp, _nc_SLIMIT(sizeof(temp)) "Keycode %d", code); code_name = temp; } - if ((old_string = keybound(code, 0)) != 0) { + if ((old_string = keybound(code, 0)) != NULL) { wprintw(win, "%s is %s\n", code_name, vis_string = visible(old_string)); @@ -148,16 +148,12 @@ really_define_key(WINDOW *win, const char *new_string, int code) } log_last_line(win); - if (vis_string != 0) { - free(vis_string); - vis_string = 0; - } - + free(vis_string); vis_string = visible(new_string); if ((rc = key_defined(new_string)) > 0) { wprintw(win, "%s was bound to %s\n", vis_string, keyname(rc)); log_last_line(win); - } else if (new_string != 0 && rc < 0) { + } else if (new_string != NULL && rc < 0) { wprintw(win, "%s conflicts with longer strings\n", vis_string); log_last_line(win); } @@ -165,18 +161,18 @@ really_define_key(WINDOW *win, const char *new_string, int code) if (rc == ERR) { wprintw(win, "%s unchanged\n", code_name); log_last_line(win); - } else if (new_string != 0) { + } else if (new_string != NULL) { wprintw(win, "%s is now bound to %s\n", vis_string, code_name); log_last_line(win); - } else if (old_string != 0) { + } else if (old_string != NULL) { wprintw(win, "%s deleted\n", code_name); log_last_line(win); } - if (vis_string != 0) + if (vis_string != NULL) free(vis_string); - if (old_string != 0) + if (old_string != NULL) free(old_string); } @@ -185,15 +181,15 @@ duplicate(WINDOW *win, NCURSES_CONST char *name, int code) { char *value = tigetstr(name); - if (value != 0) { - const char *prefix = 0; + if (VALID_STRING(value)) { + const char *prefix = NULL; if (!(strncmp) (value, "\033[", (size_t) 2)) { prefix = "\033O"; } else if (!(strncmp) (value, "\033O", (size_t) 2)) { prefix = "\033["; } - if (prefix != 0) { + if (prefix != NULL) { char temp[BUFSIZ]; _nc_SPRINTF(temp, _nc_SLIMIT(sizeof(temp)) "%s%s", prefix, value + 2); @@ -203,7 +199,7 @@ duplicate(WINDOW *win, NCURSES_CONST char *name, int code) } static void -redefine(WINDOW *win, char *string, int code) +redefine(WINDOW *win, const char *string, int code) { really_define_key(win, string, code); } @@ -211,7 +207,7 @@ redefine(WINDOW *win, char *string, int code) static void remove_definition(WINDOW *win, int code) { - really_define_key(win, 0, code); + really_define_key(win, NULL, code); } static void @@ -301,7 +297,7 @@ main(int argc, char *argv[]) const char *name = keyname(ch); wprintw(win, "Keycode %d, name %s\n", ch, - name != 0 ? name : ""); + name != NULL ? name : ""); log_last_line(win); wclrtoeol(win); if (ch == 'q') diff --git a/test/demo_forms.c b/test/demo_forms.c index 8e831255..c8ba2e2e 100644 --- a/test/demo_forms.c +++ b/test/demo_forms.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2020,2022 Thomas E. Dickey * + * Copyright 2018-2023,2024 Thomas E. Dickey * * Copyright 2003-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: demo_forms.c,v 1.61 2022/12/04 00:40:11 tom Exp $ + * $Id: demo_forms.c,v 1.68 2024/12/07 22:27:13 tom Exp $ * * Demonstrate a variety of functions from the form library. * Thomas Dickey - 2003/4/26 @@ -50,7 +50,7 @@ static int d_option = 0; static int j_value = 0; static int m_value = 0; static int o_value = 0; -static char *t_value = 0; +static char *t_value = NULL; static void failed(const char *s) @@ -82,9 +82,9 @@ static char * get_data(const char *name) { char *result = t_value; - if (my_data != 0) { + if (my_data != NULL) { int n; - for (n = 0; my_data[n].name != 0; ++n) { + for (n = 0; my_data[n].name != NULL; ++n) { if (!strcmp(name, my_data[n].name)) { result = my_data[n].value; break; @@ -102,21 +102,21 @@ read_data(const char *filename) { FILE *fp = fopen(filename, "r"); - if (fp != 0) { + if (fp != NULL) { char buffer[BUFSIZ]; char *colon; int more = 0; int item = 0; my_data = typeCalloc(MY_DATA, (size_t) 100); /* FIXME */ - while (fgets(buffer, sizeof(buffer), fp) != 0) { + while (fgets(buffer, sizeof(buffer), fp) != NULL) { chomp(buffer); if (more) { if (strcmp(buffer, ".")) { char *prior = my_data[more - 1].value; size_t need = strlen(buffer) + 2 + strlen(prior); char *value = typeRealloc(char, need, prior); - if (value == 0) + if (value == NULL) failed("realloc"); _nc_STRCAT(value, "\n", need); _nc_STRCAT(value, buffer, need); @@ -126,13 +126,13 @@ read_data(const char *filename) } } else if (*buffer == '#') { continue; - } else if ((colon = strchr(buffer, ':')) != 0) { + } else if ((colon = strchr(buffer, ':')) != NULL) { char *name; char *value; *colon++ = '\0'; name = strdup(buffer); value = strdup(colon); - if (name == 0 || value == 0) + if (name == NULL || value == NULL) failed("strdup"); my_data[item].name = name; my_data[item].value = value; @@ -148,13 +148,13 @@ read_data(const char *filename) } static FIELD * -make_label(const char *label, int frow, int fcol) +make_label(NCURSES_CONST char *label, int frow, int fcol) { FIELD *f = new_field(1, (int) strlen(label), frow, fcol, 0, 0); if (f) { set_field_buffer(f, 0, label); - set_field_opts(f, (int) ((unsigned) field_opts(f) & ~O_ACTIVE)); + set_field_opts(f, (int) ((unsigned) field_opts(f) & (unsigned) ~O_ACTIVE)); } return (f); } @@ -242,13 +242,13 @@ show_insert_mode(bool insert_mode) #define O_SELECTABLE (O_ACTIVE | O_VISIBLE) static FIELD * -another_field(FORM *form, FIELD *field) +another_field(NCURSES_CONST FORM *form, NCURSES_CONST FIELD *const field) { FIELD **f = form_fields(form); - FIELD *result = 0; + FIELD *result = NULL; int n; - for (n = 0; f[n] != 0; ++n) { + for (n = 0; f[n] != NULL; ++n) { if (f[n] != field) { result = f[n]; field_opts_on(result, O_SELECTABLE); @@ -273,7 +273,7 @@ my_form_driver(FORM *form, int c) help_edit_field(); break; case MY_EDT_MODE: - if ((field = current_field(form)) != 0) { + if ((field = current_field(form)) != NULL) { set_current_field(form, another_field(form, field)); if ((unsigned) field_opts(field) & O_EDIT) { field_opts_off(field, O_EDIT); @@ -306,9 +306,9 @@ my_form_driver(FORM *form, int c) } static void -show_current_field(WINDOW *win, FORM *form) +show_current_field(WINDOW *win, NCURSES_CONST FORM *form) { - FIELD *field; + NCURSES_CONST FIELD *field; int field_rows, field_cols, field_max; int currow, curcol; @@ -324,8 +324,8 @@ show_current_field(WINDOW *win, FORM *form) waddstr(win, " behind"); waddch(win, '\n'); - if ((field = current_field(form)) != 0) { - FIELDTYPE *type; + if ((field = current_field(form)) != NULL) { + NCURSES_CONST FIELDTYPE *type; int nbuf; wprintw(win, "Page %d%s, Field %d/%d%s:", @@ -333,7 +333,7 @@ show_current_field(WINDOW *win, FORM *form) new_page(field) ? "*" : "", field_index(field), field_count(form), field_arg(field) ? "(arg)" : ""); - if ((type = field_type(field)) != 0) { + if ((type = field_type(field)) != NULL) { if (type == TYPE_ALNUM) waddstr(win, "ALNUM"); else if (type == TYPE_ALPHA) @@ -383,8 +383,8 @@ show_current_field(WINDOW *win, FORM *form) waddstr(win, "\n"); for (nbuf = 0; nbuf <= 2; ++nbuf) { - char *buffer; - if ((buffer = field_buffer(field, nbuf)) != 0) { + NCURSES_CONST char *buffer; + if ((buffer = field_buffer(field, nbuf)) != NULL) { wprintw(win, "buffer %d:", nbuf); (void) wattrset(win, A_REVERSE); if (nbuf) { @@ -408,9 +408,9 @@ demo_forms(void) int c; unsigned n = 0; int pg; - const char *fname; - static const char *my_enum[] = - {"first", "second", "third", 0}; + NCURSES_CONST char *fname; + static NCURSES_CONST char *my_enum[] = + {"first", "second", "third", NULL}; #ifdef NCURSES_MOUSE_VERSION mousemask(ALL_MOUSE_EVENTS, (mmask_t *) 0); @@ -514,8 +514,8 @@ demo_forms(void) f[n] = (FIELD *) 0; - if ((form = new_form(f)) != 0) { - WINDOW *w; + if ((form = new_form(f)) != NULL) { + NCURSES_CONST WINDOW *w; WINDOW *also; int finished = 0; @@ -543,7 +543,7 @@ demo_forms(void) free_form(form); } - for (c = 0; f[c] != 0; c++) { + for (c = 0; f[c] != NULL; c++) { free_edit_field(f[c]); free_field(f[c]); } diff --git a/test/demo_keyok.c b/test/demo_keyok.c index 8f4ae906..36e51f81 100644 --- a/test/demo_keyok.c +++ b/test/demo_keyok.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020,2022 Thomas E. Dickey * + * Copyright 2020-2022,2024 Thomas E. Dickey * * Copyright 2002-2006,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: demo_keyok.c,v 1.9 2022/12/10 23:31:31 tom Exp $ + * $Id: demo_keyok.c,v 1.11 2024/12/07 22:22:51 tom Exp $ * * Demonstrate the keyok() function. * Thomas Dickey - 2002/11/23 @@ -93,12 +93,14 @@ main(int argc, char *argv[]) while ((ch = wgetch(win)) != ERR) { const char *name = keyname(ch); + if (ch == QUIT) + break; if (ch == ESCAPE && prior == ch) break; prior = ch; wprintw(win, "Keycode %d, name %s\n", ch, - name != 0 ? name : ""); + name != NULL ? name : ""); wclrtoeol(win); wrefresh(win); if (ch >= KEY_MIN) { diff --git a/test/demo_menus.c b/test/demo_menus.c index ab3880cb..e1b49357 100644 --- a/test/demo_menus.c +++ b/test/demo_menus.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2019-2021,2022 Thomas E. Dickey * + * Copyright 2019-2023,2024 Thomas E. Dickey * * Copyright 2003-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: demo_menus.c,v 1.79 2022/12/04 00:40:11 tom Exp $ + * $Id: demo_menus.c,v 1.86 2024/12/07 22:27:13 tom Exp $ * * Demonstrate a variety of functions from the menu library. * Thomas Dickey - 2005/4/9 @@ -185,7 +185,7 @@ menu_virtualize(int c) } static int -menu_getc(MENU * m) +menu_getc(NCURSES_CONST MENU * m) { return wGetchar(menu_win(m)); } @@ -214,7 +214,7 @@ static void my_menu_init(MENU * menu) { Trace(("called MenuHook my_menu_init")); - mvwprintw(status, 2, 0, "menu_init %p", (void *) menu); + mvwprintw(status, 2, 0, "menu_init %p", (const void *) menu); wclrtoeol(status); wrefresh(status); } @@ -223,7 +223,7 @@ static void my_menu_term(MENU * menu) { Trace(("called MenuHook my_menu_term")); - mvwprintw(status, 2, 0, "menu_term %p", (void *) menu); + mvwprintw(status, 2, 0, "menu_term %p", (const void *) menu); wclrtoeol(status); wrefresh(status); } @@ -231,7 +231,7 @@ my_menu_term(MENU * menu) static void my_item_init(MENU * menu) { - ITEM *item = current_item(menu); + NCURSES_CONST ITEM *item = current_item(menu); const char *name = item_name(item); Trace(("called MenuHook my_item_init (%s)", name)); @@ -243,7 +243,7 @@ my_item_init(MENU * menu) static void my_item_term(MENU * menu) { - ITEM *item = current_item(menu); + NCURSES_CONST ITEM *item = current_item(menu); const char *name = item_name(item); Trace(("called MenuHook my_item_term (%s)", name)); @@ -311,9 +311,9 @@ static void menu_destroy(MENU * m, int itemsToo) { Trace(("menu_destroy %p", (void *) m)); - if (m != 0) { + if (m != NULL) { ITEM **items = menu_items(m); - const char *blob = 0; + const char *blob = NULL; int count; count = item_count(m); @@ -335,7 +335,7 @@ menu_destroy(MENU * m, int itemsToo) if (count > 0 && itemsToo) { if (itemsToo & 1) { ITEM **ip = items; - if (ip != 0) { + if (ip != NULL) { while (*ip) free_item(*ip++); } @@ -348,7 +348,7 @@ menu_destroy(MENU * m, int itemsToo) /* force the given menu to appear */ static void -menu_display(MENU * m) +menu_display(NCURSES_CONST MENU * m) { touchwin(menu_win(m)); wrefresh(menu_win(m)); @@ -362,14 +362,14 @@ build_file_menu(MenuNo number) static MENU_DATA table[] = { {"Exit", call_files, 0}, - {(char *) 0, 0, 0} + {(char *) 0, NULL, 0} }; static ITEM *items[SIZEOF(table)]; ITEM **ip = items; int n; - for (n = 0; table[n].name != 0; ++n) { + for (n = 0; table[n].name != NULL; ++n) { *ip = new_item(table[n].name, empty); set_item_userptr(*ip, (void *) &table[n]); ++ip; @@ -413,17 +413,17 @@ build_select_menu(MenuNo number, char *filename) MY_DATA("Pumas"), MY_DATA("Lions, Tigers, Bears, (Oh my!), Newts, Platypi, Lemurs"), MY_DATA("Lions, Tigers, Bears, (Oh my!), Newts, Platypi, Lemurs, Lions, Tigers, Bears, (Oh my!), Newts, Platypi, Lemurs"), - {(char *) 0, 0, 0} + {(char *) 0, NULL, 0} }; static ITEM **items; ITEM **ip; - MENU_DATA *ap = 0; - MENU_DATA *myList = 0; + MENU_DATA *ap = NULL; + MENU_DATA *myList = NULL; int i; size_t count = 0; - if (filename != 0) { + if (filename != NULL) { struct stat sb; if (stat(filename, &sb) == 0 && (sb.st_mode & S_IFMT) == S_IFREG @@ -436,9 +436,9 @@ build_select_menu(MenuNo number, char *filename) Trace(("build_select_menu blob=%p, items=%p", (void *) blob, (void *) items)); - if (blob != 0 && list != 0) { + if (blob != NULL && list != NULL) { FILE *fp = fopen(filename, "r"); - if (fp != 0) { + if (fp != NULL) { if (fread(blob, sizeof(char), size, fp) == size) { bool mark = TRUE; unsigned j, k; @@ -456,7 +456,7 @@ build_select_menu(MenuNo number, char *filename) blob[j] = ' '; /* menu items are printable */ } } - list[k].name = 0; + list[k].name = NULL; count = k; ap = myList = list; } @@ -464,28 +464,28 @@ build_select_menu(MenuNo number, char *filename) } loaded_file = TRUE; } - if (ap == 0) + if (ap == NULL) free(items); } } - if (ap == 0) { + if (ap == NULL) { count = SIZEOF(table) - 1; items = typeCalloc(ITEM *, count + 1); ap = table; } ip = items; - for (i = 0; ap[i].name != 0; ++i) { + for (i = 0; ap[i].name != NULL; ++i) { ap[i].func = call_select; ap[i].mask = (unsigned) i; *ip = new_item(ap[i].name, empty); set_item_userptr(*ip, (void *) &table[i]); ++ip; } - *ip = 0; + *ip = NULL; mpSelect = menu_create(items, (int) count, 1, number); - if (myList != 0) + if (myList != NULL) free(myList); } @@ -527,7 +527,7 @@ static MENU_DATA t_tbl[] = T_TBL(TRACE_ATTRS), T_TBL(TRACE_MAXIMUM), { - (char *) 0, 0, 0 + (char *) 0, NULL, 0 } }; @@ -539,7 +539,7 @@ build_trace_menu(MenuNo number) ITEM **ip = items; int n; - for (n = 0; t_tbl[n].name != 0; n++) { + for (n = 0; t_tbl[n].name != NULL; n++) { *ip = new_item(t_tbl[n].name, empty); set_item_userptr(*ip, (void *) &t_tbl[n]); ++ip; @@ -556,8 +556,8 @@ tracetrace(unsigned tlevel) static size_t need = 12; int n; - if (buf == 0) { - for (n = 0; t_tbl[n].name != 0; n++) + if (buf == NULL) { + for (n = 0; t_tbl[n].name != NULL; n++) need += strlen(t_tbl[n].name) + 2; buf = typeMalloc(char, need); if (!buf) @@ -568,7 +568,7 @@ tracetrace(unsigned tlevel) _nc_STRCAT(buf, t_tbl[0].name ? t_tbl[0].name : "", need); _nc_STRCAT(buf, ", ", need); } else { - for (n = 1; t_tbl[n].name != 0; n++) + for (n = 1; t_tbl[n].name != NULL; n++) if ((tlevel & t_tbl[n].mask) == t_tbl[n].mask) { _nc_STRCAT(buf, t_tbl[n].name, need); _nc_STRCAT(buf, ", ", need); @@ -584,10 +584,10 @@ tracetrace(unsigned tlevel) * the others */ static bool -update_trace_menu(MENU * m) +update_trace_menu(NCURSES_CONST MENU * m) { ITEM **items; - ITEM *i; + NCURSES_CONST ITEM *i; bool changed = FALSE; items = menu_items(m); @@ -595,7 +595,7 @@ update_trace_menu(MENU * m) if (i == items[0]) { if (item_value(i)) { ITEM **p; - for (p = items + 1; *p != 0; p++) + for (p = items + 1; *p != NULL; p++) if (item_value(*p)) { set_item_value(*p, FALSE); changed = TRUE; @@ -613,7 +613,7 @@ perform_trace_menu(int cmd) int result; for (ip = menu_items(mpTrace); *ip; ip++) { - MENU_DATA *td = (MENU_DATA *) item_userptr(*ip); + NCURSES_CONST MENU_DATA *td = (MENU_DATA *) item_userptr(*ip); unsigned mask = td->mask; if (mask == 0) set_item_value(*ip, _nc_tracing == 0); @@ -628,7 +628,7 @@ perform_trace_menu(int cmd) unsigned newtrace = 0; for (ip = menu_items(mpTrace); *ip; ip++) { if (item_value(*ip)) { - MENU_DATA *td = (MENU_DATA *) item_userptr(*ip); + NCURSES_CONST MENU_DATA *td = (MENU_DATA *) item_userptr(*ip); newtrace |= td->mask; } } @@ -670,7 +670,7 @@ current_menu(void) break; #endif default: - result = 0; + result = NULL; break; } return result; @@ -693,14 +693,14 @@ build_menus(char *filename) #ifdef TRACE {"Trace", call_menus, 2}, #endif - {(char *) 0, 0, 0} + {(char *) 0, NULL, 0} }; static ITEM *items[SIZEOF(table)]; ITEM **ip = items; int n; - for (n = 0; table[n].name != 0; ++n) { + for (n = 0; table[n].name != NULL; ++n) { *ip = new_item(table[n].name, empty); set_item_userptr(*ip, (void *) &table[n]); ++ip; @@ -718,7 +718,9 @@ build_menus(char *filename) } static int -move_menu(MENU * menu, MENU * current, int by_y, int by_x) +move_menu(NCURSES_CONST MENU * menu, + NCURSES_CONST MENU * current, + int by_y, int by_x) { WINDOW *top_win = menu_win(menu); WINDOW *sub_win = menu_sub(menu); @@ -753,7 +755,7 @@ move_menu(MENU * menu, MENU * current, int by_y, int by_x) * Move the menus around on the screen, to test mvwin(). */ static void -move_menus(MENU * current, int by_y, int by_x) +move_menus(NCURSES_CONST MENU * current, int by_y, int by_x) { if (move_menu(mpBanner, current, by_y, by_x) != ERR) { erase(); @@ -798,7 +800,7 @@ resize_menus(MENU * current) #endif /* defined(KEY_RESIZE) && NCURSES_EXT_FUNCS */ static void -show_status(int ch, MENU * menu) +show_status(int ch, NCURSES_CONST MENU * menu) { wmove(status, 0, 0); wprintw(status, "key %s, menu %d, mark %s, match %s", @@ -919,13 +921,12 @@ perform_menus(void) wrefresh(menu_win(last_menu)); if (code == E_UNKNOWN_COMMAND || code == E_NOT_POSTED) { - ITEM *item = current_item(last_menu); + NCURSES_CONST ITEM *item = current_item(last_menu); MENU_DATA *td = (MENU_DATA *) item_userptr(item); td->func((int) td->mask); } if (code == E_REQUEST_DENIED) beep(); - continue; } } @@ -990,7 +991,7 @@ usage(int ok) ," -H rip-off header line (can repeat)" #endif #ifdef TRACE - ," -t mask specify default trace-level (may toggle with ^T)" + ," -D mask specify trace mask (may toggle with ^T)" #endif }; size_t n; @@ -1010,7 +1011,7 @@ main(int argc, char *argv[]) setlocale(LC_ALL, ""); START_TRACE(); - while ((ch = getopt(argc, argv, OPTS_COMMON "FHt:")) != -1) { + while ((ch = getopt(argc, argv, OPTS_COMMON "D:FH")) != -1) { switch (ch) { #if HAVE_RIPOFFLINE case 'F': @@ -1021,8 +1022,8 @@ main(int argc, char *argv[]) break; #endif /* HAVE_RIPOFFLINE */ #ifdef TRACE - case 't': - curses_trace((unsigned) strtoul(optarg, 0, 0)); + case 'D': + curses_trace((unsigned) strtoul(optarg, NULL, 0)); break; #endif case OPTS_VERSION: @@ -1045,7 +1046,7 @@ main(int argc, char *argv[]) init_pair(2, COLOR_BLUE, COLOR_WHITE); } status = newwin(3, COLS, LINES - 3, 0); - build_menus(argc > 1 ? argv[1] : 0); + build_menus(argc > 1 ? argv[1] : NULL); perform_menus(); destroy_menus(); diff --git a/test/demo_new_pair.c b/test/demo_new_pair.c index bc41d44d..d31a15e7 100644 --- a/test/demo_new_pair.c +++ b/test/demo_new_pair.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2021,2022 Thomas E. Dickey * + * Copyright 2018-2022,2024 Thomas E. Dickey * * Copyright 2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: demo_new_pair.c,v 1.27 2022/12/04 00:40:11 tom Exp $ + * $Id: demo_new_pair.c,v 1.32 2024/12/07 22:22:51 tom Exp $ * * Demonstrate the alloc_pair() function. */ @@ -36,6 +36,7 @@ #include #include +#if HAVE_TIGETSTR #if HAVE_ALLOC_PAIR && USE_WIDEC_SUPPORT #include @@ -48,8 +49,8 @@ static bool valid_cap(NCURSES_CONST char *name) { - char *value = tigetstr(name); - return (value != 0 && value != (char *) -1) ? TRUE : FALSE; + const char *value = tigetstr(name); + return (value != NULL && value != (char *) -1) ? TRUE : FALSE; } static attr_t @@ -187,7 +188,7 @@ main(int argc, char *argv[]) " ? print this screen (exit on any character).", "", "To exit this program, press ^Q, ^[ or \"q\".", - 0 + NULL }; bool done = FALSE; @@ -204,7 +205,7 @@ main(int argc, char *argv[]) wchar_t wch[2]; time_t start = now(); long total_cells = 0; - FILE *output = 0; + FILE *output = NULL; setlocale(LC_ALL, ""); @@ -242,9 +243,10 @@ main(int argc, char *argv[]) fprintf(stderr, "cannot open terminal for output\n"); ExitProgram(EXIT_FAILURE); } - if (newterm(NULL, output, stdin) == 0) { + if (newterm(NULL, output, stdin) == NULL) { fprintf(stderr, "Cannot initialize terminal\n"); - fclose(output); + if (output != NULL) + fclose(output); ExitProgram(EXIT_FAILURE); } (void) cbreak(); /* read chars without wait for \n */ @@ -383,7 +385,8 @@ main(int argc, char *argv[]) ++current; } stop_curses(); - fclose(output); + if (output != NULL) + fclose(output); printf("%.1f cells/second\n", (double) (total_cells) / (double) (now() - start)); @@ -391,11 +394,19 @@ main(int argc, char *argv[]) ExitProgram(EXIT_SUCCESS); } -#else +#else /* !(HAVE_ALLOC_PAIR && USE_WIDEC_SUPPORT) */ int main(void) { printf("This program requires the ncurses alloc_pair function\n"); ExitProgram(EXIT_FAILURE); } -#endif +#endif /* HAVE_ALLOC_PAIR && USE_WIDEC_SUPPORT */ +#else /* !HAVE_TIGETSTR */ +int +main(void) +{ + printf("This program requires the terminfo functions such as tigetstr\n"); + ExitProgram(EXIT_FAILURE); +} +#endif /* HAVE_TIGETSTR */ diff --git a/test/demo_panels.c b/test/demo_panels.c index 6c825891..91efafad 100644 --- a/test/demo_panels.c +++ b/test/demo_panels.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2020,2022 Thomas E. Dickey * + * Copyright 2018-2022,2024 Thomas E. Dickey * * Copyright 2003-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: demo_panels.c,v 1.48 2022/12/04 00:40:11 tom Exp $ + * $Id: demo_panels.c,v 1.53 2024/12/07 22:27:13 tom Exp $ * * Demonstrate a variety of functions from the panel library. */ @@ -42,7 +42,7 @@ #define TEMP_POS '>' typedef void (*InitPanel) (void); -typedef void (*FillPanel) (PANEL *); +typedef void (*FillPanel) (NCURSES_CONST PANEL *); static bool use_colors = FALSE; static bool unboxed = FALSE; @@ -52,18 +52,18 @@ static FILE *log_out; static void close_input(void) { - if (log_in != 0) { + if (log_in != NULL) { fclose(log_in); - log_in = 0; + log_in = NULL; } } static void close_output(void) { - if (log_out != 0) { + if (log_out != NULL) { fclose(log_out); - log_out = 0; + log_out = NULL; } } @@ -88,7 +88,7 @@ static void saywhat(NCURSES_CONST char *text) { WINDOW *win = statusline(); - if (text != 0 && *text != '\0') { + if (text != NULL && *text != '\0') { waddstr(win, text); waddstr(win, "; "); } @@ -124,7 +124,7 @@ get_position(NCURSES_CONST char *text, show_position(text, also, which, y1, x1); - if (log_in != 0) { + if (log_in != NULL) { if (fscanf(log_in, "%c%d,%d\n", &cmd, &y1, &x1) == 3) { switch (cmd) { case LAST_POS: @@ -204,12 +204,12 @@ static PANEL * mkpanel(short color, int rows, int cols, int tly, int tlx) { WINDOW *win; - PANEL *pan = 0; + PANEL *pan = NULL; char *userdata = typeMalloc(char, 6); - if ((win = newwin(rows, cols, tly, tlx)) != 0) { + if ((win = newwin(rows, cols, tly, tlx)) != NULL) { keypad(win, TRUE); - if ((pan = new_panel(win)) == 0) { + if ((pan = new_panel(win)) == NULL) { delwin(win); } else if (use_colors) { short fg = (short) ((color == COLOR_BLUE) @@ -231,7 +231,7 @@ mkpanel(short color, int rows, int cols, int tly, int tlx) static void my_remove_panel(PANEL **pans, int which) { - if (pans[which] != 0) { + if (pans[which] != NULL) { PANEL *pan = pans[which]; WINDOW *win = panel_window(pan); char *user = (char *) panel_userptr(pan); @@ -240,7 +240,7 @@ my_remove_panel(PANEL **pans, int which) del_panel(pan); delwin(win); - pans[which] = 0; + pans[which] = NULL; } } @@ -297,11 +297,11 @@ my_create_panel(PANEL **pans, int which, FillPanel myFill) static void my_move_panel(PANEL **pans, int which, bool continuous) { - if (pans[which] != 0) { + if (pans[which] != NULL) { int code; int y0, x0; int y1, x1; - WINDOW *win = panel_window(pans[which]); + NCURSES_CONST WINDOW *win = panel_window(pans[which]); char also[80]; getbegyx(win, y0, x0); @@ -322,7 +322,7 @@ my_move_panel(PANEL **pans, int which, bool continuous) static void my_resize_panel(PANEL **pans, int which, FillPanel myFill) { - if (pans[which] != 0) { + if (pans[which] != NULL) { int code; int y0, x0; int y1, x1; @@ -341,7 +341,7 @@ my_resize_panel(PANEL **pans, int which, FillPanel myFill) ABS(x1 - x0) + 1, MIN(y0, y1), MIN(x0, x1)); - if (next != 0) { + if (next != NULL) { keypad(next, TRUE); if (use_colors) { wbkgdset(next, (chtype) (COLOR_PAIR(which) | ' ')); @@ -368,7 +368,7 @@ init_panel(void) } static void -fill_panel(PANEL *pan) +fill_panel(NCURSES_CONST PANEL *pan) { WINDOW *win = panel_window(pan); const char *userptr = (const char *) panel_userptr(pan); @@ -388,7 +388,7 @@ fill_panel(PANEL *pan) } static void -fill_unboxed(PANEL *pan) +fill_unboxed(NCURSES_CONST PANEL *pan) { WINDOW *win = panel_window(pan); const char *userptr = (const char *) panel_userptr(pan); @@ -411,7 +411,7 @@ make_fullwidth_digit(cchar_t *target, int digit) source[0] = (wchar_t) (digit + 0xff10); source[1] = 0; - setcchar(target, source, A_NORMAL, 0, 0); + setcchar(target, source, A_NORMAL, 0, NULL); } static void @@ -431,7 +431,7 @@ init_wide_panel(void) } static void -fill_wide_panel(PANEL *pan) +fill_wide_panel(NCURSES_CONST PANEL *pan) { WINDOW *win = panel_window(pan); int num = ((const char *) panel_userptr(pan))[1]; @@ -453,7 +453,7 @@ fill_wide_panel(PANEL *pan) #define MAX_PANELS 5 static int -which_panel(PANEL *px[MAX_PANELS + 1], PANEL *pan) +which_panel(PANEL *px[MAX_PANELS + 1], NCURSES_CONST PANEL *pan) { int result = 0; int j; @@ -507,19 +507,19 @@ show_panels(PANEL *px[MAX_PANELS + 1]) memset(table, 0, sizeof(table)); for (j = 1; j <= MAX_PANELS; ++j) { - table[j].valid = (px[j] != 0); + table[j].valid = (px[j] != NULL); if (table[j].valid) { - table[j].hidden = panel_hidden(px[j]); + table[j].hidden = panel_hidden(px[j]) ? TRUE : FALSE; table[j].above = panel_above(px[j]); table[j].below = panel_below(px[j]); } } - if ((win = newwin(LINES - 1, COLS, 0, 0)) != 0) { + if ((win = newwin(LINES - 1, COLS, 0, 0)) != NULL) { PANEL *pan; keypad(win, TRUE); - if ((pan = new_panel(win)) != 0) { + if ((pan = new_panel(win)) != NULL) { werase(win); MvWPrintw(win, 0, 0, "Panels:\n"); for (j = 1; j <= MAX_PANELS; ++j) { @@ -554,7 +554,7 @@ show_panels(PANEL *px[MAX_PANELS + 1]) static int my_##func(PANEL *pan) \ { \ int code = ERR; \ - if (pan != 0) { \ + if (pan != NULL) { \ code = func(pan); \ } \ return code; \ @@ -578,7 +578,7 @@ do_panel(PANEL *px[MAX_PANELS + 1], return; } - if (log_in != 0) { + if (log_in != NULL) { pflush(); } @@ -617,7 +617,7 @@ do_panel(PANEL *px[MAX_PANELS + 1], static bool ok_letter(int ch) { - return isalpha(UChar(ch)) && strchr("bcdhmMrst", ch) != 0; + return isalpha(UChar(ch)) && strchr("bcdhmMrst", ch) != NULL; } static bool @@ -644,8 +644,8 @@ get_command(PANEL *px[MAX_PANELS + 1], char *buffer, int limit) waddstr(win, "Command:"); buffer[length = 0] = '\0'; - if (log_in != 0) { - if (fgets(buffer, limit - 3, log_in) != 0) { + if (log_in != NULL) { + if (fgets(buffer, limit - 3, log_in) != NULL) { length = (int) strlen(buffer); while (length > 0 && isspace(UChar(buffer[length - 1]))) buffer[--length] = '\0'; @@ -656,8 +656,9 @@ get_command(PANEL *px[MAX_PANELS + 1], char *buffer, int limit) (void) wgetch(win); } else { int c0 = 0; - for (;;) { + while (length < limit - 3) { int ch = wgetch(win); + memset(buffer + length, 0, 3); if (ch == ERR || ch == QUIT || ch == ESCAPE) { buffer[0] = '\0'; break; diff --git a/test/demo_tabs.c b/test/demo_tabs.c index 16c1ad57..1879ad84 100644 --- a/test/demo_tabs.c +++ b/test/demo_tabs.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2019-2020,2022 Thomas E. Dickey * + * Copyright 2019-2022,2024 Thomas E. Dickey * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -29,7 +29,7 @@ /* * Author: Thomas E. Dickey * - * $Id: demo_tabs.c,v 1.10 2022/12/04 00:40:11 tom Exp $ + * $Id: demo_tabs.c,v 1.12 2024/11/30 18:47:39 tom Exp $ * * A simple demo of tabs in curses. */ @@ -48,7 +48,7 @@ usage(int ok) ,"" ,USAGE_COMMON ,"Options:" - ," -l COUNT total number of lines to show" + ," -m NUM total number of lines to show" ," -t NUM set TABSIZE variable to the given value" }; unsigned n; @@ -69,9 +69,9 @@ main(int argc, char *argv[]) int line_limit = -1; int curses_stops = -1; - while ((ch = getopt(argc, argv, OPTS_COMMON "l:t:")) != -1) { + while ((ch = getopt(argc, argv, OPTS_COMMON "m:t:")) != -1) { switch (ch) { - case 'l': + case 'm': line_limit = atoi(optarg); break; case 't': diff --git a/test/demo_termcap.c b/test/demo_termcap.c index 468bd976..b62ce908 100644 --- a/test/demo_termcap.c +++ b/test/demo_termcap.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2019-2021,2022 Thomas E. Dickey * + * Copyright 2019-2024,2025 Thomas E. Dickey * * Copyright 2005-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -30,7 +30,7 @@ /* * Author: Thomas E. Dickey * - * $Id: demo_termcap.c,v 1.64 2022/12/10 23:22:09 tom Exp $ + * $Id: demo_termcap.c,v 1.74 2025/01/11 14:54:49 tom Exp $ * * A simple demo of the termcap interface. */ @@ -101,15 +101,18 @@ static long total_b_values; static long total_n_values; static long total_s_values; -#define isCapName(c) (isgraph(c) && strchr("^=:\\", c) == 0) +#define isCapName(c) (isgraph(c) && strchr("^=:\\", c) == NULL) #define EachCapName(n) n = 33; n < 127; ++n static char * -make_dbitem(char *p, char *q) +make_dbitem(const char *const p, const char *const q) { - size_t need = strlen(e_opt) + 2 + (size_t) (p - q); + size_t diff = (size_t) (p - q); + size_t need = strlen(e_opt) + 2 + diff; char *result = malloc(need); - _nc_SPRINTF(result, _nc_SLIMIT(need) "%s=%.*s", e_opt, (int) (p - q), q); + if (result != NULL) { + _nc_SPRINTF(result, _nc_SLIMIT(need) "%s=%.*s", e_opt, (int) diff, q); + } return result; } @@ -150,17 +153,17 @@ make_dblist(void) static char * next_dbitem(void) { - char *result = 0; + char *result = NULL; if (db_list) { - if ((result = db_list[db_item]) == 0) { + if ((result = db_list[db_item]) == NULL) { db_item = 0; result = db_list[0]; } else { db_item++; } } - if (result != 0) + if (result != NULL) printf("** %s\n", result); return result; } @@ -174,7 +177,7 @@ free_dblist(void) for (n = 0; db_list[n]; ++n) free(db_list[n]); free(db_list); - db_list = 0; + db_list = NULL; } } #endif /* NO_LEAKS */ @@ -256,10 +259,10 @@ dumpit(NCURSES_CONST char *cap) * to hold all of the strings extracted from the terminal entry. */ char area[1024], *ap = area; - char *str; + NCURSES_CONST char *str; int num; - if ((str = tgetstr(cap, &ap)) != 0) { + if ((str = tgetstr(cap, &ap)) != NULL) { total_values++; total_s_values++; if (!q_opt) { @@ -289,7 +292,7 @@ dumpit(NCURSES_CONST char *cap) } static void -brute_force(const char *name) +brute_force(NCURSES_CONST char *name) { char buffer[1024]; @@ -343,7 +346,7 @@ demo_termcap(NCURSES_CONST char *name) if (b_opt) { for (n = 0;; ++n) { cap = my_boolcodes[n]; - if (cap == 0) + if (cap == NULL) break; dumpit(cap); } @@ -352,7 +355,7 @@ demo_termcap(NCURSES_CONST char *name) if (n_opt) { for (n = 0;; ++n) { cap = my_numcodes[n]; - if (cap == 0) + if (cap == NULL) break; dumpit(cap); } @@ -361,16 +364,16 @@ demo_termcap(NCURSES_CONST char *name) if (s_opt) { for (n = 0;; ++n) { cap = my_strcodes[n]; - if (cap == 0) + if (cap == NULL) break; dumpit(cap); } } #ifdef NCURSES_VERSION - if (x_opt && (my_blob == 0) && y_opt) { + if (x_opt && (my_blob == NULL) && y_opt) { #if NCURSES_XNAMES - TERMTYPE *term = (TERMTYPE *) cur_term; - if (term != 0 + NCURSES_CONST TERMTYPE *term = (TERMTYPE *) cur_term; + if (term != NULL && ((NUM_BOOLEANS(term) != BOOLCOUNT) || (NUM_NUMBERS(term) != NUMCOUNT) || (NUM_STRINGS(term) != STRCOUNT))) { @@ -404,7 +407,8 @@ typedef enum { static void parse_description(const char *input_name) { - static char empty[1]; + static char empty[1] = + {0}; FILE *fp; struct stat sb; @@ -428,20 +432,22 @@ parse_description(const char *input_name) * None of the arrays could be larger than the input-file, and since it * is small, just allocate the maximum for simplicity. */ - if ((my_blob = malloc((size_t) sb.st_size + 1)) == 0 || - (my_boolcodes = typeCalloc(char *, sb.st_size)) == 0 || - (my_numcodes = typeCalloc(char *, sb.st_size)) == 0 || - (my_numvalues = typeCalloc(char *, sb.st_size)) == 0 || - (my_strcodes = typeCalloc(char *, sb.st_size)) == 0 || - (my_strvalues = typeCalloc(char *, sb.st_size)) == 0) { + if ((my_blob = malloc((size_t) sb.st_size + 1)) == NULL || + (my_boolcodes = typeCalloc(char *, sb.st_size)) == NULL || + (my_numcodes = typeCalloc(char *, sb.st_size)) == NULL || + (my_numvalues = typeCalloc(char *, sb.st_size)) == NULL || + (my_strcodes = typeCalloc(char *, sb.st_size)) == NULL || + (my_strvalues = typeCalloc(char *, sb.st_size)) == NULL) { failed("cannot allocate memory for input-file"); } - if ((fp = fopen(input_name, "r")) == 0) + if ((fp = fopen(input_name, "r")) == NULL) { failed("cannot open input-file"); - len = fread(my_blob, sizeof(char), (size_t) sb.st_size, fp); - my_blob[sb.st_size] = '\0'; - fclose(fp); + } else { + len = fread(my_blob, sizeof(char), (size_t) sb.st_size, fp); + my_blob[sb.st_size] = '\0'; + fclose(fp); + } /* * First, get rid of comments and escaped newlines, as well as repeated @@ -671,11 +677,11 @@ parse_description(const char *input_name) break; } } - my_boolcodes[count_bools] = 0; - my_numcodes[count_nums] = 0; - my_numvalues[count_nums] = 0; - my_strcodes[count_strs] = 0; - my_strvalues[count_strs] = 0; + my_boolcodes[count_bools] = NULL; + my_numcodes[count_nums] = NULL; + my_numvalues[count_nums] = NULL; + my_strcodes[count_strs] = NULL; + my_strvalues[count_strs] = NULL; #if 0 printf("bools:%d\n", (int) count_bools); @@ -699,11 +705,11 @@ copy_code_list(NCURSES_CONST char *const *list) int pass; size_t count; size_t length = 1; - char **result = 0; - char *unused = 0; + char **result = NULL; + char *unused = NULL; for (pass = 0; pass < 2; ++pass) { - for (count = 0; list[count] != 0; ++count) { + for (count = 0; list[count] != NULL; ++count) { size_t chunk = strlen(list[count]) + 1; if (pass == 0) { length += chunk; @@ -717,7 +723,7 @@ copy_code_list(NCURSES_CONST char *const *list) char *blob = malloc(length); result = typeCalloc(char *, count + 1); unused = blob; - if (blob == 0 || result == 0) + if (blob == NULL || result == NULL) failed("copy_code_list failed"); } } @@ -753,10 +759,10 @@ usage(int ok) ," -b print boolean-capabilities" ," -d LIST colon-separated list of databases to use" ," -e NAME environment variable to set with -d option" - ," -i NAME terminal description to use as names for \"-a\" option, etc." + ," -i NAME terminal description to use as names for \"-a\" option" ," -n print numeric-capabilities" ," -q quiet (prints only counts)" - ," -r COUNT repeat for given count" + ," -r NUM repeat tests NUM times" ," -s print string-capabilities" ," -v print termcap-variables" #ifdef NCURSES_VERSION @@ -778,12 +784,12 @@ main(int argc, char *argv[]) { int ch; int n; - char *name; + NCURSES_CONST char *name; bool a_opt = FALSE; #if defined(NCURSES_VERSION) || defined(HAVE_CURSES_DATA_OSPEED) bool v_opt = FALSE; #endif - char *input_name = 0; + NCURSES_CONST char *input_name = NULL; int repeat; int r_opt = 1; @@ -861,15 +867,15 @@ main(int argc, char *argv[]) for (n = optind; n < argc; ++n) { brute_force(argv[n]); } - } else if ((name = getenv("TERM")) != 0) { + } else if ((name = getenv("TERM")) != NULL) { brute_force(name); } else { - static char dumb[] = "dumb"; + static NCURSES_CONST char dumb[] = "dumb"; brute_force(dumb); } } } else { - if (input_name != 0) { + if (input_name != NULL) { parse_description(input_name); } #if USE_CODE_LISTS @@ -888,10 +894,10 @@ main(int argc, char *argv[]) for (n = optind; n < argc; ++n) { demo_termcap(argv[n]); } - } else if ((name = getenv("TERM")) != 0) { + } else if ((name = getenv("TERM")) != NULL) { demo_termcap(name); } else { - static char dumb[] = "dumb"; + static NCURSES_CONST char dumb[] = "dumb"; demo_termcap(dumb); } } diff --git a/test/demo_terminfo.c b/test/demo_terminfo.c index 1b2d426c..639dac7d 100644 --- a/test/demo_terminfo.c +++ b/test/demo_terminfo.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2019-2021,2022 Thomas E. Dickey * + * Copyright 2019-2024,2025 Thomas E. Dickey * * Copyright 2009-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -30,7 +30,7 @@ /* * Author: Thomas E. Dickey * - * $Id: demo_terminfo.c,v 1.56 2022/12/10 23:22:09 tom Exp $ + * $Id: demo_terminfo.c,v 1.63 2025/01/11 14:54:49 tom Exp $ * * A simple demo of the terminfo interface. */ @@ -96,11 +96,14 @@ static long total_s_values; #define FNAME(type) "%s %-*s = ", #type, f_opt ? 24 : FCOLS static char * -make_dbitem(char *p, char *q) +make_dbitem(const char *const p, const char *const q) { - size_t need = strlen(e_opt) + 2 + (size_t) (p - q); + size_t diff = (size_t) (p - q); + size_t need = strlen(e_opt) + 2 + diff; char *result = malloc(need); - _nc_SPRINTF(result, _nc_SLIMIT(need) "%s=%.*s", e_opt, (int) (p - q), q); + if (result != NULL) { + _nc_SPRINTF(result, _nc_SLIMIT(need) "%s=%.*s", e_opt, (int) diff, q); + } return result; } @@ -141,17 +144,17 @@ make_dblist(void) static char * next_dbitem(void) { - char *result = 0; + char *result = NULL; if (db_list) { - if ((result = db_list[db_item]) == 0) { + if ((result = db_list[db_item]) == NULL) { db_item = 0; result = db_list[0]; } else { db_item++; } } - if (result != 0) + if (result != NULL) printf("** %s\n", result); return result; } @@ -165,7 +168,7 @@ free_dblist(void) for (n = 0; db_list[n]; ++n) free(db_list[n]); free(db_list); - db_list = 0; + db_list = NULL; } } #endif @@ -176,7 +179,7 @@ dumpit(NCURSES_CONST char *cap, const char *show) const char *str; int num; - if ((str = tigetstr(cap)) != 0 && (str != (char *) -1)) { + if ((str = tigetstr(cap)) != NULL && (str != (char *) -1)) { total_values++; total_s_values++; if (!q_opt) { @@ -253,7 +256,7 @@ dumpit(NCURSES_CONST char *cap, const char *show) #define LegalItem(c,n) (n) static void -brute_force(const char *name) +brute_force(NCURSES_CONST char *name) { #define MAX_FORCE 5 /* omit "colors", since CPU-time is a problem */ static const char legal[] = "\ @@ -324,7 +327,7 @@ abcdefghijklmnopqrstuvwxyz_"; #endif static void -demo_terminfo(char *name) +demo_terminfo(NCURSES_CONST char *name) { unsigned n; NCURSES_CONST char *cap; @@ -339,7 +342,7 @@ demo_terminfo(char *name) if (b_opt) { for (n = 0;; ++n) { cap = my_boolcodes[n]; - if (cap == 0) + if (cap == NULL) break; dumpit(cap, fullname(bool, n)); } @@ -348,7 +351,7 @@ demo_terminfo(char *name) if (n_opt) { for (n = 0;; ++n) { cap = my_numcodes[n]; - if (cap == 0) + if (cap == NULL) break; dumpit(cap, fullname(num, n)); } @@ -357,17 +360,17 @@ demo_terminfo(char *name) if (s_opt) { for (n = 0;; ++n) { cap = my_strcodes[n]; - if (cap == 0) + if (cap == NULL) break; dumpit(cap, fullname(str, n)); } } #ifdef NCURSES_VERSION - if (x_opt && (my_blob == 0)) { + if (x_opt && (my_blob == NULL)) { if (y_opt) { #if NCURSES_XNAMES - TERMTYPE *term = (TERMTYPE *) cur_term; - if (term != 0 + const TERMTYPE *term = (TERMTYPE *) cur_term; + if (term != NULL && ((NUM_BOOLEANS(term) != BOOLCOUNT) || (NUM_NUMBERS(term) != NUMCOUNT) || (NUM_STRINGS(term) != STRCOUNT))) { @@ -430,7 +433,8 @@ typedef enum { static void parse_description(const char *input_name) { - static char empty[1]; + static char empty[1] = + {0}; FILE *fp; struct stat sb; @@ -454,20 +458,22 @@ parse_description(const char *input_name) * None of the arrays could be larger than the input-file, and since it * is small, just allocate the maximum for simplicity. */ - if ((my_blob = malloc((size_t) sb.st_size + 1)) == 0 || - (my_boolcodes = typeCalloc(char *, sb.st_size)) == 0 || - (my_numcodes = typeCalloc(char *, sb.st_size)) == 0 || - (my_numvalues = typeCalloc(char *, sb.st_size)) == 0 || - (my_strcodes = typeCalloc(char *, sb.st_size)) == 0 || - (my_strvalues = typeCalloc(char *, sb.st_size)) == 0) { + if ((my_blob = malloc((size_t) sb.st_size + 1)) == NULL || + (my_boolcodes = typeCalloc(char *, sb.st_size)) == NULL || + (my_numcodes = typeCalloc(char *, sb.st_size)) == NULL || + (my_numvalues = typeCalloc(char *, sb.st_size)) == NULL || + (my_strcodes = typeCalloc(char *, sb.st_size)) == NULL || + (my_strvalues = typeCalloc(char *, sb.st_size)) == NULL) { failed("cannot allocate memory for input-file"); } - if ((fp = fopen(input_name, "r")) == 0) + if ((fp = fopen(input_name, "r")) == NULL) { failed("cannot open input-file"); - len = fread(my_blob, sizeof(char), (size_t) sb.st_size, fp); - my_blob[sb.st_size] = '\0'; - fclose(fp); + } else { + len = fread(my_blob, sizeof(char), (size_t) sb.st_size, fp); + my_blob[sb.st_size] = '\0'; + fclose(fp); + } /* * First, get rid of comments and escaped newlines, as well as repeated @@ -701,11 +707,11 @@ parse_description(const char *input_name) break; } } - my_boolcodes[count_bools] = 0; - my_numcodes[count_nums] = 0; - my_numvalues[count_nums] = 0; - my_strcodes[count_strs] = 0; - my_strvalues[count_strs] = 0; + my_boolcodes[count_bools] = NULL; + my_numcodes[count_nums] = NULL; + my_numvalues[count_nums] = NULL; + my_strcodes[count_strs] = NULL; + my_strvalues[count_strs] = NULL; #if 0 printf("# bools:%d\n", (int) count_bools); @@ -729,11 +735,11 @@ copy_code_list(NCURSES_CONST char *const *list) int pass; size_t count; size_t length = 1; - char **result = 0; - char *unused = 0; + char **result = NULL; + char *unused = NULL; for (pass = 0; pass < 2; ++pass) { - for (count = 0; list[count] != 0; ++count) { + for (count = 0; list[count] != NULL; ++count) { size_t chunk = strlen(list[count]) + 1; if (pass == 0) { length += chunk; @@ -747,7 +753,7 @@ copy_code_list(NCURSES_CONST char *const *list) char *blob = malloc(length); result = typeCalloc(char *, count + 1); unused = blob; - if (blob == 0 || result == 0) + if (blob == NULL || result == NULL) failed("copy_code_list failed"); } } @@ -783,11 +789,11 @@ usage(int ok) ," -b print boolean-capabilities" ," -d LIST colon-separated list of databases to use" ," -e NAME environment variable to set with -d option" - ," -f print full names" + ," -f print full terminfo names" ," -i NAME terminal description to use as names for \"-a\" option" ," -n print numeric-capabilities" ," -q quiet (prints only counts)" - ," -r COUNT repeat for given count" + ," -r NUM repeat tests NUM times" ," -s print string-capabilities" #ifdef NCURSES_VERSION ," -x print extended capabilities" @@ -810,9 +816,9 @@ main(int argc, char *argv[]) int ch; int n; int repeat; - char *name; + NCURSES_CONST char *name; int r_opt = 1; - char *input_name = 0; + const char *input_name = NULL; while ((ch = getopt(argc, argv, OPTS_COMMON "abd:e:fi:nqr:sxy")) != -1) { switch (ch) { @@ -885,15 +891,15 @@ main(int argc, char *argv[]) for (n = optind; n < argc; ++n) { brute_force(argv[n]); } - } else if ((name = getenv("TERM")) != 0) { + } else if ((name = getenv("TERM")) != NULL) { brute_force(name); } else { - static char dumb[] = "dumb"; + static NCURSES_CONST char dumb[] = "dumb"; brute_force(dumb); } } } else { - if (input_name != 0) { + if (input_name != NULL) { parse_description(input_name); } #if USE_CODE_LISTS @@ -912,10 +918,10 @@ main(int argc, char *argv[]) for (n = optind; n < argc; ++n) { demo_terminfo(argv[n]); } - } else if ((name = getenv("TERM")) != 0) { + } else if ((name = getenv("TERM")) != NULL) { demo_terminfo(name); } else { - static char dumb[] = "dumb"; + static NCURSES_CONST char dumb[] = "dumb"; demo_terminfo(dumb); } } @@ -930,8 +936,8 @@ main(int argc, char *argv[]) #if NO_LEAKS free_dblist(); - if (input_name != 0) { - if (my_blob != 0) { + if (input_name != NULL) { + if (my_blob != NULL) { free(my_blob); free(my_boolcodes); free(my_numcodes); diff --git a/test/ditto.c b/test/ditto.c index 390eb3c0..874c4381 100644 --- a/test/ditto.c +++ b/test/ditto.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2021,2022 Thomas E. Dickey * + * Copyright 2018-2024,2025 Thomas E. Dickey * * Copyright 1998-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -30,7 +30,7 @@ /* * Author: Thomas E. Dickey (1998-on) * - * $Id: ditto.c,v 1.58 2022/12/24 23:53:08 tom Exp $ + * $Id: ditto.c,v 1.61 2025/02/09 00:18:00 tom Exp $ * * The program illustrates how to set up multiple screens from a single * program. @@ -157,15 +157,15 @@ open_tty(char *path) int aslave; char slave_name[1024]; char s_option[sizeof(slave_name) + 80]; - const char *xterm_prog = 0; + const char *xterm_prog = NULL; - if ((xterm_prog = getenv("XTERM_PROG")) == 0) + if ((xterm_prog = getenv("XTERM_PROG")) == NULL) xterm_prog = "xterm"; - if (openpty(&amaster, &aslave, slave_name, 0, 0) != 0 + if (openpty(&amaster, &aslave, slave_name, NULL, NULL) != 0 || strlen(slave_name) > sizeof(slave_name) - 1) failed("openpty"); - if (strrchr(slave_name, '/') == 0) { + if (strrchr(slave_name, '/') == NULL) { errno = EISDIR; failed(slave_name); } @@ -176,7 +176,7 @@ open_tty(char *path) _exit(0); } fp = fdopen(amaster, "r+"); - if (fp == 0) + if (fp == NULL) failed(path); #else struct stat sb; @@ -192,7 +192,7 @@ open_tty(char *path) failed(path); printf("opened %s\n", path); #endif - assert(fp != 0); + assert(fp != NULL); return fp; } @@ -239,6 +239,14 @@ init_screen( return TRUE; } +static void +free_screen(DITTO * target) +{ + free(target->parents); + free(target->windows); + free(target->peeks); +} + static void open_screen(DITTO * target, char **source, int length, int which1) { @@ -258,7 +266,7 @@ open_screen(DITTO * target, char **source, int length, int which1) target->output, target->input); - if (target->screen == 0) + if (target->screen == NULL) failed("newterm"); (void) USING_SCREEN(target->screen, init_screen, target); @@ -421,10 +429,10 @@ main(int argc, char *argv[]) } } - if ((data = typeCalloc(DITTO, (size_t) argc)) == 0) + if ((data = typeCalloc(DITTO, (size_t) argc)) == NULL) failed("calloc data"); - assert(data != 0); + assert(data != NULL); for (j = 0; j < argc; j++) { open_screen(&data[j], argv, argc, j); @@ -470,7 +478,7 @@ main(int argc, char *argv[]) */ for (j = argc - 1; j >= 0; j--) { LockIt(); - USING_SCREEN(data[j].screen, close_screen, 0); + USING_SCREEN(data[j].screen, close_screen, NULL); fprintf(data[j].output, "**Closed\r\n"); /* @@ -480,8 +488,10 @@ main(int argc, char *argv[]) fflush(data[j].output); fclose(data[j].output); delscreen(data[j].screen); + free_screen(&data[j]); UnlockIt(); } + free(data); ExitProgram(EXIT_SUCCESS); } #else diff --git a/test/dots.c b/test/dots.c index 05aa8545..c50d4d1b 100644 --- a/test/dots.c +++ b/test/dots.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2019-2022,2023 Thomas E. Dickey * + * Copyright 2019-2023,2024 Thomas E. Dickey * * Copyright 1999-2013,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -30,7 +30,7 @@ /* * Author: Thomas E. Dickey 1999 * - * $Id: dots.c,v 1.45 2023/01/07 17:21:48 tom Exp $ + * $Id: dots.c,v 1.47 2024/12/07 22:27:13 tom Exp $ * * A simple demo of the terminfo interface. */ @@ -61,7 +61,7 @@ TPUTS_PROTO(outc, c) } static bool -outs(const char *s) +outs(NCURSES_CONST char *s) { if (VALID_STRING(s)) { tputs(s, 1, outc); @@ -102,7 +102,7 @@ static int get_number(NCURSES_CONST char *cap, int map) { int result = map; - if (cap != 0) { + if (cap != NULL) { int check = tigetnum(cap); if (check > 0) result = check; @@ -191,12 +191,12 @@ main(int argc, char *argv[]) SetupAlarm(r_option); InitAndCatch(setupterm((char *) 0, 1, (int *) 0), onsig); - srand((unsigned) time(0)); + srand((unsigned) time(NULL)); outs(clear_screen); outs(cursor_invisible); -#define GetNumber(ln,sn) get_number(f_option ? #sn : 0, ln) +#define GetNumber(ln,sn) get_number(f_option ? #sn : NULL, ln) my_colors = GetNumber(max_colors, colors); if (my_colors > 1) { if (!VALID_STRING(set_a_foreground) diff --git a/test/dots_curses.c b/test/dots_curses.c index 1a553213..0396fcda 100644 --- a/test/dots_curses.c +++ b/test/dots_curses.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2022,2023 Thomas E. Dickey * + * Copyright 2018-2023,2024 Thomas E. Dickey * * Copyright 2014,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -30,7 +30,7 @@ /* * Author: Thomas E. Dickey * - * $Id: dots_curses.c,v 1.25 2023/01/07 17:21:48 tom Exp $ + * $Id: dots_curses.c,v 1.27 2024/12/07 22:32:11 tom Exp $ * * A simple demo of the curses interface used for comparison with termcap. */ @@ -97,7 +97,7 @@ usage(int ok) ,"Options:" ," -T TERM override $TERM" #if HAVE_USE_DEFAULT_COLORS - ," -d invoke use_default_colors()" + ," -d invoke use_default_colors" #endif #if HAVE_USE_ENV ," -e allow environment $LINES / $COLUMNS" @@ -170,7 +170,7 @@ main(int argc, char *argv[]) } } - srand((unsigned) time(0)); + srand((unsigned) time(NULL)); SetupAlarm(r_option); InitAndCatch(initscr(), onsig); diff --git a/test/dots_mvcur.c b/test/dots_mvcur.c index a6119237..c0a45ca4 100644 --- a/test/dots_mvcur.c +++ b/test/dots_mvcur.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2019-2022,2023 Thomas E. Dickey * + * Copyright 2019-2023,2024 Thomas E. Dickey * * Copyright 2007-2013,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -30,7 +30,7 @@ /* * Author: Thomas E. Dickey - 2007 * - * $Id: dots_mvcur.c,v 1.31 2023/01/07 17:21:48 tom Exp $ + * $Id: dots_mvcur.c,v 1.33 2024/12/07 22:32:11 tom Exp $ * * A simple demo of the terminfo interface, and mvcur. */ @@ -62,7 +62,7 @@ TPUTS_PROTO(outc, c) } static bool -outs(const char *s) +outs(NCURSES_CONST char *s) { if (VALID_STRING(s)) { tputs(s, 1, outc); @@ -103,7 +103,7 @@ static int get_number(NCURSES_CONST char *cap, int map) { int result = map; - if (cap != 0) { + if (cap != NULL) { int check = tigetnum(cap); if (check > 0) result = check; @@ -195,18 +195,18 @@ main(int argc, char *argv[]) InitAndCatch((sp = newterm((char *) 0, stdout, stdin)), onsig); refresh(); /* needed with Solaris curses to cancel endwin */ - if (sp == 0) { + if (sp == NULL) { fprintf(stderr, "Cannot initialize terminal\n"); ExitProgram(EXIT_FAILURE); } - srand((unsigned) time(0)); + srand((unsigned) time(NULL)); outs(clear_screen); outs(cursor_home); outs(cursor_invisible); -#define GetNumber(ln,sn) get_number(f_option ? #sn : 0, ln) +#define GetNumber(ln,sn) get_number(f_option ? #sn : NULL, ln) my_colors = GetNumber(max_colors, colors); if (my_colors > 1) { if (!VALID_STRING(set_a_foreground) diff --git a/test/dots_termcap.c b/test/dots_termcap.c index 65786c41..e505389d 100644 --- a/test/dots_termcap.c +++ b/test/dots_termcap.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2022,2023 Thomas E. Dickey * + * Copyright 2018-2023,2024 Thomas E. Dickey * * Copyright 2013-2014,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -30,14 +30,14 @@ /* * Author: Thomas E. Dickey * - * $Id: dots_termcap.c,v 1.32 2023/02/25 18:11:21 tom Exp $ + * $Id: dots_termcap.c,v 1.37 2024/12/07 22:32:11 tom Exp $ * * A simple demo of the termcap interface. */ #define USE_TINFO #include -#if !defined(_NC_WINDOWS) +#if !defined(_NC_WINDOWS_NATIVE) #include #endif @@ -113,7 +113,7 @@ TPUTS_PROTO(outc, c) } static bool -outs(char *s) +outs(NCURSES_CONST char *s) { if (VALID_STRING(s)) { tputs(s, 1, outc); @@ -153,7 +153,7 @@ ranf(void) /* * napms is a curses function which happens to be usable without initializing * the screen, but if this program happened to be build with a "real" termcap - * library, there is nothing like napms. + * library, there is nothing like napms. */ #if HAVE_NAPMS #define my_napms(ms) napms(ms) @@ -162,7 +162,7 @@ static void my_napms(int ms) { if (ms > 0) { -#if defined(_NC_WINDOWS) +#if defined(_NC_WINDOWS_NATIVE) Sleep((unsigned int) ms); #else struct timeval data; @@ -178,9 +178,9 @@ static int get_number(NCURSES_CONST char *cap, const char *env) { int result = tgetnum(cap); - char *value = env ? getenv(env) : 0; - if (value != 0 && *value != 0) { - char *next = 0; + const char *value = env ? getenv(env) : NULL; + if (value != NULL && *value != 0) { + char *next = NULL; long check = strtol(value, &next, 10); if (check > 0 && *next == '\0') result = (int) check; @@ -229,7 +229,7 @@ main(int argc, char *argv[]) double c; char buffer[1024]; char area[1024]; - char *name; + NCURSES_CONST char *name; size_t need; char *my_env; @@ -263,12 +263,12 @@ main(int argc, char *argv[]) } } - if ((name = getenv("TERM")) == 0) { + if ((name = getenv("TERM")) == NULL) { fprintf(stderr, "TERM is not set\n"); ExitProgram(EXIT_FAILURE); } - srand((unsigned) time(0)); + srand((unsigned) time(NULL)); SetupAlarm((unsigned) r_option); InitAndCatch(ch = tgetent(buffer, name), onsig); @@ -285,7 +285,7 @@ main(int argc, char *argv[]) } num_colors = tgetnum("Co"); -#define GetNumber(cap,env) get_number(cap, e_option ? env : 0) +#define GetNumber(cap,env) get_number(cap, e_option ? env : NULL) num_lines = GetNumber("li", "LINES"); num_columns = GetNumber("co", "COLUMNS"); diff --git a/test/dots_xcurses.c b/test/dots_xcurses.c index b4b52193..e1677ea2 100644 --- a/test/dots_xcurses.c +++ b/test/dots_xcurses.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2022,2023 Thomas E. Dickey * + * Copyright 2018-2023,2024 Thomas E. Dickey * * Copyright 2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -30,13 +30,13 @@ /* * Author: Thomas E. Dickey * - * $Id: dots_xcurses.c,v 1.29 2023/01/07 17:21:48 tom Exp $ + * $Id: dots_xcurses.c,v 1.32 2024/12/07 22:32:11 tom Exp $ * * A simple demo of the wide-curses interface used for comparison with termcap. */ #include -#if !defined(_NC_WINDOWS) +#if !defined(_NC_WINDOWS_NATIVE) #include #endif @@ -120,7 +120,7 @@ usage(int ok) ,"Options:" ," -T TERM override $TERM" #if HAVE_USE_DEFAULT_COLORS - ," -d invoke use_default_colors()" + ," -d invoke use_default_colors" #endif #if HAVE_USE_ENV ," -e allow environment $LINES / $COLUMNS" @@ -202,7 +202,7 @@ main(int argc, char *argv[]) } setlocale(LC_ALL, ""); - srand((unsigned) time(0)); + srand((unsigned) time(NULL)); SetupAlarm(r_option); InitAndCatch(initscr(), onsig); diff --git a/test/dump_window.c b/test/dump_window.c index 14a8c9fa..e6115eb8 100644 --- a/test/dump_window.c +++ b/test/dump_window.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018,2020 Thomas E. Dickey * + * Copyright 2018-2023,2024 Thomas E. Dickey * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -26,7 +26,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: dump_window.c,v 1.4 2020/02/02 23:34:34 tom Exp $ + * $Id: dump_window.c,v 1.6 2024/12/07 23:03:07 tom Exp $ */ #include @@ -37,7 +37,7 @@ open_dump(const char *fn) { int result = 0; close_dump(); - if ((dumpfp = fopen(fn, "a")) != 0) + if ((dumpfp = fopen(fn, "a")) != NULL) result = 1; return result; } @@ -45,9 +45,9 @@ open_dump(const char *fn) void close_dump(void) { - if (dumpfp != 0) { + if (dumpfp != NULL) { fclose(dumpfp); - dumpfp = 0; + dumpfp = NULL; } } @@ -55,14 +55,14 @@ void dump_window(WINDOW *w) { wgetch(w); - if (dumpfp != 0) { + if (dumpfp != NULL) { int y, x; int oldy, oldx; int maxy, maxx; int pass; - char *cvec = 0; - char *avec = 0; - char *pvec = 0; + char *cvec = NULL; + char *avec = NULL; + char *pvec = NULL; int ccnt = 0; int acnt = 0; int pcnt = 0; @@ -97,7 +97,7 @@ dump_window(WINDOW *w) char aa; char pp; - temp = ((data & A_ATTRIBUTES) & (~A_COLOR)); + temp = ((data & A_ATTRIBUTES) & (chtype) (~A_COLOR)); if (temp) { if (temp & A_ALTCHARSET) { aa = (temp & A_BOLD) ? 'A' : 'a'; diff --git a/test/dup_field.c b/test/dup_field.c index 3e0b7693..0fe8234b 100644 --- a/test/dup_field.c +++ b/test/dup_field.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020-2021,2022 Thomas E. Dickey * + * Copyright 2020-2024,2025 Thomas E. Dickey * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -26,7 +26,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: dup_field.c,v 1.7 2022/12/10 23:31:31 tom Exp $ + * $Id: dup_field.c,v 1.13 2025/01/11 14:54:49 tom Exp $ * * Demonstrate dup_field(). */ @@ -62,7 +62,7 @@ static struct { { CTRL('W'), REQ_NEXT_WORD, "go to next word" }, { CTRL('X'), REQ_CLR_FIELD, "clear field" }, { CTRL('['), MY_QUIT, "exit form" }, - { KEY_F(1), MY_HELP, "show this screen", }, + { HELP_KEY_2, MY_HELP, "show this screen", }, { KEY_BACKSPACE, REQ_DEL_PREV, "delete previous character" }, { KEY_BTAB, REQ_PREV_FIELD, "go to previous field" }, { KEY_DOWN, REQ_DOWN_CHAR, "move down 1 character" }, @@ -91,19 +91,21 @@ my_help_edit_field(void) const char *code = keyname(commands[n].code); size_t need = 5; #ifdef NCURSES_VERSION - if ((name = form_request_name(commands[n].result)) == 0) + if ((name = form_request_name(commands[n].result)) == NULL) #endif name = commands[n].help; need = 5 + strlen(code) + strlen(name); msg = typeMalloc(char, need); - _nc_SPRINTF(msg, _nc_SLIMIT(need) "%s -- %s", code, name); - msgs[used++] = msg; + if (msg != NULL) { + _nc_SPRINTF(msg, _nc_SLIMIT(need) "%s -- %s", code, name); + msgs[used++] = msg; + } } msgs[used++] = strdup("Arrow keys move within a field as you would expect."); - msgs[used] = 0; + msgs[used] = NULL; popup_msg2(stdscr, msgs); - for (n = 0; msgs[n] != 0; ++n) { + for (n = 0; msgs[n] != NULL; ++n) { free(msgs[n]); } free(msgs); @@ -116,7 +118,7 @@ make_label(const char *label, int frow, int fcol) if (f) { set_field_buffer(f, 0, label); - set_field_opts(f, (int) ((unsigned) field_opts(f) & ~O_ACTIVE)); + set_field_opts(f, (int) ((unsigned) field_opts(f) & (unsigned) ~O_ACTIVE)); } return (f); } @@ -146,27 +148,27 @@ erase_form(FORM *f) } static FieldAttrs * -my_field_attrs(FIELD *f) +my_field_attrs(NCURSES_CONST FIELD *f) { return (FieldAttrs *) field_userptr(f); } static int -buffer_length(FIELD *f) +buffer_length(NCURSES_CONST FIELD *f) { return my_field_attrs(f)->row_lengths[0]; } static void -set_buffer_length(FIELD *f, int length) +set_buffer_length(NCURSES_CONST FIELD *f, int length) { my_field_attrs(f)->row_lengths[0] = length; } static int -offset_in_field(FORM *form) +offset_in_field(NCURSES_CONST FORM *form) { - FIELD *field = current_field(form); + NCURSES_CONST FIELD *field = current_field(form); int currow, curcol; form_getyx(form, currow, curcol); @@ -245,7 +247,7 @@ my_edit_field(FORM *form, int *result) default: modified = (ch < MIN_FORM_COMMAND - && isprint(ch)); + && isprint(UChar(ch))); break; } @@ -347,7 +349,7 @@ demo_forms(void) all_fields[n] = (FIELD *) 0; - if ((form = new_form(all_fields)) != 0) { + if ((form = new_form(all_fields)) != NULL) { int finished = 0; post_form(form); @@ -369,7 +371,7 @@ demo_forms(void) free_form(form); } - for (c = 0; all_fields[c] != 0; c++) { + for (c = 0; all_fields[c] != NULL; c++) { free_edit_field(all_fields[c]); free_field(all_fields[c]); } diff --git a/test/echochar.c b/test/echochar.c index 1d981574..e1ce8f1d 100644 --- a/test/echochar.c +++ b/test/echochar.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2019-2020,2022 Thomas E. Dickey * + * Copyright 2019-2023,2024 Thomas E. Dickey * * Copyright 2006-2014,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: echochar.c,v 1.25 2022/12/10 22:28:50 tom Exp $ + * $Id: echochar.c,v 1.27 2024/12/07 23:03:07 tom Exp $ * * Demonstrate the echochar function (compare to dots.c). * Thomas Dickey - 2006/11/4 @@ -65,7 +65,7 @@ ranf(void) } static void -set_color(char *my_pairs, int fg, int bg) +set_color(const char *const my_pairs, int fg, int bg) { int pair = (fg * COLORS) + bg; if (pair < COLOR_PAIRS) { @@ -108,7 +108,7 @@ main(int argc, char *argv[]) double c; bool use_colors; bool opt_r = FALSE; - char *my_pairs = 0; + char *my_pairs = NULL; int last_fg = 0; int last_bg = 0; @@ -134,10 +134,10 @@ main(int argc, char *argv[]) if (COLOR_PAIRS > 0) { my_pairs = typeCalloc(char, (size_t) COLOR_PAIRS); } - use_colors = (my_pairs != 0); + use_colors = (my_pairs != NULL); } - srand((unsigned) time(0)); + srand((unsigned) time(NULL)); curs_set(0); diff --git a/test/edit_field.c b/test/edit_field.c index b2b20845..7bea65a2 100644 --- a/test/edit_field.c +++ b/test/edit_field.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2019,2020 Thomas E. Dickey * + * Copyright 2019-2024,2025 Thomas E. Dickey * * Copyright 2003-2014,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: edit_field.c,v 1.31 2020/02/02 23:34:34 tom Exp $ + * $Id: edit_field.c,v 1.34 2025/01/11 14:54:49 tom Exp $ * * A wrapper for form_driver() which keeps track of the user's editing changes * for each field, and makes the resulting length available as a @@ -131,7 +131,7 @@ static struct { CTRL(']'), MY_INS_MODE, "toggle REQ_INS_MODE/REQ_OVL_MODE", }, { - KEY_F(1), MY_HELP, "show this screen", + HELP_KEY_2, MY_HELP, "show this screen", }, { KEY_BACKSPACE, REQ_DEL_PREV, "delete previous character" @@ -188,19 +188,21 @@ help_edit_field(void) const char *code = keyname(commands[n].code); size_t need = 5; #ifdef NCURSES_VERSION - if ((name = form_request_name(commands[n].result)) == 0) + if ((name = form_request_name(commands[n].result)) == NULL) #endif name = commands[n].help; need = 5 + strlen(code) + strlen(name); msg = typeMalloc(char, need); - _nc_SPRINTF(msg, _nc_SLIMIT(need) "%s -- %s", code, name); - msgs[used++] = msg; + if (msg != NULL) { + _nc_SPRINTF(msg, _nc_SLIMIT(need) "%s -- %s", code, name); + msgs[used++] = msg; + } } msgs[used++] = strdup("Arrow keys move within a field as you would expect."); - msgs[used] = 0; + msgs[used] = NULL; popup_msg2(stdscr, msgs); - for (n = 0; msgs[n] != 0; ++n) { + for (n = 0; msgs[n] != NULL; ++n) { free(msgs[n]); } free(msgs); @@ -249,7 +251,7 @@ init_edit_field(FIELD *f, char *value) { char empty[1]; FieldAttrs *ptr = field_attrs(f); - if (ptr == 0) { + if (ptr == NULL) { int rows, cols, frow, fcol, nrow, nbuf; ptr = typeCalloc(FieldAttrs, (size_t) 1); @@ -259,7 +261,7 @@ init_edit_field(FIELD *f, char *value) ptr->row_lengths = typeCalloc(int, (size_t) nrow + 1); } } - if (value == 0) { + if (value == NULL) { value = empty; *value = '\0'; } @@ -421,7 +423,7 @@ void free_edit_field(FIELD *f) { FieldAttrs *ptr = field_attrs(f); - if (ptr != 0) { + if (ptr != NULL) { free(ptr->row_lengths); free(ptr); } diff --git a/test/filter.c b/test/filter.c index b7444569..a6bdd530 100644 --- a/test/filter.c +++ b/test/filter.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2019-2020,2022 Thomas E. Dickey * + * Copyright 2019-2024,2025 Thomas E. Dickey * * Copyright 1998-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -30,7 +30,7 @@ /* * Author: Thomas E. Dickey 1998 * - * $Id: filter.c,v 1.38 2022/12/04 00:40:11 tom Exp $ + * $Id: filter.c,v 1.42 2025/02/08 13:06:10 tom Exp $ * * An example of the 'filter()' function in ncurses, this program prompts * for commands and executes them (like a command shell). It illustrates @@ -65,7 +65,7 @@ show_prompt(int underline, bool clocked) if (clocked) { if (limit >= 3) { time_t now = time((time_t *) 0); - struct tm *my = localtime(&now); + const struct tm *my = localtime(&now); char buffer[80]; int skip, y, x; int margin; @@ -123,7 +123,7 @@ new_command(char *buffer, int length, int underline, bool clocked, bool polled) if (first) { getyx(stdscr, y, x); first = FALSE; - } else { + } else if (limit > 0) { int left = 0; /* @@ -264,12 +264,12 @@ new_command(char *buffer, int length, int underline, bool clocked, bool polled) /* * Cancel xterm's alternate-screen mode (from dialog -TD) */ -#define isprivate(s) ((s) != 0 && strstr(s, "\033[?") != 0) +#define isprivate(s) ((s) != NULL && strstr(s, "\033[?") != NULL) static void cancel_altscreen(void) { if (isatty(fileno(stdout)) - && key_mouse != 0 /* xterm and kindred */ + && key_mouse != NULL /* xterm and kindred */ && isprivate(enter_ca_mode) && isprivate(exit_ca_mode)) { /* @@ -292,8 +292,8 @@ cancel_altscreen(void) * implementation of alternate-screen in rxvt, etc., which clear more * of the display than they should. */ - enter_ca_mode = 0; - exit_ca_mode = 0; + enter_ca_mode = NULL; + exit_ca_mode = NULL; } } #endif @@ -310,7 +310,7 @@ usage(int ok) #ifdef NCURSES_VERSION ," -a suppress xterm alternate-screen by amending smcup/rmcup" #endif - ," -c show current time on prompt line with \"Command\"" + ," -t show current time on prompt line with \"Command\"" #if HAVE_USE_DEFAULT_COLORS ," -d invoke use_default_colors" #endif @@ -335,7 +335,7 @@ main(int argc, char *argv[]) #ifdef NCURSES_VERSION bool a_option = FALSE; #endif - bool c_option = FALSE; + bool t_option = FALSE; #if HAVE_USE_DEFAULT_COLORS bool d_option = FALSE; #endif @@ -344,15 +344,15 @@ main(int argc, char *argv[]) setlocale(LC_ALL, ""); - while ((ch = getopt(argc, argv, OPTS_COMMON "adcip")) != -1) { + while ((ch = getopt(argc, argv, OPTS_COMMON "adtip")) != -1) { switch (ch) { #ifdef NCURSES_VERSION case 'a': a_option = TRUE; break; #endif - case 'c': - c_option = TRUE; + case 't': + t_option = TRUE; break; #if HAVE_USE_DEFAULT_COLORS case 'd': @@ -380,7 +380,7 @@ main(int argc, char *argv[]) if (i_option) { initscr(); } else { - if (newterm((char *) 0, stdout, stdin) == 0) { + if (newterm((char *) 0, stdout, stdin) == NULL) { fprintf(stderr, "cannot initialize terminal\n"); ExitProgram(EXIT_FAILURE); } @@ -408,7 +408,7 @@ main(int argc, char *argv[]) for (;;) { int code = new_command(buffer, sizeof(buffer) - 1, - underline, c_option, p_option); + underline, t_option, p_option); if (code == ERR || *buffer == '\0') break; reset_shell_mode(); diff --git a/test/foldkeys.c b/test/foldkeys.c index bb3801e2..dd8e1007 100644 --- a/test/foldkeys.c +++ b/test/foldkeys.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2022,2023 Thomas E. Dickey * + * Copyright 2018-2024,2025 Thomas E. Dickey * * Copyright 2006-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -30,7 +30,7 @@ /* * Author: Thomas E. Dickey, 2006 * - * $Id: foldkeys.c,v 1.12 2023/02/25 16:51:01 tom Exp $ + * $Id: foldkeys.c,v 1.15 2025/01/11 14:54:49 tom Exp $ * * Demonstrate a method for altering key definitions at runtime. * @@ -55,7 +55,7 @@ log_last_line(WINDOW *win) { FILE *fp; - if ((fp = fopen(MY_LOGFILE, "a")) != 0) { + if ((fp = fopen(MY_LOGFILE, "a")) != NULL) { char temp[256]; int y, x, n; int need = sizeof(temp) - 1; @@ -112,7 +112,7 @@ demo_foldkeys(void) for (code = 0; code < STRCOUNT; ++code) { NCURSES_CONST char *name = strnames[code]; NCURSES_CONST char *value = tigetstr(name); - if (value != 0 && value != (NCURSES_CONST char *) -1) { + if (value != NULL && value != (NCURSES_CONST char *) -1) { info[info_len].name = strnames[code]; info[info_len].code = key_defined(value); info[info_len].value = value; @@ -129,7 +129,7 @@ demo_foldkeys(void) */ for (code = KEY_MAX; code < MAX_KEYS; ++code) { NCURSES_CONST char *name = keyname(code); - if (name != 0) { + if (name != NULL) { info[info_len].name = name; info[info_len].code = code; info[info_len].value = tigetstr(name); @@ -155,8 +155,10 @@ demo_foldkeys(void) &second, final) == 3 && *final != ';' + && first >= 0 + && first < 1024 && (need = strlen(info[j].value)) != 0 - && (value = strdup(info[j].value)) != 0) { + && (value = malloc(need + 8)) != NULL) { (void) need; /* _nc_SLIMIT is normally nothing */ _nc_SPRINTF(value, _nc_SLIMIT(need) "\033[%d%c", first, *final); for (k = 0; k < info_len; ++k) { @@ -232,7 +234,7 @@ main(int argc, char *argv[]) if (optind < argc) usage(FALSE); - if (newterm(0, stdout, stdin) == 0) { + if (newterm(NULL, stdout, stdin) == NULL) { fprintf(stderr, "Cannot initialize terminal\n"); ExitProgram(EXIT_FAILURE); } @@ -262,7 +264,7 @@ main(int argc, char *argv[]) printw("Keycode %d, name %s%s\n", ch, escaped ? "ESC-" : "", - name != 0 ? name : ""); + name != NULL ? name : ""); log_last_line(stdscr); clrtoeol(); if (ch == 'q') diff --git a/test/form_driver_w.c b/test/form_driver_w.c index 544060dc..327281b4 100644 --- a/test/form_driver_w.c +++ b/test/form_driver_w.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020,2022 Thomas E. Dickey * + * Copyright 2020-2022,2024 Thomas E. Dickey * * Copyright 2013-2014,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -32,7 +32,7 @@ ****************************************************************************/ /* - * $Id: form_driver_w.c,v 1.17 2022/12/10 23:31:31 tom Exp $ + * $Id: form_driver_w.c,v 1.19 2024/12/07 22:32:11 tom Exp $ * * Test form_driver_w (int, int, wchar_t), a wide char aware * replacement of form_driver. @@ -68,13 +68,13 @@ VERSION_COMMON() int main(int argc, char *argv[]) { - static const char *help[] = + static NCURSES_CONST char *help[] = { "Commands:", " ^D,^Q,ESC - quit program", " , - move to next field", " , - move to previous field", - 0 + NULL }; #define NUM_FIELDS 3 diff --git a/test/gdc.6 b/test/gdc.6 index 383aae57..700687e6 100644 --- a/test/gdc.6 +++ b/test/gdc.6 @@ -1,5 +1,5 @@ .\"*************************************************************************** -.\" Copyright 2020 Thomas E. Dickey * +.\" Copyright 2020,2024 Thomas E. Dickey * .\" Copyright 1998-2006,2017 Free Software Foundation, Inc. * .\" * .\" Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,42 +27,80 @@ .\" authorization. * .\"*************************************************************************** .\" -.\" $Id: gdc.6,v 1.5 2020/02/02 23:34:34 tom Exp $ -.TH GDC 6 +.\" $Id: gdc.6,v 1.10 2024/06/22 21:31:03 tom Exp $ +.TH GDC 6 2024-06-15 ncurses-examples Games +.ie \n(.g \{\ +.ds `` \(lq +.ds '' \(rq +.\} +.el \{\ +.ie t .ds `` `` +.el .ds `` "" +.ie t .ds '' '' +.el .ds '' "" +.\} .SH NAME -gdc \- grand digital clock (curses) +gdc \- +grand digital clock using +.I curses .SH SYNOPSIS -.B gdc \fP[\fIoptions\fP] [\fIn\fP] +.B gdc +.RB [ \-dns ] +.RB [ \-t +.IB hh : mm : ss\c +] +.RI [ count ] .SH DESCRIPTION -.I Gdc -runs a digital clock made of reverse-video blanks on a terminal screen. -If the terminal supports color, the clock is drawn in red. -You can make the clock stop, pause or resume by pressing a ``q'', -``s'' or space, respectively. +.I gdc +uses +.I curses +to display a clock on the terminal. +It constructs the digits from reverse-video blank characters. +If the terminal type supports color, +the digits are drawn in red. +Make the clock stop, +pause, +or resume by typing \*(``q\*('', +\*(``s\*('', +or space, +respectively. +.PP +Given a numeric operand, +the clock +stops after +.I count +seconds. +Normally, +.I gdc +runs \*(``forever\*('' +(at least 2 billion seconds). .SH OPTIONS .TP .B \-d -use terminal's default colors for the background. +uses the terminal's default background color. .TP .B \-n -redirects input to /dev/null, making it ignore the stop/pause commands. -You can still stop it by pressing the interrupt key. +reads input from +.IR \%/dev/null , +making +.I gdc +ignore the stop and pause commands. +You can still stop it with a terminal interrupt. .TP .B \-s -makes digits scroll as they change. -When running on a fast display, the program breaks up the scrolling into -subsecond repaints, making the operation appear smooth. +scrolls the digits up as they change. +When running on a fast display, +the program breaks up the scrolling into sub-second redraws, +making the operation appear smooth. .TP -.B \-t \fIhh:mm:ss\fP -specify starting time (default is ``now''). -.PP -With an optional numeric argument -.I num -it stops after -.I num -seconds. -Normally it runs "forever" (counting down from 2 billion seconds). -.SH AUTHOR -Amos Shapir, modified for curses by John Lupien. -.br -Improvements for ncurses by Thomas Dickey. +.BR \-t \ \c +.IB hh : mm : ss +uses the specified time instead of the current time. +.SH AUTHORS +Amos Shapir, +John Lupien +(modifications for +.IR curses ), +Thomas Dickey +(improvements for +.IR \%ncurses ) diff --git a/test/gdc.c b/test/gdc.c index 7243c104..5a763593 100644 --- a/test/gdc.c +++ b/test/gdc.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2019-2020,2022 Thomas E. Dickey * + * Copyright 2019-2022,2024 Thomas E. Dickey * * Copyright 1998-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -34,7 +34,7 @@ * modified 10-18-89 for curses (jrl) * 10-18-89 added signal handling * - * $Id: gdc.c,v 1.57 2022/12/04 00:40:11 tom Exp $ + * $Id: gdc.c,v 1.64 2024/12/07 22:32:11 tom Exp $ */ #include @@ -60,6 +60,7 @@ static long older[6], next[6], newer[6], mask; static int sigtermed = 0; static bool redirected = FALSE; static bool hascolor = FALSE; +static bool hascustomtime = FALSE; static void sighndl(int signo) @@ -149,23 +150,23 @@ set(int t, int n) mask |= m; } -static void +static GCC_NORETURN void usage(int ok) { static const char *msg[] = { - "Usage: gdc [options] [count]" + "usage: gdc [-dns] -[t HH:MM:SS] [COUNT]" + ,"" + ,"Display a digital clock, running indefinitely or for COUNT seconds." ,"" ,USAGE_COMMON ,"Options:" #if HAVE_USE_DEFAULT_COLORS - ," -d invoke use_default_colors" + ," -d uses the terminal's default background color" #endif - ," -n redirect input to /dev/null" - ," -s scroll each number into place, rather than flipping" - ," -t TIME specify starting time as hh:mm:ss (default is ``now'')" - ,"" - ,"If you specify a count, gdc runs for that number of seconds" + ," -n reads input from /dev/null" + ," -s scrolls each digit into place" + ," -t TIME specify starting time as hh:mm:ss (default is \"now\")" }; unsigned j; for (j = 0; j < SIZEOF(msg); j++) @@ -179,13 +180,38 @@ parse_time(const char *value) int hh, mm, ss; int check; time_t result; - char c; - struct tm *tm; + char c = 0; + NCURSES_CONST struct tm *tm; - if (sscanf(value, "%d:%d:%d%c", &hh, &mm, &ss, &c) != 3) { - if (sscanf(value, "%02d%02d%02d%c", &hh, &mm, &ss, &c) != 3) { - usage(FALSE); + switch (sscanf(value, "%d:%d:%d%c", &hh, &mm, &ss, &c)) { + default: + usage(FALSE); + /* NOTREACHED */ + case 1: + if (strspn(value, "0123456789") >= 2) { + switch (sscanf(value, "%02d%02d%02d%c", &hh, &mm, &ss, &c)) { + default: + usage(FALSE); + /* NOTREACHED */ + case 1: + mm = 0; + /* FALLTHRU */ + case 2: + ss = 0; + /* FALLTHRU */ + case 3: + break; + } + break; + } else { + mm = 0; } + /* FALLTHRU */ + case 2: + ss = 0; + /* FALLTHRU */ + case 3: + break; } if ((hh < 0) || (hh >= 24) || @@ -217,7 +243,7 @@ int main(int argc, char *argv[]) { time_t now; - struct tm *tm; + NCURSES_CONST struct tm *tm; long t, a; int i, j, s, k, ch; int count = 0; @@ -247,6 +273,7 @@ main(int argc, char *argv[]) smooth = TRUE; break; case 't': + hascustomtime = TRUE; starts = parse_time(optarg); break; case OPTS_VERSION: @@ -266,9 +293,9 @@ main(int argc, char *argv[]) InitAndCatch({ if (redirected) { - char *name = getenv("TERM"); - if (name == 0 - || newterm(name, ofp, ifp) == 0) { + NCURSES_CONST char *name = getenv("TERM"); + if (name == NULL + || newterm(name, ofp, ifp) == NULL) { fprintf(stderr, "cannot open terminal\n"); ExitProgram(EXIT_FAILURE); } @@ -399,14 +426,16 @@ main(int argc, char *argv[]) } } - /* this depends on the detailed format of ctime(3) */ - _nc_STRNCPY(buf, ctime(&now), (size_t) 30); - { - char *d2 = buf + 10; - char *s2 = buf + 19; - while ((*d2++ = *s2++) != '\0') ; + if (!hascustomtime) { + /* this depends on the detailed format of ctime(3) */ + _nc_STRNCPY(buf, ctime(&now), (size_t) 30); + { + char *d2 = buf + 10; + NCURSES_CONST char *s2 = buf + 19; + while ((*d2++ = *s2++) != '\0') ; + } + MvAddStr(16, 30, buf); } - MvAddStr(16, 30, buf); move(6, 0); drawbox(FALSE); diff --git a/test/hashtest.c b/test/hashtest.c index be79c0e1..d88e6390 100644 --- a/test/hashtest.c +++ b/test/hashtest.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2019-2020,2022 Thomas E. Dickey * + * Copyright 2019-2022,2024 Thomas E. Dickey * * Copyright 1998-2013,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -31,7 +31,7 @@ * * Generate timing statistics for vertical-motion optimization. * - * $Id: hashtest.c,v 1.39 2022/12/04 00:40:11 tom Exp $ + * $Id: hashtest.c,v 1.42 2024/11/30 18:54:40 tom Exp $ */ #include @@ -158,13 +158,13 @@ usage(int ok) ,"" ,USAGE_COMMON ,"Options:" - ," -c continuous (don't reset between refresh's)" - ," -F num leave 'num' lines constant for footer" - ," -H num leave 'num' lines constant for header" - ," -l num repeat test 'num' times" + ," -S continuous (don't reset between refresh's)" + ," -F NUM leave NUM lines constant for footer" + ," -H NUM leave NUM lines constant for header" + ," -r NUM repeat tests NUM times" ," -n test the normal optimizer" ," -o test the hashed optimizer" - ," -r reverse the loops" + ," -R reverse the loops" ," -s single-step" ," -x assume lower-right corner extension" }; @@ -188,9 +188,9 @@ main(int argc, char *argv[]) setlocale(LC_ALL, ""); - while ((ch = getopt(argc, argv, OPTS_COMMON "cF:H:l:norsx")) != -1) { + while ((ch = getopt(argc, argv, OPTS_COMMON "F:H:RSnor:sx")) != -1) { switch (ch) { - case 'c': + case 'S': continuous = TRUE; break; case 'F': @@ -199,7 +199,7 @@ main(int argc, char *argv[]) case 'H': head_lines = atoi(optarg); break; - case 'l': + case 'r': test_loops = atoi(optarg); assert(test_loops >= 0); break; @@ -209,7 +209,7 @@ main(int argc, char *argv[]) case 'o': test_optimize = TRUE; break; - case 'r': + case 'R': reverse_loops = TRUE; break; case 's': diff --git a/test/inch_wide.c b/test/inch_wide.c index 7b838d1d..ce9c30f5 100644 --- a/test/inch_wide.c +++ b/test/inch_wide.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2019-2020,2022 Thomas E. Dickey * + * Copyright 2019-2022,2024 Thomas E. Dickey * * Copyright 2007-2010,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: inch_wide.c,v 1.13 2022/12/10 23:55:34 tom Exp $ + * $Id: inch_wide.c,v 1.15 2024/12/07 22:32:11 tom Exp $ */ /* int in_wch(cchar_t *wcval); @@ -61,7 +61,7 @@ Quit(int ch) static int test_inchs(int level, char **argv, WINDOW *chrwin, WINDOW *strwin) { - static const char *help[] = + static NCURSES_CONST char *help[] = { "Test input from screen using inch(), etc., in a moveable viewport.", "", @@ -70,11 +70,11 @@ test_inchs(int level, char **argv, WINDOW *chrwin, WINDOW *strwin) " h,j,k,l (and arrow-keys) - move viewport", " w - recur to new window", " for next input file", - 0 + NULL }; - WINDOW *txtbox = 0; - WINDOW *txtwin = 0; + WINDOW *txtbox = NULL; + WINDOW *txtwin = NULL; FILE *fp; int j; int txt_x = 0, txt_y = 0; @@ -82,7 +82,7 @@ test_inchs(int level, char **argv, WINDOW *chrwin, WINDOW *strwin) cchar_t ch; cchar_t text[MAX_COLS]; - if (argv[level] == 0) { + if (argv[level] == NULL) { beep(); return FALSE; } @@ -110,7 +110,7 @@ test_inchs(int level, char **argv, WINDOW *chrwin, WINDOW *strwin) txt_x = 0; wmove(txtwin, txt_y, txt_x); - if ((fp = fopen(argv[level], "r")) != 0) { + if ((fp = fopen(argv[level], "r")) != NULL) { while ((j = fgetc(fp)) != EOF) { if (waddch(txtwin, UChar(j)) != OK) { break; @@ -155,7 +155,7 @@ test_inchs(int level, char **argv, WINDOW *chrwin, WINDOW *strwin) break; case 'w': test_inchs(level + 1, argv, chrwin, strwin); - if (txtbox != 0) { + if (txtbox != NULL) { touchwin(txtbox); wnoutrefresh(txtbox); } else { diff --git a/test/inchs.c b/test/inchs.c index b5922dd6..5298d543 100644 --- a/test/inchs.c +++ b/test/inchs.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2019-2020,2022 Thomas E. Dickey * + * Copyright 2019-2022,2024 Thomas E. Dickey * * Copyright 2007-2012,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: inchs.c,v 1.19 2022/12/11 00:01:39 tom Exp $ + * $Id: inchs.c,v 1.21 2024/12/07 22:32:11 tom Exp $ * * Author: Thomas E Dickey */ @@ -71,7 +71,7 @@ Quit(int ch) static int test_inchs(int level, char **argv, WINDOW *chrwin, WINDOW *strwin) { - static const char *help[] = + static NCURSES_CONST char *help[] = { "Test input from screen using inch(), etc., in a moveable viewport.", "", @@ -80,17 +80,17 @@ test_inchs(int level, char **argv, WINDOW *chrwin, WINDOW *strwin) " h,j,k,l (and arrow-keys) - move viewport", " w - recur to new window", " for next input file", - 0 + NULL }; - WINDOW *txtbox = 0; - WINDOW *txtwin = 0; + WINDOW *txtbox = NULL; + WINDOW *txtwin = NULL; FILE *fp; int ch, j; int txt_x = 0, txt_y = 0; int base_y; chtype text[MAX_COLS]; - if (argv[level] == 0) { + if (argv[level] == NULL) { beep(); return FALSE; } @@ -109,7 +109,7 @@ test_inchs(int level, char **argv, WINDOW *chrwin, WINDOW *strwin) txtwin = stdscr; base_y = BASE_Y; } - if (txtwin == 0) + if (txtwin == NULL) failed("cannot create txtwin"); keypad(txtwin, TRUE); /* enable keyboard mapping */ @@ -120,7 +120,7 @@ test_inchs(int level, char **argv, WINDOW *chrwin, WINDOW *strwin) txt_x = 0; wmove(txtwin, txt_y, txt_x); - if ((fp = fopen(argv[level], "r")) != 0) { + if ((fp = fopen(argv[level], "r")) != NULL) { while ((j = fgetc(fp)) != EOF) { if (waddch(txtwin, UChar(j)) != OK) { break; @@ -165,7 +165,7 @@ test_inchs(int level, char **argv, WINDOW *chrwin, WINDOW *strwin) break; case 'w': test_inchs(level + 1, argv, chrwin, strwin); - if (txtbox != 0) { + if (txtbox != NULL) { touchwin(txtbox); wnoutrefresh(txtbox); } else { diff --git a/test/ins_wide.c b/test/ins_wide.c index a7324493..e316a327 100644 --- a/test/ins_wide.c +++ b/test/ins_wide.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020,2022 Thomas E. Dickey * + * Copyright 2020-2022,2024 Thomas E. Dickey * * Copyright 2002-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: ins_wide.c,v 1.30 2022/12/10 22:28:50 tom Exp $ + * $Id: ins_wide.c,v 1.32 2024/12/07 22:32:11 tom Exp $ * * Demonstrate the wins_wstr() and wins_wch functions. * Thomas Dickey - 2002/11/23 @@ -73,7 +73,7 @@ static bool w_opt = FALSE; static int n_opt = -1; static void -legend(WINDOW *win, int level, Options state, wchar_t *buffer, int length) +legend(WINDOW *win, int level, Options state, const wchar_t *buffer, int length) { const char *showstate; @@ -225,9 +225,9 @@ test_inserts(int level) int row2, col2; int length; wchar_t buffer[BUFSIZ]; - WINDOW *look = 0; - WINDOW *work = 0; - WINDOW *show = 0; + WINDOW *look = NULL; + WINDOW *work = NULL; + WINDOW *show = NULL; int margin = (2 * MY_TABSIZE) - 1; Options option = (Options) ((int) (m_opt ? oMove : oDefault) | (int) ((w_opt || (level > 0)) diff --git a/test/insdelln.c b/test/insdelln.c index 52ccfb62..5488b94f 100644 --- a/test/insdelln.c +++ b/test/insdelln.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2019-2020,2022 Thomas E. Dickey * + * Copyright 2019-2022,2024 Thomas E. Dickey * * Copyright 2008-2014,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: insdelln.c,v 1.15 2022/12/10 23:31:31 tom Exp $ + * $Id: insdelln.c,v 1.18 2024/12/07 22:32:11 tom Exp $ * * test-driver for deleteln, wdeleteln, insdelln, winsdelln, insertln, winsertln */ @@ -71,7 +71,7 @@ color_params(unsigned state, int *pair) }; /* *INDENT-ON* */ - const char *result = 0; + const char *result = NULL; if (has_colors()) { static bool first = TRUE; @@ -107,7 +107,7 @@ video_params(unsigned state, unsigned *attr) }; /* *INDENT-ON* */ - const char *result = 0; + const char *result = NULL; if (state < SIZEOF(table)) { *attr = table[state].attr; @@ -144,9 +144,9 @@ show_status(WINDOW *win, STATUS * sp) getyx(win, y, x); wmove(win, 0, 0); wprintw(win, "Count %d", sp->count); - if (sp->v_msg != 0) + if (sp->v_msg != NULL) wprintw(win, " Video %s", sp->v_msg); - if (sp->c_msg != 0) + if (sp->c_msg != NULL) wprintw(win, " Color %s", sp->c_msg); wclrtoeol(win); wmove(win, y, x); @@ -160,15 +160,15 @@ reshow_status(WINDOW *win, STATUS * sp) } static void -do_subwindow(WINDOW *win, STATUS * sp, void func(WINDOW *)) +do_subwindow(WINDOW *win, const STATUS * sp, void func(WINDOW *)) { WINDOW *win1 = newwin(sp->y_max - 2, sp->x_max - 2, sp->y_beg + 1, sp->x_beg + 1); - if (win1 != 0 && sp->y_max > 4 && sp->x_max > 4) { + if (win1 != NULL && sp->y_max > 4 && sp->x_max > 4) { WINDOW *win2 = derwin(win1, sp->y_max - 4, sp->x_max - 4, 1, 1); - if (win2 != 0) { + if (win2 != NULL) { box(win1, 0, 0); wrefresh(win1); func(win2); @@ -204,7 +204,7 @@ init_status(WINDOW *win, STATUS * sp) static void show_help(WINDOW *win) { - static const char *table[] = + static NCURSES_CONST char *table[] = { "Basic commands:" ,"Use h/j/k/l or arrow keys to move the cursor." @@ -222,7 +222,7 @@ show_help(WINDOW *win) ,"q quit" ,"= resets count to zero." ,"? shows this help-window" - ,0 + ,NULL }; popup_msg(win, table); @@ -234,14 +234,14 @@ update_status(WINDOW *win, STATUS * sp) switch (sp->ch) { case ' ': /* next test-iteration */ if (has_colors()) { - if ((sp->c_msg = color_params(++(sp->c), &(sp->pair))) == 0) { + if ((sp->c_msg = color_params(++(sp->c), &(sp->pair))) == NULL) { sp->c_msg = color_params(sp->c = 0, &(sp->pair)); - if ((sp->v_msg = video_params(++(sp->v), &(sp->attr))) == 0) { + if ((sp->v_msg = video_params(++(sp->v), &(sp->attr))) == NULL) { sp->v_msg = video_params(sp->v = 0, &(sp->attr)); } } } else { - if ((sp->v_msg = video_params(++(sp->v), &(sp->attr))) == 0) { + if ((sp->v_msg = video_params(++(sp->v), &(sp->attr))) == NULL) { sp->v_msg = video_params(sp->v = 0, &(sp->attr)); } } diff --git a/test/inserts.c b/test/inserts.c index b106ffc7..6efb513b 100644 --- a/test/inserts.c +++ b/test/inserts.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020,2022 Thomas E. Dickey * + * Copyright 2020-2022,2024 Thomas E. Dickey * * Copyright 2002-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: inserts.c,v 1.34 2022/12/10 22:28:50 tom Exp $ + * $Id: inserts.c,v 1.36 2024/12/07 22:33:32 tom Exp $ * * Demonstrate the winsstr() and winsch functions. * Thomas Dickey - 2002/10/19 @@ -98,7 +98,7 @@ legend(WINDOW *win, int level, Options state, char *buffer, int length) } static int -ColOf(char *buffer, int length, int margin) +ColOf(const char *buffer, int length, int margin) { int n; int result; @@ -147,9 +147,9 @@ test_inserts(int level) int row2, col2; int length; char buffer[BUFSIZ]; - WINDOW *look = 0; - WINDOW *work = 0; - WINDOW *show = 0; + WINDOW *look = NULL; + WINDOW *work = NULL; + WINDOW *show = NULL; int margin = (2 * MY_TABSIZE) - 1; Options option = (Options) ((unsigned) (m_opt ? oMove diff --git a/test/key_names.c b/test/key_names.c index fa7fdba6..2a49f1bd 100644 --- a/test/key_names.c +++ b/test/key_names.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020,2022 Thomas E. Dickey * + * Copyright 2020-2022,2024 Thomas E. Dickey * * Copyright 2007-2014,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: key_names.c,v 1.11 2022/12/04 00:40:11 tom Exp $ + * $Id: key_names.c,v 1.12 2024/12/07 23:00:37 tom Exp $ */ #include @@ -100,7 +100,7 @@ main(int argc, char *argv[]) for (n = -1; n < KEY_MAX + 512; n++) { int check = wcwidth((wchar_t) n); const char *result = check >= 0 ? key_name((wchar_t) n) : "?"; - if (result != 0) + if (result != NULL) printf("%d(%5o):%s\n", n, n, result); } ExitProgram(EXIT_SUCCESS); diff --git a/test/keynames.c b/test/keynames.c index cae260f6..00f2cc14 100644 --- a/test/keynames.c +++ b/test/keynames.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020,2022 Thomas E. Dickey * + * Copyright 2020-2022,2024 Thomas E. Dickey * * Copyright 1998-2006,2008 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: keynames.c,v 1.13 2022/12/04 00:40:11 tom Exp $ + * $Id: keynames.c,v 1.14 2024/12/07 23:00:37 tom Exp $ */ #include @@ -97,7 +97,7 @@ main(int argc, char *argv[]) for (n = -1; n < KEY_MAX + 512; n++) { const char *result = keyname(n); - if (result != 0) + if (result != NULL) printf("%d(%5o):%s\n", n, n, result); } ExitProgram(EXIT_SUCCESS); diff --git a/test/knight.c b/test/knight.c index b15c4d23..274e175d 100644 --- a/test/knight.c +++ b/test/knight.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2021,2022 Thomas E. Dickey * + * Copyright 2018-2022,2024 Thomas E. Dickey * * Copyright 1998-2013,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -34,7 +34,7 @@ * Eric S. Raymond July 22 1995. Mouse support * added September 20th 1995. * - * $Id: knight.c,v 1.52 2022/12/04 00:40:11 tom Exp $ + * $Id: knight.c,v 1.53 2024/10/05 19:38:58 tom Exp $ */ #include @@ -450,7 +450,8 @@ iabs(int num) } static bool -evaluate_move(SQUARES squares, HISTORY * doneData, int doneSize, int row, int column) +evaluate_move(SQUARES squares, const HISTORY * doneData, int doneSize, + int row, int column) { if (doneSize <= 1) return (TRUE); diff --git a/test/linedata.h b/test/linedata.h index f042ab44..3ca9d463 100644 --- a/test/linedata.h +++ b/test/linedata.h @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018,2020 Thomas E. Dickey * + * Copyright 2018-2020,2024 Thomas E. Dickey * * Copyright 2009-2010,2012 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -28,7 +28,7 @@ ****************************************************************************/ /* - * $Id: linedata.h,v 1.8 2020/02/02 23:34:34 tom Exp $ + * $Id: linedata.h,v 1.9 2024/12/07 23:00:37 tom Exp $ * * Utility functions for reading a line of text from a file. */ @@ -55,7 +55,7 @@ failed(const char *s) static void init_linedata(const char *name) { - if ((linedata = fopen(name, "r")) == 0) { + if ((linedata = fopen(name, "r")) == NULL) { failed(name); } } @@ -64,11 +64,11 @@ static int read_linedata(WINDOW *work) { int result; - if (linedata != 0) { + if (linedata != NULL) { result = fgetc(linedata); if (result == EOF) { fclose(linedata); - linedata = 0; + linedata = NULL; result = read_linedata(work); } else { wrefresh(work); diff --git a/test/list_keys.c b/test/list_keys.c index ee54b856..aa8a3e57 100644 --- a/test/list_keys.c +++ b/test/list_keys.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2021,2022 Thomas E. Dickey * + * Copyright 2018-2023,2024 Thomas E. Dickey * * Copyright 2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: list_keys.c,v 1.31 2022/12/10 23:23:27 tom Exp $ + * $Id: list_keys.c,v 1.37 2024/12/07 22:33:32 tom Exp $ * * Author: Thomas E Dickey * @@ -52,7 +52,10 @@ static bool f_opt = FALSE; static bool m_opt = FALSE; static bool t_opt = FALSE; + +#if NCURSES_XNAMES || HAVE_USE_EXTENDED_NAMES static bool x_opt = FALSE; +#endif typedef enum { ktCursor @@ -71,12 +74,19 @@ typedef struct { #define Type(n) list[n].type #define Name(n) list[n].name +static void +failed(const char *msg) +{ + perror(msg); + ExitProgram(EXIT_FAILURE); +} + static const char * full_name(const char *name) { const char *result = name; int n; - for (n = 0; strnames[n] != 0; ++n) { + for (n = 0; strnames[n] != NULL; ++n) { if (!strcmp(name, strnames[n])) { result = strfnames[n]; break; @@ -94,7 +104,7 @@ show_key(const char *name, bool show) if (show && t_opt) fputc('"', stdout); - if (value != 0 && value != (char *) -1) { + if (value != NULL && value != (char *) -1) { while (*value != 0) { char buffer[10]; int ch = UChar(*value++); @@ -287,7 +297,7 @@ list_keys(TERMINAL **terms, int count) #if NCURSES_XNAMES if (x_opt) { for (k = 0; k < count; ++k) { - TERMTYPE *term; + const TERMTYPE *term; set_curterm(terms[k]); term = (TERMTYPE *) cur_term; total += (size_t) (NUM_STRINGS(term) - STRCOUNT); @@ -338,12 +348,15 @@ list_keys(TERMINAL **terms, int count) widths1 = (int) strlen(modifier); for (k = 0; k < count; ++k) { + const char *value; set_curterm(terms[k]); - check = (int) strlen(termname()); + if ((value = termname()) == NULL) + failed("termname"); + check = (int) strlen(value); if (widths2 < check) widths2 = check; } - for (j = 0; Name(j) != 0; ++j) { + for (j = 0; Name(j) != NULL; ++j) { if (valid_key(Name(j), terms, count)) { const char *label = f_opt ? full_name(Name(j)) : Name(j); check = (int) strlen(label); @@ -386,7 +399,7 @@ list_keys(TERMINAL **terms, int count) widthsx = widths0 + ((count + 1) * widths2); - for (j = 0; Name(j) != 0; ++j) { + for (j = 0; Name(j) != NULL; ++j) { if (j == 0 || (Type(j) != Type(j - 1))) draw_line(widthsx); if (valid_key(Name(j), terms, count)) { @@ -427,9 +440,9 @@ usage(int ok) ,"" ,USAGE_COMMON ,"Options:" - ," -f print full names" + ," -f print full terminfo names" ," -m print modifier-column for shift/control keys" - ," -t print result as CSV table" + ," -t print the result as CSV table" #ifdef NCURSES_VERSION ," -x print extended capabilities" #endif @@ -461,7 +474,7 @@ main(int argc, char *argv[]) case 't': t_opt = TRUE; break; -#ifdef NCURSES_VERSION +#if NCURSES_XNAMES || HAVE_USE_EXTENDED_NAMES case 'x': x_opt = TRUE; break; @@ -485,7 +498,7 @@ main(int argc, char *argv[]) int n; for (n = optind; n < argc; ++n) { setupterm((NCURSES_CONST char *) argv[n], 1, &status); - if (status > 0 && cur_term != 0) { + if (status > 0 && cur_term != NULL) { terms[found++] = cur_term; } } diff --git a/test/modules b/test/modules index 7e3fcc22..a3eb5808 100644 --- a/test/modules +++ b/test/modules @@ -1,6 +1,6 @@ -# $Id: modules,v 1.78 2022/08/13 20:53:43 tom Exp $ +# $Id: modules,v 1.80 2024/06/15 19:00:13 tom Exp $ ############################################################################## -# Copyright 2018-2021,2022 Thomas E. Dickey # +# Copyright 2018-2023,2024 Thomas E. Dickey # # Copyright 1998-2016,2017 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # @@ -33,8 +33,8 @@ # Test-Program modules @ base -back_ground progs $(srcdir) $(HEADER_DEPS) -background progs $(srcdir) $(HEADER_DEPS) +back_ground progs $(srcdir) $(HEADER_DEPS) $(srcdir)/color_name.h $(srcdir)/dump_window.h +background progs $(srcdir) $(HEADER_DEPS) $(srcdir)/color_name.h $(srcdir)/dump_window.h blue progs $(srcdir) $(HEADER_DEPS) bs progs $(srcdir) $(HEADER_DEPS) cardfile progs $(srcdir) $(HEADER_DEPS) $(incdir)/panel.h $(incdir)/form.h @@ -42,7 +42,7 @@ chgat progs $(srcdir) $(HEADER_DEPS) $(srcdir)/popup_msg.h clip_printw progs $(srcdir) $(HEADER_DEPS) $(srcdir)/popup_msg.h color_content progs $(srcdir) $(HEADER_DEPS) color_set progs $(srcdir) $(HEADER_DEPS) -combine progs $(srcdir) $(HEADER_DEPS) +combine progs $(srcdir) $(HEADER_DEPS) $(srcdir)/dump_window.h $(srcdir)/popup_msg.h demo_altkeys progs $(srcdir) $(HEADER_DEPS) demo_defkey progs $(srcdir) $(HEADER_DEPS) demo_forms progs $(srcdir) $(HEADER_DEPS) $(srcdir)/edit_field.h @@ -51,8 +51,8 @@ demo_menus progs $(srcdir) $(HEADER_DEPS) $(incdir)/menu.h demo_new_pair progs $(srcdir) $(HEADER_DEPS) $(srcdir)/popup_msg.h demo_panels progs $(srcdir) $(HEADER_DEPS) $(incdir)/panel.h demo_tabs progs $(srcdir) $(HEADER_DEPS) -demo_termcap progs $(srcdir) $(HEADER_DEPS) -demo_terminfo progs $(srcdir) $(HEADER_DEPS) +demo_termcap progs $(srcdir) $(HEADER_DEPS) $(incdir)/term_entry.h $(incdir)/termcap.h +demo_terminfo progs $(srcdir) $(HEADER_DEPS) $(incdir)/term_entry.h ditto progs $(srcdir) $(HEADER_DEPS) dots progs $(srcdir) $(HEADER_DEPS) dots_curses progs $(srcdir) $(HEADER_DEPS) @@ -60,7 +60,7 @@ dots_mvcur progs $(srcdir) $(HEADER_DEPS) dots_termcap progs $(srcdir) $(HEADER_DEPS) dots_xcurses progs $(srcdir) $(HEADER_DEPS) dump_window progs $(srcdir) $(HEADER_DEPS) $(srcdir)/dump_window.h -dup_field progs $(srcdir) $(HEADER_DEPS) $(srcdir)/edit_field.h +dup_field progs $(srcdir) $(HEADER_DEPS) $(srcdir)/edit_field.h $(srcdir)/popup_msg.h echochar progs $(srcdir) $(HEADER_DEPS) edit_field progs $(srcdir) $(HEADER_DEPS) $(srcdir)/edit_field.h $(srcdir)/popup_msg.h extended_color progs $(srcdir) $(HEADER_DEPS) @@ -68,7 +68,7 @@ filter progs $(srcdir) $(HEADER_DEPS) firework progs $(srcdir) $(HEADER_DEPS) firstlast progs $(srcdir) $(HEADER_DEPS) foldkeys progs $(srcdir) $(HEADER_DEPS) -form_driver_w progs $(srcdir) $(HEADER_DEPS) $(srcdir)/popup_msg.h +form_driver_w progs $(srcdir) $(HEADER_DEPS) $(srcdir)/popup_msg.h $(incdir)/form.h gdc progs $(srcdir) $(HEADER_DEPS) hanoi progs $(srcdir) $(HEADER_DEPS) hashtest progs $(srcdir) $(HEADER_DEPS) @@ -80,15 +80,15 @@ inserts progs $(srcdir) $(HEADER_DEPS) $(srcdir)/linedata.h key_names progs $(srcdir) $(HEADER_DEPS) keynames progs $(srcdir) $(HEADER_DEPS) knight progs $(srcdir) $(HEADER_DEPS) -list_keys progs $(srcdir) $(HEADER_DEPS) +list_keys progs $(srcdir) $(HEADER_DEPS) $(incdir)/term_entry.h lrtest progs $(srcdir) $(HEADER_DEPS) -move_field progs $(srcdir) $(HEADER_DEPS) $(srcdir)/edit_field.h +move_field progs $(srcdir) $(HEADER_DEPS) $(srcdir)/edit_field.h $(srcdir)/popup_msg.h movewindow progs $(srcdir) $(HEADER_DEPS) $(srcdir)/popup_msg.h ncurses progs $(srcdir) $(HEADER_DEPS) $(incdir)/panel.h $(incdir)/menu.h $(incdir)/form.h newdemo progs $(srcdir) $(HEADER_DEPS) padview progs $(srcdir) $(HEADER_DEPS) $(srcdir)/widechars.h $(srcdir)/popup_msg.h pair_content progs $(srcdir) $(HEADER_DEPS) -picsmap progs $(srcdir) $(HEADER_DEPS) +picsmap progs $(srcdir) $(HEADER_DEPS) $(srcdir)/picsmap.h popup_msg progs $(srcdir) $(HEADER_DEPS) $(srcdir)/popup_msg.h railroad progs $(srcdir) $(HEADER_DEPS) rain progs $(srcdir) $(HEADER_DEPS) $(srcdir)/popup_msg.h @@ -102,8 +102,9 @@ test_addstr progs $(srcdir) $(HEADER_DEPS) $(srcdir)/linedata.h test_addwstr progs $(srcdir) $(HEADER_DEPS) $(srcdir)/linedata.h test_arrays progs $(srcdir) $(HEADER_DEPS) test_delwin progs $(srcdir) $(HEADER_DEPS) -test_get_wstr progs $(srcdir) $(HEADER_DEPS) -test_getstr progs $(srcdir) $(HEADER_DEPS) +test_endwin progs $(srcdir) $(HEADER_DEPS) +test_get_wstr progs $(srcdir) $(HEADER_DEPS) $(srcdir)/popup_msg.h +test_getstr progs $(srcdir) $(HEADER_DEPS) $(srcdir)/popup_msg.h test_instr progs $(srcdir) $(HEADER_DEPS) test_inwstr progs $(srcdir) $(HEADER_DEPS) test_mouse progs $(srcdir) $(HEADER_DEPS) @@ -111,7 +112,7 @@ test_opaque progs $(srcdir) $(HEADER_DEPS) test_setupterm progs $(srcdir) $(HEADER_DEPS) test_sgr progs $(srcdir) $(HEADER_DEPS) test_termattrs progs $(srcdir) $(HEADER_DEPS) -test_tparm progs $(srcdir) $(HEADER_DEPS) +test_tparm progs $(srcdir) $(HEADER_DEPS) $(incdir)/term_entry.h test_unget_wch progs $(srcdir) $(HEADER_DEPS) test_vid_puts progs $(srcdir) $(HEADER_DEPS) test_vidputs progs $(srcdir) $(HEADER_DEPS) diff --git a/test/move_field.c b/test/move_field.c index e337319e..3e8b06cb 100644 --- a/test/move_field.c +++ b/test/move_field.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020-2021,2022 Thomas E. Dickey * + * Copyright 2020-2024,2025 Thomas E. Dickey * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -26,7 +26,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: move_field.c,v 1.14 2022/12/10 23:31:31 tom Exp $ + * $Id: move_field.c,v 1.21 2025/01/11 14:54:49 tom Exp $ * * Demonstrate move_field(). */ @@ -62,7 +62,7 @@ static struct { { CTRL('W'), REQ_NEXT_WORD, "go to next word" }, { CTRL('X'), REQ_CLR_FIELD, "clear field" }, { CTRL('['), MY_QUIT, "exit form" }, - { KEY_F(1), MY_HELP, "show this screen", }, + { HELP_KEY_2, MY_HELP, "show this screen", }, { KEY_BACKSPACE, REQ_DEL_PREV, "delete previous character" }, { KEY_BTAB, REQ_PREV_FIELD, "go to previous field" }, { KEY_DOWN, REQ_DOWN_CHAR, "move down 1 character" }, @@ -91,19 +91,21 @@ my_help_edit_field(void) const char *code = keyname(commands[n].code); size_t need = 5; #ifdef NCURSES_VERSION - if ((name = form_request_name(commands[n].result)) == 0) + if ((name = form_request_name(commands[n].result)) == NULL) #endif name = commands[n].help; need = 5 + strlen(code) + strlen(name); msg = typeMalloc(char, need); - _nc_SPRINTF(msg, _nc_SLIMIT(need) "%s -- %s", code, name); - msgs[used++] = msg; + if (msg != NULL) { + _nc_SPRINTF(msg, _nc_SLIMIT(need) "%s -- %s", code, name); + msgs[used++] = msg; + } } msgs[used++] = strdup("Arrow keys move within a field as you would expect."); - msgs[used] = 0; + msgs[used] = NULL; popup_msg2(stdscr, msgs); - for (n = 0; msgs[n] != 0; ++n) { + for (n = 0; msgs[n] != NULL; ++n) { free(msgs[n]); } free(msgs); @@ -116,7 +118,7 @@ make_label(const char *label, int frow, int fcol) if (f) { set_field_buffer(f, 0, label); - set_field_opts(f, (int) ((unsigned) field_opts(f) & ~O_ACTIVE)); + set_field_opts(f, (int) ((unsigned) field_opts(f) & (unsigned) ~O_ACTIVE)); } return (f); } @@ -146,27 +148,27 @@ erase_form(FORM *f) } static FieldAttrs * -my_field_attrs(FIELD *f) +my_field_attrs(NCURSES_CONST FIELD *f) { return (FieldAttrs *) field_userptr(f); } static int -buffer_length(FIELD *f) +buffer_length(NCURSES_CONST FIELD *f) { return my_field_attrs(f)->row_lengths[0]; } static void -set_buffer_length(FIELD *f, int length) +set_buffer_length(NCURSES_CONST FIELD *f, int length) { my_field_attrs(f)->row_lengths[0] = length; } static int -offset_in_field(FORM *form) +offset_in_field(NCURSES_CONST FORM *form) { - FIELD *field = current_field(form); + NCURSES_CONST FIELD *field = current_field(form); int currow, curcol; form_getyx(form, currow, curcol); @@ -245,7 +247,7 @@ my_edit_field(FORM *form, int *result) default: modified = (ch < MIN_FORM_COMMAND - && isprint(ch)); + && isprint(UChar(ch))); break; } @@ -275,9 +277,9 @@ copy_fields(FIELD **source, size_t length) /* display a status message to show what's happening */ static void -show_status(FORM *form, FIELD *field) +show_status(NCURSES_CONST FORM *form, NCURSES_CONST FIELD *field) { - WINDOW *sub = form_sub(form); + NCURSES_CONST WINDOW *sub = form_sub(form); int currow, curcol; getyx(stdscr, currow, curcol); @@ -444,7 +446,7 @@ demo_forms(void) all_fields[n] = (FIELD *) 0; - if ((form = new_form(all_fields)) != 0) { + if ((form = new_form(all_fields)) != NULL) { int finished = 0; post_form(form); @@ -466,7 +468,7 @@ demo_forms(void) free_form(form); } - for (c = 0; all_fields[c] != 0; c++) { + for (c = 0; all_fields[c] != NULL; c++) { free_edit_field(all_fields[c]); free_field(all_fields[c]); } diff --git a/test/movewindow.c b/test/movewindow.c index 7fe7329f..76a1b758 100644 --- a/test/movewindow.c +++ b/test/movewindow.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2021,2022 Thomas E. Dickey * + * Copyright 2018-2024,2025 Thomas E. Dickey * * Copyright 2006-2013,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: movewindow.c,v 1.53 2022/12/10 23:31:31 tom Exp $ + * $Id: movewindow.c,v 1.58 2025/01/11 14:54:49 tom Exp $ * * Demonstrate move functions for windows and derived windows from the curses * library. @@ -135,7 +135,7 @@ tail_line(CONST_FMT char *fmt, ...) */ static PAIR * selectcell(WINDOW *parent, - WINDOW *child, + NCURSES_CONST WINDOW *child, int uli, int ulj, int lri, int lrj, bool relative, @@ -149,7 +149,7 @@ selectcell(WINDOW *parent, res.y = uli; res.x = ulj; - if (child != 0) { + if (child != NULL) { if (relative) { getparyx(child, i, j); } else { @@ -252,24 +252,24 @@ getwindow(WINDOW *parent, PAIR * ul, PAIR * lr) int max_col = (parent == stdscr) ? COL_MAX : getmaxx(parent); int min_line = (parent == stdscr) ? LINE_MIN : 0; int max_line = (parent == stdscr) ? LINE_MAX : getmaxy(parent); - PAIR *tmp; + NCURSES_CONST PAIR *tmp; bool result = FALSE; head_line("Use arrows to move cursor, anything else to mark corner 1"); - if ((tmp = selectcell(parent, 0, + if ((tmp = selectcell(parent, NULL, min_line, min_col, max_line, max_col, FALSE, - (bool *) 0)) != 0) { + (bool *) 0)) != NULL) { *ul = *tmp; MvWAddCh(parent, ul->y, ul->x, '*'); head_line("Use arrows to move cursor, anything else to mark corner 2"); - if ((tmp = selectcell(parent, 0, + if ((tmp = selectcell(parent, NULL, ul->y, ul->x, max_line, max_col, FALSE, - (bool *) 0)) != 0) { + (bool *) 0)) != NULL) { *lr = *tmp; MvWAddCh(parent, lr->y, lr->x, '*'); wmove(parent, lr->y, lr->x); @@ -324,6 +324,7 @@ add_window(WINDOW *parent, WINDOW *child) all_windows = typeRealloc(FRAME, need, all_windows); if (!all_windows) failed("add_window"); + have = need; } all_windows[num_windows].parent = parent; all_windows[num_windows].child = child; @@ -331,7 +332,7 @@ add_window(WINDOW *parent, WINDOW *child) } static int -window2num(WINDOW *win) +window2num(const WINDOW *const win) { int n; int result = -1; @@ -345,9 +346,9 @@ window2num(WINDOW *win) } static WINDOW * -parent_of(WINDOW *win) +parent_of(NCURSES_CONST WINDOW *win) { - WINDOW *result = 0; + WINDOW *result = NULL; int n = window2num(win); if (n >= 0) result = all_windows[n].parent; @@ -407,7 +408,7 @@ prev_window(WINDOW *win) } static void -recur_move_window(WINDOW *parent, int dy, int dx) +recur_move_window(const WINDOW *const parent, int dy, int dx) { unsigned n; @@ -428,13 +429,13 @@ move_window(WINDOW *win, bool recur) WINDOW *parent = parent_of(win); bool result = FALSE; - if (parent != 0) { + if (parent != NULL) { bool top = (parent == stdscr); int min_col = top ? COL_MIN : 0; int max_col = top ? COL_MAX : getmaxx(parent); int min_line = top ? LINE_MIN : 0; int max_line = top ? LINE_MAX : getmaxy(parent); - PAIR *tmp; + NCURSES_CONST PAIR *tmp; bool more; head_line("Select new position for %swindow", top ? "" : "sub"); @@ -444,7 +445,7 @@ move_window(WINDOW *win, bool recur) min_line, min_col, max_line, max_col, FALSE, - &more)) != 0) { + &more)) != NULL) { int y0, x0; getbegyx(parent, y0, x0); /* @@ -473,7 +474,7 @@ move_window(WINDOW *win, bool recur) } static void -show_derwin(WINDOW *win) +show_derwin(NCURSES_CONST WINDOW *win) { int pary, parx, maxy, maxx; @@ -493,13 +494,13 @@ move_derwin(WINDOW *win) WINDOW *parent = parent_of(win); bool result = FALSE; - if (parent != 0) { + if (parent != NULL) { bool top = (parent == stdscr); int min_col = top ? COL_MIN : 0; int max_col = top ? COL_MAX : getmaxx(parent); int min_line = top ? LINE_MIN : 0; int max_line = top ? LINE_MAX : getmaxy(parent); - PAIR *tmp; + NCURSES_CONST PAIR *tmp; bool more; show_derwin(win); @@ -508,7 +509,7 @@ move_derwin(WINDOW *win) min_line, min_col, max_line, max_col, TRUE, - &more)) != 0) { + &more)) != NULL) { if (mvderwin(win, tmp->y, tmp->x) != ERR) { refresh_all(win); doupdate(); @@ -576,16 +577,16 @@ static WINDOW * create_my_window(WINDOW *current) { PAIR ul, lr; - WINDOW *result = 0; + WINDOW *result = NULL; if (getwindow(stdscr, &ul, &lr)) { result = newwin(lines_of(ul, lr), cols_of(ul, lr), pair_of(ul)); - if (result != 0) { + if (result != NULL) { fill_window(result, 'c'); add_window(stdscr, result); } } - if (result == 0) + if (result == NULL) result = current; return result; } @@ -594,16 +595,16 @@ static WINDOW * create_my_derwin(WINDOW *parent) { PAIR ul, lr; - WINDOW *result = 0; + WINDOW *result = NULL; if (getwindow(parent, &ul, &lr)) { result = derwin(parent, lines_of(ul, lr), cols_of(ul, lr), pair_of(ul)); - if (result != 0) { + if (result != NULL) { fill_window(result, 'd'); add_window(parent, result); } } - if (result == 0) + if (result == NULL) result = parent; return result; } @@ -612,7 +613,7 @@ static WINDOW * create_my_subwin(WINDOW *parent) { PAIR ul, lr; - WINDOW *result = 0; + WINDOW *result = NULL; if (getwindow(parent, &ul, &lr)) { result = subwin(parent, @@ -620,12 +621,12 @@ create_my_subwin(WINDOW *parent) cols_of(ul, lr), ul.y + getbegy(parent), ul.x + getbegx(parent)); - if (result != 0) { + if (result != NULL) { fill_window(result, 's'); add_window(parent, result); } } - if (result == 0) + if (result == NULL) result = parent; return result; } @@ -657,12 +658,16 @@ show_help(WINDOW *current) char **msgs = typeCalloc(char *, SIZEOF(help) + 1); size_t n; + size_t used; - for (n = 0; n < SIZEOF(help); ++n) { + for (n = used = 0; n < SIZEOF(help); ++n) { size_t need = (21 + strlen(help[n].msg)); - msgs[n] = typeMalloc(char, need); - _nc_SPRINTF(msgs[n], _nc_SLIMIT(need) - "%-20s%s", keyname(help[n].key), help[n].msg); + char *msg = typeMalloc(char, need); + if (msg != NULL) { + _nc_SPRINTF(msg, _nc_SLIMIT(need) + "%-20s%s", keyname(help[n].key), help[n].msg); + msgs[used++] = msg; + } } popup_msg2(current, msgs); for (n = 0; n < SIZEOF(help); ++n) { @@ -717,7 +722,7 @@ main(int argc, char *argv[]) nonl(); intrflush(stdscr, FALSE); - add_window(0, current_win = stdscr); + add_window(NULL, current_win = stdscr); #ifdef NCURSES_MOUSE_VERSION (void) mousemask(BUTTON1_CLICKED, (mmask_t *) NULL); diff --git a/test/ncurses.c b/test/ncurses.c index fed8b9be..5f4fdf1c 100644 --- a/test/ncurses.c +++ b/test/ncurses.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2022,2023 Thomas E. Dickey * + * Copyright 2018-2023,2024 Thomas E. Dickey * * Copyright 1998-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -41,7 +41,7 @@ AUTHOR Author: Eric S. Raymond 1993 Thomas E. Dickey (beginning revision 1.27 in 1996). -$Id: ncurses.c,v 1.534 2023/02/25 19:30:27 tom Exp $ +$Id: ncurses.c,v 1.545 2024/12/07 23:22:39 tom Exp $ ***************************************************************************/ @@ -121,23 +121,23 @@ static unsigned save_trace = TRACE_ORDINARY | TRACE_ICALLS | TRACE_CALLS; #endif #if HAVE_WCSRTOMBS -#define count_wchars(src, len, state) wcsrtombs(0, &src, len, state) -#define trans_wchars(dst, src, len, state) wcsrtombs(dst, &src, len, state) +#define count_wchars(src, len, state) wcsrtombs(NULL, &src, len, state) +#define trans_wchars(dst, src, len, state) wcsrtombs(dst, &src, len, state) #define reset_wchars(state) init_mb(state) #elif HAVE_WCSTOMBS && HAVE_MBTOWC && HAVE_MBLEN -#define count_wchars(src, len, state) wcstombs(0, src, len) -#define trans_wchars(dst, src, len, state) wcstombs(dst, src, len) +#define count_wchars(src, len, state) wcstombs(NULL, src, len) +#define trans_wchars(dst, src, len, state) wcstombs(dst, src, len) #define reset_wchars(state) IGNORE_RC(mblen(NULL, 0)), IGNORE_RC(mbtowc(NULL, NULL, 0)) #define state_unused #endif #if HAVE_MBSRTOWCS -#define count_mbytes(src, len, state) mbsrtowcs(0, &src, len, state) -#define trans_mbytes(dst, src, len, state) mbsrtowcs(dst, &src, len, state) +#define count_mbytes(src, len, state) mbsrtowcs(NULL, &src, len, state) +#define trans_mbytes(dst, src, len, state) mbsrtowcs(dst, &src, len, state) #define reset_mbytes(state) init_mb(state) #elif HAVE_MBSTOWCS && HAVE_MBTOWC && HAVE_MBLEN -#define count_mbytes(src, len, state) mbstowcs(0, src, len) -#define trans_mbytes(dst, src, len, state) mbstowcs(dst, src, len) +#define count_mbytes(src, len, state) mbstowcs(NULL, src, len) +#define trans_mbytes(dst, src, len, state) mbstowcs(dst, src, len) #define reset_mbytes(state) IGNORE_RC(mblen(NULL, 0)), IGNORE_RC(mbtowc(NULL, NULL, 0)) #define state_unused #endif @@ -273,7 +273,7 @@ wGetstring(WINDOW *win, char *buffer, int limit) ++x; break; default: - if (!isprint(ch) || ch >= KEY_MIN) { + if (!isprint(UChar(ch)) || ch >= KEY_MIN) { beep(); } else if ((int) strlen(buffer) < limit) { int j; @@ -328,7 +328,7 @@ make_fullwidth_digit(cchar_t *target, int digit) source[0] = fullwidth_digit(digit + '0'); source[1] = 0; - setcchar(target, source, A_NORMAL, 0, 0); + setcchar(target, source, A_NORMAL, 0, NULL); } #endif @@ -683,7 +683,7 @@ wgetch_help(WINDOW *win, GetchFlags flags) const char *msg = help[n]; int row = 1 + (int) (n % chk); int col = (n >= chk) ? COLS / 2 : 0; - int flg = ((strstr(msg, "toggle") != 0) + int flg = ((strstr(msg, "toggle") != NULL) && (flags[UChar(*msg)] != FALSE)); if (*msg == '^' && ExitOnEscape()) msg = "^[,^q -- quit"; @@ -717,16 +717,16 @@ typedef struct { WINDOW *frame; } WINSTACK; -static WINSTACK *winstack = 0; +static WINSTACK *winstack = NULL; static unsigned len_winstack = 0; static void forget_boxes(void) { - if (winstack != 0) { + if (winstack != NULL) { free(winstack); } - winstack = 0; + winstack = NULL; len_winstack = 0; } @@ -737,7 +737,7 @@ remember_boxes(unsigned level, WINDOW *txt_win, WINDOW *box_win) assert(level < (unsigned) COLS); - if (winstack == 0) { + if (winstack == NULL) { len_winstack = 20; winstack = typeMalloc(WINSTACK, len_winstack); } else if (need >= len_winstack) { @@ -770,7 +770,7 @@ slk_repaint(void) * Resize both and paint the box in the parent. */ static void -resize_boxes(unsigned level, WINDOW *win) +resize_boxes(unsigned level, const WINDOW *const win) { unsigned n; int base = 5; @@ -928,7 +928,7 @@ wgetch_test(unsigned level, WINDOW *win, int delay) /* at least Solaris SVR4 curses breaks unctrl(128), etc. */ c2 &= 0x7f; #endif - if (isprint(c)) + if (isprint(UChar(c))) (void) wprintw(win, "%c", UChar(c)); else if (c2 != UChar(c)) (void) wprintw(win, "M-%s", unctrl(c2)); @@ -1012,7 +1012,7 @@ getch_test(bool recur GCC_UNUSED) */ #if defined(KEY_RESIZE) && HAVE_WRESIZE static void -resize_wide_boxes(unsigned level, WINDOW *win) +resize_wide_boxes(unsigned level, const WINDOW *const win) { unsigned n; int base = 5; @@ -1030,7 +1030,7 @@ resize_wide_boxes(unsigned level, WINDOW *win) high -= 2; wide -= 2; werase(winstack[n].text); - box_set(winstack[n].frame, 0, 0); + box_set(winstack[n].frame, NULL, NULL); wnoutrefresh(winstack[n].frame); wprintw(winstack[n].text, "size %dx%d\n", @@ -1048,7 +1048,7 @@ static char * wcstos(const wchar_t *src) { int need; - char *result = 0; + char *result = NULL; const wchar_t *tmp = src; #ifndef state_unused mbstate_t state; @@ -1057,11 +1057,11 @@ wcstos(const wchar_t *src) reset_wchars(state); if ((need = (int) count_wchars(tmp, 0, &state)) > 0) { unsigned have = (unsigned) need; - if ((result = typeCalloc(char, have + 1)) != 0) { + if ((result = typeCalloc(char, have + 1)) != NULL) { tmp = src; if (trans_wchars(result, tmp, have, &state) != have) { free(result); - result = 0; + result = NULL; } } else { failed("wcstos"); @@ -1124,7 +1124,7 @@ wget_wch_test(unsigned level, WINDOW *win, int delay) for (n = 0; (wchar_buf[n] = (wchar_t) wint_buf[n]) != 0; ++n) { ; } - if ((temp = wcstos(wchar_buf)) != 0) { + if ((temp = wcstos(wchar_buf)) != NULL) { wprintw(win, "I saw %d characters:\n\t`%s'.", (int) wcslen(wchar_buf), temp); free(temp); @@ -1161,7 +1161,7 @@ wget_wch_test(unsigned level, WINDOW *win, int delay) WINDOW *wb = newwin(high, wide, new_y, new_x); WINDOW *wi = newwin(high - 2, wide - 2, new_y + 1, new_x + 1); - box_set(wb, 0, 0); + box_set(wb, NULL, NULL); wrefresh(wb); wmove(wi, 0, 0); remember_boxes(level, wi, wb); @@ -1614,7 +1614,7 @@ attr_getc(int *skip, Repaint(); break; case HELP_KEY_1: - if ((helpwin = newwin(LINES - 1, COLS - 2, 0, 0)) != 0) { + if ((helpwin = newwin(LINES - 1, COLS - 2, 0, 0)) != NULL) { box(helpwin, 0, 0); attr_legend(helpwin); wGetchar(helpwin); @@ -1693,7 +1693,7 @@ attr_test(bool recur GCC_UNUSED) chtype extras = (chtype) ac; if (UseColors) { - NCURSES_PAIRS_T pair = 0; + NCURSES_PAIRS_T pair; if ((fg != COLOR_BLACK) || (bg != COLOR_BLACK)) { pair = 1; if (init_pair(pair, fg, bg) == ERR) { @@ -1837,7 +1837,7 @@ set_wide_background(NCURSES_PAIRS_T pair) blank[0] = ' '; blank[1] = 0; - setcchar(&normal, blank, A_NORMAL, pair, 0); + setcchar(&normal, blank, A_NORMAL, pair, NULL); bkgrnd(&normal); bkgrndset(&normal); } @@ -1854,7 +1854,7 @@ get_wide_background(void) if (getbkgrnd(&ch) != ERR) { wchar_t wch[CCHARW_MAX]; - if (getcchar(&ch, wch, &attr, &pair, 0) != ERR) { + if (getcchar(&ch, wch, &attr, &pair, NULL) != ERR) { result = attr; } } @@ -1895,17 +1895,17 @@ wide_show_attr(WINDOW *win, wchar_t fill[2]; fill[0] = *s; fill[1] = L'\0'; - setcchar(&ch, fill, attr, pair, 0); + setcchar(&ch, fill, attr, pair, NULL); (void) wadd_wch(win, &ch); } } else { attr_t old_attr = 0; NCURSES_PAIRS_T old_pair = 0; - (void) (wattr_get) (win, &old_attr, &old_pair, 0); - (void) wattr_set(win, attr, pair, 0); + (void) (wattr_get) (win, &old_attr, &old_pair, NULL); + (void) wattr_set(win, attr, pair, NULL); (void) waddwstr(win, wide_attr_test_string); - (void) wattr_set(win, old_attr, old_pair, 0); + (void) wattr_set(win, old_attr, old_pair, NULL); } if (skip) printw("%*s", skip, " "); @@ -1969,8 +1969,8 @@ wide_attr_getc(int *skip, Repaint(); break; case HELP_KEY_1: - if ((helpwin = newwin(LINES - 1, COLS - 2, 0, 0)) != 0) { - box_set(helpwin, 0, 0); + if ((helpwin = newwin(LINES - 1, COLS - 2, 0, 0)) != NULL) { + box_set(helpwin, NULL, NULL); attr_legend(helpwin); wGetchar(helpwin); delwin(helpwin); @@ -2074,7 +2074,7 @@ x_attr_test(bool recur GCC_UNUSED) set_wide_background(pair); erase(); - box_set(stdscr, 0, 0); + box_set(stdscr, NULL, NULL); MvAddStr(0, 20, "Character attribute test display"); for (j = 0; j < my_size; ++j) { @@ -2258,7 +2258,7 @@ color_test(bool recur GCC_UNUSED) int col_limit; int row_limit; int per_row; - char *numbered = 0; + char *numbered = NULL; const char *hello; bool done = FALSE; bool opt_acsc = FALSE; @@ -2275,7 +2275,7 @@ color_test(bool recur GCC_UNUSED) } numbered = typeCalloc(char, COLS + 1); - done = ((COLS < 16) || (numbered == 0)); + done = ((COLS < 16) || (numbered == NULL)); /* * Because the number of colors is usually a power of two, we also use @@ -2345,7 +2345,6 @@ color_test(bool recur GCC_UNUSED) for (i = (NCURSES_PAIRS_T) (base_row * per_row); i < pairs_max; i++) { int row = grid_top + (i / per_row) - base_row; int col = (i % per_row + 1) * width; - NCURSES_PAIRS_T pair = i; if ((i / per_row) > row_limit) break; @@ -2355,6 +2354,7 @@ color_test(bool recur GCC_UNUSED) if (row >= 0 && move(row, col) != ERR) { NCURSES_COLOR_T fg = (NCURSES_COLOR_T) InxToFG(i); NCURSES_COLOR_T bg = (NCURSES_COLOR_T) InxToBG(i); + NCURSES_PAIRS_T pair = i; init_pair(pair, fg, bg); attron(COLOR_PAIR(pair)); @@ -2481,7 +2481,7 @@ color_test(bool recur GCC_UNUSED) } break; case HELP_KEY_1: - if ((helpwin = newwin(LINES - 1, COLS - 2, 0, 0)) != 0) { + if ((helpwin = newwin(LINES - 1, COLS - 2, 0, 0)) != NULL) { box(helpwin, 0, 0); color_legend(helpwin, FALSE); wGetchar(helpwin); @@ -2517,7 +2517,7 @@ color_test(bool recur GCC_UNUSED) static int x_color_test(bool recur GCC_UNUSED) { - long i; + int i; int top = 0, width; int base_row = 0; int grid_top = top + 3; @@ -2527,7 +2527,7 @@ x_color_test(bool recur GCC_UNUSED) int col_limit; int row_limit; int per_row; - char *numbered = 0; + char *numbered = NULL; const char *hello; bool done = FALSE; bool opt_acsc = FALSE; @@ -2537,7 +2537,7 @@ x_color_test(bool recur GCC_UNUSED) bool opt_nums = FALSE; bool opt_xchr = FALSE; int opt_zoom = 0; - wchar_t *buffer = 0; + wchar_t *buffer = NULL; WINDOW *helpwin; if (!UseColors) { @@ -2546,7 +2546,7 @@ x_color_test(bool recur GCC_UNUSED) } numbered = typeCalloc(char, COLS + 1); buffer = typeCalloc(wchar_t, COLS + 1); - done = ((COLS < 16) || (numbered == 0) || (buffer == 0)); + done = ((COLS < 16) || (numbered == NULL) || (buffer == NULL)); /* * Because the number of colors is usually a power of two, we also use @@ -2613,17 +2613,17 @@ x_color_test(bool recur GCC_UNUSED) /* show color names/numbers across the top */ for (i = 0; i < per_row; i++) { show_color_name(top + 2, - ((int) i + 1) * width, - (int) i * zoom_size + MinColors, + (i + 1) * width, + i * zoom_size + MinColors, opt_wide, opt_zoom); } /* show a grid of colors, with color names/ numbers on the left */ for (i = (base_row * per_row); i < pairs_max; i++) { - int row = grid_top + ((int) i / per_row) - base_row; - int col = ((int) i % per_row + 1) * width; - int pair = (int) i; + int row = grid_top + (i / per_row) - base_row; + int col = (i % per_row + 1) * width; + int pair = i; if ((i / per_row) > row_limit) break; @@ -2765,7 +2765,7 @@ x_color_test(bool recur GCC_UNUSED) } break; case HELP_KEY_1: - if ((helpwin = newwin(LINES - 1, COLS - 2, 0, 0)) != 0) { + if ((helpwin = newwin(LINES - 1, COLS - 2, 0, 0)) != NULL) { box(helpwin, 0, 0); color_legend(helpwin, TRUE); wGetchar(helpwin); @@ -2828,7 +2828,7 @@ reset_all_colors(void) #define DecodeRGB(n) (NCURSES_COLOR_T) ((n * 1000) / 0xffff) static void -init_all_colors(bool xterm_colors, char *palette_file) +init_all_colors(bool xterm_colors, NCURSES_CONST char *palette_file) { NCURSES_PAIRS_T cp; all_colors = typeMalloc(RGB_DATA, (unsigned) MaxColors); @@ -2875,14 +2875,14 @@ init_all_colors(bool xterm_colors, char *palette_file) } reset_prog_mode(); } - if (palette_file != 0) { + if (palette_file != NULL) { FILE *fp = fopen(palette_file, "r"); - if (fp != 0) { + if (fp != NULL) { char buffer[BUFSIZ]; int red, green, blue; int scale = 1000; int c; - while (fgets(buffer, sizeof(buffer), fp) != 0) { + while (fgets(buffer, sizeof(buffer), fp) != NULL) { if (sscanf(buffer, "scale:%d", &c) == 1) { scale = c; if (scale < 100) @@ -3157,7 +3157,7 @@ color_edit(bool recur GCC_UNUSED) * ****************************************************************************/ static bool -cycle_attr(int ch, unsigned *at_code, chtype *attr, ATTR_TBL * list, unsigned limit) +cycle_attr(int ch, unsigned *at_code, attr_t *attr, ATTR_TBL * list, unsigned limit) { bool result = TRUE; @@ -3317,8 +3317,8 @@ slk_test(bool recur GCC_UNUSED) { int c, fmt = 1; char buf[9]; - char *s; - chtype attr = A_NORMAL; + NCURSES_CONST char *s; + attr_t attr = A_NORMAL; unsigned at_code = 0; #if HAVE_SLK_COLOR int fg = COLOR_BLACK; @@ -3387,7 +3387,7 @@ slk_test(bool recur GCC_UNUSED) case '8': MvAddStr(SLK_WORK, 0, "Please enter the label value: "); _nc_STRCPY(buf, "", sizeof(buf)); - if ((s = slk_label(c - '0')) != 0) { + if ((s = slk_label(c - '0')) != NULL) { _nc_STRNCPY(buf, s, (size_t) 8); } wGetstring(stdscr, buf, 8); @@ -3408,7 +3408,7 @@ slk_test(bool recur GCC_UNUSED) default: if (cycle_attr(c, &at_code, &attr, my_list, my_size)) { - slk_attrset(attr); + slk_attrset((chtype) attr); slk_touch(); slk_noutrefresh(); break; @@ -3508,7 +3508,7 @@ x_slk_test(bool recur GCC_UNUSED) case '8': MvAddStr(SLK_WORK, 0, "Please enter the label value: "); *buf = 0; - if ((s = slk_label(c - '0')) != 0) { + if ((s = slk_label(c - '0')) != NULL) { char *temp = strdup(s); size_t used = strlen(temp); size_t want = SLKLEN; @@ -3821,17 +3821,17 @@ acs_test(bool recur GCC_UNUSED) int c = 'a'; int pagesize = 32; char *term = getenv("TERM"); - const char *pch_kludge = ((term != 0 && strstr(term, "linux")) + const char *pch_kludge = ((term != NULL && strstr(term, "linux")) ? "p=PC, " : ""); - chtype attr = A_NORMAL; + attr_t attr = A_NORMAL; int digit = 0; int repeat = 1; int fg = COLOR_BLACK; int bg = COLOR_BLACK; unsigned at_code = 0; NCURSES_PAIRS_T pair = 0; - void (*last_show_acs) (int, attr_t, NCURSES_PAIRS_T) = 0; + void (*last_show_acs) (int, attr_t, NCURSES_PAIRS_T) = NULL; ATTR_TBL my_list[SIZEOF(attrs_to_test)]; unsigned my_size = init_attr_list(my_list, termattrs()); @@ -3864,12 +3864,12 @@ acs_test(bool recur GCC_UNUSED) case '2': case '3': digit = (c - '0'); - last_show_acs = 0; + last_show_acs = NULL; break; case '-': if (digit > 0) { --digit; - last_show_acs = 0; + last_show_acs = NULL; } else { beep(); } @@ -3877,7 +3877,7 @@ acs_test(bool recur GCC_UNUSED) case '+': if (digit < 3) { ++digit; - last_show_acs = 0; + last_show_acs = NULL; } else { beep(); } @@ -3901,7 +3901,7 @@ acs_test(bool recur GCC_UNUSED) } if (pagesize != 32) { show_256_chars(repeat, attr, pair); - } else if (last_show_acs != 0) { + } else if (last_show_acs != NULL) { last_show_acs(repeat, attr, pair); } else { show_upper_chars(digit * pagesize + 128, pagesize, repeat, attr, pair); @@ -3938,12 +3938,11 @@ merge_wide_attr(cchar_t *dst, const cchar_t *src, attr_t attr, NCURSES_PAIRS_T p *dst = *src; do { - int count; - TEST_CCHAR(src, count, { + TEST_CCHAR(src, { attr |= (test_attrs & A_ALTCHARSET); setcchar(dst, test_wch, attr, pair, NULL); - }, { - ; + } + , {; }); } while (0); return dst; @@ -3982,7 +3981,7 @@ show_paged_widechars(unsigned base, memset(&codes, 0, sizeof(codes)); codes[0] = code; - setcchar(&temp, codes, attr, pair, 0); + setcchar(&temp, codes, attr, pair, NULL); move(row, col); if (wcwidth(code) == 0 && code != 0) { AddCh((chtype) space | @@ -4021,7 +4020,7 @@ show_upper_widechars(unsigned first, int repeat, int space, attr_t attr, NCURSES memset(&codes, 0, sizeof(codes)); codes[0] = code; - setcchar(&temp, codes, attr, pair, 0); + setcchar(&temp, codes, attr, pair, NULL); do { int y, x; @@ -4299,10 +4298,10 @@ show_2_wacs(int n, const char *name, const char *code, attr_t attr, NCURSES_PAIR char temp[80]; MvPrintw(row, col, "%*s : ", COLS / 4, name); - (void) attr_set(attr, pair, 0); + (void) attr_set(attr, pair, NULL); _nc_STRNCPY(temp, code, 20); addstr(temp); - (void) attr_set(A_NORMAL, 0, 0); + (void) attr_set(A_NORMAL, 0, NULL); return n + 1; } @@ -4374,7 +4373,7 @@ x_acs_test(bool recur GCC_UNUSED) int bg = COLOR_BLACK; unsigned at_code = 0; NCURSES_PAIRS_T pair = 0; - void (*last_show_wacs) (int, attr_t, NCURSES_PAIRS_T) = 0; + void (*last_show_wacs) (int, attr_t, NCURSES_PAIRS_T) = NULL; W_ATTR_TBL my_list[SIZEOF(w_attrs_to_test)]; unsigned my_size = init_w_attr_list(my_list, term_attrs()); char at_page[20]; @@ -4437,26 +4436,26 @@ x_acs_test(bool recur GCC_UNUSED) at_page[--len] = '\0'; } else if (c < 256 && isdigit(c)) { digit = (unsigned) (c - '0'); - last_show_wacs = 0; + last_show_wacs = NULL; } else if (c == '+') { ++digit; _nc_SPRINTF(at_page, _nc_SLIMIT(sizeof(at_page)) "%02x", digit); - last_show_wacs = 0; + last_show_wacs = NULL; } else if (c == '-' && digit > 0) { --digit; _nc_SPRINTF(at_page, _nc_SLIMIT(sizeof(at_page)) "%02x", UChar(digit)); - last_show_wacs = 0; + last_show_wacs = NULL; } else if (c == '>' && repeat < (COLS / 4)) { ++repeat; } else if (c == '<' && repeat > 1) { --repeat; } else if (c == '_') { space = (space == ' ') ? '_' : ' '; - last_show_wacs = 0; + last_show_wacs = NULL; } else if (cycle_w_attr(c, &at_code, &attr, my_list, my_size) || cycle_colors(c, &fg, &bg, &pair)) { - if (last_show_wacs != 0) + if (last_show_wacs != NULL) break; } else { beep(); @@ -4466,7 +4465,7 @@ x_acs_test(bool recur GCC_UNUSED) } if (pagesize != 32) { show_paged_widechars(digit, pagesize, repeat, space, attr, pair); - } else if (last_show_wacs != 0) { + } else if (last_show_wacs != NULL) { last_show_wacs(repeat, attr, pair); } else { show_upper_widechars(digit * 32 + 128, repeat, space, attr, pair); @@ -4616,7 +4615,7 @@ FRAME static WINDOW * frame_win(FRAME * curp) { - return (curp != 0) ? curp->wind : stdscr; + return (curp != NULL) ? curp->wind : stdscr; } /* We need to know if these flags are actually set, so don't look in FRAME. @@ -4810,7 +4809,8 @@ getwindow(void) /* Ask user for a window definition */ { WINDOW *rwindow; - pair ul, lr, *tmp; + pair ul, lr; + NCURSES_CONST pair *tmp; move(0, 0); clrtoeol(); @@ -4834,7 +4834,7 @@ getwindow(void) outerbox(ul, lr, TRUE); refresh(); - if (rwindow != 0) + if (rwindow != NULL) wrefresh(rwindow); move(0, 0); @@ -4865,9 +4865,9 @@ newwin_move(FRAME * curp, int dy, int dx) static FRAME * delete_framed(FRAME * fp, bool showit) { - FRAME *np = 0; + FRAME *np = NULL; - if (fp != 0) { + if (fp != NULL) { fp->last->next = fp->next; fp->next->last = fp->last; @@ -4905,7 +4905,7 @@ scroll_test(bool recur GCC_UNUSED) transient((FRAME *) 0, (char *) 0); switch (c) { case CTRL('C'): - if ((neww = typeCalloc(FRAME, (size_t) 1)) == 0) { + if ((neww = typeCalloc(FRAME, (size_t) 1)) == NULL) { failed("scroll_test"); goto breakout; } @@ -4915,7 +4915,7 @@ scroll_test(bool recur GCC_UNUSED) goto breakout; } - if (current == 0) { /* First element, */ + if (current == NULL) { /* First element, */ neww->next = neww; /* so point it at itself */ neww->last = neww; } else { @@ -4970,7 +4970,7 @@ scroll_test(bool recur GCC_UNUSED) #if HAVE_PUTWIN && HAVE_GETWIN case CTRL('W'): /* save and delete window */ - if ((current != 0) && (current == current->next)) { + if ((current != NULL) && (current == current->next)) { transient(current, "Will not save/delete ONLY window"); break; } else if ((fp = fopen(DUMPFILE, "w")) == (FILE *) 0) { @@ -4991,13 +4991,13 @@ scroll_test(bool recur GCC_UNUSED) if ((fp = fopen(DUMPFILE, "r")) == (FILE *) 0) { transient(current, "Can't open screen dump file"); } else { - if ((neww = typeCalloc(FRAME, (size_t) 1)) != 0) { + if ((neww = typeCalloc(FRAME, (size_t) 1)) != NULL) { - neww->next = current ? current->next : 0; + neww->next = current ? current->next : NULL; neww->last = current; - if (neww->last != 0) + if (neww->last != NULL) neww->last->next = neww; - if (neww->next != 0) + if (neww->next != NULL) neww->next->last = neww; neww->wind = getwin(fp); @@ -5014,7 +5014,8 @@ scroll_test(bool recur GCC_UNUSED) #if HAVE_WRESIZE case CTRL('X'): /* resize window */ if (current) { - pair *tmp, ul, lr; + NCURSES_CONST pair *tmp; + pair ul, lr; int mx, my; move(0, 0); @@ -5118,7 +5119,7 @@ scroll_test(bool recur GCC_UNUSED) && (c != ERR)); breakout: - while (current != 0) + while (current != NULL) current = delete_framed(current, FALSE); scrollok(stdscr, TRUE); /* reset to driver's default */ @@ -5179,7 +5180,7 @@ saywhat(NCURSES_CONST char *text) { wmove(stdscr, LINES - 1, 0); wclrtoeol(stdscr); - if (text != 0 && *text != '\0') { + if (text != NULL && *text != '\0') { waddstr(stdscr, text); waddstr(stdscr, "; "); } @@ -5193,10 +5194,10 @@ static PANEL * mkpanel(NCURSES_COLOR_T color, int rows, int cols, int tly, int tlx) { WINDOW *win; - PANEL *pan = 0; + PANEL *pan = NULL; - if ((win = newwin(rows, cols, tly, tlx)) != 0) { - if ((pan = new_panel(win)) == 0) { + if ((win = newwin(rows, cols, tly, tlx)) != NULL) { + if ((pan = new_panel(win)) == NULL) { delwin(win); } else if (UseColors) { NCURSES_COLOR_T fg = (NCURSES_COLOR_T) ((color == COLOR_BLUE) @@ -5249,7 +5250,7 @@ init_panel(WINDOW *win) } static void -fill_panel(PANEL *pan) +fill_panel(NCURSES_CONST PANEL *pan) { WINDOW *win = panel_window(pan); const char *userptr = (const char *) panel_userptr(pan); @@ -5286,7 +5287,7 @@ init_wide_panel(WINDOW *win) } static void -fill_wide_panel(PANEL *pan) +fill_wide_panel(NCURSES_CONST PANEL *pan) { WINDOW *win = panel_window(pan); const char *userptr = (const char *) panel_userptr(pan); @@ -5336,7 +5337,8 @@ canned_panel(PANEL *px[MAX_PANELS + 1], NCURSES_CONST char *cmd) } static int -demo_panels(void (*InitPanel) (WINDOW *), void (*FillPanel) (PANEL *)) +demo_panels(void (*InitPanel) (WINDOW *), + void (*FillPanel) (NCURSES_CONST PANEL *)) { int count; int itmp; @@ -5926,7 +5928,7 @@ pad_test(bool recur GCC_UNUSED) { WINDOW *panpad = newpad(PAD_HIGH, PAD_WIDE); - if (panpad == 0) { + if (panpad == NULL) { Cannot("cannot create requested pad"); return ERR; } @@ -5989,7 +5991,7 @@ flushinp_test(bool recur GCC_UNUSED) getbegyx(win, by, bx); sw = w / 3; sh = h / 3; - if ((subWin = subwin(win, sh, sw, by + h - sh - 2, bx + w - sw - 2)) == 0) + if ((subWin = subwin(win, sh, sw, by + h - sh - 2, bx + w - sw - 2)) == NULL) return ERR; #ifdef A_COLOR @@ -6137,7 +6139,7 @@ menu_test(bool recur GCC_UNUSED) refresh(); for (ap = animals; *ap; ap++) { - if ((*ip = new_item(*ap, "")) != 0) + if ((*ip = new_item(*ap, "")) != NULL) ++ip; } *ip = (ITEM *) 0; @@ -6161,7 +6163,6 @@ menu_test(bool recur GCC_UNUSED) break; if (c == E_REQUEST_DENIED) beep(); - continue; } MvPrintw(LINES - 2, 0, @@ -6216,8 +6217,8 @@ tracetrace(unsigned tlevel) static size_t need = 12; int n; - if (buf == 0) { - for (n = 0; t_tbl[n].name != 0; n++) + if (buf == NULL) { + for (n = 0; t_tbl[n].name != NULL; n++) need += strlen(t_tbl[n].name) + 2; buf = typeMalloc(char, need); if (!buf) @@ -6228,7 +6229,7 @@ tracetrace(unsigned tlevel) _nc_STRCAT(buf, t_tbl[0].name ? t_tbl[0].name : "", need); _nc_STRCAT(buf, ", ", need); } else { - for (n = 1; t_tbl[n].name != 0; n++) + for (n = 1; t_tbl[n].name != NULL; n++) if ((tlevel & t_tbl[n].mask) == t_tbl[n].mask) { _nc_STRCAT(buf, t_tbl[n].name, need); _nc_STRCAT(buf, ", ", need); @@ -6247,7 +6248,8 @@ static int run_trace_menu(MENU * m) { ITEM **items; - ITEM *i, **p; + NCURSES_CONST ITEM *i; + ITEM **p; for (;;) { bool changed = FALSE; @@ -6259,14 +6261,14 @@ run_trace_menu(MENU * m) i = current_item(m); if (i == items[0]) { if (item_value(i)) { - for (p = items + 1; *p != 0; p++) + for (p = items + 1; *p != NULL; p++) if (item_value(*p)) { set_item_value(*p, FALSE); changed = TRUE; } } } else { - for (p = items + 1; *p != 0; p++) + for (p = items + 1; *p != NULL; p++) if (item_value(*p)) { set_item_value(items[0], FALSE); changed = TRUE; @@ -6299,8 +6301,8 @@ trace_set(bool recur GCC_UNUSED) refresh(); - for (n = 0; t_tbl[n].name != 0; n++) { - if ((*ip = new_item(t_tbl[n].name, "")) != 0) { + for (n = 0; t_tbl[n].name != NULL; n++) { + if ((*ip = new_item(t_tbl[n].name, "")) != NULL) { ++ip; } } @@ -6329,8 +6331,9 @@ trace_set(bool recur GCC_UNUSED) set_item_value(*ip, TRUE); } - while (run_trace_menu(m)) - continue; + while (run_trace_menu(m)) { + /* EMPTY */ ; + } newtrace = 0; for (ip = menu_items(m); *ip; ip++) @@ -6369,7 +6372,7 @@ make_label(int frow, int fcol, NCURSES_CONST char *label) if (f) { set_field_buffer(f, 0, label); - set_field_opts(f, (int) ((unsigned) field_opts(f) & ~O_ACTIVE)); + set_field_opts(f, (int) ((unsigned) field_opts(f) & (unsigned) ~O_ACTIVE)); } return (f); } @@ -6424,17 +6427,17 @@ edit_secure(FIELD *me, int c) if (field_info(me, &rows, &cols, &frow, &fcol, &nrow, &nbuf) == E_OK && nbuf > 0) { - char *source = field_buffer(me, 1); + NCURSES_CONST char *source = field_buffer(me, 1); size_t have = (source ? strlen(source) : 0) + 1; size_t need = 80 + have; char *temp = malloc(need); - if (temp != 0) { + if (temp != NULL) { size_t len; _nc_STRNCPY(temp, source ? source : "", have + 1); len = (size_t) (char *) field_userptr(me); if (c <= KEY_MAX) { - if (isgraph(c) && (len + 1) < sizeof(temp)) { + if (isgraph(UChar(c)) && (len + 1) < sizeof(temp)) { temp[len++] = (char) c; temp[len] = 0; set_field_buffer(me, 1, temp); @@ -6484,7 +6487,7 @@ edit_secure(FIELD *me, int c) } static int -form_virtualize(FORM *f, WINDOW *w) +form_virtualize(NCURSES_CONST FORM *f, WINDOW *w) { /* *INDENT-OFF* */ static const struct { @@ -6658,7 +6661,7 @@ CHAR_CHECK_CB(mi_char_check) static FIELDCHECK_CB(pw_field_check) { - char *s = field_buffer(fld, 0); + NCURSES_CONST char *s = field_buffer(fld, 0); int n; for (n = 0; s[n] != '\0'; ++n) { @@ -6680,7 +6683,8 @@ static int form_test(bool recur GCC_UNUSED) { FORM *form; - FIELD *f[12], *secure; + FIELD *f[12]; + NCURSES_CONST FIELD *secure; FIELDTYPE *fty_middle = new_fieldtype(mi_field_check, mi_char_check); FIELDTYPE *fty_passwd = new_fieldtype(pw_field_check, pw_char_check); int c; @@ -6732,7 +6736,7 @@ form_test(bool recur GCC_UNUSED) set_field_type(f[n - 1], fty_passwd); f[n] = (FIELD *) 0; - if ((form = new_form(f)) != 0) { + if ((form = new_form(f)) != NULL) { WINDOW *w; int finished = 0; @@ -6761,7 +6765,7 @@ form_test(bool recur GCC_UNUSED) free_form(form); } - for (c = 0; f[c] != 0; c++) + for (c = 0; f[c] != NULL; c++) free_field(f[c]); free_fieldtype(fty_middle); free_fieldtype(fty_passwd); @@ -6795,7 +6799,7 @@ make_overlap(int n) getmaxyx(stdscr, y, x); if (y < 23 || x < 80) { Cannot("The screen is too small for this test"); - result = 0; + result = NULL; } else { int ymax = y - (overlap_HEAD + overlap_FOOT); int high = ymax / 5; /* equal-sized parts for cross */ @@ -7176,7 +7180,7 @@ overlap_test_3(WINDOW *a) } static void -overlap_test_4(int flavor, WINDOW *a, WINDOW *b) +overlap_test_4(int flavor, NCURSES_CONST WINDOW *a, WINDOW *b) { switch ((otCOPY) flavor) { case otCOPY_overwrite: @@ -7203,9 +7207,9 @@ overlap_test(bool recur GCC_UNUSED) int shift = 0, last_refresh = -1; int state, flavor[OVERLAP_FLAVORS]; - if ((win1 = make_overlap(0)) == 0) { + if ((win1 = make_overlap(0)) == NULL) { return ERR; - } else if ((win2 = make_overlap(1)) == 0) { + } else if ((win2 = make_overlap(1)) == NULL) { delwin(win1); return ERR; } @@ -7403,9 +7407,9 @@ x_overlap_test(bool recur GCC_UNUSED) int shift = 0, last_refresh = -1; int state, flavor[OVERLAP_FLAVORS]; - if ((win1 = make_overlap(0)) == 0) { + if ((win1 = make_overlap(0)) == NULL) { return ERR; - } else if ((win2 = make_overlap(1)) == 0) { + } else if ((win2 = make_overlap(1)) == NULL) { delwin(win1); return ERR; } @@ -7644,7 +7648,7 @@ usage(int ok) ," -E call use_env(FALSE) to ignore $LINES and $COLUMNS" #endif #if USE_SOFTKEYS - ," -e fmt specify format for soft-keys test (e)" + ," -e FMT specify format for soft-keys test (e)" #endif #if HAVE_RIPOFFLINE ," -F rip-off footer line (can repeat)" @@ -7655,13 +7659,13 @@ usage(int ok) ," -p file rgb values to use in 'd' rather than ncurses's builtin" #endif #if USE_LIBPANEL - ," -s msec specify nominal time for panel-demo (default: 1, to hold)" + ," -s MSECS specify nominal time for panel-demo (default: 1, to hold)" #endif #if defined(NCURSES_VERSION_PATCH) && (NCURSES_VERSION_PATCH >= 20120714) && !defined(_NC_WINDOWS) ," -T call use_tioctl(TRUE) to allow SIGWINCH to override environment" #endif #ifdef TRACE - ," -t mask specify default trace-level (may toggle with ^T)" + ," -D mask specify trace mask (may toggle with ^T)" #endif #if HAVE_COLOR_CONTENT ," -x use xterm-compatible control for reading color palette" @@ -7899,12 +7903,12 @@ main(int argc, char *argv[]) bool monochrome = FALSE; #if HAVE_COLOR_CONTENT bool xterm_colors = FALSE; - char *palette_file = 0; + NCURSES_CONST char *palette_file = NULL; #endif setlocale(LC_ALL, ""); - while ((ch = getopt(argc, argv, OPTS_COMMON "a:dEe:FHmp:s:Tt:x")) != -1) { + while ((ch = getopt(argc, argv, OPTS_COMMON "D:EFHTa:de:mp:s:x")) != -1) { switch (ch) { #ifdef NCURSES_VERSION_PATCH #if HAVE_USE_DEFAULT_COLORS @@ -7968,8 +7972,8 @@ main(int argc, char *argv[]) break; #endif #ifdef TRACE - case 't': - save_trace = (unsigned) strtol(optarg, 0, 0); + case 'D': + save_trace = (unsigned) strtol(optarg, NULL, 0); break; #endif #if HAVE_COLOR_CONTENT diff --git a/test/newdemo.c b/test/newdemo.c index 78761534..c51a278f 100644 --- a/test/newdemo.c +++ b/test/newdemo.c @@ -2,7 +2,7 @@ * newdemo.c - A demo program using PDCurses. The program illustrate * the use of colours for text output. * - * $Id: newdemo.c,v 1.48 2022/12/10 23:36:05 tom Exp $ + * $Id: newdemo.c,v 1.49 2025/02/15 15:15:25 tom Exp $ */ #include @@ -288,7 +288,7 @@ main(int argc, char *argv[]) set_colors(win, 2, COLOR_RED, COLOR_RED); box(win, ACS_VLINE, ACS_HLINE); wrefresh(win); - /* Do ramdom output of a character */ + /* Do random output of a character */ use_colors(win, 1, A_NORMAL); c = 'a'; for (i = 0; i < 5000; ++i) { diff --git a/test/package/debian-mingw/copyright b/test/package/debian-mingw/copyright index 9e87bbe9..539642f9 100644 --- a/test/package/debian-mingw/copyright +++ b/test/package/debian-mingw/copyright @@ -4,12 +4,12 @@ Current ncurses maintainer: Thomas Dickey ------------------------------------------------------------------------------- Files: * -Copyright: 2017-2022,2023 Thomas E. Dickey +Copyright: 2017-2024,2025 Thomas E. Dickey Copyright: 1998-2016,2017 Free Software Foundation, Inc. License: X11 Files: aclocal.m4 package -Copyright: 2003-2020,2023 by Thomas E. Dickey +Copyright: 2003-2024,2025 by Thomas E. Dickey License: X11 Permission is hereby granted, free of charge, to any person obtaining a diff --git a/test/package/debian-mingw/rules b/test/package/debian-mingw/rules index 152cd3c7..3a791507 100755 --- a/test/package/debian-mingw/rules +++ b/test/package/debian-mingw/rules @@ -43,7 +43,7 @@ configure-stamp: --prefix=$(MINGW_TOP) \ --bindir=\$${prefix}/bin/$(NCURSES_PKG) \ --datadir=\$${prefix}/share/$(NCURSES_PKG) \ - --with-screen=ncursesw6 \ + --with-screen=ncursesw6td \ --with-pkg-config-libdir=/usr/$(TARGET)/lib/pkgconfig touch configure-stamp diff --git a/test/package/debian-mingw/watch b/test/package/debian-mingw/watch index ec075b18..c35c8e38 100644 --- a/test/package/debian-mingw/watch +++ b/test/package/debian-mingw/watch @@ -1,4 +1,4 @@ version=3 -opts=passive ftp://ftp.invisible-island.net/ncurses-examples/ncurses-examples-([\d.]+)\.tgz \ +opts=passive https://invisible-island.net/archives/ncurses-examples/ncurses-examples-([\d.]+)\.tgz \ debian uupdate diff --git a/test/package/debian-mingw64/copyright b/test/package/debian-mingw64/copyright index 9e87bbe9..539642f9 100644 --- a/test/package/debian-mingw64/copyright +++ b/test/package/debian-mingw64/copyright @@ -4,12 +4,12 @@ Current ncurses maintainer: Thomas Dickey ------------------------------------------------------------------------------- Files: * -Copyright: 2017-2022,2023 Thomas E. Dickey +Copyright: 2017-2024,2025 Thomas E. Dickey Copyright: 1998-2016,2017 Free Software Foundation, Inc. License: X11 Files: aclocal.m4 package -Copyright: 2003-2020,2023 by Thomas E. Dickey +Copyright: 2003-2024,2025 by Thomas E. Dickey License: X11 Permission is hereby granted, free of charge, to any person obtaining a diff --git a/test/package/debian-mingw64/rules b/test/package/debian-mingw64/rules index 02175a66..571b9a7e 100755 --- a/test/package/debian-mingw64/rules +++ b/test/package/debian-mingw64/rules @@ -43,7 +43,7 @@ configure-stamp: --prefix=$(MINGW_TOP) \ --bindir=\$${prefix}/bin/$(NCURSES_PKG) \ --datadir=\$${prefix}/share/$(NCURSES_PKG) \ - --with-screen=ncursesw6 \ + --with-screen=ncursesw6td \ --with-pkg-config-libdir=/usr/$(TARGET)/lib/pkgconfig touch configure-stamp diff --git a/test/package/debian-mingw64/watch b/test/package/debian-mingw64/watch index ec075b18..c35c8e38 100644 --- a/test/package/debian-mingw64/watch +++ b/test/package/debian-mingw64/watch @@ -1,4 +1,4 @@ version=3 -opts=passive ftp://ftp.invisible-island.net/ncurses-examples/ncurses-examples-([\d.]+)\.tgz \ +opts=passive https://invisible-island.net/archives/ncurses-examples/ncurses-examples-([\d.]+)\.tgz \ debian uupdate diff --git a/test/package/debian/copyright b/test/package/debian/copyright index 9e87bbe9..539642f9 100644 --- a/test/package/debian/copyright +++ b/test/package/debian/copyright @@ -4,12 +4,12 @@ Current ncurses maintainer: Thomas Dickey ------------------------------------------------------------------------------- Files: * -Copyright: 2017-2022,2023 Thomas E. Dickey +Copyright: 2017-2024,2025 Thomas E. Dickey Copyright: 1998-2016,2017 Free Software Foundation, Inc. License: X11 Files: aclocal.m4 package -Copyright: 2003-2020,2023 by Thomas E. Dickey +Copyright: 2003-2024,2025 by Thomas E. Dickey License: X11 Permission is hereby granted, free of charge, to any person obtaining a diff --git a/test/package/debian/rules b/test/package/debian/rules index 2cc34f73..842e5858 100755 --- a/test/package/debian/rules +++ b/test/package/debian/rules @@ -75,7 +75,7 @@ config-$(NCURSES_PKG)-stamp: cd t/ncurses6; $(configure) \ --datadir=\$${datarootdir}/$(NCURSES_PKG) \ - --with-screen=ncursesw6 + --with-screen=ncursesw6td touch $@ @@ -87,7 +87,7 @@ config-$(NCURSEST_PKG)-stamp: cd t/ncursest6; $(configure) \ --datadir=\$${datarootdir}/$(NCURSEST_PKG) \ - --with-screen=ncursestw6 + --with-screen=ncursestw6td touch $@ diff --git a/test/package/debian/watch b/test/package/debian/watch index ec075b18..c35c8e38 100644 --- a/test/package/debian/watch +++ b/test/package/debian/watch @@ -1,4 +1,4 @@ version=3 -opts=passive ftp://ftp.invisible-island.net/ncurses-examples/ncurses-examples-([\d.]+)\.tgz \ +opts=passive https://invisible-island.net/archives/ncurses-examples/ncurses-examples-([\d.]+)\.tgz \ debian uupdate diff --git a/test/padview.c b/test/padview.c index 0defee34..5fcd8a07 100644 --- a/test/padview.c +++ b/test/padview.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2019-2021,2022 Thomas E. Dickey * + * Copyright 2019-2022,2024 Thomas E. Dickey * * Copyright 2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -29,7 +29,7 @@ /* * clone of view.c, using pads * - * $Id: padview.c,v 1.22 2022/12/04 00:40:11 tom Exp $ + * $Id: padview.c,v 1.28 2024/12/21 17:34:13 tom Exp $ */ #include @@ -88,8 +88,9 @@ show_all(const char *tag, WINDOW *my_pad, int my_row) wattrset(stdscr, COLOR_PAIR(my_pair)); clear(); + i = (int) (sizeof(temp) - strlen(tag) - 8); _nc_SPRINTF(temp, _nc_SLIMIT(sizeof(temp)) - "view %.*s", (int) strlen(tag), tag); + "view %.*s", i, tag); i = (int) strlen(temp); _nc_SPRINTF(temp + i, _nc_SLIMIT(sizeof(temp) - (size_t) i) " %.*s", (int) sizeof(temp) - i - 2, fname); @@ -124,7 +125,7 @@ read_file(const char *filename) size_t len; struct stat sb; char *my_blob; - char **my_vec = 0; + char **my_vec = NULL; WINDOW *my_pad; if (stat(filename, &sb) != 0 @@ -136,11 +137,11 @@ read_file(const char *filename) failed("input is empty"); } - if ((fp = fopen(filename, "r")) == 0) { + if ((fp = fopen(filename, "r")) == NULL) { failed("cannot open input-file"); } - if ((my_blob = malloc((size_t) sb.st_size + 1)) == 0) { + if ((my_blob = malloc((size_t) sb.st_size + 1)) == NULL) { failed("cannot allocate memory for input-file"); } @@ -171,7 +172,7 @@ read_file(const char *filename) } num_lines = k; if (pass == 0) { - if (((my_vec = typeCalloc(char *, (size_t) k + 2)) == 0)) { + if (((my_vec = typeCalloc(char *, (size_t) k + 2)) == NULL)) { failed("cannot allocate line-vector #1"); } } else { @@ -182,7 +183,7 @@ read_file(const char *filename) #if USE_WIDEC_SUPPORT if (!memcmp("\357\273\277", my_blob, 3)) { - char *s = my_blob + 3; + const char *s = my_blob + 3; char *d = my_blob; Trace(("trim BOM")); do { @@ -199,7 +200,7 @@ read_file(const char *filename) } width = (width + 1) * 5; my_pad = newpad(height, width); - if (my_pad == 0) + if (my_pad == NULL) failed("cannot allocate pad workspace"); if (try_color) { wattrset(my_pad, COLOR_PAIR(my_pair)); @@ -213,7 +214,7 @@ read_file(const char *filename) for (k = 0; my_vec[k]; ++k) { char *s; #if USE_WIDEC_SUPPORT - char *last = my_vec[k] + (int) strlen(my_vec[k]); + const char *last = my_vec[k] + (int) strlen(my_vec[k]); wchar_t wch[2]; size_t rc; #ifndef state_unused @@ -256,15 +257,15 @@ usage(int ok) ,"" ,USAGE_COMMON ,"Options:" - ," -c use color if terminal supports it" + ," -C use color if terminal supports it" ," -i ignore INT, QUIT, TERM signals" #if USE_WIDEC_SUPPORT ," -n use waddch (bytes) rather then wadd_wch (wide-chars)" #endif - ," -s start in single-step mode, waiting for input" + ," -s start in single-step mode" #ifdef TRACE ," -t trace screen updates" - ," -T NUM specify trace mask" + ," -D NUM specify trace mask" #endif }; size_t n; @@ -279,7 +280,7 @@ VERSION_COMMON() int main(int argc, char *argv[]) { - static const char *help[] = + static NCURSES_CONST char *help[] = { "Commands:", " q,^Q,ESC - quit this program", @@ -301,7 +302,7 @@ main(int argc, char *argv[]) " s - use entered count for halfdelay() parameter", " - if no entered count, stop nodelay()", " - begin nodelay()", - 0 + NULL }; int ch; @@ -318,9 +319,9 @@ main(int argc, char *argv[]) setlocale(LC_ALL, ""); - while ((ch = getopt(argc, argv, OPTS_COMMON "cinstT:")) != -1) { + while ((ch = getopt(argc, argv, OPTS_COMMON "CD:inst")) != -1) { switch (ch) { - case 'c': + case 'C': try_color = TRUE; break; case 'i': @@ -335,11 +336,11 @@ main(int argc, char *argv[]) single_step = TRUE; break; #ifdef TRACE - case 'T': + case 'D': { - char *next = 0; + char *next = NULL; int tvalue = (int) strtol(optarg, &next, 0); - if (tvalue < 0 || (next != 0 && *next != 0)) + if (tvalue < 0 || (next != NULL && *next != 0)) usage(FALSE); curses_trace((unsigned) tvalue); } @@ -532,7 +533,7 @@ main(int argc, char *argv[]) beep(); break; } - if (c >= KEY_MIN || (c > 0 && !isdigit(c))) { + if (c >= KEY_MIN || (c > 0 && !isdigit(UChar(c)))) { got_number = FALSE; value = 0; } diff --git a/test/pair_content.c b/test/pair_content.c index 2b759a82..096a4ffc 100644 --- a/test/pair_content.c +++ b/test/pair_content.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2022,2023 Thomas E. Dickey * + * Copyright 2018-2023,2024 Thomas E. Dickey * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -26,7 +26,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: pair_content.c,v 1.22 2023/02/25 16:43:56 tom Exp $ + * $Id: pair_content.c,v 1.25 2024/12/07 22:45:15 tom Exp $ */ #define NEED_TIME_H @@ -181,7 +181,7 @@ run_test(void) my_color_t fg; my_color_t bg; if (PairContent(pair, &fg, &bg) == OK) { - if (expected != 0) { + if (expected != NULL) { if (fg != expected[pair].fg) success = FALSE; if (bg != expected[pair].bg) @@ -213,10 +213,10 @@ usage(int ok) ,"Options:" ," -f PAIR first color pair to test (default: 1)" ," -i interactive, showing test-progress" - ," -l PAIR last color pair to test (default: max_pairs-1)" + ," -F PAIR last color pair to test (default: max_pairs-1)" ," -n do not initialize color pairs" ," -p print data for color pairs instead of testing" - ," -r COUNT repeat for given count" + ," -r NUM repeat tests NUM times" ," -s initialize pairs sequentially rather than random" #if USE_EXTENDED_COLOR ," -x use extended color pairs/values" @@ -236,7 +236,7 @@ main(int argc, char *argv[]) { int ch; - while ((ch = getopt(argc, argv, OPTS_COMMON "f:il:npr:sx")) != -1) { + while ((ch = getopt(argc, argv, OPTS_COMMON "f:iF:npr:sx")) != -1) { switch (ch) { case 'f': if ((f_opt = atoi(optarg)) <= 0) @@ -245,7 +245,7 @@ main(int argc, char *argv[]) case 'i': i_opt = 1; break; - case 'l': + case 'F': if ((l_opt = atoi(optarg)) <= 0) usage(FALSE); break; diff --git a/test/parse_rgb.h b/test/parse_rgb.h index df315b58..1efd972e 100644 --- a/test/parse_rgb.h +++ b/test/parse_rgb.h @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018,2020 Thomas E. Dickey * + * Copyright 2018-2024,2025 Thomas E. Dickey * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -26,7 +26,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: parse_rgb.h,v 1.5 2020/02/02 23:34:34 tom Exp $ + * $Id: parse_rgb.h,v 1.7 2025/01/18 15:03:33 tom Exp $ * * Sample implementation of ncurses RGB extension from user_caps(5). */ @@ -49,7 +49,7 @@ parse_rgb(int *r_max, int *g_max, int *b_max) int bits; int pwr2; int r = 0, g = 0, b = 0; - char *data; + const char *data; char ch; for (max_bits = 0, pwr2 = 1; @@ -58,13 +58,13 @@ parse_rgb(int *r_max, int *g_max, int *b_max) ; } - if (tigetflag("RGB") > 0) { + if (tigetflag(UserCap(RGB)) > 0) { result = OK; r = g = b = (max_bits + 2) / 3; - } else if ((bits = tigetnum("RGB")) > 0) { + } else if ((bits = tigetnum(UserCap(RGB))) > 0) { result = OK; r = g = b = bits; - } else if ((data = tigetstr("RGB")) != ABSENT_STRING + } else if ((data = tigetstr(UserCap(RGB))) != ABSENT_STRING && data != CANCELLED_STRING && sscanf(data, "%d/%d/%d%c", &r, &g, &b, &ch) == 3) { result = OK; diff --git a/test/picsmap.c b/test/picsmap.c index 04bae985..a0b7897e 100644 --- a/test/picsmap.c +++ b/test/picsmap.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2021,2022 Thomas E. Dickey * + * Copyright 2018-2023,2024 Thomas E. Dickey * * Copyright 2017,2018 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: picsmap.c,v 1.148 2022/12/04 00:40:11 tom Exp $ + * $Id: picsmap.c,v 1.153 2024/12/07 22:48:03 tom Exp $ * * Author: Thomas E. Dickey * @@ -53,13 +53,6 @@ #include #include -#if HAVE_STDINT_H -#include -#define my_intptr_t intptr_t -#else -#define my_intptr_t long -#endif - #if HAVE_TSEARCH #include #endif @@ -116,7 +109,7 @@ static void logmsg2(const char *fmt, ...) GCC_PRINTFLIKE(1, 2); static void warning(const char *fmt, ...) GCC_PRINTFLIKE(1, 2); static int gather_c_values(int); -static FILE *logfp = 0; +static FILE *logfp = NULL; static double aspect_ratio = 0.6; static bool in_curses = FALSE; static bool debugging = FALSE; @@ -145,7 +138,7 @@ static bool use_extended_colors = FALSE; static void logmsg(const char *fmt, ...) { - if (logfp != 0) { + if (logfp != NULL) { va_list ap; va_start(ap, fmt); vfprintf(logfp, fmt, ap); @@ -158,7 +151,7 @@ logmsg(const char *fmt, ...) static void logmsg2(const char *fmt, ...) { - if (logfp != 0) { + if (logfp != NULL) { va_list ap; va_start(ap, fmt); vfprintf(logfp, fmt, ap); @@ -170,7 +163,7 @@ logmsg2(const char *fmt, ...) static void close_log(void) { - if (logfp != 0) { + if (logfp != NULL) { logmsg("Allocations:"); logmsg("%8ld file", (long) how_much.file); logmsg("%8ld name", (long) how_much.name); @@ -181,7 +174,7 @@ close_log(void) logmsg("%8ld cell", (long) how_much.cell); logmsg("%8ld window", LINES * COLS * (long) sizeof(NCURSES_CH_T)); fclose(logfp); - logfp = 0; + logfp = NULL; } } @@ -206,7 +199,7 @@ failed(const char *msg) static void warning(const char *fmt, ...) { - if (logfp != 0) { + if (logfp != NULL) { va_list ap; va_start(ap, fmt); vfprintf(logfp, fmt, ap); @@ -226,7 +219,7 @@ warning(const char *fmt, ...) static void free_data(char **data) { - if (data != 0) { + if (data != NULL) { free(data[0]); free(data); } @@ -235,12 +228,12 @@ free_data(char **data) static PICS_HEAD * free_pics_head(PICS_HEAD * pics) { - if (pics != 0) { + if (pics != NULL) { free(pics->fgcol); free(pics->cells); free(pics->name); free(pics); - pics = 0; + pics = NULL; } return pics; } @@ -312,14 +305,14 @@ gather_c_values(int fg) reading_ncols[next].count = 0; check_c_values(__LINE__); - if ((ft = tfind(I2P(next), &reading_ntree, compare_c_values)) != 0) { + if ((ft = tfind(I2P(next), &reading_ntree, compare_c_values)) != NULL) { found = P2I(*ft); } else { if (reading_last + 2 >= reading_size) { int more = ((MAX(reading_last, reading_size) + 2) * 3) / 2; int last = reading_last + 1; FG_NODE *p = typeRealloc(FG_NODE, more, reading_ncols); - if (p == 0) + if (p == NULL) goto done; reading_size = more; @@ -330,7 +323,7 @@ gather_c_values(int fg) } ++reading_last; how_much.pair += sizeof(FG_NODE); - if ((ft = tsearch(I2P(next), &reading_ntree, compare_c_values)) != 0) { + if ((ft = tsearch(I2P(next), &reading_ntree, compare_c_values)) != NULL) { found = P2I(*ft); if (found != next) logmsg("OOPS expected slot %d, got %d", next, found); @@ -377,24 +370,24 @@ finish_c_values(PICS_HEAD * head) reading_last = 0; reading_size = 0; - reading_ncols = 0; + reading_ncols = NULL; } static void dispose_c_values(void) { #if HAVE_TSEARCH - if (reading_ntree != 0) { + if (reading_ntree != NULL) { int n; for (n = 0; n < reading_last; ++n) { tdelete(I2P(n), &reading_ntree, compare_c_values); } - reading_ntree = 0; + reading_ntree = NULL; } #endif - if (reading_ncols != 0) { + if (reading_ncols != NULL) { free(reading_ncols); - reading_ncols = 0; + reading_ncols = NULL; } reading_last = 0; reading_size = 0; @@ -420,7 +413,7 @@ is_file(const char *filename, struct stat *sb) static char ** read_file(const char *filename) { - char **result = 0; + char **result = NULL; struct stat sb; if (!quiet) { @@ -437,9 +430,9 @@ read_file(const char *filename) result = typeCalloc(char *, size + 1); how_much.file += ((size + 1) * 2); - if (blob != 0 && result != 0) { + if (blob != NULL && result != NULL) { FILE *fp = fopen(filename, "r"); - if (fp != 0) { + if (fp != NULL) { logmsg("opened %s", filename); if (fread(blob, sizeof(char), size, fp) == size) { @@ -464,7 +457,7 @@ read_file(const char *filename) result[k++] = blob + j; } } - result[k] = 0; + result[k] = NULL; if (k && !binary) { debugmsg2("[%5d] %s\n", k, result[k - 1]); } @@ -478,7 +471,7 @@ read_file(const char *filename) debugmsg("...file is empty"); free(blob); free(result); - result = 0; + result = NULL; } else if (binary) { debugmsg("...file is non-text"); } @@ -501,7 +494,7 @@ usage(int ok) ," -d invoke use_default_colors" #endif ," -L add debugging information to logfile" - ," -l FILE write informational messages to FILE" + ," -F FILE write informational messages to FILE" ," -p FILE color-palette file (default \"$TERM.dat\")" ," -q less verbose" ," -r FILE xpm uses X rgb color-names in FILE (default \"" RGB_PATH "\")" @@ -555,20 +548,20 @@ static char ** read_palette(const char *filename) { static const char *data_dir = DATA_DIR; - char **result = 0; + char **result = NULL; size_t last = strlen(filename); size_t need = (strlen(data_dir) + 20 + last); char *full_name = malloc(need); char *s; struct stat sb; - if (full_name != 0) { + if (full_name != NULL) { int tries; for (tries = 0; tries < 8; ++tries) { *(s = full_name) = '\0'; if (tries & 1) { - if (strchr(filename, '/') == 0) { + if (strchr(filename, '/') == NULL) { _nc_SPRINTF(full_name, _nc_SLIMIT(need) "%s/", data_dir); } else { continue; @@ -581,7 +574,7 @@ read_palette(const char *filename) _nc_STRCAT(full_name, filename, need); if (tries & 4) { char *t = s; - char *tc; + const char *tc; int num; char chr; int found = 0; @@ -589,7 +582,7 @@ read_palette(const char *filename) if (*t == '-') { if (sscanf(t, "-%d%c", &num, &chr) == 2 && chr == 'c' && - (tc = strchr(t, chr)) != 0 && + (tc = strchr(t, chr)) != NULL && !(strncmp) (tc, "color", 5)) { found = 1; } @@ -629,7 +622,7 @@ read_palette(const char *filename) static void init_palette(const char *palette_file) { - if (palette_file != 0) { + if (palette_file != NULL) { char **data = read_palette(palette_file); all_colors = typeMalloc(RGB_DATA, (unsigned) COLORS); @@ -648,12 +641,12 @@ init_palette(const char *palette_file) #else memset(all_colors, 0, sizeof(RGB_DATA) * (size_t) COLORS); #endif - if (data != 0) { + if (data != NULL) { int n; int red, green, blue; int scale = MaxSCALE; int c; - for (n = 0; data[n] != 0; ++n) { + for (n = 0; data[n] != NULL; ++n) { if (sscanf(data[n], "scale:%d", &c) == 1) { scale = c; } else if (sscanf(data[n], "%d:%d %d %d", @@ -684,9 +677,9 @@ init_palette(const char *palette_file) } if ((power2 != COLORS) || ((shift % 3) != 0)) { - if (all_colors == 0) { + if (all_colors == NULL) { init_palette(getenv("TERM")); - if (all_colors == 0) { + if (all_colors == NULL) { giveup("With %d colors, you need a palette-file", COLORS); } } @@ -711,7 +704,7 @@ map_color(int value) int green = (value & 0x00ff00) >> 8; int blue = (value & 0x0000ff) >> 0; - if (all_colors != 0) { + if (all_colors != NULL) { #define Diff2(n,m) ((m) - all_colors[n].m) * ((m) - all_colors[n].m) #define Diff2S(n) Diff2(n,red) + Diff2(n,green) + Diff2(n,blue) int d2 = Diff2S(0); @@ -830,7 +823,7 @@ match_c(const char *source, const char *pattern, ...) limit = -1; ip = va_arg(ap, int *); lv = strtol(source, &cp, ch == 'd' ? 10 : 16); - if (cp != 0 && cp != source) { + if (cp != NULL && cp != source) { *ip = (int) lv; source = cp; } else { @@ -841,13 +834,13 @@ match_c(const char *source, const char *pattern, ...) /* floating point for pixels... */ fp = va_arg(ap, float *); lv = strtol(source, &cp, 10); - if (cp == 0 || cp == source) + if (cp == NULL || cp == source) goto finish; *fp = (float) lv; source = cp; if (*source == '.') { lv = strtol(++source, &cp, 10); - if (cp == 0 || cp == source) + if (cp == NULL || cp == source) goto finish; { float scale = 1.0f; @@ -914,7 +907,7 @@ match_colors(const char *source, int cpp, char *arg1, char *arg2, char *arg3) s += cpp; while (*s++ == '\t') { char *t; - for (t = arg2; (*s != '\0') && strchr("\t\"", *s) == 0;) { + for (t = arg2; (*s != '\0') && strchr("\t\"", *s) == NULL;) { if (*s == ' ') { s = skip_cs(s); break; @@ -922,7 +915,7 @@ match_colors(const char *source, int cpp, char *arg1, char *arg2, char *arg3) *t++ = *s++; *t = '\0'; } - for (t = arg3; (*s != '\0') && strchr("\t\"", *s) == 0;) { + for (t = arg3; (*s != '\0') && strchr("\t\"", *s) == NULL;) { *t++ = *s++; *t = '\0'; } @@ -945,16 +938,17 @@ parse_rgb(char **data) char *s, *t; size_t item = 0; size_t need; - RGB_NAME *result = 0; + RGB_NAME *result = NULL; - for (need = 0; data[need] != 0; ++need) ; + for (need = 0; data[need] != NULL; ++need) ; result = typeCalloc(RGB_NAME, need + 2); how_much.name += (sizeof(RGB_NAME) * (need + 2)); - for (n = 0; data[n] != 0; ++n) { + for (n = 0; data[n] != NULL; ++n) { if (strlen(t = data[n]) >= sizeof(buf) - 1) continue; + t = strcpy(buf, t); if (*(s = skip_s(t)) == '!') continue; @@ -999,10 +993,10 @@ CaselessCmp(const char *a, const char *b) static RGB_NAME * lookup_rgb(const char *name) { - RGB_NAME *result = 0; - if (rgb_table != 0) { + RGB_NAME *result = NULL; + if (rgb_table != NULL) { int n; - for (n = 0; rgb_table[n].name != 0; ++n) { + for (n = 0; rgb_table[n].name != NULL; ++n) { if (!CaselessCmp(name, rgb_table[n].name)) { result = &rgb_table[n]; break; @@ -1035,7 +1029,7 @@ parse_xbm(char **data) gather_c_values(0); gather_c_values(0xffffff); - for (n = 0; data[n] != 0; ++n) { + for (n = 0; data[n] != NULL; ++n) { if (strlen(s = data[n]) >= sizeof(buf) - 1) continue; switch (state) { @@ -1043,10 +1037,10 @@ parse_xbm(char **data) case 1: case 2: if (sscanf(s, "#define %1024s %d%c", buf, &num, &ch) >= 2) { - if ((t = strstr(buf, "_width")) != 0) { + if ((t = strstr(buf, "_width")) != NULL) { state |= 1; result->wide = (short) bytes_of(num); - } else if ((t = strstr(buf, "_height")) != 0) { + } else if ((t = strstr(buf, "_height")) != NULL) { state |= 2; result->high = (short) num; } else { @@ -1073,7 +1067,7 @@ parse_xbm(char **data) result->cells = typeCalloc(PICS_CELL, cells); how_much.cell += (sizeof(PICS_CELL) * cells); - if ((s = strchr(s, L_CURLY)) == 0) + if ((s = strchr(s, L_CURLY)) == NULL) break; ++s; } else { @@ -1153,16 +1147,17 @@ parse_xpm(char **data) char arg1[BUFSIZ]; char arg2[BUFSIZ]; char arg3[BUFSIZ]; - char **list = 0; + char **list = NULL; debugmsg("called parse_xpm"); result = typeCalloc(PICS_HEAD, 1); how_much.head += sizeof(PICS_HEAD); - for (n = 0; data[n] != 0; ++n) { + for (n = 0; data[n] != NULL; ++n) { if (strlen(s = data[n]) >= sizeof(buf) - 1) continue; + s = strcpy(buf, s); switch (state) { case 0: if (match_c(s, " /* XPM */ ")) { @@ -1206,7 +1201,7 @@ parse_xpm(char **data) num_colors++; free(list[reading_last]); list[reading_last] = strdup(arg1); - if ((by_name = lookup_rgb(arg3)) != 0) { + if ((by_name = lookup_rgb(arg3)) != NULL) { found = gather_c_values(by_name->value); } else if (*arg3 == '#') { char *rgb = arg3 + 1; @@ -1232,7 +1227,7 @@ parse_xpm(char **data) if (num_colors >= result->colors) { finish_c_values(result); state = 4; - if (list[0] == 0) + if (list[0] == NULL) list[0] = strdup("\033"); } break; @@ -1244,7 +1239,7 @@ parse_xpm(char **data) /* FIXME - factor out */ for (c = 0; c < result->colors; ++c) { - if (list[c] == 0) { + if (list[c] == NULL) { /* should not happen... */ continue; } @@ -1319,8 +1314,8 @@ parse_img(const char *filename) result = typeCalloc(PICS_HEAD, 1); how_much.head += sizeof(PICS_HEAD); - if ((pp = popen(cmd, "r")) != 0) { - if (fgets(buffer, sizeof(buffer), pp) != 0) { + if ((pp = popen(cmd, "r")) != NULL) { + if (fgets(buffer, sizeof(buffer), pp) != NULL) { size_t n = strlen(filename); debugmsg2("...read %s", buffer); if (strlen(buffer) > n && @@ -1346,12 +1341,12 @@ parse_img(const char *filename) _nc_STRCAT(cmd, " 2>/dev/null", need); logmsg("...opening pipe to %s", cmd); - if ((pp = popen(cmd, "r")) != 0) { + if ((pp = popen(cmd, "r")) != NULL) { int count = 0; int col = 0; int row = 0; int len = 0; - while (fgets(buffer, sizeof(buffer), pp) != 0) { + while (fgets(buffer, sizeof(buffer), pp) != NULL) { debugmsg2("[%5d] %s", count + 1, buffer); if (strlen(buffer) > 160) { /* 80 columns would be enough */ okay = FALSE; @@ -1381,11 +1376,11 @@ parse_img(const char *filename) int r, g, b, nocolor; float rf, gf, bf; unsigned check; - char *t; - char *s = t = strchr(buffer, '#'); + char *s = strchr(buffer, '#'); + const char *t = s; bool matched = FALSE; - if (s != 0) { + if (s != NULL) { /* after the "#RGB", there are differences - just ignore */ while (*s != '\0' && !isspace(UChar(*s))) ++s; @@ -1477,11 +1472,11 @@ static PICS_HEAD * read_picture(const char *filename, char **data) { PICS_HEAD *pics; - if ((pics = parse_xbm(data)) == 0) { + if ((pics = parse_xbm(data)) == NULL) { dispose_c_values(); - if ((pics = parse_xpm(data)) == 0) { + if ((pics = parse_xpm(data)) == NULL) { dispose_c_values(); - if ((pics = parse_img(filename)) == 0) { + if ((pics = parse_img(filename)) == NULL) { dispose_c_values(); free_data(data); warning("unexpected file-format for \"%s\"", filename); @@ -1499,7 +1494,7 @@ read_picture(const char *filename, char **data) #define fg_color(pics,n) (pics->fgcol[n].fgcol) static void -dump_picture(PICS_HEAD * pics) +dump_picture(const PICS_HEAD * pics) { int y, x; @@ -1643,7 +1638,7 @@ report_colors(PICS_HEAD * pics) int total; char buffer[256]; - if (logfp == 0) + if (logfp == NULL) return; qsort(pics->fgcol, (size_t) pics->colors, sizeof(FG_NODE), compare_fg_counts); @@ -1734,10 +1729,10 @@ main(int argc, char *argv[]) int ch; int opt_d = FALSE; char ignore_ch; - const char *palette_path = 0; + const char *palette_path = NULL; const char *rgb_path = RGB_PATH; - while ((ch = getopt(argc, argv, OPTS_COMMON "a:dLl:p:qr:s:x:")) != -1) { + while ((ch = getopt(argc, argv, OPTS_COMMON "a:dLF:p:qr:s:x:")) != -1) { switch (ch) { case 'a': if (sscanf(optarg, "%lf%c", &aspect_ratio, &ignore_ch) != 1 @@ -1755,8 +1750,8 @@ main(int argc, char *argv[]) case 'L': debugging = TRUE; break; - case 'l': - if ((logfp = fopen(optarg, "a")) == 0) + case 'F': + if ((logfp = fopen(optarg, "a")) == NULL) failed(optarg); break; case 'p': @@ -1774,7 +1769,7 @@ main(int argc, char *argv[]) #if USE_EXTENDED_COLORS case 'x': { - char *s = optarg; + const char *s = optarg; while (*s) { switch (*s++) { case 'p': @@ -1815,11 +1810,11 @@ main(int argc, char *argv[]) PICS_HEAD *pics; char **data = read_file(argv[n]); - if (data == 0) { + if (data == NULL) { warning("cannot read \"%s\"", argv[n]); continue; } - if ((pics = read_picture(argv[n], data)) != 0) { + if ((pics = read_picture(argv[n], data)) != NULL) { if (in_curses) { show_picture(pics); } else { diff --git a/test/popup_msg.c b/test/popup_msg.c index 09eff5e3..7bacfacb 100644 --- a/test/popup_msg.c +++ b/test/popup_msg.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2020,2021 Thomas E. Dickey * + * Copyright 2018-2021,2024 Thomas E. Dickey * * Copyright 2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: popup_msg.c,v 1.11 2021/12/18 21:19:19 tom Exp $ + * $Id: popup_msg.c,v 1.15 2024/12/07 22:22:51 tom Exp $ * * Show a multi-line message in a window which may extend beyond the screen. * @@ -62,7 +62,7 @@ end_popup(void) * Display a temporary window, e.g., to display a help-message. */ void -popup_msg(WINDOW *parent, const char *const *msg) +popup_msg(WINDOW *parent, NCURSES_CONST char *const *msg) { int x0 = 4; int y0 = 2; @@ -78,16 +78,16 @@ popup_msg(WINDOW *parent, const char *const *msg) int last_y; int ch = ERR; - for (n = 0; msg[n] != 0; ++n) { + for (n = 0; msg[n] != NULL; ++n) { int check = (int) strlen(msg[n]); if (width < check) width = check; } length = n; - if ((help = newwin(high, wide, y0, x0)) == 0) + if ((help = newwin(high, wide, y0, x0)) == NULL) return; - if ((data = newpad(length + 1, width + 1)) == 0) { + if ((data = newpad(length + 2, width + 1)) == NULL) { delwin(help); return; } @@ -96,6 +96,7 @@ popup_msg(WINDOW *parent, const char *const *msg) keypad(data, TRUE); + waddstr(data, "Press ^[ or ^Q to exit this window.\n\n"); for (n = 0; n < length; ++n) { waddstr(data, msg[n]); if ((n + 1) < length) { @@ -170,12 +171,12 @@ popup_msg(WINDOW *parent, const char *const *msg) void popup_msg2(WINDOW *parent, char **msg) { - popup_msg(parent, (const char *const *) msg); + popup_msg(parent, (NCURSES_CONST char *const *) msg); } #else void -popup_msg(WINDOW *parent, const char *const *msg) +popup_msg(WINDOW *parent, NCURSES_CONST char *const *msg) { (void) parent; (void) msg; diff --git a/test/popup_msg.h b/test/popup_msg.h index 88dff73b..6b08fd78 100644 --- a/test/popup_msg.h +++ b/test/popup_msg.h @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018,2020 Thomas E. Dickey * + * Copyright 2018-2020,2024 Thomas E. Dickey * * Copyright 2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: popup_msg.h,v 1.5 2020/02/02 23:34:34 tom Exp $ + * $Id: popup_msg.h,v 1.6 2024/10/06 21:17:54 tom Exp $ * * Utility functions for a popup-message or help-screen. */ @@ -37,7 +37,7 @@ #include -extern void popup_msg(WINDOW *parent, const char *const *msg); +extern void popup_msg(WINDOW *parent, NCURSES_CONST char *const *msg); extern void popup_msg2(WINDOW *parent, char **msg); #endif /* POPUP_MSG_H_incl */ diff --git a/test/programs b/test/programs index 191a16dc..3f784d30 100644 --- a/test/programs +++ b/test/programs @@ -1,6 +1,6 @@ -# $Id: programs,v 1.55 2022/08/13 23:37:10 tom Exp $ +# $Id: programs,v 1.58 2024/06/29 18:49:58 tom Exp $ ############################################################################## -# Copyright 2018-2021,2022 Thomas E. Dickey # +# Copyright 2018-2023,2024 Thomas E. Dickey # # Copyright 2006-2016,2017 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # @@ -97,10 +97,11 @@ test_addstr $(LDFLAGS_CURSES) $(LOCAL_LIBS) test_addstr test_addwstr $(LDFLAGS_CURSES) $(LOCAL_LIBS) test_addwstr test_arrays $(LDFLAGS_TINFO) $(LOCAL_LIBS) test_arrays test_delwin $(LDFLAGS_CURSES) $(LOCAL_LIBS) test_delwin +test_endwin $(LDFLAGS_CURSES) $(LOCAL_LIBS) test_endwin test_get_wstr $(LDFLAGS_CURSES) $(LOCAL_LIBS) test_get_wstr popup_msg test_getstr $(LDFLAGS_CURSES) $(LOCAL_LIBS) test_getstr popup_msg -test_instr $(LDFLAGS_CURSES) $(LOCAL_LIBS) test_instr -test_inwstr $(LDFLAGS_CURSES) $(LOCAL_LIBS) test_inwstr +test_instr $(LDFLAGS_CURSES) $(LOCAL_LIBS) test_instr popup_msg +test_inwstr $(LDFLAGS_CURSES) $(LOCAL_LIBS) test_inwstr popup_msg test_mouse $(LDFLAGS_CURSES) $(LOCAL_LIBS) test_mouse test_opaque $(LDFLAGS_CURSES) $(LOCAL_LIBS) test_opaque test_setupterm $(LDFLAGS_CURSES) $(LOCAL_LIBS) test_setupterm diff --git a/test/railroad.c b/test/railroad.c index 4d7c0700..f119311d 100644 --- a/test/railroad.c +++ b/test/railroad.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2019-2020,2022 Thomas E. Dickey * + * Copyright 2019-2022,2024 Thomas E. Dickey * * Copyright 2000-2013,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -30,7 +30,7 @@ /* * Author: Thomas E. Dickey - 2000 * - * $Id: railroad.c,v 1.26 2022/12/11 00:12:13 tom Exp $ + * $Id: railroad.c,v 1.28 2024/12/07 22:48:03 tom Exp $ * * A simple demo of the termcap interface. */ @@ -83,13 +83,13 @@ PutChar(int ch) static void Backup(void) { - tputs(backup != 0 ? backup : "\b", 1, outc); + tputs(backup != NULL ? backup : "\b", 1, outc); } static void MyShowCursor(int flag) { - if (startC != 0 && finisC != 0) { + if (startC != NULL && finisC != NULL) { tputs(flag ? startC : finisC, 1, outc); } } @@ -97,7 +97,7 @@ MyShowCursor(int flag) static void StandOut(int flag) { - if (startS != 0 && finisS != 0) { + if (startS != NULL && finisS != NULL) { tputs(flag ? startS : finisS, 1, outc); } } @@ -105,7 +105,7 @@ StandOut(int flag) static void Underline(int flag) { - if (startU != 0 && finisU != 0) { + if (startU != NULL && finisU != NULL) { tputs(flag ? startU : finisU, 1, outc); } } @@ -113,10 +113,10 @@ Underline(int flag) static void ShowSign(char *string) { - char *base = string; + const char *base = string; int first, last; - if (moveit != 0) { + if (moveit != NULL) { tputs(tgoto(moveit, 0, height - 1), 1, outc); tputs(wipeit, 1, outc); } @@ -124,7 +124,7 @@ ShowSign(char *string) while (*string != 0) { int ch = *string; if (ch != ' ') { - if (moveit != 0) { + if (moveit != NULL) { for (first = length - 2; first >= (string - base); first--) { if (first < length - 1) { tputs(tgoto(moveit, first + 1, height - 1), 1, outc); @@ -152,7 +152,7 @@ ShowSign(char *string) Underline(0); } } - if (moveit != 0) + if (moveit != NULL) Backup(); } StandOut(1); @@ -161,7 +161,7 @@ ShowSign(char *string) fflush(stdout); string++; } - if (moveit != 0) + if (moveit != NULL) tputs(wipeit, 1, outc); putchar('\n'); } @@ -190,7 +190,7 @@ railroad(char **args) char area[1024], *ap = area; int z; - if (name == 0) + if (name == NULL) #ifdef EXP_WIN32_DRIVER name = "ms-terminal"; #else @@ -205,12 +205,12 @@ railroad(char **args) length = tgetnum("co"); moveit = tgetstr("cm", &ap); - if (wipeit == 0 - || moveit == 0 + if (wipeit == NULL + || moveit == NULL || height <= 0 || length <= 0) { - wipeit = 0; - moveit = 0; + wipeit = NULL; + moveit = NULL; height = 0; length = 0; } @@ -276,7 +276,7 @@ main(int argc, char *argv[]) } else { static char world[] = "Hello World"; static char *hello[] = - {world, 0}; + {world, NULL}; railroad(hello); } ExitProgram(EXIT_SUCCESS); diff --git a/test/rain.c b/test/rain.c index 1b1d81a0..75bc9f6b 100644 --- a/test/rain.c +++ b/test/rain.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2020,2022 Thomas E. Dickey * + * Copyright 2018-2022,2024 Thomas E. Dickey * * Copyright 1998-2014,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: rain.c,v 1.57 2022/12/04 00:40:11 tom Exp $ + * $Id: rain.c,v 1.63 2024/12/07 22:46:42 tom Exp $ */ #include #include @@ -45,7 +45,7 @@ WANT_USE_WINDOW(); struct DATA; -typedef void (*DrawPart) (struct DATA *); +typedef void (*DrawPart) (const struct DATA *); typedef struct DATA { int y, x; @@ -118,25 +118,25 @@ next_j(int j) } static void -part1(DATA * drop) +part1(const DATA * drop) { MvAddCh(drop->y, drop->x, '.'); } static void -part2(DATA * drop) +part2(const DATA * drop) { MvAddCh(drop->y, drop->x, 'o'); } static void -part3(DATA * drop) +part3(const DATA * drop) { MvAddCh(drop->y, drop->x, 'O'); } static void -part4(DATA * drop) +part4(const DATA * drop) { MvAddCh(drop->y - 1, drop->x, '-'); MvAddStr(drop->y, drop->x - 1, "|.|"); @@ -144,7 +144,7 @@ part4(DATA * drop) } static void -part5(DATA * drop) +part5(const DATA * drop) { MvAddCh(drop->y - 2, drop->x, '-'); MvAddStr(drop->y - 1, drop->x - 1, "/ \\"); @@ -154,7 +154,7 @@ part5(DATA * drop) } static void -part6(DATA * drop) +part6(const DATA * drop) { MvAddCh(drop->y - 2, drop->x, ' '); MvAddStr(drop->y - 1, drop->x - 1, " "); @@ -186,7 +186,7 @@ really_draw(WINDOW *win, void *arg) } static void -draw_part(void (*func) (DATA *), int state, DATA * data) +draw_part(void (*func) (const DATA *), int state, DATA * data) { data->func = func; data->state = state; @@ -229,7 +229,7 @@ draw_drop(void *arg) * Find myself in the list of threads so we can count the number of loops. */ for (mystats = 0; mystats < MAX_THREADS; ++mystats) { -#if defined(_NC_WINDOWS) && !defined(__WINPTHREADS_VERSION) +#if defined(_NC_WINDOWS_NATIVE) && !defined(__WINPTHREADS_VERSION) if (drop_threads[mystats].myself.p == pthread_self().p) #else if (drop_threads[mystats].myself == pthread_self()) @@ -328,14 +328,14 @@ VERSION_COMMON() int main(int argc, char *argv[]) { - static const char *help[] = + static NCURSES_CONST char *help[] = { "Commands:", " q/Q exit the program", " s do single-step", " undo single-step", "", - 0 + NULL }; bool done = FALSE; diff --git a/test/redraw.c b/test/redraw.c index 749f790b..446fa6e9 100644 --- a/test/redraw.c +++ b/test/redraw.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020-2021,2022 Thomas E. Dickey * + * Copyright 2020-2024,2025 Thomas E. Dickey * * Copyright 2006-2012,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: redraw.c,v 1.17 2022/12/10 22:28:50 tom Exp $ + * $Id: redraw.c,v 1.20 2025/02/09 00:18:18 tom Exp $ * * Demonstrate the redrawwin() and wredrawln() functions. * Thomas Dickey - 2006/11/4 @@ -61,7 +61,7 @@ trash(int beg_x, int max_x, int cur_x) static void test_redraw(WINDOW *win) { - static const char *help[] = + static NCURSES_CONST char *help[] = { "Commands:", " ^Q/ESC/q - quit", @@ -76,7 +76,7 @@ test_redraw(WINDOW *win) "", "Other control characters are added to the screen in printable form.", "Other printable characters are added to the screen as is.", - 0 + NULL }; WINDOW *win1; @@ -85,7 +85,7 @@ test_redraw(WINDOW *win) int max_y, max_x; int beg_y, beg_x; - assert(win != 0); + assert(win != NULL); scrollok(win, TRUE); keypad(win, TRUE); diff --git a/test/savescreen.c b/test/savescreen.c index 3ea61930..092a0976 100644 --- a/test/savescreen.c +++ b/test/savescreen.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2021,2022 Thomas E. Dickey * + * Copyright 2018-2022,2024 Thomas E. Dickey * * Copyright 2006-2017,2018 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: savescreen.c,v 1.62 2022/12/10 23:23:27 tom Exp $ + * $Id: savescreen.c,v 1.67 2024/12/07 22:46:42 tom Exp $ * * Demonstrate save/restore functions from the curses library. * Thomas Dickey - 2007/7/14 @@ -89,14 +89,14 @@ cleanup(char *files[]) if (!keep_dumps) { int n; - for (n = 0; files[n] != 0; ++n) { + for (n = 0; files[n] != NULL; ++n) { unlink(files[n]); } } } static int -load_screen(char *filename) +load_screen(NCURSES_CONST char *filename) { int result; @@ -170,10 +170,10 @@ dump_screen(char **files, int color, int which, int last, bool use_colors) #if USE_WIDEC_SUPPORT cchar_t mycc; #endif - char *filename = files[which]; + NCURSES_CONST char *filename = files[which]; bool dumped = FALSE; - if (filename != 0) { + if (filename != NULL) { dumped = TRUE; show_what(color, ++which, last); if (scr_dump(filename) == ERR) { @@ -216,7 +216,7 @@ dump_screen(char **files, int color, int which, int last, bool use_colors) static void editor_help(void) { - static const char *msgs[] = + static NCURSES_CONST char *msgs[] = { "You are now in the screen-editor, which allows you to make some", "lines on the screen, as well as save copies of the screen to a", @@ -230,7 +230,7 @@ editor_help(void) " a toggle between '#' and graphic symbol for drawing", " c change color drawn by line to next in palette", " h,j,k,l or arrows to move around the screen, drawing", - 0 + NULL }; popup_msg(stdscr, msgs); } @@ -238,7 +238,7 @@ editor_help(void) static void replay_help(void) { - static const char *msgs[] = + static NCURSES_CONST char *msgs[] = { "You are now in the screen-loader, which allows you to view", "the dumped/restored screens.", @@ -247,7 +247,7 @@ replay_help(void) " q quit", " load the next screen", " load the previous screen", - 0 + NULL }; popup_msg(stdscr, msgs); } @@ -261,7 +261,7 @@ usage(int ok) ,"" ,USAGE_COMMON ,"Options:" - ," -f file fill/initialize screen using text from this file" + ," -f FILE fill/initialize screen using text from this file" ," -i use scr_init/scr_restore rather than scr_set" ," -k keep the restored dump-files rather than removing them" ," -r replay the screen-dump files" @@ -286,7 +286,7 @@ main(int argc, char *argv[]) bool replaying = FALSE; bool done = FALSE; char **files; - char *fill_by = 0; + NCURSES_CONST char *fill_by = NULL; #if USE_WIDEC_SUPPORT cchar_t mycc; static const wchar_t mywc[2] = @@ -366,7 +366,7 @@ main(int argc, char *argv[]) * After that, use color pairs for constructing a test-pattern, e.g., * imitating xterm's scripts. */ - if (fill_by == 0) { + if (fill_by == NULL) { if (COLORS <= 256) { for (n = 0; n < COLORS; ++n) init_pair((short) (n + MAX_ANSI), (short) n, (short) n); @@ -407,7 +407,7 @@ main(int argc, char *argv[]) } #endif } - if ((fill_by == 0) && !replaying) { + if ((fill_by == NULL) && !replaying) { #if USE_WIDEC_SUPPORT int cube = 0; #endif @@ -484,9 +484,9 @@ main(int argc, char *argv[]) } } - if (fill_by != 0) { + if (fill_by != NULL) { FILE *fp = fopen(fill_by, "r"); - if (fp != 0) { + if (fp != NULL) { bool filled = FALSE; move(1, 0); while ((ch = fgetc(fp)) != EOF) { @@ -577,7 +577,7 @@ main(int argc, char *argv[]) int x = 0; int color = 0; int altchars = 0; - bool dirty = use_colors || (fill_by != 0); + bool dirty = use_colors || (fill_by != NULL); while (!done) { switch (get_command(color, which, last)) { diff --git a/test/sp_tinfo.c b/test/sp_tinfo.c index d003dfa3..ba0c09fd 100644 --- a/test/sp_tinfo.c +++ b/test/sp_tinfo.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2019-2020,2022 Thomas E. Dickey * + * Copyright 2019-2023,2024 Thomas E. Dickey * * Copyright 2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -28,7 +28,7 @@ ****************************************************************************/ /* - * $Id: sp_tinfo.c,v 1.28 2022/12/10 23:23:27 tom Exp $ + * $Id: sp_tinfo.c,v 1.30 2024/12/07 23:03:07 tom Exp $ * * TOTO: add option for non-sp-funcs interface */ @@ -138,7 +138,7 @@ static void show_string(MYDATA * data, const char *name, const char *value) { fprintf(data->fp, " %s = ", name); - if (value == 0) { + if (value == NULL) { fprintf(data->fp, "(missing)"); } else if (value == (char *) -1) { fprintf(data->fp, "(canceled)"); @@ -218,7 +218,7 @@ do_stuff(MYDATA * data) define_key_sp(sp, my_text, my_code); has_key_sp(sp, 0); key_defined_sp(sp, my_text); - if ((s = keybound_sp(sp, my_code, 0)) != 0) + if ((s = keybound_sp(sp, my_code, 0)) != NULL) free(s); #endif keyname_sp(sp, '?'); @@ -240,7 +240,7 @@ do_stuff(MYDATA * data) typeahead_sp(sp, FALSE); /* waddch */ use_env_sp(sp, FALSE); /* newterm */ use_tioctl_sp(sp, FALSE); /* newterm */ - intrflush_sp(sp, 0, 0); /* wgetch */ + intrflush_sp(sp, NULL, 0); /* wgetch */ flushinp_sp(sp); /* waddch */ halfdelay_sp(sp, 5); /* wgetch */ @@ -339,8 +339,12 @@ main(int argc, char *argv[]) do_stuff(my_out); do_stuff(my_err); - cleanup(my_out); - cleanup(my_err); + if (my_out != my_err) { + cleanup(my_out); + cleanup(my_err); + } else { + cleanup(my_out); + } ExitProgram(EXIT_SUCCESS); } diff --git a/test/tclock.c b/test/tclock.c index 1a749628..629bdbb4 100644 --- a/test/tclock.c +++ b/test/tclock.c @@ -1,4 +1,4 @@ -/* $Id: tclock.c,v 1.48 2023/02/25 16:42:22 tom Exp $ */ +/* $Id: tclock.c,v 1.51 2025/02/15 15:15:36 tom Exp $ */ #define NEED_TIME_H #include @@ -145,7 +145,7 @@ main(int argc, char *argv[]) int lastbeep = -1; bool odd = FALSE; time_t tim; - struct tm *t; + const struct tm *t; char szChar[20]; char *text; short my_bg = COLOR_BLACK; @@ -220,7 +220,7 @@ main(int argc, char *argv[]) for (;;) { napms(100); - tim = time(0); + tim = time(NULL); t = localtime(&tim); hours = (t->tm_hour + (t->tm_min / 60.0)); @@ -293,7 +293,7 @@ main(int argc, char *argv[]) int main(void) { - printf("This program requires the header math.h and trignometric functions\n"); + printf("This program requires the header math.h and trigonometric functions\n"); ExitProgram(EXIT_FAILURE); } #endif diff --git a/test/test.priv.h b/test/test.priv.h index a572b5c2..33778b73 100644 --- a/test/test.priv.h +++ b/test/test.priv.h @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2022,2023 Thomas E. Dickey * + * Copyright 2018-2024,2025 Thomas E. Dickey * * Copyright 1998-2017,2018 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -30,7 +30,7 @@ /**************************************************************************** * Author: Thomas E. Dickey 1996-on * ****************************************************************************/ -/* $Id: test.priv.h,v 1.210 2023/02/25 21:26:04 tom Exp $ */ +/* $Id: test.priv.h,v 1.221 2025/01/18 15:07:25 tom Exp $ */ #ifndef __TEST_PRIV_H #define __TEST_PRIV_H 1 @@ -303,6 +303,18 @@ #define HAVE_TIGETSTR 0 #endif +#ifndef HAVE_TIPARM +#define HAVE_TIPARM 0 +#endif + +#ifndef HAVE_TIPARM_S +#define HAVE_TIPARM_S 0 +#endif + +#ifndef HAVE_TISCAN_S +#define HAVE_TISCAN_S 0 +#endif + #ifndef HAVE_TPUTS_SP #define HAVE_TPUTS_SP 0 #endif @@ -379,6 +391,10 @@ #define NO_LEAKS 0 #endif +#ifndef HAVE__NC_TPARM_ANALYZE +#define HAVE__NC_TPARM_ANALYZE 0 +#endif + /* * Workaround for HPUX */ @@ -471,6 +487,13 @@ extern int optind; #include #include +#if HAVE_STDINT_H +#include +#define my_intptr_t intptr_t +#else +#define my_intptr_t long +#endif + #if defined(_MSC_VER) #undef popen #define popen(s,n) _popen(s,n) @@ -729,28 +752,27 @@ extern int optind; ," -V show version of curses" #if HAVE_CURSES_VERSION -#define format_version(buffer) strcpy(buffer, curses_version()) +#define format_version(buffer, size) strcpy(buffer, curses_version()) #elif defined(NCURSES_VERSION_MAJOR) && defined(NCURSES_VERSION_MINOR) && defined(NCURSES_VERSION_PATCH) -#define format_version(buffer) sprintf(buffer, "ncurses %d.%d.%d", \ - NCURSES_VERSION_MAJOR, \ - NCURSES_VERSION_MINOR, \ - NCURSES_VERSION_PATCH) +#define format_version(buffer, size) \ + _nc_SPRINTF(buffer, _nc_SLIMIT(size) "ncurses %d.%d.%d", \ + NCURSES_VERSION_MAJOR, \ + NCURSES_VERSION_MINOR, \ + NCURSES_VERSION_PATCH) #else -#define format_version(buffer) strcpy(buffer, "ncurses-examples") +#define format_version(buffer, size) strcpy(buffer, "ncurses-examples") #endif #define VERSION_COMMON() \ static char *version_common(char **argv) { \ - char *base = argv[0]; \ - char *leaf = strrchr(base, '/'); \ - char *result = malloc(strlen(base) + 80); \ - if (result == NULL) { \ - static char unknown[] = "?"; \ - result = unknown; \ - } else { \ - if (leaf++ == NULL) leaf = base; \ - sprintf(result, "%.20s: ", leaf); \ - format_version(result + strlen(result)); \ + const char *base = argv[0]; \ + const char *part = strrchr(base, '/'); \ + size_t need = strlen(base) + 80; \ + char *result = malloc(need); \ + if (result != NULL) { \ + if (part++ == NULL) part = base; \ + _nc_SPRINTF(result, _nc_SLIMIT(need) "%.20s: ", part); \ + format_version(result + strlen(result), need - strlen(result)); \ } \ return result; \ } \ @@ -830,6 +852,12 @@ extern "C" { #define _nc_SLIMIT(n) /* nothing */ #endif +/* + * To make them easier to find, user-defined capabilities used within ncurses + * should be tagged with this macro: + */ +#define UserCap(name) #name + /* * X/Open Curses does not define the arrays of terminfo/termcap names as SVr4 * curses did, and some implementations provide them anyway, but undeclared. @@ -894,8 +922,8 @@ extern int TABSIZE; * Workaround in case getcchar() returns a positive value when the source * string produces only a L'\0'. */ -#define TEST_CCHAR(s, count, then_stmt, else_stmt) \ - if ((count = getcchar(s, NULL, NULL, NULL, NULL)) > 0) { \ +#define TEST_CCHAR(s, then_stmt, else_stmt) \ + if (getcchar(s, NULL, NULL, NULL, NULL) > 0) { \ wchar_t test_wch[CCHARW_MAX + 2]; \ attr_t test_attrs; \ NCURSES_PAIRS_T test_pair; \ @@ -995,7 +1023,9 @@ extern int TABSIZE; #define UChar(c) ((unsigned char)(c)) +#ifndef SIZEOF #define SIZEOF(table) (sizeof(table)/sizeof(table[0])) +#endif #if defined(NCURSES_VERSION) && HAVE_NC_ALLOC_H #include @@ -1023,12 +1053,12 @@ extern int TABSIZE; #define EXIT_FAILURE 1 #endif -#undef _NC_WINDOWS +#undef _NC_WINDOWS_NATIVE #if (defined(_WIN32) || defined(_WIN64)) -#define _NC_WINDOWS 1 +#define _NC_WINDOWS_NATIVE 1 #endif -#if defined(_NC_WINDOWS) || defined(USE_WIN32CON_DRIVER) +#if defined(_NC_WINDOWS_NATIVE) || defined(USE_WIN32CON_DRIVER) #if defined(PDCURSES) #ifdef WINVER @@ -1090,14 +1120,14 @@ extern int TABSIZE; #if HAVE_CLOCK_GETTIME # define GetClockTime(t) clock_gettime(CLOCK_REALTIME, t) # define TimeType struct timespec -# define TimeScale 1000000000L /* 1e9 */ +# define TimeScale 1000000000L /* 1e9 */ # define ElapsedSeconds(b,e) \ (double) (((e)->tv_sec - (b)->tv_sec) \ + ((e)->tv_nsec - (b)->tv_nsec) / TimeScale) #elif HAVE_GETTIMEOFDAY # define GetClockTime(t) gettimeofday(t, 0) # define TimeType struct timeval -# define TimeScale 1000000L /* 1e6 */ +# define TimeScale 1000000L /* 1e6 */ # define ElapsedSeconds(b,e) \ (double) (((e)->tv_sec - (b)->tv_sec) \ + ((e)->tv_usec - (b)->tv_usec) / TimeScale) @@ -1160,7 +1190,7 @@ extern char *_nc_strstr(const char *, const char *); #define InitAndCatch(init,handler) do { init; CATCHALL(handler); } while (0) #endif -#if defined(_NC_WINDOWS) || defined(USE_WIN32CON_DRIVER) +#if defined(_NC_WINDOWS_NATIVE) || defined(USE_WIN32CON_DRIVER) #define SetupAlarm(opt) (void)opt #else #define SetupAlarm(opt) if (opt) alarm((unsigned)opt) diff --git a/test/test_add_wchstr.c b/test/test_add_wchstr.c index f69e1ddc..7d6f34a5 100644 --- a/test/test_add_wchstr.c +++ b/test/test_add_wchstr.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020-2021,2022 Thomas E. Dickey * + * Copyright 2020-2022,2024 Thomas E. Dickey * * Copyright 2009-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: test_add_wchstr.c,v 1.34 2022/12/10 22:28:50 tom Exp $ + * $Id: test_add_wchstr.c,v 1.36 2024/12/07 22:41:11 tom Exp $ * * Demonstrate the waddwchstr() and wadd_wch functions. * Thomas Dickey - 2009/9/12 @@ -88,7 +88,7 @@ static cchar_t *temp_buffer; static size_t temp_length; #define TempBuffer(source_len, source_cast) \ - if (source != 0) { \ + if (source != NULL) { \ const char *temp; \ size_t need = source_len + 1; \ wchar_t have[2]; \ @@ -107,7 +107,7 @@ static size_t temp_length; if (!pass_ctls \ && have[0] != 0 \ && have[0] < 256 \ - && (temp = unctrl((chtype) have[0])) != 0 \ + && (temp = unctrl((chtype) have[0])) != NULL \ && strlen(temp) > 1) { \ while (*temp != '\0') { \ have[0] = (wchar_t) *temp++; \ @@ -117,9 +117,9 @@ static size_t temp_length; setcchar(&temp_buffer[n++], have, A_NORMAL, 0, NULL); \ } \ } while (have[0] != 0); \ - } else if (temp_buffer != 0) { \ + } else if (temp_buffer != NULL) { \ free(temp_buffer); \ - temp_buffer = 0; \ + temp_buffer = NULL; \ temp_length = 0; \ } \ return temp_buffer; @@ -136,7 +136,7 @@ ChWLen(const wchar_t *source) for (n = 0; source[n] != 0; ++n) { const char *s; - if ((source[n] < 256) && (s = unctrl((chtype) source[n])) != 0) { + if ((source[n] < 256) && (s = unctrl((chtype) source[n])) != NULL) { adjust += (strlen(s) - 1); } } @@ -158,7 +158,7 @@ ChWStr(const wchar_t *source) } static void -legend(WINDOW *win, int level, Options state, wchar_t *buffer, int length) +legend(WINDOW *win, int level, Options state, const wchar_t *buffer, int length) { const char *showstate; @@ -310,9 +310,9 @@ recursive_test(int level) int row2, col2; int length; wchar_t buffer[BUFSIZ]; - WINDOW *look = 0; - WINDOW *work = 0; - WINDOW *show = 0; + WINDOW *look = NULL; + WINDOW *work = NULL; + WINDOW *show = NULL; int margin = (2 * MY_TABSIZE) - 1; Options option = (Options) ((unsigned) (m_opt ? oMove diff --git a/test/test_addchstr.c b/test/test_addchstr.c index cddc3152..55834c66 100644 --- a/test/test_addchstr.c +++ b/test/test_addchstr.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020,2022 Thomas E. Dickey * + * Copyright 2020-2022,2024 Thomas E. Dickey * * Copyright 2009-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: test_addchstr.c,v 1.29 2022/12/10 22:28:50 tom Exp $ + * $Id: test_addchstr.c,v 1.31 2024/12/07 22:41:11 tom Exp $ * * Demonstrate the waddchstr() and waddch functions. * Thomas Dickey - 2009/9/12 @@ -82,7 +82,7 @@ ChLen(const char *source) for (n = 0; n < result; ++n) { const char *s = unctrl(UChar(source[n])); - if (s != 0) { + if (s != NULL) { adjust += (strlen(s) - 1); } } @@ -94,7 +94,7 @@ ChLen(const char *source) static chtype * ChStr(const char *source) { - if (source != 0) { + if (source != NULL) { size_t need = ChLen(source) + 1; int n = 0; @@ -107,7 +107,7 @@ ChStr(const char *source) do { const char *s; chtype ch = UChar(*source++); - if (!pass_ctls && (s = unctrl(ch)) != 0) { + if (!pass_ctls && (s = unctrl(ch)) != NULL) { while (*s != '\0') { temp_buffer[n++] = UChar(*s++); } @@ -116,9 +116,9 @@ ChStr(const char *source) } } while (source[0] != 0); temp_buffer[n] = 0; - } else if (temp_buffer != 0) { + } else if (temp_buffer != NULL) { free(temp_buffer); - temp_buffer = 0; + temp_buffer = NULL; temp_length = 0; } return temp_buffer; @@ -169,7 +169,7 @@ legend(WINDOW *win, int level, Options state, char *buffer, int length) } static int -ColOf(char *buffer, int length, int margin) +ColOf(const char *buffer, int length, int margin) { int n; int result; @@ -218,9 +218,9 @@ recursive_test(int level) int row2, col2; int length; char buffer[BUFSIZ]; - WINDOW *look = 0; - WINDOW *work = 0; - WINDOW *show = 0; + WINDOW *look = NULL; + WINDOW *work = NULL; + WINDOW *show = NULL; int margin = (2 * MY_TABSIZE) - 1; Options option = (Options) ((unsigned) (m_opt ? oMove diff --git a/test/test_addstr.c b/test/test_addstr.c index ba8a90e5..8fab6dff 100644 --- a/test/test_addstr.c +++ b/test/test_addstr.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020,2022 Thomas E. Dickey * + * Copyright 2020-2022,2024 Thomas E. Dickey * * Copyright 2009-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: test_addstr.c,v 1.20 2022/12/10 22:28:50 tom Exp $ + * $Id: test_addstr.c,v 1.22 2024/12/07 22:41:11 tom Exp $ * * Demonstrate the waddstr() and waddch functions. * Thomas Dickey - 2009/9/12 @@ -91,7 +91,7 @@ legend(WINDOW *win, int level, Options state, char *buffer, int length) } static int -ColOf(char *buffer, int length, int margin) +ColOf(const char *buffer, int length, int margin) { int n; int result; @@ -140,9 +140,9 @@ recursive_test(int level) int row2, col2; int length; char buffer[BUFSIZ]; - WINDOW *look = 0; - WINDOW *work = 0; - WINDOW *show = 0; + WINDOW *look = NULL; + WINDOW *work = NULL; + WINDOW *show = NULL; int margin = (2 * MY_TABSIZE) - 1; Options option = (Options) ((unsigned) (m_opt ? oMove diff --git a/test/test_addwstr.c b/test/test_addwstr.c index aa7bf857..9ea7b15c 100644 --- a/test/test_addwstr.c +++ b/test/test_addwstr.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020,2022 Thomas E. Dickey * + * Copyright 2020-2023,2024 Thomas E. Dickey * * Copyright 2009-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: test_addwstr.c,v 1.21 2022/12/10 22:28:50 tom Exp $ + * $Id: test_addwstr.c,v 1.24 2024/12/07 22:41:11 tom Exp $ * * Demonstrate the waddwstr() and wadd_wch functions. * Thomas Dickey - 2009/9/12 @@ -82,7 +82,7 @@ static bool w_opt = FALSE; static int n_opt = -1; static void -legend(WINDOW *win, int level, Options state, wchar_t *buffer, int length) +legend(WINDOW *win, int level, Options state, const wchar_t *buffer, int length) { const char *showstate; @@ -114,7 +114,7 @@ legend(WINDOW *win, int level, Options state, wchar_t *buffer, int length) } static int -ColOf(wchar_t *buffer, int length, int margin) +ColOf(const wchar_t *const buffer, int length, int margin) { int n; int result; @@ -233,9 +233,9 @@ recursive_test(int level) int row2, col2; int length; wchar_t buffer[BUFSIZ]; - WINDOW *look = 0; - WINDOW *work = 0; - WINDOW *show = 0; + WINDOW *look = NULL; + WINDOW *work = NULL; + WINDOW *show = NULL; int margin = (2 * MY_TABSIZE) - 1; Options option = (Options) ((unsigned) (m_opt ? oMove diff --git a/test/test_arrays.c b/test/test_arrays.c index f89cb280..38eacd87 100644 --- a/test/test_arrays.c +++ b/test/test_arrays.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020,2022 Thomas E. Dickey * + * Copyright 2020-2022,2024 Thomas E. Dickey * * Copyright 2007-2010,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: test_arrays.c,v 1.13 2022/12/10 23:23:27 tom Exp $ + * $Id: test_arrays.c,v 1.15 2024/12/07 22:46:42 tom Exp $ * * Author: Thomas E Dickey * @@ -53,7 +53,7 @@ extern NCURSES_EXPORT_VAR(NCURSES_CONST char * const ) strfnames[]; static bool opt_C; static bool opt_T; -static bool opt_c; +static bool opt_s; static bool opt_f; static bool opt_n; static bool opt_t; @@ -66,7 +66,7 @@ dump_array(const char *name, NCURSES_CONST char *const *list) int n; printf("%s:\n", name); - for (n = 0; list[n] != 0; ++n) { + for (n = 0; list[n] != NULL; ++n) { printf("%5d:%s\n", n, list[n]); } } @@ -75,15 +75,15 @@ static void dump_plain(void) { PLAIN(opt_T && opt_n, boolnames); - PLAIN(opt_C && opt_c, boolcodes); + PLAIN(opt_C && opt_s, boolcodes); PLAIN(opt_T && opt_f, boolfnames); PLAIN(opt_T && opt_n, numnames); - PLAIN(opt_C && opt_c, numcodes); + PLAIN(opt_C && opt_s, numcodes); PLAIN(opt_T && opt_f, numfnames); PLAIN(opt_T && opt_n, strnames); - PLAIN(opt_C && opt_c, strcodes); + PLAIN(opt_C && opt_s, strcodes); PLAIN(opt_T && opt_f, strfnames); } @@ -99,7 +99,7 @@ dump_table(void) STRING(opt_t, "Index"); STRING(opt_t, "Type"); STRING(opt_n, "Name"); - STRING(opt_c, "Code"); + STRING(opt_s, "Code"); STRING(opt_f, "FName"); printf("\n"); @@ -108,7 +108,7 @@ dump_table(void) NUMBER(opt_t, r); STRING(opt_t, "bool"); STRING(opt_T && opt_n, boolnames[r]); - STRING(opt_C && opt_c, boolcodes[r]); + STRING(opt_C && opt_s, boolcodes[r]); STRING(opt_T && opt_f, boolfnames[r]); printf("\n"); } @@ -118,7 +118,7 @@ dump_table(void) NUMBER(opt_t, r); STRING(opt_t, "num"); STRING(opt_T && opt_n, numnames[r]); - STRING(opt_C && opt_c, numcodes[r]); + STRING(opt_C && opt_s, numcodes[r]); STRING(opt_T && opt_f, numfnames[r]); printf("\n"); } @@ -128,7 +128,7 @@ dump_table(void) NUMBER(opt_t, r); STRING(opt_t, "str"); STRING(opt_T && opt_n, strnames[r]); - STRING(opt_C && opt_c, strcodes[r]); + STRING(opt_C && opt_s, strcodes[r]); STRING(opt_T && opt_f, strfnames[r]); printf("\n"); } @@ -148,7 +148,7 @@ usage(int ok) ,"Options:" ," -C print termcap names" ," -T print terminfo names" - ," -c print termcap names" + ," -s print short termcap names" ," -f print full terminfo names" ," -n print short terminfo names" ," -t print the result as CSV table" @@ -168,7 +168,7 @@ main(int argc, char *argv[]) { int ch; - while ((ch = getopt(argc, argv, OPTS_COMMON "CTcfnt")) != -1) { + while ((ch = getopt(argc, argv, OPTS_COMMON "CTsfnt")) != -1) { switch (ch) { case 'C': opt_C = TRUE; @@ -176,8 +176,8 @@ main(int argc, char *argv[]) case 'T': opt_T = TRUE; break; - case 'c': - opt_c = TRUE; + case 's': + opt_s = TRUE; break; case 'f': opt_f = TRUE; @@ -202,8 +202,8 @@ main(int argc, char *argv[]) if (!(opt_T || opt_C)) { opt_T = opt_C = TRUE; } - if (!(opt_c || opt_f || opt_n)) { - opt_c = opt_f = opt_n = TRUE; + if (!(opt_s || opt_f || opt_n)) { + opt_s = opt_f = opt_n = TRUE; } if (opt_t) { diff --git a/test/test_delwin.c b/test/test_delwin.c index 7a874251..09ef5c53 100644 --- a/test/test_delwin.c +++ b/test/test_delwin.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2022 Thomas E. Dickey * + * Copyright 2022,2023 Thomas E. Dickey * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -27,7 +27,7 @@ ****************************************************************************/ /* - * $Id: test_delwin.c,v 1.4 2022/12/10 22:14:07 tom Exp $ + * $Id: test_delwin.c,v 1.5 2023/05/27 20:34:51 tom Exp $ */ #include @@ -123,7 +123,7 @@ main(int argc, char **argv) show_rc("Deleted parent", "should fail, it still has a subwindow", - rc = delwin(parent)); + delwin(parent)); next_step(stdscr); show_rc("Deleted child1", "should succeed", diff --git a/test/test_endwin.c b/test/test_endwin.c new file mode 100644 index 00000000..e1825ba7 --- /dev/null +++ b/test/test_endwin.c @@ -0,0 +1,132 @@ +/**************************************************************************** + * Copyright 2023,2024 Thomas E. Dickey * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * + * "Software"), to deal in the Software without restriction, including * + * without limitation the rights to use, copy, modify, merge, publish, * + * distribute, distribute with modifications, sublicense, and/or sell * + * copies of the Software, and to permit persons to whom the Software is * + * furnished to do so, subject to the following conditions: * + * * + * The above copyright notice and this permission notice shall be included * + * in all copies or substantial portions of the Software. * + * * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS * + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. * + * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, * + * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR * + * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR * + * THE USE OR OTHER DEALINGS IN THE SOFTWARE. * + * * + * Except as contained in this notice, the name(s) of the above copyright * + * holders shall not be used in advertising or otherwise to promote the * + * sale, use or other dealings in this Software without prior written * + * authorization. * + ****************************************************************************/ +/* + * $Id: test_endwin.c,v 1.4 2024/11/30 17:34:56 tom Exp $ + */ +#include + +static void +usage(int ok) +{ + static const char *msg[] = + { + "Usage: test_endwin [options]" + ,"" + ,"Options:" + ," -e call endwin() an extra time" + ," -i call initscr() before endwin()" + ," -n call newterm() before endwin()" + ," -r call refresh() before endwin()" + ," -s call getch() after endwin(), to refresh screen" + ,"" + ,USAGE_COMMON + }; + size_t n; + + for (n = 0; n < SIZEOF(msg); n++) + fprintf(stderr, "%s\n", msg[n]); + + ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE); +} +/* *INDENT-OFF* */ +VERSION_COMMON() +/* *INDENT-ON* */ + +#define status(opt,name,rc) if (opt) printf(" %s: %s", name, (rc) == OK ? "OK" : "ERR") + +int +main(int argc, char *argv[]) +{ + int ch; + int rc_r = OK; + int rc_e1 = OK; + int rc_e2 = OK; + int rc_e3 = OK; + const SCREEN *sp = NULL; + bool opt_e = FALSE; + bool opt_i = FALSE; + bool opt_n = FALSE; + bool opt_r = FALSE; + bool opt_s = FALSE; + + while ((ch = getopt(argc, argv, "einrs" OPTS_COMMON)) != -1) { + switch (ch) { + case 'e': + opt_e = TRUE; + break; + case 'i': + opt_i = TRUE; + break; + case 'n': + opt_n = TRUE; + break; + case 'r': + opt_r = TRUE; + break; + case 's': + opt_s = TRUE; + break; + case OPTS_VERSION: + show_version(argv); + ExitProgram(EXIT_SUCCESS); + default: + usage(ch == OPTS_USAGE); + /* NOTREACHED */ + } + } + if (optind < argc) + usage(FALSE); + if (opt_i && opt_n) + usage(TRUE); + + if (opt_i) { + initscr(); + } else if (opt_n) { + sp = newterm(NULL, stdout, stdin); + } + if (opt_r) { + rc_r = refresh(); + } + rc_e1 = endwin(); + if (opt_e) { + rc_e2 = endwin(); + } + if (opt_s) { + getch(); + rc_e3 = endwin(); + } + printf("status:"); + status(opt_i, "initscr(-i)", OK); + status(opt_n, "newterm(-n)", (sp != NULL) ? OK : ERR); + status(opt_r, "refresh(-r)", rc_r); + status(TRUE, "endwin", rc_e1); + status(opt_e, "endwin(-e)", rc_e2); + status(opt_s, "endwin(-s)", rc_e3); + printf("\n"); + ExitProgram(EXIT_SUCCESS); +} diff --git a/test/test_get_wstr.c b/test/test_get_wstr.c index 2a788fce..fc010a6c 100644 --- a/test/test_get_wstr.c +++ b/test/test_get_wstr.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020,2022 Thomas E. Dickey * + * Copyright 2020-2022,2024 Thomas E. Dickey * * Copyright 2007-2011,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: test_get_wstr.c,v 1.14 2022/12/10 23:59:13 tom Exp $ + * $Id: test_get_wstr.c,v 1.17 2024/12/07 22:46:42 tom Exp $ * * Author: Thomas E Dickey * @@ -69,7 +69,7 @@ Quit(int ch) } static int -Remainder(WINDOW *txtwin) +Remainder(const WINDOW *txtwin) { int result = getmaxx(txtwin) - getcurx(txtwin); return (result > 0) ? result : 0; @@ -138,7 +138,7 @@ ShowFlavor(WINDOW *strwin, WINDOW *txtwin, int flavor, int limit) static int recursive_test(int level, char **argv, WINDOW *strwin) { - static const char *help[] = + static NCURSES_CONST char *help[] = { "Commands:", " q,^Q,ESC - quit this program", @@ -158,10 +158,10 @@ recursive_test(int level, char **argv, WINDOW *strwin) "", " w - recur to subwindow", " ?, - show help-screen", - 0 + NULL }; - WINDOW *txtbox = 0; - WINDOW *txtwin = 0; + WINDOW *txtbox = NULL; + WINDOW *txtwin = NULL; FILE *fp; int ch; int rc; @@ -172,7 +172,7 @@ recursive_test(int level, char **argv, WINDOW *strwin) int actual; wint_t buffer[MAX_COLS]; - if (argv[level] == 0) { + if (argv[level] == NULL) { beep(); return FALSE; } @@ -200,7 +200,7 @@ recursive_test(int level, char **argv, WINDOW *strwin) txt_x = 0; wmove(txtwin, txt_y, txt_x); - if ((fp = fopen(argv[level], "r")) != 0) { + if ((fp = fopen(argv[level], "r")) != NULL) { while ((ch = fgetc(fp)) != EOF) { if (waddch(txtwin, UChar(ch)) != OK) { break; @@ -250,7 +250,7 @@ recursive_test(int level, char **argv, WINDOW *strwin) case 'w': recursive_test(level + 1, argv, strwin); - if (txtbox != 0) { + if (txtbox != NULL) { touchwin(txtbox); wnoutrefresh(txtbox); } else { diff --git a/test/test_getstr.c b/test/test_getstr.c index dbc0a0a2..48e6478d 100644 --- a/test/test_getstr.c +++ b/test/test_getstr.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020,2022 Thomas E. Dickey * + * Copyright 2020-2022,2024 Thomas E. Dickey * * Copyright 2007-2012,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: test_getstr.c,v 1.16 2022/12/10 23:58:37 tom Exp $ + * $Id: test_getstr.c,v 1.20 2024/12/07 22:46:42 tom Exp $ * * Author: Thomas E Dickey * @@ -76,7 +76,7 @@ Quit(int ch) } static int -Remainder(WINDOW *txtwin) +Remainder(NCURSES_CONST WINDOW *txtwin) { int result = getmaxx(txtwin) - getcurx(txtwin); return (result > 0) ? result : 0; @@ -145,7 +145,7 @@ ShowFlavor(WINDOW *strwin, WINDOW *txtwin, int flavor, int limit) static int recursive_test(int level, char **argv, WINDOW *strwin) { - static const char *help[] = + static NCURSES_CONST char *help[] = { "Commands:", " q,^Q,ESC - quit this program", @@ -165,10 +165,10 @@ recursive_test(int level, char **argv, WINDOW *strwin) "", " w - recur to subwindow", " ?, - show help-screen", - 0 + NULL }; - WINDOW *txtbox = 0; - WINDOW *txtwin = 0; + WINDOW *txtbox = NULL; + WINDOW *txtwin = NULL; FILE *fp; int ch; int rc; @@ -180,7 +180,7 @@ recursive_test(int level, char **argv, WINDOW *strwin) char buffer[MAX_COLS]; - if (argv[level] == 0) { + if (argv[level] == NULL) { beep(); return FALSE; } @@ -208,7 +208,7 @@ recursive_test(int level, char **argv, WINDOW *strwin) txt_x = 0; wmove(txtwin, txt_y, txt_x); - if ((fp = fopen(argv[level], "r")) != 0) { + if ((fp = fopen(argv[level], "r")) != NULL) { while ((ch = fgetc(fp)) != EOF) { if (waddch(txtwin, UChar(ch)) != OK) { break; @@ -258,7 +258,7 @@ recursive_test(int level, char **argv, WINDOW *strwin) case 'w': recursive_test(level + 1, argv, strwin); - if (txtbox != 0) { + if (txtbox != NULL) { touchwin(txtbox); wnoutrefresh(txtbox); } else { diff --git a/test/test_instr.c b/test/test_instr.c index c87bdd70..9ef83896 100644 --- a/test/test_instr.c +++ b/test/test_instr.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020,2022 Thomas E. Dickey * + * Copyright 2020-2022,2024 Thomas E. Dickey * * Copyright 2007-2010,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: test_instr.c,v 1.12 2022/12/10 23:58:01 tom Exp $ + * $Id: test_instr.c,v 1.16 2024/12/07 22:46:42 tom Exp $ * * Author: Thomas E Dickey * @@ -44,6 +44,7 @@ */ #include +#include #define BASE_Y 6 #define MAX_COLS 1024 @@ -55,24 +56,44 @@ Quit(int ch) } static void -show_1st(WINDOW *win, int line, char *buffer) +show_1st(WINDOW *win, int line, NCURSES_CONST char *buffer) { MvWAddStr(win, line, 5, buffer); } static void -showmore(WINDOW *win, int line, char *buffer) +showmore(WINDOW *win, int line, NCURSES_CONST char *buffer) { wmove(win, line, 0); wclrtoeol(win); show_1st(win, line, buffer); } +static void +show_help(WINDOW *win) +{ + static NCURSES_CONST char *msgs[] = + { + "Show file contents and a viewport from the variants of winstr." + ,"Use h/j/k/l or arrow keys to move the viewport." + ,"" + ,"Other commands:" + ,"+ increases the buffer-size used." + ,"- decreases the buffer-size used." + ,"w opens new window on the next filename." + ,"q quits the current file/window." + ,"? shows this help-window" + ,NULL + }; + + popup_msg(win, msgs); +} + static int recursive_test(int level, char **argv, WINDOW *chrwin, WINDOW *strwin) { - WINDOW *txtbox = 0; - WINDOW *txtwin = 0; + WINDOW *txtbox = NULL; + WINDOW *txtwin = NULL; FILE *fp; int ch; int txt_x = 0, txt_y = 0; @@ -81,7 +102,7 @@ recursive_test(int level, char **argv, WINDOW *chrwin, WINDOW *strwin) char buffer[MAX_COLS]; - if (argv[level] == 0) { + if (argv[level] == NULL) { beep(); return FALSE; } @@ -110,7 +131,7 @@ recursive_test(int level, char **argv, WINDOW *chrwin, WINDOW *strwin) txt_x = 0; wmove(txtwin, txt_y, txt_x); - if ((fp = fopen(argv[level], "r")) != 0) { + if ((fp = fopen(argv[level], "r")) != NULL) { while ((ch = fgetc(fp)) != EOF) { if (waddch(txtwin, UChar(ch)) != OK) { break; @@ -153,7 +174,7 @@ recursive_test(int level, char **argv, WINDOW *chrwin, WINDOW *strwin) break; case 'w': recursive_test(level + 1, argv, chrwin, strwin); - if (txtbox != 0) { + if (txtbox != NULL) { touchwin(txtbox); wnoutrefresh(txtbox); } else { @@ -169,8 +190,15 @@ recursive_test(int level, char **argv, WINDOW *chrwin, WINDOW *strwin) } break; case '+': - ++limit; + if (limit + 2 < MAX_COLS) { + ++limit; + } else { + beep(); + } break; + case HELP_KEY_1: + show_help(txtwin); + continue; default: beep(); break; @@ -273,8 +301,10 @@ main(int argc, char *argv[]) setlocale(LC_ALL, ""); - if (optind + 1 > argc) + if (optind + 1 > argc) { + fprintf(stderr, "At least one text-file is needed\n"); usage(FALSE); + } initscr(); diff --git a/test/test_inwstr.c b/test/test_inwstr.c index c22add7b..8ab10a6d 100644 --- a/test/test_inwstr.c +++ b/test/test_inwstr.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020,2022 Thomas E. Dickey * + * Copyright 2020-2022,2024 Thomas E. Dickey * * Copyright 2007-2010,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: test_inwstr.c,v 1.8 2022/12/10 23:56:39 tom Exp $ + * $Id: test_inwstr.c,v 1.12 2024/12/07 22:46:42 tom Exp $ * * Author: Thomas E Dickey * @@ -47,6 +47,8 @@ #if USE_WIDEC_SUPPORT +#include + #define BASE_Y 6 #define MAX_COLS 1024 @@ -57,24 +59,44 @@ Quit(int ch) } static void -show_1st(WINDOW *win, int line, wchar_t *buffer) +show_1st(WINDOW *win, int line, const wchar_t *buffer) { (void) mvwaddwstr(win, line, 5, buffer); } static void -showmore(WINDOW *win, int line, wchar_t *buffer) +showmore(WINDOW *win, int line, const wchar_t *buffer) { wmove(win, line, 0); wclrtoeol(win); show_1st(win, line, buffer); } +static void +show_help(WINDOW *win) +{ + static NCURSES_CONST char *msgs[] = + { + "Show file contents and a viewport from the variants of winwstr." + ,"Use h/j/k/l or arrow keys to move the viewport." + ,"" + ,"Other commands:" + ,"+ increases the buffer-size used." + ,"- decreases the buffer-size used." + ,"w opens new window on the next filename." + ,"q quits the current file/window." + ,"? shows this help-window" + ,NULL + }; + + popup_msg(win, msgs); +} + static int recursive_test(int level, char **argv, WINDOW *chrwin, WINDOW *strwin) { - WINDOW *txtbox = 0; - WINDOW *txtwin = 0; + WINDOW *txtbox = NULL; + WINDOW *txtwin = NULL; FILE *fp; int ch; int txt_x = 0, txt_y = 0; @@ -82,7 +104,7 @@ recursive_test(int level, char **argv, WINDOW *chrwin, WINDOW *strwin) int limit = getmaxx(strwin) - 5; wchar_t buffer[MAX_COLS]; - if (argv[level] == 0) { + if (argv[level] == NULL) { beep(); return FALSE; } @@ -110,7 +132,7 @@ recursive_test(int level, char **argv, WINDOW *chrwin, WINDOW *strwin) txt_x = 0; wmove(txtwin, txt_y, txt_x); - if ((fp = fopen(argv[level], "r")) != 0) { + if ((fp = fopen(argv[level], "r")) != NULL) { while ((ch = fgetc(fp)) != EOF) { if (waddch(txtwin, UChar(ch)) != OK) { break; @@ -153,7 +175,7 @@ recursive_test(int level, char **argv, WINDOW *chrwin, WINDOW *strwin) break; case 'w': recursive_test(level + 1, argv, chrwin, strwin); - if (txtbox != 0) { + if (txtbox != NULL) { touchwin(txtbox); wnoutrefresh(txtbox); } else { @@ -169,8 +191,15 @@ recursive_test(int level, char **argv, WINDOW *chrwin, WINDOW *strwin) } break; case '+': - ++limit; + if (limit + 2 < MAX_COLS) { + ++limit; + } else { + beep(); + } break; + case HELP_KEY_1: + show_help(txtwin); + continue; default: beep(); break; @@ -273,8 +302,10 @@ main(int argc, char *argv[]) setlocale(LC_ALL, ""); - if (optind + 1 > argc) + if (optind + 1 > argc) { + fprintf(stderr, "At least one text-file is needed\n"); usage(FALSE); + } initscr(); diff --git a/test/test_mouse.c b/test/test_mouse.c index d6013c74..7c2ec27e 100644 --- a/test/test_mouse.c +++ b/test/test_mouse.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2022,2023 Thomas E. Dickey * + * Copyright 2022-2024,2025 Thomas E. Dickey * * Copyright 2022 Leonid S. Usov * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -22,7 +22,7 @@ * THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************/ /* - * $Id: test_mouse.c,v 1.27 2023/01/07 17:22:42 tom Exp $ + * $Id: test_mouse.c,v 1.36 2025/01/18 15:03:25 tom Exp $ * * Author: Leonid S Usov * @@ -31,43 +31,28 @@ #include -#if defined(NCURSES_MOUSE_VERSION) && !defined(_NC_WINDOWS) +#if defined(NCURSES_MOUSE_VERSION) && !defined(_NC_WINDOWS_NATIVE) static int logoffset = 0; -static int +static void raw_loop(void) { - struct termios tty; - struct termios old; - char *xtermcap; + const char *xtermcap; - tcgetattr(0, &old); -#if HAVE_CFMAKERAW - cfmakeraw(&tty); -#else - tty = old; - tty.c_iflag &= (unsigned) (~(IGNBRK | BRKINT | PARMRK | ISTRIP - | INLCR | IGNCR | ICRNL | IXON)); - tty.c_oflag &= (unsigned) (~OPOST); - tty.c_lflag &= (unsigned) (~(ECHO | ECHONL | ICANON | ISIG | IEXTEN)); - tty.c_cflag &= (unsigned) (~(CSIZE | PARENB)); - tty.c_cflag |= CS8; - tcsetattr(0, TCSANOW, &tty); -#endif + printf("Entering raw mode. Ctrl-c to quit.\n"); - setupterm(NULL, 0, 0); - xtermcap = tigetstr("XM"); + newterm(NULL, stdout, stdin); + raw(); + xtermcap = tigetstr(UserCap(XM)); if (!VALID_STRING(xtermcap)) { fprintf(stderr, "couldn't get XM terminfo"); - return 1; + return; } - putp(tparm(xtermcap, 1)); + putp(tgoto(xtermcap, 1, 1)); fflush(stdout); - tcsetattr(0, TCSANOW, &tty); - while (1) { int c = getc(stdin); const char *pretty; @@ -85,10 +70,9 @@ raw_loop(void) } } - putp(tparm(xtermcap, 0)); + putp(tgoto(xtermcap, 0, 0)); fflush(stdout); - tcsetattr(0, TCSANOW, &old); - return 0; + noraw(); } static void logw(const char *fmt, ...) GCC_PRINTFLIKE(1, 2); @@ -117,76 +101,9 @@ logw(const char *fmt, ...) } static void -usage(int ok) -{ - static const char *msg[] = - { - "Usage: test_mouse [options]" - ,"" - ,"Test mouse events. These examples for $TERM demonstrate xterm" - ,"features:" - ," xterm" - ," xterm-1002" - ," xterm-1003" - ,"" - ,USAGE_COMMON - ,"Options:" - ," -r show raw input stream, injecting a new line before every ESC" - ," -i n set mouse interval to n; default is 0 (no double-clicks)" - ," -T term use terminal description other than $TERM" - }; - unsigned n; - for (n = 0; n < sizeof(msg) / sizeof(char *); ++n) { - fprintf(stderr, "%s\n", msg[n]); - } - ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE); -} -/* *INDENT-OFF* */ -VERSION_COMMON() -/* *INDENT-ON* */ - -int -main(int argc, char *argv[]) +cooked_loop(char *my_environ, int interval) { - bool rawmode = FALSE; - int interval = 0; - int ch; MEVENT event; - char *my_environ = NULL; - const char *term_format = "TERM=%s"; - - while ((ch = getopt(argc, argv, OPTS_COMMON "i:rT:")) != -1) { - switch (ch) { - case 'i': - interval = atoi(optarg); - break; - case 'r': - rawmode = TRUE; - break; - case 'T': - my_environ = malloc(strlen(term_format) + strlen(optarg)); - if (my_environ != NULL) { - sprintf(my_environ, term_format, optarg); - putenv(my_environ); - } - break; - case OPTS_VERSION: - show_version(argv); - ExitProgram(EXIT_SUCCESS); - default: - usage(ch == OPTS_USAGE); - /* NOTREACHED */ - } - } - if (optind < argc) { - usage(FALSE); - ExitProgram(EXIT_FAILURE); - } - - if (rawmode) { - printf("Entering raw mode. Ctrl-c to quit.\n"); - return raw_loop(); - } initscr(); noecho(); @@ -279,6 +196,82 @@ main(int argc, char *argv[]) } end: endwin(); +} + +static void +usage(int ok) +{ + static const char *msg[] = + { + "Usage: test_mouse [options]" + ,"" + ,"Test mouse events. These examples for $TERM demonstrate xterm" + ,"features:" + ," xterm" + ," xterm-1002" + ," xterm-1003" + ,"" + ,USAGE_COMMON + ,"Options:" + ," -r show raw input stream, injecting a new line before every ESC" + ," -i NUM set mouse interval to NUM; default is 0 (no double-clicks)" + ," -T TERM override $TERM" + }; + unsigned n; + for (n = 0; n < sizeof(msg) / sizeof(char *); ++n) { + fprintf(stderr, "%s\n", msg[n]); + } + ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE); +} +/* *INDENT-OFF* */ +VERSION_COMMON() +/* *INDENT-ON* */ + +int +main(int argc, char *argv[]) +{ + bool rawmode = FALSE; + int interval = 0; + int ch; + size_t my_len; + char *my_environ = NULL; + const char *term_format = "TERM=%s"; + + while ((ch = getopt(argc, argv, OPTS_COMMON "i:rT:")) != -1) { + switch (ch) { + case 'i': + interval = atoi(optarg); + break; + case 'r': + rawmode = TRUE; + break; + case 'T': + my_len = strlen(term_format) + strlen(optarg) + 1; + my_environ = malloc(my_len); + if (my_environ != NULL) { + _nc_SPRINTF(my_environ, _nc_SLIMIT(my_len) term_format, optarg); + putenv(my_environ); + } + break; + case OPTS_VERSION: + show_version(argv); + ExitProgram(EXIT_SUCCESS); + default: + usage(ch == OPTS_USAGE); + /* NOTREACHED */ + } + } + if (optind < argc) { + usage(FALSE); + ExitProgram(EXIT_FAILURE); + } + + if (rawmode) { + raw_loop(); + } else { + cooked_loop(my_environ, interval); + } + ExitProgram(EXIT_SUCCESS); } #else diff --git a/test/test_opaque.c b/test/test_opaque.c index 09b98c00..60e1c975 100644 --- a/test/test_opaque.c +++ b/test/test_opaque.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020-2021,2022 Thomas E. Dickey * + * Copyright 2020-2024,2025 Thomas E. Dickey * * Copyright 2007-2008,2009 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: test_opaque.c,v 1.15 2022/12/11 00:03:10 tom Exp $ + * $Id: test_opaque.c,v 1.19 2025/02/08 13:03:06 tom Exp $ * * Author: Thomas E Dickey * @@ -79,7 +79,7 @@ static bool test_opaque_idcok(WINDOW *win, int mode) { if (mode >= 0) { - idcok(win, mode); + idcok(win, (bool) mode); } return is_idcok(win); } @@ -88,7 +88,7 @@ static bool test_opaque_idlok(WINDOW *win, int mode) { if (mode >= 0) { - idlok(win, mode); + idlok(win, (bool) mode); } return is_idlok(win); } @@ -97,7 +97,7 @@ static bool test_opaque_immedok(WINDOW *win, int mode) { if (mode >= 0) { - immedok(win, mode); + immedok(win, (bool) mode); } return is_immedok(win); } @@ -106,7 +106,7 @@ static bool test_opaque_keypad(WINDOW *win, int mode) { if (mode >= 0) { - keypad(win, mode); + keypad(win, (bool) mode); } return is_keypad(win); } @@ -115,7 +115,7 @@ static bool test_opaque_leaveok(WINDOW *win, int mode) { if (mode >= 0) { - leaveok(win, mode); + leaveok(win, (bool) mode); } return is_leaveok(win); } @@ -124,7 +124,7 @@ static bool test_opaque_nodelay(WINDOW *win, int mode) { if (mode >= 0) { - nodelay(win, mode); + nodelay(win, (bool) mode); } return is_nodelay(win); } @@ -133,7 +133,7 @@ static bool test_opaque_notimeout(WINDOW *win, int mode) { if (mode >= 0) { - notimeout(win, mode); + notimeout(win, (bool) mode); } return is_notimeout(win); } @@ -142,7 +142,7 @@ static bool test_opaque_scrollok(WINDOW *win, int mode) { if (mode >= 0) { - scrollok(win, mode); + scrollok(win, (bool) mode); } return is_scrollok(win); } @@ -151,21 +151,39 @@ static bool test_opaque_syncok(WINDOW *win, int mode) { if (mode >= 0) { - syncok(win, mode); + syncok(win, (bool) mode); } return is_syncok(win); } static int -status_y(WINDOW *stswin, int cell) +height_of(const WINDOW *win) { - return (cell % getmaxy(stswin)); + int result = getmaxy(win); + if (result <= 0) + result = 1; + return result; } static int -status_x(WINDOW *stswin, int cell) +width_of(const WINDOW *win) { - return (15 * (cell / getmaxy(stswin))); + int result = getmaxx(win); + if (result <= 0) + result = 1; + return result; +} + +static int +status_y(const WINDOW *stswin, int cell) +{ + return (cell % height_of(stswin)); +} + +static int +status_x(const WINDOW *stswin, int cell) +{ + return (15 * (cell / height_of(stswin))); } static void @@ -269,8 +287,8 @@ show_opaque(WINDOW *stswin, WINDOW *txtwin, bool before, int active) static int test_opaque(int level, char **argv, WINDOW *stswin) { - WINDOW *txtbox = 0; - WINDOW *txtwin = 0; + WINDOW *txtbox = NULL; + WINDOW *txtwin = NULL; FILE *fp; int ch; int txt_x = 0, txt_y = 0; @@ -278,7 +296,7 @@ test_opaque(int level, char **argv, WINDOW *stswin) bool in_status = FALSE; int active = 0; - if (argv[level] == 0) { + if (argv[level] == NULL) { beep(); return FALSE; } @@ -289,8 +307,8 @@ test_opaque(int level, char **argv, WINDOW *stswin) wnoutrefresh(txtbox); txtwin = derwin(txtbox, - getmaxy(txtbox) - 2, - getmaxx(txtbox) - 2, + height_of(txtbox) - 2, + width_of(txtbox) - 2, 1, 1); base_y = 0; } else { @@ -306,7 +324,7 @@ test_opaque(int level, char **argv, WINDOW *stswin) txt_x = 0; wmove(txtwin, txt_y, txt_x); - if ((fp = fopen(argv[level], "r")) != 0) { + if ((fp = fopen(argv[level], "r")) != NULL) { while ((ch = fgetc(fp)) != EOF) { if (waddch(txtwin, UChar(ch)) != OK) { break; @@ -365,7 +383,7 @@ test_opaque(int level, char **argv, WINDOW *stswin) break; case KEY_DOWN: case 'j': - if (txt_y < getmaxy(txtwin) - 1) + if (txt_y < height_of(txtwin) - 1) txt_y++; else beep(); @@ -386,14 +404,14 @@ test_opaque(int level, char **argv, WINDOW *stswin) break; case KEY_RIGHT: case 'l': - if (txt_x < getmaxx(txtwin) - 1) + if (txt_x < width_of(txtwin) - 1) txt_x++; else beep(); break; case 'w': test_opaque(level + 1, argv, stswin); - if (txtbox != 0) { + if (txtbox != NULL) { touchwin(txtbox); wnoutrefresh(txtbox); } else { diff --git a/test/test_setupterm.c b/test/test_setupterm.c index 4e53c2e7..f7374f46 100644 --- a/test/test_setupterm.c +++ b/test/test_setupterm.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020,2022 Thomas E. Dickey * + * Copyright 2020-2023,2024 Thomas E. Dickey * * Copyright 2015,2016 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -30,7 +30,7 @@ /* * Author: Thomas E. Dickey * - * $Id: test_setupterm.c,v 1.16 2022/12/10 23:23:27 tom Exp $ + * $Id: test_setupterm.c,v 1.18 2024/12/07 23:03:07 tom Exp $ * * A simple demo of setupterm/restartterm. */ @@ -48,6 +48,13 @@ static TERMINAL **saved_terminals; static size_t num_saved; static size_t max_saved; +static void +failed(const char *msg) +{ + perror(msg); + ExitProgram(EXIT_FAILURE); +} + static void finish(int code) { @@ -73,6 +80,8 @@ save_curterm(void) if (num_saved + 1 >= max_saved) { max_saved += 100; saved_terminals = typeRealloc(TERMINAL *, max_saved, saved_terminals); + if (saved_terminals == NULL) + failed("realloc"); } saved_terminals[num_saved++] = cur_term; } @@ -89,9 +98,9 @@ test_rc(NCURSES_CONST char *name, int actual_rc, int actual_err) int expect_rc = -1; int expect_err = -1; - if (name == 0) + if (name == NULL) name = getenv("TERM"); - if (name == 0) + if (name == NULL) name = "?"; switch (*name) { @@ -235,7 +244,7 @@ main(int argc, char *argv[]) } if (a_opt) { - static char predef[][9] = + static char predef[][12] = {"vt100", "dumb", "lpr", "unknown", "none-such"}; if (optind < argc) { usage(FALSE); diff --git a/test/test_sgr.c b/test/test_sgr.c index dbd1caf1..d69964ad 100644 --- a/test/test_sgr.c +++ b/test/test_sgr.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2019-2021,2022 Thomas E. Dickey * + * Copyright 2019-2024,2025 Thomas E. Dickey * * Copyright 2015-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -30,7 +30,7 @@ /* * Author: Thomas E. Dickey * - * $Id: test_sgr.c,v 1.21 2022/12/10 23:23:27 tom Exp $ + * $Id: test_sgr.c,v 1.27 2025/01/11 14:54:49 tom Exp $ * * A simple demo of the sgr/sgr0 terminal capabilities. */ @@ -61,11 +61,14 @@ static int db_item; static long total_values; static char * -make_dbitem(char *p, char *q) +make_dbitem(const char *const p, const char *const q) { - size_t need = strlen(e_opt) + 2 + (size_t) (p - q); + size_t diff = (size_t) (p - q); + size_t need = strlen(e_opt) + 2 + diff; char *result = malloc(need); - _nc_SPRINTF(result, _nc_SLIMIT(need) "%s=%.*s", e_opt, (int) (p - q), q); + if (result != NULL) { + _nc_SPRINTF(result, _nc_SLIMIT(need) "%s=%.*s", e_opt, (int) diff, q); + } return result; } @@ -106,10 +109,10 @@ make_dblist(void) static char * next_dbitem(void) { - char *result = 0; + char *result = NULL; if (db_list) { - if ((result = db_list[db_item]) == 0) { + if ((result = db_list[db_item]) == NULL) { db_item = 0; result = db_list[0]; } else { @@ -129,7 +132,7 @@ free_dblist(void) for (n = 0; db_list[n]; ++n) free(db_list[n]); free(db_list); - db_list = 0; + db_list = NULL; } } #endif @@ -142,10 +145,10 @@ free_dblist(void) #define MASK_REV (1 << 2) static void -dumpit(unsigned bits, unsigned ignore, const char *sgr, const char *sgr0) +dumpit(unsigned bits, unsigned ignore, NCURSES_CONST char *sgr, NCURSES_CONST char *sgr0) { - static const char sample[] = "abcdefghijklm"; - static char params[] = "SURBDBIPA"; + static NCURSES_CONST char sample[] = "abcdefghijklm"; + static NCURSES_CONST char params[] = "SURBDBIPA"; unsigned n; printf("%4u ", bits); @@ -177,12 +180,11 @@ one_bit(unsigned a, unsigned b) static void brute_force(const char *name) { - unsigned count; - char *my_sgr; - char *my_sgr0; - char *my_bold; - char *my_revs; - char *my_smso; + NCURSES_CONST char *my_sgr; + NCURSES_CONST char *my_sgr0; + NCURSES_CONST char *my_bold; + NCURSES_CONST char *my_revs; + NCURSES_CONST char *my_smso; char *my_name = strdup(name); if (db_list) { @@ -219,6 +221,7 @@ brute_force(const char *name) unsigned ignore = 0; unsigned reason = 0; unsigned repeat = 0; + unsigned count; for (count = 0; count < MAXSGR; ++count) { values[count] = tparm(my_sgr, BITS2P(1), @@ -230,20 +233,20 @@ brute_force(const char *name) BITS2P(7), BITS2P(8), BITS2P(9)); - if (values[count] != 0) { + if (values[count] != NULL) { values[count] = strdup(values[count]); } } for (count = 0; count < MAXSGR; ++count) { - if (values[count] != 0) { + if (values[count] != NULL) { for (j = count + 1; j < MAXSGR; ++j) { - if (values[j] == 0) + if (values[j] == NULL) continue; if (strcmp(values[count], values[j])) continue; if (one_bit(count, j)) { free(values[j]); - values[j] = 0; + values[j] = NULL; } } } @@ -253,7 +256,7 @@ brute_force(const char *name) for (count = 0; count < MAXSGR; ++count) { if ((count & mask) != 0) continue; - if (values[count] != 0 && values[count + mask] != 0) { + if (values[count] != NULL && values[count + mask] != NULL) { mask = 0; break; } @@ -272,14 +275,14 @@ brute_force(const char *name) } } for (count = 0; count < MAXSGR; ++count) { - if (values[count] != 0) { + if (values[count] != NULL) { bool found = FALSE; if ((repeat & MASK_SMSO) != 0 && (count & MASK_SMSO) != 0) { found = TRUE; } else { for (j = 0; j < count; ++j) { - if (values[j] != 0 && !strcmp(values[j], values[count])) { + if (values[j] != NULL && !strcmp(values[j], values[count])) { if ((repeat & MASK_SMSO) != 0 && (j & MASK_SMSO) != 0 && (count & reason) != 0) { @@ -334,7 +337,7 @@ int main(int argc, char *argv[]) { int ch; - char *name; + const char *name; while ((ch = getopt(argc, argv, OPTS_COMMON "d:e:nq")) != -1) { switch (ch) { @@ -366,10 +369,10 @@ main(int argc, char *argv[]) for (n = optind; n < argc; ++n) { brute_force(argv[n]); } - } else if ((name = getenv("TERM")) != 0) { + } else if ((name = getenv("TERM")) != NULL) { brute_force(name); } else { - static char dumb[] = "dumb"; + static const char dumb[] = "dumb"; brute_force(dumb); } diff --git a/test/test_tparm.c b/test/test_tparm.c index c242ff68..1d87b0d9 100644 --- a/test/test_tparm.c +++ b/test/test_tparm.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020-2021,2022 Thomas E. Dickey * + * Copyright 2020-2024,2025 Thomas E. Dickey * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -29,18 +29,34 @@ /* * Author: Thomas E. Dickey * - * $Id: test_tparm.c,v 1.24 2022/12/10 23:23:27 tom Exp $ + * $Id: test_tparm.c,v 1.44 2025/02/15 15:42:37 tom Exp $ * - * Exercise tparm, either for all possible capabilities with fixed parameters, - * or one capability with all possible parameters. - * - * TODO: incorporate tic.h and _nc_tparm_analyze - * TODO: optionally test tiparm - * TODO: add checks/logic to handle "%s" in tparm + * Exercise tparm/tiparm, either for all possible capabilities with fixed + * parameters, or one capability with specific combinations of parameters. */ #define USE_TINFO #include +#if NCURSES_XNAMES +#if HAVE_TERM_ENTRY_H +#include +#else +#undef NCURSES_XNAMES +#define NCURSES_XNAMES 0 +#endif +#endif + +#define MAX_PARM 9 + +#define GrowArray(array,limit,length) \ + if (length + 2 >= limit) { \ + limit *= 2; \ + array = typeRealloc(char *, limit, array); \ + if (array == NULL) { \ + failed("no memory: " #array); \ + } \ + } + static GCC_NORETURN void failed(const char *); static void @@ -56,6 +72,14 @@ static int a_opt; static int p_opt; static int v_opt; +#if HAVE_TIPARM +static int i_opt; +#endif + +#if HAVE_TIPARM_S +static int s_opt; +#endif + /* * Total tests (and failures): */ @@ -83,11 +107,11 @@ output_func(int ch) } static int -isNumeric(char *source) +isNumeric(NCURSES_CONST char *source) { - char *next = 0; + char *next = NULL; long value = strtol(source, &next, 0); - int result = (next == 0 || next == source || *next != '\0') ? 0 : 1; + int result = (next == NULL || next == source || *next != '\0') ? 0 : 1; (void) value; return result; } @@ -97,10 +121,10 @@ relevant(const char *name, const char *value) { int code = 1; if (VALID_STRING(value)) { - if (strstr(value, "%p") == 0 - && strstr(value, "%d") == 0 - && strstr(value, "%s") == 0 - && (!p_opt || strstr(value, "$<") == 0)) { + if (strstr(value, "%p") == NULL + && strstr(value, "%d") == NULL + && strstr(value, "%s") == NULL + && (!p_opt || strstr(value, "$<") == NULL)) { if (v_opt > 2) printf("? %s noparams\n", name); code = 0; @@ -119,13 +143,13 @@ relevant(const char *name, const char *value) } static int -increment(int *all_parms, int *num_parms, int len_parms, int end_parms) +increment(long *all_parms, int *num_parms, int len_parms, int end_parms) { int rc = 0; int n; - if (len_parms > 9) - len_parms = 9; + if (len_parms > MAX_PARM) + len_parms = MAX_PARM; if (end_parms < len_parms) { if (all_parms[end_parms]++ >= num_parms[end_parms]) { @@ -143,38 +167,187 @@ increment(int *all_parms, int *num_parms, int len_parms, int end_parms) return rc; } +/* parse the format string to determine which positional parameters + * are assumed to be strings. + */ +#if HAVE_TISCAN_S +static int +analyze_format(const char *format, int *mask, char **p_is_s) +{ + int arg_count; + int arg_mask; + int n; + if (tiscan_s(&arg_count, &arg_mask, format) == OK) { + *mask = arg_mask; + for (n = 0; n < MAX_PARM; ++n) { + static char dummy[1]; + p_is_s[n] = (arg_mask & 1) ? dummy : NULL; + arg_mask >>= 1; + } + } else { + *mask = 0; + arg_count = 0; + for (n = 0; n < MAX_PARM; ++n) { + p_is_s[n] = NULL; + } + } + return arg_count; +} +#elif HAVE__NC_TPARM_ANALYZE +extern int _nc_tparm_analyze(TERMINAL *, const char *, char **, int *); + +static int +analyze_format(const char *format, int *mask, char **p_is_s) +{ + int popcount = 0; + int analyzed = _nc_tparm_analyze(cur_term, format, p_is_s, &popcount); + int n; + if (analyzed < popcount) { + analyzed = popcount; + } + *mask = 0; + for (n = 0; n < MAX_PARM; ++n) { + if (p_is_s[n]) + *mask |= (1 << n); + } + return analyzed; +} +#else +/* TODO: make this work without direct use of ncurses internals. */ +static int +analyze_format(const char *format, int *mask, char **p_is_s) +{ + int n; + char *filler = strstr(format, "%s"); + *mask = 0; + for (n = 0; n < MAX_PARM; ++n) { + p_is_s[n] = filler; + } + return n; +} +#endif + +#define NumStr(n) use_strings[n] \ + ? (long) (my_intptr_t) (number[n] \ + ? string[n] \ + : NULL) \ + : number[n] + +#define NS_0(fmt) fmt +#define NS_1(fmt) NS_0(fmt), NumStr(0) +#define NS_2(fmt) NS_1(fmt), NumStr(1) +#define NS_3(fmt) NS_2(fmt), NumStr(2) +#define NS_4(fmt) NS_3(fmt), NumStr(3) +#define NS_5(fmt) NS_4(fmt), NumStr(4) +#define NS_6(fmt) NS_5(fmt), NumStr(5) +#define NS_7(fmt) NS_6(fmt), NumStr(6) +#define NS_8(fmt) NS_7(fmt), NumStr(7) +#define NS_9(fmt) NS_8(fmt), NumStr(8) + static void -test_tparm(const char *name, const char *format, int *number) +test_tparm(const char *name, NCURSES_CONST char *format, long *number, char **string) { - char *result = tparm(format, - number[0], - number[1], - number[2], - number[3], - number[4], - number[5], - number[6], - number[7], - number[8]); + char *use_strings[MAX_PARM]; + char *result = NULL; + int nparam; + int mask; + + nparam = analyze_format(format, &mask, use_strings); +#if HAVE_TIPARM_S + if (s_opt) { + switch (nparam) { + case 0: + result = tiparm_s(0, mask, NS_0(format)); + break; + case 1: + result = tiparm_s(1, mask, NS_1(format)); + break; + case 2: + result = tiparm_s(2, mask, NS_2(format)); + break; + case 3: + result = tiparm_s(3, mask, NS_3(format)); + break; + case 4: + result = tiparm_s(4, mask, NS_4(format)); + break; + case 5: + result = tiparm_s(5, mask, NS_5(format)); + break; + case 6: + result = tiparm_s(6, mask, NS_6(format)); + break; + case 7: + result = tiparm_s(7, mask, NS_7(format)); + break; + case 8: + result = tiparm_s(8, mask, NS_8(format)); + break; + case 9: + result = tiparm_s(9, mask, NS_9(format)); + break; + } + } else +#endif +#if HAVE_TIPARM + if (i_opt) { + switch (nparam) { + case 0: + result = tiparm(NS_0(format)); + break; + case 1: + result = tiparm(NS_1(format)); + break; + case 2: + result = tiparm(NS_2(format)); + break; + case 3: + result = tiparm(NS_3(format)); + break; + case 4: + result = tiparm(NS_4(format)); + break; + case 5: + result = tiparm(NS_5(format)); + break; + case 6: + result = tiparm(NS_6(format)); + break; + case 7: + result = tiparm(NS_7(format)); + break; + case 8: + result = tiparm(NS_8(format)); + break; + case 9: + result = tiparm(NS_9(format)); + break; + } + } else +#endif + result = tparm(NS_9(format)); total_tests++; if (result != NULL) { tputs(result, 1, output_func); } else { total_fails++; } - if (v_opt > 1) - printf(".. %2d = %2d %2d %2d %2d %2d %2d %2d %2d %2d %s\n", - result != 0 ? (int) strlen(result) : -1, - number[0], - number[1], - number[2], - number[3], - number[4], - number[5], - number[6], - number[7], - number[8], - name); + if (v_opt > 1) { + int n; + printf(".. %3d =", result != NULL ? (int) strlen(result) : -1); + for (n = 0; n < nparam; ++n) { + if (use_strings[n]) { + if (number[n]) { + printf(" \"%s\"", string[n]); + } else { + printf(" ?"); + } + } else { + printf(" %2ld", number[n]); + } + } + printf(" %s\n", name); + } } static void @@ -192,8 +365,14 @@ usage(int ok) ," to read a list from standard-input" ," -a test all combinations of parameters" ," [value1...] forms a vector of maximum parameter-values." +#if HAVE_TIPARM + ," -i test tiparm rather than tparm" +#endif ," -p test capabilities with no parameters but having padding" ," -r NUM repeat tests NUM times" +#if HAVE_TIPARM_S + ," -s test tiparm_s rather than tparm" +#endif ," -v show values and results" }; unsigned n; @@ -219,19 +398,22 @@ main(int argc, char *argv[]) int r_run, t_run, n_run; char *old_term = getenv("TERM"); int r_opt = 1; - char *t_opt = 0; + char *t_opt = NULL; + int std_caps = 0; /* predefine items in all_caps[] */ int len_caps = 0; /* cur # of items in all_caps[] */ int max_caps = 10; /* max # of items in all_caps[] */ char **all_caps = typeCalloc(char *, max_caps); - int all_parms[10]; /* workspace for "-a" option */ + long all_parms[10]; /* workspace for "-a" option */ int len_terms = 0; /* cur # of items in all_terms[] */ int max_terms = 10; /* max # of items in all_terms[] */ char **all_terms = typeCalloc(char *, max_terms); int use_caps; + int max_name = 10; /* max # of items in cap_name[] */ + int max_data = 10; /* max # of items in cap_data[] */ char **cap_name; char **cap_data; @@ -241,10 +423,13 @@ main(int argc, char *argv[]) char **str_parms = typeCalloc(char *, max_parms); long use_parms = 1; - if (all_caps == 0 || all_terms == 0 || num_parms == 0 || str_parms == 0) + if (all_caps == NULL + || all_terms == NULL + || num_parms == NULL + || str_parms == NULL) failed("no memory"); - while ((ch = getopt(argc, argv, OPTS_COMMON "T:apr:v")) != -1) { + while ((ch = getopt(argc, argv, OPTS_COMMON "T:aipr:sv")) != -1) { switch (ch) { case 'T': t_opt = optarg; @@ -252,12 +437,22 @@ main(int argc, char *argv[]) case 'a': ++a_opt; break; +#if HAVE_TIPARM + case 'i': + ++i_opt; + break; +#endif case 'p': ++p_opt; break; case 'r': r_opt = atoi(optarg); break; +#if HAVE_TIPARM_S + case 's': + ++s_opt; + break; +#endif case 'v': ++v_opt; break; @@ -287,7 +482,7 @@ main(int argc, char *argv[]) */ while (optind < argc) { if (isNumeric(argv[optind])) { - char *dummy = 0; + char *dummy = NULL; long value = strtol(argv[optind], &dummy, 0); num_parms[len_parms] = (int) value; } @@ -312,11 +507,11 @@ main(int argc, char *argv[]) * Make a list of values for $TERM. Accept "-" for standard input to * simplify scripting a check of the whole database. */ - old_term = strdup((old_term == 0) ? "unknown" : old_term); - if (t_opt != 0) { + old_term = strdup((old_term == NULL) ? "unknown" : old_term); + if (t_opt != NULL) { if (!strcmp(t_opt, "-")) { char buffer[BUFSIZ]; - while (fgets(buffer, sizeof(buffer) - 1, stdin) != 0) { + while (fgets(buffer, sizeof(buffer) - 1, stdin) != NULL) { char *s = buffer; char *t; while (isspace(UChar(s[0]))) @@ -328,20 +523,20 @@ main(int argc, char *argv[]) if (len_terms + 2 >= max_terms) { max_terms *= 2; all_terms = typeRealloc(char *, max_terms, all_terms); - if (all_terms == 0) + if (all_terms == NULL) failed("no memory: all_terms"); } all_terms[len_terms++] = s; } } else { char *s = t_opt; - char *t; - while ((t = strtok(s, ",")) != 0) { - s = 0; + NCURSES_CONST char *t; + while ((t = strtok(s, ",")) != NULL) { + s = NULL; if (len_terms + 2 >= max_terms) { max_terms *= 2; all_terms = typeRealloc(char *, max_terms, all_terms); - if (all_terms == 0) + if (all_terms == NULL) failed("no memory: all_terms"); } all_terms[len_terms++] = strdup(t); @@ -350,7 +545,7 @@ main(int argc, char *argv[]) } else { all_terms[len_terms++] = strdup(old_term); } - all_terms[len_terms] = 0; + all_terms[len_terms] = NULL; if (v_opt) { printf("%d term%s:\n", PLURAL(len_terms)); if (v_opt > 3) { @@ -369,14 +564,8 @@ main(int argc, char *argv[]) */ if (len_caps == 0) { #if defined(HAVE_CURSES_DATA_BOOLNAMES) || defined(DECL_CURSES_DATA_BOOLNAMES) - for (n = 0; strnames[n] != 0; ++n) { - if (len_caps + 2 >= max_caps) { - max_caps *= 2; - all_caps = typeRealloc(char *, max_caps, all_caps); - if (all_caps == 0) { - failed("no memory: all_caps"); - } - } + for (n = 0; strnames[n] != NULL; ++n) { + GrowArray(all_caps, max_caps, len_caps); all_caps[len_caps++] = strdup(strnames[n]); } #else @@ -384,7 +573,8 @@ main(int argc, char *argv[]) all_caps[len_caps++] = strdup("sgr"); #endif } - all_caps[len_caps] = 0; + std_caps = len_caps; + all_caps[len_caps] = NULL; if (v_opt) { printf("%d name%s%s\n", PLURAL(len_caps), COLONS(len_caps)); if (v_opt > 3) { @@ -394,8 +584,8 @@ main(int argc, char *argv[]) } } - cap_name = typeMalloc(char *, len_caps); - cap_data = typeMalloc(char *, len_caps); + cap_name = typeMalloc(char *, (max_name = 1 + len_caps)); + cap_data = typeMalloc(char *, (max_data = 1 + len_caps)); if (r_opt <= 0) r_opt = 1; @@ -413,6 +603,20 @@ main(int argc, char *argv[]) if (setupterm(all_terms[t_run], fileno(stdout), &errs) != OK) { printf("** skipping %s (errs:%d)\n", all_terms[t_run], errs); } +#if NCURSES_XNAMES + len_caps = std_caps; + if (cur_term) { + NCURSES_CONST TERMTYPE *term = (TERMTYPE *) cur_term; + for (n = STRCOUNT; n < NUM_STRINGS(term); ++n) { + GrowArray(all_caps, max_caps, len_caps); + GrowArray(cap_name, max_name, len_caps); + GrowArray(cap_data, max_data, len_caps); + all_caps[len_caps++] = strdup(ExtStrname(term, (int) n, strnames)); + } + } +#else + (void) std_caps; +#endif /* * Most of the capabilities have no parameters, e.g., they are @@ -430,7 +634,7 @@ main(int argc, char *argv[]) } if (v_opt) { - printf("[%d:%d] %d cap%s * %ld param%s \"%s\"\n", + printf("[%d:%d] %d parameterized cap%s * %ld test-case%s \"%s\"\n", r_run + 1, r_opt, PLURAL(use_caps), PLURAL(use_parms), @@ -442,17 +646,28 @@ main(int argc, char *argv[]) /* for each combination of values */ do { for (n_run = 0; n_run < use_caps; ++n_run) { - test_tparm(cap_name[n_run], cap_data[n_run], all_parms); + test_tparm(cap_name[n_run], + cap_data[n_run], + all_parms, + str_parms); } } while (increment(all_parms, num_parms, len_parms, 0)); } else { /* for the given values */ for (n_run = 0; n_run < use_caps; ++n_run) { - test_tparm(cap_name[n_run], cap_data[n_run], all_parms); + test_tparm(cap_name[n_run], + cap_data[n_run], + all_parms, + str_parms); } } - if (cur_term != 0) { +#if NCURSES_XNAMES + for (n = std_caps; n < len_caps; ++n) { + free(all_caps[n]); + } +#endif + if (cur_term != NULL) { del_curterm(cur_term); } else { printf("? no cur_term\n"); @@ -470,7 +685,7 @@ main(int argc, char *argv[]) printf(NUMFORM " printable\n", total_print); printf(NUMFORM " total\n", total_nulls + total_ctrls + total_print); #if NO_LEAKS - for (n = 0; n < len_caps; ++n) { + for (n = 0; n < std_caps; ++n) { free(all_caps[n]); } free(all_caps); diff --git a/test/test_vid_puts.c b/test/test_vid_puts.c index 0d7d7abb..620aea74 100644 --- a/test/test_vid_puts.c +++ b/test/test_vid_puts.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020-2021,2022 Thomas E. Dickey * + * Copyright 2020-2022,2024 Thomas E. Dickey * * Copyright 2013-2014,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: test_vid_puts.c,v 1.17 2022/12/10 22:28:50 tom Exp $ + * $Id: test_vid_puts.c,v 1.18 2024/12/07 23:03:19 tom Exp $ * * Demonstrate the vid_puts and vid_attr functions. * Thomas Dickey - 2013/01/12 @@ -63,7 +63,7 @@ outs(const char *s) static void cleanup(void) { - if (cur_term != 0) { + if (cur_term != NULL) { outs(exit_attribute_mode); if (!outs(orig_colors)) outs(orig_pair); diff --git a/test/test_vidputs.c b/test/test_vidputs.c index 31dc9da4..9a87642a 100644 --- a/test/test_vidputs.c +++ b/test/test_vidputs.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020-2021,2022 Thomas E. Dickey * + * Copyright 2020-2022,2024 Thomas E. Dickey * * Copyright 2013-2014,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: test_vidputs.c,v 1.15 2022/12/10 23:23:27 tom Exp $ + * $Id: test_vidputs.c,v 1.17 2024/12/07 22:53:07 tom Exp $ * * Demonstrate the vidputs and vidattr functions. * Thomas Dickey - 2013/01/12 @@ -51,7 +51,7 @@ TPUTS_PROTO(outc, c) } static bool -outs(const char *s) +outs(NCURSES_CONST char *s) { if (VALID_STRING(s)) { tputs(s, 1, outc); @@ -63,7 +63,7 @@ outs(const char *s) static void cleanup(void) { - if (cur_term != 0) { + if (cur_term != NULL) { outs(exit_attribute_mode); if (!outs(orig_colors)) outs(orig_pair); diff --git a/test/testcurs.c b/test/testcurs.c index a1dc51ac..da39bbf5 100644 --- a/test/testcurs.c +++ b/test/testcurs.c @@ -6,7 +6,7 @@ * wrs(5/28/93) -- modified to be consistent (perform identically) with either * PDCurses or under Unix System V, R4 * - * $Id: testcurs.c,v 1.57 2022/12/10 23:35:36 tom Exp $ + * $Id: testcurs.c,v 1.60 2024/12/07 22:53:07 tom Exp $ */ #include @@ -245,18 +245,18 @@ inputTest(WINDOW *win) wclrtobot(win); if (c >= KEY_MIN) wprintw(win, "Key Pressed: %s", keyname(c)); - else if (isprint(c)) + else if (isprint(UChar(c))) wprintw(win, "Key Pressed: %c", c); else wprintw(win, "Key Pressed: %s", unctrl(UChar(c))); #ifdef KEY_MOUSE if (c == KEY_MOUSE) { #if defined(NCURSES_MOUSE_VERSION) -#define ButtonChanged(n) ((event.bstate) & NCURSES_MOUSE_MASK(1, 037)) -#define ButtonPressed(n) ((event.bstate) & NCURSES_MOUSE_MASK(1, NCURSES_BUTTON_PRESSED)) -#define ButtonDouble(n) ((event.bstate) & NCURSES_MOUSE_MASK(1, NCURSES_DOUBLE_CLICKED)) -#define ButtonTriple(n) ((event.bstate) & NCURSES_MOUSE_MASK(1, NCURSES_TRIPLE_CLICKED)) -#define ButtonRelease(n) ((event.bstate) & NCURSES_MOUSE_MASK(1, NCURSES_BUTTON_RELEASED)) +#define ButtonChanged(n) ((event.bstate) & NCURSES_MOUSE_MASK(n, (NCURSES_BUTTON_RELEASED|NCURSES_BUTTON_PRESSED|NCURSES_BUTTON_CLICKED|NCURSES_DOUBLE_CLICKED|NCURSES_TRIPLE_CLICKED|NCURSES_RESERVED_EVENT))) +#define ButtonPressed(n) ((event.bstate) & NCURSES_MOUSE_MASK(n, NCURSES_BUTTON_PRESSED)) +#define ButtonDouble(n) ((event.bstate) & NCURSES_MOUSE_MASK(n, NCURSES_DOUBLE_CLICKED)) +#define ButtonTriple(n) ((event.bstate) & NCURSES_MOUSE_MASK(n, NCURSES_TRIPLE_CLICKED)) +#define ButtonRelease(n) ((event.bstate) & NCURSES_MOUSE_MASK(n, NCURSES_BUTTON_RELEASED)) MEVENT event; int button = 0; @@ -488,14 +488,14 @@ outputTest(WINDOW *win) *Buffer = 0; scanw("%s", Buffer); - if (TIGETSTR("cvvis", "vs") != 0) { + if (TIGETSTR("cvvis", "vs") != NULL) { wclear(win); curs_set(2); MvWAddStr(win, 1, 1, "The cursor should appear as a block (visible)"); Continue(win); } - if (TIGETSTR("civis", "vi") != 0) { + if (TIGETSTR("civis", "vi") != NULL) { wclear(win); curs_set(0); MvWAddStr(win, 1, 1, @@ -503,7 +503,7 @@ outputTest(WINDOW *win) Continue(win); } - if (TIGETSTR("cnorm", "ve") != 0) { + if (TIGETSTR("cnorm", "ve") != NULL) { wclear(win); curs_set(1); MvWAddStr(win, 1, 1, "The cursor should be an underline (normal)"); @@ -592,7 +592,7 @@ padTest(WINDOW *dummy GCC_UNUSED) { WINDOW *pad; - if ((pad = newpad(50, 100)) != 0) { + if ((pad = newpad(50, 100)) != NULL) { WINDOW *spad; wattron(pad, A_REVERSE); @@ -609,7 +609,7 @@ padTest(WINDOW *dummy GCC_UNUSED) raw(); wgetch(pad); - if ((spad = subpad(pad, 12, 25, 6, 52)) != 0) { + if ((spad = subpad(pad, 12, 25, 6, 52)) != NULL) { MvWAddStr(spad, 2, 2, "This is a new subpad"); box(spad, 0, 0); delwin(spad); @@ -748,8 +748,8 @@ main(int argc, char *argv[]) keypad(stdscr, TRUE); raw(); key = getch(); - if (key < KEY_MIN && key > 0 && isalpha(key)) { - if (islower(key)) + if (key < KEY_MIN && key > 0 && isalpha(UChar(key))) { + if (islower(UChar(key))) key = toupper(key); for (n = 0; n < MAX_OPTIONS; ++n) { if (key == command[n].text[0]) { diff --git a/test/testscanw.c b/test/testscanw.c index 415250c6..ec33b06e 100644 --- a/test/testscanw.c +++ b/test/testscanw.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2019-2020,2022 Thomas E. Dickey * + * Copyright 2019-2022,2024 Thomas E. Dickey * * Copyright 1998-2002,2006 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -30,7 +30,7 @@ * Date: 1997/03/17 * From: bayern@morpheus.cis.yale.edu * - * $Id: testscanw.c,v 1.15 2022/12/11 00:10:29 tom Exp $ + * $Id: testscanw.c,v 1.16 2024/10/05 19:27:33 tom Exp $ */ #include @@ -85,7 +85,7 @@ main(int argc, char *argv[]) curses_trace(TRACE_UPDATE | TRACE_CALLS); #endif while (optind < argc) { - char *token = argv[optind++]; + const char *token = argv[optind++]; if (isdigit(UChar(*token))) move(atoi(token), 0); else if (!strcmp(token, "k+")) diff --git a/test/view.c b/test/view.c index 72e0cfbb..f2444e8e 100644 --- a/test/view.c +++ b/test/view.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2019-2021,2022 Thomas E. Dickey * + * Copyright 2019-2022,2024 Thomas E. Dickey * * Copyright 1998-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -52,7 +52,7 @@ * scroll operation worked, and the refresh() code only had to do a * partial repaint. * - * $Id: view.c,v 1.145 2022/12/04 00:40:11 tom Exp $ + * $Id: view.c,v 1.150 2024/12/07 22:53:07 tom Exp $ */ #include @@ -93,8 +93,7 @@ ch_len(NCURSES_CH_T *src) #if USE_WIDEC_SUPPORT for (;;) { - int count; - TEST_CCHAR(src, count, { + TEST_CCHAR(src, { int len = wcwidth(test_wch[0]); result += (len > 0) ? len : 1; ++src; @@ -115,7 +114,7 @@ finish(int sig) { endwin(); #if NO_LEAKS - if (vec_lines != 0) { + if (vec_lines != NULL) { int n; for (n = 0; n < num_lines; ++n) { free(vec_lines[n]); @@ -173,7 +172,7 @@ show_all(const char *tag) move(i, 0); printw("%*d:", digits, actual); clrtoeol(); - if ((s = lptr[i - 1]) == 0) { + if ((s = lptr[i - 1]) == NULL) { continue; } len = ch_len(s); @@ -186,12 +185,10 @@ show_all(const char *tag) */ { int j; - int width = 1; + int width; for (j = actual = 0; j < shift; ++j) { - int count; - - TEST_CCHAR(s + j, count, { + TEST_CCHAR(s + j, { width = wcwidth(test_wch[0]); } , { @@ -236,7 +233,7 @@ read_file(const char *filename) size_t len; struct stat sb; char *my_blob; - char **my_vec = 0; + char **my_vec = NULL; WINDOW *my_win; if (stat(filename, &sb) != 0 @@ -248,11 +245,11 @@ read_file(const char *filename) failed("input is empty"); } - if ((fp = fopen(filename, "r")) == 0) { + if ((fp = fopen(filename, "r")) == NULL) { failed("cannot open input-file"); } - if ((my_blob = malloc((size_t) sb.st_size + 1)) == 0) { + if ((my_blob = malloc((size_t) sb.st_size + 1)) == NULL) { failed("cannot allocate memory for input-file"); } @@ -283,7 +280,7 @@ read_file(const char *filename) } num_lines = k; if (pass == 0) { - if (((my_vec = typeCalloc(char *, (size_t) k + 2)) == 0)) { + if (((my_vec = typeCalloc(char *, (size_t) k + 2)) == NULL)) { failed("cannot allocate line-vector #1"); } } else { @@ -294,7 +291,7 @@ read_file(const char *filename) #if USE_WIDEC_SUPPORT if (!memcmp("\357\273\277", my_blob, 3)) { - char *s = my_blob + 3; + const char *s = my_blob + 3; char *d = my_blob; Trace(("trim BOM")); do { @@ -310,11 +307,11 @@ read_file(const char *filename) } width = (width + 1) * 5; my_win = newwin(2, width, 0, 0); - if (my_win == 0) { + if (my_win == NULL) { failed("cannot allocate temporary window"); } - if ((vec_lines = typeCalloc(NCURSES_CH_T *, (size_t) num_lines + 2)) == 0) { + if ((vec_lines = typeCalloc(NCURSES_CH_T *, (size_t) num_lines + 2)) == NULL) { failed("cannot allocate line-vector #2"); } @@ -329,7 +326,7 @@ read_file(const char *filename) char *s; int y, x; #if USE_WIDEC_SUPPORT - char *last = my_vec[k] + (int) strlen(my_vec[k]); + const char *last = my_vec[k] + (int) strlen(my_vec[k]); wchar_t wch[2]; size_t rc; #ifndef state_unused @@ -361,7 +358,7 @@ read_file(const char *filename) x = width - 1; wmove(my_win, 0, 0); /* "x + 1" works with standard curses; some implementations are buggy */ - if ((vec_lines[k] = typeCalloc(NCURSES_CH_T, x + width + 1)) == 0) { + if ((vec_lines[k] = typeCalloc(NCURSES_CH_T, x + width + 1)) == NULL) { failed("cannot allocate line-vector #3"); } #if USE_WIDEC_SUPPORT @@ -385,15 +382,15 @@ usage(int ok) ,"" ,USAGE_COMMON ,"Options:" - ," -c use color if terminal supports it" + ," -C use color if terminal supports it" ," -i ignore INT, QUIT, TERM signals" #if USE_WIDEC_SUPPORT ," -n use waddch (bytes) rather then wadd_wch (wide-chars)" #endif - ," -s start in single-step mode, waiting for input" + ," -s start in single-step mode" #ifdef TRACE ," -t trace screen updates" - ," -T NUM specify trace mask" + ," -D NUM specify trace mask" #endif }; size_t n; @@ -408,7 +405,7 @@ VERSION_COMMON() int main(int argc, char *argv[]) { - static const char *help[] = + static NCURSES_CONST char *help[] = { "Commands:", " q,^Q,ESC - quit this program", @@ -430,7 +427,7 @@ main(int argc, char *argv[]) " s - use entered count for halfdelay() parameter", " - if no entered count, stop nodelay()", " - begin nodelay()", - 0 + NULL }; int ch; @@ -446,9 +443,9 @@ main(int argc, char *argv[]) setlocale(LC_ALL, ""); - while ((ch = getopt(argc, argv, OPTS_COMMON "cinstT:")) != -1) { + while ((ch = getopt(argc, argv, OPTS_COMMON "CD:inst")) != -1) { switch (ch) { - case 'c': + case 'C': try_color = TRUE; break; case 'i': @@ -463,11 +460,11 @@ main(int argc, char *argv[]) single_step = TRUE; break; #ifdef TRACE - case 'T': + case 'D': { - char *next = 0; + char *next = NULL; int tvalue = (int) strtol(optarg, &next, 0); - if (tvalue < 0 || (next != 0 && *next != 0)) + if (tvalue < 0 || (next != NULL && *next != 0)) usage(FALSE); curses_trace((unsigned) tvalue); } @@ -659,7 +656,7 @@ main(int argc, char *argv[]) beep(); break; } - if (c >= KEY_MIN || (c > 0 && !isdigit(c))) { + if (c >= KEY_MIN || (c > 0 && !isdigit(UChar(c)))) { got_number = FALSE; value = 0; } diff --git a/test/widechars.h b/test/widechars.h index 2578a925..fe38243b 100644 --- a/test/widechars.h +++ b/test/widechars.h @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018,2020 Thomas E. Dickey * + * Copyright 2018-2020,2024 Thomas E. Dickey * * Copyright 2012 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -34,7 +34,7 @@ #if USE_WIDEC_SUPPORT -#if defined(_NC_WINDOWS) && !defined(_MSC_VER) && !defined(EXP_WIN32_DRIVER) +#if defined(_NC_MINGW) /* * MinGW has wide-character functions, but they do not work correctly. */ diff --git a/test/worm.c b/test/worm.c index 7c4842e4..d0832247 100644 --- a/test/worm.c +++ b/test/worm.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2020,2022 Thomas E. Dickey * + * Copyright 2018-2022,2024 Thomas E. Dickey * * Copyright 1998-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -53,7 +53,7 @@ traces will be dumped. The program stops and waits for one character of input at the beginning and end of the interval. - $Id: worm.c,v 1.89 2022/12/24 20:46:49 tom Exp $ + $Id: worm.c,v 1.93 2024/11/30 18:53:39 tom Exp $ */ #include @@ -119,9 +119,6 @@ pthread_mutex_t pending_mutex; #define Locked(statement) statement #endif -#ifdef TRACE -static int generation, trace_start, trace_end; -#endif /* TRACE */ /* *INDENT-OFF* */ static const struct options { int nopts; @@ -463,11 +460,10 @@ usage(int ok) ," -d invoke use_default_colors" #endif ," -f fill screen with copies of \"WORM\" at start" - ," -l set length of worms" - ," -n set number of worms" + ," -M NUM set length of worms" + ," -n NUM set number of worms" ," -t leave trail of \".\"" #ifdef TRACE - ," -T , set trace interval" ," -N suppress cursor-movement optimization" #endif }; @@ -497,7 +493,7 @@ main(int argc, char *argv[]) setlocale(LC_ALL, ""); - while ((ch = getopt(argc, argv, OPTS_COMMON "dfl:n:tT:N")) != -1) { + while ((ch = getopt(argc, argv, OPTS_COMMON "M:Ndfn:t")) != -1) { switch (ch) { #if HAVE_USE_DEFAULT_COLORS case 'd': @@ -507,7 +503,7 @@ main(int argc, char *argv[]) case 'f': field = "WORM"; break; - case 'l': + case 'M': if ((length = atoi(optarg)) < 2 || length > MAX_LENGTH) { fprintf(stderr, "%s: Invalid length\n", *argv); usage(FALSE); @@ -523,10 +519,6 @@ main(int argc, char *argv[]) trail = '.'; break; #ifdef TRACE - case 'T': - if (sscanf(optarg, "%d,%d", &trace_start, &trace_end) != 2) - usage(FALSE); - break; case 'N': _nc_optimize_enable ^= OPTIMIZE_ALL; /* declared by ncurses */ break; @@ -631,19 +623,6 @@ main(int argc, char *argv[]) while (!done) { Locked(++sequence); if ((ch = get_input()) > 0) { -#ifdef TRACE - if (trace_start || trace_end) { - if (generation == trace_start) { - curses_trace(TRACE_CALLS); - get_input(); - } else if (generation == trace_end) { - curses_trace(0); - get_input(); - } - - generation++; - } -#endif #ifdef KEY_RESIZE if (ch == KEY_RESIZE) { diff --git a/test/xmas.c b/test/xmas.c index 9ba3a26c..6b4d386f 100644 --- a/test/xmas.c +++ b/test/xmas.c @@ -92,7 +92,7 @@ /******************************************************************************/ /* - * $Id: xmas.c,v 1.39 2022/12/04 00:40:11 tom Exp $ + * $Id: xmas.c,v 1.40 2024/12/07 22:53:07 tom Exp $ */ #include @@ -140,7 +140,7 @@ set_color(WINDOW *win, chtype color) { if (has_colors()) { int n = (int) (color + 1); - if (my_pairs == 0) + if (my_pairs == NULL) my_pairs = typeCalloc(bool, (size_t) (COLORS + 1)); if (!my_pairs[n]) { init_pair((short) n, (short) color, (short) my_bg); @@ -638,7 +638,7 @@ done(int sig GCC_UNUSED) stop_curses(); #if NO_LEAKS - if (my_pairs != 0) + if (my_pairs != NULL) free(my_pairs); #endif @@ -715,44 +715,44 @@ main(int argc, char *argv[]) } curs_set(0); - if ((treescrn = newwin(16, 27, 3, 53)) == 0 || - (treescrn2 = newwin(16, 27, 3, 53)) == 0 || - (treescrn3 = newwin(16, 27, 3, 53)) == 0 || - (treescrn4 = newwin(16, 27, 3, 53)) == 0 || - (treescrn5 = newwin(16, 27, 3, 53)) == 0 || - (treescrn6 = newwin(16, 27, 3, 53)) == 0 || - (treescrn7 = newwin(16, 27, 3, 53)) == 0 || - (treescrn8 = newwin(16, 27, 3, 53)) == 0 || + if ((treescrn = newwin(16, 27, 3, 53)) == NULL || + (treescrn2 = newwin(16, 27, 3, 53)) == NULL || + (treescrn3 = newwin(16, 27, 3, 53)) == NULL || + (treescrn4 = newwin(16, 27, 3, 53)) == NULL || + (treescrn5 = newwin(16, 27, 3, 53)) == NULL || + (treescrn6 = newwin(16, 27, 3, 53)) == NULL || + (treescrn7 = newwin(16, 27, 3, 53)) == NULL || + (treescrn8 = newwin(16, 27, 3, 53)) == NULL || - (dotdeer0 = newwin(3, 71, 0, 8)) == 0 || + (dotdeer0 = newwin(3, 71, 0, 8)) == NULL || - (stardeer0 = newwin(4, 56, 0, 8)) == 0 || + (stardeer0 = newwin(4, 56, 0, 8)) == NULL || - (lildeer0 = newwin(7, 53, 0, 8)) == 0 || - (lildeer1 = newwin(2, 4, 0, 0)) == 0 || - (lildeer2 = newwin(2, 4, 0, 0)) == 0 || - (lildeer3 = newwin(2, 4, 0, 0)) == 0 || + (lildeer0 = newwin(7, 53, 0, 8)) == NULL || + (lildeer1 = newwin(2, 4, 0, 0)) == NULL || + (lildeer2 = newwin(2, 4, 0, 0)) == NULL || + (lildeer3 = newwin(2, 4, 0, 0)) == NULL || - (middeer0 = newwin(15, 42, 0, 8)) == 0 || - (middeer1 = newwin(3, 7, 0, 0)) == 0 || - (middeer2 = newwin(3, 7, 0, 0)) == 0 || - (middeer3 = newwin(3, 7, 0, 0)) == 0 || + (middeer0 = newwin(15, 42, 0, 8)) == NULL || + (middeer1 = newwin(3, 7, 0, 0)) == NULL || + (middeer2 = newwin(3, 7, 0, 0)) == NULL || + (middeer3 = newwin(3, 7, 0, 0)) == NULL || - (bigdeer0 = newwin(10, 23, 0, 0)) == 0 || - (bigdeer1 = newwin(10, 23, 0, 0)) == 0 || - (bigdeer2 = newwin(10, 23, 0, 0)) == 0 || - (bigdeer3 = newwin(10, 23, 0, 0)) == 0 || - (bigdeer4 = newwin(10, 23, 0, 0)) == 0 || + (bigdeer0 = newwin(10, 23, 0, 0)) == NULL || + (bigdeer1 = newwin(10, 23, 0, 0)) == NULL || + (bigdeer2 = newwin(10, 23, 0, 0)) == NULL || + (bigdeer3 = newwin(10, 23, 0, 0)) == NULL || + (bigdeer4 = newwin(10, 23, 0, 0)) == NULL || - (lookdeer0 = newwin(10, 25, 0, 0)) == 0 || - (lookdeer1 = newwin(10, 25, 0, 0)) == 0 || - (lookdeer2 = newwin(10, 25, 0, 0)) == 0 || - (lookdeer3 = newwin(10, 25, 0, 0)) == 0 || - (lookdeer4 = newwin(10, 25, 0, 0)) == 0 || + (lookdeer0 = newwin(10, 25, 0, 0)) == NULL || + (lookdeer1 = newwin(10, 25, 0, 0)) == NULL || + (lookdeer2 = newwin(10, 25, 0, 0)) == NULL || + (lookdeer3 = newwin(10, 25, 0, 0)) == NULL || + (lookdeer4 = newwin(10, 25, 0, 0)) == NULL || - (w_holiday = newwin(1, 26, 3, 27)) == 0 || + (w_holiday = newwin(1, 26, 3, 27)) == NULL || - (w_del_msg = newwin(1, 19, 23, 60)) == 0) { + (w_del_msg = newwin(1, 19, 23, 60)) == NULL) { stop_curses(); fprintf(stderr, "Cannot create windows - screen too small\n"); ExitProgram(EXIT_FAILURE);