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.38 and 1.43

version 1.38, 2003/11/13 18:17:42	version 1.43, 2003/12/04 17:48:17
Line 46	Line 46
// #define OPENING_WAIT 1500	// #define OPENING_WAIT 1500


NP2OSCFG np2oscfg = {"Neko Project IIx", 0, 2, 0, 0, 0, 0, 1, 0};	NP2OSCFG np2oscfg = {"Neko Project IIx", -1, -1, 0, 2, 0, 0, 0, 0, 0, 1, 0};

WindowPtr hWndMain;	WindowPtr hWndMain;
BOOL np2running;	BOOL np2running;
Line 93 pascal OSErr OpenAppleEventHandler(const	Line 93 pascal OSErr OpenAppleEventHandler(const
DescType rtype;	DescType rtype;
AEKeyword key;	AEKeyword key;
AEDescList dlist;	AEDescList dlist;
	OSErr err = noErr;

if(!AEGetParamDesc(event,keyDirectObject,typeAEList,&dlist)) {	if(!AEGetParamDesc(event,keyDirectObject,typeAEList,&dlist)) {
AECountItems( &dlist,&ct );	AECountItems( &dlist,&ct );
for( i=1;i<=ct;i++ ) {	for( i=1;i<=ct;i++ ) {
pp=&fsc;	pp=&fsc;
if (!AEGetNthPtr( &dlist,i,typeFSS,&key,&rtype,(Ptr)pp,(long)sizeof(FSSpec),&len)) {	if (!AEGetNthPtr( &dlist,i,typeFSS,&key,&rtype,(Ptr)pp,(long)sizeof(FSSpec),&len)) {
setDropFile(fsc, i-1);	err = setDropFile(fsc, i-1);
}	}
}	}
AEDisposeDesc( &dlist );	AEDisposeDesc( &dlist );
}	}
return( 0 );	return(err);
}	}


Line 337 static void HandleMenuChoice(long wParam	Line 338 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;	break;

case IDM_F12MOUSE:	case IDM_F11KANA:
menu_setf12copy(0);	menu_setf11key(0);
mackbd_resetf12();	mackbd_resetf11();
update \|= SYS_UPDATECFG;	update \|= SYS_UPDATEOSCFG;
break;	break;

case IDM_F12COPY:	case IDM_F11STOP:
menu_setf12copy(1);	menu_setf11key(1);
mackbd_resetf12();	mackbd_resetf11();
update \|= SYS_UPDATECFG;	update \|= SYS_UPDATEOSCFG;
	break;

	case IDM_F11EQU:
	menu_setf11key(2);
	mackbd_resetf11();
	update \|= SYS_UPDATEOSCFG;
break;	break;

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

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

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

case IDM_F12COMMA:	case IDM_F12COMMA:
menu_setf12copy(4);	menu_setf12key(2);
mackbd_resetf12();	mackbd_resetf12();
update \|= SYS_UPDATECFG;	update \|= SYS_UPDATEOSCFG;
	break;

	case IDM_F12XFER:
	menu_setf12key(3);
	mackbd_resetf12();
	update \|= SYS_UPDATEOSCFG;
break;	break;

case IDM_BEEPOFF:	case IDM_BEEPOFF:
Line 648 int main(int argc, char *argv[]) {	Line 674 int main(int argc, char *argv[]) {

EventRef theEvent;	EventRef theEvent;
EventTargetRef theTarget;	EventTargetRef theTarget;
	Rect bounds;
#ifdef OPENING_WAIT	#ifdef OPENING_WAIT
UINT32 tick;	UINT32 tick;
#endif	#endif
Line 681 int main(int argc, char *argv[]) {	Line 708 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_setmotorflg(np2cfg.MOTOR);	menu_setmotorflg(np2cfg.MOTOR);
Line 798 int main(int argc, char *argv[]) {	Line 826 int main(int argc, char *argv[]) {
}	}
}	}
}	}

	GetWindowBounds(hWndMain, kWindowGlobalPortRgn, &bounds);
	if ((np2oscfg.winx != bounds.left) \|\| (np2oscfg.winy != bounds.top)) {
	np2oscfg.winx = bounds.left;
	np2oscfg.winy = bounds.top;
	sysmng_update(SYS_UPDATEOSCFG);
	}

np2running = FALSE;	np2running = FALSE;
menu_setrecording(true);	menu_setrecording(true);

Line 1099 static bool setupMainWindow(void) {	Line 1135 static bool setupMainWindow(void) {
}	}
SizeWindow(hWndMain, 640, 400, TRUE);	SizeWindow(hWndMain, 640, 400, TRUE);
#endif	#endif
	if (np2oscfg.winx != -1 && np2oscfg.winy != -1) {
	MoveWindow(hWndMain, np2oscfg.winx, np2oscfg.winy, false);
	}
setUpCarbonEvent();	setUpCarbonEvent();
if (backupwidth) scrnmng_setwidth(0, backupwidth);	if (backupwidth) scrnmng_setwidth(0, backupwidth);
if (backupheight) scrnmng_setheight(0, backupheight);	if (backupheight) scrnmng_setheight(0, backupheight);

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

Removed from v.1.38
changed lines
	Added in v.1.43