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.12 and 1.31

version 1.12, 2003/11/09 23:42:06	version 1.31, 2004/02/21 17:52:04
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 28	Line 29
#include "s98.h"	#include "s98.h"
#include "diskdrv.h"	#include "diskdrv.h"
#include "fddfile.h"	#include "fddfile.h"
#include "statsave.h"


#define USE_RESUME	#define USE_RESUME


NP2OSCFG np2oscfg = {0, 2, 0, 0, 0, 0, 0};	NP2OSCFG np2oscfg = {100, 100, 0, 0, 0, 0, 0, 0, 0, 0, 0};

WindowPtr hWndMain;	WindowPtr hWndMain;
BOOL np2running;	BOOL np2running;
Line 110 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, 9);
	}
	}
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 119 static void MenuBarInit(void) {	Line 141 static void MenuBarInit(void) {
#if TARGET_API_MAC_CARBON	#if TARGET_API_MAC_CARBON
hmenu = GetMenuHandle(IDM_FDD2);	hmenu = GetMenuHandle(IDM_FDD2);
SetItemCmd(hmenu, LoWord(IDM_FDD2OPEN), 'D');	SetItemCmd(hmenu, LoWord(IDM_FDD2OPEN), 'D');
SetMenuItemModifiers(hmenu, LoWord(IDM_FDD2OPEN), kMenuOptionModifier);	SetMenuItemModifiers(hmenu, LoWord(IDM_FDD2OPEN), kMenuShiftModifier);
SetItemCmd(hmenu, LoWord(IDM_FDD2EJECT), 'E');	SetItemCmd(hmenu, LoWord(IDM_FDD2EJECT), 'E');
SetMenuItemModifiers(hmenu, LoWord(IDM_FDD2EJECT), kMenuOptionModifier);	SetMenuItemModifiers(hmenu, LoWord(IDM_FDD2EJECT), kMenuShiftModifier);
hmenu = GetMenuHandle(IDM_SASI2);	hmenu = GetMenuHandle(IDM_SASI2);
SetItemCmd(hmenu, LoWord(IDM_FDD2OPEN), 'O');	SetItemCmd(hmenu, LoWord(IDM_SASI2OPEN), 'O');
SetMenuItemModifiers(hmenu, LoWord(IDM_SASI2OPEN), kMenuOptionModifier);	SetMenuItemModifiers(hmenu, LoWord(IDM_SASI2OPEN), kMenuShiftModifier);
#else	#else
EnableItem(GetMenuHandle(IDM_DEVICE), LoWord(IDM_MOUSE));	EnableItem(GetMenuHandle(IDM_DEVICE), LoWord(IDM_MOUSE));
EnableItem(GetMenuHandle(IDM_KEYBOARD), LoWord(IDM_F12MOUSE));	EnableItem(GetMenuHandle(IDM_KEYBOARD), LoWord(IDM_F12MOUSE));
Line 186 static void HandleMenuChoice(long wParam	Line 208 static void HandleMenuChoice(long wParam
break;	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 262 static void HandleMenuChoice(long wParam	Line 316 static void HandleMenuChoice(long wParam
dialog_scropt();	dialog_scropt();
break;	break;

case IDM_MOUSE:	case IDM_MOUSE:
mousemng_toggle(MOUSEPROC_SYSTEM);	mousemng_toggle(MOUSEPROC_SYSTEM);
menu_setmouse(np2oscfg.MOUSE_SW ^ 1);	menu_setmouse(np2oscfg.MOUSE_SW ^ 1);
sysmng_update(SYS_UPDATECFG);	update \|= SYS_UPDATECFG;
break;	break;

case IDM_MIDIPANIC:	case IDM_MIDIPANIC:
Line 277 static void HandleMenuChoice(long wParam	Line 331 static void HandleMenuChoice(long wParam
case IDM_KEY:	case IDM_KEY:
menu_setkey(0);	menu_setkey(0);
keystat_resetjoykey();	keystat_resetjoykey();
	update \|= SYS_UPDATECFG;
break;	break;

case IDM_JOY1:	case IDM_JOY1:
menu_setkey(1);	menu_setkey(1);
keystat_resetjoykey();	keystat_resetjoykey();
	update \|= SYS_UPDATECFG;
break;	break;

case IDM_JOY2:	case IDM_JOY2:
menu_setkey(2);	menu_setkey(2);
keystat_resetjoykey();	keystat_resetjoykey();
	update \|= SYS_UPDATECFG;
break;	break;

case IDM_MOUSEKEY:	case IDM_MOUSEKEY:
menu_setkey(3);	menu_setkey(3);
keystat_resetjoykey();	keystat_resetjoykey();
	update \|= SYS_UPDATECFG;
break;	break;

case IDM_XSHIFT:	case IDM_XSHIFT:
menu_setxshift(np2cfg.XSHIFT ^ 1);	menu_setxshift(np2cfg.XSHIFT ^ 1);
keystat_forcerelease(0x70);	keystat_forcerelease(0x70);
	update \|= SYS_UPDATECFG;
break;	break;

case IDM_XCTRL:	case IDM_XCTRL:
menu_setxshift(np2cfg.XSHIFT ^ 2);	menu_setxshift(np2cfg.XSHIFT ^ 2);
keystat_forcerelease(0x74);	keystat_forcerelease(0x74);
	update \|= SYS_UPDATECFG;
break;	break;

case IDM_XGRPH:	case IDM_XGRPH:
menu_setxshift(np2cfg.XSHIFT ^ 4);	menu_setxshift(np2cfg.XSHIFT ^ 4);
keystat_forcerelease(0x73);	keystat_forcerelease(0x73);
	update \|= SYS_UPDATECFG;
	break;

	case IDM_F11KANA:
	menu_setf11key(0);
	mackbd_resetf11();
	update \|= SYS_UPDATEOSCFG;
	break;

	case IDM_F11STOP:
	menu_setf11key(1);
	mackbd_resetf11();
	update \|= SYS_UPDATEOSCFG;
	break;

	case IDM_F11NFER:
	menu_setf11key(3);
	mackbd_resetf11();
	update \|= SYS_UPDATEOSCFG;
	break;

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

case IDM_F12MOUSE:	case IDM_F12MOUSE:
menu_setf12copy(0);	menu_setf12key(0);
keystat_resetcopyhelp();	mackbd_resetf12();
update \|= SYS_UPDATECFG;	update \|= SYS_UPDATEOSCFG;
break;	break;

case IDM_F12COPY:	case IDM_F12COPY:
menu_setf12copy(1);	menu_setf12key(1);
keystat_resetcopyhelp();	mackbd_resetf12();
update \|= SYS_UPDATECFG;	update \|= SYS_UPDATEOSCFG;
break;	break;

case IDM_F12STOP:	case IDM_F12XFER:
menu_setf12copy(2);	menu_setf12key(3);
keystat_resetcopyhelp();	mackbd_resetf12();
update \|= SYS_UPDATECFG;	update \|= SYS_UPDATEOSCFG;
	break;

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

case IDM_BEEPOFF:	case IDM_BEEPOFF:
Line 396 static void HandleMenuChoice(long wParam	Line 487 static void HandleMenuChoice(long wParam
update \|= SYS_UPDATECFG;	update \|= SYS_UPDATECFG;
break;	break;

	case IDM_AMD98:
	menu_setsound(0x80);
	update \|= SYS_UPDATECFG;
	break;

	case IDM_JASTSND:
	menu_setjastsnd(np2oscfg.jastsnd ^ 1);
	update \|= SYS_UPDATEOSCFG;
	break;

case IDM_SEEKSND:	case IDM_SEEKSND:
menu_setmotorflg(np2cfg.MOTOR ^ 1);	menu_setmotorflg(np2cfg.MOTOR ^ 1);
update \|= SYS_UPDATECFG;	update \|= SYS_UPDATECFG;
Line 425 static void HandleMenuChoice(long wParam	Line 526 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 542 static void eventproc(EventRecord *event	Line 647 static void eventproc(EventRecord *event
break;	break;
}	}
#if !TARGET_API_MAC_CARBON	#if !TARGET_API_MAC_CARBON
if ((keycode == 0x6f) && (np2oscfg.F12COPY == 0)) {	if ((keycode == 0x6f) && (np2oscfg.F12KEY == 0)) {
HandleMenuChoice(IDM_MOUSE);	HandleMenuChoice(IDM_MOUSE);
break;	break;
}	}
#endif	#endif
if (event->modifiers & cmdKey) {	if (event->modifiers & cmdKey) {
	#if !TARGET_API_MAC_CARBON
	if (mackbd_keydown(keycode, TRUE)) {
	break;
	}
	#endif
soundmng_stop();	soundmng_stop();
mousemng_disable(MOUSEPROC_MACUI);	mousemng_disable(MOUSEPROC_MACUI);
	#if TARGET_API_MAC_CARBON
	HandleMenuChoice(MenuEvent(event));
	#else
HandleMenuChoice(MenuKey(event->message & charCodeMask));	HandleMenuChoice(MenuKey(event->message & charCodeMask));
	#endif
mousemng_enable(MOUSEPROC_MACUI);	mousemng_enable(MOUSEPROC_MACUI);
soundmng_play();	soundmng_play();
}	}
else {	else {
mackbd_keydown(keycode);	mackbd_keydown(keycode, FALSE);
}	}
break;	break;

Line 567 static void eventproc(EventRecord *event	Line 681 static void eventproc(EventRecord *event
mousemng_buttonevent(MOUSEMNG_LEFTUP);	mousemng_buttonevent(MOUSEMNG_LEFTUP);
mousemng_buttonevent(MOUSEMNG_RIGHTUP);	mousemng_buttonevent(MOUSEMNG_RIGHTUP);
break;	break;

	case activateEvt:
	mackbd_activate((event->modifiers & activeFlag)?TRUE:FALSE);
	break;
}	}
}	}

Line 624 static int flagload(const char *ext) {	Line 742 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 642 int main(int argc, char *argv[]) {	Line 760 int main(int argc, char *argv[]) {
Rect wRect;	Rect wRect;
EventRecord event;	EventRecord event;
UINT t;	UINT t;
	GrafPtr saveport;
	Point pt;

dosio_init();	dosio_init();
file_setcd(target);	file_setcd(target);
Line 654 int main(int argc, char *argv[]) {	Line 774 int main(int argc, char *argv[]) {

TRACEINIT();	TRACEINIT();

SetRect(&wRect, 100, 100, 100, 100);	keystat_initialize();

	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);
if (!hWndMain) {	if (!hWndMain) {
Line 673 int main(int argc, char *argv[]) {	Line 795 int main(int argc, char *argv[]) {
menu_setframe(np2oscfg.DRAW_SKIP);	menu_setframe(np2oscfg.DRAW_SKIP);
menu_setkey(0);	menu_setkey(0);
menu_setxshift(0);	menu_setxshift(0);
menu_setf12copy(np2oscfg.F12COPY);	menu_setf11key(np2oscfg.F11KEY);
	menu_setf12key(np2oscfg.F12KEY);
menu_setbeepvol(np2cfg.BEEP_VOL);	menu_setbeepvol(np2cfg.BEEP_VOL);
menu_setsound(np2cfg.SOUND_SW);	menu_setsound(np2cfg.SOUND_SW);
	menu_setjastsnd(np2oscfg.jastsnd);
menu_setmotorflg(np2cfg.MOTOR);	menu_setmotorflg(np2cfg.MOTOR);
menu_setextmem(np2cfg.EXTMEM);	menu_setextmem(np2cfg.EXTMEM);
menu_setdispclk(np2oscfg.DISPCLK);	menu_setdispclk(np2oscfg.DISPCLK);
Line 786 int main(int argc, char *argv[]) {	Line 910 int main(int argc, char *argv[]) {
}	}
}	}
}	}

	GetPort(&saveport);
	#if TARGET_API_MAC_CARBON
	SetPortWindowPort(hWndMain);
	#else
	SetPort(hWndMain);
	#endif
	pt.h = 0;
	pt.v = 0;
	LocalToGlobal(&pt);
	SetPort(saveport);
	if ((np2oscfg.posx != pt.h) \|\| (np2oscfg.posy != pt.v)) {
	np2oscfg.posx = pt.h;
	np2oscfg.posy = pt.v;
	sysmng_update(SYS_UPDATEOSCFG);
	}

np2running = FALSE;	np2running = FALSE;

pccore_cfgupdate();	pccore_cfgupdate();

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

Removed from v.1.12
changed lines
	Added in v.1.31