update to xterm 247, a small bug fix over version 246.

8 files changed, 37 insertions, 19 deletions

diff --git a/app/xterm/MANIFEST b/app/xterm/MANIFEST
index bcd71a769..603e76f97 100644
--- a/app/xterm/MANIFEST
+++ b/app/xterm/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for xterm-246, version xterm-246
+MANIFEST for xterm-247, version xterm-247
 --------------------------------------------------------------------------------
 MANIFEST                        this file
 256colres.h                     resource-definitions for 256-color mode
diff --git a/app/xterm/configure.in b/app/xterm/configure.in
index 53dcf698d..3fe3c6455 100644
--- a/app/xterm/configure.in
+++ b/app/xterm/configure.in
@@ -1,4 +1,4 @@
-dnl $XTermId: configure.in,v 1.252 2009/08/13 19:41:01 tom Exp $
+dnl $XTermId: configure.in,v 1.253 2009/08/30 21:46:21 tom Exp $
 dnl
 dnl ---------------------------------------------------------------------------
 dnl
@@ -285,7 +285,7 @@ LIBS="$LIBS $X_EXTRA_LIBS"
 # Check for openpty() in -lutil if the UNIX98-style pty functions are not
 # available. E.g. for GNU libc 2.0.
 case $host_os in #(vi
-freebsd*|netbsd*)	# 2004/8/15 - revisit this if/when grantpt is known to work.
+freebsd*|netbsd*|dragonfly*) # 2004/8/15 - revisit this if/when grantpt is known to work.
 	AC_CHECK_LIB(util,openpty)
 	;;
 *)
diff --git a/app/xterm/main.c b/app/xterm/main.c
index 98dd9228a..2f99d5b70 100644
--- a/app/xterm/main.c
+++ b/app/xterm/main.c
@@ -1,4 +1,4 @@
-/* $XTermId: main.c,v 1.593 2009/08/07 23:14:47 tom Exp $ */
+/* $XTermId: main.c,v 1.594 2009/08/30 21:40:45 Alex.Hornung Exp $ */
 
 /*
  *				 W A R N I N G
@@ -380,7 +380,7 @@ extern struct utmp *getutid __((struct utmp * _Id));
 #include <util.h>		/* openpty() */
 #endif
 
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__DragonFly__)
 #include <libutil.h>		/* openpty() */
 #endif
 
@@ -2420,7 +2420,7 @@ main(int argc, char *argv[]ENVP_ARG)
     }
 }
 
-#if defined(__osf__) || (defined(__GLIBC__) && !defined(USE_USG_PTYS)) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__)
+#if defined(__osf__) || (defined(__GLIBC__) && !defined(USE_USG_PTYS)) || defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__)
 #define USE_OPENPTY 1
 static int opened_tty = -1;
 #endif
diff --git a/app/xterm/print.c b/app/xterm/print.c
index 7ea1c8e1a..7200e3eb6 100644
--- a/app/xterm/print.c
+++ b/app/xterm/print.c
@@ -1,4 +1,4 @@
-/* $XTermId: print.c,v 1.105 2009/08/07 00:25:10 tom Exp $ */
+/* $XTermId: print.c,v 1.107 2009/08/31 00:37:04 tom Exp $ */
 
 /************************************************************
 
@@ -279,8 +279,10 @@ xtermPrintEverything(XtermWidget xw)
     int bot = screen->max_row;
     int was_open = initialized;
 
-    if (!screen->whichBuf)
-	top = -screen->savedlines;
+    if (!screen->whichBuf) {
+	top = -screen->savedlines - screen->topline;
+	bot -= screen->topline;
+    }
 
     TRACE(("xtermPrintEverything, rows %d..%d\n", top, bot));
     while (top <= bot)
diff --git a/app/xterm/ptyx.h b/app/xterm/ptyx.h
index 9ac8265f5..04da907e1 100644
--- a/app/xterm/ptyx.h
+++ b/app/xterm/ptyx.h
@@ -1,4 +1,4 @@
-/* $XTermId: ptyx.h,v 1.625 2009/08/14 23:14:26 tom Exp $ */
+/* $XTermId: ptyx.h,v 1.626 2009/08/30 21:40:45 Alex.Hornung Exp $ */
 
 /*
  * Copyright 1999-2008,2009 by Thomas E. Dickey
@@ -156,7 +156,7 @@
 #define USE_PTY_DEVICE 1
 #define USE_PTY_SEARCH 1
 
-#if defined(__osf__) || (defined(linux) && defined(__GLIBC__) && (__GLIBC__ >= 2) && (__GLIBC_MINOR__ >= 1)) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__)
+#if defined(__osf__) || (defined(linux) && defined(__GLIBC__) && (__GLIBC__ >= 2) && (__GLIBC_MINOR__ >= 1)) || defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__)
 #undef USE_PTY_DEVICE
 #undef USE_PTY_SEARCH
 #define USE_PTS_DEVICE 1
diff --git a/app/xterm/screen.c b/app/xterm/screen.c
index 26ad604d5..d1d836378 100644
--- a/app/xterm/screen.c
+++ b/app/xterm/screen.c
@@ -1,4 +1,4 @@
-/* $XTermId: screen.c,v 1.394 2009/08/16 18:16:45 tom Exp $ */
+/* $XTermId: screen.c,v 1.396 2009/08/30 00:06:07 tom Exp $ */
 
 /*
  * Copyright 1999-2008,2009 by Thomas E. Dickey
@@ -281,7 +281,7 @@ allocScrnHead(TScreen * screen, unsigned nrow)
 static unsigned
 sizeofScrnRow(TScreen * screen, unsigned ncol)
 {
-    unsigned result = 1;
+    unsigned result;
     unsigned sizeAttribs;
 #if OPT_ISO_COLORS
     unsigned sizeColors;
@@ -289,13 +289,14 @@ sizeofScrnRow(TScreen * screen, unsigned ncol)
 
     (void) screen;
 
+    result = (ncol * sizeof(CharData));
+    AlignValue(result);
+
 #if OPT_WIDE_CHARS
     if (screen->wide_chars) {
-	result += (unsigned) screen->max_combining;
+	result *= (unsigned) (1 + screen->max_combining);
     }
 #endif
-    result = (ncol * result * sizeof(CharData));
-    AlignValue(result);
 
     sizeAttribs = (ncol * SizeofScrnPtr(attribs));
     AlignValue(sizeAttribs);
diff --git a/app/xterm/version.h b/app/xterm/version.h
index 5b4de28aa..1d683175f 100644
--- a/app/xterm/version.h
+++ b/app/xterm/version.h
@@ -1,4 +1,4 @@
-/* $XTermId: version.h,v 1.302 2009/08/14 09:04:02 tom Exp $ */
+/* $XTermId: version.h,v 1.303 2009/08/28 10:49:30 tom Exp $ */
 
 /*
  * These definitions are used to build the string that's printed in response to
@@ -6,7 +6,7 @@
  * version of X to which this version of xterm has been built.  The number in
  * parentheses is my patch number (Thomas E. Dickey).
  */
-#define XTERM_PATCH   246
+#define XTERM_PATCH   247
 
 #ifndef __vendorversion__
 #define __vendorversion__ "XTerm/OpenBSD"
diff --git a/app/xterm/xterm.log.html b/app/xterm/xterm.log.html
index a2719afe4..f0b680c95 100644
--- a/app/xterm/xterm.log.html
+++ b/app/xterm/xterm.log.html
@@ -20,7 +20,7 @@ t<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF   *
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.            *
  *****************************************************************************
-  $XTermId: xterm.log.html,v 1.781 2009/08/16 22:51:21 tom Exp $
+  $XTermId: xterm.log.html,v 1.785 2009/08/30 23:59:11 tom Exp $
   -->
 <HTML>
 <HEAD>
@@ -45,6 +45,7 @@ Most of these are summarized in the XFree86 CHANGELOG
 is the latest version of this file.
 
 <UL>
+<LI><A HREF="#xterm_247">Patch #247 - 2009/8/30</A>
 <LI><A HREF="#xterm_246">Patch #246 - 2009/8/16</A>
 <LI><A HREF="#xterm_245">Patch #245 - 2009/8/12</A>
 <LI><A HREF="#xterm_244">Patch #244 - 2009/8/9</A>
@@ -294,6 +295,20 @@ is the latest version of this file.
 <LI><A HREF="#xterm_01">Patch #1 - 1996/1/6</A>
 </UL>
 
+<H1><A NAME="xterm_247">Patch #247 - 2009/8/30</A></H1>
+<ul>
+	<li>add ifdef's and check for openpty() on DragonFly (patch by
+	    Alex Hornung).
+
+	<li>correct calculation for size of line's data block, which was
+	    sometimes off-by-one when configured
+	    using <code>--enable-16bit-chars</code>
+	    (report by H Merijn Brand).
+
+	<li>fix indexing error in print-everything feature from
+	    <a href="#xterm_246">patch #246</a> (patch by Ovidiu Gheorghioiu).
+</ul>
+
 <H1><A NAME="xterm_246">Patch #246 - 2009/8/16</A></H1>
 <ul>
 	<li>remove obsolete logic for saving/restoring wrapping flags, which