summaryrefslogtreecommitdiff
path: root/core/os
diff options
context:
space:
mode:
authorRémi Verschelde <remi@verschelde.fr>2016-02-03 11:30:22 +0100
committerRémi Verschelde <remi@verschelde.fr>2016-02-03 11:30:22 +0100
commitc0aade4ba43eb2dc5a0f27d9e265e0011f187e09 (patch)
tree730bcd48cd0a4a19f581473e3916ed03e88414ff /core/os
parent7cb930dbede1b9c21cf138e4a38ebb9e3dbd099f (diff)
parent11e4c128aca9f2d687d06fe07e97c8636a27b17a (diff)
Merge pull request #3493 from Hinsbart/wm_class
x11: use different strings for WM_CLASS depending on context
Diffstat (limited to 'core/os')
-rw-r--r--core/os/os.cpp4
-rw-r--r--core/os/os.h7
2 files changed, 11 insertions, 0 deletions
diff --git a/core/os/os.cpp b/core/os/os.cpp
index e93038f854..0bc06c8375 100644
--- a/core/os/os.cpp
+++ b/core/os/os.cpp
@@ -523,6 +523,10 @@ String OS::get_joy_guid(int p_device) const {
return "Default Joystick";
}
+void OS::set_context(int p_context) {
+
+}
+
OS::OS() {
last_error=NULL;
frames_drawn=0;
diff --git a/core/os/os.h b/core/os/os.h
index cc001972b8..0d4edb035d 100644
--- a/core/os/os.h
+++ b/core/os/os.h
@@ -404,6 +404,13 @@ public:
virtual bool is_joy_known(int p_device);
virtual String get_joy_guid(int p_device)const;
+ enum EngineContext {
+ CONTEXT_EDITOR,
+ CONTEXT_PROJECTMAN,
+ };
+
+ virtual void set_context(int p_context);
+
OS();
virtual ~OS();