Fix scrollback.

Sponsored by:	The FreeBSD Foundation
This commit is contained in:
Aleksandr Rybalko 2014-05-08 13:46:36 +00:00
parent 7273a5307a
commit 8a25d54521
2 changed files with 7 additions and 5 deletions

View File

@ -448,8 +448,9 @@ vtbuf_grow(struct vt_buf *vb, const term_pos_t *p, int history_size)
history_size = MAX(history_size, p->tp_row);
if (history_size > vb->vb_history_size || p->tp_col >
vb->vb_scr_size.tp_col) {
/* If new screen/history size bigger or buffer is VBF_STATIC. */
if ((history_size > vb->vb_history_size) || (p->tp_col >
vb->vb_scr_size.tp_col) || (vb->vb_flags & VBF_STATIC)) {
/* Allocate new buffer. */
bufsize = history_size * p->tp_col * sizeof(term_char_t);
new = malloc(bufsize, M_VTBUF, M_WAITOK | M_ZERO);

View File

@ -2016,6 +2016,10 @@ vt_upgrade(struct vt_device *vd)
/* Start timer when everything ready. */
callout_reset(&vd->vd_timer, hz / VT_TIMERFREQ, vt_timer, vd);
VT_UNLOCK(vd);
/* Refill settings with new sizes. */
vt_resize(vd);
}
static void
@ -2090,9 +2094,6 @@ vt_allocate(struct vt_driver *drv, void *softc)
vt_upgrade(vd);
/* Refill settings with new sizes. */
vt_resize(vd);
#ifdef DEV_SPLASH
if (vd->vd_flags & VDF_SPLASH)
vtterm_splash(vd);