godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

x11: use different strings for WM_CLASS depending on context

Browse Source
This commit is contained in:
hondres 2016-01-27 21:53:37 +01:00
parent 29353808f0
commit 11e4c128ac
5 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/os/os.cpp
View File

@ -523,6 +523,10 @@ String OS::get_joy_guid(int p_device) const {
return "Default Joystick"; return "Default Joystick";
} }
void OS::set_context(int p_context) {
}
OS::OS() { OS::OS() {
last_error=NULL; last_error=NULL;
frames_drawn=0; frames_drawn=0;

7
core/os/os.h
View File

@ -402,6 +402,13 @@ public:
virtual bool is_joy_known(int p_device); virtual bool is_joy_known(int p_device);
virtual String get_joy_guid(int p_device)const; virtual String get_joy_guid(int p_device)const;
enum EngineContext {
CONTEXT_EDITOR,
CONTEXT_PROJECTMAN,
};
virtual void set_context(int p_context);
OS(); OS();
virtual ~OS(); virtual ~OS();

2
main/main.cpp
View File

@ -1319,6 +1319,7 @@ bool Main::start() {
} }
} }
} }
OS::get_singleton()->set_context(OS::CONTEXT_EDITOR);
//editor_node->set_edited_scene(game); //editor_node->set_edited_scene(game);
} else { } else {
@ -1463,6 +1464,7 @@ bool Main::start() {
ProjectManager *pmanager = memnew( ProjectManager ); ProjectManager *pmanager = memnew( ProjectManager );
sml->get_root()->add_child(pmanager); sml->get_root()->add_child(pmanager);
OS::get_singleton()->set_context(OS::CONTEXT_PROJECTMAN);
} }
#endif #endif

16
platform/x11/os_x11.cpp
View File

@ -1782,6 +1782,22 @@ String OS_X11::get_joy_guid(int p_device) const {
return input->get_joy_guid_remapped(p_device); return input->get_joy_guid_remapped(p_device);
} }
void OS_X11::set_context(int p_context) {
XClassHint* classHint = NULL;
classHint = XAllocClassHint();
if (classHint) {
if (p_context == CONTEXT_EDITOR)
classHint->res_name = (char *)"Godot_Editor";
if (p_context == CONTEXT_PROJECTMAN)
classHint->res_name = (char *)"Godot_ProjectList";
classHint->res_class = (char *)"Godot";
XSetClassHint(x11_display, x11_window, classHint);
XFree(classHint);
}
}
OS_X11::OS_X11() { OS_X11::OS_X11() {
#ifdef RTAUDIO_ENABLED #ifdef RTAUDIO_ENABLED

2
platform/x11/os_x11.h
View File

@ -226,6 +226,8 @@ public:
virtual bool is_joy_known(int p_device); virtual bool is_joy_known(int p_device);
virtual String get_joy_guid(int p_device) const; virtual String get_joy_guid(int p_device) const;
virtual void set_context(int p_context);
void run(); void run();
OS_X11(); OS_X11();