From owner-svn-src-user@FreeBSD.ORG  Mon Oct 28 14:00:06 2013
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id E9A931B7;
 Mon, 28 Oct 2013 14:00:06 +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 D7EE92114;
 Mon, 28 Oct 2013 14:00:06 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9SE06Ab078886;
 Mon, 28 Oct 2013 14:00:06 GMT (envelope-from ray@svn.freebsd.org)
Received: (from ray@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9SE06tI078885;
 Mon, 28 Oct 2013 14:00:06 GMT (envelope-from ray@svn.freebsd.org)
Message-Id: <201310281400.r9SE06tI078885@svn.freebsd.org>
From: Aleksandr Rybalko <ray@FreeBSD.org>
Date: Mon, 28 Oct 2013 14:00:06 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r257252 - user/ed/newcons/sys/kern
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: Mon, 28 Oct 2013 14:00:07 -0000

Author: ray
Date: Mon Oct 28 14:00:06 2013
New Revision: 257252
URL: http://svnweb.freebsd.org/changeset/base/257252

Log:
  Do not reset terminal state if it is not cleared on resize.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  user/ed/newcons/sys/kern/subr_terminal.c

Modified: user/ed/newcons/sys/kern/subr_terminal.c
==============================================================================
--- user/ed/newcons/sys/kern/subr_terminal.c	Mon Oct 28 13:33:29 2013	(r257251)
+++ user/ed/newcons/sys/kern/subr_terminal.c	Mon Oct 28 14:00:06 2013	(r257252)
@@ -200,12 +200,19 @@ terminal_set_winsize_blank(struct termin
 	r.tr_end.tp_col = size->ws_col;
 
 	TERMINAL_LOCK(tm);
-	teken_set_winsize(&tm->tm_emulator, &r.tr_end);
+	if (blank == 0)
+		/*
+		 * Assigned directly, to avoid terminal reset in the
+		 * teken_set_winsize.
+		 */
+		tm->tm_emulator.t_winsize = r.tr_end;
+	else
+		teken_set_winsize(&tm->tm_emulator, &r.tr_end);
 	TERMINAL_UNLOCK(tm);
 
-	if (blank)
-		tm->tm_class->tc_fill(tm, &r,
-		    TCHAR_CREATE((teken_char_t)' ', &default_message));
+	if (blank != 0)
+		tm->tm_class->tc_fill(tm, &r, TCHAR_CREATE((teken_char_t)' ',
+		    &default_message));
 
 	terminal_sync_ttysize(tm);
 }