--- np2/macosx/np2.cpp	2004/01/31 19:45:25	1.50
+++ np2/macosx/np2.cpp	2004/03/02 23:23:06	1.55
@@ -38,14 +38,29 @@
 #include	"np2opening.h"
 #include	"toolwin.h"
 #include	"aboutdlg.h"
+#include	"keystat.h"
 
-#include	<QuickTime/QuickTime.h>
 #define	USE_RESUME
 #define	NP2OPENING
 // #define	OPENING_WAIT	1500
 
 
-		NP2OSCFG	np2oscfg = {"Neko Project IIx", -1, -1, 0, 0, 0, 0, 0, 0, 0, 1, 0};
+		NP2OSCFG	np2oscfg = {"Neko Project IIx",						//titles
+								-1,										//winx
+								-1,										//winy
+								0,										//NOWAIT
+								0,										//DRAW_SKIP
+								0,										//DISPCLK
+								0,										//F11KEY
+								0,										//F12KEY
+								0,										//MOUSE_SW
+								0,										//JOYPAD1
+								{5, 0, 0x3e, 19200, "", "", "GM", ""},  //mpu
+								0,										//confirm
+								0,										//resume
+								1,										//toolwin
+								0,										//jastsnd
+								0};										//I286SAVE
 
 		WindowPtr	hWndMain;
 		BOOL		np2running;
@@ -185,7 +200,7 @@ static void changescreen(BYTE mode) {
 	}
 }
 
-static void HandleMenuChoice(long wParam) {
+void HandleMenuChoice(long wParam) {
 
 	UINT	update;
 
@@ -436,6 +451,12 @@ static void HandleMenuChoice(long wParam
 			update |= SYS_UPDATEOSCFG;
 			break;
 
+		case IDM_F11USER:
+			menu_setf11key(4);
+			mackbd_resetf11();
+			update |= SYS_UPDATEOSCFG;
+			break;
+
 		case IDM_F12MOUSE:
 			menu_setf12key(0);
 			mackbd_resetf12();
@@ -460,6 +481,12 @@ static void HandleMenuChoice(long wParam
 			update |= SYS_UPDATEOSCFG;
 			break;
 
+		case IDM_F12USER:
+			menu_setf12key(4);
+			mackbd_resetf12();
+			update |= SYS_UPDATEOSCFG;
+			break;
+
 		case IDM_BEEPOFF:
 			menu_setbeepvol(0);
 			beep_setvol(0);
@@ -695,11 +722,11 @@ static void flagload(const char *ext) {
     ret = IDOK;
 	getstatfilename(path, ext, sizeof(path));
 	r = statsave_check(path, buf, sizeof(buf));
-	if (r & (~NP2FLAG_DISKCHG)) {
+	if (r & (~STATFLAG_DISKCHG)) {
 		ResumeErrorDialogProc();
 		ret = IDCANCEL;
 	}
-	else if (r & NP2FLAG_DISKCHG) {
+	else if (r & STATFLAG_DISKCHG) {
 		ret = ResumeWarningDialogProc(buf);
 	}
 	if (ret == IDOK) {
@@ -730,7 +757,9 @@ int main(int argc, char *argv[]) {
 
 	TRACEINIT();
     
-    toolwin_readini();
+	keystat_initialize();
+	
+	toolwin_readini();
     if (!(setupMainWindow())) {
         return(0);
     }
@@ -778,7 +807,7 @@ int main(int argc, char *argv[]) {
 	S98_init();
 
     hid_init();
-#ifndef SUPPORT_WAVEMIX
+#ifndef SUPPORT_SWSEEKSND
 	if (soundmng_initialize() == SUCCESS) {
 		soundmng_pcmvolume(SOUND_PCMSEEK, np2cfg.MOTORVOL);
 		soundmng_pcmvolume(SOUND_PCMSEEK1, np2cfg.MOTORVOL);
@@ -902,7 +931,7 @@ int main(int argc, char *argv[]) {
 #if defined(NP2GCC)
 	mousemng_disable(MOUSEPROC_SYSTEM);
 #endif
-#ifndef SUPPORT_WAVEMIX
+#ifndef SUPPORT_SWSEEKSND
 	soundmng_deinitialize();
 #endif
 	scrnmng_destroy();
@@ -977,6 +1006,7 @@ static pascal OSStatus np2appevent (Even
             switch (whatHappened)
             {
                 case kEventMouseMoved:
+                case kEventMouseDragged:
                     GetEventParameter (event, kEventParamMouseDelta, typeHIPoint, NULL, sizeof(HIPoint), NULL, &delta);
                     mousemng_callback(delta);
                     result = noErr;
@@ -1122,6 +1152,7 @@ static const EventTypeSpec appEventList[
 				{kEventClassMouse,		kEventMouseDown},
 #if defined(NP2GCC)
 				{kEventClassMouse,		kEventMouseMoved},
+				{kEventClassMouse,		kEventMouseDragged},
 				{kEventClassMouse,		kEventMouseUp},
 #endif
 				{kEventClassKeyboard,	kEventRawKeyModifiersChanged},
@@ -1202,7 +1233,7 @@ static void toggleFullscreen(void) {
     static bool toolwin = false;
     MenuRef	menu = GetMenuRef(IDM_SCREEN);
     Rect	bounds;
-    short	w = 640, h = 480;
+    short	w, h;
 
     soundmng_stop();
     if (!(scrnmode & SCRNMODE_FULLSCREEN)) {
@@ -1210,12 +1241,14 @@ static void toggleFullscreen(void) {
         GetWindowBounds(hWndMain, kWindowContentRgn, &bounds);
         backupwidth = bounds.right - bounds.left;
         backupheight = bounds.bottom - bounds.top;
+		w = backupwidth;
+		h = backupheight;
         toolwin = np2oscfg.toolwin;
         toolwin_close();
         np2oscfg.winx = bounds.left;
         np2oscfg.winy = bounds.top;
         DisposeWindow(hWndMain);
-        BeginFullScreen(&bkfullscreen, 0, &w, &h, &hWndMain, NULL, fullScreenAllowEvents | fullScreenCaptureDisplay);	
+        BeginFullScreen(&bkfullscreen, 0, &w, &h, &hWndMain, NULL, fullScreenAllowEvents);	
         DisableMenuItem(menu, IDM_ROLNORMAL);
         DisableMenuItem(menu, IDM_ROLLEFT);
         DisableMenuItem(menu, IDM_ROLRIGHT);
@@ -1248,7 +1281,3 @@ static void toggleFullscreen(void) {
     CheckMenuItem(GetMenuHandle(IDM_SCREEN), LoWord(IDM_FULLSCREEN), scrnmode & SCRNMODE_FULLSCREEN);
     soundmng_play();
 }
-
-void recieveCommand(long param) {
-    HandleMenuChoice(param);
-}