Separated POSIX's i_system.cpp from native OS X implementation

src/CMakeLists.txt

@@ -592,7 +592,6 @@ set( PLAT_POSIX_SOURCES
 	posix/i_cd.cpp
 	posix/i_movie.cpp
 	posix/i_steam.cpp
-	posix/i_system.cpp
 	posix/st_start.cpp )
 set( PLAT_SDL_SOURCES
 	posix/sdl/crashcatcher.c
@@ -601,6 +600,7 @@ set( PLAT_SDL_SOURCES
 	posix/sdl/i_input.cpp
 	posix/sdl/i_joystick.cpp
 	posix/sdl/i_main.cpp
+	posix/sdl/i_system.cpp
 	posix/sdl/i_timer.cpp
 	posix/sdl/sdlvideo.cpp )
 set( PLAT_OSX_SOURCES
@@ -611,6 +611,7 @@ set( PLAT_COCOA_SOURCES
 	posix/cocoa/i_input.mm
 	posix/cocoa/i_joystick.cpp
 	posix/cocoa/i_main.mm
+	posix/cocoa/i_system.mm
 	posix/cocoa/i_timer.cpp
 	posix/cocoa/i_video.mm )
 

src/posix/cocoa/i_system.mm

@@ -0,0 +1,381 @@
+/*
+ ** i_system.mm
+ **
+ **---------------------------------------------------------------------------
+ ** Copyright 2012-2015 Alexey Lysiuk
+ ** All rights reserved.
+ **
+ ** Redistribution and use in source and binary forms, with or without
+ ** modification, are permitted provided that the following conditions
+ ** are met:
+ **
+ ** 1. Redistributions of source code must retain the above copyright
+ **    notice, this list of conditions and the following disclaimer.
+ ** 2. Redistributions in binary form must reproduce the above copyright
+ **    notice, this list of conditions and the following disclaimer in the
+ **    documentation and/or other materials provided with the distribution.
+ ** 3. The name of the author may not be used to endorse or promote products
+ **    derived from this software without specific prior written permission.
+ **
+ ** THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ ** IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ ** OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ ** IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ ** INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ ** NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ ** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ ** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ ** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ ** THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ **---------------------------------------------------------------------------
+ **
+ */
+
+#include "i_common.h"
+
+#include <fnmatch.h>
+#include <unistd.h>
+#include <sys/stat.h>
+
+#include "d_ticcmd.h"
+#include "doomdef.h"
+#include "doomerrors.h"
+#include "doomstat.h"
+#include "g_game.h"
+#include "gameconfigfile.h"
+#include "i_sound.h"
+#include "i_system.h"
+#include "v_text.h"
+#include "x86.h"
+
+
+EXTERN_CVAR(String, language)
+
+DWORD LanguageIDs[4];
+
+
+int (*I_GetTime)(bool saveMS);
+int (*I_WaitForTic)(int);
+void (*I_FreezeTime)(bool frozen);
+
+
+void I_Tactile(int /*on*/, int /*off*/, int /*total*/)
+{
+}
+
+
+ticcmd_t* I_BaseTiccmd()
+{
+	static ticcmd_t emptycmd;
+    return &emptycmd;
+}
+
+
+void I_WaitVBL(const int count)
+{
+    // I_WaitVBL is never used to actually synchronize to the
+    // vertical blank. Instead, it's used for delay purposes.
+    usleep(1000000 * count / 70);
+}
+
+
+//
+// SetLanguageIDs
+//
+void SetLanguageIDs()
+{
+	size_t langlen = strlen(language);
+
+	DWORD lang = (langlen < 2 || langlen > 3)
+		? MAKE_ID('e', 'n', 'u', '\0')
+		: MAKE_ID(language[0], language[1], language[2], '\0');
+
+	LanguageIDs[3] = LanguageIDs[2] = LanguageIDs[1] = LanguageIDs[0] = lang;
+}
+
+
+void I_InitTimer();
+void I_ShutdownTimer();
+
+void I_Init(void)
+{
+	CheckCPUID(&CPU);
+	DumpCPUInfo(&CPU);
+
+	atterm(I_ShutdownSound);
+    I_InitSound();
+	I_InitTimer();
+}
+
+static int has_exited;
+
+void I_Quit()
+{
+    has_exited = 1; // Prevent infinitely recursive exits -- killough
+
+    if (demorecording)
+	{
+		G_CheckDemoStatus();
+	}
+
+	C_DeinitConsole();
+
+	I_ShutdownTimer();
+}
+
+
+extern FILE* Logfile;
+bool gameisdead;
+
+void STACK_ARGS I_FatalError(const char* const error, ...)
+{
+    static bool alreadyThrown = false;
+    gameisdead = true;
+
+    if (!alreadyThrown) // ignore all but the first message -- killough
+    {
+		alreadyThrown = true;
+
+		char errortext[MAX_ERRORTEXT];
+		int index;
+		va_list argptr;
+		va_start(argptr, error);
+		index = vsnprintf(errortext, MAX_ERRORTEXT, error, argptr);
+		va_end(argptr);
+
+		extern void Mac_I_FatalError(const char*);
+		Mac_I_FatalError(errortext);
+		
+		// Record error to log (if logging)
+		if (Logfile)
+		{
+			fprintf(Logfile, "\n**** DIED WITH FATAL ERROR:\n%s\n", errortext);
+			fflush(Logfile);
+		}
+
+		fprintf(stderr, "%s\n", errortext);
+		exit(-1);
+    }
+
+    if (!has_exited) // If it hasn't exited yet, exit now -- killough
+    {
+		has_exited = 1; // Prevent infinitely recursive exits -- killough
+		exit(-1);
+    }
+}
+
+void STACK_ARGS I_Error(const char* const error, ...)
+{
+    va_list argptr;
+    char errortext[MAX_ERRORTEXT];
+
+    va_start(argptr, error);
+    vsnprintf(errortext, MAX_ERRORTEXT, error, argptr);
+    va_end(argptr);
+
+    throw CRecoverableError(errortext);
+}
+
+
+void I_SetIWADInfo()
+{
+}
+
+
+void I_PrintStr(const char* const message)
+{
+	// Strip out any color escape sequences before writing to output
+	char* const copy = new char[strlen(message) + 1];
+	const char* srcp = message;
+	char* dstp = copy;
+
+	while ('\0' != *srcp)
+	{
+		if (TEXTCOLOR_ESCAPE == *srcp)
+		{
+			if ('\0' != srcp[1])
+			{
+				srcp += 2;
+			}
+			else
+			{
+				break;
+			}
+		}
+		else if (0x1d == *srcp || 0x1f == *srcp) // Opening and closing bar character
+		{
+			*dstp++ = '-';
+			*srcp++;
+		}
+		else if (0x1e == *srcp) // Middle bar character
+		{
+			*dstp++ = '=';
+			*srcp++;
+		}
+		else
+		{
+			*dstp++ = *srcp++;
+		}
+	}
+
+	*dstp = '\0';
+
+	fputs(copy, stdout);
+	delete[] copy;
+	fflush(stdout);
+}
+
+
+int I_PickIWad(WadStuff* const wads, const int numwads, const bool showwin, const int defaultiwad)
+{
+	if (!showwin)
+	{
+		return defaultiwad;
+	}
+
+	I_SetMainWindowVisible(false);
+
+	extern int I_PickIWad_Cocoa(WadStuff*, int, bool, int);
+	const int result = I_PickIWad_Cocoa(wads, numwads, showwin, defaultiwad);
+
+	I_SetMainWindowVisible(true);
+
+	return result;
+}
+
+
+bool I_WriteIniFailed()
+{
+	printf("The config file %s could not be saved:\n%s\n", GameConfig->GetPathName(), strerror(errno));
+	return false; // return true to retry
+}
+
+
+static const char *pattern;
+
+#if MAC_OS_X_VERSION_MAX_ALLOWED < 1080
+static int matchfile(struct dirent *ent)
+#else
+static int matchfile(const struct dirent *ent)
+#endif
+{
+    return fnmatch(pattern, ent->d_name, FNM_NOESCAPE) == 0;
+}
+
+void* I_FindFirst(const char* const filespec, findstate_t* const fileinfo)
+{
+	FString dir;
+	
+	const char* const slash = strrchr(filespec, '/');
+
+	if (slash)
+	{
+		pattern = slash+1;
+		dir = FString(filespec, slash - filespec + 1);
+	}
+	else
+	{
+		pattern = filespec;
+		dir = ".";
+	}
+
+    fileinfo->current = 0;
+    fileinfo->count = scandir(dir.GetChars(), &fileinfo->namelist, matchfile, alphasort);
+
+    if (fileinfo->count > 0)
+    {
+		return fileinfo;
+    }
+
+    return (void*)-1;
+}
+
+int I_FindNext(void* const handle, findstate_t* const fileinfo)
+{
+    findstate_t* const state = static_cast<findstate_t*>(handle);
+
+    if (state->current < fileinfo->count)
+    {
+	    return ++state->current < fileinfo->count ? 0 : -1;
+	}
+
+	return -1;
+}
+
+int I_FindClose(void* const handle)
+{
+	findstate_t* const state = static_cast<findstate_t*>(handle);
+
+	if (handle != (void*)-1 && state->count > 0)
+	{
+		for (int i = 0; i < state->count; ++i)
+		{
+			free(state->namelist[i]);
+		}
+
+		free(state->namelist);
+		state->namelist = NULL;
+		state->count = 0;
+	}
+
+	return 0;
+}
+
+int I_FindAttr(findstate_t* const fileinfo)
+{
+	dirent* const ent = fileinfo->namelist[fileinfo->current];
+	struct stat buf;
+
+	if (stat(ent->d_name, &buf) == 0)
+	{
+		return S_ISDIR(buf.st_mode) ? FA_DIREC : 0;
+	}
+
+	return 0;
+}
+
+
+static NSString* GetPasteboardStringType()
+{
+#if MAC_OS_X_VERSION_MAX_ALLOWED < 1060
+	return NSStringPboardType;
+#else // 10.6 or higher
+	return NSAppKitVersionNumber < AppKit10_6
+		? NSStringPboardType
+		: NSPasteboardTypeString;
+#endif // before 10.6
+}
+
+void I_PutInClipboard(const char* const string)
+{
+	NSPasteboard* const pasteBoard = [NSPasteboard generalPasteboard];
+	[pasteBoard clearContents];
+	[pasteBoard setString:[NSString stringWithUTF8String:string]
+				  forType:GetPasteboardStringType()];
+}
+
+FString I_GetFromClipboard(bool returnNothing)
+{
+	if (returnNothing)
+	{
+		return FString();
+	}
+
+	NSPasteboard* const pasteBoard = [NSPasteboard generalPasteboard];
+	NSString* const value = [pasteBoard stringForType:GetPasteboardStringType()];
+
+	return FString([value UTF8String]);
+}
+
+
+unsigned int I_MakeRNGSeed()
+{
+	return static_cast<unsigned int>(arc4random());
+}
+
+
+TArray<FString> I_GetGogPaths()
+{
+	// GOG's Doom games are Windows only at the moment
+	return TArray<FString>();
+}

src/posix/osx/iwadpicker_cocoa.mm

@@ -462,20 +462,14 @@ static void RestartWithParameters(const char* iwadPath, NSString* parameters)
 	[pool release];
 }
 
-void I_SetMainWindowVisible(bool visible);
-
 // Simple wrapper so we can call this from outside.
 int I_PickIWad_Cocoa (WadStuff *wads, int numwads, bool showwin, int defaultiwad)
 {
 	NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
 
-	I_SetMainWindowVisible(false);
-
 	IWADPicker *picker = [IWADPicker alloc];
 	int ret = [picker pickIWad:wads num:numwads showWindow:showwin defaultWad:defaultiwad];
 
-	I_SetMainWindowVisible(true);
-
 	NSString* parametersToAppend = [picker commandLineParameters];
 	osx_additional_parameters = [parametersToAppend UTF8String];
 

src/posix/sdl/i_gui.cpp

@@ -54,8 +54,3 @@ bool I_SetCursor(FTexture *cursorpic)
 	}
 	return true;
 }
-
-void I_SetMainWindowVisible(bool visible)
-{
-
-}