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

SDL: Fix typo in function name

Browse source
This commit is contained in:
Ori Avtalion 2016-10-18 19:24:51 +03:00
parent d890f99c85
commit fc85eb461d
5 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -848,7 +848,7 @@ bool SdlEventSource::remapKey(SDL_Event &ev, Common::Event &event) {
return false;
}
void SdlEventSource::resetKeyboadEmulation(int16 x_max, int16 y_max) {
void SdlEventSource::resetKeyboardEmulation(int16 x_max, int16 y_max) {
_km.x_max = x_max;
_km.y_max = y_max;
_km.delay_time = 25;

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

@ -47,7 +47,7 @@ public:
/**
* Resets keyboard emulation after a video screen change
*/
virtual void resetKeyboadEmulation(int16 x_max, int16 y_max);
virtual void resetKeyboardEmulation(int16 x_max, int16 y_max);
protected:
/** @name Keyboard mouse emulation

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

@ -360,7 +360,7 @@ void OpenGLSdlGraphicsManager::notifyResize(const uint width, const uint height)
if (width != currentWidth || height != currentHeight)
return;
setActualScreenSize(width, height);
_eventSource->resetKeyboadEmulation(width - 1, height - 1);
_eventSource->resetKeyboardEmulation(width - 1, height - 1);
#else
if (!_ignoreResizeEvents && _hwScreen && !(_hwScreen->flags & SDL_FULLSCREEN)) {
// We save that we handled a resize event here. We need to know this
@ -523,7 +523,7 @@ bool OpenGLSdlGraphicsManager::setupMode(uint width, uint height) {
int actualWidth, actualHeight;
getWindowDimensions(&actualWidth, &actualHeight);
setActualScreenSize(actualWidth, actualHeight);
_eventSource->resetKeyboadEmulation(actualWidth - 1, actualHeight - 1);
_eventSource->resetKeyboardEmulation(actualWidth - 1, actualHeight - 1);
return true;
#else
// WORKAROUND: Working around infamous SDL bugs when switching
@ -569,7 +569,7 @@ bool OpenGLSdlGraphicsManager::setupMode(uint width, uint height) {
if (_hwScreen) {
notifyContextCreate(rgba8888, rgba8888);
setActualScreenSize(_hwScreen->w, _hwScreen->h);
_eventSource->resetKeyboadEmulation(_hwScreen->w - 1, _hwScreen->h - 1);
_eventSource->resetKeyboardEmulation(_hwScreen->w - 1, _hwScreen->h - 1);
}
// Ignore resize events (from SDL) for a few frames, if this isn't

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

@ -918,7 +918,7 @@ bool SurfaceSdlGraphicsManager::loadGFXMode() {
// For SDL2 the output resolution might differ from the requested
// resolution. We handle resetting the keyboard emulation properly inside
// our SDL_SetVideoMode wrapper for SDL2.
_eventSource->resetKeyboadEmulation(
_eventSource->resetKeyboardEmulation(
_videoMode.screenWidth * _videoMode.scaleFactor - 1,
effectiveScreenHeight() - 1);
#endif
@ -2562,7 +2562,7 @@ void SurfaceSdlGraphicsManager::setWindowResolution(int width, int height) {
_windowHeight = height;
// We expect full screen resolution as inputs coming from the event system.
_eventSource->resetKeyboadEmulation(_windowWidth - 1, _windowHeight - 1);
_eventSource->resetKeyboardEmulation(_windowWidth - 1, _windowHeight - 1);
// Calculate the "viewport" for the actual area we draw in. In fullscreen
// we can easily get a different resolution than what we requested. In

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

@ -934,7 +934,7 @@ bool WINCESdlGraphicsManager::loadGFXMode() {
_toolbarHigh = NULL;
// keyboard cursor control, some other better place for it?
_eventSource->resetKeyboadEmulation(_videoMode.screenWidth * _scaleFactorXm / _scaleFactorXd - 1, _videoMode.screenHeight * _scaleFactorXm / _scaleFactorXd - 1);
_eventSource->resetKeyboardEmulation(_videoMode.screenWidth * _scaleFactorXm / _scaleFactorXd - 1, _videoMode.screenHeight * _scaleFactorXm / _scaleFactorXd - 1);
return true;
}