ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup moving window & giving class hints

Browse Source 
* Add a function to irr_driver to move a window to (x, y)
 * Use this function in initDevice and move the call to later on it.
 * Also move the Linux WM classhints down a bit


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11402 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
wardje
2012-07-18 02:45:34 +00:00
parent ff6abc1c59
commit 6708d2c31e
3 changed files with 59 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

102
src/graphics/irr_driver.cpp
View File

@@ -317,51 +317,19 @@ void IrrDriver::initDevice()
fprintf(stderr, "Couldn't initialise irrlicht device. Quitting.\n");
exit(-1);
}
if (!UserConfigParams::m_fullscreen && UserConfigParams::m_remember_window_location &&
UserConfigParams::m_window_x >= 0 && UserConfigParams::m_window_y >= 0)
{
#ifdef WIN32
const SExposedVideoData& videoData = m_device->getVideoDriver()->getExposedVideoData();
// this should work even if using DirectX in theory because the HWnd is
// always third pointer in the struct, no matter which union is used
HWND window = (HWND)videoData.OpenGLWin32.HWnd;
if (SetWindowPos(window, HWND_TOP, UserConfigParams::m_window_x, UserConfigParams::m_window_y,
-1, -1, SWP_NOOWNERZORDER | SWP_NOSIZE))
{
// everything OK
}
else
{
printf("[IrrDriver] WARNING: Could not set window location\n");
}
#elif defined(__linux__)
using namespace X11;
const SExposedVideoData& videoData = m_device->getVideoDriver()->getExposedVideoData();
//XSetWindowAttributes attr;
//attr.override_redirect = True;
//XChangeWindowAttributes( (Display*)videoData.OpenGLLinux.X11Display, videoData.OpenGLLinux.X11Window, CWOverrideRedirect, &attr );
// FIXME: doesn't work
XMoveWindow((Display*)videoData.OpenGLLinux.X11Display, videoData.OpenGLLinux.X11Window,
UserConfigParams::m_window_x, UserConfigParams::m_window_y);
//attr.override_redirect = False;
//XChangeWindowAttributes( (Display*)videoData.OpenGLLinux.X11Display, videoData.OpenGLLinux.X11Window, CWOverrideRedirect, &attr );
m_scene_manager = m_device->getSceneManager();
m_gui_env = m_device->getGUIEnvironment();
m_video_driver = m_device->getVideoDriver();
#endif
}
#if defined(__linux__)
// Only change video driver settings if we are showing graphics
if (!ProfileWorld::isNoGraphics())
{
#if defined(__linux__)
// Set class hints on Linux, used by Window Managers.
using namespace X11;
const SExposedVideoData& videoData = m_device->getVideoDriver()
->getExposedVideoData();
const SExposedVideoData& videoData = m_video_driver
->getExposedVideoData();
XClassHint* classhint = XAllocClassHint();
classhint->res_name = (char*)"SuperTuxKart";
classhint->res_class = (char*)"SuperTuxKart";
@@ -369,15 +337,7 @@ void IrrDriver::initDevice()
videoData.OpenGLLinux.X11Window,
classhint);
XFree(classhint);
}
#endif
m_scene_manager = m_device->getSceneManager();
m_gui_env = m_device->getGUIEnvironment();
m_video_driver = m_device->getVideoDriver();
// Only change video driver settings if we are showing graphics
if (!ProfileWorld::isNoGraphics()) {
m_device->setResizable(false);
m_device->setWindowCaption(L"SuperTuxKart");
m_device->getVideoDriver()
@@ -393,7 +353,17 @@ void IrrDriver::initDevice()
// does not set the 'enable mipmap' flag.
m_scene_manager->getParameters()
->setAttribute(scene::B3D_LOADER_IGNORE_MIPMAP_FLAG, true);
}
// Set window to remembered position
if ( !UserConfigParams::m_fullscreen
&& UserConfigParams::m_remember_window_location
&& UserConfigParams::m_window_x >= 0
&& UserConfigParams::m_window_y >= 0 )
{
moveWindow(UserConfigParams::m_window_x,
UserConfigParams::m_window_y);
} // If reinstating window location
} // If showing graphics
// Stores the new file system pointer.
file_manager->reInit();
@@ -499,6 +469,40 @@ core::position2di IrrDriver::getMouseLocation()
return this->getDevice()->getCursorControl()->getPosition();
}
//-----------------------------------------------------------------------------
/** Moves the STK main window to coordinates (x,y)
* \return true on success, false on failure
* (always true on Linux at the moment)
*/
bool IrrDriver::moveWindow(const int x, const int y)
{
const SExposedVideoData& videoData = m_video_driver->getExposedVideoData();
#ifdef WIN32
// this should work even if using DirectX in theory,
// because the HWnd is always third pointer in the struct,
// no matter which union is used
HWND window = (HWND)videoData.OpenGLWin32.HWnd;
if (SetWindowPos(window, HWND_TOP, x, y, -1, -1,
SWP_NOOWNERZORDER | SWP_NOSIZE))
{
// everything OK
return true;
}
else
{
printf("[IrrDriver] WARNING: Could not set window location\n");
return false;
}
#elif defined(__linux__)
using namespace X11;
// TODO: Actually handle possible failure
XMoveWindow((Display*)videoData.OpenGLLinux.X11Display,
videoData.OpenGLLinux.X11Window,
x, y);
#endif
return true;
}
//-----------------------------------------------------------------------------
void IrrDriver::changeResolution(const int w, const int h,

2
src/graphics/irr_driver.hpp
View File

@@ -188,6 +188,8 @@ public:
void changeResolution(const int w, const int h, const bool fullscreen);
/** Call this to roll back to the previous resolution if a resolution switch attempt goes bad */
void cancelResChange();
bool moveWindow(const int x, const int y);
void showPointer();
void hidePointer();

8
src/karts/kart.hpp
View File

@@ -101,8 +101,8 @@ private:
/** Current race position (1-num_karts). */
int m_race_position;
/** True if the kart is eliminated. */
bool m_eliminated;
/** True if the kart is eliminated. */
bool m_eliminated;
/** For stars rotating around head effect */
Stars *m_stars_effect;
@@ -379,8 +379,8 @@ public:
* the upright constraint to allow for more realistic explosions. */
bool isNearGround () const;
// ------------------------------------------------------------------------
/** Returns true if the kart is eliminated. */
virtual bool isEliminated() const { return m_eliminated; }
/** Returns true if the kart is eliminated. */
virtual bool isEliminated() const { return m_eliminated; }
// ------------------------------------------------------------------------
virtual void eliminate();
// ------------------------------------------------------------------------