mirror of
https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git
synced 2024-11-18 08:52:42 +01:00
f201053113
o __FULLINE added for AL/DL/CS optimization with __noqch. refresh.c o Attributes does not turned off before clearing screen, cause highlighted screen. o Proper usage of 'affcnt' tputs parameter, affects terminals with padding. o make AL/DL/CS optimize not only for __FULLWIN but for __FULLLINE. ATTENTION: original code works _only_for_ FULLWIN, i.e. if you use two FULLLINE windows like in 'talk', you have full slow repaint with original code, I enhance this thing. All other fixes marked with phrase 'wrong for non-full windows' or WFNFW is continue of this fix. I rewrite scroll code too for proper working (see below and tty.c changes). o DEBUG code always use 'i' index from 0 to curscr->maxy instead of 'i - win->begy', fixed o check added into DEBUG to be shure that index inside current window. o ->hash assigment code is WFNFW (forget win->begy). o when CE usage required, and last spaces number counted, code don't check attributes, so last standouted space will be incorrectly cleared. o cep (start pointer) forget to add win->begy/win->begx, code WFNFW. o clsp (last space) wrong in two places at once: forget to add win->begy (WFNFW) and incorrectly use 'win->begx * __LDATASIZE' in pointer arithmetics. o clsp check incorrect: was 'clsp < win->maxx * __LDATASIZE', need to be 'clsp < win->maxx o Attributes does not turned off before clearing end of line, cause highlighted end of line. o When find how many lines from the top/bottom of the screen are unchanged, code always forget '- win->begy', WFNFW. o NO_JERKINESS code forgets to add win->begy, WFNFW. o Curw & Curs changed in comment description o In search for the largest block of text not changed forget to add '- win->begy' (several places), WFNFW. o Forget to add '- win->begy' for non-dirty lines, WFNFW. o touchline forget to add '- win->begy', WFNFW. o rewrite scrolln(): * remove win parameter, we deal with whole screen (curscr) now; * use NL or '\n' instead of sf, it is faster in any case; (imagine: cat written on curses now use '\n' for scroll like standard cat, no ugly escapes) * use dl (if present) instead of DL, if abs(n) == 1, the same about al/sr, it is faster; * change win->maxy to 'curscr->maxy - 1', we deal with whole screen here, WFNFW. * SF can be correctly issued only if cursor at bottom of scroll region (whole screen region included too), fix this; * sr/SR can be correctly issued only if cursor at top of scroll region (whole screen region included too), fix this; * use pre-calculaded (in setterm.c) __usecs variable to determine usage of CS or AL/DL; * completely rewrite scroll region stuff using __set_scroll_region from tty.c (see below); tty.c o Added __set_scroll_region function which set CS region and stays back in old position. Use SC/RC (save/restore cursor) if possible, else use HO and __mvcur. o __startwin: added __set_scroll_region(whole screen) at program startup, if __usecs; o endwin: added __set_scroll_region(whole screen) at program exit, if __usecs; o Fix all tc{set/get}attrs to works properly, when stdin redirected, use /dev/tty in this case (needed for some applications). setterm.c o Add new variable __usecs, if (!AL/al || !Dl/dl) && CS && (SC && RC || HO) (save/restore cursor used in __set_scroll_region in tty.c). o Set __noqch, if !__usecs && (!AL/al || !DL/dl). o Proper ospeed initialization for tputs, i.e. if speed == B9600, ospeed = 13 curses.c o Add __usecs variable that indicates usage of CS (if AL/DL absent). curses.h o Allow translation with applications which includes <sgtty.h>, undef BXXX manually to avoid redefinition and include termios to define proper ones. o Define old-style names curx/begx/maxx/etc. for old applications. Define _tty like __baset too. o Typedef SGTTY type for old applications (SGTTY == struct termios). o wstandout/wstandend should be int and not char*, some old applications relay on this fact. See standout.c too. o __FULLINE added indicated line width == terminal width, needed for refresh using AL/DL/CS with __noqch, see refresh.c changes. o Add extern __usecs variable that indicates usage of CS (if AL/DL absent). o Add __set_scroll_region() prototype, see tty.c and refresh.c changes for details. o Change winch() character mask from 0177 to 0377, we don't need to strip high bit on national characters. o Allow translate on systems with _BSD_VA_LIST_ undefined, such as FreeBSD 1.1.5.1 o __tty_fileno added to allows work with stdin redirected, see tty.c o Privately declare tputs (..., void) and externally tputs(..., int), many applications require this. Maybe not nice thing, but needed. o Remove _putchar definition and replace it to proper _putchar prototype, some old apps declares: 'extern int _putchar()' and don't even include curses.h in such modules. See putchar.c cr_put.c o __mvcur: if destline == destcol && outline == outcol do nothing, i.e. don't issue any escapes. o Proper usage of 'affcnt' tputs parameter, affects terminals with padding. cur_hash.c o Change char->unsigned char for proper sum 8-bit national characters. getch.c o check for inp == EOF added, don't add EOF to window. getstr.c o check for EOF added, don't add EOF to str. insertln.c o add cast to (int) in comparation of y and win->cury, this produce big number (cast to (unsigned)) if y < 0 tstp.c o Fix all tc{set/get}attrs to works properly, when stdin redirected, use /dev/tty in this case (needed for some applications). o add tstp() function for compatibility, some applications wants it. standout.c o Some old applications relay in fact that wstandout/wstandend returns int instead of char*, change return type to OK/ERR. putchar.c o Add _putchar function (which calls __cputchar), some old apps declares: 'extern int _putchar()' and don't even include curses.h in such modules.
78 lines
2.6 KiB
C
78 lines
2.6 KiB
C
/*
|
|
* Copyright (c) 1981, 1993, 1994
|
|
* The Regents of the University of California. All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
* 3. All advertising materials mentioning features or use of this software
|
|
* must display the following acknowledgement:
|
|
* This product includes software developed by the University of
|
|
* California, Berkeley and its contributors.
|
|
* 4. Neither the name of the University nor the names of its contributors
|
|
* may be used to endorse or promote products derived from this software
|
|
* without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
* SUCH DAMAGE.
|
|
*/
|
|
|
|
#ifndef lint
|
|
static char sccsid[] = "@(#)getch.c 8.2 (Berkeley) 5/4/94";
|
|
#endif /* not lint */
|
|
|
|
#include "curses.h"
|
|
|
|
/*
|
|
* wgetch --
|
|
* Read in a character from the window.
|
|
*/
|
|
int
|
|
wgetch(win)
|
|
register WINDOW *win;
|
|
{
|
|
register int inp, weset;
|
|
|
|
if (!(win->flags & __SCROLLOK) && (win->flags & __FULLWIN)
|
|
&& win->curx == win->maxx - 1 && win->cury == win->maxy - 1)
|
|
return (ERR);
|
|
#ifdef DEBUG
|
|
__CTRACE("wgetch: __echoit = %d, __rawmode = %d\n",
|
|
__echoit, __rawmode);
|
|
#endif
|
|
if (__echoit && !__rawmode) {
|
|
cbreak();
|
|
weset = 1;
|
|
} else
|
|
weset = 0;
|
|
|
|
inp = getchar();
|
|
if (inp != EOF) {
|
|
#ifdef DEBUG
|
|
__CTRACE("wgetch got '%s'\n", unctrl(inp));
|
|
#endif
|
|
if (__echoit) {
|
|
mvwaddch(curscr,
|
|
win->cury + win->begy, win->curx + win->begx, inp);
|
|
waddch(win, inp);
|
|
}
|
|
}
|
|
if (weset)
|
|
nocbreak();
|
|
return (inp);
|
|
}
|