diff -rc old/Makefile new/Makefile *** old/Makefile Tue Oct 2 19:22:43 1990 --- new/Makefile Tue Oct 2 19:24:18 1990 *************** *** 7,13 **** # ########################################################################### ! # Makefile generated from "Imake.tmpl" and # $XConsortium: Imake.tmpl,v 1.77 89/12/18 17:01:37 jim Exp $ # # Platform-specific parameters may be set in the appropriate .cf --- 7,13 ---- # ########################################################################### ! # Makefile generated from "Imake.tmpl" and # $XConsortium: Imake.tmpl,v 1.77 89/12/18 17:01:37 jim Exp $ # # Platform-specific parameters may be set in the appropriate .cf *************** *** 225,231 **** ########################################################################### # start of Imakefile ! # SCCS ID : %W% %G% # # Imakefile - Imakefile for xengine # --- 225,231 ---- ########################################################################### # start of Imakefile ! # SCCS ID : @(#)Imakefile 1.1 9/12/90 # # Imakefile - Imakefile for xengine # diff -rc old/README new/README *** old/README Tue Oct 2 19:22:44 1990 --- new/README Tue Oct 2 19:23:16 1990 *************** *** 31,65 **** 70 120 PolyFillRectangle 71 100 PolyFillArc ! --- Benchmarks ** ! Machine Server Release rpm ----------------------------------------------------------------------------- SparcStation 370 Memory 56M X11R4(fix-14),256 color 230 SparcStation 1 X11R4(applied fix-14) 256 color 186.33 luna-88K,2 CPU,mach Memory 32M X11R4, 16 color 180 *1 ! Sun 3/60C(CG4) X11R4 fix-14 gcc-1.35.1 16color about 90 Sun 3/60C X11R4 no-fix 73.3 CIT-X Terminal X11R3 mono 45.5 X-mint Memory 8M X11R3,mono 45 X-station Memory 8M X11R3,256 color 40 NEWS841 memory 16M X11R2, 16 color 11 X640 X11R3?(mono) 10.4 MASSCOMP RTU X11R2? 16 color 8.5 ! *1 beta version OS(MACH). ! ** These rpm are *not* official. If you want exact server's performance, ! use other benchmark tools (such as xperf or xtest). ! --- Special thanks to: ! ! Yasushi Ohba(YAMAHA/ISL) Mathematical suggestion. ! Toshihisa Sadakata(YAMAHA/ISL) Engine movement suggestion. ! Susumu Mukawa (NTT) Benchmark data correction. ! Kazunari "ISSEY" Nakamura (NKK) Benchmark data correction. Send any comments, bug reports, etc. are welcome. --- 31,99 ---- 70 120 PolyFillRectangle 71 100 PolyFillArc + --- Special thanks to: ! Yasushi Ohba (YAMAHA/ISL) ! Mathematical. ! Toshihisa Sadakata (YAMAHA/ISL) ! Engine movement. ! Hitoshi Tsujimura ! Bug report & fix. ! ! --- Benchmarks ! ! xengine benchmark ! ! Thanks to : ! ! "Greg Onufer" ! Kazunari "ISSEY" Nakamura ! Susumu-Mukawa ! kaneyasu@src.ricoh.co.jp (Noriyuki Kaneyasu) ! palm@icrl.mew.mei.co.jp (Steve [kiwin] Palm) ! saitoh@icsts1.osaka-u.ac.jp (SAITOH Akinori) ! sato@rokoh.gen.u-tokyo.ac.jp (Keisuke (@_@) SATO) ! take@studiogen.co.jp (Wataru Takenouchi) ! ! Machine Server RPM ----------------------------------------------------------------------------- + DEC Station 3100 X11R4(fix-?),mono 539 *4 + DEC Station 5000/200 16M X11R4(fix-14),256 color 473 + Sun4/370GXP SPARC 16MHz(?) X11R4(fix-12),mono 438 + SparcStation 470 Memory 32M X11R4(fix-14),256color (GX) 301.8 + DEC Station 3100/200 16M X11R4(fix-14),256 color 248 ~ 268 + SparcStation IPC Memory 24M X11R4(fix-6), 256 color 234 SparcStation 370 Memory 56M X11R4(fix-14),256 color 230 + Sun4c/60GX 10MHz(?) X11R4(fix-12),256 color 200 SparcStation 1 X11R4(applied fix-14) 256 color 186.33 luna-88K,2 CPU,mach Memory 32M X11R4, 16 color 180 *1 ! Sun4/260C 10MHz(?) X11R4(fix-12), 256 color 155 ! Sun3/50M 12M X11R4(fix-14+local patch)mono 136 *3 ! Sun3/150M 16MHz X11R4(fix-12), mono 132 ! Sun 3/60C(CG4) X11R4 fix-14 gcc-1.35.1 16color about 90 ! Sun3/110LC 16MHz X11R4(fix-12),256 color 75 Sun 3/60C X11R4 no-fix 73.3 CIT-X Terminal X11R3 mono 45.5 + NWS-1750 + XMiNT X11R3? mono 46 ~ 48 X-mint Memory 8M X11R3,mono 45 X-station Memory 8M X11R3,256 color 40 + Sun-2/120,7M X11R4(fix-14),gcc-1.37.1,mono 21.6 NEWS841 memory 16M X11R2, 16 color 11 X640 X11R3?(mono) 10.4 + NWS1450 (color) ?? 10 *2 MASSCOMP RTU X11R2? 16 color 8.5 + PC-Xview 386sx 16MHz Memory 4M + 16bitBUS-VGA X11R3 3.5 ! *1 OS is Beta version. ! *2 Why slow? ! *3 Local optimize was applied to server. + *4 Very fast ! + Send any comments, bug reports, etc. are welcome. *************** *** 68,71 **** --- 102,111 ---- InSoft System Lab. YAMAHA Corp. shutoh@isl.yamama.co.jp + + + + + + diff -rc old/patchlevel.h new/patchlevel.h *** old/patchlevel.h Tue Oct 2 19:22:44 1990 --- new/patchlevel.h Tue Oct 2 19:21:52 1990 *************** *** 1,2 **** ! #define PATCHLEVEL 0 --- 1,3 ---- ! #define PATCHLEVEL 1 ! diff -rc old/xengine.c new/xengine.c *** old/xengine.c Tue Oct 2 19:22:45 1990 --- new/xengine.c Tue Oct 2 19:21:52 1990 *************** *** 1,4 **** ! static char sccsid[] = "@(#)xengine.c 1.9 9/19/90"; /* * xengine - reciprocating engine for X :-) --- 1,4 ---- ! static char sccsid[] = "@(#)xengine.c 1.10 10/2/90"; /* * xengine - reciprocating engine for X :-) *************** *** 119,167 **** /* Get graphic context */ gcPiston = XCreateGC(XtDisplay(engine), XtWindow(engine), (unsigned long) 0, NULL); ! XAllocNamedColor(XtDisplay(engine), DefaultColormap(XtDisplay(engine), 0), colors[0], &srcColor, &dummyColor); XSetForeground(XtDisplay(engine), gcPiston, srcColor.pixel); gcShaft = XCreateGC(XtDisplay(engine), XtWindow(engine), (unsigned long) 0, NULL); ! XAllocNamedColor(XtDisplay(engine), DefaultColormap(XtDisplay(engine), 0), colors[1], &srcColor, &dummyColor); XSetForeground(XtDisplay(engine), gcShaft, srcColor.pixel); XSetLineAttributes(XtDisplay(engine), gcShaft, 2, LineSolid, CapButt, JoinMiter); gcCylinder = XCreateGC(XtDisplay(engine), XtWindow(engine), (unsigned long) 0, NULL); ! XAllocNamedColor(XtDisplay(engine), DefaultColormap(XtDisplay(engine), 0), colors[2], &srcColor, &dummyColor); XSetForeground(XtDisplay(engine), gcCylinder, srcColor.pixel); gcRoter = XCreateGC(XtDisplay(engine), XtWindow(engine), (unsigned long) 0, NULL); ! XAllocNamedColor(XtDisplay(engine), DefaultColormap(XtDisplay(engine), 0), colors[3], &srcColor, &dummyColor); XSetForeground(XtDisplay(engine), gcRoter, srcColor.pixel); gcBack = XCreateGC(XtDisplay(engine), XtWindow(engine), (unsigned long) 0, NULL); ! XAllocNamedColor(XtDisplay(engine), DefaultColormap(XtDisplay(engine), 0), colors[4], &srcColor, &dummyColor); XSetForeground(XtDisplay(engine), gcBack, srcColor.pixel); gcDep = XCreateGC(XtDisplay(engine), XtWindow(engine), (unsigned long) 0, NULL); ! XAllocNamedColor(XtDisplay(engine), DefaultColormap(XtDisplay(engine), 0), colors[5], &srcColor, &dummyColor); XSetForeground(XtDisplay(engine), gcDep, srcColor.pixel); gcPre = XCreateGC(XtDisplay(engine), XtWindow(engine), (unsigned long) 0, NULL); ! XAllocNamedColor(XtDisplay(engine), DefaultColormap(XtDisplay(engine), 0), colors[6], &srcColor, &dummyColor); XSetForeground(XtDisplay(engine), gcPre, srcColor.pixel); gcEngine = XCreateGC(XtDisplay(engine), XtWindow(engine), (unsigned long) 0, NULL); ! XAllocNamedColor(XtDisplay(engine), DefaultColormap(XtDisplay(engine), 0), colors[7], &srcColor, &dummyColor); XSetForeground(XtDisplay(engine), gcEngine, srcColor.pixel); /* Create engine Pixmap */ ! enginePixmap = XCreatePixmap(XtDisplay(engine), XtWindow(engine), width, height, DefaultDepth(XtDisplay(engine), 0)); /* Interval timer start */ XtAddTimeOut(1, Cycle, NULL); --- 119,168 ---- /* Get graphic context */ gcPiston = XCreateGC(XtDisplay(engine), XtWindow(engine), (unsigned long) 0, NULL); ! XAllocNamedColor(XtDisplay(engine), DefaultColormapOfScreen(XtScreen(engine)), colors[0], &srcColor, &dummyColor); XSetForeground(XtDisplay(engine), gcPiston, srcColor.pixel); gcShaft = XCreateGC(XtDisplay(engine), XtWindow(engine), (unsigned long) 0, NULL); ! XAllocNamedColor(XtDisplay(engine), DefaultColormapOfScreen(XtScreen(engine)), colors[1], &srcColor, &dummyColor); XSetForeground(XtDisplay(engine), gcShaft, srcColor.pixel); XSetLineAttributes(XtDisplay(engine), gcShaft, 2, LineSolid, CapButt, JoinMiter); gcCylinder = XCreateGC(XtDisplay(engine), XtWindow(engine), (unsigned long) 0, NULL); ! XSetGraphicsExposures(XtDisplay(engine), gcCylinder, False); ! XAllocNamedColor(XtDisplay(engine), DefaultColormapOfScreen(XtScreen(engine)), colors[2], &srcColor, &dummyColor); XSetForeground(XtDisplay(engine), gcCylinder, srcColor.pixel); gcRoter = XCreateGC(XtDisplay(engine), XtWindow(engine), (unsigned long) 0, NULL); ! XAllocNamedColor(XtDisplay(engine), DefaultColormapOfScreen(XtScreen(engine)), colors[3], &srcColor, &dummyColor); XSetForeground(XtDisplay(engine), gcRoter, srcColor.pixel); gcBack = XCreateGC(XtDisplay(engine), XtWindow(engine), (unsigned long) 0, NULL); ! XAllocNamedColor(XtDisplay(engine), DefaultColormapOfScreen(XtScreen(engine)), colors[4], &srcColor, &dummyColor); XSetForeground(XtDisplay(engine), gcBack, srcColor.pixel); gcDep = XCreateGC(XtDisplay(engine), XtWindow(engine), (unsigned long) 0, NULL); ! XAllocNamedColor(XtDisplay(engine), DefaultColormapOfScreen(XtScreen(engine)), colors[5], &srcColor, &dummyColor); XSetForeground(XtDisplay(engine), gcDep, srcColor.pixel); gcPre = XCreateGC(XtDisplay(engine), XtWindow(engine), (unsigned long) 0, NULL); ! XAllocNamedColor(XtDisplay(engine), DefaultColormapOfScreen(XtScreen(engine)), colors[6], &srcColor, &dummyColor); XSetForeground(XtDisplay(engine), gcPre, srcColor.pixel); gcEngine = XCreateGC(XtDisplay(engine), XtWindow(engine), (unsigned long) 0, NULL); ! XAllocNamedColor(XtDisplay(engine), DefaultColormapOfScreen(XtScreen(engine)), colors[7], &srcColor, &dummyColor); XSetForeground(XtDisplay(engine), gcEngine, srcColor.pixel); /* Create engine Pixmap */ ! enginePixmap = XCreatePixmap(XtDisplay(engine), XtWindow(engine), width, height, DefaultDepthOfScreen(XtScreen(engine))); /* Interval timer start */ XtAddTimeOut(1, Cycle, NULL); *************** *** 187,193 **** height = args[1].value; XFreePixmap(XtDisplay(engine), enginePixmap); ! enginePixmap = XCreatePixmap(XtDisplay(engine), XtWindow(engine), width, height, DefaultDepth(XtDisplay(engine), 0)); } --- 188,194 ---- height = args[1].value; XFreePixmap(XtDisplay(engine), enginePixmap); ! enginePixmap = XCreatePixmap(XtDisplay(engine), XtWindow(engine), width, height, DefaultDepthOfScreen(XtScreen(engine))); } *************** *** 331,334 **** --- 332,337 ---- return (cycle); } + +