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

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

Request diff between arbitrary revisions

Keyword substitution: kv
Default branch: MAIN

Sprinkle about some cycle wasting checks for the win pointer being
null.  Unfortunately, ncurses does this and there is some sloppy code
out there that relies on the check resulting in segfaults in
NetBSD curses which then, of course, gets blamed for the error.

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

	lib/libcurses/get_wch.c: revision 1.27

Check for returning ERR to avoid negative array index later (CID-1617248)

Check for returning ERR to avoid negative array index later (CID-1617248)

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

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

Sync with HEAD, resolve a couple of conflicts

Drop HAVE_WCHAR ifdefs from code that is not even compiled with !HAVE_WCHAR.

We still try to mainain the ability to build our curses with
!HAVE_WCHAR, but it doesn't make sense to provide stubs for new wide
API functions that just error out when !HAVE_WCHAR.  Any code that
only uses old API (and can work with !HAVE_WCHAR curses) doesn't use
those new functions.  The code that uses new API obviosly cannot work
when all the new API is stubbed out.

So the plan is to drop the stubs.  This commit does that for files
that are not even compiled with !HAVE_WCHAR (not only those stubs are
useless, they were not even there to begin with).

Same object code is generated for the normal HAVE_WCHAR case.  Nothing
is even recompiled for !HAVE_WCHAR.

Ok by blymn@ jdc@ roy@

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.

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.

sync with head

Pull up following revision(s) (requested by blymn in ticket #1791):
	lib/libcurses/get_wch.c: revision 1.10
* Size argument for memset when clearing cbuf was wrong, cbuf is an array
  of char not int so memset was stomping memory past the end of the array.
  Use sizeof properly to correctly determine the amount of memory to clear.

Pull up revisions:
  src/lib/libcurses/get_wch.c revision 1.10
  src/lib/libmenu/internals.c revisions 1.14,1.15
(requested by blymn in ticket #459).

* Size argument for memset when clearing cbuf was wrong, cbuf is an array
  of char not int so memset was stomping memory past the end of the array.
  Use sizeof properly to correctly determine the amount of memory to clear.

Extraneous whitespace removal.

* Corrected menu drawing when O_ROWMAJOR is not set
* Corrected menu item neighbour calculation so it works when O_ROWMAJOR
  is set and unset.  This corrects item navigation which was previously
  broken when O_ROWMAJOR was not set.

This resolves lib/46620.

* Size argument for memset when clearing cbuf was wrong, cbuf is an array
  of char not int so memset was stomping memory past the end of the array.
  Use sizeof properly to correctly determine the amount of memory to clear.

Observe the following spelling:
- wide character (noun)
- wide-character (adjective)

Inspired by jmc@OpenBSD.

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.

Make this compile when HAVE_WCHAR is not defined.

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.

We don't need to call __init_getch here, as it is called from
screen.c:newterm().

Fix some compiler warnings.
Remove shadowed variable declarations when DEBUG is defined.

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.

Add a cast (mlen should fit in long here).

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.

Merge wide curses.

Wide curses merge