From owner-svn-ports-all@FreeBSD.ORG Thu Mar 26 22:53:18 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0E673B62; Thu, 26 Mar 2015 22:53:18 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D3E2E81E; Thu, 26 Mar 2015 22:53:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2QMrHS0042505; Thu, 26 Mar 2015 22:53:17 GMT (envelope-from ehaupt@FreeBSD.org) Received: (from ehaupt@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2QMrHct042503; Thu, 26 Mar 2015 22:53:17 GMT (envelope-from ehaupt@FreeBSD.org) Message-Id: <201503262253.t2QMrHct042503@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ehaupt set sender to ehaupt@FreeBSD.org using -f From: Emanuel Haupt Date: Thu, 26 Mar 2015 22:53:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r382349 - in head/x11/xterm: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Mar 2015 22:53:18 -0000 Author: ehaupt Date: Thu Mar 26 22:53:16 2015 New Revision: 382349 URL: https://svnweb.freebsd.org/changeset/ports/382349 QAT: https://qat.redports.org/buildarchive/r382349/ Log: Fix an other cursor related regression introduced with 315. This patch will be merged upstream. Notified by: naddy Obtained from: dickey@his.com (author) Added: head/x11/xterm/files/ head/x11/xterm/files/patch-screen.c (contents, props changed) Modified: head/x11/xterm/Makefile Modified: head/x11/xterm/Makefile ============================================================================== --- head/x11/xterm/Makefile Thu Mar 26 22:42:43 2015 (r382348) +++ head/x11/xterm/Makefile Thu Mar 26 22:53:16 2015 (r382349) @@ -3,6 +3,7 @@ PORTNAME= xterm PORTVERSION= 316 +PORTREVISION= 1 CATEGORIES= x11 MASTER_SITES= ftp://invisible-island.net/xterm/:src1 \ LOCAL/ehaupt:src1 LOCAL/ehaupt:src2 Added: head/x11/xterm/files/patch-screen.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11/xterm/files/patch-screen.c Thu Mar 26 22:53:16 2015 (r382349) @@ -0,0 +1,42 @@ +--- screen.c.orig 2015-03-07 01:19:23 UTC ++++ screen.c +@@ -1,4 +1,4 @@ +-/* $XTermId: screen.c,v 1.510 2015/03/07 01:19:23 tom Exp $ */ ++/* $XTermId: screen.c,v 1.512 2015/03/22 14:47:02 tom Exp $ */ + + /* + * Copyright 1999-2014,2015 by Thomas E. Dickey +@@ -1248,7 +1248,7 @@ ScrnInsertChar(XtermWidget xw, unsigned + + TScreen *screen = TScreenOf(xw); + int first = ScrnLeftMargin(xw); +- int last = ScrnRightMargin(xw) + 1; ++ int last = ScrnRightMargin(xw); + int row = screen->cur_row; + int col = screen->cur_col; + int j; +@@ -1258,13 +1258,13 @@ ScrnInsertChar(XtermWidget xw, unsigned + TRACE(("ScrnInsertChar - col %d outside [%d..%d]\n", col, first, last)); + return; + } else if (last < (col + (int) n)) { +- n = (unsigned) (last - col); ++ n = (unsigned) (last + 1 - col); + } + + assert(screen->cur_col >= 0); + assert(screen->cur_row >= 0); + assert((int) n >= 0); +- assert(last >= (int) n); ++ assert((last + 1) >= (int) n); + + if_OPT_WIDE_CHARS(screen, { + int xx = screen->cur_row; +@@ -1273,7 +1273,7 @@ ScrnInsertChar(XtermWidget xw, unsigned + if (DamagedCells(screen, n, &kl, (int *) 0, xx, kr) && kr > kl) { + ClearCells(xw, 0, (unsigned) (kr - kl + 1), row, kl); + } +- kr = last - (int) n; ++ kr = last - (int) n + 1; + if (DamagedCells(screen, n, &kl, (int *) 0, xx, kr) && kr > kl) { + ClearCells(xw, 0, (unsigned) (kr - kl + 1), row, kl); + }