Merge branch 'master' into jgrpp

# Conflicts:
#	.github/workflows/ci-build.yml
#	.github/workflows/release-linux.yml
#	.github/workflows/release-macos.yml
#	.github/workflows/release-source.yml
#	.github/workflows/release.yml
#	CMakeLists.txt
#	COMPILING.md
#	src/ai/ai_core.cpp
#	src/ai/ai_gui.cpp
#	src/bridge_gui.cpp
#	src/company_gui.cpp
#	src/console_cmds.cpp
#	src/core/CMakeLists.txt
#	src/core/smallmap_type.hpp
#	src/disaster_vehicle.h
#	src/effectvehicle_base.h
#	src/fontcache.cpp
#	src/game/game_core.cpp
#	src/game/game_gui.cpp
#	src/gamelog.cpp
#	src/gamelog_internal.h
#	src/group_gui.cpp
#	src/linkgraph/linkgraph.h
#	src/misc.cpp
#	src/network/core/config.h
#	src/network/core/udp.cpp
#	src/network/network_chat_gui.cpp
#	src/network/network_content_gui.cpp
#	src/network/network_gui.cpp
#	src/newgrf.cpp
#	src/newgrf_gui.cpp
#	src/newgrf_profiling.cpp
#	src/newgrf_profiling.h
#	src/object_gui.cpp
#	src/openttd.cpp
#	src/openttd.h
#	src/order_gui.cpp
#	src/os/windows/font_win32.cpp
#	src/rail_gui.cpp
#	src/road.cpp
#	src/road_gui.cpp
#	src/saveload/afterload.cpp
#	src/saveload/saveload.h
#	src/script/api/script_controller.cpp
#	src/script/api/script_roadtypelist.cpp
#	src/script/script_config.cpp
#	src/script/script_config.hpp
#	src/script/script_instance.cpp
#	src/script/script_scanner.cpp
#	src/script/squirrel.cpp
#	src/script/squirrel_helper.hpp
#	src/settings_gui.cpp
#	src/settings_internal.h
#	src/settings_type.h
#	src/table/settings/network_private_settings.ini
#	src/timetable_gui.cpp
#	src/vehicle.cpp
#	src/vehicle_base.h
#	src/window_gui.h

src/os/macosx/CMakeLists.txt

@@ -8,5 +8,6 @@ add_files(
     osx_stdafx.h
     string_osx.cpp
     string_osx.h
+    survey_osx.cpp
     CONDITION APPLE
 )

src/os/macosx/font_osx.cpp

@@ -10,6 +10,7 @@
 #include "../../stdafx.h"
 #include "../../debug.h"
 #include "font_osx.h"
+#include "../../core/math_func.hpp"
 #include "../../blitter/factory.hpp"
 #include "../../fileio_func.h"
 #include "../../fontdetection.h"

src/os/macosx/macos.h

@@ -38,6 +38,8 @@ bool IsMonospaceFont(CFStringRef name);
 
 void MacOSSetThreadName(const char *name);
 
+uint64 MacOSGetPhysicalMemory();
+
 
 /** Deleter that calls CFRelease rather than deleting the pointer. */
 template <typename T> struct CFDeleter {

src/os/macosx/macos.mm

@@ -277,3 +277,8 @@ void MacOSSetThreadName(const char *name)
 		[ cur performSelector:@selector(setName:) withObject:[ NSString stringWithUTF8String:name ] ];
 	}
 }
+
+uint64 MacOSGetPhysicalMemory()
+{
+	return [ [ NSProcessInfo processInfo ] physicalMemory ];
+}

src/os/macosx/string_osx.cpp

@@ -104,8 +104,7 @@ public:
 
 				/* Extract font information for this run. */
 				CFRange chars = CTRunGetStringRange(run);
-				auto map = fontMapping.begin();
-				while (map < fontMapping.end() - 1 && map->first <= chars.location) map++;
+				auto map = fontMapping.upper_bound(chars.location);
 
 				this->emplace_back(run, map->second, buff);
 			}

src/os/macosx/survey_osx.cpp

@@ -0,0 +1,38 @@
+/*
+ * This file is part of OpenTTD.
+ * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
+ * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/** @file survey_osx.cpp OSX implementation of OS-specific survey information. */
+
+#ifdef WITH_NLOHMANN_JSON
+
+#include "../../stdafx.h"
+
+#include "../../3rdparty/fmt/format.h"
+#include "macos.h"
+
+#include <mach-o/arch.h>
+#include <nlohmann/json.hpp>
+
+#include "../../safeguards.h"
+
+void SurveyOS(nlohmann::json &json)
+{
+	int ver_maj, ver_min, ver_bug;
+	GetMacOSVersion(&ver_maj, &ver_min, &ver_bug);
+
+	const NXArchInfo *arch = NXGetLocalArchInfo();
+
+	json["os"] = "MacOS";
+	json["release"] = fmt::format("{}.{}.{}", ver_maj, ver_min, ver_bug);
+	json["machine"] = arch != nullptr ? arch->description : "unknown";
+	json["min_ver"] = MAC_OS_X_VERSION_MIN_REQUIRED;
+	json["max_ver"] = MAC_OS_X_VERSION_MAX_ALLOWED;
+
+	json["memory"] = MacOSGetPhysicalMemory();
+}
+
+#endif /* WITH_NLOHMANN_JSON */

src/os/unix/CMakeLists.txt

@@ -1,5 +1,6 @@
 add_files(
     crashlog_unix.cpp
+    survey_unix.cpp
     CONDITION UNIX AND NOT APPLE AND NOT OPTION_OS2
 )
 

src/os/unix/survey_unix.cpp

@@ -0,0 +1,38 @@
+/*
+ * This file is part of OpenTTD.
+ * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
+ * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/** @file survey_unix.cpp Unix implementation of OS-specific survey information. */
+
+#ifdef WITH_NLOHMANN_JSON
+
+#include "../../stdafx.h"
+
+#include <nlohmann/json.hpp>
+#include <sys/utsname.h>
+#include <unistd.h>
+
+#include "../../safeguards.h"
+
+void SurveyOS(nlohmann::json &json)
+{
+	struct utsname name;
+	if (uname(&name) < 0) {
+		json["os"] = "Unix";
+		return;
+	}
+
+	json["os"] = name.sysname;
+	json["release"] = name.release;
+	json["machine"] = name.machine;
+	json["version"] = name.version;
+
+	long pages = sysconf(_SC_PHYS_PAGES);
+	long page_size = sysconf(_SC_PAGE_SIZE);
+	json["memory"] = pages * page_size;
+}
+
+#endif /* WITH_NLOHMANN_JSON */

src/os/windows/CMakeLists.txt

@@ -4,6 +4,7 @@ add_files(
     font_win32.h
     string_uniscribe.cpp
     string_uniscribe.h
+    survey_win.cpp
     win32.cpp
     win32.h
     CONDITION WIN32

src/os/windows/font_win32.cpp

@@ -12,6 +12,7 @@
 #include "../../blitter/factory.hpp"
 #include "../../core/alloc_func.hpp"
 #include "../../core/math_func.hpp"
+#include "../../core/mem_func.hpp"
 #include "../../fileio_func.h"
 #include "../../fontdetection.h"
 #include "../../fontcache.h"

src/os/windows/survey_win.cpp

@@ -0,0 +1,37 @@
+/*
+ * This file is part of OpenTTD.
+ * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
+ * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/** @file survey_win.cpp Windows implementation of OS-specific survey information. */
+
+#ifdef WITH_NLOHMANN_JSON
+
+#include "../../stdafx.h"
+
+#include "../../3rdparty/fmt/format.h"
+
+#include <nlohmann/json.hpp>
+#include <windows.h>
+
+#include "../../safeguards.h"
+
+void SurveyOS(nlohmann::json &json)
+{
+	_OSVERSIONINFOA os;
+	os.dwOSVersionInfoSize = sizeof(os);
+	GetVersionExA(&os);
+
+	json["os"] = "Windows";
+	json["release"] = fmt::format("{}.{}.{} ({})", os.dwMajorVersion, os.dwMinorVersion, os.dwBuildNumber, os.szCSDVersion);
+
+	MEMORYSTATUSEX status;
+	status.dwLength = sizeof(status);
+	GlobalMemoryStatusEx(&status);
+
+	json["memory"] = status.ullTotalPhys;
+}
+
+#endif /* WITH_NLOHMANN_JSON */