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.8 and 1.12

version 1.8, 2003/10/25 09:08:24	version 1.12, 2003/11/09 23:42:06
Line 4	Line 4
#include "np2.h"	#include "np2.h"
#include "dosio.h"	#include "dosio.h"
#include "commng.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 29	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 100 static void InitToolBox(void) {	Line 98 static void InitToolBox(void) {

static void MenuBarInit(void) {	static void MenuBarInit(void) {

Handle hMenu;	Handle hdl;
MenuHandle happlemenu;	MenuHandle hmenu;

hMenu = GetNewMBar(IDM_MAINMENU);	hdl = GetNewMBar(IDM_MAINMENU);
if (!hMenu) {	if (hdl == NULL) {
ExitToShell();	ExitToShell();
}	}
SetMenuBar(hMenu);	SetMenuBar(hdl);
happlemenu = GetMenuHandle(IDM_APPLE);	hmenu = GetMenuHandle(IDM_APPLE);
if (happlemenu) {	if (hmenu) {
AppendResMenu(happlemenu, 'DRVR');	AppendResMenu(hmenu, 'DRVR');
}	}
InsertMenu(GetMenu(IDM_SASI1), -1);	InsertMenu(GetMenu(IDM_SASI1), -1);
InsertMenu(GetMenu(IDM_SASI2), -1);	InsertMenu(GetMenu(IDM_SASI2), -1);
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);

	#if TARGET_API_MAC_CARBON
	hmenu = GetMenuHandle(IDM_FDD2);
	SetItemCmd(hmenu, LoWord(IDM_FDD2OPEN), 'D');
	SetMenuItemModifiers(hmenu, LoWord(IDM_FDD2OPEN), kMenuOptionModifier);
	SetItemCmd(hmenu, LoWord(IDM_FDD2EJECT), 'E');
	SetMenuItemModifiers(hmenu, LoWord(IDM_FDD2EJECT), kMenuOptionModifier);
	hmenu = GetMenuHandle(IDM_SASI2);
	SetItemCmd(hmenu, LoWord(IDM_FDD2OPEN), 'O');
	SetMenuItemModifiers(hmenu, LoWord(IDM_SASI2OPEN), kMenuOptionModifier);
	#else
	EnableItem(GetMenuHandle(IDM_DEVICE), LoWord(IDM_MOUSE));
	EnableItem(GetMenuHandle(IDM_KEYBOARD), LoWord(IDM_F12MOUSE));
	#endif
DrawMenuBar();	DrawMenuBar();
}	}

Line 250 static void HandleMenuChoice(long wParam	Line 262 static void HandleMenuChoice(long wParam
dialog_scropt();	dialog_scropt();
break;	break;

#if defined(NP2GCC)
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 471 static void HandleMouseDown(EventRecord	Line 487 static void HandleMouseDown(EventRecord
case inMenuBar:	case inMenuBar:
if (np2running) {	if (np2running) {
soundmng_stop();	soundmng_stop();
	mousemng_disable(MOUSEPROC_MACUI);
HandleMenuChoice(MenuSelect(pevent->where));	HandleMenuChoice(MenuSelect(pevent->where));
	mousemng_enable(MOUSEPROC_MACUI);
	soundmng_play();
}	}
break;	break;

Line 492 static void HandleMouseDown(EventRecord	Line 511 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 511 static void HandleMouseDown(EventRecord	Line 524 static void HandleMouseDown(EventRecord

static void eventproc(EventRecord *event) {	static void eventproc(EventRecord *event) {

	int keycode;

	keycode = (event->message & keyCodeMask) >> 8;
switch(event->what) {	switch(event->what) {
case mouseDown:	case mouseDown:
HandleMouseDown(event);	HandleMouseDown(event);
Line 522 static void eventproc(EventRecord *event	Line 538 static void eventproc(EventRecord *event

case keyDown:	case keyDown:
case autoKey:	case autoKey:
if (np2running) {	if (!np2running) {
mackbd_f12down(((event->message) & keyCodeMask) >> 8);	break;
if (event->modifiers & cmdKey) {	}
HandleMenuChoice(MenuKey(event->message & charCodeMask));	#if !TARGET_API_MAC_CARBON
}	if ((keycode == 0x6f) && (np2oscfg.F12COPY == 0)) {
	HandleMenuChoice(IDM_MOUSE);
	break;
	}
	#endif
	if (event->modifiers & cmdKey) {
	soundmng_stop();
	mousemng_disable(MOUSEPROC_MACUI);
	HandleMenuChoice(MenuKey(event->message & charCodeMask));
	mousemng_enable(MOUSEPROC_MACUI);
	soundmng_play();
	}
	else {
	mackbd_keydown(keycode);
}	}
break;	break;

case keyUp:	case keyUp:
mackbd_f12up(((event->message) & keyCodeMask) >> 8);	mackbd_keyup(keycode);
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 677 int main(int argc, char *argv[]) {	Line 705 int main(int argc, char *argv[]) {
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 698 int main(int argc, char *argv[]) {	Line 725 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 719 int main(int argc, char *argv[]) {	Line 743 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 734 int main(int argc, char *argv[]) {	Line 755 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 758 int main(int argc, char *argv[]) {	Line 776 int main(int argc, char *argv[]) {
else {	else {
timing_setcount(cnt - framecnt);	timing_setcount(cnt - framecnt);
}	}
framecnt = 0;	framereset();
}	}
}	}
else {	else {
Line 782 int main(int argc, char *argv[]) {	Line 800 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.8
changed lines
	Added in v.1.12