np2/macos9/np2.cpp - diff

Return to np2.cpp CVS log

Up to [RetroPC.NET] / np2 / macos9

Diff for /np2/macos9/np2.cpp between versions 1.25 and 1.32

version 1.25, 2004/01/22 04:59:48	version 1.32, 2004/03/12 18:19:58
Line 20	Line 20
#include "pc9861k.h"	#include "pc9861k.h"
#include "mpu98ii.h"	#include "mpu98ii.h"
#include "timing.h"	#include "timing.h"
	#include "keystat.h"
#include "debugsub.h"	#include "debugsub.h"
#include "bios.h"	#include "bios.h"
#include "scrndraw.h"	#include "scrndraw.h"
Line 109 static void MenuBarInit(void) {	Line 110 static void MenuBarInit(void) {
if (hmenu) {	if (hmenu) {
AppendResMenu(hmenu, 'DRVR');	AppendResMenu(hmenu, 'DRVR');
}	}
	#if !defined(SUPPORT_SCSI)
	hmenu = GetMenuHandle(IDM_HARDDISK);
	if (hmenu) {
	DeleteMenuItem(hmenu, 7);
	DeleteMenuItem(hmenu, 6);
	DeleteMenuItem(hmenu, 5);
	DeleteMenuItem(hmenu, 4);
	DeleteMenuItem(hmenu, 3);
	}
	#endif
	if (!np2oscfg.I286SAVE) {
	hmenu = GetMenuHandle(IDM_OTHER);
	if (hmenu) {
	DeleteMenuItem(hmenu, 10);
	}
	}
InsertMenu(GetMenu(IDM_SASI1), -1);	InsertMenu(GetMenu(IDM_SASI1), -1);
InsertMenu(GetMenu(IDM_SASI2), -1);	InsertMenu(GetMenu(IDM_SASI2), -1);
	#if defined(SUPPORT_SCSI)
	InsertMenu(GetMenu(IDM_SCSI0), -1);
	InsertMenu(GetMenu(IDM_SCSI1), -1);
	InsertMenu(GetMenu(IDM_SCSI2), -1);
	InsertMenu(GetMenu(IDM_SCSI3), -1);
	#endif
InsertMenu(GetMenu(IDM_KEYBOARD), -1);	InsertMenu(GetMenu(IDM_KEYBOARD), -1);
InsertMenu(GetMenu(IDM_SOUND), -1);	InsertMenu(GetMenu(IDM_SOUND), -1);
InsertMenu(GetMenu(IDM_MEMORY), -1);	InsertMenu(GetMenu(IDM_MEMORY), -1);
Line 184 static void HandleMenuChoice(long wParam	Line 207 static void HandleMenuChoice(long wParam
diskdrv_setfdd(1, NULL, 0);	diskdrv_setfdd(1, NULL, 0);
break;	break;

	case IDM_FDD3OPEN:
	dialog_changefdd(2);
	break;

	case IDM_FDD3EJECT:
	diskdrv_setfdd(2, NULL, 0);
	break;

	case IDM_FDD4OPEN:
	dialog_changefdd(3);
	break;

	case IDM_FDD4EJECT:
	diskdrv_setfdd(3, NULL, 0);
	break;

case IDM_SASI1OPEN:	case IDM_SASI1OPEN:
dialog_changehdd(0);	dialog_changehdd(0x00);
break;	break;

case IDM_SASI1REMOVE:	case IDM_SASI1REMOVE:
diskdrv_sethdd(0, NULL);	diskdrv_sethdd(0x00, NULL);
break;	break;

case IDM_SASI2OPEN:	case IDM_SASI2OPEN:
dialog_changehdd(1);	dialog_changehdd(0x01);
break;	break;

case IDM_SASI2REMOVE:	case IDM_SASI2REMOVE:
diskdrv_sethdd(1, NULL);	diskdrv_sethdd(0x01, NULL);
	break;

	case IDM_SCSI0OPEN:
	dialog_changehdd(0x20);
	break;

	case IDM_SCSI0REMOVE:
	diskdrv_sethdd(0x20, NULL);
	break;

	case IDM_SCSI1OPEN:
	dialog_changehdd(0x21);
	break;

	case IDM_SCSI1REMOVE:
	diskdrv_sethdd(0x21, NULL);
	break;

	case IDM_SCSI2OPEN:
	dialog_changehdd(0x22);
	break;

	case IDM_SCSI2REMOVE:
	diskdrv_sethdd(0x22, NULL);
	break;

	case IDM_SCSI3OPEN:
	dialog_changehdd(0x23);
	break;

	case IDM_SCSI3REMOVE:
	diskdrv_sethdd(0x23, NULL);
break;	break;

case IDM_ROLNORMAL:	case IDM_ROLNORMAL:
Line 267 static void HandleMenuChoice(long wParam	Line 338 static void HandleMenuChoice(long wParam
update \|= SYS_UPDATECFG;	update \|= SYS_UPDATECFG;
break;	break;

	case IDM_MIDIOPT:
	MPU98DialogProc();
	break;

case IDM_MIDIPANIC:	case IDM_MIDIPANIC:
rs232c_midipanic();	rs232c_midipanic();
mpu98ii_midipanic();	mpu98ii_midipanic();
Line 333 static void HandleMenuChoice(long wParam	Line 408 static void HandleMenuChoice(long wParam
update \|= SYS_UPDATEOSCFG;	update \|= SYS_UPDATEOSCFG;
break;	break;

	case IDM_F11USER:
	menu_setf11key(4);
	mackbd_resetf11();
	update \|= SYS_UPDATEOSCFG;
	break;

case IDM_F12MOUSE:	case IDM_F12MOUSE:
menu_setf12key(0);	menu_setf12key(0);
mackbd_resetf12();	mackbd_resetf12();
Line 351 static void HandleMenuChoice(long wParam	Line 432 static void HandleMenuChoice(long wParam
update \|= SYS_UPDATEOSCFG;	update \|= SYS_UPDATEOSCFG;
break;	break;

	case IDM_F12USER:
	menu_setf12key(4);
	mackbd_resetf12();
	update \|= SYS_UPDATEOSCFG;
	break;

case IDM_BEEPOFF:	case IDM_BEEPOFF:
menu_setbeepvol(0);	menu_setbeepvol(0);
beep_setvol(0);	beep_setvol(0);
Line 459 static void HandleMenuChoice(long wParam	Line 546 static void HandleMenuChoice(long wParam
dialog_writebmp();	dialog_writebmp();
break;	break;

	case IDM_CALENDAR:
	CalendarDialogProc();
	break;

case IDM_DISPCLOCK:	case IDM_DISPCLOCK:
menu_setdispclk(np2oscfg.DISPCLK ^ 1);	menu_setdispclk(np2oscfg.DISPCLK ^ 1);
update \|= SYS_UPDATECFG;	update \|= SYS_UPDATECFG;
Line 671 static int flagload(const char *ext) {	Line 762 static int flagload(const char *ext) {
ret = IDOK;	ret = IDOK;
getstatfilename(path, ext, sizeof(path));	getstatfilename(path, ext, sizeof(path));
r = statsave_check(path, buf, sizeof(buf));	r = statsave_check(path, buf, sizeof(buf));
if (r & (~NP2FLAG_DISKCHG)) {	if (r & (~STATFLAG_DISKCHG)) {
ResumeErrorDialogProc();	ResumeErrorDialogProc();
ret = IDCANCEL;	ret = IDCANCEL;
}	}
else if (r & NP2FLAG_DISKCHG) {	else if (r & STATFLAG_DISKCHG) {
ret = ResumeWarningDialogProc(buf);	ret = ResumeWarningDialogProc(buf);
}	}
if (ret == IDOK) {	if (ret == IDOK) {
Line 703 int main(int argc, char *argv[]) {	Line 794 int main(int argc, char *argv[]) {

TRACEINIT();	TRACEINIT();

	keystat_initialize();

SetRect(&wRect, np2oscfg.posx, np2oscfg.posy, 100, 100);	SetRect(&wRect, np2oscfg.posx, np2oscfg.posy, 100, 100);
hWndMain = NewWindow(0, &wRect, "\pNeko Project II", FALSE,	hWndMain = NewWindow(0, &wRect, "\pNeko Project II", FALSE,
noGrowDocProc, (WindowPtr)-1, TRUE, 0);	noGrowDocProc, (WindowPtr)-1, TRUE, 0);

RetroPC.NET-CVS <cvs@retropc.net>

Removed from v.1.25
changed lines
	Added in v.1.32