v12i004: Starchart 3.2 update to 3.2.1 part 4/4
ccount at ATHENA.MIT.EDU
ccount at ATHENA.MIT.EDU
Sat Apr 14 09:02:15 AEST 1990
Posting-number: Volume 12, Issue 4
Submitted-by: ccount at ATHENA.MIT.EDU
Archive-name: starchart2/part04
#! /bin/sh
# This is a shell archive. Remove anything before this line, then unpack
# it by saving it into a file and typing "sh file". To overwrite existing
# files, type "sh file -c". You can also feed this as standard input via
# unshar, or by typing "sh <file", e.g.. If this archive is complete, you
# will see the following message at the end:
# "End of archive 4 (of 4)."
# Contents: stch_pch.aa
# Wrapped by ccount at e40-008-10 on Wed Apr 4 19:12:13 1990
PATH=/bin:/usr/bin:/usr/ucb ; export PATH
if test -f 'stch_pch.aa' -a "${1}" != "-c" ; then
echo shar: Will not clobber existing file \"'stch_pch.aa'\"
else
echo shar: Extracting \"'stch_pch.aa'\" \(53020 characters\)
sed "s/^X//" >'stch_pch.aa' <<'END_OF_FILE'
Xdiff -r -c ../../starchart3.2/starchart/Makefile ./Makefile
X*** ../../starchart3.2/starchart/Makefile Wed Apr 4 18:28:29 1990
X--- ./Makefile Wed Apr 4 18:31:24 1990
X***************
X*** 1,17 ****
X # Makefile for starchart programs
X #
X! # $Header: Makefile,v 2.16 90/03/08 22:23:04 ccount Exp $
X #
X # Read the makefile before making. There are many things you may wish
X # to customize.
X #
X #
X! # Copyright (c) 1990 by Craig Counterman. All rights reserved.
X #
X! # This software may be redistributed freely, not sold.
X! # This copyright notice and disclaimer of warranty must remain
X! # unchanged.
X #
X # No representation is made about the suitability of this
X # software for any purpose. It is provided "as is" without express or
X # implied warranty, to the extent permitted by applicable law.
X--- 1,22 ----
X # Makefile for starchart programs
X #
X! # $Header: Makefile,v 2.19 90/04/03 01:54:15 ccount Exp $
X #
X # Read the makefile before making. There are many things you may wish
X # to customize.
X #
X #
X! # StarChart Version 3.2 copyright (c) March 1990 by Craig Counterman
X! # original StarChart Software Suite copyright (c) 1987 by Alan Paeth
X #
X! # All rights reserved. Redistribution granted for non-commercial
X! # non-profit use only. Disclaimer: users of this work understand that
X! # (a) the authors' cannot undertake to support this software (b) users
X! # agree to acknowledge the use of the software in any published work
X! # arising from its application and (c) any subsequent redistribution of
X! # this work retains this warranty placard.
X #
X+ #
X # No representation is made about the suitability of this
X # software for any purpose. It is provided "as is" without express or
X # implied warranty, to the extent permitted by applicable law.
X***************
X*** 18,24 ****
X #
X # DISCLAIMER OF WARRANTY
X # ----------------------
X! # The author disclaims all warranties with regard to this software to
X # the extent permitted by applicable law, including all implied
X # warranties of merchantability and fitness. In no event shall the
X # author be liable for any special, indirect or consequential damages or
X--- 23,29 ----
X #
X # DISCLAIMER OF WARRANTY
X # ----------------------
X! # The authors disclaim all warranties with regard to this software to
X # the extent permitted by applicable law, including all implied
X # warranties of merchantability and fitness. In no event shall the
X # author be liable for any special, indirect or consequential damages or
X***************
X*** 51,66 ****
X
X
X # FOR ALL
X! # define OLD_GREEK if you have the old yale.star file, with a
X # slightly different greek encoding
X # To produce programs which allow keyboard user interaction with the -u flag,
X # see COBJ and starmain.o below.
X # If you don't want to use the Guide Star Catalog, you can produce
X # slightly smaller executable by defining NO_GSC
X # FOR X11
X # define USE_X_DASHES if your server can draw dashed lines
X # define RELEASE3_FONTS if you want to use the X11R3 font names
X # define X11R4 if you are using Release 4 (for the athena widgets).
X # FOR POSTSCRIPT
X # define USE_FINE_MACROS if you want to use finer macros than usual:
X # star size varies with 1/10th magnitude increments
X--- 56,77 ----
X
X
X # FOR ALL
X! # define OLD_GREEK if you have the v2.1 yale.star file, with a
X # slightly different greek encoding
X # To produce programs which allow keyboard user interaction with the -u flag,
X # see COBJ and starmain.o below.
X # If you don't want to use the Guide Star Catalog, you can produce
X # slightly smaller executable by defining NO_GSC
X+ # Define NO_BUF_READSTAR to avoid the buffering file read function,
X+ # to reduce runtime memory usage.
X+ # Define USE_ENV_RC to use a STARRC environment variable for the file name
X+ # if the STARRC file named below is not found.
X+ #
X # FOR X11
X # define USE_X_DASHES if your server can draw dashed lines
X # define RELEASE3_FONTS if you want to use the X11R3 font names
X # define X11R4 if you are using Release 4 (for the athena widgets).
X+ #
X # FOR POSTSCRIPT
X # define USE_FINE_MACROS if you want to use finer macros than usual:
X # star size varies with 1/10th magnitude increments
X***************
X*** 69,75 ****
X # postscript.
X #
X #DEFINES= -DRELEASE3_FONTS -DUSE_X_DASHES -DUSE_FINE_MACROS
X! DEFINES= -DRELEASE3_FONTS -DUSE_X_DASHES
X
X #destination for 'make install', otherwise not important
X BINDIR = "/usr/local"
X--- 80,86 ----
X # postscript.
X #
X #DEFINES= -DRELEASE3_FONTS -DUSE_X_DASHES -DUSE_FINE_MACROS
X! DEFINES= -DRELEASE3_FONTS -DUSE_X_DASHES -DUSE_ENV_RC
X
X #destination for 'make install', otherwise not important
X BINDIR = "/usr/local"
X***************
X*** 97,103 ****
X STARTOOL=startool.tt startool.icon startool.sh
X SUPP=postconv.awk
X VMSFILES=decwxtk.opt descrip.mms starchart_init.com vaxcrtl.opt
X! IBMFILES=pcstar.h Starchar.MSC staribm.c
X ATARIFILES=README.st makefile.st starst.c vqgdos.txt vqgdos.s
X MACFILES=README.mac
X FILES=Makefile README ${SRCS} ${HDRS} ${STARTOOL} ${SUPP} ${VMSFILES} \
X--- 108,114 ----
X STARTOOL=startool.tt startool.icon startool.sh
X SUPP=postconv.awk
X VMSFILES=decwxtk.opt descrip.mms starchart_init.com vaxcrtl.opt
X! IBMFILES=pcstar.h Starchar.MSC staribm.c staribmv.c svgagraf.asm
X ATARIFILES=README.st makefile.st starst.c vqgdos.txt vqgdos.s
X MACFILES=README.mac
X FILES=Makefile README ${SRCS} ${HDRS} ${STARTOOL} ${SUPP} ${VMSFILES} \
Xdiff -r -c ../../starchart3.2/starchart/README ./README
X*** ../../starchart3.2/starchart/README Wed Apr 4 18:28:30 1990
X--- ./README Wed Apr 4 18:31:24 1990
X***************
X*** 1,7 ****
X VMS) The files decwxtk.opt, descrip.mms, starchart_init.com, and
X vaxcrtl.opt are for VMS.
X
X! IBMPC) Starchar.MSC, pcstar.h, and staribm.c are for Microsoft C on the IBMPC.
X
X Mac) See README.mac
X
X--- 1,9 ----
X VMS) The files decwxtk.opt, descrip.mms, starchart_init.com, and
X vaxcrtl.opt are for VMS.
X
X! IBMPC) Starchar.MSC, pcstar.h, and staribm.c are for Microsoft C on
X! the IBMPC, using Microsoft's graphics drivers. staribmv.c and
X! svgagraf.asm are for IBMPC VGA and SVGA graphics.
X
X Mac) See README.mac
X
X***************
X*** 8,18 ****
X Atari) makefile.st starst.c vqgdos.txt and vqgdos.s are for the
X Atari ST. See README.st.
X
X! Copyright (c) 1990 by Craig Counterman. All rights reserved.
X
X! This software may be redistributed freely, not sold.
X! This copyright notice and disclaimer of warranty must remain
X! unchanged.
X
X No representation is made about the suitability of this software for
X any purpose. It is provided "as is" without express or implied
X--- 10,24 ----
X Atari) makefile.st starst.c vqgdos.txt and vqgdos.s are for the
X Atari ST. See README.st.
X
X! StarChart Version 3.2 copyright (c) March 1990 by Craig Counterman
X! original StarChart Software Suite copyright (c) 1987 by Alan Paeth
X
X! All rights reserved. Redistribution granted for non-commercial
X! non-profit use only. Disclaimer: users of this work understand that
X! (a) the authors' cannot undertake to support this software (b) users
X! agree to acknowledge the use of the software in any published work
X! arising from its application and (c) any subsequent redistribution of
X! this work retains this warranty placard.
X
X No representation is made about the suitability of this software for
X any purpose. It is provided "as is" without express or implied
X***************
X*** 20,26 ****
X
X DISCLAIMER OF WARRANTY
X ----------------------
X! The author disclaims all warranties with regard to this software to
X the extent permitted by applicable law, including all implied
X warranties of merchantability and fitness. In no event shall the
X author be liable for any special, indirect or consequential damages or
X--- 26,32 ----
X
X DISCLAIMER OF WARRANTY
X ----------------------
X! The authors disclaim all warranties with regard to this software to
X the extent permitted by applicable law, including all implied
X warranties of merchantability and fitness. In no event shall the
X author be liable for any special, indirect or consequential damages or
Xdiff -r -c ../../starchart3.2/starchart/README.mac ./README.mac
X*** ../../starchart3.2/starchart/README.mac Wed Apr 4 18:28:30 1990
X--- ./README.mac Wed Apr 4 18:31:25 1990
X***************
X*** 17,23 ****
X # starcust.c
X # Created: Thursday, March 8, 1990 9:46:18 AM
X
X! COPTIONS = -m -d 'NEBFILE="neb.star"' -d 'STARFILE="yale.star"'
X
X starmain.c.o <f> starmain.c
X C -s 1 starmain.c {COPTIONS}
X--- 17,23 ----
X # starcust.c
X # Created: Thursday, March 8, 1990 9:46:18 AM
X
X! COPTIONS = -m -d 'NEBFILE="neb.star"' -d 'STARFILE="yale.star"' -DNO_BUF_READSTAR
X
X starmain.c.o <f> starmain.c
X C -s 1 starmain.c {COPTIONS}
Xdiff -r -c ../../starchart3.2/starchart/README.st ./README.st
X*** ../../starchart3.2/starchart/README.st Wed Apr 4 18:28:31 1990
X--- ./README.st Wed Apr 4 18:31:25 1990
X***************
X*** 1,7 ****
X! Atari ST support has been provided by Holger Zessel. He reports that
X! there is still a problem causing occasional crashing. I believe this
X! is a small problem which we will have fixed soon.
X
X You may wish to apply this small patch to starm2.c:
X ================Cut here================
X ***************
X--- 1,12 ----
X! Atari ST support has been provided by Holger Zessel.
X
X+ Note that you will need strings.h, which is provided as Astring.h in
X+ the observe directory. Astring.h is for use on the Atari ST
X+ where it should be named 'strings.h', since this header is
X+ apparently not provided with MWC.
X+
X+ You may need to remove the #pragma in starsupp.c.
X+
X You may wish to apply this small patch to starm2.c:
X ================Cut here================
X ***************
X***************
X*** 43,48 ****
X--- 48,55 ----
X ================Cut here================
X
X Holger's comments follow:
X+
X+ Note that it is no longer unstable, that problem has been fixed.
X
X Some informations to the atari st driver:
X -----------------------------------------
Xdiff -r -c ../../starchart3.2/starchart/interact.c ./interact.c
X*** ../../starchart3.2/starchart/interact.c Wed Apr 4 18:28:34 1990
X--- ./interact.c Wed Apr 4 18:31:29 1990
X***************
X*** 5,14 ****
X *
X * Copyright (c) 1990 by Craig Counterman. All rights reserved.
X *
X! * This software may be redistributed freely, not sold.
X! * This copyright notice and disclaimer of warranty must remain
X! * unchanged.
X *
X * No representation is made about the suitability of this
X * software for any purpose. It is provided "as is" without express or
X * implied warranty, to the extent permitted by applicable law.
X--- 5,20 ----
X *
X * Copyright (c) 1990 by Craig Counterman. All rights reserved.
X *
X! * StarChart Version 3.2 copyright (c) March 1990 by Craig Counterman
X! * original StarChart Software Suite copyright (c) 1987 by Alan Paeth
X *
X+ * All rights reserved. Redistribution granted for non-commercial
X+ * non-profit use only. Disclaimer: users of this work understand that
X+ * (a) the authors' cannot undertake to support this software (b) users
X+ * agree to acknowledge the use of the software in any published work
X+ * arising from its application and (c) any subsequent redistribution of
X+ * this work retains this warranty placard.
X+ *
X * No representation is made about the suitability of this
X * software for any purpose. It is provided "as is" without express or
X * implied warranty, to the extent permitted by applicable law.
X***************
X*** 15,21 ****
X *
X */
X
X! static char rcsid[]="$Header: interact.c,v 1.7 90/03/10 15:33:02 ccount Exp $";
X
X #include <stdio.h>
X #include <math.h>
X--- 21,27 ----
X *
X */
X
X! static char rcsid[]="$Header: interact.c,v 1.8 90/04/03 00:31:26 ccount Exp $";
X
X #include <stdio.h>
X #include <math.h>
Xdiff -r -c ../../starchart3.2/starchart/makefile.st ./makefile.st
X*** ../../starchart3.2/starchart/makefile.st Wed Apr 4 18:28:35 1990
X--- ./makefile.st Wed Apr 4 18:31:30 1990
X***************
X*** 1,12 ****
X # Makefile for atari ST
X #
X! # $Header: makefile.st,v 1.1 90/03/08 20:14:24 ccount Exp $
X #
X TARGS= starst
X
X #SITE DEPENDENCIES
X #
X! LOCAL=-DSYSV -DATARI_ST -Ic:\include\local -DREADMODE=\"rb\"
X
X
X # FOR ALL
X--- 1,12 ----
X # Makefile for atari ST
X #
X! # $Header: makefile.st,v 1.2 90/04/02 23:21:30 ccount Exp $
X #
X TARGS= starst
X
X #SITE DEPENDENCIES
X #
X! LOCAL=-DSYSV -DATARI_ST -Ic:\include\local -DREADMODE='"rb"' -DNO_BUF_READSTAR
X
X
X # FOR ALL
X***************
X*** 86,93 ****
X
X #CFLAGS= $(FILEFLAGS) $(LOCAL) $(DEFINES) -f68881
X #LDFLAGS =
X! CFLAGS= $(FILEFLAGS) $(LOCAL) $(DEFINES) -VCSD -f
X! LDFLAGS = -VCSD -f
X
X
X #Include interact.o in COBJ to support keyboard user interaction
X--- 86,93 ----
X
X #CFLAGS= $(FILEFLAGS) $(LOCAL) $(DEFINES) -f68881
X #LDFLAGS =
X! CFLAGS= $(FILEFLAGS) $(LOCAL) $(DEFINES) -f
X! LDFLAGS = -f
X
X
X #Include interact.o in COBJ to support keyboard user interaction
Xdiff -r -c ../../starchart3.2/starchart/parse_input.c ./parse_input.c
X*** ../../starchart3.2/starchart/parse_input.c Wed Apr 4 18:28:36 1990
X--- ./parse_input.c Wed Apr 4 18:31:31 1990
X***************
X*** 3,12 ****
X *
X * Copyright (c) 1990 by Craig Counterman. All rights reserved.
X *
X! * This software may be redistributed freely, not sold.
X! * This copyright notice and disclaimer of warranty must remain
X! * unchanged.
X *
X * No representation is made about the suitability of this
X * software for any purpose. It is provided "as is" without express or
X * implied warranty, to the extent permitted by applicable law.
X--- 3,18 ----
X *
X * Copyright (c) 1990 by Craig Counterman. All rights reserved.
X *
X! * StarChart Version 3.2 copyright (c) March 1990 by Craig Counterman
X! * original StarChart Software Suite copyright (c) 1987 by Alan Paeth
X *
X+ * All rights reserved. Redistribution granted for non-commercial
X+ * non-profit use only. Disclaimer: users of this work understand that
X+ * (a) the authors' cannot undertake to support this software (b) users
X+ * agree to acknowledge the use of the software in any published work
X+ * arising from its application and (c) any subsequent redistribution of
X+ * this work retains this warranty placard.
X+ *
X * No representation is made about the suitability of this
X * software for any purpose. It is provided "as is" without express or
X * implied warranty, to the extent permitted by applicable law.
X***************
X*** 15,21 ****
X
X
X
X! static char rcsid[]="$Header: parse_input.c,v 1.5 90/02/19 17:52:54 ccount Exp $";
X
X #include <ctype.h>
X #include "star3.h"
X--- 21,27 ----
X
X
X
X! static char rcsid[]="$Header: parse_input.c,v 1.6 90/04/03 00:31:32 ccount Exp $";
X
X #include <ctype.h>
X #include "star3.h"
Xdiff -r -c ../../starchart3.2/starchart/patchlevel.h ./patchlevel.h
X*** ../../starchart3.2/starchart/patchlevel.h Wed Apr 4 18:28:37 1990
X--- ./patchlevel.h Wed Apr 4 18:31:32 1990
X***************
X*** 1,2 ****
X #define VERSION_STRING "3.2"
X! #define PATCHLEVEL_STRING "0"
X--- 1,2 ----
X #define VERSION_STRING "3.2"
X! #define PATCHLEVEL_STRING "1"
Xdiff -r -c ../../starchart3.2/starchart/pcstar.h ./pcstar.h
X*** ../../starchart3.2/starchart/pcstar.h Wed Apr 4 18:28:37 1990
X--- ./pcstar.h Wed Apr 4 18:31:32 1990
X***************
X*** 1,2 ****
X--- 1,21 ----
X #define CONSTFILE "./cons.loc"
X #define RCFILE "./star.rc"
X+ /* optionally specify other files here.
X+
X+ #define STARFILE "./data/yale.star"
X+ #define INDEXFILE "./data/index.ind"
X+ #define NEBFILE "./data/neb.sta"
X+ #define BOUNDFILE "./data/boundari.sta"
X+ #define PATTERNFILE "./data/pattern.sta"
X+ #define CNAMEFILE "./data/cnames.sta"
X+ */
X+
X+
X+ /* redefine stderr to handle errors gracefully */
X+ #ifdef stderr
X+ #undef stderr
X+ #endif
X+ #define stderr err_out
X+
X+ /* buf_readstar probably won't work worth using on a PC */
X+ #define NO_BUF_READSTAR
Xdiff -r -c ../../starchart3.2/starchart/readfile.c ./readfile.c
X*** ../../starchart3.2/starchart/readfile.c Wed Apr 4 18:28:39 1990
X--- ./readfile.c Wed Apr 4 18:31:33 1990
X***************
X*** 1,18 ****
X /*
X * readfile.c
X * readstar routine
X! * Copyright (c) 1989 by Craig Counterman (email: ccount at athena.mit.edu)
X! * and Alan Paeth (awpaeth at watcgl)
X! * all rights reserved
X *
X! * You may copy the program, compile it, and run it,
X! * but you may not try to make money off it, or pretend you wrote it.
X! * (This copyright prevents you from selling the program - the
X! * author grants anyone the right to copy and install the program
X! * on any machine it will run on)
X */
X
X! static char rcsid[]="$Header: readfile.c,v 2.7 90/03/10 15:31:11 ccount Exp $";
X
X #include <stdio.h>
X #include <math.h>
X--- 1,23 ----
X /*
X * readfile.c
X * readstar routine
X! * StarChart Version 3.2 copyright (c) March 1990 by Craig Counterman
X! * original StarChart Software Suite copyright (c) 1987 by Alan Paeth
X *
X! * All rights reserved. Redistribution granted for non-commercial
X! * non-profit use only. Disclaimer: users of this work understand that
X! * (a) the authors' cannot undertake to support this software (b) users
X! * agree to acknowledge the use of the software in any published work
X! * arising from its application and (c) any subsequent redistribution of
X! * this work retains this warranty placard.
X! *
X! * No representation is made about the suitability of this
X! * software for any purpose. It is provided "as is" without express or
X! * implied warranty, to the extent permitted by applicable law.
X! *
X */
X
X! static char rcsid[]="$Header: readfile.c,v 2.9 90/04/03 00:31:38 ccount Exp $";
X
X #include <stdio.h>
X #include <math.h>
X***************
X*** 556,563 ****
X return(FALSE); /* NO error */
X }
X
X! /* Macintosh, under MPW, currently won't do buf_readstar */
X! #ifndef macintosh
X #ifdef ATARI_ST
X #include<types.h>
X #include<stat.h>
X--- 561,569 ----
X return(FALSE); /* NO error */
X }
X
X! /* Macintosh, under MPW, currently won't do buf_readstar,
X! atari it doesn't help much. */
X! #ifndef NO_BUF_READSTAR
X #ifdef ATARI_ST
X #include<types.h>
X #include<stat.h>
X***************
X*** 607,616 ****
X if (!strcmp(cur_file_name, buf_files[i].name)) break;
X
X if (i == nbuf_files) { /* Need to read the file */
X! buf_files[nbuf_files].name =
X! (char *) malloc((unsigned) strlen(cur_file_name)+1);
X! strcpy(buf_files[nbuf_files].name, cur_file_name);
X
X #ifndef ATARI_ST
X fstat(fileno(file), &fstats);
X #else
X--- 613,630 ----
X if (!strcmp(cur_file_name, buf_files[i].name)) break;
X
X if (i == nbuf_files) { /* Need to read the file */
X! if (buf_files[nbuf_files].name =
X! (char *) malloc((unsigned) strlen(cur_file_name)+1))
X! strcpy(buf_files[nbuf_files].name, cur_file_name);
X! else {
X! /* out of memory */
X! readfile = readstar; /* Give up on buf_readstar */
X! D_comment("buffered file read: Out of memory\n");
X
X+ /* call readstar now */
X+ return readstar(file, ftype);
X+ };
X+
X #ifndef ATARI_ST
X fstat(fileno(file), &fstats);
X #else
X***************
X*** 872,875 ****
X
X return(FALSE); /* NO error */
X }
X! #endif /* macintosh */
X--- 886,889 ----
X
X return(FALSE); /* NO error */
X }
X! #endif /* NO_BUF_READSTAR not defined */
Xdiff -r -c ../../starchart3.2/starchart/star3.h ./star3.h
X*** ../../starchart3.2/starchart/star3.h Wed Apr 4 18:28:40 1990
X--- ./star3.h Wed Apr 4 18:31:34 1990
X***************
X*** 1,16 ****
X /* Header for starchart 3.x */
X /*
X *
X! * $Header: star3.h,v 2.8 90/02/19 17:58:03 ccount Exp $
X *
X */
X /*
X *
X! * Copyright (c) 1990 by Craig Counterman. All rights reserved.
X *
X! * This software may be redistributed freely, not sold.
X! * This copyright notice and disclaimer of warranty must remain
X! * unchanged.
X *
X * No representation is made about the suitability of this
X * software for any purpose. It is provided "as is" without express or
X--- 1,20 ----
X /* Header for starchart 3.x */
X /*
X *
X! * $Header: star3.h,v 2.9 90/04/03 00:35:17 ccount Exp $
X *
X */
X /*
X *
X! * StarChart Version 3.2 copyright (c) March 1990 by Craig Counterman
X! * original StarChart Software Suite copyright (c) 1987 by Alan Paeth
X *
X! * All rights reserved. Redistribution granted for non-commercial
X! * non-profit use only. Disclaimer: users of this work understand that
X! * (a) the authors' cannot undertake to support this software (b) users
X! * agree to acknowledge the use of the software in any published work
X! * arising from its application and (c) any subsequent redistribution of
X! * this work retains this warranty placard.
X *
X * No representation is made about the suitability of this
X * software for any purpose. It is provided "as is" without express or
X***************
X*** 18,24 ****
X *
X * DISCLAIMER OF WARRANTY
X * ----------------------
X! * The author disclaims all warranties with regard to this software to
X * the extent permitted by applicable law, including all implied
X * warranties of merchantability and fitness. In no event shall the
X * author be liable for any special, indirect or consequential damages or
X--- 22,28 ----
X *
X * DISCLAIMER OF WARRANTY
X * ----------------------
X! * The authors disclaim all warranties with regard to this software to
X * the extent permitted by applicable law, including all implied
X * warranties of merchantability and fitness. In no event shall the
X * author be liable for any special, indirect or consequential damages or
Xdiff -r -c ../../starchart3.2/starchart/starX10.c ./starX10.c
X*** ../../starchart3.2/starchart/starX10.c Wed Apr 4 18:28:41 1990
X--- ./starX10.c Wed Apr 4 18:31:35 1990
X***************
X*** 4,13 ****
X *
X * Copyright (c) 1990 by Craig Counterman. All rights reserved.
X *
X! * This software may be redistributed freely, not sold.
X! * This copyright notice and disclaimer of warranty must remain
X! * unchanged.
X *
X * No representation is made about the suitability of this
X * software for any purpose. It is provided "as is" without express or
X * implied warranty, to the extent permitted by applicable law.
X--- 4,19 ----
X *
X * Copyright (c) 1990 by Craig Counterman. All rights reserved.
X *
X! * StarChart Version 3.2 copyright (c) March 1990 by Craig Counterman
X! * original StarChart Software Suite copyright (c) 1987 by Alan Paeth
X *
X+ * All rights reserved. Redistribution granted for non-commercial
X+ * non-profit use only. Disclaimer: users of this work understand that
X+ * (a) the authors' cannot undertake to support this software (b) users
X+ * agree to acknowledge the use of the software in any published work
X+ * arising from its application and (c) any subsequent redistribution of
X+ * this work retains this warranty placard.
X+ *
X * No representation is made about the suitability of this
X * software for any purpose. It is provided "as is" without express or
X * implied warranty, to the extent permitted by applicable law.
X***************
X*** 14,20 ****
X *
X */
X
X! static char rcsid[]="$Header: starX10.c,v 2.3 90/02/19 17:52:58 ccount Exp $";
X
X #include <stdio.h>
X #include <math.h>
X--- 20,26 ----
X *
X */
X
X! static char rcsid[]="$Header: starX10.c,v 2.5 90/04/03 00:31:47 ccount Exp $";
X
X #include <stdio.h>
X #include <math.h>
X***************
X*** 457,462 ****
X--- 463,469 ----
X case 'M':
X colr = pixels[RED];
X break;
X+ case 'C':
X case 'R':
X case 'N':
X case 'S':
Xdiff -r -c ../../starchart3.2/starchart/starX11.c ./starX11.c
X*** ../../starchart3.2/starchart/starX11.c Wed Apr 4 18:28:42 1990
X--- ./starX11.c Wed Apr 4 18:31:36 1990
X***************
X*** 9,19 ****
X *
X * Portions Copyright (c) 1989 by Joe Wang (joe at athena.mit.edu)
X *
X! * Copyright (c) 1990 by Craig Counterman. All rights reserved.
X *
X! * This software may be redistributed freely, not sold.
X! * This copyright notice and disclaimer of warranty must remain
X! * unchanged.
X *
X * No representation is made about the suitability of this
X * software for any purpose. It is provided "as is" without express or
X--- 9,23 ----
X *
X * Portions Copyright (c) 1989 by Joe Wang (joe at athena.mit.edu)
X *
X! * StarChart Version 3.2 copyright (c) March 1990 by Craig Counterman
X! * original StarChart Software Suite copyright (c) 1987 by Alan Paeth
X *
X! * All rights reserved. Redistribution granted for non-commercial
X! * non-profit use only. Disclaimer: users of this work understand that
X! * (a) the authors' cannot undertake to support this software (b) users
X! * agree to acknowledge the use of the software in any published work
X! * arising from its application and (c) any subsequent redistribution of
X! * this work retains this warranty placard.
X *
X * No representation is made about the suitability of this
X * software for any purpose. It is provided "as is" without express or
X***************
X*** 21,27 ****
X *
X */
X
X! static char rcsid[]="$Header: starX11.c,v 2.16 90/02/19 17:53:06 ccount Exp $";
X
X #include <stdio.h>
X #include <math.h>
X--- 25,31 ----
X *
X */
X
X! static char rcsid[]="$Header: starX11.c,v 2.18 90/04/03 00:31:55 ccount Exp $";
X
X #include <stdio.h>
X #include <math.h>
X***************
X*** 705,710 ****
X--- 709,715 ----
X
X
X static int curr_lsty = -1;
X+ static int curr_dashes = 1;
X /* Draw a line of style line_style from the current point to (x, y) */
X D_draw(x, y, line_style)
X int x, y, line_style;
X***************
X*** 773,779 ****
X xline_sty = LineSolid;
X
X
X! if (xline_sty != curr_lsty) {
X values_GC.line_style = xline_sty;
X values_GC.dashes = dashes;
X XChangeGC(display, default_GC, GCLineStyle | GCDashList, &values_GC);
X--- 778,784 ----
X xline_sty = LineSolid;
X
X
X! if ((xline_sty != curr_lsty) || (dashes != curr_dashes)) {
X values_GC.line_style = xline_sty;
X values_GC.dashes = dashes;
X XChangeGC(display, default_GC, GCLineStyle | GCDashList, &values_GC);
X***************
X*** 784,789 ****
X--- 789,795 ----
X
X
X curr_lsty = xline_sty;
X+ curr_dashes = dashes;
X
X if ((use_backup) && !hide_drawing)
X XCopyArea(display, backup, window, default_GC, 0, 0, width, height,
X***************
X*** 860,866 ****
X {
X Pixel colr;
X int class, subclass;
X! static char *table = "OBAFGKMRNSrgbycpow";
X static int spectra[10] = {
X BLUE_WHITE, BLUE, WHITE, WHITE, YELLOW, ORANGE, RED, RED, RED};
X
X--- 866,872 ----
X {
X Pixel colr;
X int class, subclass;
X! static char *table = "OBAFGKMCRNSrgbycpow";
X static int spectra[10] = {
X BLUE_WHITE, BLUE, WHITE, WHITE, YELLOW, ORANGE, RED, RED, RED};
X
X***************
X*** 873,878 ****
X--- 879,885 ----
X /* G */ { 15, 15, 15, 15, 15, 16, 16, 16, 16, 16 },
X /* K */ { 17, 17, 18, 18, 18, 19, 19, 19, 19, 19 },
X /* M */ { 20, 20, 21, 22, 23, 24, 25, 26, 26, 26 },
X+ /* C */ { 27, 27, 27, 28, 28, 28, 28, 28, 29, 30 },
X /* R */ { 27, 27, 27, 28, 28, 28, 28, 28, 29, 30 },
X /* N */ { 27, 27, 27, 28, 28, 28, 28, 28, 29, 30 },
X /* S */ { 30, 30, 30, 30, 31, 31, 31, 31, 31, 31 },
Xdiff -r -c ../../starchart3.2/starchart/starXaw.c ./starXaw.c
X*** ../../starchart3.2/starchart/starXaw.c Wed Apr 4 18:28:43 1990
X--- ./starXaw.c Wed Apr 4 18:31:38 1990
X***************
X*** 8,17 ****
X *
X * Copyright (c) 1990 by Craig Counterman. All rights reserved.
X *
X! * This software may be redistributed freely, not sold.
X! * This copyright notice and disclaimer of warranty must remain
X! * unchanged.
X *
X * No representation is made about the suitability of this
X * software for any purpose. It is provided "as is" without express or
X * implied warranty, to the extent permitted by applicable law.
X--- 8,23 ----
X *
X * Copyright (c) 1990 by Craig Counterman. All rights reserved.
X *
X! * StarChart Version 3.2 copyright (c) March 1990 by Craig Counterman
X! * original StarChart Software Suite copyright (c) 1987 by Alan Paeth
X *
X+ * All rights reserved. Redistribution granted for non-commercial
X+ * non-profit use only. Disclaimer: users of this work understand that
X+ * (a) the authors' cannot undertake to support this software (b) users
X+ * agree to acknowledge the use of the software in any published work
X+ * arising from its application and (c) any subsequent redistribution of
X+ * this work retains this warranty placard.
X+ *
X * No representation is made about the suitability of this
X * software for any purpose. It is provided "as is" without express or
X * implied warranty, to the extent permitted by applicable law.
X***************
X*** 18,24 ****
X *
X */
X
X! static char rcsid[]="$Header: starXaw.c,v 1.9 90/03/10 15:33:34 ccount Exp $";
X
X #include <stdio.h>
X #include <math.h>
X--- 24,30 ----
X *
X */
X
X! static char rcsid[]="$Header: starXaw.c,v 1.10 90/04/03 00:32:10 ccount Exp $";
X
X #include <stdio.h>
X #include <math.h>
Xdiff -r -c ../../starchart3.2/starchart/starXaw.h ./starXaw.h
X*** ../../starchart3.2/starchart/starXaw.h Wed Apr 4 18:28:43 1990
X--- ./starXaw.h Wed Apr 4 18:31:38 1990
X***************
X*** 1,14 ****
X /* Header for Athena widgets starchart */
X /*
X *
X! * $Header: starXaw.h,v 1.5 90/02/19 17:58:08 ccount Exp $
X *
X- *
X * Copyright (c) 1990 by Craig Counterman. All rights reserved.
X *
X! * This software may be redistributed freely, not sold.
X! * This copyright notice and disclaimer of warranty must remain
X! * unchanged.
X *
X * No representation is made about the suitability of this
X * software for any purpose. It is provided "as is" without express or
X--- 1,19 ----
X /* Header for Athena widgets starchart */
X /*
X *
X! * $Header: starXaw.h,v 1.6 90/04/03 00:35:21 ccount Exp $
X *
X * Copyright (c) 1990 by Craig Counterman. All rights reserved.
X *
X! * StarChart Version 3.2 copyright (c) March 1990 by Craig Counterman
X! * original StarChart Software Suite copyright (c) 1987 by Alan Paeth
X! *
X! * All rights reserved. Redistribution granted for non-commercial
X! * non-profit use only. Disclaimer: users of this work understand that
X! * (a) the authors' cannot undertake to support this software (b) users
X! * agree to acknowledge the use of the software in any published work
X! * arising from its application and (c) any subsequent redistribution of
X! * this work retains this warranty placard.
X *
X * No representation is made about the suitability of this
X * software for any purpose. It is provided "as is" without express or
Xdiff -r -c ../../starchart3.2/starchart/starXawDlog.c ./starXawDlog.c
X*** ../../starchart3.2/starchart/starXawDlog.c Wed Apr 4 18:28:44 1990
X--- ./starXawDlog.c Wed Apr 4 18:31:39 1990
X***************
X*** 4,13 ****
X *
X * Copyright (c) 1990 by Craig Counterman. All rights reserved.
X *
X! * This software may be redistributed freely, not sold.
X! * This copyright notice and disclaimer of warranty must remain
X! * unchanged.
X *
X * No representation is made about the suitability of this
X * software for any purpose. It is provided "as is" without express or
X * implied warranty, to the extent permitted by applicable law.
X--- 4,19 ----
X *
X * Copyright (c) 1990 by Craig Counterman. All rights reserved.
X *
X! * StarChart Version 3.2 copyright (c) March 1990 by Craig Counterman
X! * original StarChart Software Suite copyright (c) 1987 by Alan Paeth
X *
X+ * All rights reserved. Redistribution granted for non-commercial
X+ * non-profit use only. Disclaimer: users of this work understand that
X+ * (a) the authors' cannot undertake to support this software (b) users
X+ * agree to acknowledge the use of the software in any published work
X+ * arising from its application and (c) any subsequent redistribution of
X+ * this work retains this warranty placard.
X+ *
X * No representation is made about the suitability of this
X * software for any purpose. It is provided "as is" without express or
X * implied warranty, to the extent permitted by applicable law.
X***************
X*** 14,20 ****
X *
X */
X
X! static char rcsid[]="$Header: starXawDlog.c,v 1.10 90/03/10 15:33:47 ccount Exp $";
X
X #include <stdio.h>
X #include <math.h>
X--- 20,26 ----
X *
X */
X
X! static char rcsid[]="$Header: starXawDlog.c,v 1.11 90/04/03 00:32:21 ccount Exp $";
X
X #include <stdio.h>
X #include <math.h>
Xdiff -r -c ../../starchart3.2/starchart/starXawDlog.h ./starXawDlog.h
X*** ../../starchart3.2/starchart/starXawDlog.h Wed Apr 4 18:28:45 1990
X--- ./starXawDlog.h Wed Apr 4 18:31:40 1990
X***************
X*** 1,14 ****
X /* Header for Athena widgets dialogs */
X /*
X *
X! * $Header: starXawDlog.h,v 1.5 90/02/19 17:58:10 ccount Exp $
X *
X *
X! * Copyright (c) 1990 by Craig Counterman. All rights reserved.
X! *
X! * This software may be redistributed freely, not sold.
X! * This copyright notice and disclaimer of warranty must remain
X! * unchanged.
X *
X * No representation is made about the suitability of this
X * software for any purpose. It is provided "as is" without express or
X--- 1,17 ----
X /* Header for Athena widgets dialogs */
X /*
X *
X! * $Header: starXawDlog.h,v 1.6 90/04/03 00:35:24 ccount Exp $
X *
X+ * StarChart Version 3.2 copyright (c) March 1990 by Craig Counterman
X+ * original StarChart Software Suite copyright (c) 1987 by Alan Paeth
X *
X! * All rights reserved. Redistribution granted for non-commercial
X! * non-profit use only. Disclaimer: users of this work understand that
X! * (a) the authors' cannot undertake to support this software (b) users
X! * agree to acknowledge the use of the software in any published work
X! * arising from its application and (c) any subsequent redistribution of
X! * this work retains this warranty placard.
X *
X * No representation is made about the suitability of this
X * software for any purpose. It is provided "as is" without express or
Xdiff -r -c ../../starchart3.2/starchart/starXawHelp.c ./starXawHelp.c
X*** ../../starchart3.2/starchart/starXawHelp.c Wed Apr 4 18:28:46 1990
X--- ./starXawHelp.c Wed Apr 4 18:31:41 1990
X***************
X*** 3,12 ****
X *
X * Copyright (c) 1990 by Craig Counterman. All rights reserved.
X *
X! * This software may be redistributed freely, not sold.
X! * This copyright notice and disclaimer of warranty must remain
X! * unchanged.
X *
X * No representation is made about the suitability of this
X * software for any purpose. It is provided "as is" without express or
X * implied warranty, to the extent permitted by applicable law.
X--- 3,18 ----
X *
X * Copyright (c) 1990 by Craig Counterman. All rights reserved.
X *
X! * StarChart Version 3.2 copyright (c) March 1990 by Craig Counterman
X! * original StarChart Software Suite copyright (c) 1987 by Alan Paeth
X *
X+ * All rights reserved. Redistribution granted for non-commercial
X+ * non-profit use only. Disclaimer: users of this work understand that
X+ * (a) the authors' cannot undertake to support this software (b) users
X+ * agree to acknowledge the use of the software in any published work
X+ * arising from its application and (c) any subsequent redistribution of
X+ * this work retains this warranty placard.
X+ *
X * No representation is made about the suitability of this
X * software for any purpose. It is provided "as is" without express or
X * implied warranty, to the extent permitted by applicable law.
X***************
X*** 13,19 ****
X *
X */
X
X! static char rcsid[]="$Header: starXawHelp.c,v 1.7 90/03/10 15:34:07 ccount Exp $";
X
X #include <stdio.h>
X #include <math.h>
X--- 19,25 ----
X *
X */
X
X! static char rcsid[]="$Header: starXawHelp.c,v 1.8 90/04/03 00:32:42 ccount Exp $";
X
X #include <stdio.h>
X #include <math.h>
Xdiff -r -c ../../starchart3.2/starchart/starXawMwin.c ./starXawMwin.c
X*** ../../starchart3.2/starchart/starXawMwin.c Wed Apr 4 18:28:47 1990
X--- ./starXawMwin.c Wed Apr 4 18:31:42 1990
X***************
X*** 3,12 ****
X *
X * Copyright (c) 1990 by Craig Counterman. All rights reserved.
X *
X! * This software may be redistributed freely, not sold.
X! * This copyright notice and disclaimer of warranty must remain
X! * unchanged.
X *
X * No representation is made about the suitability of this
X * software for any purpose. It is provided "as is" without express or
X * implied warranty, to the extent permitted by applicable law.
X--- 3,18 ----
X *
X * Copyright (c) 1990 by Craig Counterman. All rights reserved.
X *
X! * StarChart Version 3.2 copyright (c) March 1990 by Craig Counterman
X! * original StarChart Software Suite copyright (c) 1987 by Alan Paeth
X *
X+ * All rights reserved. Redistribution granted for non-commercial
X+ * non-profit use only. Disclaimer: users of this work understand that
X+ * (a) the authors' cannot undertake to support this software (b) users
X+ * agree to acknowledge the use of the software in any published work
X+ * arising from its application and (c) any subsequent redistribution of
X+ * this work retains this warranty placard.
X+ *
X * No representation is made about the suitability of this
X * software for any purpose. It is provided "as is" without express or
X * implied warranty, to the extent permitted by applicable law.
X***************
X*** 14,20 ****
X */
X
X
X! static char rcsid[]="$Header: starXawMwin.c,v 1.7 90/03/10 15:34:13 ccount Exp $";
X
X #include <stdio.h>
X #include <math.h>
X--- 20,26 ----
X */
X
X
X! static char rcsid[]="$Header: starXawMwin.c,v 1.8 90/04/03 00:32:49 ccount Exp $";
X
X #include <stdio.h>
X #include <math.h>
Xdiff -r -c ../../starchart3.2/starchart/starcust.c ./starcust.c
X*** ../../starchart3.2/starchart/starcust.c Wed Apr 4 18:28:49 1990
X--- ./starcust.c Wed Apr 4 18:31:43 1990
X***************
X*** 5,19 ****
X /*
X * Produced for starchart 3.0 by Craig Counterman Jan, 1989
X *
X! * Copyright (c) 1989 by Craig Counterman
X! * Portions Copyright (c) 1987 by Alan Paeth (awpaeth at watcgl)
X *
X! * Copyright (c) 1990 by Craig Counterman. All rights reserved.
X *
X- * This software may be redistributed freely, not sold.
X- * This copyright notice and disclaimer of warranty must remain
X- * unchanged.
X- *
X * No representation is made about the suitability of this
X * software for any purpose. It is provided "as is" without express or
X * implied warranty, to the extent permitted by applicable law.
X--- 5,20 ----
X /*
X * Produced for starchart 3.0 by Craig Counterman Jan, 1989
X *
X! * StarChart Version 3.2 copyright (c) March 1990 by Craig Counterman
X! * original StarChart Software Suite copyright (c) 1987 by Alan Paeth
X *
X! * All rights reserved. Redistribution granted for non-commercial
X! * non-profit use only. Disclaimer: users of this work understand that
X! * (a) the authors' cannot undertake to support this software (b) users
X! * agree to acknowledge the use of the software in any published work
X! * arising from its application and (c) any subsequent redistribution of
X! * this work retains this warranty placard.
X *
X * No representation is made about the suitability of this
X * software for any purpose. It is provided "as is" without express or
X * implied warranty, to the extent permitted by applicable law.
X***************
X*** 21,27 ****
X */
X
X
X! static char rcsid[]="$Header: starcust.c,v 2.4 90/03/10 15:34:28 ccount Exp $";
X
X #include <stdio.h>
X #include <math.h>
X--- 22,28 ----
X */
X
X
X! static char rcsid[]="$Header: starcust.c,v 2.6 90/04/03 00:33:06 ccount Exp $";
X
X #include <stdio.h>
X #include <math.h>
X***************
X*** 213,224 ****
X fscanf(mfile, "numwins=%d\n", &numwins);
X for (i = 0; i < numwins; i++) {
X fscanf(mfile, "mapwin=%d\n",&n);
X! if (n != i) fprintf(stderr, "Error in mapwin file");
X n = i;
X
X /* Allocate space for this mapwin */
X! mapwin[n] = (mapwindow *) malloc(sizeof(mapwindow));
X! mapwin[n]->tag_field = (char *) malloc(MAXPATHLEN);
X
X fscanf(mfile, "width=%d\n", &(mapwin[n]->width));
X fscanf(mfile, "height=%d\n", &(mapwin[n]->height));
X--- 214,228 ----
X fscanf(mfile, "numwins=%d\n", &numwins);
X for (i = 0; i < numwins; i++) {
X fscanf(mfile, "mapwin=%d\n",&n);
X! if (n != i) fprintf(stderr, "Error in mapwin file\n");
X n = i;
X
X /* Allocate space for this mapwin */
X! if (!(mapwin[n] = (mapwindow *) malloc(sizeof(mapwindow))))
X! die("Out of memory","");
X! if (!(mapwin[n]->tag_field = (char *) malloc(MAXPATHLEN)))
X! die("Out of memory","");
X!
X
X fscanf(mfile, "width=%d\n", &(mapwin[n]->width));
X fscanf(mfile, "height=%d\n", &(mapwin[n]->height));
X***************
X*** 272,279 ****
X o = j;
X
X /* Allocate space for the file name */
X! mapwin[n]->file[o].name = (char *) malloc(MAXPATHLEN);
X!
X
X fscanf(mfile, "name=%s\n", (mapwin[n]->file[o].name));
X fscanf(mfile, "type=%d\n", &(mapwin[n]->file[o].type));
X--- 276,283 ----
X o = j;
X
X /* Allocate space for the file name */
X! if (!(mapwin[n]->file[o].name = (char *) malloc(MAXPATHLEN)))
X! die("Out of memory","");
X
X fscanf(mfile, "name=%s\n", (mapwin[n]->file[o].name));
X fscanf(mfile, "type=%d\n", &(mapwin[n]->file[o].type));
Xdiff -r -c ../../starchart3.2/starchart/stardsp.c ./stardsp.c
X*** ../../starchart3.2/starchart/stardsp.c Wed Apr 4 18:28:50 1990
X--- ./stardsp.c Wed Apr 4 18:31:44 1990
X***************
X*** 10,20 ****
X !
X * Modified for starchart 3.0. Craig Counterman Jan, 1989
X *
X! * Copyright (c) 1990 by Craig Counterman. All rights reserved.
X *
X! * This software may be redistributed freely, not sold.
X! * This copyright notice and disclaimer of warranty must remain
X! * unchanged.
X *
X * No representation is made about the suitability of this
X * software for any purpose. It is provided "as is" without express or
X--- 10,24 ----
X !
X * Modified for starchart 3.0. Craig Counterman Jan, 1989
X *
X! * StarChart Version 3.2 copyright (c) March 1990 by Craig Counterman
X! * original StarChart Software Suite copyright (c) 1987 by Alan Paeth
X *
X! * All rights reserved. Redistribution granted for non-commercial
X! * non-profit use only. Disclaimer: users of this work understand that
X! * (a) the authors' cannot undertake to support this software (b) users
X! * agree to acknowledge the use of the software in any published work
X! * arising from its application and (c) any subsequent redistribution of
X! * this work retains this warranty placard.
X *
X * No representation is made about the suitability of this
X * software for any purpose. It is provided "as is" without express or
X***************
X*** 22,28 ****
X *
X */
X
X! static char rcsid[]="$Header: stardsp.c,v 2.4 90/02/19 17:55:01 ccount Exp $";
X
X #include <stdio.h>
X #include <math.h>
X--- 26,32 ----
X *
X */
X
X! static char rcsid[]="$Header: stardsp.c,v 2.6 90/04/03 00:33:11 ccount Exp $";
X
X #include <stdio.h>
X #include <math.h>
X***************
X*** 273,278 ****
X--- 277,283 ----
X break;
X case 'M':
X break;
X+ case 'C':
X case 'R':
X case 'N':
X case 'S':
Xdiff -r -c ../../starchart3.2/starchart/staribm.c ./staribm.c
X*** ../../starchart3.2/starchart/staribm.c Wed Apr 4 18:28:51 1990
X--- ./staribm.c Wed Apr 4 18:31:45 1990
X***************
X*** 42,51 ****
X * the program on the same display you are doing graphics on.
X *
X * Copyright (c) 1990 by Tom Horsley and Craig Counterman. All rights reserved.
X *
X! * This software may be redistributed freely, not sold.
X! * This copyright notice and disclaimer of warranty must remain
X! * unchanged.
X *
X * No representation is made about the suitability of this
X * software for any purpose. It is provided "as is" without express or
X--- 42,56 ----
X * the program on the same display you are doing graphics on.
X *
X * Copyright (c) 1990 by Tom Horsley and Craig Counterman. All rights reserved.
X+ * StarChart Version 3.2 copyright (c) March 1990 by Craig Counterman
X+ * original StarChart Software Suite copyright (c) 1987 by Alan Paeth
X *
X! * All rights reserved. Redistribution granted for non-commercial
X! * non-profit use only. Disclaimer: users of this work understand that
X! * (a) the authors' cannot undertake to support this software (b) users
X! * agree to acknowledge the use of the software in any published work
X! * arising from its application and (c) any subsequent redistribution of
X! * this work retains this warranty placard.
X *
X * No representation is made about the suitability of this
X * software for any purpose. It is provided "as is" without express or
X***************
X*** 52,61 ****
X * implied warranty, to the extent permitted by applicable law.
X *
X */
X- */
X
X /*
X! * $Header: staribm.c,v 1.2 90/02/19 17:55:09 ccount Exp $
X */
X
X
X--- 57,65 ----
X * implied warranty, to the extent permitted by applicable law.
X *
X */
X
X /*
X! * $Header: staribm.c,v 1.4 90/04/03 00:35:54 ccount Exp $
X */
X
X
X***************
X*** 492,497 ****
X--- 496,505 ----
X _setcolor(draw_yellow) ;
X break;
X case 'M':
X+ case 'C':
X+ case 'R':
X+ case 'N':
X+ case 'S':
X _setcolor(draw_red) ;
X break;
X default:
Xdiff -r -c ../../starchart3.2/starchart/staribmv.c ./staribmv.c
X*** ../../starchart3.2/starchart/staribmv.c Wed Apr 4 18:28:51 1990
X--- ./staribmv.c Wed Apr 4 18:31:46 1990
X***************
X*** 0 ****
X--- 1,1798 ----
X+ /*
X+ * IBM PC VGA/SVGA driver for starchart 3.0 by Doug MCDonald
X+ *
X+ * Uses my own public domain graphics package, included. This package works on
X+ * EGA VGA and super VGA cards. Its upper-level routines draw points, lines,
X+ * ellipses, filled ellipses, filled rectangles and text. The "symbol"
X+ * routine draws "text" that is defined by a user-supplied string of bytes,
X+ * which are painted onto the screen from top to bottom. The "zsetup" and
X+ * "curmod" routines must bracket any drawing done with this package. If you
X+ * exit the program or try to use BIOS text between them you get garbage.
X+ *
X+ *
X+ * Development was done with a Dell 310 20MHz 386, Microsoft C 5.1, a Video 7
X+ * VGA16 display card, and (thank goodness) an 80387 numeric co-processor, at
X+ * with a 18 msec disk.
X+ *
X+ *
X+ * The Microsoft library is pretty compatible with U**x System V, so compile
X+ * everything with the SYSV flag set and you will be OK.
X+ *
X+ * The main glitch is the file "con.locs". You have absolutely GOT to rename
X+ * this file under DOS, otherwise it tries to talk to the CONsole. I use
X+ * "cons.loc", which is fairly close. Renaming the built in file names is
X+ * done by modifying pcstar.h.
X+ *
X+ *
X+ * Copyright (c) 1990 by Doug McDonald, Tom Horsley, and Craig Counterman.
X+ * All rights reserved.
X+ * StarChart Version 3.2 copyright (c) March 1990 by Craig Counterman
X+ * original StarChart Software Suite copyright (c) 1987 by Alan Paeth
X+ *
X+ * All rights reserved. Redistribution granted for non-commercial
X+ * non-profit use only. Disclaimer: users of this work understand that
X+ * (a) the authors' cannot undertake to support this software (b) users
X+ * agree to acknowledge the use of the software in any published work
X+ * arising from its application and (c) any subsequent redistribution of
X+ * this work retains this warranty placard.
X+ *
X+ * The graphics library is public domain, and may be used any way you wish.
X+ *
X+ * No representation is made about the suitability of this software for any
X+ * purpose. It is provided "as is" without express or implied warranty, to
X+ * the extent permitted by applicable law.
X+ *
X+ * The followinf file will compile and link it:
X+
X+ masm svgagraf
X+ cl -c -DSYSV -Dindex=strchr -AL -Gt32 starcust.c interact.c parse_in.c
X+ cl -c -DSYSV -Dindex=strchr -AL -Gt32 staribmv.c starsupp.c readfile.c
X+ cl -c -DSYSV -Dindex=strchr -AL -Gt32 -DINTERACTIVE_CONTROL starm2.c starmain.c
X+ link staribmv+readfile+starcust+interact+parse_in+starsupp+starm2+starmain+svgagraf;
X+ exemod staribmv.exe /stack 4200
X+
X+ * for plain VGA add -DPLAIN_VGA in the line that compiles staribmv
X+ *
X+ */
X+
X+ /* for plain VGA #define PLAIN_VGA */
X+
X+
X+ #include <stdio.h>
X+ #include <math.h>
X+ #ifndef SYSV
X+ #include <strings.h>
X+ #else
X+ #include <string.h>
X+ #endif
X+ #include <ctype.h>
X+
X+ #include <dos.h>
X+
X+ #include "star3.h"
X+
X+
X+ int yscale1;
X+ long yscale2;
X+ long xscale1;
X+ int control_mode = -1;
X+ int yrad[7] = {7, 6, 5, 4, 3, 2, 1};
X+ int xrad[7] = {7, 6, 5, 4, 3, 2, 1};
X+
X+
X+ static int xlast, ylast;
X+ #define scx(x) ((int)((((long)(x))*xscale1)/1000L))
X+ #define scy(y) (yscale1-((int)((((long)(y))*yscale2)/10000L)))
X+
X+
X+ extern char *title; /* Title of page */
X+
X+ extern mapwindow *mapwin[MAXWINDOWS];
X+ extern int numwins;
X+
X+ extern int cur_function;
X+ extern int cur_map_type;
X+ extern int cur_map_tag;
X+ extern char *cur_tag_field;
X+
X+ /*
X+ * Set by initxform One could use elements of the mapwindow structure, but
X+ * these should be faster for the current window
X+ */
X+ extern int xproj_mode;
X+ extern double xwest, xeast, xnorth, xsouth, xbot;
X+ extern int cenx, ceny, strty;
X+ extern double xracen, sindlcen, cosdlcen, chart_scale;
X+ extern double yscale;
X+ extern double xc_scale;
X+ extern double inv_;
X+
X+
X+ /*
X+ * Scale multiplier, minimum, mangitude change, maximum, for thumbnail,
X+ */
X+ #define THSMUL 1.2
X+ #define THSMIN 10.0
X+ #define THMADJ 2.5
X+ #define THMMAX 5.0
X+
X+ #define MIN_MAG (-1.5) /* all magnitude below become this */
X+ #define MAX_MAG (11.4) /* all magnitude above become this */
X+
X+
X+ /* Exports */
X+
X+ /* The variables in the first few lines MUST be set by driver */
X+ mapwindow fullpage = {
X+ 880, 700, 20, 65, /* width, height, x and y offsets */
X+ 5.9, 2.0, 2.05, /* default limiting mags for glyph, name, label */
X+
X+ /*
X+ * The next several variables SHOULD be set by the driver, but are only
X+ * used by the driver
X+ */
X+ FULLPAGEMAP, /* Type of map: THUMBNAIL may have some restrictions */
X+ 0, /* May be used by driver for whatever */
X+ "String", /* May be used by driver for whatever */
X+
X+ /*
X+ * The next several variables may be set by the driver, but the main
X+ * routines may reset them (and the driver routines may then override
X+ * that)
X+ */
X+ SANSONS, /* Projection mode */
X+ FALSE, FALSE, /* Draw grids */
X+ 0.5, 5.0, /* grid step size */
X+ 0.0, 0.0, /* grid origin */
X+
X+ FALSE, /* Invert (flip north south) */
X+ };
X+
X+ /* The variables in the first few lines MUST be set by driver */
X+ mapwindow mainmap = {
X+ 880, 500, 20, 265, /* width, height, x and y offsets */
X+ 5.9, 2.0, 2.05, /* default limiting mags for glyph, name, label */
X+
X+ /*
X+ * The next several variables SHOULD be set by the driver, but are only
X+ * used by the driver
X+ */
X+ MAINMAP, /* Type of map: THUMBNAIL may have some restrictions */
X+ 0, /* May be used by driver for whatever */
X+ "String", /* May be used by driver for whatever */
X+
X+ /*
X+ * The next several variables may be set by the driver, but the main
X+ * routines may reset them (and the driver routines may then override
X+ * that)
X+ */
X+ SANSONS, /* Projection mode */
X+ FALSE, FALSE, /* Draw grids */
X+ 0.5, 5.0, /* grid step size */
X+ 0.0, 0.0, /* grid origin */
X+
X+ FALSE, /* Invert (flip north south) */
X+ };
X+
X+
X+ /* The variables in the first few lines MUST be set by driver */
X+ mapwindow thumbmap = {
X+ 480, 195, 420, 35, /* width, height, x and y offsets */
X+ 3.0 + THMADJ, 1.0 + THMADJ, 2.05 + THMADJ,
X+ /* default limiting mags for glyph, name, label */
X+
X+ /*
X+ * The next several variables SHOULD be set by the driver, but are only
X+ * used by the driver
X+ */
X+ THUMBNAIL, /* Type of map: THUMBNAIL may have some restrictions */
X+ 0, /* May be used by driver for whatever */
X+ "String", /* May be used by driver for whatever */
X+
X+ /*
X+ * The next several variables may be set by the driver, but the main
X+ * routines may reset them (and the driver routines may then override
X+ * that)
X+ */
X+ SANSONS, /* Projection mode */
X+ FALSE, FALSE, /* Draw grids */
X+ 0.5, 5.0, /* grid step size */
X+ 0.0, 0.0, /* grid origin */
X+
X+ FALSE, /* Invert (flip north south) */
X+ };
X+
X+ /* h & v tick text controls */
X+ int htick_lim = 2;
X+ int htext_lim = 80;
X+ int htext_xoff = -29; /* was +2 */
X+ int htext_yoff = 27;
END_OF_FILE
if test 53020 -ne `wc -c <'stch_pch.aa'`; then
echo shar: \"'stch_pch.aa'\" unpacked with wrong size!
fi
# end of 'stch_pch.aa'
fi
echo shar: End of archive 4 \(of 4\).
cp /dev/null ark4isdone
MISSING=""
for I in 1 2 3 4 ; do
if test ! -f ark${I}isdone ; then
MISSING="${MISSING} ${I}"
fi
done
if test "${MISSING}" = "" ; then
echo You have unpacked all 4 archives.
rm -f ark[1-9]isdone
else
echo You still need to unpack the following archives:
echo " " ${MISSING}
fi
## End of shell archive.
exit 0
More information about the Comp.sources.misc
mailing list