#include "porting.h"
-#if defined(__APPLE__)
- #include <mach-o/dyld.h>
- #include "CoreFoundation/CoreFoundation.h"
-#elif defined(__FreeBSD__)
+#if defined(__FreeBSD__)
#include <sys/types.h>
#include <sys/sysctl.h>
#elif defined(_WIN32)
#include <algorithm>
-#elif defined(__LINUX)
- #include <sys/types.h>
#endif
#if !defined(_WIN32)
- #include <sys/stat.h>
#include <unistd.h>
#include <sys/utsname.h>
#endif
+#if defined(__hpux)
+ #define _PSTAT64
+ #include <sys/pstat.h>
+#endif
+#if !defined(_WIN32) && !defined(__APPLE__) && \
+ !defined(__ANDROID__) && !defined(SERVER)
+ #define XORG_USED
+#endif
+#ifdef XORG_USED
+ #include <X11/Xlib.h>
+ #include <X11/Xutil.h>
+#endif
#include "config.h"
#include "debug.h"
#include "filesys.h"
#include "log.h"
#include "util/string.h"
-#include "main.h"
#include "settings.h"
#include <list>
void sigint_handler(int sig)
{
- if(g_killed == false)
- {
+ if(!g_killed) {
dstream<<DTIME<<"INFO: sigint_handler(): "
<<"Ctrl-C pressed, shutting down."<<std::endl;
debug_stacks_print();*/
g_killed = true;
- }
- else
- {
+ } else {
(void)signal(SIGINT, SIG_DFL);
}
}
#else // _WIN32
#include <signal.h>
- BOOL WINAPI event_handler(DWORD sig)
- {
- switch(sig)
- {
- case CTRL_C_EVENT:
- case CTRL_CLOSE_EVENT:
- case CTRL_LOGOFF_EVENT:
- case CTRL_SHUTDOWN_EVENT:
-
- if(g_killed == false)
- {
- dstream<<DTIME<<"INFO: event_handler(): "
- <<"Ctrl+C, Close Event, Logoff Event or Shutdown Event, shutting down."<<std::endl;
- // Comment out for less clutter when testing scripts
- /*dstream<<DTIME<<"INFO: event_handler(): "
- <<"Printing debug stacks"<<std::endl;
- debug_stacks_print();*/
-
- g_killed = true;
- }
- else
- {
- (void)signal(SIGINT, SIG_DFL);
- }
-
- break;
- case CTRL_BREAK_EVENT:
- break;
+BOOL WINAPI event_handler(DWORD sig)
+{
+ switch (sig) {
+ case CTRL_C_EVENT:
+ case CTRL_CLOSE_EVENT:
+ case CTRL_LOGOFF_EVENT:
+ case CTRL_SHUTDOWN_EVENT:
+ if (g_killed == false) {
+ dstream << DTIME << "INFO: event_handler(): "
+ << "Ctrl+C, Close Event, Logoff Event or Shutdown Event,"
+ " shutting down." << std::endl;
+ g_killed = true;
+ } else {
+ (void)signal(SIGINT, SIG_DFL);
}
-
- return TRUE;
+ break;
+ case CTRL_BREAK_EVENT:
+ break;
}
+ return TRUE;
+}
+
void signal_handler_init(void)
{
- SetConsoleCtrlHandler( (PHANDLER_ROUTINE)event_handler,TRUE);
+ SetConsoleCtrlHandler((PHANDLER_ROUTINE)event_handler, TRUE);
}
#endif
}
+#ifndef __ANDROID__
bool threadBindToProcessor(threadid_t tid, int pnumber)
{
#if defined(_WIN32)
#elif defined(__sun) || defined(sun)
return processor_bind(P_LWPID, MAKE_LWPID_PTHREAD(tid),
- pnumber, NULL) == 0;
+ pnumber, NULL) == 0;
#elif defined(_AIX)
-
+
return bindprocessor(BINDTHREAD, (tid_t)tid, pnumber) == 0;
#elif defined(__hpux) || defined(hpux)
pthread_spu_t answer;
return pthread_processor_bind_np(PTHREAD_BIND_ADVISORY_NP,
- &answer, pnumber, tid) == 0;
-
+ &answer, pnumber, tid) == 0;
+
#elif defined(__APPLE__)
struct thread_affinity_policy tapol;
-
+
thread_port_t threadport = pthread_mach_thread_np(tid);
tapol.affinity_tag = pnumber + 1;
return thread_policy_set(threadport, THREAD_AFFINITY_POLICY,
- (thread_policy_t)&tapol, THREAD_AFFINITY_POLICY_COUNT) == KERN_SUCCESS;
+ (thread_policy_t)&tapol, THREAD_AFFINITY_POLICY_COUNT) == KERN_SUCCESS;
#else
#endif
}
-
+#endif
bool threadSetPriority(threadid_t tid, int prio)
{
CloseHandle(hThread);
return success;
-
+
#else
struct sched_param sparam;
int policy;
-
+
if (pthread_getschedparam(tid, &policy, &sparam) != 0)
return false;
-
+
int min = sched_get_priority_min(policy);
int max = sched_get_priority_max(policy);
sparam.sched_priority = min + prio * (max - min) / THREAD_PRIORITY_HIGHEST;
return pthread_setschedparam(tid, policy, &sparam) == 0;
-
+
#endif
}
path[i] = 0;
}
-bool detectMSVCBuildDir(char *c_path)
+bool detectMSVCBuildDir(const std::string &path)
{
- std::string path(c_path);
- const char *ends[] = {"bin\\Release", "bin\\Build", NULL};
+ const char *ends[] = {
+ "bin\\Release",
+ "bin\\Debug",
+ "bin\\Build",
+ NULL
+ };
return (removeStringEnd(path, ends) != "");
}
oss << "Windows/" << osvi.dwMajorVersion << "."
<< osvi.dwMinorVersion;
- if(osvi.szCSDVersion[0])
+ if (osvi.szCSDVersion[0])
oss << "-" << tmp;
oss << " ";
#ifdef _WIN64
oss << "x86_64";
#else
BOOL is64 = FALSE;
- if(IsWow64Process(GetCurrentProcess(), &is64) && is64)
+ if (IsWow64Process(GetCurrentProcess(), &is64) && is64)
oss << "x86_64"; // 32-bit app on 64-bit OS
else
oss << "x86";
#endif
}
-void initializePaths()
+
+bool getCurrentWorkingDir(char *buf, size_t len)
{
-#if RUN_IN_PLACE
- /*
- Use relative paths if RUN_IN_PLACE
- */
+#ifdef _WIN32
+ DWORD ret = GetCurrentDirectory(len, buf);
+ return (ret != 0) && (ret <= len);
+#else
+ return getcwd(buf, len);
+#endif
+}
- infostream<<"Using relative paths (RUN_IN_PLACE)"<<std::endl;
- /*
- Windows
- */
- #if defined(_WIN32)
+bool getExecPathFromProcfs(char *buf, size_t buflen)
+{
+#ifndef _WIN32
+ buflen--;
- const DWORD buflen = 1000;
- char buf[buflen];
- DWORD len;
+ ssize_t len;
+ if ((len = readlink("/proc/self/exe", buf, buflen)) == -1 &&
+ (len = readlink("/proc/curproc/file", buf, buflen)) == -1 &&
+ (len = readlink("/proc/curproc/exe", buf, buflen)) == -1)
+ return false;
- // Find path of executable and set path_share relative to it
- len = GetModuleFileName(GetModuleHandle(NULL), buf, buflen);
- assert(len < buflen);
- pathRemoveFile(buf, '\\');
+ buf[len] = '\0';
+ return true;
+#else
+ return false;
+#endif
+}
- if(detectMSVCBuildDir(buf)){
- infostream<<"MSVC build directory detected"<<std::endl;
- path_share = std::string(buf) + "\\..\\..";
- path_user = std::string(buf) + "\\..\\..";
- }
- else{
- path_share = std::string(buf) + "\\..";
- path_user = std::string(buf) + "\\..";
- }
+//// Windows
+#if defined(_WIN32)
- /*
- Linux
- */
- #elif defined(linux)
+bool getCurrentExecPath(char *buf, size_t len)
+{
+ DWORD written = GetModuleFileNameA(NULL, buf, len);
+ if (written == 0 || written == len)
+ return false;
- char buf[BUFSIZ];
- memset(buf, 0, BUFSIZ);
- // Get path to executable
- assert(readlink("/proc/self/exe", buf, BUFSIZ-1) != -1);
+ return true;
+}
- pathRemoveFile(buf, '/');
- path_share = std::string(buf) + "/..";
- path_user = std::string(buf) + "/..";
+//// Linux
+#elif defined(linux) || defined(__linux) || defined(__linux__)
+
+bool getCurrentExecPath(char *buf, size_t len)
+{
+ if (!getExecPathFromProcfs(buf, len))
+ return false;
+
+ return true;
+}
- /*
- OS X
- */
- #elif defined(__APPLE__)
- //https://developer.apple.com/library/mac/#documentation/Darwin/Reference/ManPages/man3/dyld.3.html
- //TODO: Test this code
- char buf[BUFSIZ];
- uint32_t len = sizeof(buf);
- assert(_NSGetExecutablePath(buf, &len) != -1);
+//// Mac OS X, Darwin
+#elif defined(__APPLE__)
- pathRemoveFile(buf, '/');
+bool getCurrentExecPath(char *buf, size_t len)
+{
+ uint32_t lenb = (uint32_t)len;
+ if (_NSGetExecutablePath(buf, &lenb) == -1)
+ return false;
+
+ return true;
+}
- path_share = std::string(buf) + "/..";
- path_user = std::string(buf) + "/..";
- /*
- FreeBSD
- */
- #elif defined(__FreeBSD__)
+//// FreeBSD, NetBSD, DragonFlyBSD
+#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
+
+bool getCurrentExecPath(char *buf, size_t len)
+{
+ // Try getting path from procfs first, since valgrind
+ // doesn't work with the latter
+ if (getExecPathFromProcfs(buf, len))
+ return true;
int mib[4];
- char buf[BUFSIZ];
- size_t len = sizeof(buf);
mib[0] = CTL_KERN;
mib[1] = KERN_PROC;
mib[2] = KERN_PROC_PATHNAME;
mib[3] = -1;
- assert(sysctl(mib, 4, buf, &len, NULL, 0) != -1);
- pathRemoveFile(buf, '/');
+ if (sysctl(mib, 4, buf, &len, NULL, 0) == -1)
+ return false;
- path_share = std::string(buf) + "/..";
- path_user = std::string(buf) + "/..";
+ return true;
+}
- #else
- //TODO: Get path of executable. This assumes working directory is bin/
- dstream<<"WARNING: Relative path not properly supported on this platform"
- <<std::endl;
+//// Solaris
+#elif defined(__sun) || defined(sun)
- /* scriptapi no longer allows paths that start with "..", so assuming that
- the current working directory is bin/, strip off the last component. */
- char *cwd = getcwd(NULL, 0);
- pathRemoveFile(cwd, '/');
- path_share = std::string(cwd);
- path_user = std::string(cwd);
+bool getCurrentExecPath(char *buf, size_t len)
+{
+ const char *exec = getexecname();
+ if (exec == NULL)
+ return false;
- #endif
+ if (strlcpy(buf, exec, len) >= len)
+ return false;
-#else // RUN_IN_PLACE
+ return true;
+}
- /*
- Use platform-specific paths otherwise
- */
- infostream<<"Using system-wide paths (NOT RUN_IN_PLACE)"<<std::endl;
+// HP-UX
+#elif defined(__hpux)
- /*
- Windows
- */
- #if defined(_WIN32)
+bool getCurrentExecPath(char *buf, size_t len)
+{
+ struct pst_status psts;
- const DWORD buflen = 1000;
- char buf[buflen];
- DWORD len;
+ if (pstat_getproc(&psts, sizeof(psts), 0, getpid()) == -1)
+ return false;
+
+ if (pstat_getpathname(buf, len, &psts.pst_fid_text) == -1)
+ return false;
+
+ return true;
+}
+
+
+#else
+
+bool getCurrentExecPath(char *buf, size_t len)
+{
+ return false;
+}
+
+#endif
+
+
+//// Windows
+#if defined(_WIN32)
+
+bool setSystemPaths()
+{
+ char buf[BUFSIZ];
// Find path of executable and set path_share relative to it
- len = GetModuleFileName(GetModuleHandle(NULL), buf, buflen);
- assert(len < buflen);
+ FATAL_ERROR_IF(!getCurrentExecPath(buf, sizeof(buf)),
+ "Failed to get current executable path");
pathRemoveFile(buf, '\\');
// Use ".\bin\.."
path_share = std::string(buf) + "\\..";
// Use "C:\Documents and Settings\user\Application Data\<PROJECT_NAME>"
- len = GetEnvironmentVariable("APPDATA", buf, buflen);
- assert(len < buflen);
+ DWORD len = GetEnvironmentVariable("APPDATA", buf, sizeof(buf));
+ FATAL_ERROR_IF(len == 0 || len > sizeof(buf), "Failed to get APPDATA");
+
path_user = std::string(buf) + DIR_DELIM + PROJECT_NAME;
+ return true;
+}
- /*
- Linux
- */
- #elif defined(linux)
- // Get path to executable
- std::string bindir = "";
- {
- char buf[BUFSIZ];
- memset(buf, 0, BUFSIZ);
- assert(readlink("/proc/self/exe", buf, BUFSIZ-1) != -1);
- pathRemoveFile(buf, '/');
- bindir = buf;
+//// Linux
+#elif defined(linux) || defined(__linux)
+
+bool setSystemPaths()
+{
+ char buf[BUFSIZ];
+
+ if (!getCurrentExecPath(buf, sizeof(buf))) {
+#ifdef __ANDROID__
+ errorstream << "Unable to read bindir "<< std::endl;
+#else
+ FATAL_ERROR("Unable to read bindir");
+#endif
+ return false;
}
+ pathRemoveFile(buf, '/');
+ std::string bindir(buf);
+
// Find share directory from these.
// It is identified by containing the subdirectory "builtin".
std::list<std::string> trylist;
std::string static_sharedir = STATIC_SHAREDIR;
- if(static_sharedir != "" && static_sharedir != ".")
+ if (static_sharedir != "" && static_sharedir != ".")
trylist.push_back(static_sharedir);
- trylist.push_back(
- bindir + DIR_DELIM + ".." + DIR_DELIM + "share" + DIR_DELIM + PROJECT_NAME);
- trylist.push_back(bindir + DIR_DELIM + "..");
- for(std::list<std::string>::const_iterator i = trylist.begin();
- i != trylist.end(); i++)
- {
+ trylist.push_back(bindir + DIR_DELIM ".." DIR_DELIM "share"
+ DIR_DELIM + PROJECT_NAME);
+ trylist.push_back(bindir + DIR_DELIM "..");
+
+#ifdef __ANDROID__
+ trylist.push_back(path_user);
+#endif
+
+ for (std::list<std::string>::const_iterator
+ i = trylist.begin(); i != trylist.end(); i++) {
const std::string &trypath = *i;
- if(!fs::PathExists(trypath) || !fs::PathExists(trypath + DIR_DELIM + "builtin")){
- dstream<<"WARNING: system-wide share not found at \""
- <<trypath<<"\""<<std::endl;
+ if (!fs::PathExists(trypath) ||
+ !fs::PathExists(trypath + DIR_DELIM + "builtin")) {
+ dstream << "WARNING: system-wide share not found at \""
+ << trypath << "\""<< std::endl;
continue;
}
+
// Warn if was not the first alternative
- if(i != trylist.begin()){
- dstream<<"WARNING: system-wide share found at \""
- <<trypath<<"\""<<std::endl;
+ if (i != trylist.begin()) {
+ dstream << "WARNING: system-wide share found at \""
+ << trypath << "\"" << std::endl;
}
+
path_share = trypath;
break;
}
- path_user = std::string(getenv("HOME")) + DIR_DELIM + "." + PROJECT_NAME;
+#ifndef __ANDROID__
+ path_user = std::string(getenv("HOME")) + DIR_DELIM "."
+ + PROJECT_NAME;
+#endif
+
+ return true;
+}
- /*
- OS X
- */
- #elif defined(__APPLE__)
- // Code based on
- // http://stackoverflow.com/questions/516200/relative-paths-not-working-in-xcode-c
+//// Mac OS X
+#elif defined(__APPLE__)
+
+bool setSystemPaths()
+{
CFBundleRef main_bundle = CFBundleGetMainBundle();
CFURLRef resources_url = CFBundleCopyResourcesDirectoryURL(main_bundle);
char path[PATH_MAX];
- if(CFURLGetFileSystemRepresentation(resources_url, TRUE, (UInt8 *)path, PATH_MAX))
- {
- dstream<<"Bundle resource path: "<<path<<std::endl;
- //chdir(path);
- path_share = std::string(path) + DIR_DELIM + "share";
- }
- else
- {
- // error!
- dstream<<"WARNING: Could not determine bundle resource path"<<std::endl;
+ if (CFURLGetFileSystemRepresentation(resources_url,
+ TRUE, (UInt8 *)path, PATH_MAX)) {
+ path_share = std::string(path);
+ } else {
+ dstream << "WARNING: Could not determine bundle resource path" << std::endl;
}
CFRelease(resources_url);
- path_user = std::string(getenv("HOME")) + "/Library/Application Support/" + PROJECT_NAME;
+ path_user = std::string(getenv("HOME"))
+ + "/Library/Application Support/"
+ + PROJECT_NAME;
+ return true;
+}
- #else // FreeBSD, and probably many other POSIX-like systems.
+#else
+
+bool setSystemPaths()
+{
path_share = STATIC_SHAREDIR;
- path_user = std::string(getenv("HOME")) + DIR_DELIM + "." + PROJECT_NAME;
+ path_user = std::string(getenv("HOME")) + DIR_DELIM "."
+ + lowercase(PROJECT_NAME);
+ return true;
+}
- #endif
-#endif // RUN_IN_PLACE
+#endif
+
+
+void initializePaths()
+{
+#if RUN_IN_PLACE
+ char buf[BUFSIZ];
+
+ infostream << "Using relative paths (RUN_IN_PLACE)" << std::endl;
+
+ bool success =
+ getCurrentExecPath(buf, sizeof(buf)) ||
+ getExecPathFromProcfs(buf, sizeof(buf));
+
+ if (success) {
+ pathRemoveFile(buf, DIR_DELIM_CHAR);
+ std::string execpath(buf);
+
+ path_share = execpath + DIR_DELIM "..";
+ path_user = execpath + DIR_DELIM "..";
+
+ if (detectMSVCBuildDir(execpath)) {
+ path_share += DIR_DELIM "..";
+ path_user += DIR_DELIM "..";
+ }
+ } else {
+ errorstream << "Failed to get paths by executable location, "
+ "trying cwd" << std::endl;
+
+ if (!getCurrentWorkingDir(buf, sizeof(buf)))
+ FATAL_ERROR("Ran out of methods to get paths");
+
+ size_t cwdlen = strlen(buf);
+ if (cwdlen >= 1 && buf[cwdlen - 1] == DIR_DELIM_CHAR) {
+ cwdlen--;
+ buf[cwdlen] = '\0';
+ }
+
+ if (cwdlen >= 4 && !strcmp(buf + cwdlen - 4, DIR_DELIM "bin"))
+ pathRemoveFile(buf, DIR_DELIM_CHAR);
+
+ std::string execpath(buf);
+
+ path_share = execpath;
+ path_user = execpath;
+ }
+
+#else
+ infostream << "Using system-wide paths (NOT RUN_IN_PLACE)" << std::endl;
+
+ if (!setSystemPaths())
+ errorstream << "Failed to get one or more system-wide path" << std::endl;
+
+#endif
+
+ infostream << "Detected share path: " << path_share << std::endl;
+ infostream << "Detected user path: " << path_user << std::endl;
}
-static irr::IrrlichtDevice* device;
-void initIrrlicht(irr::IrrlichtDevice * _device)
+
+void setXorgClassHint(const video::SExposedVideoData &video_data,
+ const std::string &name)
{
- device = _device;
+#ifdef XORG_USED
+ if (video_data.OpenGLLinux.X11Display == NULL)
+ return;
+
+ XClassHint *classhint = XAllocClassHint();
+ classhint->res_name = (char *)name.c_str();
+ classhint->res_class = (char *)name.c_str();
+
+ XSetClassHint((Display *)video_data.OpenGLLinux.X11Display,
+ video_data.OpenGLLinux.X11Window, classhint);
+ XFree(classhint);
+#endif
}
+
+////
+//// Video/Display Information (Client-only)
+////
+
#ifndef SERVER
+
+static irr::IrrlichtDevice *device;
+
+void initIrrlicht(irr::IrrlichtDevice *device_)
+{
+ device = device_;
+}
+
v2u32 getWindowSize()
{
return device->getVideoDriver()->getScreenSize();
}
-float getDisplayDensity()
+std::vector<core::vector3d<u32> > getSupportedVideoModes()
{
- float gui_scaling = g_settings->getFloat("gui_scaling");
- // using Y here feels like a bug, this needs to be discussed later!
- if (getWindowSize().Y <= 800) {
- return (2.0/3.0) * gui_scaling;
- }
- if (getWindowSize().Y <= 1280) {
- return 1.0 * gui_scaling;
+ IrrlichtDevice *nulldevice = createDevice(video::EDT_NULL);
+ sanity_check(nulldevice != NULL);
+
+ std::vector<core::vector3d<u32> > mlist;
+ video::IVideoModeList *modelist = nulldevice->getVideoModeList();
+
+ u32 num_modes = modelist->getVideoModeCount();
+ for (u32 i = 0; i != num_modes; i++) {
+ core::dimension2d<u32> mode_res = modelist->getVideoModeResolution(i);
+ s32 mode_depth = modelist->getVideoModeDepth(i);
+ mlist.push_back(core::vector3d<u32>(mode_res.Width, mode_res.Height, mode_depth));
}
- return (4.0/3.0) * gui_scaling;
+ nulldevice->drop();
+
+ return mlist;
}
-v2u32 getDisplaySize()
+std::vector<irr::video::E_DRIVER_TYPE> getSupportedVideoDrivers()
{
- IrrlichtDevice *nulldevice = createDevice(video::EDT_NULL);
+ std::vector<irr::video::E_DRIVER_TYPE> drivers;
- core::dimension2d<u32> deskres = nulldevice->getVideoModeList()->getDesktopResolution();
- nulldevice -> drop();
+ for (int i = 0; i != irr::video::EDT_COUNT; i++) {
+ if (irr::IrrlichtDevice::isDriverSupported((irr::video::E_DRIVER_TYPE)i))
+ drivers.push_back((irr::video::E_DRIVER_TYPE)i);
+ }
- return deskres;
+ return drivers;
}
-#endif
-#ifdef SERVER
-#ifdef _WIN32
-void daemonize()
+const char *getVideoDriverName(irr::video::E_DRIVER_TYPE type)
{
- errorstream << "daemonize not implemented on windows" << std::endl;
+ static const char *driver_ids[] = {
+ "null",
+ "software",
+ "burningsvideo",
+ "direct3d8",
+ "direct3d9",
+ "opengl",
+ "ogles1",
+ "ogles2",
+ };
+
+ return driver_ids[type];
}
-#else // assume posix like os
-static std::string get_pidfile_path()
-{
- // make it static to make sure it won't change after first call to this fct
- static std::string path_pidfile = "";
- static bool initialized = false;
- if (initialized)
- {
- return path_pidfile;
- }
-
- g_settings->getNoEx("pidfile", path_pidfile);
-
- if (path_pidfile == "") {
-#ifdef RUN_IN_PLACE
- path_pidfile = "pidfile.pid";
-#else
- path_pidfile = "/var/run/minetest.pid";
-#endif
- }
- initialized = true;
- return path_pidfile;
+const char *getVideoDriverFriendlyName(irr::video::E_DRIVER_TYPE type)
+{
+ static const char *driver_names[] = {
+ "NULL Driver",
+ "Software Renderer",
+ "Burning's Video",
+ "Direct3D 8",
+ "Direct3D 9",
+ "OpenGL",
+ "OpenGL ES1",
+ "OpenGL ES2",
+ };
+
+ return driver_names[type];
}
+# ifndef __ANDROID__
+# ifdef XORG_USED
-void daemonize()
+static float calcDisplayDensity()
{
- std::string path_pidfile = get_pidfile_path();
+ const char* current_display = getenv("DISPLAY");
+
+ if (current_display != NULL) {
+ Display * x11display = XOpenDisplay(current_display);
+
+ if (x11display != NULL) {
+ /* try x direct */
+ float dpi_height =
+ floor(DisplayHeight(x11display, 0) /
+ (DisplayHeightMM(x11display, 0) * 0.039370) + 0.5);
+ float dpi_width =
+ floor(DisplayWidth(x11display, 0) /
+ (DisplayWidthMM(x11display, 0) * 0.039370) +0.5);
- FILE* pidfile = fopen(path_pidfile.c_str(),"r");
+ XCloseDisplay(x11display);
- if (pidfile) {
- int pid = 0;
- if (fscanf(pidfile, "%i", &pid) == 1) {
- if (kill(pid, 0) == 0) {
- errorstream <<
- "Minetestserver is already running with pid: "
- << pid << std::endl;
- exit(-1);
+ return std::max(dpi_height,dpi_width) / 96.0;
}
- } else {
- errorstream << "Pidfile \"" << path_pidfile << "\" "
- "already exists but content is invalid" << std::endl <<
- "Delete it manually if you're sure minetest isn't running!"
- << std::endl;
- exit(-1);
}
- fclose(pidfile);
- pidfile = 0;
- }
- pid_t pid = fork();
+ /* return manually specified dpi */
+ return g_settings->getFloat("screen_dpi")/96.0;
+}
- if (pid > 0) {
- pidfile = fopen(path_pidfile.c_str(),"w+");
- if (pidfile) {
- fprintf(pidfile,"%i",pid);
- fclose(pidfile);
- } else {
- errorstream << "Failed to create pidfile: \"" << path_pidfile
- << "\""<< std::endl;
- }
- exit (0);
- } else if (pid == 0) {
- fclose(stdout);
- fclose(stderr);
- return;
- }
- errorstream << "Failed to daemonize minetest, exiting" << std::endl;
- exit(-1);
+float getDisplayDensity()
+{
+ static float cached_display_density = calcDisplayDensity();
+ return cached_display_density;
}
-void cleanup_pid()
+
+# else // XORG_USED
+float getDisplayDensity()
{
- unlink(get_pidfile_path().c_str());
+ return g_settings->getFloat("screen_dpi")/96.0;
}
-#endif
-#endif
+# endif // XORG_USED
+
+v2u32 getDisplaySize()
+{
+ IrrlichtDevice *nulldevice = createDevice(video::EDT_NULL);
+
+ core::dimension2d<u32> deskres = nulldevice->getVideoModeList()->getDesktopResolution();
+ nulldevice -> drop();
+
+ return deskres;
+}
+# endif // __ANDROID__
+#endif // SERVER
} //namespace porting
projects / dragonfireclient.git / blobdiff