From 0475bba7f5d9ff73cc59c9a734e88f31eb0ec11a Mon Sep 17 00:00:00 2001 From: Ed Schouten Date: Wed, 11 Nov 2009 08:11:21 +0000 Subject: [PATCH] Always home the cursor when changing the scrolling region. I thought this only had to be done when in origin mode, to ensure that the cursor is not placed outside the origin, but it seems this is also done when not in origin mode. This fixes some artifacts when pressing ^L while running irssi in tmux. (Almost) nobody noticed this, because cons25 doesn't have scrolling regions. --- sys/teken/teken_subr.h | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/sys/teken/teken_subr.h b/sys/teken/teken_subr.h index ad10abbb6fd5..4caa5007358a 100644 --- a/sys/teken/teken_subr.h +++ b/sys/teken/teken_subr.h @@ -1237,16 +1237,17 @@ teken_subr_set_top_and_bottom_margins(teken_t *t, unsigned int top, bottom = t->t_winsize.tp_row; } + /* Apply scrolling region. */ t->t_scrollreg.ts_begin = top; t->t_scrollreg.ts_end = bottom; - if (t->t_stateflags & TS_ORIGIN) { - /* XXX: home cursor? */ + if (t->t_stateflags & TS_ORIGIN) t->t_originreg = t->t_scrollreg; - t->t_cursor.tp_row = t->t_originreg.ts_begin; - t->t_cursor.tp_col = 0; - t->t_stateflags &= ~TS_WRAPPED; - teken_funcs_cursor(t); - } + + /* Home cursor to the top left of the scrolling region. */ + t->t_cursor.tp_row = t->t_originreg.ts_begin; + t->t_cursor.tp_col = 0; + t->t_stateflags &= ~TS_WRAPPED; + teken_funcs_cursor(t); } static void