summaryrefslogtreecommitdiffstats
path: root/lib/libcurses/cr_put.c
diff options
context:
space:
mode:
authorache <ache@FreeBSD.org>1994-08-28 21:47:13 +0000
committerache <ache@FreeBSD.org>1994-08-28 21:47:13 +0000
commitb942ce9760728fb49779bf935c37cd771591179f (patch)
tree15d0f287c735370d7c344c86a8addbbf04e4b2a5 /lib/libcurses/cr_put.c
parenta00bd57cf70abf1e00736365d5f1f652182326a1 (diff)
downloadFreeBSD-src-b942ce9760728fb49779bf935c37cd771591179f.zip
FreeBSD-src-b942ce9760728fb49779bf935c37cd771591179f.tar.gz
newwin.c
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.
Diffstat (limited to 'lib/libcurses/cr_put.c')
-rw-r--r--lib/libcurses/cr_put.c23
1 files changed, 12 insertions, 11 deletions
diff --git a/lib/libcurses/cr_put.c b/lib/libcurses/cr_put.c
index ada2df5..e6a790e 100644
--- a/lib/libcurses/cr_put.c
+++ b/lib/libcurses/cr_put.c
@@ -79,7 +79,8 @@ __mvcur(ly, lx, y, x, in_refresh)
destline = y;
outcol = lx;
outline = ly;
- fgoto(in_refresh);
+ if (destline != destcol || outline != outcol)
+ fgoto(in_refresh);
return (OK);
}
@@ -102,11 +103,11 @@ fgoto(in_refresh)
while (l > 0) {
if (__pfast)
if (CR)
- tputs(CR, 0, __cputchar);
+ tputs(CR, 1, __cputchar);
else
putchar('\r');
if (NL)
- tputs(NL, 0, __cputchar);
+ tputs(NL, 1, __cputchar);
else
putchar('\n');
l--;
@@ -147,7 +148,7 @@ fgoto(in_refresh)
* Eggert's Superbee description which wins better.
*/
if (NL /* && !XB */ && __pfast)
- tputs(NL, 0, __cputchar);
+ tputs(NL, 1, __cputchar);
else
putchar('\n');
l--;
@@ -167,7 +168,7 @@ fgoto(in_refresh)
if (outcol != COLS - 1 && plod(strlen(cgp), in_refresh) > 0)
plod(0, in_refresh);
else
- tputs(cgp, 0, __cputchar);
+ tputs(cgp, 1, __cputchar);
} else
plod(0, in_refresh);
outline = destline;
@@ -244,7 +245,7 @@ plod(cnt, in_refresh)
* Cheaper to home. Do it now and pretend it's a
* regular local motion.
*/
- tputs(HO, 0, plodput);
+ tputs(HO, 1, plodput);
outcol = outline = 0;
} else if (LL) {
/*
@@ -253,7 +254,7 @@ plod(cnt, in_refresh)
*/
k = (LINES - 1) - destline;
if (i + k + 2 < j && (k <= 0 || UP)) {
- tputs(LL, 0, plodput);
+ tputs(LL, 1, plodput);
outcol = 0;
outline = LINES - 1;
}
@@ -303,12 +304,12 @@ plod(cnt, in_refresh)
* into account.
*/
if (CR)
- tputs(CR, 0, plodput);
+ tputs(CR, 1, plodput);
else
plodput('\r');
if (NC) {
if (NL)
- tputs(NL, 0, plodput);
+ tputs(NL, 1, plodput);
else
plodput('\n');
outline++;
@@ -319,7 +320,7 @@ plod(cnt, in_refresh)
dontcr: while (outline < destline) {
outline++;
if (NL)
- tputs(NL, 0, plodput);
+ tputs(NL, 1, plodput);
else
plodput('\n');
if (plodcnt < 0)
@@ -348,7 +349,7 @@ dontcr: while (outline < destline) {
}
while (outline > destline) {
outline--;
- tputs(UP, 0, plodput);
+ tputs(UP, 1, plodput);
if (plodcnt < 0)
goto out;
}
OpenPOWER on IntegriCloud