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

xrandr: move restore resolution to separated function because it makes a mess...

Browse Source
This commit is contained in:
Deve 2014-08-20 19:36:44 +02:00
parent 56fa56a38f
commit c2cf83bb6a
2 changed files with 56 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.cpp
View File

@ -194,7 +194,7 @@ CIrrDeviceLinux::~CIrrDeviceLinux()
} }
// Reset fullscreen resolution change // Reset fullscreen resolution change
switchToFullscreen(true); restoreResolution();
if (!ExternalWindow) if (!ExternalWindow)
{ {
@ -235,13 +235,11 @@ int IrrPrintXError(Display *display, XErrorEvent *event)
} }
#endif #endif
bool CIrrDeviceLinux::restoreResolution()
bool CIrrDeviceLinux::switchToFullscreen(bool reset)
{ {
if (!CreationParams.Fullscreen) if (!CreationParams.Fullscreen)
return true; return true;
if (reset)
{
#ifdef _IRR_LINUX_X11_VIDMODE_ #ifdef _IRR_LINUX_X11_VIDMODE_
if (UseXVidMode && CreationParams.Fullscreen) if (UseXVidMode && CreationParams.Fullscreen)
{ {
@ -287,9 +285,16 @@ bool CIrrDeviceLinux::switchToFullscreen(bool reset)
} }
#endif #endif
return true; return true;
} }
bool CIrrDeviceLinux::switchToFullscreen()
{
if (!CreationParams.Fullscreen)
return true;
getVideoModeList(); getVideoModeList();
#if defined(_IRR_LINUX_X11_VIDMODE_) || defined(_IRR_LINUX_X11_RANDR_) #if defined(_IRR_LINUX_X11_VIDMODE_) || defined(_IRR_LINUX_X11_RANDR_)
s32 eventbase, errorbase; s32 eventbase, errorbase;
s32 bestMode = -1; s32 bestMode = -1;

3
lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.h
View File

@ -150,7 +150,8 @@ namespace irr
void initXAtoms(); void initXAtoms();
bool switchToFullscreen(bool reset=false); bool restoreResolution();
bool switchToFullscreen();
//! Implementation of the linux cursor control //! Implementation of the linux cursor control
class CCursorControl : public gui::ICursorControl class CCursorControl : public gui::ICursorControl