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.6 and 1.11

version 1.6, 2003/10/24 08:07:33	version 1.11, 2003/11/09 21:57:04
Line 3	Line 3
#include "strres.h"	#include "strres.h"
#include "np2.h"	#include "np2.h"
#include "dosio.h"	#include "dosio.h"
	#include "commng.h"
	#include "mousemng.h"
#include "scrnmng.h"	#include "scrnmng.h"
#include "soundmng.h"	#include "soundmng.h"
#include "sysmng.h"	#include "sysmng.h"
Line 28	Line 30
#include "fddfile.h"	#include "fddfile.h"
#include "statsave.h"	#include "statsave.h"

#if defined(NP2GCC)
#include "mousemng.h"
#endif

#define USE_RESUME	#define USE_RESUME


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

WindowPtr hWndMain;	WindowPtr hWndMain;
BOOL np2running;	BOOL np2running;
Line 116 static void MenuBarInit(void) {	Line 115 static void MenuBarInit(void) {
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);
	SetMenuItemModifiers(GetMenuHandle(IDM_FDD2), LoWord(IDM_FDD2OPEN),
	kMenuOptionModifier);
	SetMenuItemModifiers(GetMenuHandle(IDM_FDD2), LoWord(IDM_FDD2EJECT),
	kMenuOptionModifier);
	SetMenuItemModifiers(GetMenuHandle(IDM_SASI2), LoWord(IDM_SASI2OPEN),
	kMenuOptionModifier);
	#if TARGET_API_MAC_CARBON
	DisableMenuItem(GetMenuHandle(IDM_DEVICE), LoWord(IDM_MOUSE));
	DisableMenuItem(GetMenuHandle(IDM_KEYBOARD), LoWord(IDM_F12MOUSE));
	#endif
DrawMenuBar();	DrawMenuBar();
}	}

Line 245 static void HandleMenuChoice(long wParam	Line 254 static void HandleMenuChoice(long wParam
update \|= SYS_UPDATECFG;	update \|= SYS_UPDATECFG;
break;	break;

#if defined(NP2GCC)	case IDM_SCREENOPT:
	dialog_scropt();
	break;

case IDM_MOUSE:	case IDM_MOUSE:
mouse_running(MOUSE_XOR);	mousemng_toggle(MOUSEPROC_SYSTEM);
menu_setmouse(np2oscfg.MOUSE_SW ^ 1);	menu_setmouse(np2oscfg.MOUSE_SW ^ 1);
sysmng_update(SYS_UPDATECFG);	sysmng_update(SYS_UPDATECFG);
break;	break;
#endif
	case IDM_MIDIPANIC:
	rs232c_midipanic();
	mpu98ii_midipanic();
	pc9861k_midipanic();
	break;

case IDM_KEY:	case IDM_KEY:
menu_setkey(0);	menu_setkey(0);
Line 467 static void HandleMouseDown(EventRecord	Line 484 static void HandleMouseDown(EventRecord
if (np2running) {	if (np2running) {
soundmng_stop();	soundmng_stop();
HandleMenuChoice(MenuSelect(pevent->where));	HandleMenuChoice(MenuSelect(pevent->where));
	soundmng_play();
}	}
break;	break;

Line 487 static void HandleMouseDown(EventRecord	Line 505 static void HandleMouseDown(EventRecord
break;	break;

case inContent:	case inContent:
#if defined(NP2GCC)	mousemng_buttonevent((pevent->modifiers & (1 << 12))
if (controlKey & GetCurrentKeyModifiers() ) {	?MOUSEMNG_RIGHTDOWN:MOUSEMNG_LEFTDOWN);
mouse_btn(MOUSE_RIGHTDOWN);
}
else {
mouse_btn(MOUSE_LEFTDOWN);
}
#endif
break;	break;

case inGoAway:	case inGoAway:
Line 520 static void eventproc(EventRecord *event	Line 532 static void eventproc(EventRecord *event
if (np2running) {	if (np2running) {
mackbd_f12down(((event->message) & keyCodeMask) >> 8);	mackbd_f12down(((event->message) & keyCodeMask) >> 8);
if (event->modifiers & cmdKey) {	if (event->modifiers & cmdKey) {
	soundmng_stop();
HandleMenuChoice(MenuKey(event->message & charCodeMask));	HandleMenuChoice(MenuKey(event->message & charCodeMask));
	soundmng_play();
}	}
}	}
break;	break;
Line 529 static void eventproc(EventRecord *event	Line 543 static void eventproc(EventRecord *event
mackbd_f12up(((event->message) & keyCodeMask) >> 8);	mackbd_f12up(((event->message) & keyCodeMask) >> 8);
break;	break;

#if defined(NP2GCC)	case mouseUp:
case mouseUp:	mousemng_buttonevent(MOUSEMNG_LEFTUP);
if (controlKey & GetCurrentKeyModifiers()) {	mousemng_buttonevent(MOUSEMNG_RIGHTUP);
mouse_btn(MOUSE_RIGHTUP);
}
else {
mouse_btn(MOUSE_LEFTUP);
}
break;	break;
#endif
}	}
}	}


// ----	// ----

	static void framereset(void) {

	framecnt = 0;
	if (np2oscfg.DISPCLK & 3) {
	if (sysmng_workclockrenewal()) {
	sysmng_updatecaption(3);
	}
	}
	}

static void processwait(UINT waitcnt) {	static void processwait(UINT waitcnt) {

if (timing_getcount() >= waitcnt) {	if (timing_getcount() >= waitcnt) {
timing_setcount(0);	timing_setcount(0);
framecnt = 0;	framereset();
if (np2oscfg.DISPCLK & 3) {
if (sysmng_workclockrenewal()) {
sysmng_updatecaption(3);
}
}
}	}
}	}

Line 666 int main(int argc, char *argv[]) {	Line 679 int main(int argc, char *argv[]) {
}	}
}	}

	commng_initialize();
sysmng_initialize();	sysmng_initialize();
mackbd_initialize();	mackbd_initialize();
pccore_init();	pccore_init();
S98_init();	S98_init();

#if defined(NP2GCC)	mousemng_initialize();
if (np2oscfg.MOUSE_SW) { // ver0.30	if (np2oscfg.MOUSE_SW) { // ver0.30
mouse_running(MOUSE_ON);	mousemng_enable(MOUSEPROC_SYSTEM);
}	}
#endif
// scrndraw_redraw();	// scrndraw_redraw();
pccore_reset();	pccore_reset();

Line 692 int main(int argc, char *argv[]) {	Line 705 int main(int argc, char *argv[]) {
}	}
else {	else {
if (np2oscfg.NOWAIT) {	if (np2oscfg.NOWAIT) {
#if defined(NP2GCC)
mouse_callback();
#endif
soundmng_play();
mackbd_callback();	mackbd_callback();
	mousemng_callback();
pccore_exec(framecnt == 0);	pccore_exec(framecnt == 0);
if (np2oscfg.DRAW_SKIP) { // nowait frame skip	if (np2oscfg.DRAW_SKIP) { // nowait frame skip
framecnt++;	framecnt++;
Line 713 int main(int argc, char *argv[]) {	Line 723 int main(int argc, char *argv[]) {
}	}
else if (np2oscfg.DRAW_SKIP) { // frame skip	else if (np2oscfg.DRAW_SKIP) { // frame skip
if (framecnt < np2oscfg.DRAW_SKIP) {	if (framecnt < np2oscfg.DRAW_SKIP) {
#if defined(NP2GCC)
mouse_callback();
#endif
soundmng_play();
mackbd_callback();	mackbd_callback();
	mousemng_callback();
pccore_exec(framecnt == 0);	pccore_exec(framecnt == 0);
framecnt++;	framecnt++;
}	}
Line 728 int main(int argc, char *argv[]) {	Line 735 int main(int argc, char *argv[]) {
else { // auto skip	else { // auto skip
if (!waitcnt) {	if (!waitcnt) {
UINT cnt;	UINT cnt;
#if defined(NP2GCC)
mouse_callback();
#endif
soundmng_play();
mackbd_callback();	mackbd_callback();
	mousemng_callback();
pccore_exec(framecnt == 0);	pccore_exec(framecnt == 0);
framecnt++;	framecnt++;
cnt = timing_getcount();	cnt = timing_getcount();
Line 752 int main(int argc, char *argv[]) {	Line 756 int main(int argc, char *argv[]) {
else {	else {
timing_setcount(cnt - framecnt);	timing_setcount(cnt - framecnt);
}	}
framecnt = 0;	framereset();
}	}
}	}
else {	else {
Line 776 int main(int argc, char *argv[]) {	Line 780 int main(int argc, char *argv[]) {
pccore_term();	pccore_term();
S98_trash();	S98_trash();

#if defined(NP2GCC)	mousemng_disable(MOUSEPROC_SYSTEM);
mouse_running(MOUSE_OFF);
#endif

scrnmng_destroy();	scrnmng_destroy();

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

Removed from v.1.6
changed lines
	Added in v.1.11