gosu 0.7.31 → 0.7.32

data/Gosu/Fwd.hpp

@@ -10,6 +10,7 @@ namespace Gosu
     class Audio;
     class Bitmap;
     class Buffer;
+    class Button;
     class Color;
     class File;
     class Font;

data/Gosu/Version.hpp

@@ -3,7 +3,37 @@
 
 #define GOSU_MAJOR_VERSION 0
 #define GOSU_MINOR_VERSION 7
-#define GOSU_POINT_VERSION 31
-#define GOSU_VERSION "0.7.31"
+#define GOSU_POINT_VERSION 32
+#define GOSU_VERSION "0.7.32"
 
+#define GOSU_COPYRIGHT_NOTICE \
+  "May contain `ogg', `vorbis' libraries (c) 2002-2008 Xiph.org Foundation" \
+  "\n\n" \
+  "Redistribution and use in source and binary forms, with or without" \
+  "modification, are permitted provided that the following conditions" \
+  "are met:" \
+  "\n\n" \
+  "- Redistributions of source code must retain the above copyright" \
+  "notice, this list of conditions and the following disclaimer." \
+  "\n\n" \
+  "- Redistributions in binary form must reproduce the above copyright" \
+  "notice, this list of conditions and the following disclaimer in the" \
+  "documentation and/or other materials provided with the distribution." \
+  "\n\n" \
+  "- Neither the name of the Xiph.org Foundation nor the names of its" \
+  "contributors may be used to endorse or promote products derived from" \
+  "this software without specific prior written permission." \
+  "\n\n" \
+  "THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS" \
+  "``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT" \
+  "LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR" \
+  "A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION" \
+  "OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL," \
+  "SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT" \
+  "LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE," \
+  "DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY" \
+  "THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT" \
+  "(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE" \
+  "OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+  
 #endif

data/GosuImpl/Graphics/BitmapApple.mm

@@ -164,7 +164,8 @@ void Gosu::saveImageFile(const Bitmap& bmp, Writer writer, const std::wstring& f
     {
         Bitmap bitmap = bmp;
         unapplyColorKey(bitmap, Color::FUCHSIA);
-        return Gosu::saveToBMP(bitmap, writer);
+        Gosu::saveToBMP(bitmap, writer);
+        return;
     }
     
     ObjRef<NSAutoreleasePool> pool([NSAutoreleasePool new]);
@@ -193,7 +194,5 @@ void Gosu::saveImageFile(const Bitmap& bmp, Writer writer, const std::wstring& f
     CGImageRelease(imageRef);
     
     CGDataProviderRelease(dataProvider);
-    
-    return writer;
 }
 #endif

data/GosuImpl/Graphics/BitmapFreeImage.cpp

@@ -6,6 +6,18 @@
 #include <boost/cstdint.hpp>
 #include <FreeImage.h>
 
+// Compatibility with FreeImage < 3.1.3 which is still stuck in many package repositories
+#ifndef JPEG_EXIFROTATE
+#define JPEG_EXIFROTATE 0
+#endif
+
+// In Windows, add a suffix to all functions so they can be used as a fallback for GDI+.
+#ifdef GOSU_IS_WIN
+#define FI(x) x##_FreeImage
+#else
+#define FI(x) x
+#endif
+
 namespace
 {
     const int GOSU_FIFLAGS = (JPEG_EXIFROTATE | ICO_MAKEALPHA | PNG_IGNOREGAMMA);
@@ -68,54 +80,57 @@ namespace
 
 // TODO: error checking w/ FreeImage_SetOutputMessage?
 
-Gosu::Bitmap Gosu::loadImageFile(const std::wstring& filename)
+namespace Gosu
 {
-    #ifdef GOSU_IS_WIN
-    FREE_IMAGE_FORMAT fif = GetFileTypeU(filename.c_str());
-    FIBITMAP* fib = FreeImage_LoadU(filename.c_str(), GOSU_FIFLAGS);
-    #else
-    std::string utf8Filename = wstringToUTF8(filename);
-    FREE_IMAGE_FORMAT fif = FreeImage_GetFileType(utf8Filename.c_str());
-    FIBITMAP* fib = FreeImage_Load(fif, utf8Filename.c_str(), GOSU_FIFLAGS);
-    #endif
+    Bitmap FI(loadImageFile)(const std::wstring& filename)
+    {
+        #ifdef GOSU_IS_WIN
+        FREE_IMAGE_FORMAT fif = FreeImage_GetFileTypeU(filename.c_str());
+        FIBITMAP* fib = FreeImage_LoadU(fif, filename.c_str(), GOSU_FIFLAGS);
+        #else
+        std::string utf8Filename = wstringToUTF8(filename);
+        FREE_IMAGE_FORMAT fif = FreeImage_GetFileType(utf8Filename.c_str());
+        FIBITMAP* fib = FreeImage_Load(fif, utf8Filename.c_str(), GOSU_FIFLAGS);
+        #endif
 
-    return fibToBitmap(fib, fif);
-}
+        return fibToBitmap(fib, fif);
+    }
 
-Gosu::Bitmap Gosu::loadImageFile(Gosu::Reader input)
-{
-    // Read all available input
-    std::vector<BYTE> data(input.resource().size() - input.position());
-    input.read(&data[0], data.size());
-    FIMEMORY* fim = FreeImage_OpenMemory(&data[0], data.size());
-    FREE_IMAGE_FORMAT fif = FreeImage_GetFileTypeFromMemory(fim);
-    FIBITMAP* fib = FreeImage_LoadFromMemory(fif, fim, GOSU_FIFLAGS);
+    Bitmap FI(loadImageFile)(Gosu::Reader input)
+    {
+        // Read all available input
+        std::vector<BYTE> data(input.resource().size() - input.position());
+        input.read(&data[0], data.size());
+        FIMEMORY* fim = FreeImage_OpenMemory(&data[0], data.size());
+        FREE_IMAGE_FORMAT fif = FreeImage_GetFileTypeFromMemory(fim);
+        FIBITMAP* fib = FreeImage_LoadFromMemory(fif, fim, GOSU_FIFLAGS);
 
-    return fibToBitmap(fib, fif);
-}
+        return fibToBitmap(fib, fif);
+    }
 
-void Gosu::saveImageFile(const Bitmap& bitmap, const std::wstring& filename)
-{
-    std::string utf8Filename = wstringToUTF8(filename);
-    FREE_IMAGE_FORMAT fif = FreeImage_GetFIFFromFilename(utf8Filename.c_str());
-    FIBITMAP* fib = bitmapToFIB(bitmap, fif);
+    void FI(saveImageFile)(const Bitmap& bitmap, const std::wstring& filename)
+    {
+        std::string utf8Filename = wstringToUTF8(filename);
+        FREE_IMAGE_FORMAT fif = FreeImage_GetFIFFromFilename(utf8Filename.c_str());
+        FIBITMAP* fib = bitmapToFIB(bitmap, fif);
 
-    #ifdef GOSU_IS_WIN
-    FreeImage_SaveU(fif, fib, filename.c_str());
-    #else
-    FreeImage_Save(fif, fib, utf8Filename.c_str());
-    #endif
-    FreeImage_Unload(fib);
-}
+        #ifdef GOSU_IS_WIN
+        FreeImage_SaveU(fif, fib, filename.c_str());
+        #else
+        FreeImage_Save(fif, fib, utf8Filename.c_str());
+        #endif
+        FreeImage_Unload(fib);
+    }
 
-void Gosu::saveImageFile(const Bitmap& bitmap, Gosu::Writer writer,
-    const std::wstring& formatHint)
-{
-    std::string utf8FormatHint = wstringToUTF8(formatHint);
-    FREE_IMAGE_FORMAT fif = FreeImage_GetFIFFromFilename(utf8FormatHint.c_str());
-    FIBITMAP* fib = bitmapToFIB(bitmap, fif);
-    
-    FreeImageIO fio = { NULL, WriteProc, SeekProc, TellProc };
-    FreeImage_SaveToHandle(fif, fib, &fio, &writer);
-    FreeImage_Unload(fib);
+    void FI(saveImageFile)(const Bitmap& bitmap, Gosu::Writer writer,
+        const std::wstring& formatHint)
+    {
+        std::string utf8FormatHint = wstringToUTF8(formatHint);
+        FREE_IMAGE_FORMAT fif = FreeImage_GetFIFFromFilename(utf8FormatHint.c_str());
+        FIBITMAP* fib = bitmapToFIB(bitmap, fif);
+        
+        FreeImageIO fio = { NULL, WriteProc, SeekProc, TellProc };
+        FreeImage_SaveToHandle(fif, fib, &fio, &writer);
+        FreeImage_Unload(fib);
+    }
 }

data/GosuImpl/Graphics/TextMac.cpp

@@ -192,10 +192,15 @@ namespace
 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 :///7
+    
+    // TODO: special case :(
+    // TODO: Why? I guess it was empty otherwise?
     if (text == L" ")
         return fontHeight / 3;
     
@@ -208,6 +213,9 @@ 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;
 

data/GosuImpl/Graphics/TextTouch.mm

@@ -2,12 +2,13 @@
 
 #if defined(GOSU_IS_IPHONE) || defined(__LP64__)
 
-#import <Gosu/Text.hpp>
-#import <Gosu/Bitmap.hpp>
-#import <Gosu/Utility.hpp>
-#import <GosuImpl/MacUtility.hpp>
-#import <map>
-#import <cmath>
+#include <Gosu/Text.hpp>
+#include <Gosu/Bitmap.hpp>
+#include <Gosu/Utility.hpp>
+#include <GosuImpl/MacUtility.hpp>
+#include <boost/algorithm/string.hpp>
+#include <map>
+#include <cmath>
 using namespace std;
 
 #if defined(GOSU_IS_IPHONE)
@@ -130,6 +131,9 @@ namespace
 unsigned Gosu::textWidth(const wstring& text,
     const wstring& fontName, unsigned fontHeight, unsigned fontFlags)
 {
+    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);
     
     // This will, of course, compute a too large size; fontHeight is in pixels,
@@ -141,7 +145,7 @@ unsigned Gosu::textWidth(const wstring& text,
     #else
     CGSize size = [string.obj() sizeWithFont: font];
     #endif
-                           
+    
     // Now adjust the scaling...
     return ceil(size.width / size.height * fontHeight);
 }
@@ -150,6 +154,9 @@ 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)
+        throw std::invalid_argument("the argument to drawText cannot contain line breaks");
+    
     OSXFont* font = getFont(fontName, fontFlags, fontHeight);
     ObjRef<NSString> string([[NSString alloc] initWithUTF8String: wstringToUTF8(text).c_str()]);
 

data/GosuImpl/Graphics/TextUnix.cpp

@@ -243,6 +243,9 @@ 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");
+    
     if (fontName.find(L"/") == std::wstring::npos)
         return PangoRenderer().textWidth(text, fontName, fontHeight, fontFlags);
     else
@@ -253,6 +256,9 @@ 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 (fontName.find(L"/") == std::wstring::npos)
         PangoRenderer().drawText(bitmap, text, x, y, c, fontName, fontHeight, fontFlags);
     else

data/GosuImpl/Graphics/TextWin.cpp

@@ -143,6 +143,9 @@ namespace Gosu
 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");
+    
     WinBitmap helper(1, 1);
     helper.selectFont(fontName, fontHeight, fontFlags);
     
@@ -157,6 +160,9 @@ 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");
+    
     unsigned width = textWidth(text, fontName, fontHeight, fontFlags);
 
     WinBitmap helper(width, fontHeight);

data/GosuImpl/RubyGosu.swg

@@ -173,6 +173,9 @@
 #include <Gosu/Utility.hpp>
 #include <Gosu/Version.hpp>
 #include <Gosu/Window.hpp>
+#ifdef GOSU_IS_WIN
+#include <FreeImage.h>
+#endif
 
 namespace Gosu {
     void enableUndocumentedRetrofication() { extern bool undocumentedRetrofication; undocumentedRetrofication = true; }
@@ -215,17 +218,49 @@ namespace
     }
 }
 
-// Allow filenames and RMagick Images to be passed where Bitmaps are needed.
 namespace Gosu
 {
+	#ifdef GOSU_IS_WIN
+    void ping_FreeImage()
+    {
+        // Copied and pasted from MSDN.
+        // TODO: Remove duplication, this is also in AudioAudiere.cpp
+        #define FACILITY_VISUALCPP  ((LONG)0x6d)
+        #define VcppException(sev,err)  ((sev) | (FACILITY_VISUALCPP<<16) | err)
+        #define BAD_MOD VcppException(ERROR_SEVERITY_ERROR, ERROR_MOD_NOT_FOUND)
+        
+        __try
+        {
+            FreeImage_GetVersion();
+        }
+        __except ((GetExceptionCode() == BAD_MOD) ? EXCEPTION_EXECUTE_HANDLER : EXCEPTION_CONTINUE_SEARCH)
+        {
+            rb_raise(rb_eRuntimeError, "unable to locate FreeImage.dll");
+        }
+        #undef BAD_MOD
+        #undef VcppException
+        #undef FACILITY_VISUALCPP
+    }
+	Bitmap loadImageFile_FreeImage(const std::wstring& filename);
+    #endif
     Gosu::Bitmap loadBitmap(VALUE val)
     {
         // Try to treat as filename first.
         if (rb_respond_to(val, rb_intern("to_str")))
         {
             VALUE to_str = rb_funcall(val, rb_intern("to_str"), 0);
-            const char* filename = StringValuePtr(to_str);
-            return loadImageFile(Gosu::utf8ToWstring(filename));
+            const char* filenameUTF8 = StringValuePtr(to_str);
+            std::wstring filename = Gosu::utf8ToWstring(filenameUTF8);
+            try {
+	            return loadImageFile(filename);
+	        } catch (const std::exception&) {
+            #ifdef GOSU_IS_WIN
+                ping_FreeImage();
+				return loadImageFile_FreeImage(filename);
+	        #else
+				throw;
+			#endif
+	        }  
         }
 
         // Otherwise, try to call .to_blob on it (works with RMagick, TexPlay etc).

data/GosuImpl/RubyGosu_SWIG_RENAME_PATCH.patch

@@ -1,13 +1,11 @@
-Index: GosuImpl/RubyGosu_wrap.cxx
-===================================================================
 --- GosuImpl/RubyGosu_wrap.cxx
 +++ GosuImpl/RubyGosu_wrap.cxx
-@@ -2877,14 +2877,14 @@ SwigDirector_Window::~SwigDirector_Window() {
+@@ -2912,14 +2912,14 @@ SwigDirector_Window::~SwigDirector_Window() {
  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("update_"), 0, NULL);
++  result = rb_funcall(swig_get_self(), rb_intern("protected_update"), 0, NULL);
  }
  
  
@@ -15,7 +13,50 @@ Index: GosuImpl/RubyGosu_wrap.cxx
    VALUE result;
    
 -  result = rb_funcall(swig_get_self(), rb_intern("draw"), 0, NULL);
-+  result = rb_funcall(swig_get_self(), rb_intern("draw_"), 0, NULL);
++  result = rb_funcall(swig_get_self(), rb_intern("protected_draw"), 0, NULL);
  }
  
  
+@@ -2927,7 +2927,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)) {
+@@ -2942,7 +2942,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)) {
+@@ -2956,7 +2956,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);
+ }
+ 
+ 
+@@ -2977,7 +2977,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);
+ }
+ 
+ 
+@@ -2991,7 +2991,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);
+ }

data/GosuImpl/RubyGosu_wrap.cxx

@@ -2241,6 +2241,9 @@ static VALUE mGosu;
 #include <Gosu/Utility.hpp>
 #include <Gosu/Version.hpp>
 #include <Gosu/Window.hpp>
+#ifdef GOSU_IS_WIN
+#include <FreeImage.h>
+#endif
 
 namespace Gosu {
     void enableUndocumentedRetrofication() { extern bool undocumentedRetrofication; undocumentedRetrofication = true; }
@@ -2283,17 +2286,49 @@ namespace
     }
 }
 
-// Allow filenames and RMagick Images to be passed where Bitmaps are needed.
 namespace Gosu
 {
+	#ifdef GOSU_IS_WIN
+    void ping_FreeImage()
+    {
+        // Copied and pasted from MSDN.
+        // TODO: Remove duplication, this is also in AudioAudiere.cpp
+        #define FACILITY_VISUALCPP  ((LONG)0x6d)
+        #define VcppException(sev,err)  ((sev) | (FACILITY_VISUALCPP<<16) | err)
+        #define BAD_MOD VcppException(ERROR_SEVERITY_ERROR, ERROR_MOD_NOT_FOUND)
+        
+        __try
+        {
+            FreeImage_GetVersion();
+        }
+        __except ((GetExceptionCode() == BAD_MOD) ? EXCEPTION_EXECUTE_HANDLER : EXCEPTION_CONTINUE_SEARCH)
+        {
+            rb_raise(rb_eRuntimeError, "unable to locate FreeImage.dll");
+        }
+        #undef BAD_MOD
+        #undef VcppException
+        #undef FACILITY_VISUALCPP
+    }
+	Bitmap loadImageFile_FreeImage(const std::wstring& filename);
+    #endif
     Gosu::Bitmap loadBitmap(VALUE val)
     {
         // Try to treat as filename first.
         if (rb_respond_to(val, rb_intern("to_str")))
         {
             VALUE to_str = rb_funcall(val, rb_intern("to_str"), 0);
-            const char* filename = StringValuePtr(to_str);
-            return loadImageFile(Gosu::utf8ToWstring(filename));
+            const char* filenameUTF8 = StringValuePtr(to_str);
+            std::wstring filename = Gosu::utf8ToWstring(filenameUTF8);
+            try {
+	            return loadImageFile(filename);
+	        } catch (const std::exception&) {
+            #ifdef GOSU_IS_WIN
+                ping_FreeImage();
+				return loadImageFile_FreeImage(filename);
+	        #else
+				throw;
+			#endif
+	        }  
         }
 
         // Otherwise, try to call .to_blob on it (works with RMagick, TexPlay etc).
@@ -2877,14 +2912,14 @@ SwigDirector_Window::~SwigDirector_Window() {
 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"), 0, NULL);
 }
 
 
@@ -2892,7 +2927,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)) {
@@ -2907,7 +2942,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)) {
@@ -2921,7 +2956,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);
 }
 
 
@@ -2942,7 +2977,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);
 }
 
 
@@ -2956,7 +2991,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);
 }
 
 
@@ -11085,8 +11120,9 @@ SWIGEXPORT void Init_gosu(void) {
   SWIG_RubyInitializeTrackings();
   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 >(7)));
-  rb_define_const(mGosu, "POINT_VERSION", SWIG_From_int(static_cast< int >(31)));
-  rb_define_const(mGosu, "VERSION", SWIG_FromCharPtr("0.7.31"));
+  rb_define_const(mGosu, "POINT_VERSION", SWIG_From_int(static_cast< int >(32)));
+  rb_define_const(mGosu, "VERSION", SWIG_FromCharPtr("0.7.32"));
+  rb_define_const(mGosu, "GOSU_COPYRIGHT_NOTICE", SWIG_FromCharPtr("May contain `ogg\', `vorbis\' libraries (c) 2002-2008 Xiph.org Foundation\n\nRedistribution and use in source and binary forms, with or withoutmodification, are permitted provided that the following conditionsare met:\n\n- Redistributions of source code must retain the above copyrightnotice, this list of conditions and the following disclaimer.\n\n- Redistributions in binary form must reproduce the above copyrightnotice, this list of conditions and the following disclaimer in thedocumentation and/or other materials provided with the distribution.\n\n- Neither the name of the Xiph.org Foundation nor the names of itscontributors may be used to endorse or promote products derived fromthis software without specific prior written permission.\n\nTHIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS``AS IS\'\' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOTLIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FORA PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATIONOR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOTLIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANYTHEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USEOF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."));
   rb_define_module_function(mGosu, "milliseconds", VALUEFUNC(_wrap_milliseconds), -1);
   rb_define_module_function(mGosu, "random", VALUEFUNC(_wrap_random), -1);
   rb_define_module_function(mGosu, "degrees_to_radians", VALUEFUNC(_wrap_degrees_to_radians), -1);

data/GosuImpl/WindowMac.mm

@@ -321,6 +321,9 @@ Gosu::Window::Window(unsigned width, unsigned height, bool fullscreen,
     
     pimpl->interval = updateInterval;
     pimpl->mouseViz = true;
+    
+    // Clear gl error flag if it should accidentally be set. (Huh?)
+    while (glGetError() != GL_NO_ERROR);
 }
 
 Gosu::Window::~Window()

data/examples/ChipmunkIntegration.rb

@@ -4,7 +4,7 @@
 ## Date: 2007-10-05
 ## License: Same as for Gosu (MIT)
 ## Comments: Based on the Gosu Ruby Tutorial, but incorporating the Chipmunk Physics Engine
-## See http://code.google.com/p/gosu/wiki/RubyChipmunkIntegration for the accompanying text.
+## See https://github.com/jlnr/gosu/wiki/Ruby-Chipmunk-Integration for the accompanying text.
 
 require 'rubygems'
 require 'gosu'

data/lib/gosu.rb

@@ -1,16 +1,16 @@
-require 'rbconfig'
-
-begin
-  if defined? RUBY_VERSION and RUBY_VERSION[0..2] == '1.9' then
-    version = '1_9'
-  else
-    version = '1_8'
-  end
-  require "#{File.dirname(__FILE__)}/gosu.for_#{version}.#{Config::CONFIG['DLEXT']}"
-  require "#{File.dirname(__FILE__)}/gosu/swig_patches.rb"
-rescue LoadError => e
-  require "#{File.dirname(__FILE__)}/gosu.#{Config::CONFIG['DLEXT']}"
-  require "#{File.dirname(__FILE__)}/gosu/swig_patches.rb"
-end
-
-require "#{File.dirname(__FILE__)}/gosu/patches.rb"
+require 'rbconfig'
+
+begin
+  if defined? RUBY_VERSION and RUBY_VERSION[0..2] == '1.9' then
+    version = '1_9'
+  else
+    version = '1_8'
+  end
+  require "#{File.dirname(__FILE__)}/gosu.for_#{version}.#{Config::CONFIG['DLEXT']}"
+  require "#{File.dirname(__FILE__)}/gosu/swig_patches.rb"
+rescue LoadError => e
+  require "#{File.dirname(__FILE__)}/gosu.#{Config::CONFIG['DLEXT']}"
+  require "#{File.dirname(__FILE__)}/gosu/swig_patches.rb"
+end
+
+require "#{File.dirname(__FILE__)}/gosu/patches.rb"

data/lib/gosu/swig_patches.rb

@@ -3,27 +3,38 @@
 
 # Exceptions in Window callbacks often get lost, this is especially annoying in draw/update.
 # It is not clear whether this is a SWIG issue or if some stack frame is not exception
-# compatible, but I just call update_ and draw_ in the Ruby wrapper so I can add this
+# compatible, but I just call protected_update etc. in the Ruby wrapper so I can add this
 # custom debugging help:
 class Gosu::Window
-  def update_
-    update
-  rescue Exception => e
-    puts e.inspect
-    puts e.backtrace
-    raise e
+  %w(update draw needs_redraw? needs_cursor?
+     lose_focus button_down button_up).each do |callback|
+    define_method "protected_#{callback}" do |*args|
+      begin
+        # Turn into a boolean result for needs_cursor? etc while we are at it.
+        !!send(callback, *args) unless @_exception
+      rescue Exception => e
+        # Exit the message loop naturally, then re-throw
+        @_exception = e
+        close
+      end
+    end
   end
-
-  def draw_
-    draw
-  rescue Exception => e
-    puts e.inspect
-    puts e.backtrace
-    raise e
+  
+  alias show_internal show
+  def show
+    show_internal
+    # Try to format the message nicely, without any useless patching that we are
+    # doing here.
+    if @_exception then
+      if @_exception.backtrace.is_a? Array and not @_exception.backtrace.frozen? then
+        @_exception.backtrace.reject! { |line| line.include? 'lib/gosu/swig_patches.rb' }
+      end
+      raise @_exception
+    end
   end
 end
 
-# SWIG doesn't understand the C++ overloading.
+# SWIG doesn't understand the C++ overloading, so we need this simple check in Ruby.
 class Gosu::Image
   def self.from_text(*args)
     args.size == 4 ? from_text4(*args) : from_text7(*args)

data/linux/extconf.rb

@@ -10,7 +10,7 @@ end
 
 puts 'The Gosu gem requires some libraries to be installed system-wide.'
 puts 'See the following site for a list:'
-puts 'http://code.google.com/p/gosu/wiki/GettingStartedOnLinux'
+puts 'https://github.com/jlnr/gosu/wiki/Getting-Started-on-Linux'
 puts
 
 BASE_FILES = %w(

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gosu
 version: !ruby/object:Gem::Version 
-  hash: 61
+  hash: 67
   prerelease: 
   segments: 
   - 0
   - 7
-  - 31
-  version: 0.7.31
+  - 32
+  version: 0.7.32
 platform: ruby
 authors: 
 - Julian Raschke
@@ -16,8 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-30 00:00:00 +08:00
-default_executable: 
+date: 2011-06-05 00:00:00 Z
 dependencies: []
 
 description: "  2D game development library.\n\n  Gosu features easy to use and game-friendly interfaces to 2D graphics\n  and text (accelerated by 3D hardware), sound samples and music as well as\n  keyboard, mouse and gamepad/joystick input.\n\n  Also includes demos for integration with RMagick, Chipmunk and Ruby-OpenGL.\n"
@@ -175,7 +174,6 @@ files:
 - GosuImpl/WinUtility.cpp
 - GosuImpl/X11vroot.h
 - linux/extconf.rb
-has_rdoc: true
 homepage: http://libgosu.org/
 licenses: []
 
@@ -205,9 +203,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 requirements: 
-- See http://code.google.com/p/gosu/wiki/GettingStartedOnLinux
+- See https://github.com/jlnr/gosu/wiki/Getting-Started-on-Linux
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.4
 signing_key: 
 specification_version: 3
 summary: 2D game development library.