(svn r23490) -Add [FS#2750]: OpenBrowser function to open a browser on major OSes

This commit is contained in:
yexo 2011-12-11 11:47:08 +00:00
parent 0143f00d6f
commit b4fdba2fb3
4 changed files with 34 additions and 0 deletions

View File

@ -359,6 +359,15 @@ void MakeNewgameSettingsLive()
}
}
void OpenBrowser(const char *url)
{
/* Make sure we only accept urls that are sure to open a browser. */
if (strstr(url, "http://") != url && strstr(url, "https://") != url) return;
extern void OSOpenBrowser(const char *url);
OSOpenBrowser(url);
}
/** Callback structure of statements to be executed after the NewGRF scan. */
struct AfterNewGRFScan : NewGRFScanCallback {
Year startyear; ///< The start year.

View File

@ -118,6 +118,10 @@ void ShowOSErrorBox(const char *buf, bool system)
}
}
void OSOpenBrowser(const char *url)
{
[ [ NSWorkspace sharedWorkspace ] openURL:[ NSURL URLWithString:[ NSString stringWithUTF8String:url ] ] ];
}
/**
* Determine and return the current user's locale.

View File

@ -14,6 +14,7 @@
#include "../../openttd.h"
#include "../../crashlog.h"
#include "../../core/random_func.hpp"
#include "../../debug.h"
#include <dirent.h>
@ -348,4 +349,18 @@ uint GetCPUCoreCount()
return count;
}
void OSOpenBrowser(const char *url)
{
pid_t child_pid = fork();
if (child_pid != 0) return;
const char *args[3];
args[0] = "/usr/bin/xdg-open";
args[1] = url;
args[2] = NULL;
execv(args[0], const_cast<char * const *>(args));
DEBUG(misc, 0, "Failed to open url: %s", url);
exit(0);
}
#endif

View File

@ -18,6 +18,7 @@
#include <windows.h>
#include <fcntl.h>
#include <shlobj.h> /* SHGetFolderPath */
#include <Shellapi.h>
#include "win32.h"
#include "../../core/alloc_func.hpp"
#include "../../openttd.h"
@ -79,6 +80,11 @@ void ShowOSErrorBox(const char *buf, bool system)
MessageBox(GetActiveWindow(), MB_TO_WIDE(buf), _T("Error!"), MB_ICONSTOP);
}
void OSOpenBrowser(const char *url)
{
ShellExecute(GetActiveWindow(), _T("open"), MB_TO_WIDE(url), NULL, NULL, SW_SHOWNORMAL);
}
/* Code below for windows version of opendir/readdir/closedir copied and
* modified from Jan Wassenberg's GPL implementation posted over at
* http://www.gamedev.net/community/forums/topic.asp?topic_id=364584&whichpage=1&#2398903 */