--- previous/src/main.c	2018/04/24 19:25:30	1.1.1.2
+++ previous/src/main.c	2018/04/24 19:29:49	1.1.1.5
@@ -32,9 +32,12 @@ const char Main_fileid[] = "Hatari main.
 #include "nextMemory.h"
 #include "str.h"
 #include "video.h"
+#include "audio.h"
 #include "avi_record.h"
 #include "debugui.h"
 #include "clocks_timings.h"
+#include "file.h"
+#include "dsp.h"
 
 #include "hatari-glue.h"
 
@@ -42,6 +45,7 @@ const char Main_fileid[] = "Hatari main.
 #include <sys/time.h>
 #endif
 
+int nFrameSkips;
 
 bool bQuitProgram = false;                /* Flag to quit program cleanly */
 
@@ -150,7 +154,7 @@ bool Main_PauseEmulation(bool visualize)
 	if ( !bEmulationActive )
 		return false;
 
-//	Audio_EnableAudio(false);
+	//Audio_Output_Enable(false);
 	bEmulationActive = false;
 	if (visualize)
 	{
@@ -172,9 +176,11 @@ bool Main_PauseEmulation(bool visualize)
 		/* make sure msg gets shown */
 		Statusbar_Update(sdlscrn);
 
-		if (bGrabMouse && !bInFullScreen)
+		if (bGrabMouse && !bInFullScreen) {
 			/* Un-grab mouse pointer in windowed mode */
-			SDL_WM_GrabInput(SDL_GRAB_OFF);
+			SDL_SetRelativeMouseMode(SDL_FALSE);
+            SDL_SetWindowGrab(sdlWindow, SDL_FALSE);
+        }
 	}
 	return true;
 }
@@ -190,16 +196,17 @@ bool Main_UnPauseEmulation(void)
 	if ( bEmulationActive )
 		return false;
 
-//	Sound_BufferIndexNeedReset = true;
-//	Audio_EnableAudio(ConfigureParams.Sound.bEnableSound);
+	//Audio_Output_Enable(ConfigureParams.Sound.bEnableSound);
 	bEmulationActive = true;
 
 	/* Cause full screen update (to clear all) */
 	Screen_SetFullUpdate();
 
-	if (bGrabMouse)
+	if (bGrabMouse) {
 		/* Grab mouse pointer again */
-		SDL_WM_GrabInput(SDL_GRAB_ON);
+		SDL_SetRelativeMouseMode(SDL_TRUE);
+        SDL_SetWindowGrab(sdlWindow, SDL_TRUE);
+    }
 	return true;
 }
 
@@ -269,29 +276,31 @@ void Main_WaitOnVbl(void)
 	}
 
 //	FrameDuration_micro = (Sint64) ( 1000000.0 / nScreenRefreshRate + 0.5 );	/* round to closest integer */
-//	FrameDuration_micro = ClocksTimings_GetVBLDuration_micro ( ConfigureParams.System.nMachineType , nScreenRefreshRate );
-    FrameDuration_micro = 1000000/50;
+	FrameDuration_micro = ClocksTimings_GetVBLDuration_micro ( ConfigureParams.System.nMachineType , 68 );
+//      FrameDuration_micro = 1000000/50;
 	CurrentTicks = Time_GetTicks();
 
 	if ( DestTicks == 0 )					/* first call, init DestTicks */
+    {
 		DestTicks = CurrentTicks + FrameDuration_micro;
+    }
 
 	nDelay = DestTicks - CurrentTicks;
 
 	/* Do not wait if we are in fast forward mode or if we are totally out of sync */
 	if (ConfigureParams.System.bFastForward == true
-	        || nDelay < -4*FrameDuration_micro)
+	        || nDelay < -4*FrameDuration_micro || nDelay > 50*FrameDuration_micro)
 	{
 		if (ConfigureParams.System.bFastForward == true)
 		{
 			if (!nFirstMilliTick)
 				nFirstMilliTick = Main_GetTicks();
 		}
-//		if (nFrameSkips < ConfigureParams.Screen.nFrameSkips)
-//		{
-//			nFrameSkips += 1;
-			// Log_Printf(LOG_DEBUG, "Increased frameskip to %d\n", nFrameSkips);
-//		}
+		if (nFrameSkips < ConfigureParams.Screen.nFrameSkips)
+		{
+			nFrameSkips += 1;
+			Log_Printf(LOG_DEBUG, "Increased frameskip to %d\n", nFrameSkips);
+		}
 		/* Only update DestTicks for next VBL */
 		DestTicks = CurrentTicks + FrameDuration_micro;
 		return;
@@ -299,13 +308,13 @@ void Main_WaitOnVbl(void)
 	/* If automatic frameskip is enabled and delay's more than twice
 	 * the effect of single frameskip, decrease frameskip
 	 */
-//	if (nFrameSkips > 0
-//	    && ConfigureParams.Screen.nFrameSkips >= AUTO_FRAMESKIP_LIMIT
-//	    && 2*nDelay > FrameDuration_micro/nFrameSkips)
-//	{
-//		nFrameSkips -= 1;
-		// Log_Printf(LOG_DEBUG, "Decreased frameskip to %d\n", nFrameSkips);
-//	}
+	if (nFrameSkips > 0
+	    && ConfigureParams.Screen.nFrameSkips >= AUTO_FRAMESKIP_LIMIT
+	    && 2*nDelay > FrameDuration_micro/nFrameSkips)
+	{
+		nFrameSkips -= 1;
+		Log_Printf(LOG_DEBUG, "Decreased frameskip to %d\n", nFrameSkips);
+	}
 
 	if (bAccurateDelays)
 	{
@@ -325,6 +334,10 @@ void Main_WaitOnVbl(void)
 	{
 		CurrentTicks = Time_GetTicks();
 		nDelay = DestTicks - CurrentTicks;
+        /* If the delay is still bigger than one frame, somebody
+         * played tricks with the system clock and we have to abort */
+        if (nDelay > FrameDuration_micro)
+            break;
 	}
 
 //printf ( "tick %lld\n" , CurrentTicks );
@@ -366,8 +379,8 @@ static void Main_CheckForAccurateDelays(
  */
 void Main_WarpMouse(int x, int y)
 {
-	SDL_WarpMouse(x, y);                  /* Set mouse pointer to new position */
-	bIgnoreNextMouseMotion = true;        /* Ignore mouse motion event from SDL_WarpMouse */
+    SDL_WarpMouseInWindow(sdlWindow, x, y); /* Set mouse pointer to new position */
+	bIgnoreNextMouseMotion = true;          /* Ignore mouse motion event from SDL_WarpMouse */
 }
 
 
@@ -375,42 +388,28 @@ void Main_WarpMouse(int x, int y)
 /**
  * Handle mouse motion event.
  */
+SDL_Event mymouse[100];
 static void Main_HandleMouseMotion(SDL_Event *pEvent)
 {
 	int dx, dy;
-	static int ax = 0, ay = 0;
-
-	/* Ignore motion when position has changed right after a reset or TOS
-	 * (especially version 4.04) might get confused and play key clicks */
-	if (bIgnoreNextMouseMotion)
-	{
-		bIgnoreNextMouseMotion = false;
-		return;
-	}
+	int i,nb;
 
 	dx = pEvent->motion.xrel;
 	dy = pEvent->motion.yrel;
 
-	/* In zoomed low res mode, we divide dx and dy by the zoom factor so that
-	 * the ST mouse cursor stays in sync with the host mouse. However, we have
-	 * to take care of lowest bit of dx and dy which will get lost when
-	 * dividing. So we store these bits in ax and ay and add them to dx and dy
-	 * the next time. */
-	if (nScreenZoomX != 1)
-	{
-		dx += ax;
-		ax = dx % nScreenZoomX;
-		dx /= nScreenZoomX;
-	}
-	if (nScreenZoomY != 1)
-	{
-		dy += ay;
-		ay = dy % nScreenZoomY;
-		dy /= nScreenZoomY;
+	/* get all mouse event to clean the queue and sum them */
+	nb=SDL_PeepEvents(&mymouse[0], 100, SDL_GETEVENT, SDL_MOUSEMOTION, SDL_MOUSEMOTION);
+
+	for (i=0;i<nb;i++) {
+	dx += mymouse[i].motion.xrel;
+	dy += mymouse[i].motion.yrel;
 	}
 
-//	KeyboardProcessor.Mouse.dx += dx;
-//	KeyboardProcessor.Mouse.dy += dy;
+	if (bGrabMouse) {
+    	Keymap_MouseMove(dx,dy,ConfigureParams.Mouse.fLinSpeedLocked,ConfigureParams.Mouse.fExpSpeedLocked);
+	} else {
+    	Keymap_MouseMove(dx,dy,ConfigureParams.Mouse.fLinSpeedNormal,ConfigureParams.Mouse.fLinSpeedNormal);
+	}
 }
 
 
@@ -455,24 +454,39 @@ void Main_EventHandler(void)
 		}
 		switch (event.type)
 		{
-
+         case SDL_WINDOWEVENT:
+                if(event.window.event == SDL_WINDOWEVENT_CLOSE)
+                    Main_RequestQuit();
+                break;
 		 case SDL_QUIT:
 			Main_RequestQuit();
 			break;
 			
 		 case SDL_MOUSEMOTION:               /* Read/Update internal mouse position */
 			Main_HandleMouseMotion(&event);
-			bContinueProcessing = true;
+			bContinueProcessing = false;
 			break;
 
 		 case SDL_MOUSEBUTTONDOWN:
 			if (event.button.button == SDL_BUTTON_LEFT)
 			{
-//				if (Keyboard.LButtonDblClk == 0)
-//					Keyboard.bLButtonDown |= BUTTON_MOUSE;  /* Set button down flag */
+				if (ConfigureParams.Mouse.bEnableAutoGrab && !bGrabMouse) {
+					bGrabMouse = true;        /* Toggle flag */
+
+					/* If we are in windowed mode, toggle the mouse cursor mode now: */
+					if (!bInFullScreen)
+					{
+						SDL_SetRelativeMouseMode(SDL_TRUE);
+                        SDL_SetWindowGrab(sdlWindow, SDL_TRUE);
+						Main_SetTitle(MOUSE_LOCK_MSG);
+					}
+				}
+                
+                Keymap_MouseDown(true);
 			}
 			else if (event.button.button == SDL_BUTTON_RIGHT)
 			{
+                Keymap_MouseDown(false);
 //				Keyboard.bRButtonDown |= BUTTON_MOUSE;
 			}
 			else if (event.button.button == SDL_BUTTON_MIDDLE)
@@ -480,48 +494,32 @@ void Main_EventHandler(void)
 				/* Start double-click sequence in emulation time */
 //				Keyboard.LButtonDblClk = 1;
 			}
-			else if (event.button.button == SDL_BUTTON_WHEELDOWN)
-			{
-				/* Simulate pressing the "cursor down" key */
-//				IKBD_PressSTKey(0x50, true);
-			}
-			else if (event.button.button == SDL_BUTTON_WHEELUP)
-			{
-				/* Simulate pressing the "cursor up" key */
-//				IKBD_PressSTKey(0x48, true);
-			}
 			break;
 
 		 case SDL_MOUSEBUTTONUP:
 			if (event.button.button == SDL_BUTTON_LEFT)
 			{
+                Keymap_MouseUp(true);
 //				Keyboard.bLButtonDown &= ~BUTTON_MOUSE;
 			}
 			else if (event.button.button == SDL_BUTTON_RIGHT)
 			{
+                Keymap_MouseUp(false);
 //				Keyboard.bRButtonDown &= ~BUTTON_MOUSE;
 			}
-			else if (event.button.button == SDL_BUTTON_WHEELDOWN)
-			{
-				/* Simulate releasing the "cursor down" key */
-//				IKBD_PressSTKey(0x50, false);
-			}
-			else if (event.button.button == SDL_BUTTON_WHEELUP)
-			{
-				/* Simulate releasing the "cursor up" key */
-//				IKBD_PressSTKey(0x48, false);
-			}
 			break;
 
 		 case SDL_KEYDOWN:
-            fprintf(stderr, "keydwn\n");
-			Keymap_KeyDown(&event.key.keysym);
-            ShortCut_ActKey();
+            if (ConfigureParams.Keyboard.bDisableKeyRepeat && event.key.repeat)
+                break;
+
+            Keymap_KeyDown(&event.key.keysym);
 			break;
 
 		 case SDL_KEYUP:
 			Keymap_KeyUp(&event.key.keysym);
 			break;
+                
 
 		default:
 			/* don't let unknown events delay event processing */
@@ -538,10 +536,10 @@ void Main_EventHandler(void)
  */
 void Main_SetTitle(const char *title)
 {
-	if (title)
-		SDL_WM_SetCaption(title, "Hatari");
-	else
-		SDL_WM_SetCaption(PROG_NAME, "Hatari");
+    if (title)
+        SDL_SetWindowTitle(sdlWindow, title);
+    else
+        SDL_SetWindowTitle(sdlWindow, PROG_NAME);
 }
 
 /*-----------------------------------------------------------------------*/
@@ -568,48 +566,48 @@ static void Main_Init(void)
 	ClocksTimings_InitMachine ( ConfigureParams.System.nMachineType );
 	Resolution_Init();
 	SDLGui_Init();
-//	Printer_Init();
-//	RS232_Init();
-//	Midi_Init();
 	Screen_Init();
 	Main_SetTitle(NULL);
 //	HostScreen_Init();
-//	DSP_Init();
+	DSP_Init();
 //	Floppy_Init();
 	M68000_Init();                /* Init CPU emulation */
 //	Audio_Init();
 //	DmaSnd_Init();
-//	Keymap_Init();
+	Keymap_Init();
+
 
-	/* Init HD emulation */
-//	HDC_Init();
-//	Ide_Init();
-//	GemDOS_Init();
-//	if (ConfigureParams.HardDisk.bUseHardDiskDirectories)
-//	{
-		/* uses variables set by HDC_Init()! */
-//		GemDOS_InitDrives();
-//	}
-
-	if (Reset_Cold())             /* Reset all systems, load TOS image */
-	{
-		/* If loading of the TOS failed, we bring up the GUI to let the
-		 * user choose another TOS ROM file. */
-//		Dialog_DoProperty();
-	}
     /* call menu at startup */
-    Dialog_DoProperty();
+    if (!File_Exists(sConfigFileName) || ConfigureParams.ConfigDialog.bShowConfigDialogAtStartup)
+        Dialog_DoProperty();
+    else
+        Dialog_CheckFiles();
+    
     if (bQuitProgram)
-	{
-		fprintf(stderr, "Failed to load TOS image!\n");
-		SDL_Quit();
-		exit(-2);
-	}
-
+    {
+        SDL_Quit();
+        exit(-2);
+    }
+    
+    
+//    const char *err_msg;
+//    
+//    while ((err_msg=Reset_Cold())!=NULL)
+//    {
+//        DlgMissing_Rom();
+//        if (bQuitProgram) {
+//            Main_RequestQuit();
+//            break;
+//        }
+//    }
+
+    Reset_Cold();
+    
+//    if (bQuitProgram) {
+//        SDL_Quit();
+//        exit(-2);
+//    }
 	IoMem_Init();
-//	NvRam_Init();
-//	Joy_Init();
-//	Sound_Init();
 	
 	/* done as last, needs CPU & DSP running... */
 	DebugUI_Init();
@@ -623,22 +621,8 @@ static void Main_Init(void)
 static void Main_UnInit(void)
 {
 	Screen_ReturnFromFullScreen();
-//	Floppy_UnInit();
-//	HDC_UnInit();
-//	Midi_UnInit();
-//	RS232_UnInit();
-//	Printer_UnInit();
 	IoMem_UnInit();
-//	NvRam_UnInit();
-//	GemDOS_UnInitDrives();
-//	Ide_UnInit();
-//	Joy_UnInit();
-//	if (Sound_AreWeRecording())
-//		Sound_EndRecording();
-//	Audio_UnInit();
 	SDLGui_UnInit();
-//	DSP_UnInit();
-//	HostScreen_UnInit();
 	Screen_UnInit();
 	Exit680x0();
 
@@ -683,7 +667,7 @@ static void Main_LoadInitialConfig(void)
 static void Main_StatusbarSetup(void)
 {
 	const char *name = NULL;
-	SDLKey key;
+	SDL_Keycode key;
 
 	key = ConfigureParams.Shortcut.withoutModifier[SHORTCUT_OPTIONS];
 	if (!key)
@@ -725,12 +709,14 @@ int main(int argc, char *argv[])
 
 	/* Now load the values from the configuration file */
 	Main_LoadInitialConfig();
-
+    
+#if 0 /* FIXME: This sometimes causes exits when starting from application bundles */
 	/* Check for any passed parameters */
 	if (!Opt_ParseParameters(argc, (const char * const *)argv))
 	{
 		return 1;
 	}
+#endif
 	/* monitor type option might require "reset" -> true */
 	Configuration_Apply(true);
 
@@ -754,25 +740,12 @@ int main(int argc, char *argv[])
 	/* Check if SDL_Delay is accurate */
 	Main_CheckForAccurateDelays();
 
-//	if ( AviRecordOnStartup )	/* Immediatly starts avi recording ? */
-//		Avi_StartRecording ( ConfigureParams.Video.AviRecordFile , ConfigureParams.Screen.bCrop ,
-//			ConfigureParams.Video.AviRecordFps == 0 ?
-//				ClocksTimings_GetVBLPerSec ( ConfigureParams.System.nMachineType , nScreenRefreshRate ) :
-//				(Uint32)ConfigureParams.Video.AviRecordFps << CLOCKS_TIMINGS_SHIFT_VBL ,
-//			1 << CLOCKS_TIMINGS_SHIFT_VBL ,
-//			ConfigureParams.Video.AviRecordVcodec );
 
 	/* Run emulation */
 	Main_UnPauseEmulation();
 	M68000_Start();                 /* Start emulation */
 
-//	if (bRecordingAvi)
-//	{
-		/* cleanly close the avi file */
-//		Statusbar_AddMessage("Finishing AVI file...", 100);
-//		Statusbar_Update(sdlscrn);
-//		Avi_StopRecording();
-//	}
+
 	/* Un-init emulation system */
 	Main_UnInit();