[comp.sources.games] v03i069: x11conq - diffs for X10.4 to X11 xconq, Part03/03

games-request@tekred.TEK.COM (01/22/88)

Submitted by: Kurt Hoyt <kwh@sei.cmu.edu>
Comp.sources.games: Volume 3, Issue 69
Archive-name: x11conq/Part03

#! /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 3 (of 3)."
# Contents:  x11diffs.3
# Wrapped by billr@tekred on Wed Jan 20 08:53:33 1988
PATH=/bin:/usr/bin:/usr/ucb ; export PATH
if test -f x11diffs.3 -a "${1}" != "-c" ; then 
  echo shar: Will not over-write existing file \"x11diffs.3\"
else
echo shar: Extracting \"x11diffs.3\" \(43319 characters\)
sed "s/^X//" >x11diffs.3 <<'END_OF_x11diffs.3'
Xdiff -c ./output.c X11/output.c
X*** ./output.c	Thu Jul 16 14:55:19 1987
X--- X11/output.c	Wed Oct 28 08:07:17 1987
X***************
X*** 1,4
X! /* Copyright (c) 1987  Stanley T. Shebs, University of Utah. */
X  /* This program may be used, copied, modified, and redistributed freely */
X  /* for noncommercial purposes, so long as this notice remains intact. */
X  
X
X--- 1,5 -----
X! /* Copyright (c) 1987  Stanley T. Shebs, University of Utah; */
X! /*                     Kurt W. Hoyt, Software Engineering Institute. */
X  /* This program may be used, copied, modified, and redistributed freely */
X  /* for noncommercial purposes, so long as this notice remains intact. */
X  
X***************
X*** 2,8
X  /* This program may be used, copied, modified, and redistributed freely */
X  /* for noncommercial purposes, so long as this notice remains intact. */
X  
X! /* RCS $Header: output.c,v 1.4 87/06/08 21:45:22 shebs Exp $ */
X  
X  #include "xconq.h"
X  
X
X--- 3,9 -----
X  /* This program may be used, copied, modified, and redistributed freely */
X  /* for noncommercial purposes, so long as this notice remains intact. */
X  
X! /* RCS $Header: output.c,v 1.9 87/10/27 11:37:11 kwh Exp $ */
X  
X  #include "xconq.h"
X  
X***************
X*** 62,68
X  	}
X  	strcpy(side->noticebuf[MAXNOTES-1], notice);
X  	show_note(side);
X! 	XFlush();
X  	if (Debug) printf("%s\n", notice);
X      }
X  }
X
X--- 63,69 -----
X  	}
X  	strcpy(side->noticebuf[MAXNOTES-1], notice);
X  	show_note(side);
X! 	XFlush(side->display);
X  	if (Debug) printf("%s\n", notice);
X      }
X  }
X***************
X*** 73,79
X  show_note(side)
X  Side *side;
X  {
X!     int i;
X  
X      XClear(side->msg);
X      for (i = 0; i < MAXNOTES; ++i) {
X
X--- 74,80 -----
X  show_note(side)
X  Side *side;
X  {
X!     int i, y;
X  
X      XClearWindow(side->display, side->msg);
X      XSetFont(side->display, side->gc, side->msgfont);
X***************
X*** 75,81
X  {
X      int i;
X  
X!     XClear(side->msg);
X      for (i = 0; i < MAXNOTES; ++i) {
X  	XText(side->msg, 0, i*fh,
X  	      side->noticebuf[i], strlen(side->noticebuf[i]),
X
X--- 76,86 -----
X  {
X      int i, y;
X  
X!     XClearWindow(side->display, side->msg);
X!     XSetFont(side->display, side->gc, side->msgfont);
X!     XSetForeground(side->display, side->gc, side->graycolor);
X!     XSetBackground(side->display, side->gc, side->bgcolor);
X! 
X      for (i = 0; i < MAXNOTES; ++i) {
X          if (i == MAXNOTES - 1)
X               XSetForeground (side->display, side->gc, side->fgcolor);
X***************
X*** 77,87
X  
X      XClear(side->msg);
X      for (i = 0; i < MAXNOTES; ++i) {
X! 	XText(side->msg, 0, i*fh,
X! 	      side->noticebuf[i], strlen(side->noticebuf[i]),
X! 	      side->msgfont,
X! 	      (i == MAXNOTES-1) ? side->fgcolor : side->graycolor,
X! 	      side->bgcolor);
X      }
X  }
X  
X
X--- 82,92 -----
X      XSetBackground(side->display, side->gc, side->bgcolor);
X  
X      for (i = 0; i < MAXNOTES; ++i) {
X!         if (i == MAXNOTES - 1)
X!              XSetForeground (side->display, side->gc, side->fgcolor);
X!         y = (i+1)*fh - side->msgfontinfo->descent;
X! 	XDrawImageString(side->display, side->msg, side->gc, 0, y,
X! 	                 side->noticebuf[i], strlen(side->noticebuf[i]));
X      }
X  }
X  
X***************
X*** 100,105
X  show_info(side)
X  Side *side;
X  {
X      if (active_display(side)) {
X  	XClear(side->info);
X  	XText(side->info, 0, 0*fh, side->infobuf[0], strlen(side->infobuf[0]),
X
X--- 105,112 -----
X  show_info(side)
X  Side *side;
X  {
X+     int y;
X+ 
X      if (active_display(side)) {
X  	XClearWindow(side->display, side->info);
X          XSetFont(side->display, side->gc, side->msgfont);
X***************
X*** 101,112
X  Side *side;
X  {
X      if (active_display(side)) {
X! 	XClear(side->info);
X! 	XText(side->info, 0, 0*fh, side->infobuf[0], strlen(side->infobuf[0]),
X! 	      side->msgfont, side->fgcolor, side->bgcolor);
X! 	XText(side->info, 0, 1*fh, side->infobuf[1], strlen(side->infobuf[1]),
X! 	      side->msgfont, side->fgcolor, side->bgcolor);
X! 	XFlush();
X      }
X  }
X  
X
X--- 108,124 -----
X      int y;
X  
X      if (active_display(side)) {
X! 	XClearWindow(side->display, side->info);
X!         XSetFont(side->display, side->gc, side->msgfont);
X!         XSetForeground(side->display, side->gc, side->fgcolor);
X!         XSetBackground(side->display, side->gc, side->bgcolor);
X!         y = fh - side->msgfontinfo->descent;
X! 	XDrawString(side->display, side->info, side->gc, 0, y,
X!                     side->infobuf[0], strlen(side->infobuf[0]));
X!         y += fh;
X! 	XDrawString(side->display, side->info, side->gc, 0, y,
X!                     side->infobuf[1], strlen(side->infobuf[1]));
X! 	XFlush(side->display);
X      }
X  }
X  
X***************
X*** 119,125
X      if (active_display(side)) {
X  	sprintf(side->infobuf[0], " ");
X  	sprintf(side->infobuf[1], " ");
X! 	XClear(side->info);
X      }
X  }
X  
X
X--- 131,137 -----
X      if (active_display(side)) {
X  	sprintf(side->infobuf[0], " ");
X  	sprintf(side->infobuf[1], " ");
X! 	XClearWindow(side->display, side->info);
X      }
X  }
X  
X***************
X*** 129,134
X  show_prompt(side)
X  Side *side;
X  {
X      if (active_display(side)) {
X  	XText(side->prompt, 0, 0, side->promptbuf, strlen(side->promptbuf),
X  	      side->msgfont, side->fgcolor, side->bgcolor);
X
X--- 141,148 -----
X  show_prompt(side)
X  Side *side;
X  {
X+     int y;
X+ 
X      if (active_display(side)) {
X          XSetFont(side->display, side->gc, side->msgfont);
X          XSetForeground(side->display, side->gc, side->fgcolor);
X***************
X*** 130,137
X  Side *side;
X  {
X      if (active_display(side)) {
X! 	XText(side->prompt, 0, 0, side->promptbuf, strlen(side->promptbuf),
X! 	      side->msgfont, side->fgcolor, side->bgcolor);
X  	promptcol = strlen(side->promptbuf) + 1;
X      }
X  }
X
X--- 144,155 -----
X      int y;
X  
X      if (active_display(side)) {
X!         XSetFont(side->display, side->gc, side->msgfont);
X!         XSetForeground(side->display, side->gc, side->fgcolor);
X!         XSetBackground(side->display, side->gc, side->bgcolor);
X!         y = fh - side->msgfontinfo->descent;
X! 	XDrawString(side->display, side->prompt, side->gc, 0, y,
X!                     side->promptbuf, strlen(side->promptbuf));
X  	promptcol = strlen(side->promptbuf) + 1;
X      }
X  }
X***************
X*** 143,148
X  char ch;
X  {
X      char tmp[2];
X  
X      /* no display test needed ... */
X  
X
X--- 161,167 -----
X  char ch;
X  {
X      char tmp[2];
X+     int  y;
X  
X      /* no display test needed ... */
X  
X***************
X*** 146,151
X  
X      /* no display test needed ... */
X  
X      if (ch == '\010') {
X  	tmp[0] = ' ';
X  	XText(curside->prompt, (--promptcol)*fw, 0, tmp, 1, 
X
X--- 165,175 -----
X  
X      /* no display test needed ... */
X  
X+     XSetFont(curside->display, curside->gc, curside->msgfont);
X+     XSetForeground(curside->display, curside->gc, curside->fgcolor);
X+     XSetBackground(curside->display, curside->gc, curside->bgcolor);
X+     y = fh - curside->msgfontinfo->descent;
X+ 
X      if (ch == '\010') {
X  	tmp[0] = ' ';
X  	XDrawString(curside->display, curside->prompt, curside->gc,
X***************
X*** 148,155
X  
X      if (ch == '\010') {
X  	tmp[0] = ' ';
X! 	XText(curside->prompt, (--promptcol)*fw, 0, tmp, 1, 
X! 	      curside->msgfont, curside->fgcolor, curside->bgcolor);
X      } else {
X  	tmp[0] = ch;
X  	XText(curside->prompt, (promptcol++)*fw, 0, tmp, 1, 
X
X--- 172,179 -----
X  
X      if (ch == '\010') {
X  	tmp[0] = ' ';
X! 	XDrawString(curside->display, curside->prompt, curside->gc,
X!                     (--promptcol)*fw, y, tmp, 1);
X      } else {
X  	tmp[0] = ch;
X  	XDrawString(curside->display, curside->prompt, curside->gc,
X***************
X*** 152,159
X  	      curside->msgfont, curside->fgcolor, curside->bgcolor);
X      } else {
X  	tmp[0] = ch;
X! 	XText(curside->prompt, (promptcol++)*fw, 0, tmp, 1, 
X! 	      curside->msgfont, curside->fgcolor, curside->bgcolor);
X      }
X      XFlush();
X  }
X
X--- 176,183 -----
X                      (--promptcol)*fw, y, tmp, 1);
X      } else {
X  	tmp[0] = ch;
X! 	XDrawString(curside->display, curside->prompt, curside->gc,
X!                     (promptcol++)*fw, y, tmp, 1);
X      }
X      XFlush(curside->display);
X  }
X***************
X*** 155,161
X  	XText(curside->prompt, (promptcol++)*fw, 0, tmp, 1, 
X  	      curside->msgfont, curside->fgcolor, curside->bgcolor);
X      }
X!     XFlush();
X  }
X  
X  /* Clear the prompt line.  We only call this when no display test needed. */
X
X--- 179,185 -----
X  	XDrawString(curside->display, curside->prompt, curside->gc,
X                      (promptcol++)*fw, y, tmp, 1);
X      }
X!     XFlush(curside->display);
X  }
X  
X  /* Clear the prompt line.  We only call this when no display test needed. */
X***************
X*** 164,170
X  Side *side;
X  {
X      sprintf(side->promptbuf, " ");
X!     XClear(side->prompt);
X  }
X  
X  /* Update the turn number display. */
X
X--- 188,194 -----
X  Side *side;
X  {
X      sprintf(side->promptbuf, " ");
X!     XClearWindow(side->display, side->prompt);
X  }
X  
X  /* Update the turn number display. */
X***************
X*** 173,178
X  Side *side;
X  {
X      char timebuf[BUFSIZE];
X  
X      if (active_display(side)) {
X  	XClear(side->time);
X
X--- 197,203 -----
X  Side *side;
X  {
X      char timebuf[BUFSIZE];
X+     int y;
X  
X      if (active_display(side)) {
X  	XClearWindow(side->display, side->time);
X***************
X*** 175,181
X      char timebuf[BUFSIZE];
X  
X      if (active_display(side)) {
X! 	XClear(side->time);
X  	sprintf(timebuf, "Turn %4d", gametime);
X  	XText(side->time, 0, 0, timebuf, strlen(timebuf),
X  	      side->msgfont, side->fgcolor, side->bgcolor);
X
X--- 200,206 -----
X      int y;
X  
X      if (active_display(side)) {
X! 	XClearWindow(side->display, side->time);
X  	sprintf(timebuf, "Turn %4d", gametime);
X          XSetFont(side->display, side->gc, side->msgfont);
X          XSetForeground(side->display, side->gc, side->fgcolor);
X***************
X*** 177,185
X      if (active_display(side)) {
X  	XClear(side->time);
X  	sprintf(timebuf, "Turn %4d", gametime);
X! 	XText(side->time, 0, 0, timebuf, strlen(timebuf),
X! 	      side->msgfont, side->fgcolor, side->bgcolor);
X! 	XFlush();
X  	if (Debug) printf("Turn %d\n", gametime);
X      }
X  }
X
X--- 202,214 -----
X      if (active_display(side)) {
X  	XClearWindow(side->display, side->time);
X  	sprintf(timebuf, "Turn %4d", gametime);
X!         XSetFont(side->display, side->gc, side->msgfont);
X!         XSetForeground(side->display, side->gc, side->fgcolor);
X!         XSetBackground(side->display, side->gc, side->bgcolor);
X!         y = fh - side->msgfontinfo->descent;
X! 	XDrawString(side->display, side->time, side->gc, 0, y,
X!                     timebuf, strlen(timebuf));
X! 	XFlush(side->display);
X  	if (Debug) printf("Turn %d\n", gametime);
X      }
X  }
X***************
X*** 190,195
X  Side *side;
X  {
X      char modebuf[BUFSIZE];
X  
X      if (active_display(side)) {
X  	XClear(side->mode);
X
X--- 219,225 -----
X  Side *side;
X  {
X      char modebuf[BUFSIZE];
X+     int  y;
X  
X      if (active_display(side)) {
X  	XClearWindow(side->display, side->mode);
X***************
X*** 192,198
X      char modebuf[BUFSIZE];
X  
X      if (active_display(side)) {
X! 	XClear(side->mode);
X  	sprintf(modebuf, "%s Mode", modenames[mode]);
X  	XText(side->mode, 0, 0, modebuf, strlen(modebuf),
X  	      side->msgfont, side->fgcolor, side->bgcolor);
X
X--- 222,228 -----
X      int  y;
X  
X      if (active_display(side)) {
X! 	XClearWindow(side->display, side->mode);
X  	sprintf(modebuf, "%s Mode", modenames[mode]);
X          XSetFont(side->display, side->gc, side->msgfont);
X          XSetForeground(side->display, side->gc, side->fgcolor);
X***************
X*** 194,202
X      if (active_display(side)) {
X  	XClear(side->mode);
X  	sprintf(modebuf, "%s Mode", modenames[mode]);
X! 	XText(side->mode, 0, 0, modebuf, strlen(modebuf),
X! 	      side->msgfont, side->fgcolor, side->bgcolor);
X! 	XFlush();
X      }
X  }
X  
X
X--- 224,236 -----
X      if (active_display(side)) {
X  	XClearWindow(side->display, side->mode);
X  	sprintf(modebuf, "%s Mode", modenames[mode]);
X!         XSetFont(side->display, side->gc, side->msgfont);
X!         XSetForeground(side->display, side->gc, side->fgcolor);
X!         XSetBackground(side->display, side->gc, side->bgcolor);
X!         y = fh - side->msgfontinfo->descent;
X! 	XDrawString(side->display, side->mode, side->gc, 0, y,
X!                     modebuf, strlen(modebuf));
X! 	XFlush(side->display);
X      }
X  }
X  
X***************
X*** 207,212
X  Side *side;
X  {
X      char statebuf[BUFSIZE];
X  
X      if (active_display(side)) {
X  	XClear(side->state);
X
X--- 241,247 -----
X  Side *side;
X  {
X      char statebuf[BUFSIZE];
X+     int  y;
X  
X      if (active_display(side)) {
X  	XClearWindow(side->display, side->state);
X***************
X*** 209,215
X      char statebuf[BUFSIZE];
X  
X      if (active_display(side)) {
X! 	XClear(side->state);
X  	sprintf(statebuf, "Morale %d (%s) Score %d",
X  		side->morale, moralenames[side->morale/1000], side->score);
X  	XText(side->state, 0, 1*fh, statebuf, strlen(statebuf),
X
X--- 244,250 -----
X      int  y;
X  
X      if (active_display(side)) {
X! 	XClearWindow(side->display, side->state);
X  	sprintf(statebuf, "Morale %d (%s) Score %d",
X  		side->morale, moralenames[side->morale/1000], side->score);
X          XSetFont(side->display, side->gc, side->msgfont);
X***************
X*** 212,219
X  	XClear(side->state);
X  	sprintf(statebuf, "Morale %d (%s) Score %d",
X  		side->morale, moralenames[side->morale/1000], side->score);
X! 	XText(side->state, 0, 1*fh, statebuf, strlen(statebuf),
X! 	      side->msgfont, side->fgcolor, side->bgcolor);
X  	if (usecount) {
X  	    sprintf(statebuf, "%3d inputs left", numinputs);
X  	    XText(side->state, 0, 0*fh, statebuf, strlen(statebuf),
X
X--- 247,258 -----
X  	XClearWindow(side->display, side->state);
X  	sprintf(statebuf, "Morale %d (%s) Score %d",
X  		side->morale, moralenames[side->morale/1000], side->score);
X!         XSetFont(side->display, side->gc, side->msgfont);
X!         XSetForeground(side->display, side->gc, side->fgcolor);
X!         XSetBackground(side->display, side->gc, side->bgcolor);
X!         y = 2*fh - side->msgfontinfo->descent;
X! 	XDrawString(side->display, side->state, side->gc, 0, y,
X!                     statebuf, strlen(statebuf));
X  	if (usecount) {
X  	    sprintf(statebuf, "%3d inputs left", numinputs);
X              y = fh - side->msgfontinfo->descent;
X***************
X*** 216,223
X  	      side->msgfont, side->fgcolor, side->bgcolor);
X  	if (usecount) {
X  	    sprintf(statebuf, "%3d inputs left", numinputs);
X! 	    XText(side->state, 0, 0*fh, statebuf, strlen(statebuf),
X! 		  side->msgfont, side->fgcolor, side->bgcolor);
X  	}
X  	XFlush();
X      }
X
X--- 255,263 -----
X                      statebuf, strlen(statebuf));
X  	if (usecount) {
X  	    sprintf(statebuf, "%3d inputs left", numinputs);
X!             y = fh - side->msgfontinfo->descent;
X! 	    XDrawImageString(side->display, side->state, side->gc, 0, y,
X!                         statebuf, strlen(statebuf));
X  	}
X  	XFlush(side->display);
X      }
X***************
X*** 219,225
X  	    XText(side->state, 0, 0*fh, statebuf, strlen(statebuf),
X  		  side->msgfont, side->fgcolor, side->bgcolor);
X  	}
X! 	XFlush();
X      }
X  }
X  
X
X--- 259,265 -----
X  	    XDrawImageString(side->display, side->state, side->gc, 0, y,
X                          statebuf, strlen(statebuf));
X  	}
X! 	XFlush(side->display);
X      }
X  }
X  
X***************
X*** 229,234
X  Side *side;
X  {
X      char tmp[BUFSIZE];
X  
X      if (active_display(side)) {
X  	sprintf(tmp, "%3d", numinputs);
X
X--- 269,275 -----
X  Side *side;
X  {
X      char tmp[BUFSIZE];
X+     int  y;
X  
X      if (active_display(side)) {
X  	sprintf(tmp, "%3d", numinputs);
X***************
X*** 232,240
X  
X      if (active_display(side)) {
X  	sprintf(tmp, "%3d", numinputs);
X! 	XText(side->state, 0, 0, tmp, strlen(tmp),
X! 	      side->msgfont, side->fgcolor, side->bgcolor);
X! 	XFlush();
X      }
X  }
X  
X
X--- 273,285 -----
X  
X      if (active_display(side)) {
X  	sprintf(tmp, "%3d", numinputs);
X!         XSetFont(side->display, side->gc, side->msgfont);
X!         XSetForeground(side->display, side->gc, side->fgcolor);
X!         XSetBackground(side->display, side->gc, side->bgcolor);
X!         y = fh - side->msgfontinfo->descent;
X! 	XDrawImageString(side->display, side->state, side->gc, 0, y,
X!                          tmp, strlen(tmp));
X! 	XFlush(side->display);
X      }
X  }
X  
X***************
X*** 244,250
X  show_all_sides(side)
X  Side *side;
X  {
X!     int midhgt;
X      Side *side2;
X  
X      if (active_display(side)) {
X
X--- 289,295 -----
X  show_all_sides(side)
X  Side *side;
X  {
X!     int  midhgt;
X      Side *side2;
X      int  y;
X  
X***************
X*** 246,251
X  {
X      int midhgt;
X      Side *side2;
X  
X      if (active_display(side)) {
X  	XClear(side->sides);
X
X--- 291,297 -----
X  {
X      int  midhgt;
X      Side *side2;
X+     int  y;
X  
X      if (active_display(side)) {
X  	XClearWindow(side->display, side->sides);
X***************
X*** 248,254
X      Side *side2;
X  
X      if (active_display(side)) {
X! 	XClear(side->sides);
X  	for_all_sides(side2) {
X  	    XText(side->sides, 0, side_number(side2)*fh,
X  		  side2->titlebuf, strlen(side2->titlebuf),
X
X--- 294,303 -----
X      int  y;
X  
X      if (active_display(side)) {
X! 	XClearWindow(side->display, side->sides);
X!         XSetFont(side->display, side->gc, side->msgfont);
X!         XSetForeground(side->display, side->gc, side->graycolor);
X!         XSetBackground(side->display, side->gc, side->bgcolor);
X  	for_all_sides(side2) {
X              y = (side_number(side2) + 1)*fh - side->msgfontinfo->descent;
X  	    XDrawImageString(side->display, side->sides, side->gc, 0, y,
X***************
X*** 250,258
X      if (active_display(side)) {
X  	XClear(side->sides);
X  	for_all_sides(side2) {
X! 	    XText(side->sides, 0, side_number(side2)*fh,
X! 		  side2->titlebuf, strlen(side2->titlebuf),
X! 		  side->msgfont, side->graycolor, side->bgcolor);
X  	    if (side2->lost) {
X  		midhgt = side_number(side2)*fh+fh/2;
X  		XLine(side->sides, 0, midhgt, 500, midhgt,
X
X--- 299,307 -----
X          XSetForeground(side->display, side->gc, side->graycolor);
X          XSetBackground(side->display, side->gc, side->bgcolor);
X  	for_all_sides(side2) {
X!             y = (side_number(side2) + 1)*fh - side->msgfontinfo->descent;
X! 	    XDrawImageString(side->display, side->sides, side->gc, 0, y,
X! 		             side2->titlebuf, strlen(side2->titlebuf));
X  	    if (side2->lost) {
X  		midhgt = side_number(side2)*fh+fh/2;
X  		XDrawLine(side->display, side->sides, side->gc,
X***************
X*** 255,262
X  		  side->msgfont, side->graycolor, side->bgcolor);
X  	    if (side2->lost) {
X  		midhgt = side_number(side2)*fh+fh/2;
X! 		XLine(side->sides, 0, midhgt, 500, midhgt,
X! 		      1, 1, side->graycolor, GXcopy, AllPlanes);
X  	    }
X  	}
X  	XFlush();
X
X--- 304,311 -----
X  		             side2->titlebuf, strlen(side2->titlebuf));
X  	    if (side2->lost) {
X  		midhgt = side_number(side2)*fh+fh/2;
X! 		XDrawLine(side->display, side->sides, side->gc,
X!                           0, midhgt, 500, midhgt);
X  	    }
X  	}
X  	XFlush(side->display);
X***************
X*** 259,265
X  		      1, 1, side->graycolor, GXcopy, AllPlanes);
X  	    }
X  	}
X! 	XFlush();
X      }
X  }
X  
X
X--- 308,314 -----
X                            0, midhgt, 500, midhgt);
X  	    }
X  	}
X! 	XFlush(side->display);
X      }
X  }
X  
X***************
X*** 270,275
X  show_curside(side)
X  Side *side;
X  {
X      if (active_display(side) && curside != NULL) {
X  	XText(side->sides, 0, side_number(curside)*fh,
X  	      curside->titlebuf, strlen(curside->titlebuf), side->msgfont,
X
X--- 319,326 -----
X  show_curside(side)
X  Side *side;
X  {
X+     int y;
X+ 
X      if (active_display(side) && curside != NULL) {
X          XSetFont (side->display, side->gc, side->msgfont);
X          if (side == curside)
X***************
X*** 271,281
X  Side *side;
X  {
X      if (active_display(side) && curside != NULL) {
X! 	XText(side->sides, 0, side_number(curside)*fh,
X! 	      curside->titlebuf, strlen(curside->titlebuf), side->msgfont,
X! 	      (side == curside ? side->bgcolor : side->fgcolor),
X! 	      (side == curside ? side->fgcolor : side->bgcolor));
X! 	XFlush();
X      }
X  }
X  
X
X--- 322,343 -----
X      int y;
X  
X      if (active_display(side) && curside != NULL) {
X!         XSetFont (side->display, side->gc, side->msgfont);
X!         if (side == curside)
X!           {
X!             XSetForeground (side->display, side->gc, side->bgcolor);
X!             XSetBackground (side->display, side->gc, side->fgcolor);
X! 	  }
X!         else
X!           {
X!             XSetForeground (side->display, side->gc, side->fgcolor);
X!             XSetBackground (side->display, side->gc, side->bgcolor);
X! 	  }
X! 
X!         y = (side_number(curside) + 1)*fh - side->msgfontinfo->descent;
X! 	XDrawImageString(side->display, side->sides, side->gc, 0, y,
X! 	                 curside->titlebuf, strlen(curside->titlebuf));
X! 	XFlush(side->display);
X      }
X  }
X  
X***************
X*** 284,289
X  unshow_curside(side)
X  Side *side;
X  {
X      if (active_display(side) && curside != NULL) {
X  	XText(side->sides, 0, side_number(curside)*fh,
X  	      curside->titlebuf, strlen(curside->titlebuf),
X
X--- 346,353 -----
X  unshow_curside(side)
X  Side *side;
X  {
X+     int y;
X+ 
X      if (active_display(side) && curside != NULL) {
X          XSetFont (side->display, side->gc, side->msgfont);
X          XSetForeground (side->display, side->gc, side->graycolor);
X***************
X*** 285,294
X  Side *side;
X  {
X      if (active_display(side) && curside != NULL) {
X! 	XText(side->sides, 0, side_number(curside)*fh,
X! 	      curside->titlebuf, strlen(curside->titlebuf),
X! 	      side->msgfont, side->graycolor, side->bgcolor);
X! 	XFlush();
X      }
X  }
X  
X
X--- 349,361 -----
X      int y;
X  
X      if (active_display(side) && curside != NULL) {
X!         XSetFont (side->display, side->gc, side->msgfont);
X!         XSetForeground (side->display, side->gc, side->graycolor);
X!         XSetBackground (side->display, side->gc, side->bgcolor);
X!         y = (side_number(curside) + 1)*fh - side->msgfontinfo->descent;
X! 	XDrawImageString(side->display, side->sides, side->gc, 0, y,
X! 	                 curside->titlebuf, strlen(curside->titlebuf));
X! 	XFlush(side->display);
X      }
X  }
X  
X***************
X*** 298,303
X  Side *side;
X  {
X      char clockbuf[BUFSIZE];
X  
X      if (active_display(side)) {
X  	XClear(side->clock);
X
X--- 365,371 -----
X  Side *side;
X  {
X      char clockbuf[BUFSIZE];
X+     int y;
X  
X      if (active_display(side)) {
X  	XClearWindow(side->display, side->clock);
X***************
X*** 300,306
X      char clockbuf[BUFSIZE];
X  
X      if (active_display(side)) {
X! 	XClear(side->clock);
X  	sprintf(clockbuf, "%3d", countdown);
X  	XText(side->clock, 0, 0, clockbuf, strlen(clockbuf),
X  	      side->msgfont, side->fgcolor, side->bgcolor);
X
X--- 368,374 -----
X      int y;
X  
X      if (active_display(side)) {
X! 	XClearWindow(side->display, side->clock);
X  	sprintf(clockbuf, "%3d", countdown);
X          XSetFont (side->display, side->gc, side->msgfont);
X          XSetForeground (side->display, side->gc, side->fgcolor);
X***************
X*** 302,310
X      if (active_display(side)) {
X  	XClear(side->clock);
X  	sprintf(clockbuf, "%3d", countdown);
X! 	XText(side->clock, 0, 0, clockbuf, strlen(clockbuf),
X! 	      side->msgfont, side->fgcolor, side->bgcolor);
X! 	XFlush();
X      }
X  }
X  
X
X--- 370,382 -----
X      if (active_display(side)) {
X  	XClearWindow(side->display, side->clock);
X  	sprintf(clockbuf, "%3d", countdown);
X!         XSetFont (side->display, side->gc, side->msgfont);
X!         XSetForeground (side->display, side->gc, side->fgcolor);
X!         XSetBackground (side->display, side->gc, side->bgcolor);
X!         y = fh - side->msgfontinfo->descent;
X! 	XDrawString(side->display, side->clock, side->gc, 0, y,
X!                     clockbuf, strlen(clockbuf));
X! 	XFlush(side->display);
X      }
X  }
X  
X***************
X*** 313,319
X  beep(side)
X  Side *side;
X  {
X!     if (active_display(side)) XFeep(0);
X  }
X  
X  /* Dump a file into the help window.  This routine is neither sophisticated */
X
X--- 385,391 -----
X  beep(side)
X  Side *side;
X  {
X!     if (active_display(side)) XBell(side->display, 100);
X  }
X  
X  /* Dump a file into the help window.  This routine is neither sophisticated */
X***************
X*** 347,354
X  {
X      tmphelp = curside->help;
X  
X!     XMapWindow(tmphelp);
X!     XClear(tmphelp);
X  }
X  
X  conceal_help()
X
X--- 419,426 -----
X  {
X      tmphelp = curside->help;
X  
X!     XMapWindow(curside->display, tmphelp);
X!     XClearWindow(curside->display, tmphelp);
X  }
X  
X  conceal_help()
X***************
X*** 353,359
X  
X  conceal_help()
X  {
X!     XUnmapWindow(tmphelp);
X      redraw(curside);
X      XFlush();
X  }
X
X--- 425,431 -----
X  
X  conceal_help()
X  {
X!     XUnmapWindow(curside->display, tmphelp);
X      redraw(curside);
X      XFlush(curside->display);
X  }
X***************
X*** 355,361
X  {
X      XUnmapWindow(tmphelp);
X      redraw(curside);
X!     XFlush();
X  }
X  
X  /* init our counters or open a file. */
X
X--- 427,433 -----
X  {
X      XUnmapWindow(curside->display, tmphelp);
X      redraw(curside);
X!     XFlush(curside->display);
X  }
X  
X  /* init our counters or open a file. */
X***************
X*** 379,384
X  Side *side;
X  char *control, *a1, *a2, *a3, *a4, *a5, *a6;
X  {
X      sprintf(wbuf, control, a1, a2, a3, a4, a5, a6);
X      if (wprintmode && wfp != NULL) {
X  	fprintf(wfp, "%s\n", wbuf);
X
X--- 451,458 -----
X  Side *side;
X  char *control, *a1, *a2, *a3, *a4, *a5, *a6;
X  {
X+     int y;
X+ 
X      sprintf(wbuf, control, a1, a2, a3, a4, a5, a6);
X      if (wprintmode && wfp != NULL) {
X  	fprintf(wfp, "%s\n", wbuf);
X***************
X*** 384,391
X  	fprintf(wfp, "%s\n", wbuf);
X      } else {
X  	if (strlen(wbuf) > 0) {
X! 	    XText(side->help, wcol*fw, wline*fh, wbuf, strlen(wbuf),
X! 		  side->msgfont, side->fgcolor, side->bgcolor);
X  	}
X  	wline++;  /* should acct for newlines etc */
X      }
X
X--- 458,469 -----
X  	fprintf(wfp, "%s\n", wbuf);
X      } else {
X  	if (strlen(wbuf) > 0) {
X!             XSetFont (side->display, side->gc, side->msgfont);
X!             XSetForeground (side->display, side->gc, side->fgcolor);
X!             XSetBackground (side->display, side->gc, side->bgcolor);
X!             y = (wline + 1)*fh - side->msgfontinfo->descent;
X! 	    XDrawString(side->display, side->help, side->gc,
X!                         wcol*fw, y, wbuf, strlen(wbuf));
X  	}
X  	wline++;  /* should acct for newlines etc */
X      }
Xdiff -c ./side.c X11/side.c
X*** ./side.c	Thu Jul 16 14:55:25 1987
X--- X11/side.c	Wed Oct 28 08:08:15 1987
X***************
X*** 1,4
X! /* Copyright (c) 1987  Stanley T. Shebs, University of Utah. */
X  /* This program may be used, copied, modified, and redistributed freely */
X  /* for noncommercial purposes, so long as this notice remains intact. */
X  
X
X--- 1,5 -----
X! /* Copyright (c) 1987  Stanley T. Shebs, University of Utah; */
X! /*                     Kurt W. Hoyt, Software Engineering Institute. */
X  /* This program may be used, copied, modified, and redistributed freely */
X  /* for noncommercial purposes, so long as this notice remains intact. */
X  
X***************
X*** 2,8
X  /* This program may be used, copied, modified, and redistributed freely */
X  /* for noncommercial purposes, so long as this notice remains intact. */
X  
X! /* RCS $Header: side.c,v 1.5 87/06/07 11:37:07 shebs Exp $ */
X  
X  #include "xconq.h"
X  
X
X--- 3,9 -----
X  /* This program may be used, copied, modified, and redistributed freely */
X  /* for noncommercial purposes, so long as this notice remains intact. */
X  
X! /* RCS $Header: side.c,v 1.9 87/10/27 11:25:57 kwh Exp $ */
X  
X  #include "xconq.h"
X  
X***************
X*** 57,63
X  #ifdef XWINDOWS
X  	    if (name == NULL &&	host != NULL &&
X  		strcmp(host, getenv("DISPLAY")) == 0) {
X! 		name = XGetDefault(programname, "SideName");
X  	    }
X  #endif XWINDOWS
X  	    if (name == NULL) {
X
X--- 58,65 -----
X  #ifdef XWINDOWS
X  	    if (name == NULL &&	host != NULL &&
X  		strcmp(host, getenv("DISPLAY")) == 0) {
X!                 open_display (&sides[s]);
X! 		name = XGetDefault(sides[s].display, programname, "SideName");
X  	    }
X  #endif XWINDOWS
X  	    if (name == NULL) {
X***************
X*** 67,75
X  	    }
X  	    sides[s].name = malloc(strlen(name)+2);
X  	    strcpy(sides[s].name, name);
X! 	    sprintf(sides[s].titlebuf,
X! 		    "%d: The %s (%s)",
X! 		    s, plural_form(sides[s].name), (host != NULL ? host : ""));
X  	    for (i = 0; i < numutypes; ++i) {
X  		sides[s].counts[i] = 1;        /* reset id# of units */
X  	    }
X
X--- 69,78 -----
X  	    }
X  	    sides[s].name = malloc(strlen(name)+2);
X  	    strcpy(sides[s].name, name);
X! 	    sprintf(sides[s].titlebuf, "%d: The %s (%s)",
X! 		    s, plural_form(sides[s].name),
X!                        (host != NULL ? host : ""));
X! 
X  	    for (i = 0; i < numutypes; ++i) {
X  		sides[s].counts[i] = 1;        /* reset id# of units */
X  	    }
Xdiff -c ./unit.c X11/unit.c
X*** ./unit.c	Thu Jul 16 14:55:27 1987
X--- X11/unit.c	Wed Oct 28 08:10:13 1987
X***************
X*** 1,4
X! /* Copyright (c) 1987  Stanley T. Shebs, University of Utah. */
X  /* This program may be used, copied, modified, and redistributed freely */
X  /* for noncommercial purposes, so long as this notice remains intact. */
X  
X
X--- 1,5 -----
X! /* Copyright (c) 1987  Stanley T. Shebs, University of Utah; */
X! /*                     Kurt W. Hoyt, Software Engineering Institute. */
X  /* This program may be used, copied, modified, and redistributed freely */
X  /* for noncommercial purposes, so long as this notice remains intact. */
X  
X***************
X*** 2,8
X  /* This program may be used, copied, modified, and redistributed freely */
X  /* for noncommercial purposes, so long as this notice remains intact. */
X  
X! /* RCS $Header: unit.c,v 1.4 87/06/08 21:45:17 shebs Exp $ */
X  
X  #include "xconq.h"
X  
X
X--- 3,9 -----
X  /* This program may be used, copied, modified, and redistributed freely */
X  /* for noncommercial purposes, so long as this notice remains intact. */
X  
X! /* RCS $Header: unit.c,v 1.9 87/10/27 11:26:34 kwh Exp $ */
X  
X  #include "xconq.h"
X  
X***************
X*** 425,431
X  {
X      erase_cursor(curside, curx, cury);
X      clear_info(curside);
X!     flush_output();
X  }
X  
X  /* Build a short phrase describing a given unit to a given side. */
X
X--- 426,432 -----
X  {
X      erase_cursor(curside, curx, cury);
X      clear_info(curside);
X!     flush_output(curside);
X  }
X  
X  /* Build a short phrase describing a given unit to a given side. */
Xdiff -c ./version.h X11/version.h
X*** ./version.h	Thu Jul 16 14:55:30 1987
X--- X11/version.h	Wed Oct 28 08:35:00 1987
X***************
X*** 1
X! #define VERSION "1.00 (6/8/87)"
X
X--- 1 -----
X! #define VERSION "1.50 (10/27/87) -- X11 version"
Xdiff -c ./xconq.c X11/xconq.c
X*** ./xconq.c	Thu Jul 16 14:55:36 1987
X--- X11/xconq.c	Wed Oct 28 08:09:51 1987
X***************
X*** 1,4
X! /* Copyright (c) 1987  Stanley T. Shebs, University of Utah. */
X  /* This program may be used, copied, modified, and redistributed freely */
X  /* for noncommercial purposes, so long as this notice remains intact. */
X  
X
X--- 1,5 -----
X! /* Copyright (c) 1987  Stanley T. Shebs, University of Utah; */
X! /*                     Kurt W. Hoyt, Software Engineering Institute. */
X  /* This program may be used, copied, modified, and redistributed freely */
X  /* for noncommercial purposes, so long as this notice remains intact. */
X  
X***************
X*** 2,8
X  /* This program may be used, copied, modified, and redistributed freely */
X  /* for noncommercial purposes, so long as this notice remains intact. */
X  
X! /* RCS $Header: xconq.c,v 1.5 87/06/08 21:45:02 shebs Exp $ */
X  
X  #include "xconq.h"
X  
X
X--- 3,9 -----
X  /* This program may be used, copied, modified, and redistributed freely */
X  /* for noncommercial purposes, so long as this notice remains intact. */
X  
X! /* RCS $Header: xconq.c,v 1.9 87/10/27 11:27:25 kwh Exp $ */
X  
X  #include "xconq.h"
X  
X***************
X*** 195,200
X      signal(SIGINT, SIG_IGN);
X  #endif UNIX
X      open_displays();
X      for (side = sidelist; side != NULL; side = side->next) {
X  	if (active_display(side)) {
X  	    init_curxy(side);
X
X--- 196,202 -----
X      signal(SIGINT, SIG_IGN);
X  #endif UNIX
X      open_displays();
X+     open_windows();
X      for (side = sidelist; side != NULL; side = side->next) {
X  	if (active_display(side)) {
X  	    init_curxy(side);
X***************
X*** 249,254
X      
X      while (!won && gametime < MAXTIME) {
X  	++gametime;
X  	for_all_cities(city) {
X  	    make_repairs(city);
X  	}
X
X--- 251,257 -----
X      
X      while (!won && gametime < MAXTIME) {
X  	++gametime;
X+ 
X  	for_all_cities(city) {
X  	    make_repairs(city);
X  	}
X***************
X*** 252,257
X  	for_all_cities(city) {
X  	    make_repairs(city);
X  	}
X  	for_all_sides(side) {
X  	    show_time(side);
X  	    show_state(side);
X
X--- 255,261 -----
X  	for_all_cities(city) {
X  	    make_repairs(city);
X  	}
X+ 
X  	for_all_sides(side) {
X  	    show_time(side);
X  	    show_state(side);
X***************
X*** 258,263
X  	    adjust_morale(side, -5);
X  	}
X  	/* This is where curside is set */
X  	for_all_sides(curside) {
X  	    if (!curside->lost) {
X  		lost = TRUE;
X
X--- 262,268 -----
X  	    adjust_morale(side, -5);
X  	}
X  	/* This is where curside is set */
X+ 
X  	for_all_sides(curside) {
X  	    if (!curside->lost) {
X  		lost = TRUE;
X***************
X*** 262,267
X  	    if (!curside->lost) {
X  		lost = TRUE;
X  		gaveup = FALSE;
X  		for_all_sides(side) {
X  		    show_curside(side);
X  		}
X
X--- 267,273 -----
X  	    if (!curside->lost) {
X  		lost = TRUE;
X  		gaveup = FALSE;
X+ 
X  		for_all_sides(side) {
X  		    show_curside(side);
X  		}
X***************
X*** 265,270
X  		for_all_sides(side) {
X  		    show_curside(side);
X  		}
X  		setup_counts(curside);
X  		for_all_cities(city) {
X  		    if (own(city)) {
X
X--- 271,277 -----
X  		for_all_sides(side) {
X  		    show_curside(side);
X  		}
X+ 
X  		setup_counts(curside);
X  
X  		for_all_cities(city) {
X***************
X*** 266,271
X  		    show_curside(side);
X  		}
X  		setup_counts(curside);
X  		for_all_cities(city) {
X  		    if (own(city)) {
X  			if (city->size > BASE) lost = FALSE;
X
X--- 273,279 -----
X  		}
X  
X  		setup_counts(curside);
X+ 
X  		for_all_cities(city) {
X  		    if (own(city)) {
X  			if (city->size > BASE) lost = FALSE;
X***************
X*** 272,277
X  			produce(city);
X  		    }
X  		}
X  		for_all_units(unit) {
X  		    if (alive(unit) && own(unit) && !gaveup) {
X  			if (could_capture(unit->type, CITY)) lost = FALSE;
X
X--- 280,286 -----
X  			produce(city);
X  		    }
X  		}
X+ 
X  		for_all_units(unit) {
X  		    if (alive(unit) && own(unit) && !gaveup) {
X  			if (could_capture(unit->type, CITY)) lost = FALSE;
X***************
X*** 278,283
X  			xorders(unit);
X  		    }
X  		}
X  		for_all_sides(side) {
X  		    unshow_curside(side);
X  		}
X
X--- 287,293 -----
X  			xorders(unit);
X  		    }
X  		}
X+ 
X  		for_all_sides(side) {
X  		    unshow_curside(side);
X  		}
X***************
X*** 281,286
X  		for_all_sides(side) {
X  		    unshow_curside(side);
X  		}
X  		if (side_maybe_revolts(curside)) lost = TRUE;
X  		if (lost || gaveup) side_loses(curside);
X  	    }
X
X--- 291,297 -----
X  		for_all_sides(side) {
X  		    unshow_curside(side);
X  		}
X+ 
X  		if (side_maybe_revolts(curside)) lost = TRUE;
X  
X  		if (lost || gaveup) side_loses(curside);
X***************
X*** 282,287
X  		    unshow_curside(side);
X  		}
X  		if (side_maybe_revolts(curside)) lost = TRUE;
X  		if (lost || gaveup) side_loses(curside);
X  	    }
X  	}
X
X--- 293,299 -----
X  		}
X  
X  		if (side_maybe_revolts(curside)) lost = TRUE;
X+ 
X  		if (lost || gaveup) side_loses(curside);
X  	    }
X  	}
X***************
X*** 298,304
X  Side *side;
X  {
X      beepedplayer = FALSE;
X!     flush_input();
X      countedout = timedout = FALSE;
X      if (usecount) {
X  	numinputs = 15 + gametime/10;
X
X--- 310,316 -----
X  Side *side;
X  {
X      beepedplayer = FALSE;
X!     flush_input(side);
X      countedout = timedout = FALSE;
X      if (usecount) {
X  	numinputs = 15 + gametime/10;
Xdiff -c ./xconq.doc X11/xconq.doc
X*** ./xconq.doc	Thu Jul 16 14:55:37 1987
X--- X11/xconq.doc	Mon Nov  2 11:07:19 1987
X***************
X*** 61,67
X  
X  
X  
X!                        July 10, 1987
X  
X  
X  
X
X--- 61,67 -----
X  
X  
X  
X!                       November 2, 1987
X  
X  
X  
X***************
X*** 127,133
X  
X  
X  
X!                        July 10, 1987
X  
X  
X  
X
X--- 127,133 -----
X  
X  
X  
X!                       November 2, 1987
X  
X  
X  
X***************
X*** 193,199
X  
X  
X  
X!                        July 10, 1987
X  
X  
X  
X
X--- 193,199 -----
X  
X  
X  
X!                       November 2, 1987
X  
X  
X  
X***************
X*** 259,265
X  
X  
X  
X!                        July 10, 1987
X  
X  
X  
X
X--- 259,265 -----
X  
X  
X  
X!                       November 2, 1987
X  
X  
X  
X***************
X*** 325,331
X  
X  
X  
X!                        July 10, 1987
X  
X  
X  
X
X--- 325,331 -----
X  
X  
X  
X!                       November 2, 1987
X  
X  
X  
X***************
X*** 391,397
X  
X  
X  
X!                        July 10, 1987
X  
X  
X  
X
X--- 391,397 -----
X  
X  
X  
X!                       November 2, 1987
X  
X  
X  
X***************
X*** 457,463
X  
X  
X  
X!                        July 10, 1987
X  
X  
X  
X
X--- 457,463 -----
X  
X  
X  
X!                       November 2, 1987
X  
X  
X  
X***************
X*** 523,529
X  
X  
X  
X!                        July 10, 1987
X  
X  
X  
X
X--- 523,529 -----
X  
X  
X  
X!                       November 2, 1987
X  
X  
X  
X***************
X*** 589,595
X  
X  
X  
X!                        July 10, 1987
X  
X  
X  
X
X--- 589,595 -----
X  
X  
X  
X!                       November 2, 1987
X  
X  
X  
X***************
X*** 655,661
X  
X  
X  
X!                        July 10, 1987
X  
X  
X  
X
X--- 655,661 -----
X  
X  
X  
X!                       November 2, 1987
X  
X  
X  
X***************
X*** 721,727
X  
X  
X  
X!                        July 10, 1987
X  
X  
X  
X
X--- 721,727 -----
X  
X  
X  
X!                       November 2, 1987
X  
X  
X  
X***************
X*** 787,793
X  
X  
X  
X!                        July 10, 1987
X  
X  
X  
X
X--- 787,793 -----
X  
X  
X  
X!                       November 2, 1987
X  
X  
X  
X***************
X*** 853,859
X  
X  
X  
X!                        July 10, 1987
X  
X  
X  
X
X--- 853,859 -----
X  
X  
X  
X!                       November 2, 1987
X  
X  
X  
X***************
X*** 919,925
X  
X  
X  
X!                        July 10, 1987
X  
X  
X  
X
X--- 919,925 -----
X  
X  
X  
X!                       November 2, 1987
X  
X  
X  
X***************
X*** 985,991
X  
X  
X  
X!                        July 10, 1987
X  
X  
X  
X
X--- 985,991 -----
X  
X  
X  
X!                       November 2, 1987
X  
X  
X  
X***************
X*** 1051,1057
X  
X  
X  
X!                        July 10, 1987
X  
X  
X  
X
X--- 1051,1057 -----
X  
X  
X  
X!                       November 2, 1987
X  
X  
X  
X***************
X*** 1117,1123
X  
X  
X  
X!                        July 10, 1987
X  
X  
X  
X
X--- 1117,1123 -----
X  
X  
X  
X!                       November 2, 1987
X  
X  
X  
X***************
X*** 1183,1189
X  
X  
X  
X!                        July 10, 1987
X  
X  
X  
X
X--- 1183,1189 -----
X  
X  
X  
X!                       November 2, 1987
X  
X  
X  
X***************
X*** 1249,1254
X  
X  
X  
X!                        July 10, 1987
X  
X  
X
X--- 1249,1254 -----
X  
X  
X  
X!                       November 2, 1987
X  
X  
Xdiff -c ./xconq.h X11/xconq.h
X*** ./xconq.h	Thu Jul 16 14:55:38 1987
X--- X11/xconq.h	Wed Oct 28 08:11:00 1987
X***************
X*** 1,4
X! /* Copyright (c) 1987  Stanley T. Shebs, University of Utah. */
X  /* This program may be used, copied, modified, and redistributed freely */
X  /* for noncommercial purposes, so long as this notice remains intact. */
X  
X
X--- 1,5 -----
X! /* Copyright (c) 1987  Stanley T. Shebs, University of Utah; */
X! /*                     Kurt W. Hoyt, Software Engineering Institute. */
X  /* This program may be used, copied, modified, and redistributed freely */
X  /* for noncommercial purposes, so long as this notice remains intact. */
X  
X***************
X*** 2,8
X  /* This program may be used, copied, modified, and redistributed freely */
X  /* for noncommercial purposes, so long as this notice remains intact. */
X  
X! /* RCS $Header: xconq.h,v 1.6 87/06/07 11:37:59 shebs Exp $ */
X  
X  /* Global definitions for xconq.  Nearly everything needed by more than */
X  /* one file is here, which is why it's rather large. */
X
X--- 3,9 -----
X  /* This program may be used, copied, modified, and redistributed freely */
X  /* for noncommercial purposes, so long as this notice remains intact. */
X  
X! /* RCS $Header: xconq.h,v 1.9 87/10/27 11:27:53 kwh Exp $ */
X  
X  /* Global definitions for xconq.  Nearly everything needed by more than */
X  /* one file is here, which is why it's rather large. */
X***************
X*** 21,27
X  #include "config.h"
X  
X  #ifdef XWINDOWS
X! #include <X/Xlib.h>
X  #endif XWINDOWS
X  
X  /* General classes of units - we exclude amphibious, spaceships, etc */
X
X--- 22,28 -----
X  #include "config.h"
X  
X  #ifdef XWINDOWS
X! #include <X11/Xlib.h>
X  #endif XWINDOWS
X  
X  /* General classes of units - we exclude amphibious, spaceships, etc */
X***************
X*** 268,273
X      struct a_side *next;    /* pointer to next in list */
X  #ifdef XWINDOWS
X      Display *display;       /* side's display structure */
X      bool fewcolors;         /* true if needs to use icons for terrain also */
X      int vwid, vhgt, vwid2, vhgt2;
X      int vcx, vcy;           /* center square in the view */
X
X--- 269,275 -----
X      struct a_side *next;    /* pointer to next in list */
X  #ifdef XWINDOWS
X      Display *display;       /* side's display structure */
X+     GC gc;		    /* side's graphics context */
X      bool fewcolors;         /* true if needs to use icons for terrain also */
X      int vwid, vhgt, vwid2, vhgt2;
X      int vcx, vcy;           /* center square in the view */
X***************
X*** 282,289
X      Window main, map, world, msg, prompt, info;
X      Window time, clock, mode, state, sides, help;
X      Font msgfont, iconfont;
X!     FontInfo *msgfontinfo, *iconfontinfo;
X!     Bitmap ccurs, cmask, mcurs, mmask, dots, bombpics[3];
X      Pixmap bordertile, dotpix;
X      Cursor curs;
X      int bdcolor, bgcolor, fgcolor;  /* standard symbolic colors */
X
X--- 284,291 -----
X      Window main, map, world, msg, prompt, info;
X      Window time, clock, mode, state, sides, help;
X      Font msgfont, iconfont;
X!     XFontStruct *msgfontinfo, *iconfontinfo;
X!     Pixmap ccurs, cmask, mcurs, mmask, dots, bombpics[3];
X      Pixmap bordertile, dotpix;
X      Cursor curs;
X      unsigned long fgcolor, bgcolor, bdcolor;  /* standard symbolic colors */
X***************
X*** 286,294
X      Bitmap ccurs, cmask, mcurs, mmask, dots, bombpics[3];
X      Pixmap bordertile, dotpix;
X      Cursor curs;
X!     int bdcolor, bgcolor, fgcolor;  /* standard symbolic colors */
X!     int owncolor, enemycolor, graycolor, curscolor;  /* less standard colors */
X!     int sqcolor[MAXTERRTYPES];  /* colors for terrain */
X  #endif XWINDOWS
X      /* player options */
X      bool warpmouse;        /* if true, mouse cursor is moved around */
X
X--- 288,296 -----
X      Pixmap ccurs, cmask, mcurs, mmask, dots, bombpics[3];
X      Pixmap bordertile, dotpix;
X      Cursor curs;
X!     unsigned long fgcolor, bgcolor, bdcolor;  /* standard symbolic colors */
X!     unsigned long owncolor, enemycolor, graycolor, curscolor;  /* less standard colors */
X!     unsigned long sqcolor[MAXTERRTYPES];  /* colors for terrain */
X  #endif XWINDOWS
X      /* player options */
X      bool warpmouse;        /* if true, mouse cursor is moved around */
END_OF_x11diffs.3
if test 43319 -ne `wc -c <x11diffs.3`; then
    echo shar: \"x11diffs.3\" unpacked with wrong size!
fi
# end of overwriting check
fi
echo shar: End of archive 3 \(of 3\).
cp /dev/null ark3isdone
MISSING=""
for I in 1 2 3 ; do
    if test ! -f ark${I}isdone ; then
	MISSING="${MISSING} ${I}"
    fi
done
if test "${MISSING}" = "" ; then
    echo You have unpacked all 3 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