From owner-svn-src-all@FreeBSD.ORG  Sun Jan  4 22:24:48 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 59B40106566B;
	Sun,  4 Jan 2009 22:24:48 +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 48AD68FC08;
	Sun,  4 Jan 2009 22:24:48 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n04MOl78075868;
	Sun, 4 Jan 2009 22:24:47 GMT (envelope-from ed@svn.freebsd.org)
Received: (from ed@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n04MOlK7075867;
	Sun, 4 Jan 2009 22:24:47 GMT (envelope-from ed@svn.freebsd.org)
Message-Id: <200901042224.n04MOlK7075867@svn.freebsd.org>
From: Ed Schouten <ed@FreeBSD.org>
Date: Sun, 4 Jan 2009 22:24:47 +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: r186753 - head/sys/dev/syscons/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: Sun, 04 Jan 2009 22:24:49 -0000

Author: ed
Date: Sun Jan  4 22:24:47 2009
New Revision: 186753
URL: http://svn.freebsd.org/changeset/base/186753

Log:
  Fix rendering glitch in cons25 emulation.
  
  Because we now have cons25-style linewrapping, we must also use cons25-
  style reverse linewrapping. This means that a ^H on column 0 will move
  the cursor one line up.
  
  Also fix a small regression: if the user invokes a RIS (Reset to Initial
  State), we must show the cursor again.
  
  Spotted by:	Paul B. Mahol <onemda gmail com>

Modified:
  head/sys/dev/syscons/teken/teken_subr.h

Modified: head/sys/dev/syscons/teken/teken_subr.h
==============================================================================
--- head/sys/dev/syscons/teken/teken_subr.h	Sun Jan  4 22:15:15 2009	(r186752)
+++ head/sys/dev/syscons/teken/teken_subr.h	Sun Jan  4 22:24:47 2009	(r186753)
@@ -198,11 +198,22 @@ static void
 teken_subr_backspace(teken_t *t)
 {
 
+#ifdef TEKEN_CONS25
+	if (t->t_cursor.tp_col == 0) {
+		if (t->t_cursor.tp_row == t->t_originreg.ts_begin)
+			return;
+		t->t_cursor.tp_row--;
+		t->t_cursor.tp_col = t->t_winsize.tp_col - 1;
+	} else {
+		t->t_cursor.tp_col--;
+	}
+#else /* !TEKEN_CONS25 */
 	if (t->t_cursor.tp_col == 0)
 		return;
 
 	t->t_cursor.tp_col--;
 	t->t_stateflags &= ~TS_WRAPPED;
+#endif /* TEKEN_CONS25 */
 
 	teken_funcs_cursor(t);
 }
@@ -862,6 +873,7 @@ teken_subr_reset_to_initial_state(teken_
 
 	teken_subr_do_reset(t);
 	teken_subr_erase_display(t, 2);
+	teken_funcs_param(t, TP_SHOWCURSOR, 1);
 	teken_funcs_cursor(t);
 }