*** x11win.c.orig	Sat Apr 21 14:59:51 2001
--- x11win.c	Sat Apr 13 22:01:13 2002
***************
*** 384,390 ****
  static int IdentCount;
  #endif
  
- static int HeldButton;
  static int HeldStep;
  
  static Byte Intensity[LutSize];
--- 384,389 ----
***************
*** 656,662 ****
          sprintf(buffer,"%x %s",(int)MainWin,name);
          XChangeProperty( dpy, RootWindow(dpy,0), InterpAtom, XA_STRING, 
                           8, PropModeReplace, (unsigned char*)buffer, 
!                          strlen(buffer)+1 );
          return( True );
      }
  
--- 655,661 ----
          sprintf(buffer,"%x %s",(int)MainWin,name);
          XChangeProperty( dpy, RootWindow(dpy,0), InterpAtom, XA_STRING, 
                           8, PropModeReplace, (unsigned char*)buffer, 
!                          (int)strlen(buffer)+1 );
          return( True );
      }
  
***************
*** 679,685 ****
      sprintf(buffer,"%x %s",(int)MainWin,name);
      XChangeProperty( dpy, RootWindow(dpy,0), InterpAtom, XA_STRING, 
                       8, PropModeAppend, (unsigned char*)buffer, 
!                      strlen(buffer)+1 );
      return( True );
  }
  
--- 678,684 ----
      sprintf(buffer,"%x %s",(int)MainWin,name);
      XChangeProperty( dpy, RootWindow(dpy,0), InterpAtom, XA_STRING, 
                       8, PropModeAppend, (unsigned char*)buffer, 
!                      (int)strlen(buffer)+1 );
      return( True );
  }
  
***************
*** 730,736 ****
          *dst = 0;
  
          XChangeProperty( dpy, RootWindow(dpy,0), InterpAtom, XA_STRING,
!                          8, PropModeReplace, registry, dst-(char*)registry );
      }
      XFree( (char*)registry );
  }
--- 729,735 ----
          *dst = 0;
  
          XChangeProperty( dpy, RootWindow(dpy,0), InterpAtom, XA_STRING,
!                          8, PropModeReplace, registry, (int)(dst-(char*)registry) );
      }
      XFree( (char*)registry );
  }
***************
*** 1925,1939 ****
  
  int CreateImage( void )
  {
!     register Long size, temp;
      register int format;
      register Pixel *ptr;
  
      if( !Interactive )
      {   if( FBuffer ) free(FBuffer);
!         size = (Long)XRange*YRange*sizeof(Pixel);
          FBuffer = (Pixel*)malloc( size+32 );
!         return( (int)FBuffer );
      }
  
      format = Monochrome? XYPixmap : ZPixmap;
--- 1924,1938 ----
  
  int CreateImage( void )
  {
!     register long size, temp;
      register int format;
      register Pixel *ptr;
  
      if( !Interactive )
      {   if( FBuffer ) free(FBuffer);
!         size = (long)XRange*YRange*sizeof(Pixel);
          FBuffer = (Pixel*)malloc( size+32 );
! 	return((FBuffer!=(Pixel*)NULL)?True : False);
      }
  
      format = Monochrome? XYPixmap : ZPixmap;
***************
*** 1955,1969 ****
  
      if( Monochrome )
      {   /* Monochrome Mode Frame Buffer! */
!         size = (Long)XRange*YRange*sizeof(Pixel);
          FBuffer = (Pixel*)malloc( size+32 );
!         if( !FBuffer ) return False;
  
          /* Bit per Pixel ScanLines! */
          temp = ((XRange+31)>>5)<<2;
!         size = (Long)temp*YRange + 32;
      } else 
!         size = (Long)XRange*YRange*sizeof(Pixel) + 32;
  
  #ifdef MITSHM
      if( SharedMemOption )
--- 1954,1968 ----
  
      if( Monochrome )
      {   /* Monochrome Mode Frame Buffer! */
!         size = (long)XRange*YRange*sizeof(Pixel);
          FBuffer = (Pixel*)malloc( size+32 );
! 	if( FBuffer == (Pixel*)NULL) return False;
  
          /* Bit per Pixel ScanLines! */
          temp = ((XRange+31)>>5)<<2;
!         size = (long)temp*YRange + 32;
      } else 
!         size = (long)XRange*YRange*sizeof(Pixel) + 32;
  
  #ifdef MITSHM
      if( SharedMemOption )
***************
*** 2007,2018 ****
  
      /* Allocate Frame Buffer! */
      ptr = (Pixel*)malloc( size );
!     if( !ptr ) return False;
  
      if( !Monochrome ) FBuffer = ptr;
      image = XCreateImage( dpy, vis, PixDepth, format, 0, (char*)ptr, 
                            XRange, YRange, sizeof(Pixel)<<3, 0 );
!     return (int)image;
  }
  
  
--- 2006,2017 ----
  
      /* Allocate Frame Buffer! */
      ptr = (Pixel*)malloc( size );
!     if( ptr == (Pixel*)NULL) return False;
  
      if( !Monochrome ) FBuffer = ptr;
      image = XCreateImage( dpy, vis, PixDepth, format, 0, (char*)ptr, 
                            XRange, YRange, sizeof(Pixel)<<3, 0 );
!     return ((image==(XImage *)NULL)? False : True);
  }
  
  
***************
*** 2179,2185 ****
      static Atom type;
      char buffer[32];
  
!     register int rlen;
      register int result;
      register int (*handler)();
      register char *cmnd;
--- 2178,2184 ----
      static Atom type;
      char buffer[32];
  
!     register size_t rlen;
      register int result;
      register int (*handler)();
      register char *cmnd;
***************
*** 2254,2260 ****
              handler = XSetErrorHandler( HandleIPCError );
              XChangeProperty( dpy, source, CommAtom, XA_STRING, 8,
                               PropModeAppend, (unsigned char*)buffer, 
!                              strlen(buffer)+1 );
              XSync(dpy,False);
              XSetErrorHandler(handler);
          } 
--- 2253,2259 ----
              handler = XSetErrorHandler( HandleIPCError );
              XChangeProperty( dpy, source, CommAtom, XA_STRING, 8,
                               PropModeAppend, (unsigned char*)buffer, 
!                              (int)strlen(buffer)+1 );
              XSync(dpy,False);
              XSetErrorHandler(handler);
          }