gosu 0.7.45 → 0.7.46

data/GosuImpl/RubyGosu_wrap.h

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.9
  * 
  * This file is not intended to be easily readable and contains a number of 
  * coding conventions designed to improve portability and efficiency. Do not make

data/GosuImpl/TextInputWin.cpp

@@ -1,5 +1,5 @@
 #include <Gosu/TextInput.hpp>
-#include <Gosu/ButtonsWin.hpp>
+#include <Gosu/Buttons.hpp>
 #include <algorithm>
 #include <vector>
 #include <wctype.h>

data/GosuImpl/TextInputX.cpp

@@ -65,7 +65,9 @@ bool Gosu::TextInput::feedXEvent(void* display, void* event)
     bool shiftDown	= (ev->xkey.state & ShiftMask);
 
     KeySym lower, upper;
-    XConvertCase(XKeycodeToKeysym((Display*)display, ev->xkey.keycode, 0), &lower, &upper);
+    int keysyms_per_keycode_return;
+    KeySym keysym = (KeySym)XGetKeyboardMapping((Display*)display, ev->xkey.keycode, 0, &keysyms_per_keycode_return);
+    XConvertCase(keysym, &lower, &upper);
 
     wchar_t ch = static_cast<wchar_t>(shiftDown ? upper : lower);
 

data/GosuImpl/WinMain.cpp

@@ -4,7 +4,6 @@
 #include <vector>
 using namespace std;
 
-// IMPR: Check for security issues. I hacked this together.
 vector<string> splitCmdLine()
 {
     vector<string> result;
@@ -29,12 +28,12 @@ vector<string> splitCmdLine()
                 argBegin = 0;
             }
         }
-        else if (!isspace(*cmdLine) && argBegin == 0)
+        else if (!isspace((unsigned char)*cmdLine) && argBegin == 0)
         {
             argBegin = cmdLine;
             isQuotedArg = false;
         }
-        else if (isspace(*cmdLine) && argBegin != 0 && !isQuotedArg)
+        else if (isspace((unsigned char)*cmdLine) && argBegin != 0 && !isQuotedArg)
         {
             result.push_back(std::string(argBegin, cmdLine + 1));
             argBegin = 0;
@@ -58,7 +57,7 @@ int WINAPI WinMain(HINSTANCE, HINSTANCE, LPSTR, int)
         vector<char*> argv(arguments.size());
         for (unsigned i = 0; i < argv.size(); ++i)
             argv[i] = const_cast<char*>(arguments[i].c_str());
-	    return main(argv.size(), &argv[0]);
+        return main(argv.size(), &argv[0]);
     }
     catch (const std::exception& e)
     {

data/GosuImpl/WindowMac.mm

@@ -23,7 +23,7 @@ namespace Gosu
         void registerFrame();
     }
     
-    NSRect screenRect = [[[NSScreen screens] objectAtIndex: 0] frame];
+    NSRect screenRect = [[NSScreen mainScreen] frame];
     
     unsigned screenWidth()
     {
@@ -34,16 +34,30 @@ namespace Gosu
     {
         return screenRect.size.height;
     }
+    
+    static NSUInteger windowStyleMask = NSTitledWindowMask | NSMiniaturizableWindowMask | NSClosableWindowMask;
+    
+    void scaleDownWindowIfNecessary(unsigned& width, unsigned& height)
+    {
+        NSRect usableFrameRect = [[NSScreen mainScreen] visibleFrame];
+        NSRect usableContentRect = [NSWindow contentRectForFrameRect:usableFrameRect styleMask:windowStyleMask];
+        double factor = std::min(usableContentRect.size.width / width, usableContentRect.size.height / height);
+        if (factor < 1) {
+            width *= factor;
+            height *= factor;
+        }
+    }
 }
 
 #ifndef __LP64__
 // Workaround for Apple NSScreen bug :(
+// TODO - fill in the details ... on which systems does Gosu break without this?
 @interface NSScreen (NSScreenAccess)
-- (void) setFrame:(NSRect)frame;
+- (void)setFrame:(NSRect)frame;
 @end
 
 @implementation NSScreen (NSScreenAccess)
-- (void) setFrame:(NSRect)frame;
+- (void)setFrame:(NSRect)frame;
 {
     _frame = frame;
 }
@@ -94,40 +108,40 @@ namespace
 
 typedef void (*WindowProc)(Gosu::Window&);
 
-@interface GosuForwarder : NSObject
+@interface GosuForwarder : NSObject<NSWindowDelegate>
 {
     Gosu::Window* win;
     WindowProc pr;
 }
-- (id)initWithWindow: (Gosu::Window*)window withProc:(WindowProc)proc;
-- (void)doTick: (NSTimer*)timer;
-- (BOOL)windowShouldClose: (id)sender;
+- (id)initWithWindow:(Gosu::Window *)window withProc:(WindowProc)proc;
+- (void)doTick:(NSTimer *)timer;
+- (BOOL)windowShouldClose:(id)sender;
 @end
 
 @implementation GosuForwarder
-- (id)initWithWindow: (Gosu::Window*)window withProc:(WindowProc)proc
+- (id)initWithWindow:(Gosu::Window*)window withProc:(WindowProc)proc
 {
-    if (![super init])
-        return nil;
-    win = window;
-    pr = proc;
+    if ((self = [super init])) {
+        win = window;
+        pr = proc;
+    }
     return self;
 }
 
-- (void)doTick: (NSTimer*)timer
+- (void)doTick:(NSTimer*)timer
 {
     pr(*win);
 }
 
-- (BOOL)windowShouldClose: (id)sender
+- (BOOL)windowShouldClose:(id)sender
 {
-    [NSApp stop: nil];
+    [NSApp stop:nil];
     return YES;
 }
 @end
 
 #define OVERRIDE_METHOD(method)       \
-    - (void) method: (NSEvent*) event \
+    - (void)method:(NSEvent*) event   \
     {                                 \
         _input->feedNSEvent(event);   \
     }
@@ -138,7 +152,7 @@ typedef void (*WindowProc)(Gosu::Window&);
 }
 @end
 @implementation GosuWindow
-- (void) setInput: (Gosu::Input*)input
+- (void)setInput:(Gosu::Input *)input
 {
     _input = input;
 }
@@ -155,11 +169,11 @@ OVERRIDE_METHOD(scrollWheel);
 
 @interface GosuView : NSView
 {
-    Gosu::Input* _input;
+    Gosu::Input *_input;
 }
 @end
 @implementation GosuView
-- (void) setInput: (Gosu::Input*)input
+- (void)setInput:(Gosu::Input *)input
 {
     _input = input;
     
@@ -201,12 +215,11 @@ struct Gosu::Window::Impl
     void createWindow(unsigned width, unsigned height)
     {
         NSRect rect = NSMakeRect(0, 0, width, height);
-        unsigned style = NSTitledWindowMask | NSMiniaturizableWindowMask | NSClosableWindowMask;
-        window.reset([[GosuWindow alloc] initWithContentRect:rect styleMask:style 
+        window.reset([[GosuWindow alloc] initWithContentRect:rect styleMask:windowStyleMask 
                                          backing:NSBackingStoreBuffered defer:NO]);
         [window.obj() retain]; // TODO: Why?
         
-        [window.obj() setContentView: [[GosuView alloc] init]];
+        [window.obj() setContentView:[[GosuView alloc] init]];
         [window.obj() center];
     }
     
@@ -222,6 +235,11 @@ Gosu::Window::Window(unsigned width, unsigned height, bool fullscreen,
                      double updateInterval)
 : pimpl(new Impl)
 {
+    if (fullscreen) {
+        NSLog(@"Fullscreen mode is temporarily unavailable on OS X; see https://github.com/jlnr/gosu/issues/157");
+        fullscreen = false;
+    }
+    
     pimpl->pool.reset([[NSAutoreleasePool alloc] init]); // <- necessary...?
     
     // Create NSApp global variable
@@ -254,11 +272,11 @@ Gosu::Window::Window(unsigned width, unsigned height, bool fullscreen,
     
     // Create pixel format and OpenGL context
     ObjRef<NSOpenGLPixelFormat> fmt([[NSOpenGLPixelFormat alloc] initWithAttributes:attrs]);
-    if (not fmt.get())
+    if (! fmt.get())
         throw std::runtime_error("Could not find a suitable OpenGL pixel format");
-    ::context = [[NSOpenGLContext alloc] initWithFormat: fmt.obj() shareContext:nil];
+    ::context = [[NSOpenGLContext alloc] initWithFormat:fmt.obj() shareContext:nil];
     pimpl->context.reset(context);
-    if (not pimpl->context.get())
+    if (! pimpl->context.get())
         throw std::runtime_error("Unable to create an OpenGL context with the supplied pixel format");
     
     unsigned realWidth = width, realHeight = height;
@@ -268,7 +286,7 @@ Gosu::Window::Window(unsigned width, unsigned height, bool fullscreen,
         
         // Save old mode and retrieve BPP
         pimpl->savedMode = CGDisplayCurrentMode(kCGDirectMainDisplay);
-		pimpl->savedFrame = [[NSScreen mainScreen] frame];
+        pimpl->savedFrame = [[NSScreen mainScreen] frame];
         int bpp;
         CFNumberGetValue((CFNumberRef)CFDictionaryGetValue(pimpl->savedMode, kCGDisplayBitsPerPixel),
                          kCFNumberIntType, &bpp);
@@ -283,15 +301,7 @@ Gosu::Window::Window(unsigned width, unsigned height, bool fullscreen,
     }
     else
     {
-        // Windowed: Create window large enough to display stuff
-        // This is a pretty brutal heuristic I guess.
-        
-        double factor = std::min(0.9 * screenWidth() / width,
-                                 0.8 * screenHeight() / height);
-        
-        if (factor < 1)
-            realWidth *= factor, realHeight *= factor;
-        
+        scaleDownWindowIfNecessary(realWidth, realHeight);
         pimpl->createWindow(realWidth, realHeight);
         // Tell context to draw on this window.
         [pimpl->context.obj() setView:[pimpl->window.obj() contentView]];
@@ -309,15 +319,15 @@ Gosu::Window::Window(unsigned width, unsigned height, bool fullscreen,
     pimpl->input->onButtonUp = std::tr1::bind(&Window::buttonUp, this, _1);
     pimpl->input->setMouseFactors(1.0 * width / realWidth, 1.0 * height / realHeight);
     if (fullscreen)
-        [NSApp setInput: input()];
+        [NSApp setInput:input()];
     
-    pimpl->forwarder.reset([[GosuForwarder alloc] initWithWindow: this withProc: &Impl::doTick]);
+    pimpl->forwarder.reset([[GosuForwarder alloc] initWithWindow:this withProc:&Impl::doTick]);
     
-    if (not fullscreen)
+    if (! fullscreen)
     {
-        [pimpl->window.obj() setDelegate: pimpl->forwarder.obj()];
-        [pimpl->window.obj() setInput: pimpl->input.get()];
-        [(GosuView*)[pimpl->window.obj() contentView] setInput: pimpl->input.get()];
+        [pimpl->window.obj() setDelegate:pimpl->forwarder.obj()];
+        [pimpl->window.obj() setInput:pimpl->input.get()];
+        [(GosuView*)[pimpl->window.obj() contentView] setInput:pimpl->input.get()];
         // Finally, safely hide the window.
         [pimpl->window.obj() orderOut:nil];
     }
@@ -343,7 +353,7 @@ Gosu::Window::~Window()
 
 std::wstring Gosu::Window::caption() const
 {
-    if (not pimpl->window.get())
+    if (! pimpl->window.get())
         return L"";
     
     ObjRef<NSAutoreleasePool> pool([[NSAutoreleasePool alloc] init]);
@@ -353,11 +363,11 @@ std::wstring Gosu::Window::caption() const
 
 void Gosu::Window::setCaption(const std::wstring& caption)
 {
-    if (not pimpl->window.get())
+    if (! pimpl->window.get())
         return;
     
     std::string utf8 = wstringToUTF8(caption);
-    ObjRef<NSString> title([[NSString alloc] initWithUTF8String: utf8.c_str()]);
+    ObjRef<NSString> title([[NSString alloc] initWithUTF8String:utf8.c_str()]);
     [pimpl->window.obj() setTitle: title.obj()];
 }
 
@@ -368,15 +378,15 @@ double Gosu::Window::updateInterval() const
 
 void Gosu::Window::show()
 {
-	// This is for Ruby/Gosu and misc. hackery:
-	// Usually, applications on the Mac can only get keyboard and mouse input if
-	// run by double-clicking an .app. So if this is run from the Terminal (i.e.
-	// during Ruby/Gosu game development), tell the OS we need input in any case.
-	ProcessSerialNumber psn = { 0, kCurrentProcess };
-	TransformProcessType(&psn, kProcessTransformToForegroundApplication);
+    // This is for Ruby/Gosu and misc. hackery:
+    // Usually, applications on the Mac can only get keyboard and mouse input if
+    // run by double-clicking an .app. So if this is run from the Terminal (i.e.
+    // during Ruby/Gosu game development), tell the OS we need input in any case.
+    ProcessSerialNumber psn = { 0, kCurrentProcess };
+    TransformProcessType(&psn, kProcessTransformToForegroundApplication);
     SetFrontProcess(&psn);
 
-    [NSThread setThreadPriority: 1.0];
+    [NSThread setThreadPriority:1.0];
  
     if (graphics().fullscreen())
     {
@@ -390,7 +400,7 @@ void Gosu::Window::show()
     else
         [pimpl->window.obj() makeKeyAndOrderFront:nil];
 
-    NSTimer* timer = [NSTimer scheduledTimerWithTimeInterval: pimpl->interval / 1000.0
+    NSTimer* timer = [NSTimer scheduledTimerWithTimeInterval:pimpl->interval / 1000.0
                             target:pimpl->forwarder.obj() selector:@selector(doTick:)
                             userInfo:nil repeats:YES];
     [NSApp run];
@@ -416,15 +426,15 @@ void Gosu::Window::close()
     // NSApp doesn't check its 'stopped' flag until it finishes processing
     // the next event (timers are not events), so here's a rather hacky way
     // to make sure it has one in its queue
-    [NSApp postEvent: [NSEvent otherEventWithType:NSApplicationDefined
-                               location:NSZeroPoint
-                               modifierFlags:0
-                               timestamp:0.0
-                               windowNumber:0
-                               context:NULL
-                               subtype:0
-                               data1:0
-                               data2:0] atStart:NO];
+    [NSApp postEvent:[NSEvent otherEventWithType:NSApplicationDefined
+                              location:NSZeroPoint
+                              modifierFlags:0
+                              timestamp:0.0
+                              windowNumber:0
+                              context:NULL
+                              subtype:0
+                              data1:0
+                              data2:0] atStart:NO];
 }
 
 const Gosu::Graphics& Gosu::Window::graphics() const
@@ -449,14 +459,15 @@ Gosu::Input& Gosu::Window::input()
 
 namespace
 {
-    void makeCurrentContext(NSOpenGLContext* context)
+    void makeCurrentContext(NSOpenGLContext *context)
     {
         [context makeCurrentContext];
     }
     
-    void releaseContext(NSOpenGLContext* context)
+    void releaseContextAndDelete(NSOpenGLContext *context, std::tr1::function<void()> *function)
     {
         [context release];
+        delete function;
     }
 }
 
@@ -471,16 +482,15 @@ Gosu::Window::SharedContext Gosu::Window::createSharedContext()
         (NSOpenGLPixelFormatAttribute)0
     };
     
-    NSOpenGLPixelFormat* pf =
-        [[[NSOpenGLPixelFormat alloc]
-            initWithAttributes:attributes] autorelease];
+    NSOpenGLPixelFormat* pf = [[[NSOpenGLPixelFormat alloc] initWithAttributes:attributes] autorelease];
 
-    NSOpenGLContext* ctx = [[NSOpenGLContext alloc]
-            initWithFormat: pf
-            shareContext: pimpl->context.obj()];
+    NSOpenGLContext* ctx = [[NSOpenGLContext alloc] initWithFormat:pf shareContext:pimpl->context.obj()];
     
-    return SharedContext(new std::tr1::function<void()>(std::tr1::bind(makeCurrentContext, ctx)),
-        std::tr1::bind(releaseContext, ctx));
+    // TODO: Exception safety? Oh man, is this construction really worth it? :)
+    std::tr1::function<void()> *makeCurrent =
+        new std::tr1::function<void()>(std::tr1::bind(makeCurrentContext, ctx));
+    return SharedContext(makeCurrent,
+        std::tr1::bind(releaseContextAndDelete, ctx, _1));
 }
 
 namespace GosusDarkSide
@@ -496,7 +506,7 @@ void Gosu::Window::Impl::doTick(Window& window)
 {
     // Enable vsync.
     GLint value = 1;
-    [window.pimpl->context.obj() setValues: &value forParameter: NSOpenGLCPSwapInterval];
+    [window.pimpl->context.obj() setValues:&value forParameter:NSOpenGLCPSwapInterval];
     
     if ((window.graphics().fullscreen() ||
         NSPointInRect([window.pimpl->window.obj() mouseLocationOutsideOfEventStream],
@@ -509,7 +519,7 @@ void Gosu::Window::Impl::doTick(Window& window)
     }
     else
     {
-        if (not window.pimpl->mouseViz)
+        if (! window.pimpl->mouseViz)
             [NSCursor unhide];
         window.pimpl->mouseViz = true;
     }

data/GosuImpl/WindowWin.cpp

@@ -117,7 +117,7 @@ namespace Gosu
         void setupVSync()
         {
             char* extensions = (char*)glGetString(GL_EXTENSIONS);
-			// The Intel BootCamp drivers will actually have a proc address for wglSwapInterval
+            // The Intel BootCamp drivers will actually have a proc address for wglSwapInterval
             // that doesn't do much, so check the string instead of just getting the address.
             if (!strstr(extensions, "WGL_EXT_swap_control"))
                 return;
@@ -176,10 +176,10 @@ namespace Gosu
 struct Gosu::Window::Impl
 {
     HWND handle;
-	HDC hdc;
+    HDC hdc;
     std::auto_ptr<Graphics> graphics;
     std::auto_ptr<Input> input;
-	double updateInterval;
+    double updateInterval;
     bool iconified;
 
     unsigned originalWidth, originalHeight;
@@ -225,22 +225,22 @@ Gosu::Window::Window(unsigned width, unsigned height, bool fullscreen,
         Win::instance(), 0);
     Win::check(pimpl->handle);
 
-	pimpl->hdc = GetDC(handle());
+    pimpl->hdc = GetDC(handle());
     Win::check(pimpl->hdc);
 
-	PIXELFORMATDESCRIPTOR pfd;
-	ZeroMemory(&pfd, sizeof pfd);
+    PIXELFORMATDESCRIPTOR pfd;
+    ZeroMemory(&pfd, sizeof pfd);
     pfd.nSize        = sizeof pfd;
     pfd.nVersion     = 1;
     pfd.dwFlags      = PFD_DRAW_TO_WINDOW | PFD_SUPPORT_OPENGL | PFD_DOUBLEBUFFER;
     pfd.iLayerType   = PFD_MAIN_PLANE;
     pfd.iPixelType   = PFD_TYPE_RGBA;
     pfd.cColorBits   = 32;
-	int pf = ChoosePixelFormat(pimpl->hdc, &pfd);
+    int pf = ChoosePixelFormat(pimpl->hdc, &pfd);
     Win::check(pf);
     Win::check(SetPixelFormat(pimpl->hdc, pf, &pfd));
 
-	HGLRC hrc = Win::check(wglCreateContext(pimpl->hdc), "creating rendering context");
+    HGLRC hrc = Win::check(wglCreateContext(pimpl->hdc), "creating rendering context");
     Win::check(wglMakeCurrent(pimpl->hdc, hrc), "selecting the rendering context");
 
     setupVSync();
@@ -256,12 +256,12 @@ Gosu::Window::Window(unsigned width, unsigned height, bool fullscreen,
     
     if (!fullscreen)
     {
-		double factor = std::min(0.9 * screenWidth() / width,
-								 0.8 * screenHeight() / height);
-	    
-		if (factor < 1)
-			width *= factor, height *= factor;
-	}
+        double factor = std::min(0.9 * screenWidth() / width,
+                                 0.8 * screenHeight() / height);
+        
+        if (factor < 1)
+            width *= factor, height *= factor;
+    }
 
     // Determine the size the window needs to have including UI chrome.
     RECT rc = { 0, 0, width, height };
@@ -287,9 +287,9 @@ Gosu::Window::Window(unsigned width, unsigned height, bool fullscreen,
     MoveWindow(handle(), windowX, windowY, windowW, windowH, false);
 
     pimpl->graphics.reset(new Gosu::Graphics(width, height, fullscreen));
-	graphics().setResolution(pimpl->originalWidth, pimpl->originalHeight);
+    graphics().setResolution(pimpl->originalWidth, pimpl->originalHeight);
     pimpl->input.reset(new Gosu::Input(handle()));
-	input().setMouseFactors(1.0 * pimpl->originalWidth / width, 1.0 * pimpl->originalHeight / height);
+    input().setMouseFactors(1.0 * pimpl->originalWidth / width, 1.0 * pimpl->originalHeight / height);
     input().onButtonDown = std::tr1::bind(&Window::buttonDown, this, _1);
     input().onButtonUp = std::tr1::bind(&Window::buttonUp, this, _1);
 
@@ -343,46 +343,46 @@ void Gosu::Window::show()
     {
         Win::processMessages();
 
-		unsigned lastTick = 0;
+        unsigned lastTick = 0;
 
-		for (;;)
-	    {
-			Win::processMessages();
+        for (;;)
+        {
+            Win::processMessages();
 
-			if (!::IsWindowVisible(handle()))
-			{
+            if (!::IsWindowVisible(handle()))
+            {
                 // TODO: Find out what the Sleep here is doing...
-				Sleep(50);
-				return;
-			}
+                Sleep(50);
+                return;
+            }
 
-			unsigned ms = milliseconds();
+            unsigned ms = milliseconds();
 
-			if (ms < lastTick || ms - lastTick >= static_cast<unsigned>(pimpl->updateInterval))
-			{
-				lastTick = ms;
+            if (ms < lastTick || ms - lastTick >= static_cast<unsigned>(pimpl->updateInterval))
+            {
+                lastTick = ms;
                 Song::update();
-				input().update();
-				// TODO: Bad heuristic -- this causes flickering cursor on right and bottom border of the
-				// window.
-				if (input().mouseX() >= 0 && input().mouseY() >= 0)
-					SendMessage(handle(), WM_SETCURSOR, reinterpret_cast<WPARAM>(handle()), HTCLIENT);
-			    update();
+                input().update();
+                // TODO: Bad heuristic -- this causes flickering cursor on right and bottom border of the
+                // window.
+                if (input().mouseX() >= 0 && input().mouseY() >= 0)
+                    SendMessage(handle(), WM_SETCURSOR, reinterpret_cast<WPARAM>(handle()), HTCLIENT);
+                update();
                 if (needsRedraw())
                 {
-      				::InvalidateRect(handle(), 0, FALSE);
+                    ::InvalidateRect(handle(), 0, FALSE);
                     FPS::registerFrame();
                 }
-				// There probably should be a proper "oncePerTick" handler
-				// system in the future. Right now, this is necessary to give
-				// timeslices to Ruby's green threads in Ruby/Gosu.
-		        if (GosusDarkSide::oncePerTick) GosusDarkSide::oncePerTick();
-			}
+                // There probably should be a proper "oncePerTick" handler
+                // system in the future. Right now, this is necessary to give
+                // timeslices to Ruby's green threads in Ruby/Gosu.
+                if (GosusDarkSide::oncePerTick) GosusDarkSide::oncePerTick();
+            }
             else if (pimpl->updateInterval - (ms - lastTick) > 5)
-				// More than 5 ms left until next update: Sleep to reduce
-				// processur usage, Sleep() is accurate enough for that.
-				Sleep(5);
-		}
+                // More than 5 ms left until next update: Sleep to reduce
+                // processur usage, Sleep() is accurate enough for that.
+                Sleep(5);
+        }
     }
     catch (...)
     {
@@ -425,16 +425,23 @@ HWND Gosu::Window::handle() const
 
 LRESULT Gosu::Window::handleMessage(UINT message, WPARAM wparam, LPARAM lparam)
 {
-	if (message == WM_SETCURSOR)
+    if (message == WM_SETCURSOR)
     {
-		if (LOWORD(lparam) != HTCLIENT || GetForegroundWindow() != handle() || needsCursor())
-		{
-			static const HCURSOR arrowCursor = LoadCursor(0, IDC_ARROW);
-			SetCursor(arrowCursor);
-	    }
-		else
-			SetCursor(NULL);
-        return TRUE;
+        try
+        {
+            if (LOWORD(lparam) != HTCLIENT || GetForegroundWindow() != handle() || needsCursor())
+            {
+                static const HCURSOR arrowCursor = LoadCursor(0, IDC_ARROW);
+                SetCursor(arrowCursor);
+            }
+            else
+                SetCursor(NULL);
+            return TRUE;
+        }
+        catch (std::exception& e)
+        {
+            // TODO - mark needsCursor() as noexcept and remove this try/catch block altogether
+        }
     }
 
     if (message == WM_SETFOCUS && graphics().fullscreen() && IsWindowVisible(pimpl->handle))
@@ -476,13 +483,13 @@ LRESULT Gosu::Window::handleMessage(UINT message, WPARAM wparam, LPARAM lparam)
             try
             {
                 draw();
+                graphics().end();
             }
-            catch (...)
+            catch (std::exception& e)
             {
-                graphics().end();
-                throw;
+                ::MessageBoxA(0, e.what(), "Error", MB_OK | MB_ICONERROR);
+                abort();
             }
-            graphics().end();
         }
         
         SwapBuffers(pimpl->hdc);