home *** CD-ROM | disk | FTP | other *** search
/ Source Code 1994 March / Source_Code_CD-ROM_Walnut_Creek_March_1994.iso / compsrcs / misc / volume37 / mgiccube / patch01 < prev    next >
Encoding:
Text File  |  1993-05-16  |  24.2 KB  |  530 lines
  1. Newsgroups: comp.sources.misc
  2. From: fleurant@hri.com (P.Fleurant)
  3. Subject: v37i067:  magiccube - a cube simulator for X11/Motif, Patch01
  4. Message-ID: <1993May18.030637.14219@sparky.imd.sterling.com>
  5. X-Md4-Signature: 46fc14809aebf6596b3d6a331c9be9b3
  6. Date: Tue, 18 May 1993 03:06:37 GMT
  7. Approved: kent@sparky.imd.sterling.com
  8.  
  9. Submitted-by: fleurant@hri.com (P.Fleurant)
  10. Posting-number: Volume 37, Issue 67
  11. Archive-name: magiccube/patch01
  12. Environment: X11, Motif
  13. Patch-To: magiccube: Volume 37, Issue 38-42
  14.  
  15. SORRY for such an early patch. There was a mistake in the cube.h file
  16. that became manifest when cube was built using gcc. It worked ok when 
  17. built with our bundled cc (SUN OS 4.1)
  18.  
  19. ldfile.c had something that gcc didn't like either. 
  20.  
  21.    Execute the following in the cube directory.
  22.           patch < patch1
  23.           patch < patch2
  24.  
  25.    Then rebuild:
  26.           make 
  27.  
  28. ALSO: when this was released it specified ANSI-C.  No way. All I can say 
  29. is that it can be built with gcc -traditional and SUN OS 4.1 cc.
  30. --
  31. P.Fleurant                                          Horizon Research, Inc.
  32. fleurant@hri.com                                    Waltham, MA 
  33. ---------------------------------------------------------------------------
  34. #!/bin/sh
  35. # This is a shell archive (produced by shar 3.50)
  36. # To extract the files from this archive, save it to a file, remove
  37. # everything above the "!/bin/sh" line above, and type "sh file_name".
  38. #
  39. # made 05/17/1993 13:24 UTC by fleurant@sparc15
  40. # Source directory /home/gamera/U1/fleurant/x/cube
  41. #
  42. # existing files will NOT be overwritten unless -c is specified
  43. #
  44. # This shar contains:
  45. # length  mode       name
  46. # ------ ---------- ------------------------------------------
  47. #    357 -rw-r--r-- MANIFEST-patch
  48. #   2438 -rw-r--r-- README-patch
  49. #    217 -rw-r--r-- patchlevel.h
  50. #  16528 -rw-r--r-- patch1
  51. #   1119 -rw-r--r-- patch2
  52. #
  53. # ============= MANIFEST-patch ==============
  54. if test -f 'MANIFEST-patch' -a X"$1" != X"-c"; then
  55.     echo 'x - skipping MANIFEST-patch (File already exists)'
  56. else
  57. echo 'x - extracting MANIFEST-patch (Text)'
  58. sed 's/^X//' << 'SHAR_EOF' > 'MANIFEST-patch' &&
  59. X   File Name        Archive #    Description
  60. -----------------------------------------------------------
  61. X   MANIFEST-patch                    -- The file you are actually reading.
  62. X   README-patch                         
  63. X   patchlevel.h
  64. X   patch1                            -- patch for the cube.h file
  65. X   patch2                            -- patch for the ldfile.c
  66. SHAR_EOF
  67. chmod 0644 MANIFEST-patch ||
  68. echo 'restore of MANIFEST-patch failed'
  69. Wc_c="`wc -c < 'MANIFEST-patch'`"
  70. test 357 -eq "$Wc_c" ||
  71.     echo 'MANIFEST-patch: original size 357, current size' "$Wc_c"
  72. fi
  73. # ============= README-patch ==============
  74. if test -f 'README-patch' -a X"$1" != X"-c"; then
  75.     echo 'x - skipping README-patch (File already exists)'
  76. else
  77. echo 'x - extracting README-patch (Text)'
  78. sed 's/^X//' << 'SHAR_EOF' > 'README-patch' &&
  79. PPPPPPPP        A        TTTTTTTTTTTT      CCCCCCC    H      H
  80. P       P      A A            T           C           H      H
  81. P       P     A   A           T           C           H      H
  82. PPPPPPP      A     A          T           C           HHHHHHHH
  83. P           A       A         T           C           H      H
  84. P          AAAAAAAAAAA        T           C           H      H
  85. P         A           A       T            CCCCCCC    H      H
  86. X
  87. M          MM       A         GGGGGGGG    IIIIIIII   CCCCCCC  
  88. M M       M M      A A       G        G      I      C         
  89. M  M     M  M     A   A      G               I      C         
  90. M   M   M   M    A     A     G  GGGGGGG      I      C         
  91. M    M M    M   AAAAAAAAA    G        G      I      C         
  92. M     M     M  A         A    GGGGGGGG    IIIIIIII   CCCCCCC  
  93. X
  94. X          CCCCCCC   U        U  BBBBBBB    EEEEEEEE
  95. X         C          U        U  B      B   E
  96. X         C          U        U  B      B   E
  97. X         C          U        U  BBBBBBBB   EEEEE
  98. X         C          U        U  B      B   E
  99. X          CCCCCCC    UUUUUUUU   BBBBBBB    EEEEEEEE 
  100. X       /////////                          ////////////     
  101. X       /////////     using X11/Motif      ////////////     
  102. X       //////////  V e r s i o n   1 . 0  ////////////
  103. X
  104. COPYRIGHT & DISCLAIMER STUFF:
  105. \\\\\\\\\\\\\\\\\\\\\\\\\\\\\
  106. X
  107. Copyright (C) 1993 by Pierre A. Fleurant
  108. X                      Horizon Research, Inc
  109. X                      Email: fleurant@hri.com
  110. X
  111. X
  112. ////////////The following references were used:///////////////////////
  113. X
  114. X   "The X Window System Programming And Applications with Xt
  115. X   OSF/MOTIF EDITION"
  116. X   by Douglas A Young 
  117. X   Prentice-Hall, 1990.
  118. X   ISBN 0-13-642786-3
  119. X
  120. X   "Mastering Rubik's Cube"
  121. X   by Don Taylor
  122. X   An Owl Book; Holt, Rinehart and Winston, New York, 1980
  123. X   ISBN 0-03-059941-5
  124. X
  125. //////////////////////////////////////////////////////////////////////
  126. PATCH INFO:
  127. X
  128. SORRY for such an early patch. There was a mistake in the cube.h file
  129. that became manifest when cube was built using gcc. It worked ok when 
  130. built with our bundled cc (SUN OS 4.1)
  131. X
  132. ldfile.c had something that gcc didn't like either. 
  133. X
  134. X   Execute the following in the cube directory.
  135. X          patch < patch1
  136. X          patch < patch2
  137. X
  138. X   Then rebuild:
  139. X          make 
  140. X          
  141. //////////////////////////////////////////////////////////////////////
  142. X   Please send comments to fleurant@hri.com
  143. X   "Don't say the `R' word!"
  144. SHAR_EOF
  145. chmod 0644 README-patch ||
  146. echo 'restore of README-patch failed'
  147. Wc_c="`wc -c < 'README-patch'`"
  148. test 2438 -eq "$Wc_c" ||
  149.     echo 'README-patch: original size 2438, current size' "$Wc_c"
  150. fi
  151. # ============= patchlevel.h ==============
  152. if test -f 'patchlevel.h' -a X"$1" != X"-c"; then
  153.     echo 'x - skipping patchlevel.h (File already exists)'
  154. else
  155. echo 'x - extracting patchlevel.h (Text)'
  156. sed 's/^X//' << 'SHAR_EOF' > 'patchlevel.h' &&
  157. #define VERSION    "1.0.0"
  158. #define DATE    "10 May 1993"
  159. X
  160. /*
  161. X *  patch1        14 May 93       :Fix to seed_cube in cube.h; Bug became manifest in gcc
  162. X *  patch2        14 May 93       :Fix to ldfile.c;  Bug became manifest in gcc
  163. X */
  164. SHAR_EOF
  165. chmod 0644 patchlevel.h ||
  166. echo 'restore of patchlevel.h failed'
  167. Wc_c="`wc -c < 'patchlevel.h'`"
  168. test 217 -eq "$Wc_c" ||
  169.     echo 'patchlevel.h: original size 217, current size' "$Wc_c"
  170. fi
  171. # ============= patch1 ==============
  172. if test -f 'patch1' -a X"$1" != X"-c"; then
  173.     echo 'x - skipping patch1 (File already exists)'
  174. else
  175. echo 'x - extracting patch1 (Text)'
  176. sed 's/^X//' << 'SHAR_EOF' > 'patch1' &&
  177. *** cube.h    Thu May 13 14:52:35 1993
  178. --- cube01.h    Fri May 14 11:42:50 1993
  179. ***************
  180. *** 171,306 ****
  181. X  double_XPoint seed_face[][5] = {
  182. X  
  183. X    /* Side 0 (front)*/
  184. !   {MR_X, MR_Y, Z_DEPTH},
  185. !               {FACE0_WIDTH,0,0},{0,FACE0_HEIGHT,0},{-FACE0_WIDTH,0,0},{0,-FACE0_HEIGHT,0},
  186. !   {MR_X+FACE0_WIDTH, MR_Y, Z_DEPTH},
  187. !               {FACE0_WIDTH,0,0},{0,FACE0_HEIGHT,0},{-FACE0_WIDTH,0,0},{0,-FACE0_HEIGHT,0},
  188. !   {MR_X+2*FACE0_WIDTH, MR_Y, Z_DEPTH},
  189. !               {FACE0_WIDTH,0,0},{0,FACE0_HEIGHT,0},{-FACE0_WIDTH,0,0},{0,-FACE0_HEIGHT,0},
  190. X  
  191. !   {MR_X, MR_Y+FACE0_HEIGHT, Z_DEPTH},
  192. !               {FACE0_WIDTH,0,0},{0,FACE0_HEIGHT,0},{-FACE0_WIDTH,0,0},{0,-FACE0_HEIGHT,0},
  193. !   {MR_X+FACE0_WIDTH, MR_Y+FACE0_HEIGHT, Z_DEPTH},
  194. !               {FACE0_WIDTH,0,0},{0,FACE0_HEIGHT,0},{-FACE0_WIDTH,0,0},{0,-FACE0_HEIGHT,0},
  195. !   {MR_X+2*FACE0_WIDTH, MR_Y+FACE0_HEIGHT, Z_DEPTH},
  196. !               {FACE0_WIDTH,0,0},{0,FACE0_HEIGHT,0},{-FACE0_WIDTH,0,0},{0,-FACE0_HEIGHT,0},
  197. X  
  198. !   {MR_X, MR_Y+2*FACE0_HEIGHT, Z_DEPTH},
  199. !               {FACE0_WIDTH,0,0},{0,FACE0_HEIGHT,0},{-FACE0_WIDTH,0,0},{0,-FACE0_HEIGHT,0},
  200. !   {MR_X+FACE0_WIDTH, MR_Y+2*FACE0_HEIGHT, Z_DEPTH},
  201. !               {FACE0_WIDTH,0,0},{0,FACE0_HEIGHT,0},{-FACE0_WIDTH,0,0},{0,-FACE0_HEIGHT,0},
  202. !   {MR_X+2*FACE0_WIDTH, MR_Y+2*FACE0_HEIGHT, Z_DEPTH},
  203. !               {FACE0_WIDTH,0,0},{0,FACE0_HEIGHT,0},{-FACE0_WIDTH,0,0},{0,-FACE0_HEIGHT,0},
  204. X  
  205. X    /* Side 1 (left) */
  206. !   {MR_X, MR_Y, Z_DEPTH},
  207. !               {0,0,FACE0_WIDTH},{0,FACE0_HEIGHT,0},{0,0,-FACE0_WIDTH},{0,-FACE0_HEIGHT,0},
  208. !   {MR_X, MR_Y, Z_DEPTH+FACE0_WIDTH},
  209. !               {0,0,FACE0_WIDTH},{0,FACE0_HEIGHT,0},{0,0,-FACE0_WIDTH},{0,-FACE0_HEIGHT,0},
  210. !   {MR_X, MR_Y, Z_DEPTH+2*FACE0_WIDTH},
  211. !               {0,0,FACE0_WIDTH},{0,FACE0_HEIGHT,0},{0,0,-FACE0_WIDTH},{0,-FACE0_HEIGHT,0},
  212. X  
  213. !   {MR_X, MR_Y+FACE0_HEIGHT, Z_DEPTH},
  214. !               {0,0,FACE0_WIDTH},{0,FACE0_HEIGHT,0},{0,0,-FACE0_WIDTH},{0,-FACE0_HEIGHT,0},
  215. !   {MR_X, MR_Y+FACE0_HEIGHT, Z_DEPTH+FACE0_WIDTH},
  216. !               {0,0,FACE0_WIDTH},{0,FACE0_HEIGHT,0},{0,0,-FACE0_WIDTH},{0,-FACE0_HEIGHT,0},
  217. !   {MR_X, MR_Y+FACE0_HEIGHT, Z_DEPTH+2*FACE0_WIDTH},
  218. !               {0,0,FACE0_WIDTH},{0,FACE0_HEIGHT,0},{0,0,-FACE0_WIDTH},{0,-FACE0_HEIGHT,0},
  219. X  
  220. !   {MR_X, MR_Y+2*FACE0_HEIGHT, Z_DEPTH},
  221. !               {0,0,FACE0_WIDTH},{0,FACE0_HEIGHT,0},{0,0,-FACE0_WIDTH},{0,-FACE0_HEIGHT,0},
  222. !   {MR_X, MR_Y+2*FACE0_HEIGHT, Z_DEPTH+FACE0_WIDTH},
  223. !               {0,0,FACE0_WIDTH},{0,FACE0_HEIGHT,0},{0,0,-FACE0_WIDTH},{0,-FACE0_HEIGHT,0},
  224. !   {MR_X, MR_Y+2*FACE0_HEIGHT, Z_DEPTH+2*FACE0_WIDTH},
  225. !               {0,0,FACE0_WIDTH},{0,FACE0_HEIGHT,0},{0,0,-FACE0_WIDTH},{0,-FACE0_HEIGHT,0},
  226. X  
  227. X    /* Side 2 (right) */
  228. !   {MR_X+3*FACE0_WIDTH, MR_Y, Z_DEPTH},
  229. !               {0,0,FACE0_WIDTH},{0,FACE0_HEIGHT,0},{0,0,-FACE0_WIDTH},{0,-FACE0_HEIGHT,0},
  230. !   {MR_X+3*FACE0_WIDTH, MR_Y, Z_DEPTH+FACE0_WIDTH},
  231. !               {0,0,FACE0_WIDTH},{0,FACE0_HEIGHT,0},{0,0,-FACE0_WIDTH},{0,-FACE0_HEIGHT,0},
  232. !   {MR_X+3*FACE0_WIDTH, MR_Y, Z_DEPTH+2*FACE0_WIDTH},
  233. !               {0,0,FACE0_WIDTH},{0,FACE0_HEIGHT,0},{0,0,-FACE0_WIDTH},{0,-FACE0_HEIGHT,0},
  234. X  
  235. !   {MR_X+3*FACE0_WIDTH, MR_Y+FACE0_HEIGHT, Z_DEPTH},
  236. !               {0,0,FACE0_WIDTH},{0,FACE0_HEIGHT,0},{0,0,-FACE0_WIDTH},{0,-FACE0_HEIGHT,0},
  237. !   {MR_X+3*FACE0_WIDTH, MR_Y+FACE0_HEIGHT, Z_DEPTH+FACE0_WIDTH},
  238. !               {0,0,FACE0_WIDTH},{0,FACE0_HEIGHT,0},{0,0,-FACE0_WIDTH},{0,-FACE0_HEIGHT,0},
  239. !   {MR_X+3*FACE0_WIDTH, MR_Y+FACE0_HEIGHT, Z_DEPTH+2*FACE0_WIDTH},
  240. !               {0,0,FACE0_WIDTH},{0,FACE0_HEIGHT,0},{0,0,-FACE0_WIDTH},{0,-FACE0_HEIGHT,0},
  241. X  
  242. !   {MR_X+3*FACE0_WIDTH, MR_Y+2*FACE0_HEIGHT, Z_DEPTH},
  243. !               {0,0,FACE0_WIDTH},{0,FACE0_HEIGHT,0},{0,0,-FACE0_WIDTH},{0,-FACE0_HEIGHT,0},
  244. !   {MR_X+3*FACE0_WIDTH, MR_Y+2*FACE0_HEIGHT, Z_DEPTH+FACE0_WIDTH},
  245. !               {0,0,FACE0_WIDTH},{0,FACE0_HEIGHT,0},{0,0,-FACE0_WIDTH},{0,-FACE0_HEIGHT,0},
  246. !   {MR_X+3*FACE0_WIDTH, MR_Y+2*FACE0_HEIGHT, Z_DEPTH+2*FACE0_WIDTH},
  247. !               {0,0,FACE0_WIDTH},{0,FACE0_HEIGHT,0},{0,0,-FACE0_WIDTH},{0,-FACE0_HEIGHT,0},
  248. X  
  249. X    /* Side 3 (back) */
  250. !   {MR_X, MR_Y, Z_DEPTH+3*FACE0_WIDTH},
  251. !               {FACE0_WIDTH,0,0},{0,FACE0_HEIGHT,0},{-FACE0_WIDTH,0,0},{0,-FACE0_HEIGHT,0},
  252. !   {MR_X+FACE0_WIDTH, MR_Y, Z_DEPTH+3*FACE0_WIDTH},
  253. !               {FACE0_WIDTH,0,0},{0,FACE0_HEIGHT,0},{-FACE0_WIDTH,0,0},{0,-FACE0_HEIGHT,0},
  254. !   {MR_X+2*FACE0_WIDTH, MR_Y, Z_DEPTH+3*FACE0_WIDTH},
  255. !               {FACE0_WIDTH,0,0},{0,FACE0_HEIGHT,0},{-FACE0_WIDTH,0,0},{0,-FACE0_HEIGHT,0},
  256. X  
  257. !   {MR_X, MR_Y+FACE0_HEIGHT, Z_DEPTH+3*FACE0_WIDTH},
  258. !               {FACE0_WIDTH,0,0},{0,FACE0_HEIGHT,0},{-FACE0_WIDTH,0,0},{0,-FACE0_HEIGHT,0},
  259. !   {MR_X+FACE0_WIDTH, MR_Y+FACE0_HEIGHT, Z_DEPTH+3*FACE0_WIDTH},
  260. !               {FACE0_WIDTH,0,0},{0,FACE0_HEIGHT,0},{-FACE0_WIDTH,0,0},{0,-FACE0_HEIGHT,0},
  261. !   {MR_X+2*FACE0_WIDTH, MR_Y+FACE0_HEIGHT, Z_DEPTH+3*FACE0_WIDTH},
  262. !               {FACE0_WIDTH,0,0},{0,FACE0_HEIGHT,0},{-FACE0_WIDTH,0,0},{0,-FACE0_HEIGHT,0},
  263. X  
  264. !   {MR_X, MR_Y+2*FACE0_HEIGHT, Z_DEPTH+3*FACE0_WIDTH},
  265. !               {FACE0_WIDTH,0,0},{0,FACE0_HEIGHT,0},{-FACE0_WIDTH,0,0},{0,-FACE0_HEIGHT,0},
  266. !   {MR_X+FACE0_WIDTH, MR_Y+2*FACE0_HEIGHT, Z_DEPTH+3*FACE0_WIDTH},
  267. !               {FACE0_WIDTH,0,0},{0,FACE0_HEIGHT,0},{-FACE0_WIDTH,0,0},{0,-FACE0_HEIGHT,0},
  268. !   {MR_X+2*FACE0_WIDTH, MR_Y+2*FACE0_HEIGHT, Z_DEPTH+3*FACE0_WIDTH},
  269. !               {FACE0_WIDTH,0,0},{0,FACE0_HEIGHT,0},{-FACE0_WIDTH,0,0},{0,-FACE0_HEIGHT,0},
  270. ! 
  271. X    /* Side 4 (top) */
  272. !   {MR_X, MR_Y, Z_DEPTH},
  273. !               {FACE0_WIDTH,0,0},{0,0,FACE0_HEIGHT},{-FACE0_WIDTH,0,0},{0,0,-FACE0_HEIGHT},
  274. !   {MR_X+FACE0_WIDTH, MR_Y, Z_DEPTH},
  275. !               {FACE0_WIDTH,0,0},{0,0,FACE0_HEIGHT},{-FACE0_WIDTH,0,0},{0,0,-FACE0_HEIGHT},
  276. !   {MR_X+2*FACE0_WIDTH, MR_Y, Z_DEPTH},
  277. !               {FACE0_WIDTH,0,0},{0,0,FACE0_HEIGHT},{-FACE0_WIDTH,0,0},{0,0,-FACE0_HEIGHT},
  278. X  
  279. !   {MR_X, MR_Y, Z_DEPTH+FACE0_HEIGHT},
  280. !               {FACE0_WIDTH,0,0},{0,0,FACE0_HEIGHT},{-FACE0_WIDTH,0,0},{0,0,-FACE0_HEIGHT},
  281. !   {MR_X+FACE0_WIDTH, MR_Y, Z_DEPTH+FACE0_HEIGHT},
  282. !               {FACE0_WIDTH,0,0},{0,0,FACE0_HEIGHT},{-FACE0_WIDTH,0,0},{0,0,-FACE0_HEIGHT},
  283. !   {MR_X+2*FACE0_WIDTH, MR_Y, Z_DEPTH+FACE0_HEIGHT},
  284. !               {FACE0_WIDTH,0,0},{0,0,FACE0_HEIGHT},{-FACE0_WIDTH,0,0},{0,0,-FACE0_HEIGHT},
  285. X  
  286. !   {MR_X, MR_Y, Z_DEPTH+2*FACE0_HEIGHT},
  287. !               {FACE0_WIDTH,0,0},{0,0,FACE0_HEIGHT},{-FACE0_WIDTH,0,0},{0,0,-FACE0_HEIGHT},
  288. !   {MR_X+FACE0_WIDTH, MR_Y, Z_DEPTH+2*FACE0_HEIGHT},
  289. !               {FACE0_WIDTH,0,0},{0,0,FACE0_HEIGHT},{-FACE0_WIDTH,0,0},{0,0,-FACE0_HEIGHT},
  290. !   {MR_X+2*FACE0_WIDTH, MR_Y, Z_DEPTH+2*FACE0_HEIGHT},
  291. !               {FACE0_WIDTH,0,0},{0,0,FACE0_HEIGHT},{-FACE0_WIDTH,0,0},{0,0,-FACE0_HEIGHT},
  292. X  
  293. X    /* Side 5 (bottom) */
  294. !   {MR_X, MR_Y+3*FACE0_HEIGHT, Z_DEPTH},
  295. !               {FACE0_WIDTH,0,0},{0,0,FACE0_HEIGHT},{-FACE0_WIDTH,0,0},{0,0,-FACE0_HEIGHT},
  296. !   {MR_X+FACE0_WIDTH, MR_Y+3*FACE0_HEIGHT, Z_DEPTH},
  297. !               {FACE0_WIDTH,0,0},{0,0,FACE0_HEIGHT},{-FACE0_WIDTH,0,0},{0,0,-FACE0_HEIGHT},
  298. !   {MR_X+2*FACE0_WIDTH, MR_Y+3*FACE0_HEIGHT, Z_DEPTH},
  299. !               {FACE0_WIDTH,0,0},{0,0,FACE0_HEIGHT},{-FACE0_WIDTH,0,0},{0,0,-FACE0_HEIGHT},
  300. X  
  301. !   {MR_X, MR_Y+3*FACE0_HEIGHT, Z_DEPTH+FACE0_HEIGHT},
  302. !               {FACE0_WIDTH,0,0},{0,0,FACE0_HEIGHT},{-FACE0_WIDTH,0,0},{0,0,-FACE0_HEIGHT},
  303. !   {MR_X+FACE0_WIDTH, MR_Y+3*FACE0_HEIGHT, Z_DEPTH+FACE0_HEIGHT},
  304. !               {FACE0_WIDTH,0,0},{0,0,FACE0_HEIGHT},{-FACE0_WIDTH,0,0},{0,0,-FACE0_HEIGHT},
  305. !   {MR_X+2*FACE0_WIDTH, MR_Y+3*FACE0_HEIGHT, Z_DEPTH+FACE0_HEIGHT},
  306. !               {FACE0_WIDTH,0,0},{0,0,FACE0_HEIGHT},{-FACE0_WIDTH,0,0},{0,0,-FACE0_HEIGHT},
  307. X  
  308. !   {MR_X, MR_Y+3*FACE0_HEIGHT, Z_DEPTH+2*FACE0_HEIGHT},
  309. !               {FACE0_WIDTH,0,0},{0,0,FACE0_HEIGHT},{-FACE0_WIDTH,0,0},{0,0,-FACE0_HEIGHT},
  310. !   {MR_X+FACE0_WIDTH, MR_Y+3*FACE0_HEIGHT, Z_DEPTH+2*FACE0_HEIGHT},
  311. !               {FACE0_WIDTH,0,0},{0,0,FACE0_HEIGHT},{-FACE0_WIDTH,0,0},{0,0,-FACE0_HEIGHT},
  312. !   {MR_X+2*FACE0_WIDTH, MR_Y+3*FACE0_HEIGHT, Z_DEPTH+2*FACE0_HEIGHT},
  313. !               {FACE0_WIDTH,0,0},{0,0,FACE0_HEIGHT},{-FACE0_WIDTH,0,0},{0,0,-FACE0_HEIGHT},
  314. X  
  315. X  };
  316. X  int rot_angle,spin_angle,flip_angle;
  317. --- 171,306 ----
  318. X  double_XPoint seed_face[][5] = {
  319. X  
  320. X    /* Side 0 (front)*/
  321. !  { {MR_X, MR_Y, Z_DEPTH},
  322. !               {FACE0_WIDTH,0,0},{0,FACE0_HEIGHT,0},{-FACE0_WIDTH,0,0},{0,-FACE0_HEIGHT,0} },
  323. !  { {MR_X+FACE0_WIDTH, MR_Y, Z_DEPTH},
  324. !               {FACE0_WIDTH,0,0},{0,FACE0_HEIGHT,0},{-FACE0_WIDTH,0,0},{0,-FACE0_HEIGHT,0} },
  325. !  { {MR_X+2*FACE0_WIDTH, MR_Y, Z_DEPTH},
  326. !               {FACE0_WIDTH,0,0},{0,FACE0_HEIGHT,0},{-FACE0_WIDTH,0,0},{0,-FACE0_HEIGHT,0} },
  327. X  
  328. !  { {MR_X, MR_Y+FACE0_HEIGHT, Z_DEPTH},
  329. !               {FACE0_WIDTH,0,0},{0,FACE0_HEIGHT,0},{-FACE0_WIDTH,0,0},{0,-FACE0_HEIGHT,0} },
  330. !  { {MR_X+FACE0_WIDTH, MR_Y+FACE0_HEIGHT, Z_DEPTH},
  331. !               {FACE0_WIDTH,0,0},{0,FACE0_HEIGHT,0},{-FACE0_WIDTH,0,0},{0,-FACE0_HEIGHT,0} },
  332. !  { {MR_X+2*FACE0_WIDTH, MR_Y+FACE0_HEIGHT, Z_DEPTH},
  333. !               {FACE0_WIDTH,0,0},{0,FACE0_HEIGHT,0},{-FACE0_WIDTH,0,0},{0,-FACE0_HEIGHT,0} },
  334. X  
  335. !  { {MR_X, MR_Y+2*FACE0_HEIGHT, Z_DEPTH},
  336. !               {FACE0_WIDTH,0,0},{0,FACE0_HEIGHT,0},{-FACE0_WIDTH,0,0},{0,-FACE0_HEIGHT,0} },
  337. !  { {MR_X+FACE0_WIDTH, MR_Y+2*FACE0_HEIGHT, Z_DEPTH},
  338. !               {FACE0_WIDTH,0,0},{0,FACE0_HEIGHT,0},{-FACE0_WIDTH,0,0},{0,-FACE0_HEIGHT,0} },
  339. !  { {MR_X+2*FACE0_WIDTH, MR_Y+2*FACE0_HEIGHT, Z_DEPTH},
  340. !               {FACE0_WIDTH,0,0},{0,FACE0_HEIGHT,0},{-FACE0_WIDTH,0,0},{0,-FACE0_HEIGHT,0} },
  341. X  
  342. X    /* Side 1 (left) */
  343. !  { {MR_X, MR_Y, Z_DEPTH},
  344. !               {0,0,FACE0_WIDTH},{0,FACE0_HEIGHT,0},{0,0,-FACE0_WIDTH},{0,-FACE0_HEIGHT,0} },
  345. !  { {MR_X, MR_Y, Z_DEPTH+FACE0_WIDTH},
  346. !               {0,0,FACE0_WIDTH},{0,FACE0_HEIGHT,0},{0,0,-FACE0_WIDTH},{0,-FACE0_HEIGHT,0} },
  347. !  { {MR_X, MR_Y, Z_DEPTH+2*FACE0_WIDTH},
  348. !               {0,0,FACE0_WIDTH},{0,FACE0_HEIGHT,0},{0,0,-FACE0_WIDTH},{0,-FACE0_HEIGHT,0} },
  349. X  
  350. !  { {MR_X, MR_Y+FACE0_HEIGHT, Z_DEPTH},
  351. !               {0,0,FACE0_WIDTH},{0,FACE0_HEIGHT,0},{0,0,-FACE0_WIDTH},{0,-FACE0_HEIGHT,0} },
  352. !  { {MR_X, MR_Y+FACE0_HEIGHT, Z_DEPTH+FACE0_WIDTH},
  353. !               {0,0,FACE0_WIDTH},{0,FACE0_HEIGHT,0},{0,0,-FACE0_WIDTH},{0,-FACE0_HEIGHT,0} },
  354. !  { {MR_X, MR_Y+FACE0_HEIGHT, Z_DEPTH+2*FACE0_WIDTH},
  355. !               {0,0,FACE0_WIDTH},{0,FACE0_HEIGHT,0},{0,0,-FACE0_WIDTH},{0,-FACE0_HEIGHT,0} },
  356. X  
  357. !  { {MR_X, MR_Y+2*FACE0_HEIGHT, Z_DEPTH},
  358. !               {0,0,FACE0_WIDTH},{0,FACE0_HEIGHT,0},{0,0,-FACE0_WIDTH},{0,-FACE0_HEIGHT,0} },
  359. !  { {MR_X, MR_Y+2*FACE0_HEIGHT, Z_DEPTH+FACE0_WIDTH},
  360. !               {0,0,FACE0_WIDTH},{0,FACE0_HEIGHT,0},{0,0,-FACE0_WIDTH},{0,-FACE0_HEIGHT,0} },
  361. !  { {MR_X, MR_Y+2*FACE0_HEIGHT, Z_DEPTH+2*FACE0_WIDTH},
  362. !               {0,0,FACE0_WIDTH},{0,FACE0_HEIGHT,0},{0,0,-FACE0_WIDTH},{0,-FACE0_HEIGHT,0} },
  363. X  
  364. X    /* Side 2 (right) */
  365. !  { {MR_X+3*FACE0_WIDTH, MR_Y, Z_DEPTH},
  366. !               {0,0,FACE0_WIDTH},{0,FACE0_HEIGHT,0},{0,0,-FACE0_WIDTH},{0,-FACE0_HEIGHT,0} },
  367. !  { {MR_X+3*FACE0_WIDTH, MR_Y, Z_DEPTH+FACE0_WIDTH},
  368. !               {0,0,FACE0_WIDTH},{0,FACE0_HEIGHT,0},{0,0,-FACE0_WIDTH},{0,-FACE0_HEIGHT,0} },
  369. !  { {MR_X+3*FACE0_WIDTH, MR_Y, Z_DEPTH+2*FACE0_WIDTH},
  370. !               {0,0,FACE0_WIDTH},{0,FACE0_HEIGHT,0},{0,0,-FACE0_WIDTH},{0,-FACE0_HEIGHT,0} },
  371. X  
  372. !  { {MR_X+3*FACE0_WIDTH, MR_Y+FACE0_HEIGHT, Z_DEPTH},
  373. !               {0,0,FACE0_WIDTH},{0,FACE0_HEIGHT,0},{0,0,-FACE0_WIDTH},{0,-FACE0_HEIGHT,0} },
  374. !  { {MR_X+3*FACE0_WIDTH, MR_Y+FACE0_HEIGHT, Z_DEPTH+FACE0_WIDTH},
  375. !               {0,0,FACE0_WIDTH},{0,FACE0_HEIGHT,0},{0,0,-FACE0_WIDTH},{0,-FACE0_HEIGHT,0} },
  376. !  { {MR_X+3*FACE0_WIDTH, MR_Y+FACE0_HEIGHT, Z_DEPTH+2*FACE0_WIDTH},
  377. !               {0,0,FACE0_WIDTH},{0,FACE0_HEIGHT,0},{0,0,-FACE0_WIDTH},{0,-FACE0_HEIGHT,0} },
  378. X  
  379. !  { {MR_X+3*FACE0_WIDTH, MR_Y+2*FACE0_HEIGHT, Z_DEPTH},
  380. !               {0,0,FACE0_WIDTH},{0,FACE0_HEIGHT,0},{0,0,-FACE0_WIDTH},{0,-FACE0_HEIGHT,0} },
  381. !  { {MR_X+3*FACE0_WIDTH, MR_Y+2*FACE0_HEIGHT, Z_DEPTH+FACE0_WIDTH},
  382. !               {0,0,FACE0_WIDTH},{0,FACE0_HEIGHT,0},{0,0,-FACE0_WIDTH},{0,-FACE0_HEIGHT,0} },
  383. !  { {MR_X+3*FACE0_WIDTH, MR_Y+2*FACE0_HEIGHT, Z_DEPTH+2*FACE0_WIDTH},
  384. !               {0,0,FACE0_WIDTH},{0,FACE0_HEIGHT,0},{0,0,-FACE0_WIDTH},{0,-FACE0_HEIGHT,0} },
  385. X  
  386. X    /* Side 3 (back) */
  387. !  { {MR_X, MR_Y, Z_DEPTH+3*FACE0_WIDTH},
  388. !               {FACE0_WIDTH,0,0},{0,FACE0_HEIGHT,0},{-FACE0_WIDTH,0,0},{0,-FACE0_HEIGHT,0} },
  389. !  { {MR_X+FACE0_WIDTH, MR_Y, Z_DEPTH+3*FACE0_WIDTH},
  390. !               {FACE0_WIDTH,0,0},{0,FACE0_HEIGHT,0},{-FACE0_WIDTH,0,0},{0,-FACE0_HEIGHT,0} },
  391. !  { {MR_X+2*FACE0_WIDTH, MR_Y, Z_DEPTH+3*FACE0_WIDTH},
  392. !               {FACE0_WIDTH,0,0},{0,FACE0_HEIGHT,0},{-FACE0_WIDTH,0,0},{0,-FACE0_HEIGHT,0} },
  393. X  
  394. !  { {MR_X, MR_Y+FACE0_HEIGHT, Z_DEPTH+3*FACE0_WIDTH},
  395. !               {FACE0_WIDTH,0,0},{0,FACE0_HEIGHT,0},{-FACE0_WIDTH,0,0},{0,-FACE0_HEIGHT,0} },
  396. !  { {MR_X+FACE0_WIDTH, MR_Y+FACE0_HEIGHT, Z_DEPTH+3*FACE0_WIDTH},
  397. !               {FACE0_WIDTH,0,0},{0,FACE0_HEIGHT,0},{-FACE0_WIDTH,0,0},{0,-FACE0_HEIGHT,0} },
  398. !  { {MR_X+2*FACE0_WIDTH, MR_Y+FACE0_HEIGHT, Z_DEPTH+3*FACE0_WIDTH},
  399. !               {FACE0_WIDTH,0,0},{0,FACE0_HEIGHT,0},{-FACE0_WIDTH,0,0},{0,-FACE0_HEIGHT,0} },
  400. X  
  401. !  { {MR_X, MR_Y+2*FACE0_HEIGHT, Z_DEPTH+3*FACE0_WIDTH},
  402. !               {FACE0_WIDTH,0,0},{0,FACE0_HEIGHT,0},{-FACE0_WIDTH,0,0},{0,-FACE0_HEIGHT,0} },
  403. !  { {MR_X+FACE0_WIDTH, MR_Y+2*FACE0_HEIGHT, Z_DEPTH+3*FACE0_WIDTH},
  404. !               {FACE0_WIDTH,0,0},{0,FACE0_HEIGHT,0},{-FACE0_WIDTH,0,0},{0,-FACE0_HEIGHT,0} },
  405. !  { {MR_X+2*FACE0_WIDTH, MR_Y+2*FACE0_HEIGHT, Z_DEPTH+3*FACE0_WIDTH},
  406. !               {FACE0_WIDTH,0,0},{0,FACE0_HEIGHT,0},{-FACE0_WIDTH,0,0},{0,-FACE0_HEIGHT,0} },
  407. !  
  408. X    /* Side 4 (top) */
  409. !  { {MR_X, MR_Y, Z_DEPTH},
  410. !               {FACE0_WIDTH,0,0},{0,0,FACE0_HEIGHT},{-FACE0_WIDTH,0,0},{0,0,-FACE0_HEIGHT} },
  411. !  { {MR_X+FACE0_WIDTH, MR_Y, Z_DEPTH},
  412. !               {FACE0_WIDTH,0,0},{0,0,FACE0_HEIGHT},{-FACE0_WIDTH,0,0},{0,0,-FACE0_HEIGHT} },
  413. !  { {MR_X+2*FACE0_WIDTH, MR_Y, Z_DEPTH},
  414. !               {FACE0_WIDTH,0,0},{0,0,FACE0_HEIGHT},{-FACE0_WIDTH,0,0},{0,0,-FACE0_HEIGHT} },
  415. X  
  416. !  { {MR_X, MR_Y, Z_DEPTH+FACE0_HEIGHT},
  417. !               {FACE0_WIDTH,0,0},{0,0,FACE0_HEIGHT},{-FACE0_WIDTH,0,0},{0,0,-FACE0_HEIGHT} },
  418. !  { {MR_X+FACE0_WIDTH, MR_Y, Z_DEPTH+FACE0_HEIGHT},
  419. !               {FACE0_WIDTH,0,0},{0,0,FACE0_HEIGHT},{-FACE0_WIDTH,0,0},{0,0,-FACE0_HEIGHT} },
  420. !  { {MR_X+2*FACE0_WIDTH, MR_Y, Z_DEPTH+FACE0_HEIGHT},
  421. !               {FACE0_WIDTH,0,0},{0,0,FACE0_HEIGHT},{-FACE0_WIDTH,0,0},{0,0,-FACE0_HEIGHT} },
  422. X  
  423. !  { {MR_X, MR_Y, Z_DEPTH+2*FACE0_HEIGHT},
  424. !               {FACE0_WIDTH,0,0},{0,0,FACE0_HEIGHT},{-FACE0_WIDTH,0,0},{0,0,-FACE0_HEIGHT} },
  425. !  { {MR_X+FACE0_WIDTH, MR_Y, Z_DEPTH+2*FACE0_HEIGHT},
  426. !               {FACE0_WIDTH,0,0},{0,0,FACE0_HEIGHT},{-FACE0_WIDTH,0,0},{0,0,-FACE0_HEIGHT} },
  427. !  { {MR_X+2*FACE0_WIDTH, MR_Y, Z_DEPTH+2*FACE0_HEIGHT},
  428. !               {FACE0_WIDTH,0,0},{0,0,FACE0_HEIGHT},{-FACE0_WIDTH,0,0},{0,0,-FACE0_HEIGHT} },
  429. X  
  430. X    /* Side 5 (bottom) */
  431. !  { {MR_X, MR_Y+3*FACE0_HEIGHT, Z_DEPTH},
  432. !               {FACE0_WIDTH,0,0},{0,0,FACE0_HEIGHT},{-FACE0_WIDTH,0,0},{0,0,-FACE0_HEIGHT} },
  433. !  { {MR_X+FACE0_WIDTH, MR_Y+3*FACE0_HEIGHT, Z_DEPTH},
  434. !               {FACE0_WIDTH,0,0},{0,0,FACE0_HEIGHT},{-FACE0_WIDTH,0,0},{0,0,-FACE0_HEIGHT} },
  435. !  { {MR_X+2*FACE0_WIDTH, MR_Y+3*FACE0_HEIGHT, Z_DEPTH},
  436. !               {FACE0_WIDTH,0,0},{0,0,FACE0_HEIGHT},{-FACE0_WIDTH,0,0},{0,0,-FACE0_HEIGHT} },
  437. X  
  438. !  { {MR_X, MR_Y+3*FACE0_HEIGHT, Z_DEPTH+FACE0_HEIGHT},
  439. !               {FACE0_WIDTH,0,0},{0,0,FACE0_HEIGHT},{-FACE0_WIDTH,0,0},{0,0,-FACE0_HEIGHT} },
  440. !  { {MR_X+FACE0_WIDTH, MR_Y+3*FACE0_HEIGHT, Z_DEPTH+FACE0_HEIGHT},
  441. !               {FACE0_WIDTH,0,0},{0,0,FACE0_HEIGHT},{-FACE0_WIDTH,0,0},{0,0,-FACE0_HEIGHT} },
  442. !  { {MR_X+2*FACE0_WIDTH, MR_Y+3*FACE0_HEIGHT, Z_DEPTH+FACE0_HEIGHT},
  443. !               {FACE0_WIDTH,0,0},{0,0,FACE0_HEIGHT},{-FACE0_WIDTH,0,0},{0,0,-FACE0_HEIGHT} },
  444. X  
  445. !  { {MR_X, MR_Y+3*FACE0_HEIGHT, Z_DEPTH+2*FACE0_HEIGHT},
  446. !               {FACE0_WIDTH,0,0},{0,0,FACE0_HEIGHT},{-FACE0_WIDTH,0,0},{0,0,-FACE0_HEIGHT} },
  447. !  { {MR_X+FACE0_WIDTH, MR_Y+3*FACE0_HEIGHT, Z_DEPTH+2*FACE0_HEIGHT},
  448. !               {FACE0_WIDTH,0,0},{0,0,FACE0_HEIGHT},{-FACE0_WIDTH,0,0},{0,0,-FACE0_HEIGHT} },
  449. !  { {MR_X+2*FACE0_WIDTH, MR_Y+3*FACE0_HEIGHT, Z_DEPTH+2*FACE0_HEIGHT},
  450. !               {FACE0_WIDTH,0,0},{0,0,FACE0_HEIGHT},{-FACE0_WIDTH,0,0},{0,0,-FACE0_HEIGHT} }
  451. X  
  452. X  };
  453. X  int rot_angle,spin_angle,flip_angle;
  454. SHAR_EOF
  455. chmod 0644 patch1 ||
  456. echo 'restore of patch1 failed'
  457. Wc_c="`wc -c < 'patch1'`"
  458. test 16528 -eq "$Wc_c" ||
  459.     echo 'patch1: original size 16528, current size' "$Wc_c"
  460. fi
  461. # ============= patch2 ==============
  462. if test -f 'patch2' -a X"$1" != X"-c"; then
  463.     echo 'x - skipping patch2 (File already exists)'
  464. else
  465. echo 'x - extracting patch2 (Text)'
  466. sed 's/^X//' << 'SHAR_EOF' > 'patch2' &&
  467. *** ldfile.c    Wed May 12 10:22:18 1993
  468. --- ldfile01.c    Wed May 12 10:37:49 1993
  469. ***************
  470. *** 31,37 ****
  471. X  
  472. X  #include "ldfile.h"
  473. X  
  474. ! XtCallbackProc fileProc;
  475. X  
  476. X  void FileNamePopUp();
  477. X  void okFileNameCallback();
  478. --- 31,37 ----
  479. X  
  480. X  #include "ldfile.h"
  481. X  
  482. ! void (*fileProc)();
  483. X  
  484. X  void FileNamePopUp();
  485. X  void okFileNameCallback();
  486. ***************
  487. *** 178,184 ****
  488. X    Dimension bw_width, pw_width;
  489. X    int n;
  490. X    
  491. !   fileProc = (XtCallbackProc) proc;
  492. X    
  493. X    popup = XtCreatePopupShell("ldfile_popup",
  494. X                   transientShellWidgetClass, theParent, NULL, 0);
  495. --- 178,184 ----
  496. X    Dimension bw_width, pw_width;
  497. X    int n;
  498. X    
  499. !   fileProc = proc;
  500. X    
  501. X    popup = XtCreatePopupShell("ldfile_popup",
  502. X                   transientShellWidgetClass, theParent, NULL, 0);
  503. ***************
  504. *** 227,233 ****
  505. X    int n;
  506. X    XmString compoundString;
  507. X    Arg args[1];
  508. !   
  509. X    
  510. X    n=0;
  511. X    XtSetArg(args[n], XmNtextString, &compoundString);n++;
  512. --- 227,233 ----
  513. X    int n;
  514. X    XmString compoundString;
  515. X    Arg args[1];
  516. !   XtCallbackProc callbackFunct;
  517. X    
  518. X    n=0;
  519. X    XtSetArg(args[n], XmNtextString, &compoundString);n++;
  520. SHAR_EOF
  521. chmod 0644 patch2 ||
  522. echo 'restore of patch2 failed'
  523. Wc_c="`wc -c < 'patch2'`"
  524. test 1119 -eq "$Wc_c" ||
  525.     echo 'patch2: original size 1119, current size' "$Wc_c"
  526. fi
  527. exit 0
  528.  
  529. exit 0 # Just in case...
  530.