--- np2/macosx/np2.cpp	2003/11/24 20:44:14	1.40
+++ np2/macosx/np2.cpp	2003/12/05 17:00:09	1.44
@@ -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, 2, 0, 0, 0, 0, 0, 1, 0};
 
 		WindowPtr	hWndMain;
 		BOOL		np2running;
@@ -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_F12STOP:
-			menu_setf12copy(2);
+		case IDM_F11EQU:
+			menu_setf11key(2);
+			mackbd_resetf11();
+			update |= SYS_UPDATEOSCFG;
+			break;
+
+		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;
@@ -656,6 +674,7 @@ int main(int argc, char *argv[]) {
 
     EventRef		theEvent;
     EventTargetRef	theTarget;
+    Rect			bounds;
 #ifdef OPENING_WAIT
 	UINT32		tick;
 #endif
@@ -689,7 +708,8 @@ 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_setmotorflg(np2cfg.MOTOR);
@@ -806,6 +826,7 @@ int main(int argc, char *argv[]) {
 			}
 		}
 	}
+    
 	np2running = FALSE;
     menu_setrecording(true);
 
@@ -813,6 +834,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 +938,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 +947,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) {
@@ -1107,7 +1135,9 @@ 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);
@@ -1132,6 +1162,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);