--- np2/macosx/np2.cpp	2003/11/24 20:44:14	1.40
+++ np2/macosx/np2.cpp	2004/01/11 19:22:01	1.48
@@ -46,7 +46,7 @@
 // #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, 0, 0, 0, 0, 0, 0, 1, 0};
 
 		WindowPtr	hWndMain;
 		BOOL		np2running;
@@ -141,9 +141,9 @@ static void MenuBarInit(void) {
 	InsertMenu(GetMenu(IDM_MEMORY), -1);
     ChangeMenuAttributes(GetMenuRef(IDM_EDIT), kMenuAttrAutoDisable, 0);
     DisableAllMenuItems(GetMenuHandle(IDM_EDIT));
-    SetMenuItemModifiers(GetMenuRef(IDM_FDD2), IDM_FDD2OPEN, kMenuOptionModifier);
-    SetMenuItemModifiers(GetMenuRef(IDM_FDD2), IDM_FDD2EJECT, kMenuOptionModifier);
-    SetMenuItemModifiers(GetMenuRef(IDM_SASI2), IDM_SASI2OPEN, kMenuOptionModifier);
+    SetMenuItemModifiers(GetMenuRef(IDM_FDD2), IDM_FDD2OPEN, kMenuShiftModifier);
+    SetMenuItemModifiers(GetMenuRef(IDM_FDD2), IDM_FDD2EJECT, kMenuShiftModifier);
+    SetMenuItemModifiers(GetMenuRef(IDM_SASI2), IDM_SASI2OPEN, kMenuShiftModifier);
 	DrawMenuBar();
 #else
     OSStatus	err;
@@ -377,32 +377,50 @@ static void HandleMenuChoice(long wParam
 			update |= SYS_UPDATECFG;
 			break;
 
-		case IDM_F12MOUSE:
-			menu_setf12copy(0);
-			mackbd_resetf12();
+		case IDM_F11KANA:
+			menu_setf11key(0);
+			mackbd_resetf11();
 			update |= SYS_UPDATEOSCFG;
 			break;
 
-		case IDM_F12COPY:
-			menu_setf12copy(1);
-			mackbd_resetf12();
+		case IDM_F11STOP:
+			menu_setf11key(1);
+			mackbd_resetf11();
+			update |= SYS_UPDATEOSCFG;
+			break;
+
+		case IDM_F11EQU:
+			menu_setf11key(2);
+			mackbd_resetf11();
 			update |= SYS_UPDATEOSCFG;
 			break;
 
-		case IDM_F12STOP:
-			menu_setf12copy(2);
+		case IDM_F11NFER:
+			menu_setf11key(3);
+			mackbd_resetf11();
+			update |= SYS_UPDATEOSCFG;
+			break;
+
+		case IDM_F12MOUSE:
+			menu_setf12key(0);
 			mackbd_resetf12();
 			update |= SYS_UPDATEOSCFG;
 			break;
 
-		case IDM_F12EQU:
-			menu_setf12copy(3);
+		case IDM_F12COPY:
+			menu_setf12key(1);
 			mackbd_resetf12();
 			update |= SYS_UPDATEOSCFG;
 			break;
 
 		case IDM_F12COMMA:
-			menu_setf12copy(4);
+			menu_setf12key(2);
+			mackbd_resetf12();
+			update |= SYS_UPDATEOSCFG;
+			break;
+
+		case IDM_F12XFER:
+			menu_setf12key(3);
 			mackbd_resetf12();
 			update |= SYS_UPDATEOSCFG;
 			break;
@@ -481,6 +499,11 @@ static void HandleMenuChoice(long wParam
 			update |= SYS_UPDATECFG;
 			break;
 
+		case IDM_JASTSOUND:
+			menu_setjastsound(np2oscfg.jastsnd ^ 1);
+			update |= SYS_UPDATEOSCFG;
+			break;
+
 		case IDM_SEEKSND:
 			menu_setmotorflg(np2cfg.MOTOR ^ 1);
 			update |= SYS_UPDATECFG;
@@ -656,6 +679,7 @@ int main(int argc, char *argv[]) {
 
     EventRef		theEvent;
     EventTargetRef	theTarget;
+    Rect			bounds;
 #ifdef OPENING_WAIT
 	UINT32		tick;
 #endif
@@ -689,9 +713,11 @@ int main(int argc, char *argv[]) {
 	menu_setframe(np2oscfg.DRAW_SKIP);
 	menu_setkey(0);
 	menu_setxshift(0);
-	menu_setf12copy(np2oscfg.F12COPY);
+	menu_setf11key(np2oscfg.F11KEY);
+	menu_setf12key(np2oscfg.F12KEY);
 	menu_setbeepvol(np2cfg.BEEP_VOL);
 	menu_setsound(np2cfg.SOUND_SW);
+	menu_setjastsound(np2oscfg.jastsnd);
 	menu_setmotorflg(np2cfg.MOTOR);
 	menu_setextmem(np2cfg.EXTMEM);
 	menu_setdispclk(np2oscfg.DISPCLK);
@@ -806,6 +832,7 @@ int main(int argc, char *argv[]) {
 			}
 		}
 	}
+    
 	np2running = FALSE;
     menu_setrecording(true);
 
@@ -813,6 +840,13 @@ int main(int argc, char *argv[]) {
         toggleFullscreen();
     }
     
+	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);
+	}
+
 	pccore_cfgupdate();
 
 #if defined(USE_RESUME)
@@ -910,7 +944,7 @@ static pascal OSStatus np2appevent (Even
                     result = noErr;
                     break;
                 case kEventMouseDown:
-                    if (buttonKind == kEventMouseButtonSecondary | modif & controlKey) {
+                    if (buttonKind == kEventMouseButtonSecondary || modif & cmdKey) {
                         mousemng_buttonevent(MOUSEMNG_RIGHTDOWN);
                     }
                     else {
@@ -919,7 +953,7 @@ static pascal OSStatus np2appevent (Even
                     result=noErr;
                     break;
                 case kEventMouseUp:
-                    if (buttonKind == kEventMouseButtonSecondary | modif & controlKey) {
+                    if (buttonKind == kEventMouseButtonSecondary || modif & cmdKey) {
                         mousemng_buttonevent(MOUSEMNG_RIGHTUP);
                     }
                     else if (buttonKind == kEventMouseButtonTertiary) {
@@ -939,6 +973,22 @@ static pascal OSStatus np2appevent (Even
                 }
 #endif
                 break;
+		case kEventClassKeyboard:
+                if (GetEventKind(event)==kEventRawKeyModifiersChanged) {
+					static UInt32 backup = 0;
+                    if (modif & shiftKey) keystat_senddata(0x70);
+                    else keystat_senddata(0x70 | 0x80);
+                    if (modif & optionKey) keystat_senddata(0x73);
+                    else keystat_senddata(0x73 | 0x80);
+                    if (modif & controlKey) keystat_senddata(0x74);
+                    else keystat_senddata(0x74 | 0x80);
+                    if ((modif & alphaLock) != (backup & alphaLock)) {
+                        keystat_senddata(0x71);
+                        backup = modif;
+                    }
+                    result = noErr;
+				}
+				break;
         default:
             break; 
     }
@@ -960,7 +1010,6 @@ static pascal OSStatus np2windowevent(Ev
     eventClass = GetEventClass(event);
     whatHappened = GetEventKind(event);
         
-    static UInt32 backup = 0;
     switch (eventClass)
     {        
         case kEventClassKeyboard:
@@ -991,19 +1040,6 @@ static pascal OSStatus np2windowevent(Ev
                     }
                     result = noErr;
                     break;
-                case kEventRawKeyModifiersChanged:
-                    if (modif & shiftKey) keystat_senddata(0x70);
-                    else keystat_senddata(0x70 | 0x80);
-                    if (modif & optionKey) keystat_senddata(0x73);
-                    else keystat_senddata(0x73 | 0x80);
-                    if (modif & controlKey) keystat_senddata(0x74);
-                    else keystat_senddata(0x74 | 0x80);
-                    if ((modif & alphaLock) != (backup & alphaLock)) {
-                        keystat_senddata(0x71);
-                        backup = modif;
-                    }
-                    result = noErr;
-                    break;
                 default: 
                     break;             
             }
@@ -1050,6 +1086,7 @@ static const EventTypeSpec appEventList[
 				{kEventClassMouse,		kEventMouseMoved},
 				{kEventClassMouse,		kEventMouseUp},
 #endif
+				{kEventClassKeyboard,	kEventRawKeyModifiersChanged},
 			};
 
 static const EventTypeSpec windEventList[] = {
@@ -1062,7 +1099,6 @@ static const EventTypeSpec windEventList
 				{kEventClassKeyboard,	kEventRawKeyDown},
 				{kEventClassKeyboard,	kEventRawKeyUp},
 				{kEventClassKeyboard,	kEventRawKeyRepeat},
-				{kEventClassKeyboard,	kEventRawKeyModifiersChanged},
 			};
 
 
@@ -1107,11 +1143,17 @@ static bool setupMainWindow(void) {
 	}
 	SizeWindow(hWndMain, 640, 400, TRUE);
 #endif
-
+    if (np2oscfg.winx != -1 && np2oscfg.winy != -1) {
+        MoveWindow(hWndMain, np2oscfg.winx, np2oscfg.winy, false);
+    }
     setUpCarbonEvent();
     if (backupwidth) scrnmng_setwidth(0, backupwidth);
     if (backupheight) scrnmng_setheight(0, backupheight);
-    SetWindowTitleWithCFString(hWndMain, CFStringCreateWithCString(NULL, np2oscfg.titles, kCFStringEncodingUTF8));
+	CFStringRef title = CFStringCreateWithCString(NULL, np2oscfg.titles, kCFStringEncodingUTF8);
+	if (title) {
+		SetWindowTitleWithCFString(hWndMain, title);
+		CFRelease(title);
+	}
 	ShowWindow(hWndMain);
     return(true);
 }
@@ -1132,6 +1174,8 @@ static void toggleFullscreen(void) {
         backupheight = bounds.bottom - bounds.top;
         toolwin = np2oscfg.toolwin;
         toolwin_close();
+        np2oscfg.winx = bounds.left;
+        np2oscfg.winy = bounds.top;
         DisposeWindow(hWndMain);
         BeginFullScreen(&bkfullscreen, 0, &w, &h, &hWndMain, NULL, fullScreenAllowEvents);	
         DisableMenuItem(menu, IDM_ROLNORMAL);