X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fporting.h;h=e6574494a28753d4dda16efe759af0349f512809;hb=5b55deb1ebfd55562a6a57fbdbf5dce86015ca86;hp=be26e428246877a1e78cd4bdad2145743ad780d8;hpb=34904a0744ee08d387a67619a5e2c46ce4928c12;p=dragonfireclient.git

diff --git a/src/porting.h b/src/porting.h
index be26e4282..e6574494a 100644
--- a/src/porting.h
+++ b/src/porting.h
@@ -33,6 +33,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #endif
 
 #include <string>
+#include <vector>
 #include "irrlicht.h"
 #include "irrlichttypes.h" // u32
 #include "irrlichttypes_extrabloated.h"
@@ -53,12 +54,12 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #ifdef _WIN32
 	#include <windows.h>
-	
+
 	#define sleep_ms(x) Sleep(x)
 #else
 	#include <unistd.h>
 	#include <stdint.h> //for uintptr_t
-	
+
 	#if (defined(linux) || defined(__linux)) && !defined(_GNU_SOURCE)
 		#define _GNU_SOURCE
 	#endif
@@ -79,7 +80,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 	#endif
 
 	#define sleep_ms(x) usleep(x*1000)
-	
+
 	#define THREAD_PRIORITY_LOWEST       0
 	#define THREAD_PRIORITY_BELOW_NORMAL 1
 	#define THREAD_PRIORITY_NORMAL       2
@@ -123,6 +124,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #define PADDING(x, y) ((ALIGNOF(y) - ((uintptr_t)(x) & (ALIGNOF(y) - 1))) & (ALIGNOF(y) - 1))
 
+#if defined(__APPLE__)
+	#include <mach-o/dyld.h>
+	#include <CoreFoundation/CoreFoundation.h>
+#endif
+
 namespace porting
 {
 
@@ -192,17 +198,17 @@ void initIrrlicht(irr::IrrlichtDevice * );
 	#define _WIN32_WINNT 0x0501
 #endif
 	#include <windows.h>
-	
+
 	inline u32 getTimeS()
 	{
 		return GetTickCount() / 1000;
 	}
-	
+
 	inline u32 getTimeMs()
 	{
 		return GetTickCount();
 	}
-	
+
 	inline u32 getTimeUs()
 	{
 		LARGE_INTEGER freq, t;
@@ -210,7 +216,7 @@ void initIrrlicht(irr::IrrlichtDevice * );
 		QueryPerformanceCounter(&t);
 		return (double)(t.QuadPart) / ((double)(freq.QuadPart) / 1000000.0);
 	}
-	
+
 	inline u32 getTimeNs()
 	{
 		LARGE_INTEGER freq, t;
@@ -218,39 +224,54 @@ void initIrrlicht(irr::IrrlichtDevice * );
 		QueryPerformanceCounter(&t);
 		return (double)(t.QuadPart) / ((double)(freq.QuadPart) / 1000000000.0);
 	}
-	
+
 #else // Posix
-	#include <sys/time.h>
-	#include <time.h>
-	
+#include <sys/time.h>
+#include <time.h>
+#ifdef __MACH__
+#include <mach/clock.h>
+#include <mach/mach.h>
+#endif
+
 	inline u32 getTimeS()
 	{
 		struct timeval tv;
 		gettimeofday(&tv, NULL);
 		return tv.tv_sec;
 	}
-	
+
 	inline u32 getTimeMs()
 	{
 		struct timeval tv;
 		gettimeofday(&tv, NULL);
 		return tv.tv_sec * 1000 + tv.tv_usec / 1000;
 	}
-	
+
 	inline u32 getTimeUs()
 	{
 		struct timeval tv;
 		gettimeofday(&tv, NULL);
 		return tv.tv_sec * 1000000 + tv.tv_usec;
 	}
-	
+
 	inline u32 getTimeNs()
 	{
 		struct timespec ts;
+		// from http://stackoverflow.com/questions/5167269/clock-gettime-alternative-in-mac-os-x
+#ifdef __MACH__ // OS X does not have clock_gettime, use clock_get_time
+		clock_serv_t cclock;
+		mach_timespec_t mts;
+		host_get_clock_service(mach_host_self(), CALENDAR_CLOCK, &cclock);
+		clock_get_time(cclock, &mts);
+		mach_port_deallocate(mach_task_self(), cclock);
+		ts.tv_sec = mts.tv_sec;
+		ts.tv_nsec = mts.tv_nsec;
+#else
 		clock_gettime(CLOCK_REALTIME, &ts);
+#endif
 		return ts.tv_sec * 1000000000 + ts.tv_nsec;
 	}
-	
+
 	/*#include <sys/timeb.h>
 	inline u32 getTimeMs()
 	{
@@ -275,6 +296,21 @@ inline u32 getTime(TimePrecision prec)
 	return 0;
 }
 
+/**
+ * Delta calculation function taking two 32bit arguments.
+ * @param old_time_ms old time for delta calculation (order is relevant!)
+ * @param new_time_ms new time for delta calculation (order is relevant!)
+ * @return positive 32bit delta value
+ */
+inline u32 getDeltaMs(u32 old_time_ms, u32 new_time_ms)
+{
+	if (new_time_ms >= old_time_ms) {
+		return (new_time_ms - old_time_ms);
+	} else {
+		return (old_time_ms - new_time_ms);
+	}
+}
+
 #if defined(linux) || defined(__linux)
 	#include <sys/prctl.h>
 
@@ -334,14 +370,60 @@ float getDisplayDensity();
 
 v2u32 getDisplaySize();
 v2u32 getWindowSize();
+
+std::vector<irr::video::E_DRIVER_TYPE> getSupportedVideoDrivers();
+const char *getVideoDriverName(irr::video::E_DRIVER_TYPE type);
+const char *getVideoDriverFriendlyName(irr::video::E_DRIVER_TYPE type);
 #endif
 
-#ifdef SERVER
-void daemonize();
-void cleanup_pid();
+inline const char * getPlatformName()
+{
+	return
+#if defined(ANDROID)
+	"Android"
+#elif defined(linux) || defined(__linux) || defined(__linux__)
+	"Linux"
+#elif defined(_WIN32) || defined(_WIN64)
+	"Windows"
+#elif defined(__DragonFly__) || defined(__FreeBSD__) || \
+		defined(__NetBSD__) || defined(__OpenBSD__)
+	"BSD"
+#elif defined(__APPLE__) && defined(__MACH__)
+	#if TARGET_OS_MAC
+		"OSX"
+	#elif TARGET_OS_IPHONE
+		"iOS"
+	#else
+		"Apple"
+	#endif
+#elif defined(_AIX)
+	"AIX"
+#elif defined(__hpux)
+	"HP-UX"
+#elif defined(__sun) && defined(__SVR4)
+	"Solaris"
+#elif defined(__CYGWIN__)
+	"Cygwin"
+#elif defined(__unix__) || defined(__unix)
+	#if defined(_POSIX_VERSION)
+		"Posix"
+	#else
+		"Unix"
+	#endif
+#else
+	"?"
 #endif
+	;
+}
+
+void setXorgClassHint(const video::SExposedVideoData &video_data,
+	const std::string &name);
 
 } // namespace porting
 
+#ifdef __ANDROID__
+#include "porting_android.h"
+#endif
+
 #endif // PORTING_HEADER