shutoh@uunet.UU.NET (Kazuhiko Shutoh) (10/08/90)
Submitted-by: kddlab!isl.yamaha.co.jp!shutoh@uunet.UU.NET (Kazuhiko Shutoh)
Posting-number: Volume 9, Issue 68
Archive-name: xengine/patch1
Patch-To: xengine: Volume 9, Issue 46 (9/23/90)
#! /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 shell archive."
# Contents: xengine.patch1
# Wrapped by shutoh@uni on Tue Oct 2 19:37:02 1990
PATH=/bin:/usr/bin:/usr/ucb ; export PATH
if test -f 'xengine.patch1' -a "${1}" != "-c" ; then
echo shar: Will not clobber existing file \"'xengine.patch1'\"
else
echo shar: Extracting \"'xengine.patch1'\" \(11551 characters\)
sed "s/^X//" >'xengine.patch1' <<'END_OF_FILE'
Xdiff -rc old/Makefile new/Makefile
X*** old/Makefile Tue Oct 2 19:22:43 1990
X--- new/Makefile Tue Oct 2 19:24:18 1990
X***************
X*** 7,13 ****
X #
X
X ###########################################################################
X! # Makefile generated from "Imake.tmpl" and </tmp/IIf.a02029>
X # $XConsortium: Imake.tmpl,v 1.77 89/12/18 17:01:37 jim Exp $
X #
X # Platform-specific parameters may be set in the appropriate .cf
X--- 7,13 ----
X #
X
X ###########################################################################
X! # Makefile generated from "Imake.tmpl" and </tmp/IIf.a01700>
X # $XConsortium: Imake.tmpl,v 1.77 89/12/18 17:01:37 jim Exp $
X #
X # Platform-specific parameters may be set in the appropriate .cf
X***************
X*** 225,231 ****
X ###########################################################################
X # start of Imakefile
X
X! # SCCS ID : %W% %G%
X #
X # Imakefile - Imakefile for xengine
X #
X--- 225,231 ----
X ###########################################################################
X # start of Imakefile
X
X! # SCCS ID : @(#)Imakefile 1.1 9/12/90
X #
X # Imakefile - Imakefile for xengine
X #
Xdiff -rc old/README new/README
X*** old/README Tue Oct 2 19:22:44 1990
X--- new/README Tue Oct 2 19:23:16 1990
X***************
X*** 31,65 ****
X 70 120 PolyFillRectangle
X 71 100 PolyFillArc
X
X
X! --- Benchmarks **
X
X! Machine Server Release rpm
X -----------------------------------------------------------------------------
X SparcStation 370 Memory 56M X11R4(fix-14),256 color 230
X SparcStation 1 X11R4(applied fix-14) 256 color 186.33
X luna-88K,2 CPU,mach Memory 32M X11R4, 16 color 180 *1
X! Sun 3/60C(CG4) X11R4 fix-14 gcc-1.35.1 16color about 90
X Sun 3/60C X11R4 no-fix 73.3
X CIT-X Terminal X11R3 mono 45.5
X X-mint Memory 8M X11R3,mono 45
X X-station Memory 8M X11R3,256 color 40
X NEWS841 memory 16M X11R2, 16 color 11
X X640 X11R3?(mono) 10.4
X MASSCOMP RTU X11R2? 16 color 8.5
X
X! *1 beta version OS(MACH).
X
X! ** These rpm are *not* official. If you want exact server's performance,
X! use other benchmark tools (such as xperf or xtest).
X
X! --- Special thanks to:
X!
X! Yasushi Ohba(YAMAHA/ISL) Mathematical suggestion.
X! Toshihisa Sadakata(YAMAHA/ISL) Engine movement suggestion.
X! Susumu Mukawa (NTT) Benchmark data correction.
X! Kazunari "ISSEY" Nakamura (NKK) Benchmark data correction.
X
X Send any comments, bug reports, etc. are welcome.
X
X
X--- 31,99 ----
X 70 120 PolyFillRectangle
X 71 100 PolyFillArc
X
X+ --- Special thanks to:
X
X! Yasushi Ohba (YAMAHA/ISL)
X! Mathematical.
X! Toshihisa Sadakata (YAMAHA/ISL)
X! Engine movement.
X! Hitoshi Tsujimura <hitosi@sinbasi.trad.pfu.fujitsu.co.jp>
X! Bug report & fix.
X
X!
X! --- Benchmarks
X!
X! xengine benchmark
X!
X! Thanks to :
X!
X! "Greg Onufer" <greg@cheers.Bungi.COM>
X! Kazunari "ISSEY" Nakamura <kazu@the.nkk.co.jp>
X! Susumu-Mukawa <mukawa@ctec.tn-sec.ntt.jp>
X! kaneyasu@src.ricoh.co.jp (Noriyuki Kaneyasu)
X! palm@icrl.mew.mei.co.jp (Steve [kiwin] Palm)
X! saitoh@icsts1.osaka-u.ac.jp (SAITOH Akinori)
X! sato@rokoh.gen.u-tokyo.ac.jp (Keisuke (@_@) SATO)
X! take@studiogen.co.jp (Wataru Takenouchi)
X!
X! Machine Server RPM
X -----------------------------------------------------------------------------
X+ DEC Station 3100 X11R4(fix-?),mono 539 *4
X+ DEC Station 5000/200 16M X11R4(fix-14),256 color 473
X+ Sun4/370GXP SPARC 16MHz(?) X11R4(fix-12),mono 438
X+ SparcStation 470 Memory 32M X11R4(fix-14),256color (GX) 301.8
X+ DEC Station 3100/200 16M X11R4(fix-14),256 color 248 ~ 268
X+ SparcStation IPC Memory 24M X11R4(fix-6), 256 color 234
X SparcStation 370 Memory 56M X11R4(fix-14),256 color 230
X+ Sun4c/60GX 10MHz(?) X11R4(fix-12),256 color 200
X SparcStation 1 X11R4(applied fix-14) 256 color 186.33
X luna-88K,2 CPU,mach Memory 32M X11R4, 16 color 180 *1
X! Sun4/260C 10MHz(?) X11R4(fix-12), 256 color 155
X! Sun3/50M 12M X11R4(fix-14+local patch)mono 136 *3
X! Sun3/150M 16MHz X11R4(fix-12), mono 132
X! Sun 3/60C(CG4) X11R4 fix-14 gcc-1.35.1 16color about 90
X! Sun3/110LC 16MHz X11R4(fix-12),256 color 75
X Sun 3/60C X11R4 no-fix 73.3
X CIT-X Terminal X11R3 mono 45.5
X+ NWS-1750 + XMiNT X11R3? mono 46 ~ 48
X X-mint Memory 8M X11R3,mono 45
X X-station Memory 8M X11R3,256 color 40
X+ Sun-2/120,7M X11R4(fix-14),gcc-1.37.1,mono 21.6
X NEWS841 memory 16M X11R2, 16 color 11
X X640 X11R3?(mono) 10.4
X+ NWS1450 (color) ?? 10 *2
X MASSCOMP RTU X11R2? 16 color 8.5
X+ PC-Xview 386sx 16MHz Memory 4M
X+ 16bitBUS-VGA X11R3 3.5
X
X! *1 OS is Beta version.
X
X! *2 Why slow?
X
X! *3 Local optimize was applied to server.
X
X+ *4 Very fast !
X+
X Send any comments, bug reports, etc. are welcome.
X
X
X***************
X*** 68,71 ****
X--- 102,111 ----
X InSoft System Lab.
X YAMAHA Corp.
X shutoh@isl.yamama.co.jp
X+
X+
X+
X+
X+
X+
X
Xdiff -rc old/patchlevel.h new/patchlevel.h
X*** old/patchlevel.h Tue Oct 2 19:22:44 1990
X--- new/patchlevel.h Tue Oct 2 19:21:52 1990
X***************
X*** 1,2 ****
X
X! #define PATCHLEVEL 0
X--- 1,3 ----
X
X! #define PATCHLEVEL 1
X!
Xdiff -rc old/xengine.c new/xengine.c
X*** old/xengine.c Tue Oct 2 19:22:45 1990
X--- new/xengine.c Tue Oct 2 19:21:52 1990
X***************
X*** 1,4 ****
X! static char sccsid[] = "@(#)xengine.c 1.9 9/19/90";
X
X /*
X * xengine - reciprocating engine for X :-)
X--- 1,4 ----
X! static char sccsid[] = "@(#)xengine.c 1.10 10/2/90";
X
X /*
X * xengine - reciprocating engine for X :-)
X***************
X*** 119,167 ****
X /* Get graphic context */
X
X gcPiston = XCreateGC(XtDisplay(engine), XtWindow(engine), (unsigned long) 0, NULL);
X! XAllocNamedColor(XtDisplay(engine), DefaultColormap(XtDisplay(engine), 0), colors[0], &srcColor, &dummyColor);
X
X XSetForeground(XtDisplay(engine), gcPiston, srcColor.pixel);
X
X gcShaft = XCreateGC(XtDisplay(engine), XtWindow(engine), (unsigned long) 0, NULL);
X! XAllocNamedColor(XtDisplay(engine), DefaultColormap(XtDisplay(engine), 0), colors[1], &srcColor, &dummyColor);
X
X XSetForeground(XtDisplay(engine), gcShaft, srcColor.pixel);
X XSetLineAttributes(XtDisplay(engine), gcShaft, 2, LineSolid, CapButt, JoinMiter);
X
X gcCylinder = XCreateGC(XtDisplay(engine), XtWindow(engine), (unsigned long) 0, NULL);
X! XAllocNamedColor(XtDisplay(engine), DefaultColormap(XtDisplay(engine), 0), colors[2], &srcColor, &dummyColor);
X
X XSetForeground(XtDisplay(engine), gcCylinder, srcColor.pixel);
X
X gcRoter = XCreateGC(XtDisplay(engine), XtWindow(engine), (unsigned long) 0, NULL);
X! XAllocNamedColor(XtDisplay(engine), DefaultColormap(XtDisplay(engine), 0), colors[3], &srcColor, &dummyColor);
X
X XSetForeground(XtDisplay(engine), gcRoter, srcColor.pixel);
X
X gcBack = XCreateGC(XtDisplay(engine), XtWindow(engine), (unsigned long) 0, NULL);
X! XAllocNamedColor(XtDisplay(engine), DefaultColormap(XtDisplay(engine), 0), colors[4], &srcColor, &dummyColor);
X
X XSetForeground(XtDisplay(engine), gcBack, srcColor.pixel);
X
X gcDep = XCreateGC(XtDisplay(engine), XtWindow(engine), (unsigned long) 0, NULL);
X! XAllocNamedColor(XtDisplay(engine), DefaultColormap(XtDisplay(engine), 0), colors[5], &srcColor, &dummyColor);
X
X XSetForeground(XtDisplay(engine), gcDep, srcColor.pixel);
X
X gcPre = XCreateGC(XtDisplay(engine), XtWindow(engine), (unsigned long) 0, NULL);
X! XAllocNamedColor(XtDisplay(engine), DefaultColormap(XtDisplay(engine), 0), colors[6], &srcColor, &dummyColor);
X
X XSetForeground(XtDisplay(engine), gcPre, srcColor.pixel);
X
X gcEngine = XCreateGC(XtDisplay(engine), XtWindow(engine), (unsigned long) 0, NULL);
X! XAllocNamedColor(XtDisplay(engine), DefaultColormap(XtDisplay(engine), 0), colors[7], &srcColor, &dummyColor);
X
X XSetForeground(XtDisplay(engine), gcEngine, srcColor.pixel);
X
X /* Create engine Pixmap */
X
X! enginePixmap = XCreatePixmap(XtDisplay(engine), XtWindow(engine), width, height, DefaultDepth(XtDisplay(engine), 0));
X
X /* Interval timer start */
X XtAddTimeOut(1, Cycle, NULL);
X--- 119,168 ----
X /* Get graphic context */
X
X gcPiston = XCreateGC(XtDisplay(engine), XtWindow(engine), (unsigned long) 0, NULL);
X! XAllocNamedColor(XtDisplay(engine), DefaultColormapOfScreen(XtScreen(engine)), colors[0], &srcColor, &dummyColor);
X
X XSetForeground(XtDisplay(engine), gcPiston, srcColor.pixel);
X
X gcShaft = XCreateGC(XtDisplay(engine), XtWindow(engine), (unsigned long) 0, NULL);
X! XAllocNamedColor(XtDisplay(engine), DefaultColormapOfScreen(XtScreen(engine)), colors[1], &srcColor, &dummyColor);
X
X XSetForeground(XtDisplay(engine), gcShaft, srcColor.pixel);
X XSetLineAttributes(XtDisplay(engine), gcShaft, 2, LineSolid, CapButt, JoinMiter);
X
X gcCylinder = XCreateGC(XtDisplay(engine), XtWindow(engine), (unsigned long) 0, NULL);
X! XSetGraphicsExposures(XtDisplay(engine), gcCylinder, False);
X! XAllocNamedColor(XtDisplay(engine), DefaultColormapOfScreen(XtScreen(engine)), colors[2], &srcColor, &dummyColor);
X
X XSetForeground(XtDisplay(engine), gcCylinder, srcColor.pixel);
X
X gcRoter = XCreateGC(XtDisplay(engine), XtWindow(engine), (unsigned long) 0, NULL);
X! XAllocNamedColor(XtDisplay(engine), DefaultColormapOfScreen(XtScreen(engine)), colors[3], &srcColor, &dummyColor);
X
X XSetForeground(XtDisplay(engine), gcRoter, srcColor.pixel);
X
X gcBack = XCreateGC(XtDisplay(engine), XtWindow(engine), (unsigned long) 0, NULL);
X! XAllocNamedColor(XtDisplay(engine), DefaultColormapOfScreen(XtScreen(engine)), colors[4], &srcColor, &dummyColor);
X
X XSetForeground(XtDisplay(engine), gcBack, srcColor.pixel);
X
X gcDep = XCreateGC(XtDisplay(engine), XtWindow(engine), (unsigned long) 0, NULL);
X! XAllocNamedColor(XtDisplay(engine), DefaultColormapOfScreen(XtScreen(engine)), colors[5], &srcColor, &dummyColor);
X
X XSetForeground(XtDisplay(engine), gcDep, srcColor.pixel);
X
X gcPre = XCreateGC(XtDisplay(engine), XtWindow(engine), (unsigned long) 0, NULL);
X! XAllocNamedColor(XtDisplay(engine), DefaultColormapOfScreen(XtScreen(engine)), colors[6], &srcColor, &dummyColor);
X
X XSetForeground(XtDisplay(engine), gcPre, srcColor.pixel);
X
X gcEngine = XCreateGC(XtDisplay(engine), XtWindow(engine), (unsigned long) 0, NULL);
X! XAllocNamedColor(XtDisplay(engine), DefaultColormapOfScreen(XtScreen(engine)), colors[7], &srcColor, &dummyColor);
X
X XSetForeground(XtDisplay(engine), gcEngine, srcColor.pixel);
X
X /* Create engine Pixmap */
X
X! enginePixmap = XCreatePixmap(XtDisplay(engine), XtWindow(engine), width, height, DefaultDepthOfScreen(XtScreen(engine)));
X
X /* Interval timer start */
X XtAddTimeOut(1, Cycle, NULL);
X***************
X*** 187,193 ****
X height = args[1].value;
X
X XFreePixmap(XtDisplay(engine), enginePixmap);
X! enginePixmap = XCreatePixmap(XtDisplay(engine), XtWindow(engine), width, height, DefaultDepth(XtDisplay(engine), 0));
X
X }
X
X--- 188,194 ----
X height = args[1].value;
X
X XFreePixmap(XtDisplay(engine), enginePixmap);
X! enginePixmap = XCreatePixmap(XtDisplay(engine), XtWindow(engine), width, height, DefaultDepthOfScreen(XtScreen(engine)));
X
X }
X
X***************
X*** 331,334 ****
X--- 332,337 ----
X return (cycle);
X
X }
X+
X+
X
END_OF_FILE
if test 11551 -ne `wc -c <'xengine.patch1'`; then
echo shar: \"'xengine.patch1'\" unpacked with wrong size!
fi
# end of 'xengine.patch1'
fi
echo shar: End of shell archive.
exit 0
dan
----------------------------------------------------
O'Reilly && Associates argv@sun.com / argv@ora.com
Opinions expressed reflect those of the author only.