CVS log for src/lib/libcurses/getch.c

Up to [cvs.NetBSD.org] / src / lib / libcurses

Request diff between arbitrary revisions

Keyword substitution: kv
Default branch: MAIN

curse: constify define_key() argument

define_key() is ncurses extension and ncurses defines its first
argument as "const char *".  Follow suit.

PR lib/58254

Fix for PR pkg/55931
Don't move the cursor when getch is called if input is not going to
be echoed.  Lynx uses the cursor to mark the current selection in a
pop-up, previously the cursor was being relocated when getch was called
which broke the Lynx item marking.

Style fixes most for __CTRACE().

Expand __CTRACE() to __nothing #ifndef DEBUG.

Remove most of #ifdef DEBUG around __CTRACE() calls.

No binary changes, except for line numbers for assert().

Pull up following revision(s) (requested by uwe in ticket #987):

	lib/libcurses/get_wch.c: revision 1.24
	lib/libcurses/getch.c: revision 1.75

Pads are not to be automatically refreshed on input.

X/Open Curses says in the documentation for newpad():
  Automatic refreshes of pads (e.g., from scrolling or echoing of
  input) do not occur.

And in the documentation for get*():
  If the current or specified window is not a pad, and it has been
  moved or modified since the last refresh operation, then it will be
  refreshed before another character is read.

From Michael Forney in PR lib/55457

Pads are not to be automatically refreshed on input.

X/Open Curses says in the documentation for newpad():

  Automatic refreshes of pads (e.g., from scrolling or echoing of
  input) do not occur.

And in the documentation for get*():

  If the current or specified window is not a pad, and it has been
  moved or modified since the last refresh operation, then it will be
  refreshed before another character is read.

From Michael Forney in PR lib/55457

KNF nit.

Sync with HEAD

Rework previous fix for getch cursor position when cursor is moved
without refresh.  If the window is not dirty but the window cursor
position does not match curscr then move the cursor.  This fixes
the issues seen in PR lib/54263.

Back out incorrect fix for PR 53617 and fix it in a different way.
Keep track of the cursor location, if getch is called without a refresh
and without pending updates (dirty windows) then move the cursor to the
correct location directly.  Doing this prevents unnecessary refreshes.

Pull up following revision(s) (requested by rin in ticket #1686):

	lib/libcurses/get_wch.c: revision 1.21
	lib/libcurses/getch.c: revision 1.71

Rename global variable "state" to "_cursesi_state".

Until now, if application happens to have a global variable of the same
name, it was overridden by curses routines. This is the scenario in
which aspell crashes when linked to our curses, reported in pkg/44005.

We need to wipe out global/static variables like "_cursesi_state" or
"wstate" for thread safety. But it would be a future task...

XXX pullup to netbsd-8 and netbsd-7

Pull up following revision(s) (requested by rin in ticket #1214):

	lib/libcurses/get_wch.c: revision 1.21
	lib/libcurses/getch.c: revision 1.71

Rename global variable "state" to "_cursesi_state".

Until now, if application happens to have a global variable of the same
name, it was overridden by curses routines. This is the scenario in
which aspell crashes when linked to our curses, reported in pkg/44005.

We need to wipe out global/static variables like "_cursesi_state" or
"wstate" for thread safety. But it would be a future task...

XXX pullup to netbsd-8 and netbsd-7

Rename global variable "state" to "_cursesi_state".

Until now, if application happens to have a global variable of the same
name, it was overridden by curses routines. This is the scenario in
which aspell crashes when linked to our curses, reported in pkg/44005.

We need to wipe out global/static variables like "_cursesi_state" or
"wstate" for thread safety. But it would be a future task...

XXX pullup to netbsd-8 and netbsd-7

Pull up following revision(s) (requested by roy in ticket #1043):

	lib/libcurses/resize.c: revision 1.27
	lib/libcurses/get_wch.c: revision 1.19
	lib/libcurses/getch.c: revision 1.70

curses: resizeterm(3) should always send KEY_RESIZE

Fixes #53636

OK kamil@

Ssync with HEAD

curses: resizeterm(3) should always send KEY_RESIZE

Fixes #53636

OK kamil@

Pull up following revision(s) (requested by roy in ticket #1042):
	lib/libcurses/getch.c: revision 1.68
	lib/libcurses/getch.c: revision 1.69
	lib/libcurses/get_wch.c: revision 1.17
	lib/libcurses/get_wch.c: revision 1.18
	lib/libcurses/curses_private.h: revision 1.63
curses: unify resize handling in getch
Instead of testing each fgetc call for resize event, add the wrapper
__fgetc_resize to simplify the logic.
While here, ensure that get_wch uses the correct input stream which
may or may not be stdin.
curses: call resizeterm if getch issues KEY_RESIZE
This fixes PR #53633.

Pull up following revision(s) (requested by kamil in ticket #1039):

	lib/libcurses/getch.c: revision 1.66
	lib/libcurses/getch.c: revision 1.67
	lib/libcurses/tstp.c: revision 1.43
	lib/libcurses/get_wch.c: revision 1.15
	lib/libcurses/get_wch.c: revision 1.16

PR lib/53615
getch() and get_wch() should return KEY_RESIZE when interrupted by SIGWIN=
CH.

OK roy

 -

PR lib/53615
Before invoking a previous signal handler, make sure it is not SIG_*.
Fix potential crash with SIGWINCH.

OK roy

 -

Correct detecting of terminal resize in curses(3) with keypad(,TRUE)
A previous change fixed only keypad(,FALSE) scenarios.

 -

Handle catching terminal resize in INKEY_NORM and INKEY_ASSEMBLING (in the
middle of assembling a key code from passed codes) as both accept keys with
fgetc(3) and both can be in theory interrupted with a resize.

PR lib/53615

curses: call resizeterm if getch issues KEY_RESIZE

This fixes PR #53633.

curses: unify resize handling in getch

Instead of testing each fgetc call for resize event, add the wrapper
__fgetc_resize to simplify the logic.
While here, ensure that get_wch uses the correct input stream which
may or may not be stdin.

Correct detecting of terminal resize in curses(3) with keypad(,TRUE)

A previous change fixed only keypad(,FALSE) scenarios.

Handle catching terminal resize in INKEY_NORM and INKEY_ASSEMBLING (in the
middle of assembling a key code from passed codes) as both accept keys with
fgetc(3) and both can be in theory interrupted with a resize.

PR lib/53615

PR lib/53615

getch() and get_wch() should return KEY_RESIZE when interrupted by SIGWINCH.

OK roy

Sync with HEAD

Sync with HEAD

Move ESCDELAY to curses.c so all globals are close to each other.
Remove _reentrant and use ESCDELAY and TABSIZE as we're not really
reentrant.

Check _cursesi_term is set in a few places and sprinkle some static.

If either set_escdelay(3) or set_tabsize(3) are called, set _reentrant
to ensure we use the saved value for the sceen.

This effectively makes ESCDELAY and TABSIZE read-only when either
of these functions are called.

Sync with HEAD.  (Note that most of these changes are simply $NetBSD$
tag issues.)

KNF.
Normalise coding style.
White space police.
Sprinkle some extra braces to make the flow more clear.

No functional changes.

Add the set_escdelay(3) and set_tabsize(3) ncurses extensions.

Implement ncurses extension has_key.

sync with head.

Add capfile(5) to describe the termcap format.
Adjust various man pages and other documentation to point to capfile(5)
instead of termcap(5).
Remove getcap(3) as curses hasn't been building it for a long time.
Punt wrterm.c as tset no longer uses it.

Fix deleting a key definition, it did not work.  Also improve tracing
of key definition deletion.

Since limit and l are both unsigned, comparing to 0 doesn't work, so compare
the values directly.

Don't echo key symbols.

Userland now builds and uses terminfo instead of termcap.

OK: core@, jdc@

Read input from the correct FILE.

Move calls to __restore_termios() into the failing path of the functions
that fail - instead of in most of the callers.
All rather pointless if tcsetattr() fails to set the mode we want we
are very unlikely to be able to restore any later on.

Sync with HEAD.

Third (and last) commit. See http://mail-index.netbsd.org/source-changes/2009/05/13/msg221222.html

Pull up following revision(s) (requested by jdc in ticket #451):
	lib/libcurses/getch.c: revision 1.52
Fix bug where a single ESC was not recognised when in keypad() mode.
Noticed by abs@.

Fix bug where a single ESC was not recognised when in keypad() mode.
Noticed by abs@.

Add extra debugging information.

sync with HEAD

Keep pushed-back characters locally.  Fixes problems where KEY_* symbols
are pushed back.  Should fix the arrow keys part of PR pkg/37173.

While we are here, make getch() and get_wch() check for resize immediately,
instead of reading a key, checking for resize and then having to push-back
the just read key.

sync with HEAD

Fix a crash caused by having a single NULL character as a string capability.
This fix is about the best we can do given the current interfaces. We
could extend the cgetcap(3) interfaces with a function that would return
a character count and handle this in libterm which would provide a more
complete fix and allow a NULL character in a string capability.

Merge in wide curses code done as a Summer of Code project by
Ruibiao Qiu.

 * rearrange code to ensure that SET_WCOL() is called after attributes
   are copied/set.

 * fix some instances where attributes were being checked without
   masking with WA_ATTRIBUTES

 * Replace another instance of non-spacing character copying with function
   call.

Apply the changes that add debug "areas" on HEAD to the wcurses branch.
Add correspending changes to the debug code that is only present on the branch.

Add debug "areas" that allow selective debugging by setting the
"CURSES_TRACE_MASK" environment variable.  Postive vales include
debug areas, negative values exclude them.

Wide curses merge

PR/34011: Julian Coleman: Limit timeout to 25.5 seconds.

Coverity CID 1246: Don't allow getc == -1 to propagate as an array index.

Add KEY_RESIZE support and a SIGWINCH handler.
Fixes PR bin/20032.
This requires a change to KEY_MAX, which affects libform and libmenu, so we
need to change libcurses major number.

Minor style change.

Move UCB-licensed code from 4-clause to 3-clause licence.

Patches provided by Joel Baker in PR 22280, verified by myself.

Apply patch (requested by jdc in ticket #1244):

Keep the cr->nl translation state in a separate variable, so that we can
do the translation ourselves (if the tty didn't do it for us).
Add debugging to track functions that change tty state.

Add ESCDELAY variable to control the inter-key delay in escape sequences.
Fixes PR 20031 by Thomas Klausner.

Keep the cr->nl translation state in a separate variable, so that we can
do the translation ourselves (if the tty didn't do it for us).
Add debugging to track functions that change tty state.

Fixes PR 20834 by Stephen Borrill.

Fix resize of windows with subwins.
Let window size be given as a -ver number => lines from bottom.
Fix trace calls of pointers
(approved by Brett Lumn)

Increase default delay when assembling key sequences.  This seems to
eliminate the occasional non-recognition of key sequences over remote
connections.
Okayed by blymn.

Added the ncurses extensions define_key and keyok.

Remove extraneous tabs from blank lines.

* Major change to add support for the newterm/set_term functions.
* Added fix to getch.c suggested by Gabriel Rosenkoetter (thanks :-)

Remove bogus call to free(3) which caused several warning messages in
application using our "curses" library after the latest change to
memory management in the "c" library.

Fixed casting bug in array indexing, a signed char was being sign
extended when cast to unsigned, made the cast "unsigned char"

pullup 1.31 -> 1.32 (approved by releng-1-5)

>do not call wrefresh() uncondintionally from wgetch().  call it only
>when the window was touched (is_wintouched()).
>the previous behavior damaged existing applications, especially when it issues
>lots of subwindow manipulation and mvcur().
>
>it was introduced in 1.23 -> 1.24 or sometime before.

do not call wrefresh() uncondintionally from wgetch().  call it only
when the window was touched (is_wintouched()).
the previous behavior damaged existing applications, especially when it issues
lots of subwindow manipulation and mvcur().

it was introduced in 1.23 -> 1.24 or sometime before.

pullup 1.30 -> 1.31 (approved by releng-1-5)

 > free region got from t_getstr().  we will experience memory leak if
 > we call initscr() multiple times (rare, but it's better to be pedant).

pullup 1.29 -> 1.30 (approved by releng-1-5)

 > fix 8bit cleanness of getch() and wgetch().  never use char variable against
 > stdio functions which return "int" (including getchar()).
 > the bug was introduced in 1.9 -> 1.10.  fixes PR10723.

free region got from t_getstr().  we will experience memory leak if
we call initscr() multiple times (rare, but it's better to be pedant).

fix 8bit cleanness of getch() and wgetch().  never use char variable against
stdio functions which return "int" (including getchar()).
the bug was introduced in 1.9 -> 1.10.  fixes PR10723.

Send 'ks' sequence from first call to keypad(win, TRUE) only and not from
wgetch().  Don't send 'ke' sequence from keypad(win, FALSE) or wgetch().
This makes us compatible with Solaris.
Suggested by ITOH Yasufumi.

Send, if necessary, 'ks' or 'ke' sequences from keypad() and wgetch().
Fixes PR 10116.

* Made erasechar and killchar into functions
* Modified __init_getch to use termcap handle that has been allocated
  (_cursesi_genbuf) instead of refetching it.
* Make wgetstr support erase - this is not a full blown SUSv2 version
  but it is a start.

No, really, make sure ECHO is cleared in cbreak() mode too.

Add extra KEY_* definitions (from SUSv2).
Fix `gcc -Wuninitialized`.

* Fixed bug in copywin which was copying more than it should.
* Changed call to wrefresh in wgetch to be before input read.
* Changed default old cursor mode to be high vis in curs_set
* Added documentation for various new functions to fns.doc.

Fully initialize the structure allocated in new_keymap().

* Added ungetch
* Converted inkey and getch to use getchar instead of read so ungetch
  will work.

Make sure we don't read a negative character value (again).

Multiple fixes:
* Added Bill's fixes for errors when compiling with WARNS=1
* Incorporated fixes to make usage of unctrl consistent in debug and
  made improvements to ctrace - it now timestamps it's output better.
* Reduced the number of mallocs done by __init_getch by allocating key
  structs in bunches instead of singly.
* Removed the shadowing of global declarations in newwin and subwin
  functions

Add a missing __restore_termios() in an error return.
Don't display the character on curscr if the terminal has echo on :
  - doing so will break the tracking of curscr->cury|x if we've just refreshed
  a non-fullscreen window
  - with echo on, the terminal displays the character for us anyway

Added functions to replace what were previously macros in curses.h
(this is a requirement of SUSv2) - the old macro behaviour can be
restored by defining _CURSES_USE_MACROS.
Changed function prototypes to use ANSI style.
All externally visible functions now have ANSI style declarations.

Make sure we don't read a negative character value.

Made data structures opaque

Handle characters with top bit set.

Changes to make libcurses SUS v2 compatible.

Pull up to last week's -current.

Only unctrl() the first 256 input values.

This and the previous curses patches were from Brett Lymn.

Get rid of the evil trailing spaces and tabs.

Make a few private variables and functions static.

Re-arrange some code to approach our regular style.

Hang on to the termcap buffer that we have tgetent() fill.
 (someone ows me two hours worth of beer for this... :-)

Upgrades the standard NetBSD curses library to provide some
of the SYSV curses facilities.  The added features are the collapsing
of arrow and function keysequences (as defined by termcap for the
terminal) into symbolic code returns thus relieving the application of
recognising multi-character key sequences.  Other features are the
capability to perform a timed wait for a key (good for when you are
not sure if there is a keypress ready or not) and the capability for
turning off the inter-key timeout when assembling multi-character
function keys.

this work was done by Julian Coleman <J.D.Coleman@newcastle.ac.uk>
and blymn@baea.com.au (Brett Lymn).  i'm just integrating it.  thanks
HEAPS guys!

remove obsolete register declarations

RCSid police, fix warnings

clean up import

file getch.c was added on branch netbsd-1-0 on 1994-08-17 21:52:18 +0000

clean up import

new libcurses, from new nvi

repeat after me: "I hate rcs ids"

update to new version from berkeley.  doesn't compile yet, nor
does it have rcsid's.  this is for diffs.

New version from uunet.

Add RCS identifiers.

added Andrew Chernov's patch set:
Standard curses library use eight bit for standout mode, so
8-bit characters displays like highlighted 7-bit characters.

This patch produce library which is fully compatible with all curses
programs and add 8-bit chars to all input/display functions.
---
I don't think, that any programs wish to use internal curses
attribute _STANDOUT directly, in expressions like:
        addch( ch | _STANDOUT );
        Normal interface use standout() and standend() functions instead.
        Many programs use 'char' type (with sign extention) for input characters
        and sign extention becomes _STANDOUT mode in this case.
        So, I refuse this future and allow 8-bit characters for programs,
        which is designed for 7-bit only ('char' type using instead of
        'unsigned char').
---
This small patch fix unpleasant standard curses bug:
curses can't expand TAB at all (but tries).
A man who wrote this curses misplace SYNC_IN and SYNCH_OUT,
this patch exchange macro calls.

This patch useful for standard 7-bit curses too, for this
you must delete '_' symbol before waddbytes and apply patch.
---
Oh, NO! This curses are really buggy!

This small patch fix following problem:
[ assumed scrollok(stdscr, TRUE) ]
when addch(ch) at lower right corner of screen, curses are realy
gone mad instead if simple scrolling... Curses code assumed that
this will be done correctly, but implement it with two bugs.

initial import of 386bsd-0.1 sources

Initial revision