From owner-svn-src-all@FreeBSD.ORG  Sat Sep 12 08:19:24 2009
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 755651065672;
	Sat, 12 Sep 2009 08:19:24 +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 656568FC14;
	Sat, 12 Sep 2009 08:19:24 +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 n8C8JOT1079106;
	Sat, 12 Sep 2009 08:19:24 GMT (envelope-from ed@svn.freebsd.org)
Received: (from ed@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n8C8JOqT079103;
	Sat, 12 Sep 2009 08:19:24 GMT (envelope-from ed@svn.freebsd.org)
Message-Id: <200909120819.n8C8JOqT079103@svn.freebsd.org>
From: Ed Schouten <ed@FreeBSD.org>
Date: Sat, 12 Sep 2009 08:19:24 +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: r197114 - 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: Sat, 12 Sep 2009 08:19:24 -0000

Author: ed
Date: Sat Sep 12 08:19:24 2009
New Revision: 197114
URL: http://svn.freebsd.org/changeset/base/197114

Log:
  Make resizing of teken terminals a bit more safe.
  
  Just perform a full reset when resizing the terminal. This means the
  cursor, scrolling region, etc. are never positioned outside the
  terminal.

Modified:
  head/sys/teken/teken.c
  head/sys/teken/teken_subr.h

Modified: head/sys/teken/teken.c
==============================================================================
--- head/sys/teken/teken.c	Sat Sep 12 05:39:51 2009	(r197113)
+++ head/sys/teken/teken.c	Sat Sep 12 08:19:24 2009	(r197114)
@@ -341,10 +341,7 @@ teken_set_winsize(teken_t *t, const teke
 {
 
 	t->t_winsize = *p;
-	/* XXX: bounds checking with cursor/etc! */
-	t->t_scrollreg.ts_begin = 0;
-	t->t_scrollreg.ts_end = t->t_winsize.tp_row;
-	t->t_originreg = t->t_scrollreg;
+	teken_subr_do_reset(t);
 }
 
 /*

Modified: head/sys/teken/teken_subr.h
==============================================================================
--- head/sys/teken/teken_subr.h	Sat Sep 12 05:39:51 2009	(r197113)
+++ head/sys/teken/teken_subr.h	Sat Sep 12 08:19:24 2009	(r197114)
@@ -927,6 +927,9 @@ teken_subr_do_reset(teken_t *t)
 
 	t->t_curattr = t->t_defattr;
 	t->t_cursor.tp_row = t->t_cursor.tp_col = 0;
+	t->t_scrollreg.ts_begin = 0;
+	t->t_scrollreg.ts_end = t->t_winsize.tp_row;
+	t->t_originreg = t->t_scrollreg;
 	t->t_stateflags = TS_AUTOWRAP;
 
 	teken_scs_set(t, 0, teken_scs_us_ascii);