Author: dumbbell
Date: Sat Nov 22 16:55:55 2014
New Revision: 274860
URL: https://svnweb.freebsd.org/changeset/base/274860
Log:
vt(4): Adjust the cursor position after changing the window size
A new terminal_set_cursor() is added: it wraps the existing
teken_set_cursor() function.
In vtbuf_grow(), the cursor position is adjusted at the end of the
function. In vt_change_font(), we call terminal_set_cursor() just after
terminal_set_winsize_blank(), while the terminal is mute.
This fixes a bug where, after loading a kernel video driver which
increases the terminal window size, the cursor remains at its old
position, in other words, in the middle of the display content.
PR: 194421
MFC of: r273932
Modified:
stable/10/sys/dev/vt/vt_buf.c
stable/10/sys/dev/vt/vt_core.c
stable/10/sys/kern/subr_terminal.c
stable/10/sys/sys/terminal.h
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/dev/vt/vt_buf.c
==============================================================================
--- stable/10/sys/dev/vt/vt_buf.c Sat Nov 22 16:48:29 2014
(r274859)
+++ stable/10/sys/dev/vt/vt_buf.c Sat Nov 22 16:55:55 2014
(r274860)
@@ -562,6 +562,18 @@ vtbuf_grow(struct vt_buf *vb, const term
vb->vb_roffset = vb->vb_curroffset;
}
+ /* Adjust cursor position. */
+ if (vb->vb_cursor.tp_col > p->tp_col - 1)
+ /*
+ * Move cursor to the last column, in case its previous
+ * position is outside of the new screen area.
+ */
+ vb->vb_cursor.tp_col = p->tp_col - 1;
+
+ if (vb->vb_curroffset > 0 || vb->vb_cursor.tp_row > p->tp_row - 1)
+ /* Move cursor to the last line on the screen. */
+ vb->vb_cursor.tp_row = p->tp_row - 1;
+
vtbuf_make_undirty(vb);
VTBUF_UNLOCK(vb);
Modified: stable/10/sys/dev/vt/vt_core.c
==============================================================================
--- stable/10/sys/dev/vt/vt_core.c Sat Nov 22 16:48:29 2014
(r274859)
+++ stable/10/sys/dev/vt/vt_core.c Sat Nov 22 16:55:55 2014
(r274860)
@@ -1525,6 +1525,7 @@ vt_change_font(struct vt_window *vw, str
terminal_mute(tm, 1);
vtbuf_grow(&vw->vw_buf, &size, vw->vw_buf.vb_history_size);
terminal_set_winsize_blank(tm, &wsz, 0, NULL);
+ terminal_set_cursor(tm, &vw->vw_buf.vb_cursor);
terminal_mute(tm, 0);
/* Actually apply the font to the current window. */
Modified: stable/10/sys/kern/subr_terminal.c
==============================================================================
--- stable/10/sys/kern/subr_terminal.c Sat Nov 22 16:48:29 2014
(r274859)
+++ stable/10/sys/kern/subr_terminal.c Sat Nov 22 16:55:55 2014
(r274860)
@@ -190,6 +190,13 @@ terminal_maketty(struct terminal *tm, co
}
void
+terminal_set_cursor(struct terminal *tm, const term_pos_t *pos)
+{
+
+ teken_set_cursor(&tm->tm_emulator, pos);
+}
+
+void
terminal_set_winsize_blank(struct terminal *tm, const struct winsize *size,
int blank, const term_attr_t *attr)
{
Modified: stable/10/sys/sys/terminal.h
==============================================================================
--- stable/10/sys/sys/terminal.h Sat Nov 22 16:48:29 2014
(r274859)
+++ stable/10/sys/sys/terminal.h Sat Nov 22 16:55:55 2014
(r274860)
@@ -207,6 +207,7 @@ struct terminal {
struct terminal *terminal_alloc(const struct terminal_class *tc, void *softc);
void terminal_maketty(struct terminal *tm, const char *fmt, ...);
+void terminal_set_cursor(struct terminal *tm, const term_pos_t *pos);
void terminal_set_winsize_blank(struct terminal *tm,
const struct winsize *size, int blank, const term_attr_t *attr);
void terminal_set_winsize(struct terminal *tm, const struct winsize *size);
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
