From owner-svn-src-all@FreeBSD.ORG  Mon Aug  9 18:07:16 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1AE0D1065678;
	Mon,  9 Aug 2010 18:07:16 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 0A60E8FC1D;
	Mon,  9 Aug 2010 18:07:16 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o79I7FDb065650;
	Mon, 9 Aug 2010 18:07:15 GMT (envelope-from ed@svn.freebsd.org)
Received: (from ed@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o79I7FZI065648;
	Mon, 9 Aug 2010 18:07:15 GMT (envelope-from ed@svn.freebsd.org)
Message-Id: <201008091807.o79I7FZI065648@svn.freebsd.org>
From: Ed Schouten <ed@FreeBSD.org>
Date: Mon, 9 Aug 2010 18:07:15 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r211113 - head/sys/teken
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 09 Aug 2010 18:07:16 -0000

Author: ed
Date: Mon Aug  9 18:07:15 2010
New Revision: 211113
URL: http://svn.freebsd.org/changeset/base/211113

Log:
  Make ^L with cons25 and origin mode bit more sane.
  
  Even though cons25 normally doesn't support origin regions, this
  emulator does allow you to do it. It makes more sense to blank only the
  origin region when emitting ^L instead of blanking the entire screen.
  Apart from that, we should always place the cursor inside the origin
  region, which doesn't happen right now.

Modified:
  head/sys/teken/teken_subr.h

Modified: head/sys/teken/teken_subr.h
==============================================================================
--- head/sys/teken/teken_subr.h	Mon Aug  9 17:54:26 2010	(r211112)
+++ head/sys/teken/teken_subr.h	Mon Aug  9 18:07:15 2010	(r211113)
@@ -725,11 +725,17 @@ teken_subr_newpage(teken_t *t)
 	if (t->t_stateflags & TS_CONS25) {
 		teken_rect_t tr;
 
-		tr.tr_begin.tp_row = tr.tr_begin.tp_col = 0;
-		tr.tr_end = t->t_winsize;
+		/* Clear screen. */
+		tr.tr_begin.tp_row = t->t_originreg.ts_begin;
+		tr.tr_begin.tp_col = 0;
+		tr.tr_end.tp_row = t->t_originreg.ts_end;
+		tr.tr_end.tp_col = t->t_winsize.tp_col;
 		teken_funcs_fill(t, &tr, BLANK, &t->t_curattr);
 
-		t->t_cursor.tp_row = t->t_cursor.tp_col = 0;
+		/* Cursor at top left. */
+		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);
 	} else {
 		teken_subr_newline(t);