Add OS.get_time_zone_info function

The returned dictionary maps "name" to the
name of the current time zone, and "bias" to
a bias from UTC in minutes.

8 files changed, 119 insertions, 2 deletions

diff --git a/core/bind/core_bind.cpp b/core/bind/core_bind.cpp
index 700856ab6f..26b1dac6f1 100644
--- a/core/bind/core_bind.cpp
+++ b/core/bind/core_bind.cpp
@@ -480,6 +480,15 @@ Dictionary _OS::get_time(bool utc) const {
 	return timed;
 
 }
+
+Dictionary _OS::get_time_zone_info() const {
+	OS::TimeZoneInfo info = OS::get_singleton()->get_time_zone_info();
+	Dictionary infod;
+	infod["bias"] = info.bias;
+	infod["name"] = info.name;
+	return infod;
+}
+
 uint64_t _OS::get_unix_time() const {
 
 	return OS::get_singleton()->get_unix_time();
@@ -776,6 +785,7 @@ void _OS::_bind_methods() {
 
 	ObjectTypeDB::bind_method(_MD("get_date","utc"),&_OS::get_date,DEFVAL(false));
 	ObjectTypeDB::bind_method(_MD("get_time","utc"),&_OS::get_time,DEFVAL(false));
+	ObjectTypeDB::bind_method(_MD("get_time_zone_info"),&_OS::get_time_zone_info);
 	ObjectTypeDB::bind_method(_MD("get_unix_time"),&_OS::get_unix_time);
 
 	ObjectTypeDB::bind_method(_MD("set_icon"),&_OS::set_icon);
diff --git a/core/bind/core_bind.h b/core/bind/core_bind.h
index 2400ba3fd4..74f29c23e8 100644
--- a/core/bind/core_bind.h
+++ b/core/bind/core_bind.h
@@ -206,6 +206,7 @@ public:
 	void set_icon(const Image& p_icon);
 	Dictionary get_date(bool utc) const;
 	Dictionary get_time(bool utc) const;
+	Dictionary get_time_zone_info() const;
 	uint64_t get_unix_time() const;
 
 	int get_static_memory_usage() const;
diff --git a/core/os/os.h b/core/os/os.h
index 75a0a4eea7..0230a75ca0 100644
--- a/core/os/os.h
+++ b/core/os/os.h
@@ -244,9 +244,15 @@ public:
 		int min;
 		int sec;
 	};
-	
+
+	struct TimeZoneInfo {
+		int bias;
+		String name;
+	};
+
 	virtual Date get_date(bool local=false) const=0;
 	virtual Time get_time(bool local=false) const=0;
+	virtual TimeZoneInfo get_time_zone_info() const=0;
 	virtual uint64_t get_unix_time() const;
 
 	virtual void delay_usec(uint32_t p_usec) const=0; 
diff --git a/drivers/unix/os_unix.cpp b/drivers/unix/os_unix.cpp
index afb85e49e8..8ba56490d7 100644
--- a/drivers/unix/os_unix.cpp
+++ b/drivers/unix/os_unix.cpp
@@ -246,9 +246,36 @@ OS::Time OS_Unix::get_time(bool utc) const {
 	ret.hour=lt->tm_hour;
 	ret.min=lt->tm_min;
 	ret.sec=lt->tm_sec;
+	get_time_zone_info();
 	return ret;
 }
-	
+
+OS::TimeZoneInfo OS_Unix::get_time_zone_info() const {
+	time_t t = time(NULL);
+	struct tm *lt = localtime(&t);
+	char name[16];
+	strftime(name, 16, "%Z", lt);
+	name[15] = 0;
+	TimeZoneInfo ret;
+	ret.name = name;
+
+	char bias_buf[16];
+	strftime(bias_buf, 16, "%z", lt);
+	int bias;
+	bias_buf[15] = 0;
+	sscanf(bias_buf, "%d", &bias);
+
+	// convert from ISO 8601 (1 minute=1, 1 hour=100) to minutes
+	int hour = (int)bias / 100;
+	int minutes = bias % 100;
+	if (bias < 0)
+		ret.bias = hour * 60 - minutes;
+	else
+		ret.bias = hour * 60 + minutes;
+
+	return ret;
+}
+
 void OS_Unix::delay_usec(uint32_t p_usec) const {
 
 	usleep(p_usec);
diff --git a/drivers/unix/os_unix.h b/drivers/unix/os_unix.h
index bafa590d5f..8bb57eda12 100644
--- a/drivers/unix/os_unix.h
+++ b/drivers/unix/os_unix.h
@@ -90,6 +90,7 @@ public:
 		
 	virtual Date get_date(bool utc) const;
 	virtual Time get_time(bool utc) const;
+	virtual TimeZoneInfo get_time_zone_info() const;
 
 	virtual uint64_t get_unix_time() const;
 
diff --git a/platform/nacl/os_nacl.cpp b/platform/nacl/os_nacl.cpp
index ecace58801..b282209d72 100644
--- a/platform/nacl/os_nacl.cpp
+++ b/platform/nacl/os_nacl.cpp
@@ -273,6 +273,32 @@ OS::Time OSNacl::get_time(bool utc) const {
 	return ret;
 };
 
+OS::TimeZoneInfo OS_Unix::get_time_zone_info() const {
+	time_t t = time(NULL);
+	struct tm *lt = localtime(&t);
+	char name[16];
+	strftime(name, 16, "%Z", lt);
+	name[15] = 0;
+	TimeZoneInfo ret;
+	ret.name = name;
+
+	char bias_buf[16];
+	strftime(bias_buf, 16, "%z", lt);
+	int bias;
+	bias_buf[15] = 0;
+	sscanf(bias_buf, "%d", &bias);
+
+	// convert from ISO 8601 (1 minute=1, 1 hour=100) to minutes
+	int hour = (int)bias / 100;
+	int minutes = bias % 100;
+	if (bias < 0)
+		ret.bias = hour * 60 - minutes;
+	else
+		ret.bias = hour * 60 + minutes;
+
+	return ret;
+};
+
 void OSNacl::delay_usec(uint32_t p_usec) const {
 
 	//usleep(p_usec);
diff --git a/platform/windows/os_windows.cpp b/platform/windows/os_windows.cpp
index 16b9e9b327..cdf9b007d1 100644
--- a/platform/windows/os_windows.cpp
+++ b/platform/windows/os_windows.cpp
@@ -1858,6 +1858,36 @@ OS::Time OS_Windows::get_time(bool utc) const {
 	time.sec=systemtime.wSecond;
 	return time;
 }
+OS::Time OS_Windows::get_time(bool utc) const {
+
+	SYSTEMTIME systemtime;
+	if (utc)
+		GetSystemTime(&systemtime);
+	else
+		GetLocalTime(&systemtime);
+
+	Time time;
+	time.hour=systemtime.wHour;
+	time.min=systemtime.wMinute;
+	time.sec=systemtime.wSecond;
+	return time;
+}
+
+OS::TimeZoneInfo OS_Windows::get_time_zone_info() const {
+	TIME_ZONE_INFORMATION info;
+	bool daylight = false;
+	if (GetTimeZoneInformation(info) == TIME_ZONE_ID_DAYLIGHT)
+		daylight = true;
+
+	if (daylight) {
+		ret.name = info.DaylightName;
+	} else {
+		ret.name = info.StandardName;
+	}
+
+	ret.bias = info.Bias;
+	return ret;
+}
 
 uint64_t OS_Windows::get_unix_time(bool local) const {
 
diff --git a/platform/winrt/os_winrt.cpp b/platform/winrt/os_winrt.cpp
index a84e54ee0e..24037f05d7 100644
--- a/platform/winrt/os_winrt.cpp
+++ b/platform/winrt/os_winrt.cpp
@@ -469,6 +469,22 @@ OS::Time OSWinrt::get_time(bool utc) const {
 	return time;
 }
 
+OS::TimeZoneInfo OS_Windows::get_time_zone_info() const {
+	TIME_ZONE_INFORMATION info;
+	bool daylight = false;
+	if (GetTimeZoneInformation(info) == TIME_ZONE_ID_DAYLIGHT)
+		daylight = true;
+
+	if (daylight) {
+		ret.name = info.DaylightName;
+	} else {
+		ret.name = info.StandardName;
+	}
+
+	ret.bias = info.Bias;
+	return ret;
+}
+
 uint64_t OSWinrt::get_unix_time(bool utc) const {
 
 	FILETIME ft;