enlightenment/terminology
enlightenment
/
terminology
9
6
Fork 7
Code Issues 7 Pull Requests Projects Releases Wiki Activity

reflow: display content from backlog when vertically expanding

This commit is contained in:
Boris Faure 2013-04-05 21:12:39 +02:00
parent fc7dcbdad6
commit a7858ecc2e
1 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/bin/termpty.c
View File

@ -716,10 +716,15 @@ static void
_termpty_vertically_expand(Termpty *ty, int old_w, int old_h, _termpty_vertically_expand(Termpty *ty, int old_w, int old_h,
Termcell *old_screen) Termcell *old_screen)
{ {
int from_history = 0,
y;
if (ty->backmax > 0)
from_history = MIN(ty->h - old_h, ty->backscroll_num);
if (old_screen) if (old_screen)
{ {
int y, int old_circular_offset = ty->circular_offset;
old_circular_offset = ty->circular_offset;
ty->circular_offset = 0; ty->circular_offset = 0;
@ -728,12 +733,35 @@ _termpty_vertically_expand(Termpty *ty, int old_w, int old_h,
Termcell *c1, *c2; Termcell *c1, *c2;
c1 = &(OLD_SCREEN(0, y)); c1 = &(OLD_SCREEN(0, y));
c2 = &(TERMPTY_SCREEN(ty, 0, y)); c2 = &(TERMPTY_SCREEN(ty, 0, y + from_history));
_termpty_text_copy(ty, c1, c2, old_w); _termpty_text_copy(ty, c1, c2, old_w);
} }
} }
/* TODO: display content from backlog */ if (from_history <= 0 || !ty->back)
return;
/* display content from backlog */
for (y = from_history - 1; y >= 0; y--)
{
Termsave *ts;
Termcell *src, *dst;
ty->backpos--;
if (ty->backpos < 0)
ty->backpos = ty->backscroll_num - 1;
ts = ty->back[ty->backpos];
src = ts->cell;
dst = &(TERMPTY_SCREEN(ty, 0, y));
_termpty_text_copy(ty, src, dst, ts->w);
free(ts);
ty->back[ty->backpos] = NULL;
ty->backscroll_num--;
}
ty->state.cy += from_history;
} }