From owner-p4-projects@FreeBSD.ORG  Mon Dec  8 20:07:39 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E28F91065675; Mon,  8 Dec 2008 20:07:38 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A66721065672
	for <perforce@FreeBSD.org>; Mon,  8 Dec 2008 20:07:38 +0000 (UTC)
	(envelope-from ed@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 94EA98FC1C
	for <perforce@FreeBSD.org>; Mon,  8 Dec 2008 20:07:38 +0000 (UTC)
	(envelope-from ed@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mB8K7cCH015689
	for <perforce@FreeBSD.org>; Mon, 8 Dec 2008 20:07:38 GMT
	(envelope-from ed@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mB8K7cIb015687
	for perforce@freebsd.org; Mon, 8 Dec 2008 20:07:38 GMT
	(envelope-from ed@FreeBSD.org)
Date: Mon, 8 Dec 2008 20:07:38 GMT
Message-Id: <200812082007.mB8K7cIb015687@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	ed@FreeBSD.org using -f
From: Ed Schouten <ed@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 154362 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 08 Dec 2008 20:07:39 -0000

http://perforce.freebsd.org/chv.cgi?CH=154362

Change 154362 by ed@ed_flippo on 2008/12/08 20:06:41

	Fix remove of cutmarkings when copying/filling and fix the
	history buffer.

Affected files ...

.. //depot/projects/mpsafetty/sys/dev/syscons/scterm-teken.c#16 edit

Differences ...

==== //depot/projects/mpsafetty/sys/dev/syscons/scterm-teken.c#16 (text+ko) ====

@@ -288,7 +288,10 @@
 	sc_vtb_putchar(&scp->vtb, p, map[ch], attr);
 
 	mark_for_update(scp, cursor);
-	/* XXX: why? */
+	/*
+	 * XXX: Why do we need this? Only marking `cursor' should be
+	 * enough. Without this line, we get artifacts.
+	 */
 	mark_for_update(scp, imin(cursor + 1, scp->xsize * scp->ysize - 1));
 }
 
@@ -337,6 +340,7 @@
 	    r->tr_begin.tp_row * scp->xsize + r->tr_begin.tp_col);
 	mark_for_update(scp,
 	    (r->tr_end.tp_row - 1) * scp->xsize + (r->tr_end.tp_col - 1));
+	sc_remove_cutmarking(scp);
 }
 
 static void
@@ -346,6 +350,19 @@
 	unsigned int width;
 	int src, dst, end;
 
+#ifndef SC_NO_HISTORY
+	/*
+	 * We count a line of input as history if we perform a copy of
+	 * one whole line upward. In other words: if a line of text gets
+	 * overwritten by a rectangle that's right below it.
+	 */
+	if (scp->history != NULL &&
+	    r->tr_begin.tp_col == 0 && r->tr_end.tp_col == scp->xsize &&
+	    r->tr_begin.tp_row == p->tp_row + 1) {
+		sc_hist_save_one_line(scp, p->tp_row);
+	}
+#endif
+
 	if (r->tr_begin.tp_col == 0 && r->tr_end.tp_col == scp->xsize) {
 		/* Single contiguous region to copy. */
 		sc_vtb_move(&scp->vtb, r->tr_begin.tp_row * scp->xsize,
@@ -394,6 +411,7 @@
 	    (p->tp_row + r->tr_end.tp_row - r->tr_begin.tp_row - 1) *
 	    scp->xsize +
 	    (p->tp_col + r->tr_end.tp_col - r->tr_begin.tp_col - 1));
+	sc_remove_cutmarking(scp);
 }
 
 static void