#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(_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"
/*
Multithreading support
*/
-int getNumberOfProcessors()
-{
+int getNumberOfProcessors() {
#if defined(_SC_NPROCESSORS_ONLN)
return sysconf(_SC_NPROCESSORS_ONLN);
}
-bool threadBindToProcessor(threadid_t tid, int pnumber)
-{
+#ifndef __ANDROID__
+bool threadBindToProcessor(threadid_t tid, int pnumber) {
#if defined(_WIN32)
HANDLE hThread = OpenThread(THREAD_ALL_ACCESS, 0, tid);
pnumber, NULL) == 0;
#elif defined(_AIX)
-
+
return bindprocessor(BINDTHREAD, (tid_t)tid, pnumber) == 0;
#elif defined(__hpux) || defined(hpux)
return pthread_processor_bind_np(PTHREAD_BIND_ADVISORY_NP,
&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,
#endif
}
+#endif
-
-bool threadSetPriority(threadid_t tid, int prio)
-{
+bool threadSetPriority(threadid_t tid, int prio) {
#if defined(_WIN32)
HANDLE hThread = OpenThread(THREAD_ALL_ACCESS, 0, tid);
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
}
{
char buf[BUFSIZ];
memset(buf, 0, BUFSIZ);
- assert(readlink("/proc/self/exe", buf, BUFSIZ-1) != -1);
- pathRemoveFile(buf, '/');
- bindir = buf;
+ if (readlink("/proc/self/exe", buf, BUFSIZ-1) == -1) {
+ errorstream << "Unable to read bindir "<< std::endl;
+#ifndef __ANDROID__
+ assert("Unable to read bindir" == 0);
+#endif
+ } else {
+ pathRemoveFile(buf, '/');
+ bindir = buf;
+ }
}
// Find share directory from these.
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++)
path_share = trypath;
break;
}
-
+#ifndef __ANDROID__
path_user = std::string(getenv("HOME")) + DIR_DELIM + "." + PROJECT_NAME;
+#endif
/*
OS X
{
dstream<<"Bundle resource path: "<<path<<std::endl;
//chdir(path);
- path_share = std::string(path) + DIR_DELIM + "share";
+ path_share = std::string(path) + DIR_DELIM + STATIC_SHAREDIR;
}
else
{
static irr::IrrlichtDevice* device;
-void initIrrlicht(irr::IrrlichtDevice * _device)
-{
+void initIrrlicht(irr::IrrlichtDevice * _device) {
device = _device;
}
+void setXorgClassHint(const video::SExposedVideoData &video_data,
+ const std::string &name)
+{
+#ifdef XORG_USED
+ 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
+}
+
#ifndef SERVER
v2u32 getWindowSize()
{
return device->getVideoDriver()->getScreenSize();
}
-
+#ifndef __ANDROID__
+#ifdef XORG_USED
float getDisplayDensity()
{
- 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;
- }
+ const char* current_display = getenv("DISPLAY");
- return (4.0/3.0) * gui_scaling;
-}
+ if (current_display != NULL) {
+ Display * x11display = XOpenDisplay(current_display);
-v2u32 getDisplaySize()
-{
- IrrlichtDevice *nulldevice = createDevice(video::EDT_NULL);
+ 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);
- core::dimension2d<u32> deskres = nulldevice->getVideoModeList()->getDesktopResolution();
- nulldevice -> drop();
+ XCloseDisplay(x11display);
- return deskres;
-}
-#endif
+ return (std::max(dpi_height,dpi_width) / 96.0);
+ }
+ }
-#ifdef SERVER
-#ifdef _WIN32
-void daemonize()
-{
- errorstream << "daemonize not implemented on windows" << std::endl;
+ /* return manually specified dpi */
+ return g_settings->getFloat("screen_dpi")/96.0;
}
-#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;
+float getDisplayDensity()
+{
+ return g_settings->getFloat("screen_dpi")/96.0;
}
+#endif
-
-void daemonize()
+v2u32 getDisplaySize()
{
- std::string path_pidfile = get_pidfile_path();
-
- FILE* pidfile = fopen(path_pidfile.c_str(),"r");
-
- 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);
- }
- } 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();
-
- 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;
- }
+ IrrlichtDevice *nulldevice = createDevice(video::EDT_NULL);
- errorstream << "Failed to daemonize minetest, exiting" << std::endl;
- exit(-1);
-}
+ core::dimension2d<u32> deskres = nulldevice->getVideoModeList()->getDesktopResolution();
+ nulldevice -> drop();
-void cleanup_pid()
-{
- unlink(get_pidfile_path().c_str());
+ return deskres;
}
#endif
#endif
projects / minetest.git / blobdiff