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

Converted OSystem::SetMouseCursor to take pointer to PixelFormat, instead of full PixelFormat. Removed OSystem::setCursorFormat (since I forgot to do so several commits ago)

Browse source 
svn-id: r41901
This commit is contained in:
Jody Northup 2009-06-26 10:37:00 +00:00
parent 2859c91304
commit 27e50db5d7
4 changed files with 12 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

18
backends/platform/sdl/graphics.cpp
View file

@ -1162,15 +1162,7 @@ void OSystem_SDL::setCursorPalette(const byte *colors, uint start, uint num) {
} }
_cursorPaletteDisabled = false; _cursorPaletteDisabled = false;
#ifdef ENABLE_RGB_COLOR blitCursor();
}
void OSystem_SDL::setCursorFormat(Graphics::PixelFormat format) {
assert(format.bytesPerPixel);
_cursorFormat = format;
#endif
// blitCursor();
} }
@ -1378,10 +1370,12 @@ void OSystem_SDL::warpMouse(int x, int y) {
} }
} }
void OSystem_SDL::setMouseCursor(const byte *buf, uint w, uint h, int hotspot_x, int hotspot_y, uint32 keycolor, int cursorTargetScale, Graphics::PixelFormat format) { void OSystem_SDL::setMouseCursor(const byte *buf, uint w, uint h, int hotspot_x, int hotspot_y, uint32 keycolor, int cursorTargetScale, Graphics::PixelFormat *format) {
#ifdef ENABLE_RGB_COLOR #ifdef ENABLE_RGB_COLOR
if (format.bytesPerPixel <= _screenFormat.bytesPerPixel) if (!format)
_cursorFormat = format; format = new Graphics::PixelFormat(1,8,8,8,8,0,0,0,0);
if (format->bytesPerPixel <= _screenFormat.bytesPerPixel)
_cursorFormat = *format;
keycolor &= (1 << (_cursorFormat.bytesPerPixel << 3)) - 1; keycolor &= (1 << (_cursorFormat.bytesPerPixel << 3)) - 1;
#else #else
keycolor &= 0xFF; keycolor &= 0xFF;

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

@ -152,10 +152,7 @@ public:
virtual void warpMouse(int x, int y); // overloaded by CE backend (FIXME) virtual void warpMouse(int x, int y); // overloaded by CE backend (FIXME)
// Set the bitmap that's used when drawing the cursor. // Set the bitmap that's used when drawing the cursor.
virtual void setMouseCursor(const byte *buf, uint w, uint h, int hotspot_x, int hotspot_y, uint32 keycolor, int cursorTargetScale, Graphics::PixelFormat format); // overloaded by CE backend (FIXME) virtual void setMouseCursor(const byte *buf, uint w, uint h, int hotspot_x, int hotspot_y, uint32 keycolor, int cursorTargetScale, Graphics::PixelFormat *format); // overloaded by CE backend (FIXME)
#ifdef ENABLE_RGB_COLOR
virtual void setCursorFormat(Graphics::PixelFormat format);
#endif
// Set colors of cursor palette // Set colors of cursor palette
void setCursorPalette(const byte *colors, uint start, uint num); void setCursorPalette(const byte *colors, uint start, uint num);

8
common/system.h
View file

@ -732,13 +732,9 @@ public:
* @param hotspotY vertical offset from the top side to the hotspot * @param hotspotY vertical offset from the top side to the hotspot
* @param keycolor transparency color index * @param keycolor transparency color index
* @param cursorTargetScale scale factor which cursor is designed for * @param cursorTargetScale scale factor which cursor is designed for
* @param format pixel format which cursor graphic uses * @param format pointer to the pixel format which cursor graphic uses
*/ */
virtual void setMouseCursor(const byte *buf, uint w, uint h, int hotspotX, int hotspotY, uint32 keycolor = 0xFFFFFFFF, int cursorTargetScale = 1, Graphics::PixelFormat format = Graphics::PixelFormat::createFormatCLUT8()) = 0; virtual void setMouseCursor(const byte *buf, uint w, uint h, int hotspotX, int hotspotY, uint32 keycolor = 0xFFFFFFFF, int cursorTargetScale = 1, Graphics::PixelFormat *format = NULL) = 0;
#ifdef ENABLE_RGB_COLOR
virtual void setCursorFormat(Graphics::PixelFormat format) = 0;
#endif
/** /**
* Replace the specified range of cursor the palette with new colors. * Replace the specified range of cursor the palette with new colors.

6
graphics/cursorman.cpp
View file

@ -64,7 +64,7 @@ void CursorManager::pushCursor(const byte *buf, uint w, uint h, int hotspotX, in
_cursorStack.push(cur); _cursorStack.push(cur);
if (buf) { if (buf) {
g_system->setMouseCursor(cur->_data, w, h, hotspotX, hotspotY, keycolor, targetScale, *format); g_system->setMouseCursor(cur->_data, w, h, hotspotX, hotspotY, keycolor, targetScale, format);
} }
} }
@ -77,7 +77,7 @@ void CursorManager::popCursor() {
if (!_cursorStack.empty()) { if (!_cursorStack.empty()) {
cur = _cursorStack.top(); cur = _cursorStack.top();
g_system->setMouseCursor(cur->_data, cur->_width, cur->_height, cur->_hotspotX, cur->_hotspotY, cur->_keycolor, cur->_targetScale, cur->_format); g_system->setMouseCursor(cur->_data, cur->_width, cur->_height, cur->_hotspotX, cur->_hotspotY, cur->_keycolor, cur->_targetScale, &(cur->_format));
} }
g_system->showMouse(isVisible()); g_system->showMouse(isVisible());
@ -137,7 +137,7 @@ void CursorManager::replaceCursor(const byte *buf, uint w, uint h, int hotspotX,
cur->_format = *format; cur->_format = *format;
#endif #endif
g_system->setMouseCursor(cur->_data, w, h, hotspotX, hotspotY, keycolor, targetScale, *format); g_system->setMouseCursor(cur->_data, w, h, hotspotX, hotspotY, keycolor, targetScale, format);
} }
void CursorManager::disableCursorPalette(bool disable) { void CursorManager::disableCursorPalette(bool disable) {