gosu 0.10.6 → 0.10.7

data/src/Bitmap/BitmapIO.cpp

@@ -9,6 +9,13 @@
 #define STB_IMAGE_IMPLEMENTATION
 #define STBI_NO_STDIO
 #define STBI_NO_LINEAR
+
+// Work around this bug:
+// https://bugs.launchpad.net/ubuntu/+source/gcc-5/+bug/1568899
+#ifdef GOSU_IS_X
+#define STBI_NO_SIMD
+#endif
+
 #include "../stb_image.h"
 
 namespace
@@ -106,32 +113,40 @@ void Gosu::saveImageFile(const Gosu::Bitmap& bitmap, const std::wstring& filenam
         throw std::runtime_error("Could not save image data to file: " + utf8);
 }
 
+namespace
+{
+    void stbiWriteToWriter(void *context, void *data, int size)
+    {
+        Gosu::Writer *writer = reinterpret_cast<Gosu::Writer*>(context);
+        writer->write(data, size);
+    }
+}
+
 void Gosu::saveImageFile(const Gosu::Bitmap& bitmap, Gosu::Writer writer,
     const std::wstring& formatHint)
 {
-    unsigned char* rgba =
-        const_cast<unsigned char*>(reinterpret_cast<const unsigned char*>(bitmap.data()));
-    
-    // TODO: Use the new *_to_func functions in stb_imagewrite.h instead:
-    // https://github.com/nothings/stb/blob/master/stb_image_write.h#L39
-    int length;
-    unsigned char* png =
-        stbi_write_png_to_mem(rgba, 0, bitmap.width(), bitmap.height(), 4, &length);
-    
-    if (png == 0)
-        throw std::runtime_error("Could not save image data to memory");
+    int ok;
     
-    try
+    if (isExtension(formatHint.c_str(), L"bmp"))
     {
-        writer.write(png, length);
+        ok = stbi_write_bmp_to_func(stbiWriteToWriter, &writer,
+                                    bitmap.width(), bitmap.height(), 4, bitmap.data());
     }
-    catch (...)
+    else if (isExtension(formatHint.c_str(), L"tga"))
     {
-        STBIW_FREE(png);
-        throw;
+        stbi_write_tga_with_rle = 0;
+        ok = stbi_write_tga_to_func(stbiWriteToWriter, &writer,
+                                    bitmap.width(), bitmap.height(), 4, bitmap.data());
+    }
+    else
+    {
+        ok = stbi_write_png_to_func(stbiWriteToWriter, &writer,
+                                    bitmap.width(), bitmap.height(), 4, bitmap.data(), 0);
     }
     
-    STBIW_FREE(png);
+    if (ok == 0)
+        throw std::runtime_error("Could not save image data to memory (format hint = '" +
+                                 Gosu::wstringToUTF8(formatHint) + "'");
 }
 
 // Deprecated methods.

data/src/DirectoriesApple.mm

@@ -5,9 +5,9 @@
 #import <unistd.h>
 
 
-static std::wstring stringFromNSString(NSString* string, const std::wstring& def)
+static std::wstring stringFromNSString(NSString *string, const wchar_t *fallback)
 {
-    return string ? Gosu::utf8ToWstring([string UTF8String]) : def;
+    return string ? Gosu::utf8ToWstring([string UTF8String]) : fallback;
 }
 
 void Gosu::useResourceDirectory()
@@ -17,60 +17,55 @@ void Gosu::useResourceDirectory()
 
 std::wstring Gosu::userSettingsPrefix()
 {
-    static std::wstring result;
-    if (result.empty())
-    {
-        ObjCRef<NSAutoreleasePool> pool([NSAutoreleasePool new]);
-        NSArray *paths = NSSearchPathForDirectoriesInDomains(NSLibraryDirectory, NSUserDomainMask, YES);
-        NSString *libraryDirectory = [paths objectAtIndex:0];
-        NSString *preferencesDirectory = [libraryDirectory stringByAppendingPathComponent:@"Preferences"];
-        
-        result = stringFromNSString(preferencesDirectory, L".") + L"/";
-    }
+    static std::wstring result = [] {
+        @autoreleasepool {
+            NSString *library =
+                NSSearchPathForDirectoriesInDomains(NSLibraryDirectory, NSUserDomainMask, YES)[0];
+            NSString *preferences = [library stringByAppendingPathComponent:@"Preferences"];
+            
+            return stringFromNSString(preferences, L".") + L"/";
+        }
+    }();
     return result;
 }
 
 std::wstring Gosu::userDocsPrefix()
 {
-    static std::wstring result;
-    if (result.empty())
-    {
-        ObjCRef<NSAutoreleasePool> pool([NSAutoreleasePool new]);
-        NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
-        NSString *documentsDirectory = [paths objectAtIndex:0];
-        
-        result = stringFromNSString(documentsDirectory, L".") + L"/";
-    }
+    static std::wstring result = [] {
+        @autoreleasepool {
+            NSString *documents =
+                NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES)[0];
+            
+            return stringFromNSString(documents, L".") + L"/";
+        }
+    }();
     return result;
 }
 
 std::wstring Gosu::resourcePrefix()
 {
-    static std::wstring result;
-    if (result.empty())
-    {
-        ObjCRef<NSAutoreleasePool> pool([NSAutoreleasePool new]);
-        NSString *resourcePath = [[NSBundle mainBundle] resourcePath];
-        
-        result = stringFromNSString(resourcePath, L".") + L"/";
-    }
+    static std::wstring result = [] {
+        @autoreleasepool {
+            NSString *resources = [NSBundle mainBundle].resourcePath;
+            return stringFromNSString(resources, L".") + L"/";
+        }
+    }();
     return result;
 }
 
 std::wstring Gosu::sharedResourcePrefix()
 {
-    #ifdef GOSU_IS_IPHONE
+#ifdef GOSU_IS_IPHONE
     return resourcePrefix();
-    #else
-    static std::wstring result;
-    if (result.empty())
-    {
-        ObjCRef<NSAutoreleasePool> pool([NSAutoreleasePool new]);
-        NSString *bundlePath = [[NSBundle mainBundle] bundlePath];
-        NSString *containingPath = [bundlePath stringByDeletingLastPathComponent];
-        
-        result = stringFromNSString(containingPath, L".");
-    }
+#else
+    static std::wstring result = [] {
+        @autoreleasepool {
+            NSString *bundlePath = [NSBundle mainBundle].bundlePath;
+            NSString *containingPath = [bundlePath stringByDeletingLastPathComponent];
+            
+            return stringFromNSString(containingPath, L".");
+        }
+    }();
     return result;
-    #endif
+#endif
 }

data/src/Input/Input.cpp

@@ -48,7 +48,11 @@ struct Gosu::Input::Impl
     
     void updateMousePosition()
     {
-    #if SDL_VERSION_ATLEAST(2, 0, 4)
+    // Do not use GetGlobalMouseState on Linux for now to prevent this bug:
+    // https://github.com/gosu/gosu/issues/326
+    // Once SDL 2.0.5 has been released, we can use this function as a workaround:
+    // https://wiki.libsdl.org/SDL_GetWindowBordersSize
+    #if SDL_VERSION_ATLEAST(2, 0, 4) && !defined(GOSU_IS_X)
         int x, y, windowX, windowY;
         SDL_GetWindowPosition(window, &windowX, &windowY);
         SDL_GetGlobalMouseState(&x, &y);
@@ -60,6 +64,22 @@ struct Gosu::Input::Impl
     #endif
     }
     
+    void setMousePosition(double x, double y)
+    {
+        SDL_WarpMouseInWindow(window,
+            (x - mouseOffsetX) / mouseFactorX, (y - mouseOffsetY) / mouseFactorY);
+
+    #if SDL_VERSION_ATLEAST(2, 0, 4) && !defined(GOSU_IS_X)
+        // On systems where we have a working GetGlobalMouseState, we can warp the mouse and
+        // retrieve its position directly afterwards.
+        updateMousePosition();
+    #else
+        // Otherwise, we have to assume that setting the position worked, because if we update the
+        // mouse position now, we'll get the previous position.
+        mouseX = x, mouseY = y;
+    #endif
+    }
+    
     void enqueueEvent(int id, bool down)
     {
         eventQueue.push_back(down ? id : ~id);
@@ -378,11 +398,7 @@ double Gosu::Input::mouseY() const
 
 void Gosu::Input::setMousePosition(double x, double y)
 {
-    SDL_WarpMouseInWindow(pimpl->window,
-        (x - pimpl->mouseOffsetX) / pimpl->mouseFactorX,
-        (y - pimpl->mouseOffsetY) / pimpl->mouseFactorY);
-    
-    pimpl->updateMousePosition();
+    pimpl->setMousePosition(x, y);
 }
 
 void Gosu::Input::setMouseFactors(double factorX, double factorY,

data/src/Input/InputUIKit.mm

@@ -14,29 +14,32 @@ unsigned Gosu::TextInput::selectionStart() const { return 0; }
 
 struct Gosu::Input::Impl
 {
-    UIView* view;
+    UIView *view;
     float mouseX, mouseY;
     float factorX, factorY;
     float updateInterval;
     
-    ObjCRef<NSMutableSet> currentTouchesSet;
-    std::auto_ptr<Gosu::Touches> currentTouchesVector;
+    NSMutableSet *currentTouchesSet;
+    std::unique_ptr<Gosu::Touches> currentTouchesVector;
     
-    Touch translateTouch(UITouch* uiTouch)
+    Touch translateTouch(UITouch *uiTouch)
     {
-        CGPoint point = [uiTouch locationInView: view];
-        Touch touch = { uiTouch, (float)point.x, (float)point.y };
-        touch.x *= factorX, touch.y *= factorY;
-        return touch;
+        CGPoint point = [uiTouch locationInView:view];
+        
+        return (Touch) {
+            .id = (__bridge void *)uiTouch,
+            .x = (float) point.x * factorX,
+            .y = (float) point.y * factorY,
+        };
     }
 };
 
 Gosu::Input::Input(void* view, float updateInterval)
 : pimpl(new Impl)
 {
-    pimpl->view = (UIView*)view;
+    pimpl->view = (__bridge UIView *)view;
     pimpl->updateInterval = updateInterval;
-    pimpl->currentTouchesSet.reset([[NSMutableSet alloc] init]);
+    pimpl->currentTouchesSet = [NSMutableSet new];
     pimpl->mouseX = pimpl->mouseY = -1000;
     setMouseFactors(1, 1);
 }
@@ -45,27 +48,27 @@ Gosu::Input::~Input()
 {
 }
 
-void Gosu::Input::feedTouchEvent(int type, void* touches)
+void Gosu::Input::feedTouchEvent(int type, void *touches)
 {
-    NSSet *uiTouches = (NSSet *)touches;
+    NSSet *uiTouches = (__bridge NSSet *)touches;
     
     pimpl->currentTouchesVector.reset();
     
     std::tr1::function<void (Touch)>* callback = nullptr;
     
     if (type == 0) {
-        [pimpl->currentTouchesSet.get() unionSet:uiTouches];
+        [pimpl->currentTouchesSet unionSet:uiTouches];
         callback = &onTouchBegan;
     }
     else if (type == 1) {
         callback = &onTouchMoved;
     }
     else if (type == 2) {
-        [pimpl->currentTouchesSet.get() minusSet:uiTouches];
+        [pimpl->currentTouchesSet minusSet:uiTouches];
         callback = &onTouchEnded;
     }
     else if (type == 3) {
-        [pimpl->currentTouchesSet.get() minusSet:uiTouches];
+        [pimpl->currentTouchesSet minusSet:uiTouches];
         callback = &onTouchCancelled;
     }
     
@@ -115,11 +118,11 @@ void Gosu::Input::setMouseFactors(double factorX, double factorY, double offsetX
 
 const Gosu::Touches& Gosu::Input::currentTouches() const
 {
-    if (!pimpl->currentTouchesVector.get())
-    {
+    if (!pimpl->currentTouchesVector.get()) {
         pimpl->currentTouchesVector.reset(new Gosu::Touches);
-        for (UITouch* uiTouch in pimpl->currentTouchesSet.obj())
+        for (UITouch* uiTouch in pimpl->currentTouchesSet) {
             pimpl->currentTouchesVector->push_back(pimpl->translateTouch(uiTouch));
+        }
     }
     return *pimpl->currentTouchesVector;
 }
@@ -144,30 +147,35 @@ void Gosu::Input::update()
     // Check for dead touches and remove from vector if
     // necessary
 
-    ObjCRef<NSMutableSet> deadTouches;
+    NSMutableSet *deadTouches = nil;
 
-    for (UITouch* touch in pimpl->currentTouchesSet.obj())
+    for (UITouch *touch in pimpl->currentTouchesSet)
     {
         UITouchPhase phase = [touch phase];
         if (phase == UITouchPhaseBegan ||
-            phase == UITouchPhaseMoved ||
-            phase == UITouchPhaseStationary)
+                phase == UITouchPhaseMoved ||
+                phase == UITouchPhaseStationary) {
             continue;
+        }
         
         // Something was deleted, we will need the set.
-        if (!deadTouches.get())
-            deadTouches.reset([[NSMutableSet alloc] init]);
-        [deadTouches.obj() addObject:touch];
+        if (!deadTouches) {
+            deadTouches = [NSMutableSet new];
+        }
+        [deadTouches addObject:touch];
     }
     
     // Has something been deleted?
-    if (deadTouches.get())
+    if (deadTouches)
     {
         pimpl->currentTouchesVector.reset();
-        [pimpl->currentTouchesSet.obj() minusSet: deadTouches.obj()];
-        for (UITouch* uiTouch in deadTouches.obj())
-            if (onTouchEnded)
+        [pimpl->currentTouchesSet minusSet: deadTouches];
+        
+        if (onTouchEnded) {
+            for (UITouch *uiTouch in deadTouches) {
                 onTouchEnded(pimpl->translateTouch(uiTouch));
+            }
+        }
     }
 }
 

data/src/Text/Font.cpp

@@ -65,7 +65,7 @@ struct Gosu::Font::Impl
         //     charString.clear();
         unsigned charWidth = Gosu::textWidth(charString, name, height, flags);
         
-        Bitmap bitmap(charWidth, height);
+        Bitmap bitmap(charWidth, height, 0x00ffffff);
         drawText(bitmap, charString, 0, 0, Color::WHITE, name, height, flags);
         info.image.reset(new Image(bitmap));
         info.factor = 0.5;

data/src/Text/TextApple.mm

@@ -20,7 +20,6 @@ typedef NSFont OSXFont;
 
 namespace
 {
-    using Gosu::ObjCRef;
     using Gosu::CFRef;
 
     // If a font is a filename, loads the font and returns its family name that can be used
@@ -35,12 +34,14 @@ namespace
         static map<wstring, wstring> familyOfFiles;
         
         // Not a path name: It is already a family name
-        if (fontName.find(L"/") == std::wstring::npos)
+        if (fontName.find(L"/") == std::wstring::npos) {
             return fontName;
+        }
         
         // Already activated font & extracted family name
-        if (familyOfFiles.count(fontName) > 0)
+        if (familyOfFiles.count(fontName) > 0) {
             return familyOfFiles[fontName];
+        }
         
         CFRef<CFStringRef> urlString(
             CFStringCreateWithBytes(NULL,
@@ -49,22 +50,24 @@ namespace
                 kCFStringEncodingUTF32LE, NO));
         CFRef<CFURLRef> url(
             CFURLCreateWithFileSystemPath(NULL, urlString.obj(), kCFURLPOSIXPathStyle, YES));
-        if (!url.get())
+        if (!url.get()) {
             return familyOfFiles[fontName] = Gosu::defaultFontName();
-            
+        }
+        
         CFRef<CFArrayRef> array(
             CTFontManagerCreateFontDescriptorsFromURL(url.obj()));
 
         if (array.get() == NULL || CFArrayGetCount(array.obj()) < 1 ||
-            !CTFontManagerRegisterFontsForURL(url.obj(), kCTFontManagerScopeProcess, NULL))
+                !CTFontManagerRegisterFontsForURL(url.obj(), kCTFontManagerScopeProcess, NULL)) {
             return familyOfFiles[fontName] = Gosu::defaultFontName();
+        }
 
         CTFontDescriptorRef ref =
             (CTFontDescriptorRef)CFArrayGetValueAtIndex(array.get(), 0);
         CFRef<CFStringRef> fontNameStr(
             (CFStringRef)CTFontDescriptorCopyAttribute(ref, kCTFontFamilyNameAttribute));
         
-        const char* utf8FontName = [(NSString*)fontNameStr.obj() UTF8String];
+        const char *utf8FontName = [(__bridge NSString *)fontNameStr.obj() UTF8String];
         return familyOfFiles[fontName] = Gosu::utf8ToWstring(utf8FontName);
         #endif
     }
@@ -78,21 +81,25 @@ namespace
         OSXFont* result = usedFonts[make_pair(fontName, make_pair(fontFlags, height))];
         if (!result)
         {
-            ObjCRef<NSString> name([[NSString alloc] initWithUTF8String:Gosu::wstringToUTF8(fontName).c_str()]);
+            NSString *name = [NSString stringWithUTF8String:Gosu::wstringToUTF8(fontName).c_str()];
             #ifdef GOSU_IS_IPHONE
-            result = [OSXFont fontWithName:name.obj() size:height];
+            result = [OSXFont fontWithName:name size:height];
             #else
-            NSFontDescriptor* desc = [[NSFontDescriptor fontDescriptorWithFontAttributes:nil] fontDescriptorWithFamily:name.obj()];
-            result = [[NSFont fontWithDescriptor:desc size:height] retain];
-            if (result && (fontFlags & Gosu::ffBold))
+            NSFontDescriptor* desc = [[NSFontDescriptor fontDescriptorWithFontAttributes:nil]
+                                      fontDescriptorWithFamily:name];
+            result = [NSFont fontWithDescriptor:desc size:height];
+            if (result && (fontFlags & Gosu::ffBold)) {
                 result = [[NSFontManager sharedFontManager] convertFont:result toHaveTrait:NSFontBoldTrait];
-            if (result && (fontFlags & Gosu::ffItalic))
+            }
+            if (result && (fontFlags & Gosu::ffItalic)) {
                 result = [[NSFontManager sharedFontManager] convertFont:result toHaveTrait:NSFontItalicTrait];
+            }
             #endif
-            if (!result && fontName != Gosu::defaultFontName())
+            if (!result && fontName != Gosu::defaultFontName()) {
                 result = getFont(Gosu::defaultFontName(), 0, height);
+            }
             assert(result);
-            usedFonts[make_pair(fontName, make_pair(fontFlags, height))] = [result retain];
+            usedFonts[make_pair(fontName, make_pair(fontFlags, height))] = result;
         }
         return result;
     }
@@ -106,17 +113,16 @@ wstring Gosu::defaultFontName()
 #ifndef GOSU_IS_IPHONE
 namespace
 {
-    NSDictionary* attributeDictionary(NSFont* font, unsigned fontFlags)
+    NSDictionary *attributeDictionary(NSFont* font, unsigned fontFlags)
     {
-        NSMutableDictionary* dict =
-            [[NSMutableDictionary alloc] initWithObjectsAndKeys:
-                font, NSFontAttributeName,
-                [NSColor whiteColor], NSForegroundColorAttributeName,
-                nil];
-        if (fontFlags & Gosu::ffUnderline)
-        {
-            Gosu::ObjCRef<NSNumber> underline([[NSNumber alloc] initWithInt:NSUnderlineStyleSingle]);
-            [dict setValue:underline.obj() forKey:NSUnderlineStyleAttributeName];
+        NSDictionary* dict = @{
+            NSFontAttributeName: font,
+            NSForegroundColorAttributeName: [NSColor whiteColor]
+        };
+        if (fontFlags & Gosu::ffUnderline) {
+            NSMutableDictionary *mutableDict = [dict mutableCopy];
+            mutableDict[NSUnderlineStyleAttributeName] = @(NSUnderlineStyleSingle);
+            dict = [mutableDict copy];
         }
         return dict;
     }
@@ -126,19 +132,20 @@ namespace
 unsigned Gosu::textWidth(const wstring& text,
     const wstring& fontName, unsigned fontHeight, unsigned fontFlags)
 {
-    if (text.find_first_of(L"\r\n") != wstring::npos)
+    if (text.find_first_of(L"\r\n") != wstring::npos) {
         throw std::invalid_argument("the argument to textWidth cannot contain line breaks");
+    }
     
-    OSXFont* font = getFont(fontName, fontFlags, fontHeight);
+    OSXFont *font = getFont(fontName, fontFlags, fontHeight);
     
     // This will, of course, compute a too large size; fontHeight is in pixels,
     // the method expects point.
-    ObjCRef<NSString> string([[NSString alloc] initWithUTF8String:wstringToUTF8(text).c_str()]);
+    NSString *string = [NSString stringWithUTF8String:wstringToUTF8(text).c_str()];
     #ifndef GOSU_IS_IPHONE
-    ObjCRef<NSDictionary> attributes(attributeDictionary(font, fontFlags));
-    NSSize size = [string.obj() sizeWithAttributes:attributes.get()];
+    NSDictionary *attributes = attributeDictionary(font, fontFlags);
+    NSSize size = [string sizeWithAttributes:attributes];
     #else
-    CGSize size = [string.obj() sizeWithFont:font];
+    CGSize size = [string sizeWithFont:font];
     #endif
     
     // Now adjust the scaling...
@@ -149,18 +156,19 @@ void Gosu::drawText(Bitmap& bitmap, const wstring& text, int x, int y,
     Color c, const wstring& fontName, unsigned fontHeight,
     unsigned fontFlags)
 {
-    if (text.find_first_of(L"\r\n") != wstring::npos)
+    if (text.find_first_of(L"\r\n") != wstring::npos) {
         throw std::invalid_argument("the argument to drawText cannot contain line breaks");
+    }
     
-    OSXFont* font = getFont(fontName, fontFlags, fontHeight);
-    ObjCRef<NSString> string([[NSString alloc] initWithUTF8String:wstringToUTF8(text).c_str()]);
+    OSXFont *font = getFont(fontName, fontFlags, fontHeight);
+    NSString *string = [NSString stringWithUTF8String:wstringToUTF8(text).c_str()];
 
     // Note that fontHeight is in pixels, the method expects points, so we have to scale this down.
     #ifndef GOSU_IS_IPHONE
-    ObjCRef<NSDictionary> attributes(attributeDictionary(font, fontFlags));
-    NSSize size = [string.obj() sizeWithAttributes:attributes.get()];
+    NSDictionary *attributes = attributeDictionary(font, fontFlags);
+    NSSize size = [string sizeWithAttributes:attributes];
     #else
-    CGSize size = [string.obj() sizeWithFont:font];
+    CGSize size = [string sizeWithFont:font];
     #endif
     
     unsigned width = static_cast<unsigned>(round(size.width / size.height * fontHeight));
@@ -189,16 +197,16 @@ void Gosu::drawText(Bitmap& bitmap, const wstring& text, int x, int y,
     CGContextTranslateCTM(context, 0, fontHeight);
     CGContextScaleCTM(context, 1, -1);
     UIGraphicsPushContext(context);
-    [string.obj() drawAtPoint:CGPointZero withFont:font];
+    [string drawAtPoint:CGPointZero withFont:font];
     UIGraphicsPopContext();
     #else
     NSPoint NSPointZero = { 0, 0 };
-    attributes.reset(attributeDictionary(font, fontFlags));
+    attributes = attributeDictionary(font, fontFlags);
     
     [NSGraphicsContext saveGraphicsState];
     [NSGraphicsContext setCurrentContext:
         [NSGraphicsContext graphicsContextWithGraphicsPort:(void *)context flipped:false]];
-    [string.obj() drawAtPoint:NSPointZero withAttributes:attributes.get()];
+    [string drawAtPoint:NSPointZero withAttributes:attributes];
     [NSGraphicsContext restoreGraphicsState];
     #endif
     CGContextRelease(context);
@@ -211,7 +219,8 @@ void Gosu::drawText(Bitmap& bitmap, const wstring& text, int x, int y,
         for (int relX = 0; relX < effectiveWidth; ++relX)
         {
             c.setAlpha(bmp.getPixel(relX, relY).alpha());
-            if (c.alpha())
+            if (c.alpha()) {
                 bitmap.setPixel(x + relX, y + relY, c);
+            }
         }
 }