epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #8001 from RoosterDragon/hardware-cursor-fixes

Browse Source 
Hardware cursor fixes
This commit is contained in:
Oliver Brakmann
2015-04-30 20:24:19 +02:00
parent 16c61cb929 13078c820b
commit 583b89eb17
2 changed files with 55 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenRA.Game/Game.cs
View File

@@ -309,6 +309,9 @@ namespace OpenRA
using (new PerfTimer("LoadMaps")) using (new PerfTimer("LoadMaps"))
ModData.MapCache.LoadMaps(); ModData.MapCache.LoadMaps();
if (Cursor != null)
Cursor.Dispose();
if (Settings.Graphics.HardwareCursors) if (Settings.Graphics.HardwareCursors)
{ {
try try

66
OpenRA.Renderer.Sdl2/Sdl2GraphicsDevice.cs
View File

@@ -106,11 +106,14 @@ namespace OpenRA.Renderer.Sdl2
public IHardwareCursor CreateHardwareCursor(string name, Size size, byte[] data, int2 hotspot) public IHardwareCursor CreateHardwareCursor(string name, Size size, byte[] data, int2 hotspot)
{ {
var c = new SDL2HardwareCursor(size, data, hotspot); try
if (c.Cursor == IntPtr.Zero) {
throw new InvalidDataException("Failed to create hardware cursor `{0}`: {1}".F(name, SDL.SDL_GetError())); return new SDL2HardwareCursor(size, data, hotspot);
}
return c; catch (Exception ex)
{
throw new InvalidDataException("Failed to create hardware cursor `{0}`".F(name), ex);
}
} }
public void SetHardwareCursor(IHardwareCursor cursor) public void SetHardwareCursor(IHardwareCursor cursor)
@@ -125,24 +128,59 @@ namespace OpenRA.Renderer.Sdl2
} }
} }
class SDL2HardwareCursor : IHardwareCursor sealed class SDL2HardwareCursor : IHardwareCursor
{ {
public readonly IntPtr Cursor; public IntPtr Cursor { get; private set; }
readonly IntPtr surface; IntPtr surface;
public SDL2HardwareCursor(Size size, byte[] data, int2 hotspot) public SDL2HardwareCursor(Size size, byte[] data, int2 hotspot)
{ {
surface = SDL.SDL_CreateRGBSurface(0, size.Width, size.Height, 32, 0x00FF0000, 0x0000FF00, 0x000000FF, 0xFF000000); try
{
surface = SDL.SDL_CreateRGBSurface(0, size.Width, size.Height, 32, 0x00FF0000, 0x0000FF00, 0x000000FF, 0xFF000000);
if (surface == IntPtr.Zero)
throw new InvalidDataException("Failed to create surface: {0}".F(SDL.SDL_GetError()));
var sur = (SDL2.SDL.SDL_Surface)Marshal.PtrToStructure(surface, typeof(SDL2.SDL.SDL_Surface)); var sur = (SDL2.SDL.SDL_Surface)Marshal.PtrToStructure(surface, typeof(SDL2.SDL.SDL_Surface));
Marshal.Copy(data, 0, sur.pixels, data.Length); Marshal.Copy(data, 0, sur.pixels, data.Length);
Cursor = SDL.SDL_CreateColorCursor(surface, hotspot.X, hotspot.Y);
// This call very occasionally fails on Windows, but often works when retried.
for (var retries = 0; retries < 3 && Cursor == IntPtr.Zero; retries++)
Cursor = SDL.SDL_CreateColorCursor(surface, hotspot.X, hotspot.Y);
if (Cursor == IntPtr.Zero)
throw new InvalidDataException("Failed to create cursor: {0}".F(SDL.SDL_GetError()));
}
catch
{
Dispose();
throw;
}
}
~SDL2HardwareCursor()
{
Game.RunAfterTick(() => Dispose(false));
} }
public void Dispose() public void Dispose()
{ {
SDL.SDL_FreeCursor(Cursor); Game.RunAfterTick(() => Dispose(true));
SDL.SDL_FreeSurface(surface); GC.SuppressFinalize(this);
}
void Dispose(bool disposing)
{
if (Cursor != IntPtr.Zero)
{
SDL.SDL_FreeCursor(Cursor);
Cursor = IntPtr.Zero;
}
if (surface != IntPtr.Zero)
{
SDL.SDL_FreeSurface(surface);
surface = IntPtr.Zero;
}
} }
} }