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

OPENGL: Prevent access to a few more members in the SDL OpenGL code.

Browse source
This commit is contained in:
Johannes Schickel 2012-02-15 02:09:46 +01:00
parent 05af37c08e
commit 5b3ebdf43d
3 changed files with 17 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -594,10 +594,8 @@ void OpenGLGraphicsManager::warpMouse(int x, int y) {
scaledY += _displayY; scaledY += _displayY;
} }
setMousePosition(scaledX, scaledY);
setInternalMousePosition(scaledX, scaledY); setInternalMousePosition(scaledX, scaledY);
_cursorState.x = scaledX;
_cursorState.y = scaledY;
} }
void OpenGLGraphicsManager::setMouseCursor(const byte *buf, uint w, uint h, int hotspotX, int hotspotY, uint32 keycolor, int cursorTargetScale, const Graphics::PixelFormat *format) { void OpenGLGraphicsManager::setMouseCursor(const byte *buf, uint w, uint h, int hotspotX, int hotspotY, uint32 keycolor, int cursorTargetScale, const Graphics::PixelFormat *format) {

19
backends/graphics/opengl/opengl-graphics.h
View file

@ -217,6 +217,7 @@ protected:
uint getAspectRatio() const; uint getAspectRatio() const;
void setFormatIsBGR(bool isBGR) { _formatBGR = isBGR; }
bool _formatBGR; bool _formatBGR;
// //
@ -285,6 +286,14 @@ protected:
int _cursorTargetScale; int _cursorTargetScale;
bool _cursorNeedsRedraw; bool _cursorNeedsRedraw;
/**
* Set up the mouse position for graphics output.
*
* @param x X coordinate in native coordinates.
* @param y Y coordinate in native coordinates.
*/
void setMousePosition(int x, int y) { _cursorState.x = x; _cursorState.y = y; }
virtual void refreshCursor(); virtual void refreshCursor();
virtual void refreshCursorScale(); virtual void refreshCursorScale();
@ -311,11 +320,6 @@ protected:
virtual bool saveScreenshot(const char *filename); virtual bool saveScreenshot(const char *filename);
#ifdef USE_OSD #ifdef USE_OSD
/**
* The OSD contents.
*/
Common::Array<Common::String> _osdLines;
/** /**
* Returns the font used for on screen display * Returns the font used for on screen display
*/ */
@ -326,6 +330,11 @@ protected:
*/ */
void updateOSD(); void updateOSD();
/**
* The OSD contents.
*/
Common::Array<Common::String> _osdLines;
GLTexture *_osdTexture; GLTexture *_osdTexture;
Graphics::Surface _osdSurface; Graphics::Surface _osdSurface;
uint8 _osdAlpha; uint8 _osdAlpha;

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

@ -376,7 +376,7 @@ bool OpenGLSdlGraphicsManager::loadGFXMode() {
} }
// Check if the screen is BGR format // Check if the screen is BGR format
_formatBGR = _hwscreen->format->Rshift != 0; setFormatIsBGR(_hwscreen->format->Rshift != 0);
if (isFullscreen) { if (isFullscreen) {
_lastFullscreenModeWidth = _videoMode.hardwareWidth; _lastFullscreenModeWidth = _videoMode.hardwareWidth;
@ -671,8 +671,7 @@ void OpenGLSdlGraphicsManager::transformMouseCoordinates(Common::Point &point) {
} }
void OpenGLSdlGraphicsManager::notifyMousePos(Common::Point mouse) { void OpenGLSdlGraphicsManager::notifyMousePos(Common::Point mouse) {
_cursorState.x = mouse.x; setMousePosition(mouse.x, mouse.y);
_cursorState.y = mouse.y;
} }
#endif #endif