diff options
| author | kwolekr <kwolekr@minetest.net> | 2014-12-15 13:47:31 -0500 |
|---|---|---|
| committer | kwolekr <kwolekr@minetest.net> | 2014-12-15 13:52:10 -0500 |
| commit | 8661b3587b4854f18f747a5577d0bb62998e569d (patch) | |
| tree | 51286cb31aa2d29c17a2c2e7eea23de976fdee0a | |
| parent | 8fe1d3fc2e4564fd30658c7008ef7a0e6161e2d3 (diff) | |
| download | minetest-8661b3587b4854f18f747a5577d0bb62998e569d.tar.gz minetest-8661b3587b4854f18f747a5577d0bb62998e569d.tar.bz2 minetest-8661b3587b4854f18f747a5577d0bb62998e569d.zip | |
Set WM_CLASS window hint for Xorg
| -rw-r--r-- | src/main.cpp | 6 | ||||
| -rw-r--r-- | src/porting.cpp | 24 | ||||
| -rw-r--r-- | src/porting.h | 3 |
3 files changed, 32 insertions, 1 deletions
diff --git a/src/main.cpp b/src/main.cpp index ed9800f00..0c5f73b23 100644 --- 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 index 42ee2ffe2..e1a062ecd 100644 --- 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 index b6f71103d..a184af8b8 100644 --- 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__ |