np2/macosx/np2.cpp - diff

Return to np2.cpp CVS log

Up to [RetroPC.NET] / np2 / macosx

Diff for /np2/macosx/np2.cpp between versions 1.4 and 1.10

version 1.4, 2003/10/17 07:17:20	version 1.10, 2003/10/22 16:40:45
Line 27	Line 27
#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


	#if defined(NP2GCC)
	NP2OSCFG np2oscfg = {0, 2, 0, 0, 0, 0};
	#else
NP2OSCFG np2oscfg = {0, 2, 0, 0, 0};	NP2OSCFG np2oscfg = {0, 2, 0, 0, 0};
	#endif

WindowPtr hWndMain;	WindowPtr hWndMain;
BOOL np2running;	BOOL np2running;
Line 115 static void MenuBarInit(void) {	Line 122 static void MenuBarInit(void) {
DrawMenuBar();	DrawMenuBar();
}	}


static void changescreen(BYTE mode) {	static void changescreen(BYTE mode) {

(void)mode;	(void)mode;
}	}


static void HandleMenuChoice(long wParam) {	static void HandleMenuChoice(long wParam) {

UINT update;	UINT update;
Line 241 static void HandleMenuChoice(long wParam	Line 246 static void HandleMenuChoice(long wParam
update \|= SYS_UPDATECFG;	update \|= SYS_UPDATECFG;
break;	break;

	#if defined(NP2GCC)
	case IDM_MOUSE:
	mouse_running(MOUSE_XOR);
	menu_setmouse(np2oscfg.MOUSE_SW ^ 1);
	sysmng_update(SYS_UPDATECFG);
	break;
	#endif

case IDM_KEY:	case IDM_KEY:
menu_setkey(0);	menu_setkey(0);
keystat_resetjoykey();	keystat_resetjoykey();
Line 463 static void HandleMouseDown(EventRecord	Line 476 static void HandleMouseDown(EventRecord
break;	break;

case inContent:	case inContent:
	#if defined(NP2GCC)
	if (controlKey & GetCurrentKeyModifiers() ) {
	mouse_btn(MOUSE_RIGHTDOWN);
	}
	else {
	mouse_btn(MOUSE_LEFTDOWN);
	}
	#endif
break;	break;

case inGoAway:	case inGoAway:
Line 485 static void eventproc(EventRecord *event	Line 506 static void eventproc(EventRecord *event

case keyDown:	case keyDown:
case autoKey:	case autoKey:
	mackbd_f12down(((event->message) & keyCodeMask) >> 8);
if (event->modifiers & cmdKey) {	if (event->modifiers & cmdKey) {
if (!mackbd_down(1, ((event->message) & keyCodeMask) >> 8)) {	HandleMenuChoice(MenuKey(event->message & charCodeMask));
HandleMenuChoice(MenuKey(event->message & charCodeMask));
}
}
else {
mackbd_down(0, ((event->message) & keyCodeMask) >> 8);
}	}
break;	break;

case keyUp:	case keyUp:
mackbd_up(((event->message) & keyCodeMask) >> 8);	mackbd_f12up(((event->message) & keyCodeMask) >> 8);
	break;

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


	// ----

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

if (timing_getcount() >= waitcnt) {	if (timing_getcount() >= waitcnt) {
Line 557 int main(int argc, char *argv[]) {	Line 587 int main(int argc, char *argv[]) {

initload();	initload();

	TRACEINIT();

SetRect(&wRect, 100, 100, 100, 100);	SetRect(&wRect, 100, 100, 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) {
	TRACETERM();
macossub_term();	macossub_term();
dosio_term();	dosio_term();
return(0);	return(0);
Line 586 int main(int argc, char *argv[]) {	Line 619 int main(int argc, char *argv[]) {

scrnmode = 0;	scrnmode = 0;
if (scrnmng_create(scrnmode) != SUCCESS) {	if (scrnmng_create(scrnmode) != SUCCESS) {
	TRACETERM();
macossub_term();	macossub_term();
dosio_term();	dosio_term();
DisposeWindow(hWndMain);	DisposeWindow(hWndMain);
Line 593 int main(int argc, char *argv[]) {	Line 627 int main(int argc, char *argv[]) {
}	}

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

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

Line 612 int main(int argc, char *argv[]) {	Line 652 int main(int argc, char *argv[]) {
}	}
else {	else {
if (np2oscfg.NOWAIT) {	if (np2oscfg.NOWAIT) {
	#if defined(NP2GCC)
	mouse_callback();
	#endif
mackbd_callback();	mackbd_callback();
pccore_exec(framecnt == 0);	pccore_exec(framecnt == 0);
if (np2oscfg.DRAW_SKIP) { // nowait frame skip	if (np2oscfg.DRAW_SKIP) { // nowait frame skip
Line 629 int main(int argc, char *argv[]) {	Line 672 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
mackbd_callback();	mackbd_callback();
pccore_exec(framecnt == 0);	pccore_exec(framecnt == 0);
framecnt++;	framecnt++;
Line 639 int main(int argc, char *argv[]) {	Line 685 int main(int argc, char *argv[]) {
}	}
else { // auto skip	else { // auto skip
if (!waitcnt) {	if (!waitcnt) {
	UINT cnt;
	#if defined(NP2GCC)
	mouse_callback();
	#endif
mackbd_callback();	mackbd_callback();
pccore_exec(framecnt == 0);	pccore_exec(framecnt == 0);
framecnt++;	framecnt++;
if (timing_getcount() < framecnt) {	// �ƥ��
	cnt = timing_getcount();
	if (framecnt > cnt) {
waitcnt = framecnt;	waitcnt = framecnt;
if (framemax > 1) {	if (framemax > 1) {
framemax--;	framemax--;
}	}
}	}
else if (framecnt >= framemax) {	else if (framecnt >= framemax) {
waitcnt = framecnt;
if (framemax < 12) {	if (framemax < 12) {
framemax++;	framemax++;
}	}
	if (cnt >= 12) {
	timing_init();
	}
	else {
	timing_setcount(cnt - framecnt);
	}
	framecnt = 0;
}	}
}	}
else {	else {
Line 673 int main(int argc, char *argv[]) {	Line 731 int main(int argc, char *argv[]) {
pccore_term();	pccore_term();
S98_trash();	S98_trash();

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

scrnmng_destroy();	scrnmng_destroy();

if (sys_updates & (SYS_UPDATECFG \| SYS_UPDATEOSCFG)) {	if (sys_updates & (SYS_UPDATECFG \| SYS_UPDATEOSCFG)) {

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

Removed from v.1.4
changed lines
	Added in v.1.10