1 files changed, 10 insertions, 66 deletions

diff --git a/platform/server/os_server.cpp b/platform/server/os_server.cpp
index 498fd01b5e..fbe526ef6d 100644
--- a/platform/server/os_server.cpp
+++ b/platform/server/os_server.cpp
@@ -31,10 +31,9 @@
 #include "os_server.h"
 
 #include "core/print_string.h"
-#include "drivers/dummy/audio_driver_dummy.h"
 #include "drivers/dummy/rasterizer_dummy.h"
 #include "drivers/dummy/texture_loader_dummy.h"
-#include "servers/visual/visual_server_raster.h"
+#include "servers/rendering/rendering_server_raster.h"
 
 #include "main/main.h"
 
@@ -43,11 +42,10 @@
 #include <unistd.h>
 
 int OS_Server::get_video_driver_count() const {
-
 	return 1;
 }
-const char *OS_Server::get_video_driver_name(int p_driver) const {
 
+const char *OS_Server::get_video_driver_name(int p_driver) const {
 	return "Dummy";
 }
 
@@ -56,7 +54,6 @@ int OS_Server::get_audio_driver_count() const {
 }
 
 const char *OS_Server::get_audio_driver_name(int p_driver) const {
-
 	return "Dummy";
 }
 
@@ -65,39 +62,27 @@ int OS_Server::get_current_video_driver() const {
 }
 
 void OS_Server::initialize_core() {
-
 	crash_handler.initialize();
 
 	OS_Unix::initialize_core();
-
-#ifdef __APPLE__
-	SemaphoreOSX::make_default();
-#endif
 }
 
 Error OS_Server::initialize(const VideoMode &p_desired, int p_video_driver, int p_audio_driver) {
-
 	args = OS::get_singleton()->get_cmdline_args();
 	current_videomode = p_desired;
-	main_loop = NULL;
+	main_loop = nullptr;
 
 	RasterizerDummy::make_current();
 
 	video_driver_index = p_video_driver; // unused in server platform, but should still be initialized
 
-	visual_server = memnew(VisualServerRaster);
-	visual_server->init();
+	rendering_server = memnew(RenderingServerRaster);
+	rendering_server->init();
 
 	AudioDriverManager::initialize(p_audio_driver);
 
 	input = memnew(InputDefault);
 
-#ifdef __APPLE__
-	power_manager = memnew(PowerOSX);
-#else
-	power_manager = memnew(PowerX11);
-#endif
-
 	_ensure_user_data_dir();
 
 	resource_loader_dummy.instance();
@@ -107,18 +92,15 @@ Error OS_Server::initialize(const VideoMode &p_desired, int p_video_driver, int
 }
 
 void OS_Server::finalize() {
-
 	if (main_loop)
 		memdelete(main_loop);
-	main_loop = NULL;
+	main_loop = nullptr;
 
-	visual_server->finish();
-	memdelete(visual_server);
+	rendering_server->finish();
+	memdelete(rendering_server);
 
 	memdelete(input);
 
-	memdelete(power_manager);
-
 	ResourceLoader::remove_resource_format_loader(resource_loader_dummy);
 	resource_loader_dummy.unref();
 
@@ -129,22 +111,18 @@ void OS_Server::set_mouse_show(bool p_show) {
 }
 
 void OS_Server::set_mouse_grab(bool p_grab) {
-
 	grab = p_grab;
 }
 
 bool OS_Server::is_mouse_grab_enabled() const {
-
 	return grab;
 }
 
 int OS_Server::get_mouse_button_state() const {
-
 	return 0;
 }
 
 Point2 OS_Server::get_mouse_position() const {
-
 	return Point2();
 }
 
@@ -155,12 +133,10 @@ void OS_Server::set_video_mode(const VideoMode &p_video_mode, int p_screen) {
 }
 
 OS::VideoMode OS_Server::get_video_mode(int p_screen) const {
-
 	return current_videomode;
 }
 
 Size2 OS_Server::get_window_size() const {
-
 	return Vector2(current_videomode.width, current_videomode.height);
 }
 
@@ -168,54 +144,36 @@ void OS_Server::get_fullscreen_mode_list(List<VideoMode> *p_list, int p_screen)
 }
 
 MainLoop *OS_Server::get_main_loop() const {
-
 	return main_loop;
 }
 
 void OS_Server::delete_main_loop() {
-
 	if (main_loop)
 		memdelete(main_loop);
-	main_loop = NULL;
+	main_loop = nullptr;
 }
 
 void OS_Server::set_main_loop(MainLoop *p_main_loop) {
-
 	main_loop = p_main_loop;
 	input->set_main_loop(p_main_loop);
 }
 
 bool OS_Server::can_draw() const {
-
 	return false; //can never draw
 };
 
 String OS_Server::get_name() const {
-
 	return "Server";
 }
 
 void OS_Server::move_window_to_foreground() {
 }
 
-OS::PowerState OS_Server::get_power_state() {
-	return power_manager->get_power_state();
-}
-
-int OS_Server::get_power_seconds_left() {
-	return power_manager->get_power_seconds_left();
-}
-
-int OS_Server::get_power_percent_left() {
-	return power_manager->get_power_percent_left();
-}
-
 bool OS_Server::_check_internal_feature_support(const String &p_feature) {
 	return p_feature == "pc";
 }
 
 void OS_Server::run() {
-
 	force_quit = false;
 
 	if (!main_loop)
@@ -224,7 +182,6 @@ void OS_Server::run() {
 	main_loop->init();
 
 	while (!force_quit) {
-
 		if (Main::iteration())
 			break;
 	};
@@ -233,7 +190,6 @@ void OS_Server::run() {
 }
 
 String OS_Server::get_config_path() const {
-
 	if (has_environment("XDG_CONFIG_HOME")) {
 		return get_environment("XDG_CONFIG_HOME");
 	} else if (has_environment("HOME")) {
@@ -244,7 +200,6 @@ String OS_Server::get_config_path() const {
 }
 
 String OS_Server::get_data_path() const {
-
 	if (has_environment("XDG_DATA_HOME")) {
 		return get_environment("XDG_DATA_HOME");
 	} else if (has_environment("HOME")) {
@@ -255,7 +210,6 @@ String OS_Server::get_data_path() const {
 }
 
 String OS_Server::get_cache_path() const {
-
 	if (has_environment("XDG_CACHE_HOME")) {
 		return get_environment("XDG_CACHE_HOME");
 	} else if (has_environment("HOME")) {
@@ -266,46 +220,37 @@ String OS_Server::get_cache_path() const {
 }
 
 String OS_Server::get_system_dir(SystemDir p_dir) const {
-
 	String xdgparam;
 
 	switch (p_dir) {
 		case SYSTEM_DIR_DESKTOP: {
-
 			xdgparam = "DESKTOP";
 		} break;
 		case SYSTEM_DIR_DCIM: {
-
 			xdgparam = "PICTURES";
 
 		} break;
 		case SYSTEM_DIR_DOCUMENTS: {
-
 			xdgparam = "DOCUMENTS";
 
 		} break;
 		case SYSTEM_DIR_DOWNLOADS: {
-
 			xdgparam = "DOWNLOAD";
 
 		} break;
 		case SYSTEM_DIR_MOVIES: {
-
 			xdgparam = "VIDEOS";
 
 		} break;
 		case SYSTEM_DIR_MUSIC: {
-
 			xdgparam = "MUSIC";
 
 		} break;
 		case SYSTEM_DIR_PICTURES: {
-
 			xdgparam = "PICTURES";
 
 		} break;
 		case SYSTEM_DIR_RINGTONES: {
-
 			xdgparam = "MUSIC";
 
 		} break;
@@ -314,7 +259,7 @@ String OS_Server::get_system_dir(SystemDir p_dir) const {
 	String pipe;
 	List<String> arg;
 	arg.push_back(xdgparam);
-	Error err = const_cast<OS_Server *>(this)->execute("xdg-user-dir", arg, true, NULL, &pipe);
+	Error err = const_cast<OS_Server *>(this)->execute("xdg-user-dir", arg, true, nullptr, &pipe);
 	if (err != OK)
 		return ".";
 	return pipe.strip_edges();
@@ -329,7 +274,6 @@ bool OS_Server::is_disable_crash_handler() const {
 }
 
 OS_Server::OS_Server() {
-
 	//adriver here
 	grab = false;
 };