summaryrefslogtreecommitdiffstats
path: root/platform/server/os_server.cpp
diff options
context:
space:
mode:
authorFabio Alessandrelli <fabio.alessandrelli@gmail.com>2018-01-09 11:08:10 +0100
committerK. S. Ernest (iFire) Lee <ernest.lee@chibifire.com>2018-02-15 07:34:11 -0800
commit2de10aa4679a2a5612a7d7939dbd8e74a4caa886 (patch)
tree13b7261b7267a9416af8ad08837fc1aac9c52f60 /platform/server/os_server.cpp
parent6784d743f72f66e0e07343bdb326fa42c9f0f43c (diff)
downloadredot-engine-2de10aa4679a2a5612a7d7939dbd8e74a4caa886.tar.gz
Fixes to OS_Server and DummyRasterizer to match new signatures
Diffstat (limited to 'platform/server/os_server.cpp')
-rw-r--r--platform/server/os_server.cpp11
1 files changed, 10 insertions, 1 deletions
diff --git a/platform/server/os_server.cpp b/platform/server/os_server.cpp
index 49ecc4389a..1340303fee 100644
--- a/platform/server/os_server.cpp
+++ b/platform/server/os_server.cpp
@@ -63,7 +63,7 @@ void OS_Server::initialize_core() {
OS_Unix::initialize_core();
}
-void OS_Server::initialize(const VideoMode &p_desired, int p_video_driver, int p_audio_driver) {
+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;
@@ -81,7 +81,10 @@ void OS_Server::initialize(const VideoMode &p_desired, int p_video_driver, int p
power_manager = memnew(PowerX11);
_ensure_user_data_dir();
+
+ return OK;
}
+
void OS_Server::finalize() {
if (main_loop)
@@ -100,10 +103,12 @@ void OS_Server::finalize() {
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;
@@ -124,6 +129,7 @@ void OS_Server::set_window_title(const String &p_title) {
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;
@@ -171,6 +177,9 @@ void OS_Server::move_window_to_foreground() {
void OS_Server::set_cursor_shape(CursorShape p_shape) {
}
+void OS_Server::set_custom_mouse_cursor(const RES &p_cursor, CursorShape p_shape, const Vector2 &p_hotspot) {
+}
+
OS::PowerState OS_Server::get_power_state() {
return power_manager->get_power_state();
}