XFree86 3.9Nj/3.3.2e - xterm patch #86 - 1998/10/14 - T.Dickey <dickey@clark.net>

A small bug fix.

# ------------------------------------------------------------------------------
#  charproc.c     |    2 +-
#  version.h      |    2 +-
#  xterm.log.html |    6 ++++++
#  xtermcfg.hin   |    3 ++-
#  4 files changed, 10 insertions, 3 deletions
# ------------------------------------------------------------------------------
Index: charproc.c
--- xterm-85+/charproc.c	Sun Oct 11 20:58:52 1998
+++ xterm-86/charproc.c	Wed Oct 14 06:51:57 1998
@@ -3995,6 +3995,7 @@
 		(int) term->core.depth,
 		InputOutput, CopyFromParent,
 		*valuemask|CWBitGravity, values);
+	screen->event_mask = values->event_mask;
 
 #ifndef NO_ACTIVE_ICON
 	if (term->misc.active_icon && screen->fnt_icon) {
@@ -4021,7 +4022,6 @@
 	    /* since only one client is permitted to select for Button
 	     * events, we have to let the window manager get 'em...
 	     */
-	    screen->event_mask = values->event_mask;
 	    values->event_mask &= ~(ButtonPressMask|ButtonReleaseMask);
 	    values->border_pixel = term->misc.icon_border_pixel;
 
Index: version.h
--- xterm-85+/version.h	Sun Oct 11 21:34:02 1998
+++ xterm-86/version.h	Wed Oct 14 06:55:26 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(85)"
+#define XTERM_VERSION "XFree86 3.9Nj(86)"
Index: xterm.log.html
--- xterm-85+/xterm.log.html	Mon Oct 12 06:16:49 1998
+++ xterm-86/xterm.log.html	Wed Oct 14 06:54:58 1998
@@ -41,6 +41,7 @@
 xc/programs/Xserver/hw/xfree86).
 
 <UL>
+<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>
 <LI><A HREF="#sync_83">Resync #83 - 1998/10/7 - XFree86 3.3.2e</A>
@@ -128,6 +129,11 @@
 <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_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,
+the event mask was incorrect if xterm was built under X11R5 because the
+original data was saved under an ifdef for active-icon.
 
 <H1><A NAME="xterm_85">Patch #85 - 1998/10/12 - XFree86 3.9Nj and 3.3.2e</A></H1>
 Some cleanup (I noticed the pixel droppings a few months ago after getting a
Index: xtermcfg.hin
--- xterm-85+/xtermcfg.hin	Sun Oct 11 17:18:52 1998
+++ xterm-86/xtermcfg.hin	Wed Oct 14 06:52:56 1998
@@ -79,11 +79,12 @@
 
 #if USE_MY_MEMMOVE
 #define memmove(d,s,n) my_memmove(d,s,n)
+extern char * my_memmove(char * s1, char * s2, size_t n);
 #endif
 
 #if !HAVE_STRERROR
 #define strerror(n) my_strerror(n)
-extern char *my_strerror();
+extern char *my_strerror(int n);
 #endif
 
 #if !HAVE_X11_XPOLL_H