From owner-svn-src-user@FreeBSD.ORG  Wed Oct 23 14:15:47 2013
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 1227C6B0;
 Wed, 23 Oct 2013 14:15:47 +0000 (UTC) (envelope-from ray@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id F3BBC223A;
 Wed, 23 Oct 2013 14:15:46 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9NEFkdP003268;
 Wed, 23 Oct 2013 14:15:46 GMT (envelope-from ray@svn.freebsd.org)
Received: (from ray@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9NEFkXT003267;
 Wed, 23 Oct 2013 14:15:46 GMT (envelope-from ray@svn.freebsd.org)
Message-Id: <201310231415.r9NEFkXT003267@svn.freebsd.org>
From: Aleksandr Rybalko <ray@FreeBSD.org>
Date: Wed, 23 Oct 2013 14:15:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r256970 - user/ed/newcons/sys/dev/vt
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 23 Oct 2013 14:15:47 -0000

Author: ray
Date: Wed Oct 23 14:15:46 2013
New Revision: 256970
URL: http://svnweb.freebsd.org/changeset/base/256970

Log:
  Turn off confusing rotation of scroll history.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  user/ed/newcons/sys/dev/vt/vt_buf.c

Modified: user/ed/newcons/sys/dev/vt/vt_buf.c
==============================================================================
--- user/ed/newcons/sys/dev/vt/vt_buf.c	Wed Oct 23 14:06:41 2013	(r256969)
+++ user/ed/newcons/sys/dev/vt/vt_buf.c	Wed Oct 23 14:15:46 2013	(r256970)
@@ -54,7 +54,7 @@ static MALLOC_DEFINE(M_VTBUF, "vtbuf", "
 int
 vthistory_seek(struct vt_buf *vb, int offset, int whence)
 {
-	int roffset;
+	int top, bottom, roffset;
 
 	/* No scrolling if not enabled. */
 	if ((vb->vb_flags & VBF_SCROLL) == 0) {
@@ -64,11 +64,15 @@ vthistory_seek(struct vt_buf *vb, int of
 		}
 		return (0); /* No changes */
 	}
+	top = (vb->vb_flags & VBF_HISTORY_FULL)?
+	    (vb->vb_curroffset + vb->vb_scr_size.tp_row):vb->vb_history_size;
+	bottom = vb->vb_curroffset + vb->vb_history_size;
+
 	/*
 	 * Operate on copy of offset value, since it temporary can be bigger
 	 * than amount of rows in buffer.
 	 */
-	roffset = vb->vb_roffset;
+	roffset = vb->vb_roffset + vb->vb_history_size;
 	switch (whence) {
 	case VHS_SET:
 		roffset = offset;
@@ -82,11 +86,10 @@ vthistory_seek(struct vt_buf *vb, int of
 		break;
 	}
 
-	if (roffset < 0)
-		roffset = 0;
-	if (roffset >= vb->vb_history_size)
-		/* Still have screen_height rows. */
-		roffset %= VTBUF_MAX_HEIGHT(vb);
+	roffset = (roffset < top)?top:roffset;
+	roffset = (roffset > bottom)?bottom:roffset;
+
+	roffset %= vb->vb_history_size;
 
 	if (vb->vb_roffset != roffset) {
 		vb->vb_roffset = roffset;