nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-04-15 01:58:05 -05:00
Code Issues Projects Releases Wiki Activity

Scrollback viewing position, and selection endpoints, now keep pace

Browse Source 
with the scrollback movement. (The former is of course only
detectable when reset-scrollback-on-activity is disabled.)

[originally from svn r1266]
This commit is contained in:
Simon Tatham 2001-09-12 20:38:40 +00:00
parent 98af2ddc72
commit 6403725639
1 changed files with 33 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
terminal.c
View File

@ -587,7 +587,7 @@ static void check_selection(pos from, pos to)
static void scroll(int topline, int botline, int lines, int sb) static void scroll(int topline, int botline, int lines, int sb)
{ {
unsigned long *line, *line2; unsigned long *line, *line2;
int i; int i, seltop;
if (topline != 0 || alt_which != 0) if (topline != 0 || alt_which != 0)
sb = FALSE; sb = FALSE;
@ -637,6 +637,23 @@ static void scroll(int topline, int botline, int lines, int sb)
} }
addpos234(scrollback, line, sblen); addpos234(scrollback, line, sblen);
line = line2; line = line2;
/*
* If the user is currently looking at part of the
* scrollback, and they haven't enabled any options
* that are going to reset the scrollback as a
* result of this movement, then the chances are
* they'd like to keep looking at the same line. So
* we move their viewpoint at the same rate as the
* scroll, at least until their viewpoint hits the
* top end of the scrollback buffer, at which point
* we don't have the choice any more.
*
* Thanks to Jan Holmen Holsten for the idea and
* initial implementation.
*/
if (disptop > -savelines && disptop < 0)
disptop--;
} }
line = resizeline(line, cols); line = resizeline(line, cols);
for (i = 0; i < cols; i++) for (i = 0; i < cols; i++)
@ -644,17 +661,26 @@ static void scroll(int topline, int botline, int lines, int sb)
line[cols + 1] = 0; line[cols + 1] = 0;
addpos234(screen, line, botline); addpos234(screen, line, botline);
if (selstart.y >= topline && selstart.y <= botline) { /*
* If the selection endpoints move into the scrollback,
* we keep them moving until they hit the top. However,
* of course, if the line _hasn't_ moved into the
* scrollback then we don't do this, and cut them off
* at the top of the scroll region.
*/
seltop = sb ? -savelines : 0;
if (selstart.y >= seltop && selstart.y <= botline) {
selstart.y--; selstart.y--;
if (selstart.y < topline) { if (selstart.y < seltop) {
selstart.y = topline; selstart.y = seltop;
selstart.x = 0; selstart.x = 0;
} }
} }
if (selend.y >= topline && selend.y <= botline) { if (selend.y >= seltop && selend.y <= botline) {
selend.y--; selend.y--;
if (selend.y < topline) { if (selend.y < seltop) {
selend.y = topline; selend.y = seltop;
selend.x = 0; selend.x = 0;
} }
} }