ken@uunet.UU.NET (Ken Marks) (09/29/90)
Submitted-by: balr!panasun!ken@uunet.UU.NET (Ken Marks)
Posting-number: Volume 9, Issue 58
Archive-name: choas/patch1
Patch-To: choas: Volume 8, Issue 77-86
This is the FIRST official patch to chaos since its posting on comp.sources.x
(bringing it from patch level 1 to 2).
If you use xmkmf to generate Makefiles, the makefiles will take precedence
over the corresponding Makefiles (I thought it was the other way around).
Renaming these files to Makefile.simple takes care of this.
There is no easy way to convince patch to do the following:
mv makefile Makefile.simple
mv common/makefile common/Makefile.simple
mv drone/makefile drone/Makefile.simple
mv fonts/makefile fonts/Makefile.simple
mv gencmap/makefile gencmap/Makefile.simple
mv master/makefile master/Makefile.simple
mv widgets/makefile widgets/Makefile.simple
*** orig/headers/patchlevel.h Fri Sep 28 07:19:50 1990
--- headers/patchlevel.h Thu Sep 13 15:53:00 1990
***************
*** 1 ****
! #define PATCHLEVEL 1
--- 1 ----
! #define PATCHLEVEL 2
*** Makefile.simple Thu Sep 13 16:04:47 1990
--- orig/Makefile.simple Thu Sep 13 15:52:30 1990
***************
*** 1,4 ****
! MAKE = make -f Makefile.simple
SUBDIRS = \
common \
--- 1,4 ----
! MAKE = make -f makefile
SUBDIRS = \
common \
*** orig/MANIFEST Thu Sep 13 15:33:32 1990
--- MANIFEST Mon Sep 10 11:34:49 1990
***************
*** 13,19 ****
common/file.c 8
common/imageIO.c 9
common/ipc.c 8
! common/makefile 10
common/showEvent.c 2
drone 1
drone/Imakefile 10
--- 13,19 ----
common/file.c 8
common/imageIO.c 9
common/ipc.c 8
! common/Makefile.simple 10
common/showEvent.c 2
drone 1
drone/Imakefile 10
***************
*** 21,27 ****
drone/drone.c 9
drone/drone.man 10
drone/init.c 9
! drone/makefile 10
drone/mandelbrot.c 7
drone/propNotify.c 8
fonts 1
--- 21,27 ----
drone/drone.c 9
drone/drone.man 10
drone/init.c 9
! drone/Makefile.simple 10
drone/mandelbrot.c 7
drone/propNotify.c 8
fonts 1
***************
*** 28,34 ****
fonts/Imakefile 10
fonts/chaos-bold.bdf 6
fonts/chaos-norm.bdf 6
! fonts/makefile 10
fonts/push-norm.bdf 3
fonts/push-rev.bdf 4
gencmap 1
--- 28,34 ----
fonts/Imakefile 10
fonts/chaos-bold.bdf 6
fonts/chaos-norm.bdf 6
! fonts/Makefile.simple 10
fonts/push-norm.bdf 3
fonts/push-rev.bdf 4
gencmap 1
***************
*** 35,41 ****
gencmap/Imakefile 2
gencmap/gencmap.c 2
gencmap/gencmap.man 9
! gencmap/makefile 10
headers 1
headers/Canvas.h 10
headers/CanvasP.h 9
--- 35,41 ----
gencmap/Imakefile 2
gencmap/gencmap.c 2
gencmap/gencmap.man 9
! gencmap/Makefile.simple 10
headers 1
headers/Canvas.h 10
headers/CanvasP.h 9
***************
*** 65,71 ****
headers/Text.h 10
headers/TextP.h 10
headers/patchlevel.h 8
! makefile 10
maps 1
maps/default.map 8
maps/gray4.map 9
--- 65,71 ----
headers/Text.h 10
headers/TextP.h 10
headers/patchlevel.h 8
! Makefile.simple 10
maps 1
maps/default.map 8
maps/gray4.map 9
***************
*** 92,98 ****
master/colormapDb.c 4
master/droneDb.c 6
master/fileDb.c 7
! master/makefile 10
master/master.c 3
master/messageDb.c 8
master/queue.c 8
--- 92,98 ----
master/colormapDb.c 4
master/droneDb.c 6
master/fileDb.c 7
! master/Makefile.simple 10
master/master.c 3
master/messageDb.c 8
master/queue.c 8
***************
*** 110,113 ****
widgets/Push.c 7
widgets/Slider.c 5
widgets/Text.c 5
! widgets/makefile 10
--- 110,113 ----
widgets/Push.c 7
widgets/Slider.c 5
widgets/Text.c 5
! widgets/Makefile.simple 10
*** orig/README Thu Sep 13 15:33:31 1990
--- README Tue Aug 28 13:02:22 1990
***************
*** 1,12 ****
Overview
--------
This code was developed on a SUN 3/60 and a SPARCstation 1 with the help of
! Saber-C which has been a blessing. The code has been also been tested on
! a DECstation 3100 and a SUN 386i. The messages passed between the chaos
client and the drone daemons are byte-order independent and therefore drones
may be run on a variety of different machines.
Building, Installing and Executing
----------------------------------
--- 1,17 ----
Overview
--------
This code was developed on a SUN 3/60 and a SPARCstation 1 with the help of
! Saber-C which has been a blessing. The messages passed between the chaos
client and the drone daemons are byte-order independent and therefore drones
may be run on a variety of different machines.
+ Architectures Supported
+ -----------------------
+ SUN: (SunOS 3.5, 4.0.3, 4.1) 3/xx, 4/xx, 386i, SparcStation 1, SparcStation 1+
+ DEC: (Running X11R4) DECStation 5600, DECStation 3100
+
+
Building, Installing and Executing
----------------------------------
***************
*** 44,47 ****
Any enhancements are welcome but please direct them back to me so that I can
keep a single version of the code.
! Ken Marks ...uunet!tellab5!balr!panasun!ken -or- ken@panasun
--- 49,52 ----
Any enhancements are welcome but please direct them back to me so that I can
keep a single version of the code.
! Ken Marks ...uunet!balr!panasun!ken -or- ken@panasun
*** orig/TODO Thu Sep 13 15:33:50 1990
--- TODO Tue Aug 28 12:45:04 1990
***************
*** 4,6 ****
--- 4,7 ----
- Add Julia set expansion.
- Figure out someway to make mandelbrots look reasonable on monochrome
displays.
+ - Allow user to change directory for image and colormap I/O.
*** orig/drone/drone.man Thu Sep 13 15:34:19 1990
--- drone/drone.man Tue Aug 28 13:02:58 1990
***************
*** 21,26 ****
--- 21,31 ----
.BI -display \ display
This argument allows the user to specify the server to connect to;
see \fIX(1)\fP.
+ .SH BUGS
+ If
+ .I xhost
+ is not used to allow access by other hosts, then drones spawned on these
+ remote machines will terminate silently.
.SH SEE ALSO
chaos(6), gencmap(6)
.SH AUTHOR
*** orig/gencmap/gencmap.c Thu Sep 13 15:33:38 1990
--- gencmap/gencmap.c Tue Aug 28 12:58:51 1990
***************
*** 5,11 ****
#include <stdio.h>
#include <ctype.h>
#include <math.h>
- #include <values.h>
#include <X11/Intrinsic.h>
#include <Colormap.h>
--- 5,10 ----
*** orig/master/settingsDb.c Thu Sep 13 15:33:56 1990
--- master/settingsDb.c Mon Aug 27 15:09:06 1990
***************
*** 59,65 ****
};
static ToggleItem aspect_item[] = {
! {"Retain aspect ration (for zooms)", True},
{NULL, NULL},
};
--- 59,65 ----
};
static ToggleItem aspect_item[] = {
! {"Retain aspect ratio (for zooms)", True},
{NULL, NULL},
};
*** orig/master/droneDb.c Thu Sep 13 15:33:52 1990
--- master/droneDb.c Mon Sep 3 15:00:13 1990
***************
*** 292,299 ****
/* Cheap and sleazy way of constructing hostname:display:screen from
* unix:display:screen */
! (void) sprintf(host_display_name, "%s%s", hostname,
! strchr(display_name, ':'));
}
if (vfork() == 0)
--- 292,300 ----
/* Cheap and sleazy way of constructing hostname:display:screen from
* unix:display:screen */
! if (strcmp(display_name,"unix:0.0") == 0)
! (void) sprintf(host_display_name, "%s%s", hostname,
! strchr(display_name, ':'));
}
if (vfork() == 0)
***************
*** 301,307 ****
if (exec_local_drone)
execlp(drone_path, "drone", "-display", display_name, (char *) 0);
else
! execlp("rsh", "rsh", name, drone_path, "drone", "-display",
host_display_name, (char *) 0);
eprintf("Could not exec drone process!\n");
--- 302,308 ----
if (exec_local_drone)
execlp(drone_path, "drone", "-display", display_name, (char *) 0);
else
! execlp("rsh", "rsh", name, drone_path, "-display",
host_display_name, (char *) 0);
eprintf("Could not exec drone process!\n");
***************
*** 407,413 ****
if (host == NULL)
{
/* A drone has been started on a host we didn't know about */
! eprintf("Drone initiated from host '%s' which is not a recognized host\n");
CleanupAndDie();
}
--- 408,414 ----
if (host == NULL)
{
/* A drone has been started on a host we didn't know about */
! eprintf("Drone initiated from host '%s' which is not a recognized host\n", name);
CleanupAndDie();
}
dan
----------------------------------------------------
O'Reilly && Associates argv@sun.com / argv@ora.com
Opinions expressed reflect those of the author only.