From ebcc0ebd2d72d2fa0895cda8c7466d0d6bdb6b7b Mon Sep 17 00:00:00 2001 From: Tiago Cunha Date: Tue, 2 Feb 2010 23:56:25 +0000 Subject: [PATCH] Sync OpenBSD patchset 630: If redrawing line 0 of the screen onto the tty, there can't be a wrap flag on the previous line, so move the cursor. Fixes status line redraw issues when resizing in choose mode and hopefully at other times as well. --- tty.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tty.c b/tty.c index cba27bc2..229c3e44 100644 --- a/tty.c +++ b/tty.c @@ -1,4 +1,4 @@ -/* $Id: tty.c,v 1.186 2010-01-05 23:49:24 tcunha Exp $ */ +/* $Id: tty.c,v 1.187 2010-02-02 23:56:25 tcunha Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -484,7 +484,7 @@ tty_draw_line(struct tty *tty, struct screen *s, u_int py, u_int ox, u_int oy) gl = NULL; if (py != 0) gl = &s->grid->linedata[s->grid->hsize + py - 1]; - if (oy + py == 0 || (gl != NULL && !(gl->flags & GRID_LINE_WRAPPED)) || + if (oy + py == 0 || gl == NULL || !(gl->flags & GRID_LINE_WRAPPED) || tty->cx < tty->sx || ox != 0 || (oy + py != tty->cy + 1 && tty->cy != s->rlower + oy)) tty_cursor(tty, ox, oy + py);