# ------------------------------------------------------------------------------
# Makefile.in | 2 ++
# charproc.c | 4 ++--
# ptyx.h | 5 +++--
# version.h | 2 +-
# xterm.log.html | 11 +++++++++++
# 5 files changed, 19 insertions, 5 deletions
# ------------------------------------------------------------------------------
Index: Makefile.in
--- xterm-86+/Makefile.in Sun Oct 11 14:59:56 1998
+++ xterm-87/Makefile.in Wed Oct 21 17:21:19 1998
@@ -77,6 +77,8 @@
main.o: version.h
+$(OBJS1) : ptyx.h
+
xterm : $(OBJS1)
@ECHO_LD@$(LINK) $(LDFLAGS) -o $@ $(OBJS1) $(X_LIBS) $(X_EXTRA_LIBS) $(LIBS) $(EXTRA_LOADFLAGS)
Index: charproc.c
--- xterm-86+/charproc.c Wed Oct 14 06:51:57 1998
+++ xterm-87/charproc.c Wed Oct 21 17:19:43 1998
@@ -600,10 +600,10 @@
{XtNprinterCommand,XtCPrinterCommand, XtRString, sizeof(String),
XtOffsetOf(XtermWidgetRec, screen.printer_command),
XtRString, (XtPointer) "lpr"},
-{XtNprinterExtent,XtCPrinterExtent, XtRBoolean, sizeof(String),
+{XtNprinterExtent,XtCPrinterExtent, XtRBoolean, sizeof(Boolean),
XtOffsetOf(XtermWidgetRec, screen.printer_extent),
XtRBoolean, (XtPointer) &defaultFALSE},
-{XtNprinterFormFeed,XtCPrinterFormFeed, XtRBoolean, sizeof(String),
+{XtNprinterFormFeed,XtCPrinterFormFeed, XtRBoolean, sizeof(Boolean),
XtOffsetOf(XtermWidgetRec, screen.printer_formfeed),
XtRBoolean, (XtPointer) &defaultFALSE},
{XtNmultiClickTime,XtCMultiClickTime, XtRInt, sizeof(int),
Index: ptyx.h
--- xterm-86+/ptyx.h Sun Oct 11 20:57:55 1998
+++ xterm-87/ptyx.h Wed Oct 21 18:44:56 1998
@@ -40,6 +40,7 @@
#include <X11/Xmu/Misc.h> /* For Max() and Min(). */
#include <X11/Xfuncs.h>
#include <X11/Xosdefs.h>
+#include <X11/Xmu/Converters.h>
/* adapted from IntrinsicI.h */
#define MyStackAlloc(size, stack_cache_array) \
@@ -810,7 +811,7 @@
Boolean backarrow_key; /* backspace/delete */
Pixmap menu_item_bitmap; /* mask for checking items */
Widget mainMenu, vtMenu, tekMenu, fontMenu;
- char* menu_font_names[NMENUFONTS];
+ String menu_font_names[NMENUFONTS];
int menu_font_number;
XIC xic;
} TScreen;
@@ -845,7 +846,7 @@
#endif
Boolean login_shell;
Boolean re_verse;
- int resizeGravity;
+ XtGravity resizeGravity;
Boolean reverseWrap;
Boolean autoWrap;
Boolean logInhibit;
Index: version.h
--- xterm-86+/version.h Wed Oct 14 06:55:26 1998
+++ xterm-87/version.h Wed Oct 21 17:52:20 1998
@@ -6,4 +6,4 @@
* version of xterm has been built. The number in parentheses is my patch
* number (T.Dickey).
*/
-#define XTERM_VERSION "XFree86 3.9Nj(86)"
+#define XTERM_VERSION "XFree86 3.9Nj(87)"
Index: xterm.log.html
--- xterm-86+/xterm.log.html Wed Oct 14 06:54:58 1998
+++ xterm-87/xterm.log.html Wed Oct 21 18:58:17 1998
@@ -41,6 +41,7 @@
xc/programs/Xserver/hw/xfree86).
<UL>
+<LI><A HREF="#xterm_87">Patch #87 - 1998/10/21 - XFree86 3.9Nj and 3.3.2f</A>
<LI><A HREF="#xterm_86">Patch #86 - 1998/10/14 - XFree86 3.9Nj and 3.3.2e</A>
<LI><A HREF="#xterm_85">Patch #85 - 1998/10/12 - XFree86 3.9Nj and 3.3.2e</A>
<LI><A HREF="#xterm_84">Patch #84 - 1998/10/9 - XFree86 3.9Ni and 3.3.2e</A>
@@ -129,6 +130,16 @@
<LI><A HREF="#xterm_02">Patch #2 - 1996/1/7</A>
<LI><A HREF="#xterm_01">Patch #1 - 1996/1/6</A>
</UL>
+
+<H1><A NAME="xterm_87">Patch #87 - 1998/10/21 - XFree86 3.9Nj and 3.3.2f</A></H1>
+This corrects a problem reported by Stefan Dalibor. My table entries for the
+<em>printerExtent</em> and <em>printerFormFeed</em> resources used the wrong
+types for sizeof, causing the printer to not work properly on some platforms
+because the <em>printAttributes</em> resource was overwritten (e.g., Digital Unix with DEC Alpha).
+<p>
+I reviewed all of the resource table entries and fixed a potential problem with
+<em>resizeGravity</em>, which was typed as <em>int</em> rather than
+<em>XtGravity</em>.
<H1><A NAME="xterm_86">Patch #86 - 1998/10/14 - XFree86 3.9Nj and 3.3.2e</A></H1>
A small fix: when switching to/from the continuous mouse reporting mode,