Set WM_CLASS window hint for Xorg

kwolekr · kwolekr · commit 8661b3587b48 · 2014-12-15T13:52:10.000-05:00
diff --git a/src/main.cpp b/src/main.cpp
@@ -1582,6 +1582,7 @@ ClientLauncher::~ClientLauncher()
 		device->drop();
 }
 
+
 bool ClientLauncher::run(GameParams &game_params, const Settings &cmd_args)
 {
 	init_args(game_params, cmd_args);
@@ -1602,11 +1603,14 @@ bool ClientLauncher::run(GameParams &game_params, const Settings &cmd_args)
 		return true;
 	}
 
-	if (device->getVideoDriver() == NULL) {
+	video::IVideoDriver *video_driver = device->getVideoDriver();
+	if (video_driver == NULL) {
 		errorstream << "Could not initialize video driver." << std::endl;
 		return false;
 	}
 
+	porting::setXorgClassHint(video_driver->getExposedVideoData(), "Minetest");
+
 	/*
 		This changes the minimum allowed number of vertices in a VBO.
 		Default is 500.
diff --git a/src/porting.cpp b/src/porting.cpp
@@ -36,6 +36,16 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 	#include <sys/utsname.h>
 #endif
 
+#if !defined(_WIN32) && !defined(__APPLE__) && \
+	!defined(__ANDROID__) && !defined(SERVER)
+	#define XORG_USED
+#endif
+
+#ifdef XORG_USED
+	#include <X11/Xlib.h>
+	#include <X11/Xutil.h>
+#endif
+
 #include "config.h"
 #include "debug.h"
 #include "filesys.h"
@@ -545,6 +555,20 @@ void initIrrlicht(irr::IrrlichtDevice * _device) {
 	device = _device;
 }
 
+void setXorgClassHint(const video::SExposedVideoData &video_data,
+	const std::string &name)
+{
+#ifdef XORG_USED
+	XClassHint *classhint = XAllocClassHint();
+	classhint->res_name  = (char *)name.c_str();
+	classhint->res_class = (char *)name.c_str();
+
+	XSetClassHint((Display *)video_data.OpenGLLinux.X11Display,
+		video_data.OpenGLLinux.X11Window, classhint);
+	XFree(classhint);
+#endif
+}
+
 #ifndef SERVER
 v2u32 getWindowSize() {
 	return device->getVideoDriver()->getScreenSize();
diff --git a/src/porting.h b/src/porting.h
@@ -411,6 +411,9 @@ inline const char * getPlatformName()
 	;
 }
 
+void setXorgClassHint(const video::SExposedVideoData &video_data,
+	const std::string &name);
+
 } // namespace porting
 
 #ifdef __ANDROID__

Original file line number	Diff line number	Diff line change
`@@ -1582,6 +1582,7 @@ ClientLauncher::~ClientLauncher()`
`1582`	`1582`	`device->drop();`
`1583`	`1583`	`}`
`1584`	`1584`
	`1585`	`+`
`1585`	`1586`	`bool ClientLauncher::run(GameParams &game_params, const Settings &cmd_args)`
`1586`	`1587`	`{`
`1587`	`1588`	`init_args(game_params, cmd_args);`
`@@ -1602,11 +1603,14 @@ bool ClientLauncher::run(GameParams &game_params, const Settings &cmd_args)`
`1602`	`1603`	`return true;`
`1603`	`1604`	`}`
`1604`	`1605`
`1605`		`- if (device->getVideoDriver() == NULL) {`
	`1606`	`+ video::IVideoDriver *video_driver = device->getVideoDriver();`
	`1607`	`+ if (video_driver == NULL) {`
`1606`	`1608`	`errorstream << "Could not initialize video driver." << std::endl;`
`1607`	`1609`	`return false;`
`1608`	`1610`	`}`
`1609`	`1611`
	`1612`	`+ porting::setXorgClassHint(video_driver->getExposedVideoData(), "Minetest");`
	`1613`	`+`
`1610`	`1614`	`/*`
`1611`	`1615`	`This changes the minimum allowed number of vertices in a VBO.`
`1612`	`1616`	`Default is 500.`
Original file line number	Diff line number	Diff line change
`@@ -411,6 +411,9 @@ inline const char * getPlatformName()`
`411`	`411`	`;`
`412`	`412`	`}`
`413`	`413`
	`414`	`+void setXorgClassHint(const video::SExposedVideoData &video_data,`
	`415`	`+ const std::string &name);`
	`416`	`+`
`414`	`417`	`} // namespace porting`
`415`	`418`
`416`	`419`	`#ifdef __ANDROID__`