Skip to content
Permalink
Browse files

Set WM_CLASS window hint for Xorg

  • Loading branch information
kwolekr committed Dec 15, 2014
1 parent 8fe1d3f commit 8661b3587b4854f18f747a5577d0bb62998e569d
Showing with 32 additions and 1 deletion.
  1. +5 −1 src/main.cpp
  2. +24 −0 src/porting.cpp
  3. +3 −0 src/porting.h
@@ -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.
@@ -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();
@@ -411,6 +411,9 @@ inline const char * getPlatformName()
;
}

void setXorgClassHint(const video::SExposedVideoData &video_data,
const std::string &name);

} // namespace porting

#ifdef __ANDROID__

0 comments on commit 8661b35

Please sign in to comment.