gosu 0.10.2.pre1 → 0.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ecfdbb08ed4f62285efa92a4e6531cd11adae83f
-  data.tar.gz: 8c7633022fb1c04feacd970b3aa347c3e2130eb5
+  metadata.gz: 6a7232fe12b9c8879a9cfa88e30f9ce0cf61916c
+  data.tar.gz: 02b5c36e500dcd641fc70ee65d6d316dc16f3dba
 SHA512:
-  metadata.gz: 2c13a96ad5c4e0b58ff964208c7a7cd12ee92bb93a4cdb214641ab93877bbfec080c0923364ef115cab7335eb718655d00c5c4210d59b65d6762926bd161bba8
-  data.tar.gz: c24c6d0429534be9927d1a1bbbd39031bb18b0d23914dd3af8e702571b20746ff57ba416dd2fd644a22d117e8efb481ce4f8d9a8cc45db24c059fa7c93e6074c
+  metadata.gz: ac51f4a214b0077dd7817ef0e5e741a1618019b3c7e552a0dc80cd3ae1897ea626d3be2e180b4a76b0603dc7fe5f057a57203d50550bde76e61a8f820bd50fe3
+  data.tar.gz: 09520284f76e8efad4dec94ffa584768f0c3c11882c845db9139dc6a7baa02ba4687efd463d43a86f253d44b92a81de61b8e2068b22b9c3f170bc673d63eed6e

data/Gosu/Version.hpp

@@ -4,7 +4,7 @@
 #define GOSU_MAJOR_VERSION 0
 #define GOSU_MINOR_VERSION 10
 #define GOSU_POINT_VERSION 2
-#define GOSU_VERSION "0.10.2.pre1"
+#define GOSU_VERSION "0.10.2"
 
 #define GOSU_COPYRIGHT_NOTICE \
     "This software uses the following third-party libraries:\n" \

data/ext/gosu/extconf.rb

@@ -49,7 +49,6 @@ MAC_FILES = %w(
   Audio/Audio.mm
   Graphics/ResolutionApple.mm
   Text/TextApple.mm
-  Text/TextMac.cpp
   TimingApple.cpp
   UtilityApple.mm
 )

data/ext/gosu/gosu_wrap.cxx

@@ -8,6 +8,10 @@
  * interface file instead.
  * ----------------------------------------------------------------------------- */
 
+// This file was afterwards patched using the following instructions:
+// http://sourceforge.net/tracker/index.php?func=detail&aid=2034216&group_id=1645&atid=101645
+// (Many thanks to Kevin Burge for that.)
+
 #define SWIGRUBY
 #define SWIG_DIRECTORS
 
@@ -870,6 +874,7 @@ SWIG_UnpackDataName(const char *c, void *ptr, size_t sz, const char *name) {
 
 
 #include <ruby.h>
+#include <map>
 
 /* Ruby 1.9.1 has a "memoisation optimisation" when compiling with GCC which
  * breaks using rb_intern as an lvalue, as SWIG does.  We work around this
@@ -1210,7 +1215,7 @@ extern "C" {
 /* Global Ruby hash table to store Trackings from C/C++
    structs to Ruby Objects. 
 */
-static VALUE swig_ruby_trackings = Qnil;
+static std::map<void*, VALUE> swig_ruby_trackings;
 
 /* Global variable that stores a reference to the ruby
    hash table delete function. */
@@ -1227,34 +1232,18 @@ SWIGRUNTIME void SWIG_RubyInitializeTrackings(void) {
      This is done to allow multiple DSOs to share the same
      tracking table.
   */
-  ID trackings_id = rb_intern( "@__trackings__" );
   VALUE verbose = rb_gv_get("VERBOSE");
   rb_gv_set("VERBOSE", Qfalse);
-  swig_ruby_trackings = rb_ivar_get( _mSWIG, trackings_id );
   rb_gv_set("VERBOSE", verbose);
 
   /* No, it hasn't.  Create one ourselves */ 
-  if ( swig_ruby_trackings == Qnil )
-    {
-      swig_ruby_trackings = rb_hash_new();
-      rb_ivar_set( _mSWIG, trackings_id, swig_ruby_trackings );
-    }
+  swig_ruby_trackings.clear();
 
   /* Now store a reference to the hash table delete function
      so that we only have to look it up once.*/
   swig_ruby_hash_delete = rb_intern("delete");
 }
 
-/* Get a Ruby number to reference a pointer */
-SWIGRUNTIME VALUE SWIG_RubyPtrToReference(void* ptr) {
-  /* We cast the pointer to an unsigned long
-     and then store a reference to it using
-     a Ruby number object. */
-
-  /* Convert the pointer to a Ruby number */
-  return SWIG2NUM(ptr);
-}
-
 /* Get a Ruby number to reference an object */
 SWIGRUNTIME VALUE SWIG_RubyObjectToReference(VALUE object) {
   /* We cast the object to an unsigned long
@@ -1276,39 +1265,16 @@ SWIGRUNTIME VALUE SWIG_RubyReferenceToObject(VALUE reference) {
 
 /* Add a Tracking from a C/C++ struct to a Ruby object */
 SWIGRUNTIME void SWIG_RubyAddTracking(void* ptr, VALUE object) {
-  /* In a Ruby hash table we store the pointer and
-     the associated Ruby object.  The trick here is
-     that we cannot store the Ruby object directly - if
-     we do then it cannot be garbage collected.  So
-     instead we typecast it as a unsigned long and
-     convert it to a Ruby number object.*/
-
-  /* Get a reference to the pointer as a Ruby number */
-  VALUE key = SWIG_RubyPtrToReference(ptr);
-
-  /* Get a reference to the Ruby object as a Ruby number */
-  VALUE value = SWIG_RubyObjectToReference(object);
-
   /* Store the mapping to the global hash table. */
-  rb_hash_aset(swig_ruby_trackings, key, value);
+  swig_ruby_trackings[ptr] = object;
 }
 
 /* Get the Ruby object that owns the specified C/C++ struct */
 SWIGRUNTIME VALUE SWIG_RubyInstanceFor(void* ptr) {
-  /* Get a reference to the pointer as a Ruby number */
-  VALUE key = SWIG_RubyPtrToReference(ptr);
-
-  /* Now lookup the value stored in the global hash table */
-  VALUE value = rb_hash_aref(swig_ruby_trackings, key);
-	
-  if (value == Qnil) {
-    /* No object exists - return nil. */
+  if (swig_ruby_trackings.count(ptr) == 0)
     return Qnil;
-  }
-  else {
-    /* Convert this value to Ruby object */
-    return SWIG_RubyReferenceToObject(value);
-  }
+  else
+    return swig_ruby_trackings[ptr];
 }
 
 /* Remove a Tracking from a C/C++ struct to a Ruby object.  It
@@ -1316,12 +1282,7 @@ SWIGRUNTIME VALUE SWIG_RubyInstanceFor(void* ptr) {
    since the same memory address may be reused later to create
    a new object. */
 SWIGRUNTIME void SWIG_RubyRemoveTracking(void* ptr) {
-  /* Get a reference to the pointer as a Ruby number */
-  VALUE key = SWIG_RubyPtrToReference(ptr);
-
-  /* Delete the object from the hash table by calling Ruby's
-     do this we need to call the Hash.delete method.*/
-  rb_funcall(swig_ruby_trackings, swig_ruby_hash_delete, 1, key);
+  swig_ruby_trackings.erase(ptr);
 }
 
 /* This is a helper method that unlinks a Ruby object from its
@@ -3119,14 +3080,14 @@ bool SwigDirector_Window::tick() {
 void SwigDirector_Window::update() {
   VALUE result;
   
-  result = rb_funcall(swig_get_self(), rb_intern("update"), 0, NULL);
+  result = rb_funcall(swig_get_self(), rb_intern("protected_update"), 0, NULL);
 }
 
 
 void SwigDirector_Window::draw() {
   VALUE result;
   
-  result = rb_funcall(swig_get_self(), rb_intern("draw"), 0, NULL);
+  result = rb_funcall(swig_get_self(), rb_intern("protected_draw_2"), 0, NULL);
 }
 
 
@@ -3134,7 +3095,7 @@ bool SwigDirector_Window::needsRedraw() const {
   bool c_result ;
   VALUE result;
   
-  result = rb_funcall(swig_get_self(), rb_intern("needs_redraw?"), 0, NULL);
+  result = rb_funcall(swig_get_self(), rb_intern("protected_needs_redraw?"), 0, NULL);
   bool swig_val;
   int swig_res = SWIG_AsVal_bool(result, &swig_val);
   if (!SWIG_IsOK(swig_res)) {
@@ -3149,7 +3110,7 @@ bool SwigDirector_Window::needsCursor() const {
   bool c_result ;
   VALUE result;
   
-  result = rb_funcall(swig_get_self(), rb_intern("needs_cursor?"), 0, NULL);
+  result = rb_funcall(swig_get_self(), rb_intern("protected_needs_cursor?"), 0, NULL);
   bool swig_val;
   int swig_res = SWIG_AsVal_bool(result, &swig_val);
   if (!SWIG_IsOK(swig_res)) {
@@ -3163,7 +3124,7 @@ bool SwigDirector_Window::needsCursor() const {
 void SwigDirector_Window::loseFocus() {
   VALUE result;
   
-  result = rb_funcall(swig_get_self(), rb_intern("lose_focus"), 0, NULL);
+  result = rb_funcall(swig_get_self(), rb_intern("protected_lose_focus"), 0, NULL);
 }
 
 
@@ -3184,7 +3145,7 @@ void SwigDirector_Window::buttonDown(Gosu::Button arg0) {
     else
     obj0 = LONG2NUM((&arg0)->id());
   }
-  result = rb_funcall(swig_get_self(), rb_intern("button_down"), 1,obj0);
+  result = rb_funcall(swig_get_self(), rb_intern("protected_button_down"), 1,obj0);
 }
 
 
@@ -3198,7 +3159,7 @@ void SwigDirector_Window::buttonUp(Gosu::Button arg0) {
     else
     obj0 = LONG2NUM((&arg0)->id());
   }
-  result = rb_funcall(swig_get_self(), rb_intern("button_up"), 1,obj0);
+  result = rb_funcall(swig_get_self(), rb_intern("protected_button_up"), 1,obj0);
 }
 
 
@@ -11209,7 +11170,7 @@ SWIGEXPORT void Init_gosu(void) {
   rb_define_const(mGosu, "MAJOR_VERSION", SWIG_From_int(static_cast< int >(0)));
   rb_define_const(mGosu, "MINOR_VERSION", SWIG_From_int(static_cast< int >(10)));
   rb_define_const(mGosu, "POINT_VERSION", SWIG_From_int(static_cast< int >(2)));
-  rb_define_const(mGosu, "VERSION", SWIG_FromCharPtr("0.10.2.pre1"));
+  rb_define_const(mGosu, "VERSION", SWIG_FromCharPtr("0.10.2"));
   rb_define_const(mGosu, "GOSU_COPYRIGHT_NOTICE", SWIG_FromCharPtr("This software uses the following third-party libraries:\n\nGosu, http://www.libgosu.org, MIT License, http://opensource.org/licenses/MIT\nSDL 2, http://www.libsdl.org, MIT License, http://opensource.org/licenses/MIT\nlibsndfile, http://www.mega-nerd.com/libsndfile, GNU LGPL 3, http://www.gnu.org/copyleft/lesser.html\nOpenAL Soft, http://kcat.strangesoft.net/openal.html, GNU LGPL 2, http://www.gnu.org/licenses/old-licenses/lgpl-2.0.html\n"));
   rb_define_module_function(mGosu, "milliseconds", VALUEFUNC(_wrap_milliseconds), -1);
   rb_define_module_function(mGosu, "random", VALUEFUNC(_wrap_random), -1);

data/rdoc/gosu.rb

@@ -742,6 +742,18 @@ module Gosu
     #
     # @return [void]
     def show; end
+    
+    ##
+    # EXPERIMENTAL - MAY DISAPPEAR WITHOUT WARNING:
+    # Performs a single step in the main loop. This can be useful for integrating Gosu with other
+    # libraries that have their own main loop, e.g. Ruby/Tk.
+    # 
+    # See: https://www.libgosu.org/cgi-bin/mwf/topic_show.pl?tid=1218
+    # 
+    # If you find a good way to use this, please post it on the forum. Thank you!
+    # 
+    # @return [true, false] whether the Window should still be shown after this tick
+    def tick; end
 
     ##
     # Tells the window to end the current run loop as soon as possible. Calling this method will not prevent execution of lines after it.

data/src/Text/Text.cpp

@@ -67,7 +67,7 @@ namespace Gosu
                     allocatedLines += 10;
                     bmp.resize(bmp.width(),
                         fontHeight * allocatedLines + lineSpacing * (allocatedLines - 1),
-                        Color::NONE);
+                        0x00ffffff);
                 }
             }
 
@@ -183,7 +183,7 @@ namespace Gosu
             {
                 Bitmap result = bmp;
                 result.resize(result.width(),
-                    fontHeight * usedLines + lineSpacing * (usedLines - 1));
+                    fontHeight * usedLines + lineSpacing * (usedLines - 1), 0x00ffffff);
                 return result;
             }
             
@@ -347,7 +347,7 @@ Gosu::Bitmap Gosu::createText(const wstring& text,
             {
                 Gosu::Bitmap entity = entityBitmap(part.entityAt(0));
                 multiplyBitmapAlpha(entity, part.colorAt(0).alpha());
-                bmp.resize(max(bmp.width(), x + entity.width()), bmp.height());
+                bmp.resize(max(bmp.width(), x + entity.width()), bmp.height(), 0x00ffffff);
                 bmp.insert(entity, x, i * fontHeight);
                 x += entity.width();
                 continue;
@@ -357,7 +357,7 @@ Gosu::Bitmap Gosu::createText(const wstring& text,
             wstring unformattedText = part.unformat();
             unsigned partWidth =
                 textWidth(unformattedText, fontName, fontHeight, part.flagsAt(0));
-            bmp.resize(max(bmp.width(), x + partWidth), bmp.height());
+            bmp.resize(max(bmp.width(), x + partWidth), bmp.height(), 0x00ffffff);
             drawText(bmp, unformattedText, x, i * fontHeight, part.colorAt(0),
                 fontName, fontHeight, part.flagsAt(0));
             x += partWidth;

data/src/Text/TextApple.mm

@@ -1,7 +1,5 @@
 #import <Gosu/Platform.hpp>
 
-#if defined(GOSU_IS_IPHONE) || defined(__LP64__)
-
 #include <Gosu/Text.hpp>
 #include <Gosu/Bitmap.hpp>
 #include <Gosu/Utility.hpp>
@@ -29,6 +27,8 @@ namespace
     // like any system font. Otherwise, just returns the family name.
     std::wstring normalizeFont(const std::wstring& fontName)
     {
+        // On iOS, we have no support for loading font files yet. However if you register your fonts
+        // via your app's Info.plist, you should be able to reference them by their name.
         #ifdef GOSU_IS_IPHONE
         return fontName;
         #else
@@ -48,8 +48,7 @@ namespace
                 fontName.length() * sizeof(wchar_t),
                 kCFStringEncodingUTF32LE, NO));
         CFRef<CFURLRef> url(
-            CFURLCreateWithFileSystemPath(NULL, urlString.obj(),
-                kCFURLPOSIXPathStyle, YES));
+            CFURLCreateWithFileSystemPath(NULL, urlString.obj(), kCFURLPOSIXPathStyle, YES));
         if (!url.get())
             return familyOfFiles[fontName] = Gosu::defaultFontName();
             
@@ -57,17 +56,15 @@ namespace
             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() cStringUsingEncoding: NSUTF8StringEncoding];
+        
+        const char* utf8FontName = [(NSString*)fontNameStr.obj() UTF8String];
         return familyOfFiles[fontName] = Gosu::utf8ToWstring(utf8FontName);
         #endif
     }
@@ -81,9 +78,9 @@ namespace
         OSXFont* result = usedFonts[make_pair(fontName, make_pair(fontFlags, height))];
         if (!result)
         {
-            ObjCRef<NSString> name([[NSString alloc] initWithUTF8String: Gosu::wstringToUTF8(fontName).c_str()]);
+            ObjCRef<NSString> name([[NSString alloc] initWithUTF8String:Gosu::wstringToUTF8(fontName).c_str()]);
             #ifdef GOSU_IS_IPHONE
-            result = [OSXFont fontWithName: name.obj() size: height];
+            result = [OSXFont fontWithName:name.obj() size:height];
             #else
             NSFontDescriptor* desc = [[NSFontDescriptor fontDescriptorWithFontAttributes:nil] fontDescriptorWithFamily:name.obj()];
             result = [[NSFont fontWithDescriptor:desc size:height] retain];
@@ -103,8 +100,6 @@ namespace
 
 wstring Gosu::defaultFontName()
 {
-    // OF COURSE Helvetica is better - but the dots above my capital umlauts get
-    // eaten when I use it with Gosu. Until this is fixed, keep Arial. (TODO)
     return L"Arial";
 }
 
@@ -121,7 +116,7 @@ namespace
         if (fontFlags & Gosu::ffUnderline)
         {
             Gosu::ObjCRef<NSNumber> underline([[NSNumber alloc] initWithInt:NSUnderlineStyleSingle]);
-            [dict setValue: underline.obj() forKey:NSUnderlineStyleAttributeName];
+            [dict setValue:underline.obj() forKey:NSUnderlineStyleAttributeName];
         }
         return dict;
     }
@@ -138,12 +133,12 @@ unsigned Gosu::textWidth(const wstring& text,
     
     // 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()]);
+    ObjCRef<NSString> string([[NSString alloc] initWithUTF8String:wstringToUTF8(text).c_str()]);
     #ifndef GOSU_IS_IPHONE
     ObjCRef<NSDictionary> attributes(attributeDictionary(font, fontFlags));
-    NSSize size = [string.obj() sizeWithAttributes: attributes.get()];
+    NSSize size = [string.obj() sizeWithAttributes:attributes.get()];
     #else
-    CGSize size = [string.obj() sizeWithFont: font];
+    CGSize size = [string.obj() sizeWithFont:font];
     #endif
     
     // Now adjust the scaling...
@@ -158,20 +153,20 @@ void Gosu::drawText(Bitmap& bitmap, const wstring& text, int x, int y,
         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()]);
+    ObjCRef<NSString> string([[NSString alloc] initWithUTF8String:wstringToUTF8(text).c_str()]);
 
-    // This will, of course, compute a too large size; fontHeight is in pixels, the method expects point.
+    // 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()];
+    NSSize size = [string.obj() sizeWithAttributes:attributes.get()];
     #else
-    CGSize size = [string.obj() sizeWithFont: font];
+    CGSize size = [string.obj() sizeWithFont:font];
     #endif
     
     unsigned width = static_cast<unsigned>(round(size.width / size.height * fontHeight));
 
     // Get the width and height of the image
-    Bitmap bmp(width, fontHeight);
+    Bitmap bmp(width, fontHeight, 0x00ffffff);
     
     // Use a temporary context to draw the CGImage to the buffer.
     CGColorSpaceRef colorSpace = CGColorSpaceCreateDeviceRGB();
@@ -194,7 +189,7 @@ 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.obj() drawAtPoint:CGPointZero withFont:font];
     UIGraphicsPopContext();
     #else
     NSPoint NSPointZero = { 0, 0 };
@@ -203,7 +198,7 @@ void Gosu::drawText(Bitmap& bitmap, const wstring& text, int x, int y,
     [NSGraphicsContext saveGraphicsState];
     [NSGraphicsContext setCurrentContext:
         [NSGraphicsContext graphicsContextWithGraphicsPort:(void *)context flipped:false]];
-    [string.obj() drawAtPoint: NSPointZero withAttributes: attributes.get()];
+    [string.obj() drawAtPoint:NSPointZero withAttributes:attributes.get()];
     [NSGraphicsContext restoreGraphicsState];
     #endif
     CGContextRelease(context);
@@ -220,5 +215,3 @@ void Gosu::drawText(Bitmap& bitmap, const wstring& text, int x, int y,
                 bitmap.setPixel(x + relX, y + relY, c);
         }
 }
-
-#endif

data/src/Text/TextWin.cpp

@@ -79,11 +79,6 @@ namespace Gosu
                 return bitmap;
             }
 
-            /*char* data() const
-            {
-                return pixels;
-            }*/
-
             void selectFont(std::wstring fontName, unsigned fontHeight,
                 unsigned fontFlags) const
             {
@@ -123,8 +118,9 @@ namespace Gosu
                         CLIP_DEFAULT_PRECIS, ANTIALIASED_QUALITY,
                         DEFAULT_PITCH | FF_DONTCARE };
                     
-                    // Note: This will truncate the font value, but that's the way stuff works.
-                    /*std::*/wcsncpy(logfont.lfFaceName, fontName.c_str(), LF_FACESIZE);
+                    // Don't rely on wcsncpy being in std::...
+                    using namepace std;
+                    wcsncpy(logfont.lfFaceName, fontName.c_str(), LF_FACESIZE);
                     logfont.lfFaceName[LF_FACESIZE - 1] = 0;
                     
                     font = loadedFonts[key] = Win::check(::CreateFontIndirect(&logfont),

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gosu
 version: !ruby/object:Gem::Version
-  version: 0.10.2.pre1
+  version: 0.10.2
 platform: ruby
 authors:
 - Julian Raschke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-31 00:00:00.000000000 Z
+date: 2015-09-13 00:00:00.000000000 Z
 dependencies: []
 description: |2
       2D game development library.
@@ -85,7 +85,6 @@ files:
 - src/Math.cpp
 - src/Text/Font.cpp
 - src/Text/Text.cpp
-- src/Text/TextMac.cpp
 - src/Text/TextTTFWin.cpp
 - src/Text/TextUnix.cpp
 - src/Text/TextWin.cpp
@@ -155,9 +154,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.8.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.14

data/src/Text/TextMac.cpp

@@ -1,253 +0,0 @@
-#include <Gosu/Platform.hpp>
-
-#if !defined(GOSU_IS_IPHONE) && !defined(__LP64__)
-
-#include <Gosu/Bitmap.hpp>
-#include <Gosu/Text.hpp>
-#include <Gosu/TR1.hpp>
-#include <Gosu/Math.hpp>
-#include <Gosu/Utility.hpp>
-#include <Gosu/IO.hpp>
-#include "../AppleUtility.hpp"
-#include <cmath>
-#include <stdexcept>
-#include <map>
-#include <vector>
-#include <ApplicationServices/ApplicationServices.h>
-
-std::wstring Gosu::defaultFontName()
-{
-    // OF COURSE Helvetica is better - but the dots above my capital umlauts get
-    // eaten when I use it with Gosu. Until this is fixed, keep Arial. (TODO)
-    return L"Arial";
-}
-
-namespace Gosu
-{
-    std::vector<unsigned short> wstringToUniChars(const std::wstring& ws);
-}
-
-namespace
-{
-    class MacBitmap
-    {
-        std::tr1::uint32_t* buf;
-        unsigned width, height;
-        CGContextRef ctx;
-        
-        MacBitmap(const MacBitmap&);
-        MacBitmap& operator=(const MacBitmap&);
-
-    public:
-        MacBitmap(std::tr1::uint32_t* buf, unsigned width, unsigned height)
-        : buf(buf), width(width), height(height)
-        {
-            CGColorSpaceRef colorSpace = CGColorSpaceCreateWithName(kCGColorSpaceGenericRGB); 
-            ctx = CGBitmapContextCreate (buf, width, height, 8, width * 4, colorSpace,
-                kCGImageAlphaPremultipliedLast);
-
-            CGColorSpaceRelease( colorSpace ); 
-        }
-
-        ~MacBitmap()
-        {
-            CGContextRelease(ctx);
-        }
-
-        CGContextRef context() const
-        {
-            return ctx;
-        }
-    };
-    
-    struct CachedFontInfo
-    {
-        ATSUFontID fontId;
-        double heightAt1Pt;
-        double descentAt1Pt;
-    };
-    CachedFontInfo& getFont(const std::wstring& fontName)
-    {
-        static std::map<std::wstring, CachedFontInfo> fonts;
-        
-        if (fonts.count(fontName))
-            return fonts[fontName];
-        
-        // Get reference to font, loaded from the system or a file.
-        ATSFontRef atsRef;
-        if (fontName.find(L"/") == std::wstring::npos)
-        {
-            // System font
-            CFStringRef cfName = CFStringCreateWithCString(NULL, Gosu::narrow(fontName).c_str(), kCFStringEncodingASCII);
-            atsRef = ATSFontFindFromName(cfName, kATSOptionFlagsDefault);
-            if (!atsRef)
-                throw std::runtime_error("Cannot find font " + Gosu::narrow(fontName));
-            CFRelease(cfName);
-        }
-        else
-        {
-            // Filename to font
-            Gosu::Buffer buf;
-            Gosu::loadFile(buf, fontName);
-            
-            ATSFontContainerRef container; 
-            CHECK_OS( ATSFontActivateFromMemory(buf.data(), buf.size(),
-                          kATSFontContextLocal, kATSFontFormatUnspecified, 
-                          NULL, kATSOptionFlagsDefault, &container) );
-            
-            ATSFontRef fontRefs[1024]; 
-            ItemCount  fontCount; 
-            CHECK_OS( ATSFontFindFromContainer(container, kATSOptionFlagsDefault, 
-                          1024, fontRefs, &fontCount) );
-            if (fontCount == 0)
-                throw std::runtime_error("No font found in " + Gosu::narrow(fontName));
-
-            atsRef = fontRefs[0];
-        }
-        
-        // Calculate metrics (for space allocations) and create CachedFontInfo entry.
-        CachedFontInfo newFont;
-        newFont.fontId = (ATSUFontID)atsRef;
-
-        ATSFontMetrics metrics;
-        CHECK_OS(ATSFontGetHorizontalMetrics(newFont.fontId, kATSOptionFlagsDefault, &metrics));
-        newFont.heightAt1Pt = metrics.ascent - metrics.descent;
-        newFont.descentAt1Pt = -metrics.descent;
-        fonts[fontName] = newFont;
-        return fonts[fontName];
-    }
-    
-    class ATSULayoutAndStyle
-    {
-        ATSUStyle style;
-        ATSUTextLayout layout;
-        std::vector<UniChar> utf16; // More like UCS-2-INTERNAL.
-
-        template<typename T>
-        void setAttribute(ATSUAttributeTag tag, T value)
-        {
-            ByteCount size = sizeof value;
-            ATSUAttributeValuePtr ptr = &value;
-            CHECK_OS( ATSUSetAttributes(style, 1, &tag, &size, &ptr) );
-        }
-        
-        template<typename T>
-        void setLayoutControl(ATSUAttributeTag tag, T value)
-        {
-            ByteCount size = sizeof value;
-            ATSUAttributeValuePtr ptr = &value;
-            CHECK_OS( ATSUSetLayoutControls(layout, 1, &tag, &size, &ptr) );
-        }
-        
-    public:
-        ATSULayoutAndStyle(const std::wstring& text, const std::wstring& fontName, unsigned fontHeightPx, unsigned fontFlags)
-        {
-            utf16 = Gosu::wstringToUniChars(text);
-        
-            CHECK_OS( ATSUCreateStyle(&style) );
-            
-            CachedFontInfo& font = getFont(fontName);
-            
-            setAttribute<ATSUFontID>(kATSUFontTag, font.fontId);
-            
-            setAttribute<Fixed>(kATSUSizeTag, X2Fix(fontHeightPx / font.heightAt1Pt));
-            if (fontFlags & Gosu::ffBold)
-                setAttribute<Boolean>(kATSUQDBoldfaceTag, TRUE);
-            if (fontFlags & Gosu::ffItalic)
-                setAttribute<Boolean>(kATSUQDItalicTag, TRUE);
-            if (fontFlags & Gosu::ffUnderline)
-                setAttribute<Boolean>(kATSUQDUnderlineTag, TRUE);
-
-            UniCharCount runLength = utf16.size();
-            CHECK_OS( ATSUCreateTextLayoutWithTextPtr(&utf16[0], kATSUFromTextBeginning,
-                            kATSUToTextEnd, utf16.size(), 1, &runLength, &style, &layout) );
-        }
-        
-        ~ATSULayoutAndStyle()
-        {
-            CHECK_OS( ATSUDisposeStyle(style) );
-            CHECK_OS( ATSUDisposeTextLayout(layout) );
-        }
-
-        Rect textExtents() const
-        {
-            Rect rect;
-            CHECK_OS( ATSUSetTransientFontMatching(layout, TRUE) );
-            CHECK_OS( ATSUMeasureTextImage(layout, kATSUFromTextBeginning,
-                                           kATSUToTextEnd, X2Fix(0), X2Fix(0), &rect) );
-            return rect;
-        }
-        
-        void drawToContext(Fixed x, Fixed y, CGContextRef context)
-        {
-            // Always draw in black - recoloring to white happens in drawText itself.
-            // Reason: Text drawn using fallback fonts seems to always be black anyway :(
-            
-            RGBColor color = { 0, 0, 0 };
-            setAttribute<RGBColor>(kATSUColorTag, color);
-            setLayoutControl<CGContextRef>(kATSUCGContextTag, context);
-            CHECK_OS( ATSUSetTransientFontMatching(layout, TRUE) );
-            CHECK_OS( ATSUDrawText(layout, kATSUFromTextBeginning, kATSUToTextEnd, x, y) );
-        }
-    };
-}
-
-unsigned Gosu::textWidth(const std::wstring& text,
-    const std::wstring& fontName, unsigned fontHeight, unsigned fontFlags)
-{
-    if (text.find_first_of(L"\r\n") != std::wstring::npos)
-        throw std::invalid_argument("the argument to textWidth cannot contain line breaks");
-    
-    // TODO: Why 1?
-    if (text.empty())
-        return 1;
-    
-    // TODO: special case :(
-    // TODO: Why? I guess it was empty otherwise?
-    if (text == L" ")
-        return fontHeight / 3;
-    
-    ATSULayoutAndStyle atlas(text, fontName, fontHeight, fontFlags);
-    Rect rect = atlas.textExtents();
-    return rect.right + 1 - rect.left + 1; // add one pixel on OS X
-}
-
-void Gosu::drawText(Bitmap& bitmap, const std::wstring& text, int x, int y,
-    Color c, const std::wstring& fontName, unsigned fontHeight,
-    unsigned fontFlags)
-{
-    if (text.find_first_of(L"\r\n") != std::wstring::npos)
-        throw std::invalid_argument("the argument to drawText cannot contain line breaks");
-    
-    if (text.empty())
-        return;
-
-    CachedFontInfo& font = getFont(fontName);
-    
-    ATSULayoutAndStyle atlas(text, fontName, fontHeight, fontFlags);
-    Rect rect = atlas.textExtents();
-    int width = rect.right + 1 - rect.left + 1; // add one pixel on OS X
-    std::vector<std::tr1::uint32_t> buf(width * fontHeight);
-    {
-        MacBitmap helper(&buf[0], width, fontHeight);
-        atlas.drawToContext(X2Fix(-rect.left), X2Fix(fontHeight / font.heightAt1Pt * font.descentAt1Pt),
-                            helper.context());
-    }
-    
-    int effectiveWidth = Gosu::clamp<int>(width, 0, bitmap.width() - x);
-    int effectiveHeight = Gosu::clamp<int>(fontHeight, 0, bitmap.height() - y);
-    
-    for (int relY = 0; relY < effectiveHeight; ++relY)
-        for (int relX = 0; relX < effectiveWidth; ++relX)
-        {
-#ifdef __BIG_ENDIAN__
-            Color::Channel alpha = buf[relY * width + relX];
-#else
-            Color::Channel alpha = Color(buf[relY * width + relX]).alpha();
-#endif
-            if (alpha != 0)
-                bitmap.setPixel(x + relX, y + relY, multiply(c, Color(alpha, 0xff, 0xff, 0xff)));
-        }
-}
-
-#endif