diff -c xmris.4.01/CHANGES.4.02 xmris.4.02/CHANGES.4.02
*** xmris.4.01/CHANGES.4.02	Wed Feb 16 12:52:51 1994
--- xmris.4.02/CHANGES.4.02	Wed Feb 16 12:28:43 1994
***************
*** 0 ****
--- 1,12 ----
+ XMRIS V4.02 changes from 4.01
+ 
+ typos in scoring.c fixed about locking_file
+ 
+ AllTarget removed from Imakefile, as its broke on too many systems
+ 
+ Imakefile checks some required macros, and makes them up if
+ they're not defined
+ 
+ Keys displayed for DEBUGEVENTLOOP
+ 
+ protected convert_string2color from NULL argument list
diff -c xmris.4.01/Drag.c xmris.4.02/Drag.c
*** xmris.4.01/Drag.c	Tue Feb  8 19:02:58 1994
--- xmris.4.02/Drag.c	Wed Feb 16 12:26:29 1994
***************
*** 1,5 ****
  /* Copyright (C) 1993 Nathan Sidwell */
! /* RCS $Id: Drag.c,v 4.13 1993/11/01 16:23:50 nathan stable $ */
  /* the drag widget is an override shell to be popped up
   * and follow the pointer until released.
   * A pixmap is displayed in the widget.
--- 1,5 ----
  /* Copyright (C) 1993 Nathan Sidwell */
! /* RCS $Id: Drag.c,v 4.13 1993/11/01 16:23:50 nathan Stable $ */
  /* the drag widget is an override shell to be popped up
   * and follow the pointer until released.
   * A pixmap is displayed in the widget.
diff -c xmris.4.01/Drag.h xmris.4.02/Drag.h
*** xmris.4.01/Drag.h	Tue Feb  8 19:03:03 1994
--- xmris.4.02/Drag.h	Wed Feb 16 12:21:36 1994
***************
*** 1,5 ****
  /* Copyright (C) 1993 Nathan Sidwell */
! /* RCS $Id: Drag.h,v 4.5 1993/10/01 19:19:35 nathan stable $ */
  
  #ifndef Mred_Drag_h
  #define Mred_Drag_h
--- 1,5 ----
  /* Copyright (C) 1993 Nathan Sidwell */
! /* RCS $Id: Drag.h,v 4.5 1993/10/01 19:19:35 nathan Stable $ */
  
  #ifndef Mred_Drag_h
  #define Mred_Drag_h
Only in xmris.4.01: Drag.o
diff -c xmris.4.01/Icon.c xmris.4.02/Icon.c
*** xmris.4.01/Icon.c	Tue Feb  8 19:03:00 1994
--- xmris.4.02/Icon.c	Wed Feb 16 12:27:01 1994
***************
*** 1,5 ****
  /* Copyright (C) 1993 Nathan Sidwell */
! /* RCS $Id: Icon.c,v 4.12 1993/10/29 14:04:44 nathan stable $ */
  /* this widget holds a pixmap which it can select a row/column from
   * similar to a command widget, or initiate a drag on press and move
   */
--- 1,5 ----
  /* Copyright (C) 1993 Nathan Sidwell */
! /* RCS $Id: Icon.c,v 4.12 1993/10/29 14:04:44 nathan Stable $ */
  /* this widget holds a pixmap which it can select a row/column from
   * similar to a command widget, or initiate a drag on press and move
   */
diff -c xmris.4.01/Icon.h xmris.4.02/Icon.h
*** xmris.4.01/Icon.h	Tue Feb  8 19:03:05 1994
--- xmris.4.02/Icon.h	Wed Feb 16 12:21:37 1994
***************
*** 1,5 ****
  /* Copyright (C) 1993 Nathan Sidwell */
! /* RCS $Id: Icon.h,v 4.7 1993/10/01 19:19:35 nathan stable $ */
  
  #ifndef Mred_Icon_h
  #define Mred_Icon_h
--- 1,5 ----
  /* Copyright (C) 1993 Nathan Sidwell */
! /* RCS $Id: Icon.h,v 4.7 1993/10/01 19:19:35 nathan Stable $ */
  
  #ifndef Mred_Icon_h
  #define Mred_Icon_h
Only in xmris.4.01: Icon.o
diff -c xmris.4.01/Imakefile xmris.4.02/Imakefile
*** xmris.4.01/Imakefile	Tue Feb  8 18:59:27 1994
--- xmris.4.02/Imakefile	Wed Feb 16 12:10:54 1994
***************
*** 3,16 ****
  #endif
  
  XCOMM Copyright (C) 1993 Nathan Sidwell
! XCOMM RCS $Id: Imakefile,v 4.50 1994/02/08 18:52:34 nathan stable $
  
  XCOMM specify if this is a transputer target
  XCOMM #define transputerbuild 1
  
  XCOMM For full details of the switches herein, read the README file
! XCOMM Imake file for xmris V4.01 31 January 1994
! VERSION = 4.01
  
  /* Imake compatibility */
  #ifndef MakeDir
--- 3,16 ----
  #endif
  
  XCOMM Copyright (C) 1993 Nathan Sidwell
! XCOMM RCS $Id: Imakefile,v 4.51 1994/02/16 11:30:37 nathan Stable $
  
  XCOMM specify if this is a transputer target
  XCOMM #define transputerbuild 1
  
  XCOMM For full details of the switches herein, read the README file
! XCOMM Imake file for xmris V4.02 15 February 1994
! VERSION = 4.02
  
  /* Imake compatibility */
  #ifndef MakeDir
***************
*** 160,166 ****
  MREDHDRS = xmred.h defmred.h
  COMMONSRCS = defcom.c makecom.c
  GARDENS = alphabet.gdn digits.gdn puzzle.gdn xmred.gdn
! FILES = CHANGES CHANGES.4.01 README COPYRIGHT Imakefile \
  	xmris.man xmred.man Xmris-ad.src
  MRISSRCS = apple.c defmris.c demo.c draw.c makemris.c \ 
  	monster.c move.c player.c scoring.c timer.c xmris.c
--- 160,166 ----
  MREDHDRS = xmred.h defmred.h
  COMMONSRCS = defcom.c makecom.c
  GARDENS = alphabet.gdn digits.gdn puzzle.gdn xmred.gdn
! FILES = CHANGES CHANGES.4.01 CHANGES.4.02 README COPYRIGHT Imakefile \
  	xmris.man xmred.man Xmris-ad.src
  MRISSRCS = apple.c defmris.c demo.c draw.c makemris.c \ 
  	monster.c move.c player.c scoring.c timer.c xmris.c
***************
*** 245,257 ****
  	@#keep gnumake happy
  
  #if transputerbuild
! AllTarget(xmris.btl xmred.btl)
  
  #else
! AllTarget(xmris xmred)
  
  #endif /* transputerbuild */
! AllTarget(README.xmris README.xmred Xmris.ad)
  
  XCOMM rules to make sure the initialize thing is done
  clean :: initialize
--- 245,260 ----
  	@#keep gnumake happy
  
  #if transputerbuild
! all :: xmris.btl xmred.btl
! 	@#keep gnumake happy
  
  #else
! all :: xmris xmred
! 	@#keep gnumake happy
  
  #endif /* transputerbuild */
! all :: README.xmris README.xmred Xmris.ad
! 	@#keep gnumake happy
  
  XCOMM rules to make sure the initialize thing is done
  clean :: initialize
Only in xmris.4.01: Makefile
Only in xmris.4.01: Makefile.bak
diff -c xmris.4.01/Makefile.std xmris.4.02/Makefile.std
*** xmris.4.01/Makefile.std	Tue Feb  8 18:59:36 1994
--- xmris.4.02/Makefile.std	Wed Feb 16 12:11:36 1994
***************
*** 275,288 ****
  # start of Imakefile
  
  # Copyright (C) 1993 Nathan Sidwell
! # RCS $Id: Imakefile,v 4.50 1994/02/08 18:52:34 nathan stable $
  
  # specify if this is a transputer target
  # #define transputerbuild 1
  
  # For full details of the switches herein, read the README file
! # Imake file for xmris V4.01 31 January 1994
! VERSION = 4.01
  
  # compiler options
  #
--- 275,288 ----
  # start of Imakefile
  
  # Copyright (C) 1993 Nathan Sidwell
! # RCS $Id: Imakefile,v 4.51 1994/02/16 11:30:37 nathan Stable $
  
  # specify if this is a transputer target
  # #define transputerbuild 1
  
  # For full details of the switches herein, read the README file
! # Imake file for xmris V4.02 15 February 1994
! VERSION = 4.02
  
  # compiler options
  #
***************
*** 369,375 ****
  MREDHDRS = xmred.h defmred.h
  COMMONSRCS = defcom.c makecom.c
  GARDENS = alphabet.gdn digits.gdn puzzle.gdn xmred.gdn
! FILES = CHANGES CHANGES.4.01 README COPYRIGHT Imakefile \
  	xmris.man xmred.man Xmris-ad.src
  MRISSRCS = apple.c defmris.c demo.c draw.c makemris.c \
  	monster.c move.c player.c scoring.c timer.c xmris.c
--- 369,375 ----
  MREDHDRS = xmred.h defmred.h
  COMMONSRCS = defcom.c makecom.c
  GARDENS = alphabet.gdn digits.gdn puzzle.gdn xmred.gdn
! FILES = CHANGES CHANGES.4.01 CHANGES.4.02 README COPYRIGHT Imakefile \
  	xmris.man xmred.man Xmris-ad.src
  MRISSRCS = apple.c defmris.c demo.c draw.c makemris.c \
  	monster.c move.c player.c scoring.c timer.c xmris.c
***************
*** 453,461 ****
  all :: initialize
  	@#keep gnumake happy
  
! all:: xmris xmred
  
! all:: README.xmris README.xmred Xmris.ad
  
  # rules to make sure the initialize thing is done
  clean :: initialize
--- 453,463 ----
  all :: initialize
  	@#keep gnumake happy
  
! all :: xmris xmred
! 	@#keep gnumake happy
  
! all :: README.xmris README.xmred Xmris.ad
! 	@#keep gnumake happy
  
  # rules to make sure the initialize thing is done
  clean :: initialize
diff -c xmris.4.01/PixmapList.c xmris.4.02/PixmapList.c
*** xmris.4.01/PixmapList.c	Tue Feb  8 19:03:02 1994
--- xmris.4.02/PixmapList.c	Wed Feb 16 12:27:20 1994
***************
*** 1,5 ****
  /* Copyright (C) 1993 Nathan Sidwell */
! /* RCS $Id: PixmapList.c,v 4.8 1994/01/06 10:20:24 nathan stable $ */
  /* Holds a list of pixmaps which can be selected or dragged like
   * individual Icon widgets.
   * I tried using a box widget with an insertPosition function
--- 1,5 ----
  /* Copyright (C) 1993 Nathan Sidwell */
! /* RCS $Id: PixmapList.c,v 4.8 1994/01/06 10:20:24 nathan Stable $ */
  /* Holds a list of pixmaps which can be selected or dragged like
   * individual Icon widgets.
   * I tried using a box widget with an insertPosition function
diff -c xmris.4.01/PixmapList.h xmris.4.02/PixmapList.h
*** xmris.4.01/PixmapList.h	Tue Feb  8 19:03:07 1994
--- xmris.4.02/PixmapList.h	Wed Feb 16 12:21:39 1994
***************
*** 1,5 ****
  /* Copyright (C) 1993 Nathan Sidwell */
! /* RCS $Id: PixmapList.h,v 4.4 1993/12/14 16:55:52 nathan stable $ */
  
  #ifndef Mred_PixmapList_h
  #define Mred_PixmapList_h
--- 1,5 ----
  /* Copyright (C) 1993 Nathan Sidwell */
! /* RCS $Id: PixmapList.h,v 4.4 1993/12/14 16:55:52 nathan Stable $ */
  
  #ifndef Mred_PixmapList_h
  #define Mred_PixmapList_h
Only in xmris.4.01: PixmapList.o
Only in xmris.4.01: Xmris.ad
diff -c xmris.4.01/all.c xmris.4.02/all.c
*** xmris.4.01/all.c	Tue Feb  8 19:02:46 1994
--- xmris.4.02/all.c	Wed Feb 16 12:21:40 1994
***************
*** 1,5 ****
  /* Copyright (C) 1993, 1992 Nathan Sidwell */
! /* RCS $Id: all.c,v 4.17 1994/01/06 10:20:24 nathan stable $ */
  /*{{{  includes*/
  #include "xmred.h"
  #include <X11/StringDefs.h>
--- 1,5 ----
  /* Copyright (C) 1993, 1992 Nathan Sidwell */
! /* RCS $Id: all.c,v 4.17 1994/01/06 10:20:24 nathan Stable $ */
  /*{{{  includes*/
  #include "xmred.h"
  #include <X11/StringDefs.h>
Only in xmris.4.01: all.o
diff -c xmris.4.01/ansiknr.h xmris.4.02/ansiknr.h
*** xmris.4.01/ansiknr.h	Tue Feb  8 18:59:44 1994
--- xmris.4.02/ansiknr.h	Wed Feb 16 12:11:45 1994
***************
*** 1,5 ****
  /* Copyright (C) 1993 Nathan Sidwell */
! /* RCS $Id: ansiknr.h,v 4.5 1994/01/25 18:33:03 nathan stable $ */
  /* macros to make both ANSI & K&R compilers happy */
  /* uses FUNCPROTO like Xfuncproto.h does, so you can tailor things */
  /*{{{  prototypes*/
--- 1,5 ----
  /* Copyright (C) 1993 Nathan Sidwell */
! /* RCS $Id: ansiknr.h,v 4.5 1994/01/25 18:33:03 nathan Stable $ */
  /* macros to make both ANSI & K&R compilers happy */
  /* uses FUNCPROTO like Xfuncproto.h does, so you can tailor things */
  /*{{{  prototypes*/
diff -c xmris.4.01/apple.c xmris.4.02/apple.c
*** xmris.4.01/apple.c	Tue Feb  8 18:59:47 1994
--- xmris.4.02/apple.c	Wed Feb 16 12:11:48 1994
***************
*** 1,5 ****
  /* Copyright (C) 1993, 1992 Nathan Sidwell */
! /* RCS $Id: apple.c,v 4.10 1993/12/10 11:52:23 nathan stable $ */
  #include "xmris.h"
  /*{{{  prototypes*/
  static APPLE *apple_search PROTOARG((int, int, unsigned, unsigned, unsigned));
--- 1,5 ----
  /* Copyright (C) 1993, 1992 Nathan Sidwell */
! /* RCS $Id: apple.c,v 4.10 1993/12/10 11:52:23 nathan Stable $ */
  #include "xmris.h"
  /*{{{  prototypes*/
  static APPLE *apple_search PROTOARG((int, int, unsigned, unsigned, unsigned));
Only in xmris.4.01: apple.o
Common subdirectories: xmris.4.01/bitmaps and xmris.4.02/bitmaps
diff -c xmris.4.01/common.h xmris.4.02/common.h
*** xmris.4.01/common.h	Tue Feb  8 18:59:43 1994
--- xmris.4.02/common.h	Wed Feb 16 12:11:44 1994
***************
*** 1,5 ****
  /* Copyright (C) 1993, 1992 Nathan Sidwell */
! /* RCS $Id: common.h,v 4.27 1994/01/31 17:40:36 nathan stable $ */
  /* common header stuff for xmris and xmred
   * included from xmris.h or xmred.h
   */
--- 1,5 ----
  /* Copyright (C) 1993, 1992 Nathan Sidwell */
! /* RCS $Id: common.h,v 4.27 1994/01/31 17:40:36 nathan Stable $ */
  /* common header stuff for xmris and xmred
   * included from xmris.h or xmred.h
   */
diff -c xmris.4.01/control.c xmris.4.02/control.c
*** xmris.4.01/control.c	Tue Feb  8 19:02:48 1994
--- xmris.4.02/control.c	Wed Feb 16 12:22:20 1994
***************
*** 1,5 ****
  /* Copyright (C) 1993, 1992 Nathan Sidwell */
! /* RCS $Id: control.c,v 4.15 1993/12/10 11:52:23 nathan stable $ */
  /*{{{  includes*/
  #include "xmred.h"
  #include <X11/StringDefs.h>
--- 1,5 ----
  /* Copyright (C) 1993, 1992 Nathan Sidwell */
! /* RCS $Id: control.c,v 4.15 1993/12/10 11:52:23 nathan Stable $ */
  /*{{{  includes*/
  #include "xmred.h"
  #include <X11/StringDefs.h>
Only in xmris.4.01: control.o
diff -c xmris.4.01/defcom.c xmris.4.02/defcom.c
*** xmris.4.01/defcom.c	Tue Feb  8 19:00:21 1994
--- xmris.4.02/defcom.c	Wed Feb 16 12:12:31 1994
***************
*** 1,7 ****
  /* Copyright (C) 1993, 1992 Nathan Sidwell */
  /* additional sprites by Stefan Gustavson <stefang@isy.liu.se> */
  /* common define file for xmris and xmred, included from defmris or defmred */
! /* RCS $Id: defcom.c,v 4.25 1994/02/08 18:52:34 nathan stable $ */
  /*{{{  some sprite info*/
  /* you can add your own sprites, if you like, but you have to be careful
   * to make sure that they look ok with both -swap and -noswap, and also
--- 1,7 ----
  /* Copyright (C) 1993, 1992 Nathan Sidwell */
  /* additional sprites by Stefan Gustavson <stefang@isy.liu.se> */
  /* common define file for xmris and xmred, included from defmris or defmred */
! /* RCS $Id: defcom.c,v 4.25 1994/02/08 18:52:34 nathan Stable $ */
  /*{{{  some sprite info*/
  /* you can add your own sprites, if you like, but you have to be careful
   * to make sure that they look ok with both -swap and -noswap, and also
diff -c xmris.4.01/defcom.h xmris.4.02/defcom.h
*** xmris.4.01/defcom.h	Tue Feb  8 19:00:20 1994
--- xmris.4.02/defcom.h	Wed Feb 16 12:12:29 1994
***************
*** 1,6 ****
  /* Copyright (C) 1993, 1992 Nathan Sidwell */
  /* this file is common to xmris and xmred, included from def*.h */
! /* RCS $Id: defcom.h,v 4.5 1994/01/25 18:33:03 nathan stable $ */
  #include <X11/StringDefs.h>
  #include <X11/Shell.h>
  #define XtRGender       "Gender"
--- 1,6 ----
  /* Copyright (C) 1993, 1992 Nathan Sidwell */
  /* this file is common to xmris and xmred, included from def*.h */
! /* RCS $Id: defcom.h,v 4.5 1994/01/25 18:33:03 nathan Stable $ */
  #include <X11/StringDefs.h>
  #include <X11/Shell.h>
  #define XtRGender       "Gender"
diff -c xmris.4.01/defmred.c xmris.4.02/defmred.c
*** xmris.4.01/defmred.c	Tue Feb  8 19:02:49 1994
--- xmris.4.02/defmred.c	Wed Feb 16 12:22:53 1994
***************
*** 1,5 ****
  /* Copyright (C) 1993, 1992 Nathan Sidwell */
! /* RCS $Id: defmred.c,v 4.14 1993/10/25 12:02:18 nathan stable $ */
  #define EXTERN
  #include "xmred.h"
  #include "defmred.h"
--- 1,5 ----
  /* Copyright (C) 1993, 1992 Nathan Sidwell */
! /* RCS $Id: defmred.c,v 4.14 1993/10/25 12:02:18 nathan Stable $ */
  #define EXTERN
  #include "xmred.h"
  #include "defmred.h"
diff -c xmris.4.01/defmred.h xmris.4.02/defmred.h
*** xmris.4.01/defmred.h	Tue Feb  8 19:02:22 1994
--- xmris.4.02/defmred.h	Wed Feb 16 12:22:52 1994
***************
*** 1,4 ****
  /* Copyright (C) 1993, 1992 Nathan Sidwell */
  /* definition header file for xmred */
! /* RCS $Id: defmred.h,v 4.5 1993/10/01 19:19:35 nathan stable $ */
  #include "defcom.h"
--- 1,4 ----
  /* Copyright (C) 1993, 1992 Nathan Sidwell */
  /* definition header file for xmred */
! /* RCS $Id: defmred.h,v 4.5 1993/10/01 19:19:35 nathan Stable $ */
  #include "defcom.h"
Only in xmris.4.01: defmred.o
diff -c xmris.4.01/defmris.c xmris.4.02/defmris.c
*** xmris.4.01/defmris.c	Tue Feb  8 19:02:08 1994
--- xmris.4.02/defmris.c	Wed Feb 16 12:14:15 1994
***************
*** 1,5 ****
  /* Copyright (C) 1993, 1992 Nathan Sidwell */
! /* RCS $Id: defmris.c,v 4.4 1993/12/10 11:52:23 nathan stable $ */
  #define EXTERN
  #include "xmris.h"
  #include "defmris.h"
--- 1,5 ----
  /* Copyright (C) 1993, 1992 Nathan Sidwell */
! /* RCS $Id: defmris.c,v 4.4 1993/12/10 11:52:23 nathan Stable $ */
  #define EXTERN
  #include "xmris.h"
  #include "defmris.h"
diff -c xmris.4.01/defmris.h xmris.4.02/defmris.h
*** xmris.4.01/defmris.h	Tue Feb  8 19:00:18 1994
--- xmris.4.02/defmris.h	Wed Feb 16 12:12:28 1994
***************
*** 1,6 ****
  /* Copyright (C) 1993, 1992 Nathan Sidwell */
  /* definition header file for xmris */
! /* RCS $Id: defmris.h,v 4.2 1994/01/25 18:33:03 nathan stable $ */
  #include "defcom.h"
  #define XtRKeySym "KeySym"
  extern COORD CONST she_hold[16];
--- 1,6 ----
  /* Copyright (C) 1993, 1992 Nathan Sidwell */
  /* definition header file for xmris */
! /* RCS $Id: defmris.h,v 4.2 1994/01/25 18:33:03 nathan Stable $ */
  #include "defcom.h"
  #define XtRKeySym "KeySym"
  extern COORD CONST she_hold[16];
Only in xmris.4.01: defmris.o
diff -c xmris.4.01/demo.c xmris.4.02/demo.c
*** xmris.4.01/demo.c	Tue Feb  8 19:02:28 1994
--- xmris.4.02/demo.c	Wed Feb 16 12:15:39 1994
***************
*** 1,5 ****
  /* Copyright (C) 1993, 1992 Nathan Sidwell */
! /* RCS $Id: demo.c,v 4.14 1994/01/25 18:33:03 nathan stable $ */
  #include "xmris.h"
  #define SCORING_LEN 22
  /*{{{  static*/
--- 1,5 ----
  /* Copyright (C) 1993, 1992 Nathan Sidwell */
! /* RCS $Id: demo.c,v 4.14 1994/01/25 18:33:03 nathan Stable $ */
  #include "xmris.h"
  #define SCORING_LEN 22
  /*{{{  static*/
Only in xmris.4.01: demo.o
diff -c xmris.4.01/dialogs.c xmris.4.02/dialogs.c
*** xmris.4.01/dialogs.c	Tue Feb  8 19:02:51 1994
--- xmris.4.02/dialogs.c	Wed Feb 16 12:23:32 1994
***************
*** 1,5 ****
  /* Copyright (C) 1993, 1992 Nathan Sidwell */
! /* RCS $Id: dialogs.c,v 4.6 1994/01/25 18:33:03 nathan stable $ */
  /*{{{  includes*/
  #include "xmred.h"
  #include <X11/Xaw/Dialog.h>
--- 1,5 ----
  /* Copyright (C) 1993, 1992 Nathan Sidwell */
! /* RCS $Id: dialogs.c,v 4.6 1994/01/25 18:33:03 nathan Stable $ */
  /*{{{  includes*/
  #include "xmred.h"
  #include <X11/Xaw/Dialog.h>
Only in xmris.4.01: dialogs.o
diff -c xmris.4.01/draw.c xmris.4.02/draw.c
*** xmris.4.01/draw.c	Tue Feb  8 19:02:31 1994
--- xmris.4.02/draw.c	Wed Feb 16 12:16:17 1994
***************
*** 1,5 ****
  /* Copyright (C) 1993, 1992 Nathan Sidwell */
! /* RCS $Id: draw.c,v 4.17 1994/02/08 18:52:34 nathan stable $ */
  #include "xmris.h"
  #include "time.h"
  /*{{{  board load error masks*/
--- 1,5 ----
  /* Copyright (C) 1993, 1992 Nathan Sidwell */
! /* RCS $Id: draw.c,v 4.17 1994/02/08 18:52:34 nathan Stable $ */
  #include "xmris.h"
  #include "time.h"
  /*{{{  board load error masks*/
Only in xmris.4.01: draw.o
diff -c xmris.4.01/garden.c xmris.4.02/garden.c
*** xmris.4.01/garden.c	Tue Feb  8 19:02:52 1994
--- xmris.4.02/garden.c	Wed Feb 16 12:24:00 1994
***************
*** 1,5 ****
  /* Copyright (C) 1993, 1992 Nathan Sidwell */
! /* RCS $Id: garden.c,v 4.6 1994/01/06 10:20:24 nathan stable $ */
  /*{{{  includes*/
  #include "xmred.h"
  #include <X11/IntrinsicP.h>
--- 1,5 ----
  /* Copyright (C) 1993, 1992 Nathan Sidwell */
! /* RCS $Id: garden.c,v 4.6 1994/01/06 10:20:24 nathan Stable $ */
  /*{{{  includes*/
  #include "xmred.h"
  #include <X11/IntrinsicP.h>
Only in xmris.4.01: garden.o
diff -c xmris.4.01/makecom.c xmris.4.02/makecom.c
*** xmris.4.01/makecom.c	Tue Feb  8 19:02:25 1994
--- xmris.4.02/makecom.c	Wed Feb 16 12:16:56 1994
***************
*** 1,5 ****
  /* Copyright (C) 1993, 1992 Nathan Sidwell */
! /* RCS $Id: makecom.c,v 4.23 1994/02/08 18:52:34 nathan stable $ */
  /* common make stuff for xmris and xmred, 
   * included from makemris and makemred
   */
--- 1,5 ----
  /* Copyright (C) 1993, 1992 Nathan Sidwell */
! /* RCS $Id: makecom.c,v 4.24 1994/02/16 11:30:37 nathan Stable $ */
  /* common make stuff for xmris and xmred, 
   * included from makemris and makemred
   */
***************
*** 78,83 ****
--- 78,84 ----
  {
    static XColor result;
    Status    status;
+   Colormap  colormap;
    
    if(to->size < sizeof(XColor))
      {
***************
*** 84,90 ****
        to->size = sizeof(XColor);
        return False;
      }
!   status = XParseColor(display, *(Colormap *)args[1].addr,
        (char CONST *)from->addr, to->addr ? (XColor *)to->addr : &result);
    if(status)
      {
--- 85,103 ----
        to->size = sizeof(XColor);
        return False;
      }
!   if(args && *num_args > 1)
!     colormap = *(Colormap *)args[1].addr;
!   else
!     {
!       Screen    *screen;
!       
!       if(args && *num_args)
! 	screen = *(Screen **)args[0].addr;
!       else
! 	screen = DefaultScreenOfDisplay(display);
!       colormap = DefaultColormapOfScreen(screen);
!     }
!   status = XParseColor(display, colormap,
        (char CONST *)from->addr, to->addr ? (XColor *)to->addr : &result);
    if(status)
      {
diff -c xmris.4.01/makemred.c xmris.4.02/makemred.c
*** xmris.4.01/makemred.c	Tue Feb  8 19:02:54 1994
--- xmris.4.02/makemred.c	Wed Feb 16 12:24:42 1994
***************
*** 1,5 ****
  /* Copyright (C) 1993, 1992 Nathan Sidwell */
! /* RCS $Id: makemred.c,v 4.29 1994/01/06 10:20:24 nathan stable $ */
  /*{{{  includes*/
  #include "xmred.h"
  #include "defmred.h"
--- 1,5 ----
  /* Copyright (C) 1993, 1992 Nathan Sidwell */
! /* RCS $Id: makemred.c,v 4.29 1994/01/06 10:20:24 nathan Stable $ */
  /*{{{  includes*/
  #include "xmred.h"
  #include "defmred.h"
Only in xmris.4.01: makemred.o
diff -c xmris.4.01/makemris.c xmris.4.02/makemris.c
*** xmris.4.01/makemris.c	Tue Feb  8 19:02:33 1994
--- xmris.4.02/makemris.c	Wed Feb 16 12:16:58 1994
***************
*** 1,5 ****
  /* Copyright (C) 1993, 1992 Nathan Sidwell */
! /* RCS $Id: makemris.c,v 4.18 1994/01/25 18:33:03 nathan stable $ */
  /*{{{  includes*/
  #include "xmris.h"
  #include "defmris.h"
--- 1,5 ----
  /* Copyright (C) 1993, 1992 Nathan Sidwell */
! /* RCS $Id: makemris.c,v 4.18 1994/01/25 18:33:03 nathan Stable $ */
  /*{{{  includes*/
  #include "xmris.h"
  #include "defmris.h"
Only in xmris.4.01: makemris.o
diff -c xmris.4.01/menubar.c xmris.4.02/menubar.c
*** xmris.4.01/menubar.c	Tue Feb  8 19:02:55 1994
--- xmris.4.02/menubar.c	Wed Feb 16 12:25:21 1994
***************
*** 1,5 ****
  /* Copyright (C) 1993, 1992 Nathan Sidwell */
! /* RCS $Id: menubar.c,v 4.6 1994/01/06 10:20:24 nathan stable $ */
  /*{{{  includes*/
  #include "xmred.h"
  #include <X11/StringDefs.h>
--- 1,5 ----
  /* Copyright (C) 1993, 1992 Nathan Sidwell */
! /* RCS $Id: menubar.c,v 4.6 1994/01/06 10:20:24 nathan Stable $ */
  /*{{{  includes*/
  #include "xmred.h"
  #include <X11/StringDefs.h>
Only in xmris.4.01: menubar.o
diff -c xmris.4.01/monster.c xmris.4.02/monster.c
*** xmris.4.01/monster.c	Tue Feb  8 19:02:34 1994
--- xmris.4.02/monster.c	Wed Feb 16 12:17:38 1994
***************
*** 1,5 ****
  /* Copyright (C) 1993, 1992 Nathan Sidwell */
! /* RCS $Id: monster.c,v 4.6 1993/12/10 11:52:23 nathan stable $ */
  #include "xmris.h"
  /*{{{  MONSTER *extra_escape()*/
  extern MONSTER *extra_escape FUNCARGVOID
--- 1,5 ----
  /* Copyright (C) 1993, 1992 Nathan Sidwell */
! /* RCS $Id: monster.c,v 4.6 1993/12/10 11:52:23 nathan Stable $ */
  #include "xmris.h"
  /*{{{  MONSTER *extra_escape()*/
  extern MONSTER *extra_escape FUNCARGVOID
Only in xmris.4.01: monster.o
diff -c xmris.4.01/move.c xmris.4.02/move.c
*** xmris.4.01/move.c	Tue Feb  8 19:02:37 1994
--- xmris.4.02/move.c	Wed Feb 16 12:18:12 1994
***************
*** 1,5 ****
  /* Copyright (C) 1993, 1992 Nathan Sidwell */
! /* RCS $Id: move.c,v 4.3 1993/10/25 12:02:18 nathan stable $ */
  #include "xmris.h"
  /*{{{  prototypes*/
  static VOIDFUNC connect_hole PROTOARG((CELL *));
--- 1,5 ----
  /* Copyright (C) 1993, 1992 Nathan Sidwell */
! /* RCS $Id: move.c,v 4.3 1993/10/25 12:02:18 nathan Stable $ */
  #include "xmris.h"
  /*{{{  prototypes*/
  static VOIDFUNC connect_hole PROTOARG((CELL *));
Only in xmris.4.01: move.o
diff -c xmris.4.01/patchlevel.h xmris.4.02/patchlevel.h
*** xmris.4.01/patchlevel.h	Tue Feb  8 18:59:46 1994
--- xmris.4.02/patchlevel.h	Wed Feb 16 12:11:47 1994
***************
*** 1,5 ****
  /* Copyright (C) 1993, 1992 Nathan Sidwell */
! /* RCS $Id: patchlevel.h,v 4.7 1994/01/31 17:40:36 nathan stable $ */
! #define XMRISVERSION "V4.01"
  #define XMREDVERSION "V1.01"
! #define DATE "31 January 1994"
--- 1,5 ----
  /* Copyright (C) 1993, 1992 Nathan Sidwell */
! /* RCS $Id: patchlevel.h,v 4.8 1994/02/16 11:30:37 nathan Stable $ */
! #define XMRISVERSION "V4.02"
  #define XMREDVERSION "V1.01"
! #define DATE "15 February 1994"
diff -c xmris.4.01/player.c xmris.4.02/player.c
*** xmris.4.01/player.c	Tue Feb  8 19:02:39 1994
--- xmris.4.02/player.c	Wed Feb 16 12:19:02 1994
***************
*** 1,5 ****
  /* Copyright (C) 1993, 1992 Nathan Sidwell */
! /* RCS $Id: player.c,v 4.3 1993/10/07 18:08:36 nathan stable $ */
  #include "xmris.h"
  /*{{{  void bounce_ball()*/
  extern VOIDFUNC bounce_ball FUNCARGVOID
--- 1,5 ----
  /* Copyright (C) 1993, 1992 Nathan Sidwell */
! /* RCS $Id: player.c,v 4.3 1993/10/07 18:08:36 nathan Stable $ */
  #include "xmris.h"
  /*{{{  void bounce_ball()*/
  extern VOIDFUNC bounce_ball FUNCARGVOID
Only in xmris.4.01: player.o
diff -c xmris.4.01/scoring.c xmris.4.02/scoring.c
*** xmris.4.01/scoring.c	Tue Feb  8 19:02:41 1994
--- xmris.4.02/scoring.c	Wed Feb 16 12:19:35 1994
***************
*** 1,5 ****
  /* Copyright (C) 1993, 1992 Nathan Sidwell */
! /* RCS $Id: scoring.c,v 4.10 1994/01/06 10:20:24 nathan stable $ */
  /*{{{  file locking problems*/
  /*
   * USELOCKFILE file locking as suggested by
--- 1,5 ----
  /* Copyright (C) 1993, 1992 Nathan Sidwell */
! /* RCS $Id: scoring.c,v 4.11 1994/02/16 11:30:37 nathan Stable $ */
  /*{{{  file locking problems*/
  /*
   * USELOCKFILE file locking as suggested by
***************
*** 250,256 ****
  #else
    if(stream)
      /*{{{  get lock on the file*/
!     while(locking_file(stream))
        {
  	if(errno == EINTR)
  	  continue;
--- 250,256 ----
  #else
    if(stream)
      /*{{{  get lock on the file*/
!     while(lock_file(stream))
        {
  	if(errno == EINTR)
  	  continue;
***************
*** 293,299 ****
      }
  #else
    rewind(stream);
!   unlocking_file(stream);
    fclose(stream);
  #endif /* USELOCKFILE */
    return;
--- 293,299 ----
      }
  #else
    rewind(stream);
!   unlock_file(stream);
    fclose(stream);
  #endif /* USELOCKFILE */
    return;
Only in xmris.4.01: scoring.o
Only in xmris.4.01: scram
diff -c xmris.4.01/scram.c xmris.4.02/scram.c
*** xmris.4.01/scram.c	Tue Feb  8 19:00:23 1994
--- xmris.4.02/scram.c	Wed Feb 16 12:12:33 1994
***************
*** 1,5 ****
  /* Copyright (C) 1992 Nathan Sidwell */
! /* RCS $Id: scram.c,v 4.7 1993/11/09 16:27:47 nathan stable $ */
  /*{{{  about me*/
  /* a simple program to compress the monochrome, mask & color sprites
   * together into one set of planes. This is done by color separation
--- 1,5 ----
  /* Copyright (C) 1992 Nathan Sidwell */
! /* RCS $Id: scram.c,v 4.7 1993/11/09 16:27:47 nathan Stable $ */
  /*{{{  about me*/
  /* a simple program to compress the monochrome, mask & color sprites
   * together into one set of planes. This is done by color separation
Only in xmris.4.01: scram.o
diff -c xmris.4.01/timer.c xmris.4.02/timer.c
*** xmris.4.01/timer.c	Tue Feb  8 19:02:43 1994
--- xmris.4.02/timer.c	Wed Feb 16 12:20:21 1994
***************
*** 1,5 ****
  /* Copyright (C) 1993, 1992 Nathan Sidwell */
! /* RCS $Id: timer.c,v 4.7 1994/01/31 17:40:36 nathan stable $ */
  /*{{{  the problem with real time under unix*/
  /*
   * Getting accurate, stable timing is difficult. An auto repeating
--- 1,5 ----
  /* Copyright (C) 1993, 1992 Nathan Sidwell */
! /* RCS $Id: timer.c,v 4.7 1994/01/31 17:40:36 nathan Stable $ */
  /*{{{  the problem with real time under unix*/
  /*
   * Getting accurate, stable timing is difficult. An auto repeating
Only in xmris.4.01: timer.o
Only in xmris.4.01: xmred
diff -c xmris.4.01/xmred.c xmris.4.02/xmred.c
*** xmris.4.01/xmred.c	Tue Feb  8 19:02:57 1994
--- xmris.4.02/xmred.c	Wed Feb 16 12:25:55 1994
***************
*** 1,5 ****
  /* Copyright (C) 1993, 1992 Nathan Sidwell */
! /* RCS $Id: xmred.c,v 4.11 1994/01/06 10:20:24 nathan stable $ */
  /*{{{  include*/
  #include "xmred.h"
  #ifdef SCROLLBARBUGFIX
--- 1,5 ----
  /* Copyright (C) 1993, 1992 Nathan Sidwell */
! /* RCS $Id: xmred.c,v 4.11 1994/01/06 10:20:24 nathan Stable $ */
  /*{{{  include*/
  #include "xmred.h"
  #ifdef SCROLLBARBUGFIX
diff -c xmris.4.01/xmred.h xmris.4.02/xmred.h
*** xmris.4.01/xmred.h	Tue Feb  8 19:02:20 1994
--- xmris.4.02/xmred.h	Wed Feb 16 12:21:35 1994
***************
*** 1,5 ****
  /* Copyright (C) 1993 Nathan Sidwell */
! /* RCS $Id: xmred.h,v 4.27 1994/01/06 10:20:24 nathan stable $ */
  #define XMRED 1
  #define BUTTONS         5
  #include "common.h"
--- 1,5 ----
  /* Copyright (C) 1993 Nathan Sidwell */
! /* RCS $Id: xmred.h,v 4.27 1994/01/06 10:20:24 nathan Stable $ */
  #define XMRED 1
  #define BUTTONS         5
  #include "common.h"
Only in xmris.4.01: xmred.o
Only in xmris.4.01: xmris
diff -c xmris.4.01/xmris.c xmris.4.02/xmris.c
*** xmris.4.01/xmris.c	Tue Feb  8 19:02:44 1994
--- xmris.4.02/xmris.c	Wed Feb 16 12:20:55 1994
***************
*** 1,5 ****
  /* Copyright (C) 1993, 1992 Nathan Sidwell */
! /* RCS $Id: xmris.c,v 4.17 1994/01/28 10:11:53 nathan stable $ */
  /*{{{  the problem with recursive function definitions*/
  /*
   * In order to keep a single control loop, I use animate functions,
--- 1,5 ----
  /* Copyright (C) 1993, 1992 Nathan Sidwell */
! /* RCS $Id: xmris.c,v 4.18 1994/02/16 11:30:37 nathan Stable $ */
  /*{{{  the problem with recursive function definitions*/
  /*
   * In order to keep a single control loop, I use animate functions,
***************
*** 133,138 ****
--- 133,142 ----
    KeySym    keysym;
  
    keysym = XKeycodeToKeysym(display.display, event->xkey.keycode, 0);
+ #ifdef DEBUGEVENTLOOP
+   fprintf(stderr, "action_keypress(0x%lx) keysym=%0xlx\n",
+       (long)XtWindow(widget), (long)keysym);
+ #endif /* DEBUGEVENTLOOP */
    global.key = keysym;
    if(global.state != MODE_KEY_DEF)
      for(ix = KEYS; ix--;)
***************
*** 166,171 ****
--- 170,179 ----
    KeySym    keysym;
  
    keysym = XKeycodeToKeysym(display.display, event->xkey.keycode, 0);
+ #ifdef DEBUGEVENTLOOP
+   fprintf(stderr, "action_keyrelease(0x%lx) keysym=%0xlx\n",
+       (long)XtWindow(widget), (long)keysym);
+ #endif /* DEBUGEVENTLOOP */
    if(global.state != MODE_KEY_DEF)
      for(ix = KEYS; ix--;)
        if(keysym == data.keysyms[ix])
***************
*** 186,192 ****
  )
  {
  #ifdef DEBUGEVENTLOOP
!   fprintf(stderr, "action_map(0x%lx)\n", XtWindow(widget));
  #endif /* DEBUGEVENTLOOP */
    display.mapped = 1;
    if(map_start)
--- 194,200 ----
  )
  {
  #ifdef DEBUGEVENTLOOP
!   fprintf(stderr, "action_map(0x%lx)\n", (long)XtWindow(widget));
  #endif /* DEBUGEVENTLOOP */
    display.mapped = 1;
    if(map_start)
***************
*** 205,211 ****
  )
  {
  #ifdef DEBUGEVENTLOOP
!   fprintf(stderr, "action_pause(0x%lx)\n", XtWindow(widget));
  #endif /* DEBUGEVENTLOOP */
    global.pause = global.state < 6;
    return;
--- 213,219 ----
  )
  {
  #ifdef DEBUGEVENTLOOP
!   fprintf(stderr, "action_pause(0x%lx)\n", (long)XtWindow(widget));
  #endif /* DEBUGEVENTLOOP */
    global.pause = global.state < 6;
    return;
***************
*** 221,227 ****
  )
  {
  #ifdef DEBUGEVENTLOOP
!   fprintf(stderr, "action_unmap(0x%lx)\n", XtWindow(widget));
  #endif /* DEBUGEVENTLOOP */
    display.mapped = 0;
    global.pause = global.state < 6;
--- 229,235 ----
  )
  {
  #ifdef DEBUGEVENTLOOP
!   fprintf(stderr, "action_unmap(0x%lx)\n", (long)XtWindow(widget));
  #endif /* DEBUGEVENTLOOP */
    display.mapped = 0;
    global.pause = global.state < 6;
***************
*** 1273,1280 ****
        XtParseTranslationTable(toplevel_translations));
    XtRealizeWidget(display.toplevel);
  #ifdef DEBUGEVENTLOOP
!   printf("Toplevel is 0x%lx\n", XtWindow(display.toplevel));
!   printf("Garden is 0x%lx\n", XtWindow(display.garden));
  #endif /* DEBUGEVENTLOOP */
    display.window = XtWindow(display.garden);
    timer_open();
--- 1281,1288 ----
        XtParseTranslationTable(toplevel_translations));
    XtRealizeWidget(display.toplevel);
  #ifdef DEBUGEVENTLOOP
!   printf("Toplevel is 0x%lx\n", (long)XtWindow(display.toplevel));
!   printf("Garden is 0x%lx\n", (long)XtWindow(display.garden));
  #endif /* DEBUGEVENTLOOP */
    display.window = XtWindow(display.garden);
    timer_open();
diff -c xmris.4.01/xmris.h xmris.4.02/xmris.h
*** xmris.4.01/xmris.h	Tue Feb  8 18:59:42 1994
--- xmris.4.02/xmris.h	Wed Feb 16 12:11:42 1994
***************
*** 1,5 ****
  /* Copyright (C) 1993, 1992 Nathan Sidwell */
! /* RCS $Id: xmris.h,v 4.18 1994/01/06 10:20:24 nathan stable $ */
  #include "common.h"
  #define COPYRIGHT "Copyright (C) 1994-1992 Nathan Sidwell"
  /*{{{  function pointers*/
--- 1,5 ----
  /* Copyright (C) 1993, 1992 Nathan Sidwell */
! /* RCS $Id: xmris.h,v 4.18 1994/01/06 10:20:24 nathan Stable $ */
  #include "common.h"
  #define COPYRIGHT "Copyright (C) 1994-1992 Nathan Sidwell"
  /*{{{  function pointers*/
Only in xmris.4.01: xmris.o