thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SDL: Refactor WM specific functionality into SdlGraphicsManager.

Browse source
This commit is contained in:
Johannes Schickel 2015-01-24 23:42:12 +01:00
parent 4e1ffc9434
commit 3a2db0135d
10 changed files with 88 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

15
backends/events/sdl/sdl-events.cpp
View file

@ -173,7 +173,9 @@ void SdlEventSource::handleKbdMouse() {
_km.y_down_count = 1;
}
SDL_WarpMouse((Uint16)_km.x, (Uint16)_km.y);
if (_graphicsManager) {
_graphicsManager->warpMouseInWindow((Uint16)_km.x, (Uint16)_km.y);
}
}
}
}
@ -429,7 +431,9 @@ bool SdlEventSource::handleKeyDown(SDL_Event &ev, Common::Event &event) {
// Ctrl-m toggles mouse capture
if (event.kbd.hasFlags(Common::KBD_CTRL) && ev.key.keysym.sym == 'm') {
toggleMouseGrab();
if (_graphicsManager) {
_graphicsManager->toggleMouseGrab();
}
return false;
}
@ -752,13 +756,6 @@ bool SdlEventSource::remapKey(SDL_Event &ev, Common::Event &event) {
return false;
}
void SdlEventSource::toggleMouseGrab() {
if (SDL_WM_GrabInput(SDL_GRAB_QUERY) == SDL_GRAB_OFF)
SDL_WM_GrabInput(SDL_GRAB_ON);
else
SDL_WM_GrabInput(SDL_GRAB_OFF);
}
void SdlEventSource::resetKeyboadEmulation(int16 x_max, int16 y_max) {
_km.x_max = x_max;
_km.y_max = y_max;

5
backends/events/sdl/sdl-events.h
View file

@ -49,11 +49,6 @@ public:
*/
virtual void resetKeyboadEmulation(int16 x_max, int16 y_max);
/**
* Toggles mouse input grab
*/
virtual void toggleMouseGrab();
protected:
/** @name Keyboard mouse emulation
* Disabled by fingolfin 2004-12-18.

4
backends/events/symbiansdl/symbiansdl-events.cpp
View file

@ -133,7 +133,9 @@ bool SymbianSdlEventSource::remapKey(SDL_Event &ev, Common::Event &event) {
_currentZone = 0;
event.type = Common::EVENT_MOUSEMOVE;
processMouseEvent(event, _mouseXZone[_currentZone], _mouseYZone[_currentZone]);
SDL_WarpMouse(event.mouse.x, event.mouse.y);
if (_graphicsManager) {
_graphicsManager->warpMouseInWindow(event.mouse.x, event.mouse.y);
}
}
return true;

2
backends/graphics/dinguxsdl/dinguxsdl-graphics.cpp
View file

@ -122,7 +122,7 @@ void DINGUXSdlGraphicsManager::initSize(uint w, uint h) {
if (w > 320 || h > 240) {
setGraphicsMode(GFX_HALF);
setGraphicsModeIntern();
_eventSource->toggleMouseGrab();
toggleMouseGrab();
}
_transactionDetails.sizeChanged = true;

2
backends/graphics/linuxmotosdl/linuxmotosdl-graphics.cpp
View file

@ -134,7 +134,7 @@ void LinuxmotoSdlGraphicsManager::initSize(uint w, uint h) {
if (w > 320 || h > 240) {
setGraphicsMode(GFX_HALF);
setGraphicsModeIntern();
_eventSource->toggleMouseGrab();
toggleMouseGrab();
}
_transactionDetails.sizeChanged = true;

4
backends/graphics/openglsdl/openglsdl-graphics.cpp
View file

@ -108,7 +108,7 @@ void OpenGLSdlGraphicsManager::setFeatureState(OSystem::Feature f, bool enable)
case OSystem::kFeatureIconifyWindow:
if (enable) {
SDL_WM_IconifyWindow();
iconifyWindow();
}
break;
@ -229,7 +229,7 @@ void OpenGLSdlGraphicsManager::notifyMousePos(Common::Point mouse) {
}
void OpenGLSdlGraphicsManager::setInternalMousePosition(int x, int y) {
SDL_WarpMouse(x, y);
warpMouseInWindow(x, y);
}
bool OpenGLSdlGraphicsManager::loadVideoMode(uint requestedWidth, uint requestedHeight, const Graphics::PixelFormat &format) {

31
backends/graphics/sdl/sdl-graphics.cpp
View file

@ -22,7 +22,9 @@
#include "backends/graphics/sdl/sdl-graphics.h"
#include "backends/platform/sdl/sdl-sys.h"
#include "backends/events/sdl/sdl-events.h"
#include "common/textconsole.h"
SdlGraphicsManager::SdlGraphicsManager(SdlEventSource *source)
: _eventSource(source) {
@ -38,3 +40,32 @@ void SdlGraphicsManager::activateManager() {
void SdlGraphicsManager::deactivateManager() {
_eventSource->setGraphicsManager(0);
}
void SdlGraphicsManager::setWindowCaption(const Common::String &caption) {
SDL_WM_SetCaption(caption.c_str(), caption.c_str());
}
void SdlGraphicsManager::setWindowIcon(SDL_Surface *icon) {
SDL_WM_SetIcon(icon, NULL);
SDL_FreeSurface(icon);
}
void SdlGraphicsManager::toggleMouseGrab() {
if (SDL_WM_GrabInput(SDL_GRAB_QUERY) == SDL_GRAB_OFF) {
SDL_WM_GrabInput(SDL_GRAB_ON);
} else {
SDL_WM_GrabInput(SDL_GRAB_OFF);
}
}
bool SdlGraphicsManager::hasMouseFocus() const {
return (SDL_GetAppState() & SDL_APPMOUSEFOCUS);
}
void SdlGraphicsManager::warpMouseInWindow(uint x, uint y) {
SDL_WarpMouse(x, y);
}
void SdlGraphicsManager::iconifyWindow() {
SDL_WM_IconifyWindow();
}

38
backends/graphics/sdl/sdl-graphics.h
View file

@ -25,7 +25,9 @@
#include "backends/graphics/graphics.h"
#include "backends/platform/sdl/sdl-sys.h"
#include "common/rect.h"
#include "common/str.h"
class SdlEventSource;
@ -91,6 +93,42 @@ public:
*/
virtual void notifyMousePos(Common::Point mouse) = 0;
/**
* Change the caption of the window.
*
* @param caption New window caption in UTF-8 encoding.
*/
void setWindowCaption(const Common::String &caption);
/**
* Attach an icon to the window.
*
* @param icon The surface to use as icon. SdlGraphicsManager takes
* ownership over it.
*/
void setWindowIcon(SDL_Surface *icon);
/**
* Toggle mouse grab state. This decides whether the cursor can leave the
* window or not.
*/
void toggleMouseGrab();
/**
* Check whether the application has mouse focus.
*/
bool hasMouseFocus() const;
/**
* Warp the mouse to the specified position in window coordinates.
*/
void warpMouseInWindow(uint x, uint y);
/**
* Iconifies the window.
*/
void iconifyWindow();
protected:
SdlEventSource *_eventSource;
};

8
backends/graphics/surfacesdl/surfacesdl-graphics.cpp
View file

@ -235,7 +235,7 @@ void SurfaceSdlGraphicsManager::setFeatureState(OSystem::Feature f, bool enable)
break;
case OSystem::kFeatureIconifyWindow:
if (enable)
SDL_WM_IconifyWindow();
iconifyWindow();
break;
default:
break;
@ -1710,7 +1710,7 @@ void SurfaceSdlGraphicsManager::warpMouse(int x, int y) {
int y1 = y;
// Don't change actual mouse position, when mouse is outside of our window (in case of windowed mode)
if (!(SDL_GetAppState( ) & SDL_APPMOUSEFOCUS)) {
if (!hasMouseFocus()) {
setMousePos(x, y); // but change game cursor position
return;
}
@ -1720,9 +1720,9 @@ void SurfaceSdlGraphicsManager::warpMouse(int x, int y) {
if (_mouseCurState.x != x || _mouseCurState.y != y) {
if (!_overlayVisible)
SDL_WarpMouse(x * _videoMode.scaleFactor, y1 * _videoMode.scaleFactor);
warpMouseInWindow(x * _videoMode.scaleFactor, y1 * _videoMode.scaleFactor);
else
SDL_WarpMouse(x, y1);
warpMouseInWindow(x, y1);
// SDL_WarpMouse() generates a mouse movement event, so
// setMousePos() would be called eventually. However, the

5
backends/platform/sdl/sdl.cpp
View file

@ -314,7 +314,7 @@ void OSystem_SDL::setWindowCaption(const char *caption) {
}
}
SDL_WM_SetCaption(cap.c_str(), cap.c_str());
dynamic_cast<SdlGraphicsManager *>(_graphicsManager)->setWindowCaption(cap);
}
void OSystem_SDL::quit() {
@ -477,8 +477,7 @@ void OSystem_SDL::setupIcon() {
if (!sdl_surf) {
warning("SDL_CreateRGBSurfaceFrom(icon) failed");
}
SDL_WM_SetIcon(sdl_surf, NULL);
SDL_FreeSurface(sdl_surf);
dynamic_cast<SdlGraphicsManager *>(_graphicsManager)->setWindowIcon(sdl_surf);
free(icon);
}