Skip to content

Commit

Permalink
- put common POSIX system code to a separate file
Browse files Browse the repository at this point in the history
  • Loading branch information
alexey-lysiuk committed Jan 26, 2020
1 parent 081cf81 commit d425d8d
Show file tree
Hide file tree
Showing 4 changed files with 160 additions and 273 deletions.
3 changes: 2 additions & 1 deletion src/CMakeLists.txt
Expand Up @@ -470,7 +470,8 @@ if (HAVE_VULKAN)
endif()

set( PLAT_POSIX_SOURCES
posix/i_steam.cpp )
posix/i_steam.cpp
posix/i_system_posix.cpp )
set( PLAT_SDL_SOURCES
posix/sdl/crashcatcher.c
posix/sdl/hardware.cpp
Expand Down
128 changes: 1 addition & 127 deletions src/posix/cocoa/i_system.mm
Expand Up @@ -33,39 +33,16 @@

#include "i_common.h"

#include <fnmatch.h>
#include <sys/sysctl.h>

#include "d_protocol.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 "st_console.h"
#include "v_text.h"
#include "x86.h"
#include "cmdlib.h"


void I_Tactile(int /*on*/, int /*off*/, int /*total*/)
{
}


ticcmd_t* I_BaseTiccmd()
{
static ticcmd_t emptycmd;
return &emptycmd;
}



double PerfToSec, PerfToMillisec;

static void CalculateCPUSpeed()
void CalculateCPUSpeed()
{
long long frequency;
size_t size = sizeof frequency;
Expand All @@ -82,17 +59,6 @@ static void CalculateCPUSpeed()
}
}

void I_Init(void)
{
CheckCPUID(&CPU);
CalculateCPUSpeed();
DumpCPUInfo(&CPU);
}

void I_SetIWADInfo()
{
}


void I_DebugPrint(const char *cp)
{
Expand Down Expand Up @@ -172,90 +138,6 @@ int I_PickIWad(WadStuff* const wads, const int numwads, const bool showwin, cons
}


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];
return (ent->d_type & DT_DIR) ? FA_DIREC : 0;
}


void I_PutInClipboard(const char* const string)
{
NSPasteboard* const pasteBoard = [NSPasteboard generalPasteboard];
Expand Down Expand Up @@ -287,11 +169,3 @@ 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>();
}

153 changes: 153 additions & 0 deletions src/posix/i_system_posix.cpp
@@ -0,0 +1,153 @@
//-----------------------------------------------------------------------------
//
// Copyright 1993-1996 id Software
// Copyright 1999-2016 Randy Heit
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program. If not, see http://www.gnu.org/licenses/
//
//-----------------------------------------------------------------------------
//

#include <stdio.h>
#include <errno.h>
#include <fnmatch.h>

#ifdef __APPLE__
#include <AvailabilityMacros.h>
#endif // __APPLE__

#include "d_protocol.h"
#include "i_system.h"
#include "gameconfigfile.h"
#include "x86.h"


void I_Tactile(int /*on*/, int /*off*/, int /*total*/)
{
}

static ticcmd_t emptycmd;

ticcmd_t *I_BaseTiccmd()
{
return &emptycmd;
}

//
// I_Init
//
void I_Init()
{
extern void CalculateCPUSpeed();

CheckCPUID(&CPU);
CalculateCPUSpeed();
DumpCPUInfo(&CPU);
}


void I_SetIWADInfo()
{
}


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 defined(__APPLE__) && 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 = nullptr;
state->count = 0;
}

return 0;
}

int I_FindAttr(findstate_t *const fileinfo)
{
dirent *const ent = fileinfo->namelist[fileinfo->current];
return (ent->d_type & DT_DIR) ? FA_DIREC : 0;
}


TArray<FString> I_GetGogPaths()
{
// GOG's Doom games are Windows only at the moment
return TArray<FString>();
}

0 comments on commit d425d8d

Please sign in to comment.