Update patch to move.c to stop tvtwm crashing in some rare situations.

3 files changed, 32 insertions, 20 deletions

diff --git a/wm/tvtwm/Makefile b/wm/tvtwm/Makefile
index e3fc5893f68..35ae68a8397 100644
--- a/wm/tvtwm/Makefile
+++ b/wm/tvtwm/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2004/03/10 14:12:51 xtraeme Exp $
+# $NetBSD: Makefile,v 1.11 2004/09/18 11:59:06 blymn Exp $
 
 DISTNAME=	tvtwm.pl11
 PKGNAME=	tvtwm-11
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	x11 wm
 MASTER_SITES=	${MASTER_SITE_XCONTRIB:=window_managers/}
 
diff --git a/wm/tvtwm/distinfo b/wm/tvtwm/distinfo
index 306568745cb..c2b3e9db563 100644
--- a/wm/tvtwm/distinfo
+++ b/wm/tvtwm/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2004/05/23 23:28:29 danw Exp $
+$NetBSD: distinfo,v 1.4 2004/09/18 11:59:06 blymn Exp $
 
 SHA1 (tvtwm.pl11.tar.gz) = a0e092c6dbab072b488606c28a78746d1b55d078
 Size (tvtwm.pl11.tar.gz) = 224935 bytes
@@ -15,7 +15,7 @@ SHA1 (patch-al) = 6614b46b5f348ebaf8418494ab1eac71bf845f63
 SHA1 (patch-am) = 3691648d9a7f1b25f742f359cdf50e32bb11ddc3
 SHA1 (patch-an) = db292b1aa120da9a95629352175b5042a1bb7d77
 SHA1 (patch-ao) = 033a8c45601fb0804f365a92d67d2c98391c80a2
-SHA1 (patch-ap) = 9ec04518a4d56c02120ba6cbd1fd2b37a98b14f1
+SHA1 (patch-ap) = 2e5f81e4c586949f3c43ecdb09bf7463adc19dce
 SHA1 (patch-aq) = 171a4fbcf7a79608e77db8f8f925c80ca91167d2
 SHA1 (patch-ar) = d00034f3db33f5a01a855fccca1b22f3281829d2
 SHA1 (patch-as) = 05276c93e34536501a8cdf1d45b36c933bd67e91
diff --git a/wm/tvtwm/patches/patch-ap b/wm/tvtwm/patches/patch-ap
index 3185c0aeaf2..532ef839eeb 100644
--- a/wm/tvtwm/patches/patch-ap
+++ b/wm/tvtwm/patches/patch-ap
@@ -1,13 +1,7 @@
-$NetBSD: patch-ap,v 1.1.1.1 2000/12/12 02:03:49 wiz Exp $
+$NetBSD: patch-ap,v 1.2 2004/09/18 11:59:06 blymn Exp $
 
-Index: move.c
-===================================================================
-RCS file: /home/siren/src/tvtwm/move.c,v
-retrieving revision 1.1.1.1
-retrieving revision 1.2
-diff -u -r1.1.1.1 -r1.2
---- move.c	1999/08/08 05:46:52	1.1.1.1
-+++ move.c	1999/08/08 05:56:54	1.2
+--- move.c.orig	1994-05-12 08:28:47.000000000 +0930
++++ move.c
 @@ -34,11 +34,6 @@
   *
   **********************************************************************/
@@ -20,7 +14,7 @@ diff -u -r1.1.1.1 -r1.2
  #include <stdio.h>
  #include <X11/X.h>
  #include <X11/Xatom.h>
-@@ -70,7 +65,8 @@
+@@ -70,7 +65,8 @@ static int doingMove = False;
  
  static void reallyStartMove();
  static void doMove();
@@ -30,7 +24,7 @@ diff -u -r1.1.1.1 -r1.2
  
  /***********************************************************************
   *
-@@ -165,11 +161,9 @@
+@@ -165,11 +161,9 @@ int adding;		/* adding a window from add
  int pulldown;		/* moving window from a pulldown menu */
  {
      Window junkRoot, junkChild;
@@ -43,7 +37,7 @@ diff -u -r1.1.1.1 -r1.2
      int first;
      XSetWindowAttributes attr;
      XWindowAttributes wattr;
-@@ -338,7 +332,7 @@
+@@ -338,7 +332,7 @@ int panner;
  	XRaiseWindow(dpy, window);
  
      while (True) {
@@ -52,7 +46,7 @@ diff -u -r1.1.1.1 -r1.2
  	if (done) {
  	    doMove(tmp_win, window, *x_root, *y_root, &xdest, &ydest, panner, False);
  	    break;
-@@ -363,9 +357,8 @@
+@@ -363,9 +357,8 @@ int panner;
  int paint;
  {
      int xl, yt;
@@ -63,7 +57,7 @@ diff -u -r1.1.1.1 -r1.2
      Window actual, virtual;
  
      dragX = x_root;
-@@ -374,8 +367,8 @@
+@@ -374,8 +367,8 @@ int paint;
      xl = dragX + diffX;
      yt = dragY + diffY;
  
@@ -74,7 +68,7 @@ diff -u -r1.1.1.1 -r1.2
  
      if (MoveFunction != F_FORCEMOVE && Scr->DontMoveOff && outlineWindow != Scr->Panner) {
  	if (tmp_win->root == Scr->VirtualDesktop || tmp_win->root == Scr->Panner) {
-@@ -438,8 +431,8 @@
+@@ -438,8 +431,8 @@ int paint;
  }
  
  static void
@@ -85,7 +79,7 @@ diff -u -r1.1.1.1 -r1.2
  int *x_root;
  int *y_root;
  int *cancel;
-@@ -448,11 +441,9 @@
+@@ -448,11 +441,9 @@ int *first;
  int adding;
  int pulldown;
  {
@@ -97,3 +91,21 @@ diff -u -r1.1.1.1 -r1.2
      unsigned mask;
      static int buttons;
  
+@@ -521,7 +512,7 @@ int pulldown;
+ 		}
+ 		break;
+ 	    case EnterNotify:
+-                if (doingMove && event.xcrossing.window == Scr->Panner && event.xcrossing.detail != NotifyInferior)
++                if (doingMove && Scr != NULL && event.xcrossing.window == Scr->Panner && event.xcrossing.detail != NotifyInferior)
+                 {
+                     MoveOutline(outlineWindow, 0,0,0,0,0,0);
+                     *cancel = IN_PANNER;
+@@ -530,7 +521,7 @@ int pulldown;
+                 }
+ 		break;
+ 	    case LeaveNotify:
+-                if (doingMove && event.xcrossing.window == Scr->Panner &&
++                if (doingMove && Scr != NULL && event.xcrossing.window == Scr->Panner &&
+ 		    event.xcrossing.detail != NotifyInferior && event.xcrossing.mode == NotifyNormal)
+                 {
+                     MoveOutline(outlineWindow, 0,0,0,0,0,0);