--- np2/macosx/np2.cpp	2004/01/31 19:45:25	1.50
+++ np2/macosx/np2.cpp	2004/02/16 05:31:31	1.52
@@ -436,6 +436,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 +466,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);
@@ -977,6 +989,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 +1135,7 @@ static const EventTypeSpec appEventList[
 				{kEventClassMouse,		kEventMouseDown},
 #if defined(NP2GCC)
 				{kEventClassMouse,		kEventMouseMoved},
+				{kEventClassMouse,		kEventMouseDragged},
 				{kEventClassMouse,		kEventMouseUp},
 #endif
 				{kEventClassKeyboard,	kEventRawKeyModifiersChanged},
@@ -1202,7 +1216,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 +1224,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);