diff -cbw xemeraldia-0.3/CHANGES.sjis xemeraldia-0.31/CHANGES.sjis *** xemeraldia-0.3/CHANGES.sjis Thu Mar 23 16:49:25 1995 --- xemeraldia-0.31/CHANGES.sjis Fri Apr 7 23:53:43 1995 *************** *** 1,3 **** --- 1,13 ---- + Changes from xemeraldia 0.3 to 0.31 (April 7, 1995) + + [usleep.c, score.c, graphics.h] + ・EWS4800, NEWS-OS 6.1 への対応 + + [main.c, XEmeraldia.ad] + ・リソースの書き間違いの修正(Horizontal が Horizontial になっていた) + + + -------------------------------------------------------------------------- Changes from xemeraldia 0.21 to 0.3 (March 23, 1995) [XEmeraldia.ad, main.c] diff -cbw xemeraldia-0.3/Imakefile xemeraldia-0.31/Imakefile *** xemeraldia-0.3/Imakefile Thu Mar 23 20:12:46 1995 --- xemeraldia-0.31/Imakefile Thu Mar 30 20:17:18 1995 *************** *** 4,10 **** /*---------------------------------------------------------------------*/ /* CC=gcc */ - CDEBUGFLAGS=-g #ifdef SunOSPlatform #if SunOSPlatform --- 4,9 ---- diff -cbw xemeraldia-0.3/README.sjis xemeraldia-0.31/README.sjis *** xemeraldia-0.3/README.sjis Thu Mar 23 16:46:53 1995 --- xemeraldia-0.31/README.sjis Fri Apr 7 23:51:59 1995 *************** *** 5,11 **** | | | by tommy | | | ! | Ver. 0.3 (March 23, 1995) | | | +----------------------------------------------------------------------+ --- 5,11 ---- | | | by tommy | | | ! | Ver. 0.31 (April 7, 1995) | | | +----------------------------------------------------------------------+ *************** *** 29,35 **** [[[ 動作確認された環境 ]]] ・SunOS 4.1.3_U1 + X11R5 ! ・Linux 1.1.54 + XFree86 3.1 ・NEWS-OS 4.2.1R (X11R5), NEWS-OS 4.2R (X11R4), NEWS-OS 4.2C (X11R4) ・IRIX 4.0.5 (X11R4), IRIX 5.2 (X11R5) ・OSF/1 ver 2.0, Alpha AXP --- 29,35 ---- [[[ 動作確認された環境 ]]] ・SunOS 4.1.3_U1 + X11R5 ! ・Linux 1.1.54 + XFree86-3.1 ・NEWS-OS 4.2.1R (X11R5), NEWS-OS 4.2R (X11R4), NEWS-OS 4.2C (X11R4) ・IRIX 4.0.5 (X11R4), IRIX 5.2 (X11R5) ・OSF/1 ver 2.0, Alpha AXP *************** *** 36,41 **** --- 36,44 ---- ・HP-UX 9.05 ・SunOS 5.3 ・SunOS 4.1.1 (OpenWindows 2.X) + ・UNIX System V/386 Release 4.0 V4.0 + XFree86 + ・FreeBSD-2.0R + XFree86-3.1.1 + ・EWS4800 [[[ コンパイル&インストールの方法 ]]] diff -cbw xemeraldia-0.3/XEmeraldia.ad xemeraldia-0.31/XEmeraldia.ad *** xemeraldia-0.3/XEmeraldia.ad Thu Mar 23 19:38:52 1995 --- xemeraldia-0.31/XEmeraldia.ad Mon Mar 27 17:59:00 1995 *************** *** 72,78 **** XEmeraldia*ScoreText*edittype: read XEmeraldia*ScoreText*displayCaret: False XEmeraldia*ScoreText*scrollVertical: never ! XEmeraldia*ScoreText*scrollHorizontial: never ?.ScoreFrame*baseTranslations:#override \ :Done()\n\ :Done() --- 72,78 ---- XEmeraldia*ScoreText*edittype: read XEmeraldia*ScoreText*displayCaret: False XEmeraldia*ScoreText*scrollVertical: never ! XEmeraldia*ScoreText*scrollHorizontal: never ?.ScoreFrame*baseTranslations:#override \ :Done()\n\ :Done() Common subdirectories: xemeraldia-0.3/bitmaps and xemeraldia-0.31/bitmaps diff -cbw xemeraldia-0.3/graphics.h xemeraldia-0.31/graphics.h *** xemeraldia-0.3/graphics.h Wed Mar 22 15:23:03 1995 --- xemeraldia-0.31/graphics.h Mon Mar 27 18:16:54 1995 *************** *** 72,77 **** #define HIGH_SCORE_TABLE ".xemeraldia.scores" #endif ! #if defined(sgi) || defined(SYSV) void usleep (); #endif --- 72,77 ---- #define HIGH_SCORE_TABLE ".xemeraldia.scores" #endif ! #if defined(sgi) || defined(SYSV) || defined(SVR4) void usleep (); #endif diff -cbw xemeraldia-0.3/main.c xemeraldia-0.31/main.c *** xemeraldia-0.3/main.c Thu Mar 23 15:59:17 1995 --- xemeraldia-0.31/main.c Mon Mar 27 18:56:24 1995 *************** *** 62,68 **** "XEmeraldia*ScoreText*edittype: read", "XEmeraldia*ScoreText*displayCaret: False", "XEmeraldia*ScoreText*scrollVertical: never", ! "XEmeraldia*ScoreText*scrollHorizontial: never", "?.ScoreFrame*baseTranslations:#override \ :Done()\n\ :Done()", --- 62,68 ---- "XEmeraldia*ScoreText*edittype: read", "XEmeraldia*ScoreText*displayCaret: False", "XEmeraldia*ScoreText*scrollVertical: never", ! "XEmeraldia*ScoreText*scrollHorizontal: never", "?.ScoreFrame*baseTranslations:#override \ :Done()\n\ :Done()", *************** *** 81,87 **** programname = argv[0]; topLevel = XtVaAppInitialize (&app_context, "XEmeraldia", Options, XtNumber (Options), ! (Cardinal *)&argc, argv, fallback_resources, NULL); XtGetApplicationResources (topLevel, (XtPointer)&app_data, resources, XtNumber (resources), NULL, 0); initXt (topLevel); --- 81,87 ---- programname = argv[0]; topLevel = XtVaAppInitialize (&app_context, "XEmeraldia", Options, XtNumber (Options), ! &argc, argv, fallback_resources, NULL); XtGetApplicationResources (topLevel, (XtPointer)&app_data, resources, XtNumber (resources), NULL, 0); initXt (topLevel); diff -cbw xemeraldia-0.3/score.c xemeraldia-0.31/score.c *** xemeraldia-0.3/score.c Thu Mar 23 20:09:48 1995 --- xemeraldia-0.31/score.c Wed Mar 29 16:20:11 1995 *************** *** 11,24 **** #include - /* #define DEBUG */ - #define HIGH_TABLE_SIZE 30 /* size of high score table */ #define YES (1) #define NO (0) ! #if defined(SYSV) && !defined(sgi) #define HAVE_FLOCK NO #define HAVE_LOCKF YES #else --- 11,22 ---- #include #define HIGH_TABLE_SIZE 30 /* size of high score table */ #define YES (1) #define NO (0) ! #if defined(SYSV) && !defined(sgi) || defined(SVR4) #define HAVE_FLOCK NO #define HAVE_LOCKF YES #else *************** *** 84,90 **** { FILE *fp; int i; - int ret; if (! app_data.usescorefile) return; --- 82,87 ---- *************** *** 103,114 **** #if HAVE_FLOCK if (flock (fileno (fp), LOCK_SH) == -1) perror ("read_high_scores:can't shared lock"); ! #else if HAVE_LOCKF rewind (fp); ! if ((ret = lockf (fileno (fp), F_LOCK, 0L)) == -1) perror ("read_high_scores:can't lock"); - #ifdef DEBUG - fprintf (stderr, "%d\n", ret); #endif #endif for (i = 0; i < HIGH_TABLE_SIZE; i++) --- 100,110 ---- #if HAVE_FLOCK if (flock (fileno (fp), LOCK_SH) == -1) perror ("read_high_scores:can't shared lock"); ! #else ! #if HAVE_LOCKF rewind (fp); ! if (lockf (fileno (fp), F_LOCK, 0L) == -1) perror ("read_high_scores:can't lock"); #endif #endif for (i = 0; i < HIGH_TABLE_SIZE; i++) *************** *** 128,139 **** #if HAVE_FLOCK if (flock (fileno (fp), LOCK_UN) == -1) perror ("read_high_scores:can't unlock"); ! #else if HAVE_LOCKF rewind (fp); ! if ((ret = lockf (fileno (fp), F_ULOCK, 0L)) == -1) perror ("read_high_scores:can't unlock"); - #ifdef DEBUG - fprintf (stderr, "%d\n", ret); #endif #endif fclose(fp); --- 124,134 ---- #if HAVE_FLOCK if (flock (fileno (fp), LOCK_UN) == -1) perror ("read_high_scores:can't unlock"); ! #else ! #if HAVE_LOCKF rewind (fp); ! if (lockf (fileno (fp), F_ULOCK, 0L) == -1) perror ("read_high_scores:can't unlock"); #endif #endif fclose(fp); *************** *** 144,150 **** { FILE *fp; int i; - int ret; if ((fp = fopen (app_data.scorefile, "w")) == NULL) { --- 139,144 ---- *************** *** 156,167 **** #if HAVE_FLOCK if (flock (fileno (fp), LOCK_EX) == -1) perror ("write_high_scores:can't exclusive lock"); ! #else if HAVE_LOCKF rewind (fp); ! if ((ret = lockf (fileno (fp), F_LOCK, 0L)) == -1) perror ("write_high_scores:can't lock"); - #ifdef DEBUG - fprintf (stderr, "%d\n", ret); #endif #endif for (i = 0; i < HIGH_TABLE_SIZE; i++) --- 150,160 ---- #if HAVE_FLOCK if (flock (fileno (fp), LOCK_EX) == -1) perror ("write_high_scores:can't exclusive lock"); ! #else ! #if HAVE_LOCKF rewind (fp); ! if (lockf (fileno (fp), F_LOCK, 0L) == -1) perror ("write_high_scores:can't lock"); #endif #endif for (i = 0; i < HIGH_TABLE_SIZE; i++) *************** *** 173,184 **** #if HAVE_FLOCK if (flock (fileno (fp), LOCK_UN) == -1) perror ("write_high_scores:can't unlock"); ! #else if HAVE_LOCKF rewind (fp); ! if ((ret = lockf (fileno (fp), F_ULOCK, 0L)) == -1) perror ("write_high_scores:can't unlock"); - #ifdef DEBUG - fprintf (stderr, "%d\n", ret); #endif #endif fclose(fp); --- 166,176 ---- #if HAVE_FLOCK if (flock (fileno (fp), LOCK_UN) == -1) perror ("write_high_scores:can't unlock"); ! #else ! #if HAVE_LOCKF rewind (fp); ! if (lockf (fileno (fp), F_ULOCK, 0L) == -1) perror ("write_high_scores:can't unlock"); #endif #endif fclose(fp); diff -cbw xemeraldia-0.3/usleep.c xemeraldia-0.31/usleep.c *** xemeraldia-0.3/usleep.c Thu Mar 23 15:49:57 1995 --- xemeraldia-0.31/usleep.c Mon Mar 27 18:56:25 1995 *************** *** 2,13 **** /* xemeraldia ----- usleep.c */ /* */ #ifdef SYSV #include #ifdef sgi #include ! #endif void usleep (useconds) unsigned useconds; { --- 2,21 ---- /* xemeraldia ----- usleep.c */ /* */ + #if defined(SYSV) || defined(SVR4) #ifdef SYSV #include + #endif /* SYSV */ #ifdef sgi #include ! #endif /* sgi */ ! #ifdef SVR4 ! #include ! #include ! #include ! #endif /* SVR4 */ + void usleep (useconds) unsigned useconds; { *************** *** 18,21 **** select (0, 0, 0, 0, &timeout); } ! #endif --- 26,29 ---- select (0, 0, 0, 0, &timeout); } ! #endif /* SYSV || SVR4 */