gosu 0.10.0 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 29ea42b991f0cdb7184583f5a435defec4f07942
-  data.tar.gz: 44b69037fa96ae7d5cacc38d5c1919b23a87461c
+  metadata.gz: 7aedd1fe70ab438f78ea2412e96323a9713f5d58
+  data.tar.gz: 34533d20906d49c8b6928be119c43494d4253146
 SHA512:
-  metadata.gz: 3bf4f2486302c435a0b46a420649db290ffb951133a5bbed48e98e0cd9d58738250cf549fc397a632de224e837bc7b58640367db69703c93262780b61539eab2
-  data.tar.gz: 0f0b3b81cb18107cf9253a1757237cbfdd46897bc55bcd108453c748689b36a0bcbe482a2eef5f20d1fa4b3149349433d5851421c18c9e04fa0cdd812d8802c7
+  metadata.gz: 4bd7363b574bfa87aa0a777f90badb769f2c7391a6d9cee1dfd8edbefe706b3e9c4737b81aa189a30a56430e1216da4fa449f57f41ec8a1f9cd0676e5217f44f
+  data.tar.gz: b7e43cb2de077d7f8ce07556f8eb1e14b523ca7a599bb0342c62fdf76913c097b7342ec141d87ef56b63f6af4d60d1dc49282cf78449083af26c16e6b72c07ad

data/Gosu/Version.hpp

@@ -3,8 +3,8 @@
 
 #define GOSU_MAJOR_VERSION 0
 #define GOSU_MINOR_VERSION 10
-#define GOSU_POINT_VERSION 0
-#define GOSU_VERSION "0.10.0"
+#define GOSU_POINT_VERSION 1
+#define GOSU_VERSION "0.10.1"
 
 #define GOSU_COPYRIGHT_NOTICE \
     "This software uses the following third-party libraries:\n" \

data/ext/gosu/gosu_wrap.cxx

@@ -8,10 +8,6 @@
  * 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
 
@@ -874,7 +870,6 @@ 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
@@ -1215,7 +1210,7 @@ extern "C" {
 /* Global Ruby hash table to store Trackings from C/C++
    structs to Ruby Objects. 
 */
-static std::map<void*, VALUE> swig_ruby_trackings;
+static VALUE swig_ruby_trackings = Qnil;
 
 /* Global variable that stores a reference to the ruby
    hash table delete function. */
@@ -1232,18 +1227,34 @@ 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 */ 
-  swig_ruby_trackings.clear();
+  if ( swig_ruby_trackings == Qnil )
+    {
+      swig_ruby_trackings = rb_hash_new();
+      rb_ivar_set( _mSWIG, trackings_id, swig_ruby_trackings );
+    }
 
   /* 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
@@ -1265,16 +1276,39 @@ 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. */
-  swig_ruby_trackings[ptr] = object;
+  rb_hash_aset(swig_ruby_trackings, key, value);
 }
 
 /* Get the Ruby object that owns the specified C/C++ struct */
 SWIGRUNTIME VALUE SWIG_RubyInstanceFor(void* ptr) {
-  if (swig_ruby_trackings.count(ptr) == 0)
+  /* 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. */
     return Qnil;
-  else
-    return swig_ruby_trackings[ptr];
+  }
+  else {
+    /* Convert this value to Ruby object */
+    return SWIG_RubyReferenceToObject(value);
+  }
 }
 
 /* Remove a Tracking from a C/C++ struct to a Ruby object.  It
@@ -1282,7 +1316,12 @@ 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) {
-  swig_ruby_trackings.erase(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);
 }
 
 /* This is a helper method that unlinks a Ruby object from its
@@ -2856,6 +2895,7 @@ SWIGINTERN Gosu::Image *Gosu_Image_fromText(std::wstring const &text,unsigned in
         unsigned width = 0xfefefefe;
         unsigned spacing = 0;
         Gosu::TextAlign align = Gosu::taLeft;
+        unsigned flags = 0;
         
         if (options) {
             Check_Type(options, T_HASH);
@@ -2892,6 +2932,10 @@ SWIGINTERN Gosu::Image *Gosu_Image_fromText(std::wstring const &text,unsigned in
                 else if (!strcmp(keyString, "spacing")) {
                     spacing = NUM2INT(value);
                 }
+                else if (!strcmp(keyString, "retro")) {
+                    if (RTEST(value))
+                        flags |= Gosu::ifRetro;
+                }
                 else {
                     static bool issuedWarning = false;
                     if (!issuedWarning) {
@@ -2903,9 +2947,9 @@ SWIGINTERN Gosu::Image *Gosu_Image_fromText(std::wstring const &text,unsigned in
         }
         
         if (width == 0xfefefefe)
-            return new Gosu::Image(Gosu::createText(text, font, fontHeight));
+            return new Gosu::Image(Gosu::createText(text, font, fontHeight), flags);
         else
-            return new Gosu::Image(Gosu::createText(text, font, fontHeight, spacing, width, align));
+            return new Gosu::Image(Gosu::createText(text, font, fontHeight, spacing, width, align), flags);
     }
 SWIGINTERN std::vector< Gosu::Image > Gosu_Image_loadTiles__SWIG_0(VALUE source,int tileWidth,int tileHeight,VALUE options=0){
         Gosu::Bitmap bmp;
@@ -2928,6 +2972,10 @@ SWIGINTERN std::vector< Gosu::Image > Gosu_Image_loadTiles__SWIG_0(VALUE source,
                     if (RTEST(value))
                         flags |= Gosu::ifTileable;
                 }
+                else if (!strcmp(keyString, "retro")) {
+                    if (RTEST(value))
+                        flags |= Gosu::ifRetro;
+                }
                 else {
                     static bool issuedWarning = false;
                     if (!issuedWarning) {
@@ -3063,14 +3111,14 @@ SwigDirector_Window::~SwigDirector_Window() {
 void SwigDirector_Window::update() {
   VALUE result;
   
-  result = rb_funcall(swig_get_self(), rb_intern("protected_update"), 0, NULL);
+  result = rb_funcall(swig_get_self(), rb_intern("update"), 0, NULL);
 }
 
 
 void SwigDirector_Window::draw() {
   VALUE result;
   
-  result = rb_funcall(swig_get_self(), rb_intern("protected_draw_2"), 0, NULL);
+  result = rb_funcall(swig_get_self(), rb_intern("draw"), 0, NULL);
 }
 
 
@@ -3078,7 +3126,7 @@ bool SwigDirector_Window::needsRedraw() const {
   bool c_result ;
   VALUE result;
   
-  result = rb_funcall(swig_get_self(), rb_intern("protected_needs_redraw?"), 0, NULL);
+  result = rb_funcall(swig_get_self(), rb_intern("needs_redraw?"), 0, NULL);
   bool swig_val;
   int swig_res = SWIG_AsVal_bool(result, &swig_val);
   if (!SWIG_IsOK(swig_res)) {
@@ -3093,7 +3141,7 @@ bool SwigDirector_Window::needsCursor() const {
   bool c_result ;
   VALUE result;
   
-  result = rb_funcall(swig_get_self(), rb_intern("protected_needs_cursor?"), 0, NULL);
+  result = rb_funcall(swig_get_self(), rb_intern("needs_cursor?"), 0, NULL);
   bool swig_val;
   int swig_res = SWIG_AsVal_bool(result, &swig_val);
   if (!SWIG_IsOK(swig_res)) {
@@ -3107,7 +3155,7 @@ bool SwigDirector_Window::needsCursor() const {
 void SwigDirector_Window::loseFocus() {
   VALUE result;
   
-  result = rb_funcall(swig_get_self(), rb_intern("protected_lose_focus"), 0, NULL);
+  result = rb_funcall(swig_get_self(), rb_intern("lose_focus"), 0, NULL);
 }
 
 
@@ -3128,7 +3176,7 @@ void SwigDirector_Window::buttonDown(Gosu::Button arg0) {
     else
     obj0 = LONG2NUM((&arg0)->id());
   }
-  result = rb_funcall(swig_get_self(), rb_intern("protected_button_down"), 1,obj0);
+  result = rb_funcall(swig_get_self(), rb_intern("button_down"), 1,obj0);
 }
 
 
@@ -3142,7 +3190,7 @@ void SwigDirector_Window::buttonUp(Gosu::Button arg0) {
     else
     obj0 = LONG2NUM((&arg0)->id());
   }
-  result = rb_funcall(swig_get_self(), rb_intern("protected_button_up"), 1,obj0);
+  result = rb_funcall(swig_get_self(), rb_intern("button_up"), 1,obj0);
 }
 
 

data/lib/gosu.rb

@@ -1,19 +1,19 @@
-require 'rbconfig'
-
-if RUBY_PLATFORM =~ /mswin$|mingw32|mingw64|win32\-|\-win32/ then
-  binary_path = File.dirname(__FILE__)
-  # 64-bit builds of Windows use "x64-mingw32" as RUBY_PLATFORM
-  binary_path += '64' if RUBY_PLATFORM =~ /^x64-/
-  
-  # Add this gem to the PATH on Windows so that bundled DLLs can be found.
-  ENV['PATH'] = "#{binary_path};#{ENV['PATH']}"
-  
-  # Add the correct directory 
-  RUBY_VERSION =~ /(\d+.\d+)/
-  $LOAD_PATH.unshift "#{binary_path}/#{$1}"
-end
-
-require "gosu.#{RbConfig::CONFIG['DLEXT']}"
-
-require "gosu/swig_patches"
-require "gosu/patches"
+require 'rbconfig'
+
+if RUBY_PLATFORM =~ /mswin$|mingw32|mingw64|win32\-|\-win32/ then
+  binary_path = File.dirname(__FILE__)
+  # 64-bit builds of Windows use "x64-mingw32" as RUBY_PLATFORM
+  binary_path += '64' if RUBY_PLATFORM =~ /^x64-/
+  
+  # Add this gem to the PATH on Windows so that bundled DLLs can be found.
+  ENV['PATH'] = "#{binary_path};#{ENV['PATH']}"
+  
+  # Add the correct directory 
+  RUBY_VERSION =~ /(\d+.\d+)/
+  $LOAD_PATH.unshift "#{binary_path}/#{$1}"
+end
+
+require "gosu.#{RbConfig::CONFIG['DLEXT']}"
+
+require "gosu/swig_patches"
+require "gosu/patches"

data/lib/gosu/patches.rb

@@ -1,117 +1,117 @@
-# Extend Numeric with simple angle conversion methods,
-# for easier integration with Chipmunk.
-class ::Numeric
-  def degrees_to_radians
-    self * Math::PI / 180.0
-  end
-  
-  def radians_to_degrees
-    self * 180.0 / Math::PI
-  end
-  
-  def gosu_to_radians
-    (self - 90) * Math::PI / 180.0
-  end
-  
-  def radians_to_gosu
-    self * 180.0 / Math::PI + 90
-  end
-end
-
-# Backwards compatibility:
-# Import constants into Gosu::Button.
-module Gosu::Button
-  Gosu.constants.each { |c| const_set(c, Gosu.const_get(c)) }
-end
-
-# Backwards compatibility:
-# The old version of from_text has been deprecated in Gosu 0.9.
-class Gosu::Image
-  class << self
-    alias from_text_without_window from_text
-  end
-  
-  def self.from_text(*args)
-    if args.size == 4
-      from_text_without_window(args[1], args[3], :font => args[2])
-    elsif args.size == 7
-      from_text_without_window(args[1], args[3], :font => args[2],
-        :spacing => args[4], :width => args[5], :align => args[6])
-    else
-      from_text_without_window(*args)
-    end
-  end
-end
-
-# Backwards compatibility:
-# Passing a Window Sample#initialize has been deprecated in Gosu 0.7.17.
-class Gosu::Sample
-  alias initialize_without_window initialize
-  
-  def initialize(*args)
-    args.shift if args.first.is_a? Gosu::Window
-    initialize_without_window(*args)
-  end
-end
-
-# Backwards compatibility:
-# Passing a Window to Song#initialize has been deprecated in Gosu 0.7.17.
-class Gosu::Song
-  alias initialize_without_window initialize
-  
-  def initialize(*args)
-    args.shift if args.first.is_a? Gosu::Window
-    initialize_without_window(*args)
-  end
-end
-
-# Color constants.
-# This is cleaner than having SWIG define them.
-module Gosu
-  class ImmutableColor < Color
-    private :alpha=, :red=, :green=, :blue=, :hue=, :saturation=, :value=
-  end
-  
-  class Color
-    NONE    = Gosu::ImmutableColor.new(0x00_000000)
-    BLACK   = Gosu::ImmutableColor.new(0xff_000000)
-    GRAY    = Gosu::ImmutableColor.new(0xff_808080)
-    WHITE   = Gosu::ImmutableColor.new(0xff_ffffff)
-    AQUA    = Gosu::ImmutableColor.new(0xff_00ffff)
-    RED     = Gosu::ImmutableColor.new(0xff_ff0000)
-    GREEN   = Gosu::ImmutableColor.new(0xff_00ff00)
-    BLUE    = Gosu::ImmutableColor.new(0xff_0000ff)
-    YELLOW  = Gosu::ImmutableColor.new(0xff_ffff00)
-    FUCHSIA = Gosu::ImmutableColor.new(0xff_ff00ff)
-    CYAN    = Gosu::ImmutableColor.new(0xff_00ffff)
-  end
-end
-
-class Gosu::Window
-  # Backwards compatibility:
-  # Class methods that have been turned into module methods.
-  def self.button_id_to_char(id)
-    Gosu.button_id_to_char(id)
-  end
-  
-  def self.char_to_button_id(ch)
-    Gosu.char_to_button_id(ch)
-  end
-  
-  # Backwards compatibility:
-  # Instance methods taht have been turned into module methods.
-  %w(draw_line draw_triangle draw_quad
-     flush gl clip_to record
-     transform translate rotate scale
-     button_id_to_char char_to_button_id button_down?).each do |method|
-    define_method method.to_sym do |*args, &block|
-      Gosu.send method, *args, &block
-    end
-  end
-end
-
-# Release OpenAL resources during Ruby's shutdown, not Gosu's.
-at_exit do
-  Gosu::Song.current_song.stop if Gosu::Song.current_song
-  Gosu::_release_all_openal_resources
-end
+# Extend Numeric with simple angle conversion methods,
+# for easier integration with Chipmunk.
+class ::Numeric
+  def degrees_to_radians
+    self * Math::PI / 180.0
+  end
+  
+  def radians_to_degrees
+    self * 180.0 / Math::PI
+  end
+  
+  def gosu_to_radians
+    (self - 90) * Math::PI / 180.0
+  end
+  
+  def radians_to_gosu
+    self * 180.0 / Math::PI + 90
+  end
+end
+
+# Backwards compatibility:
+# Import constants into Gosu::Button.
+module Gosu::Button
+  Gosu.constants.each { |c| const_set(c, Gosu.const_get(c)) }
+end
+
+# Backwards compatibility:
+# The old version of from_text has been deprecated in Gosu 0.9.
+class Gosu::Image
+  class << self
+    alias from_text_without_window from_text
+  end
+  
+  def self.from_text(*args)
+    if args.size == 4
+      from_text_without_window(args[1], args[3], :font => args[2])
+    elsif args.size == 7
+      from_text_without_window(args[1], args[3], :font => args[2],
+        :spacing => args[4], :width => args[5], :align => args[6])
+    else
+      from_text_without_window(*args)
+    end
+  end
+end
+
+# Backwards compatibility:
+# Passing a Window Sample#initialize has been deprecated in Gosu 0.7.17.
+class Gosu::Sample
+  alias initialize_without_window initialize
+  
+  def initialize(*args)
+    args.shift if args.first.is_a? Gosu::Window
+    initialize_without_window(*args)
+  end
+end
+
+# Backwards compatibility:
+# Passing a Window to Song#initialize has been deprecated in Gosu 0.7.17.
+class Gosu::Song
+  alias initialize_without_window initialize
+  
+  def initialize(*args)
+    args.shift if args.first.is_a? Gosu::Window
+    initialize_without_window(*args)
+  end
+end
+
+# Color constants.
+# This is cleaner than having SWIG define them.
+module Gosu
+  class ImmutableColor < Color
+    private :alpha=, :red=, :green=, :blue=, :hue=, :saturation=, :value=
+  end
+  
+  class Color
+    NONE    = Gosu::ImmutableColor.new(0x00_000000)
+    BLACK   = Gosu::ImmutableColor.new(0xff_000000)
+    GRAY    = Gosu::ImmutableColor.new(0xff_808080)
+    WHITE   = Gosu::ImmutableColor.new(0xff_ffffff)
+    AQUA    = Gosu::ImmutableColor.new(0xff_00ffff)
+    RED     = Gosu::ImmutableColor.new(0xff_ff0000)
+    GREEN   = Gosu::ImmutableColor.new(0xff_00ff00)
+    BLUE    = Gosu::ImmutableColor.new(0xff_0000ff)
+    YELLOW  = Gosu::ImmutableColor.new(0xff_ffff00)
+    FUCHSIA = Gosu::ImmutableColor.new(0xff_ff00ff)
+    CYAN    = Gosu::ImmutableColor.new(0xff_00ffff)
+  end
+end
+
+class Gosu::Window
+  # Backwards compatibility:
+  # Class methods that have been turned into module methods.
+  def self.button_id_to_char(id)
+    Gosu.button_id_to_char(id)
+  end
+  
+  def self.char_to_button_id(ch)
+    Gosu.char_to_button_id(ch)
+  end
+  
+  # Backwards compatibility:
+  # Instance methods taht have been turned into module methods.
+  %w(draw_line draw_triangle draw_quad
+     flush gl clip_to record
+     transform translate rotate scale
+     button_id_to_char char_to_button_id button_down?).each do |method|
+    define_method method.to_sym do |*args, &block|
+      Gosu.send method, *args, &block
+    end
+  end
+end
+
+# Release OpenAL resources during Ruby's shutdown, not Gosu's.
+at_exit do
+  Gosu::Song.current_song.stop if Gosu::Song.current_song
+  Gosu::_release_all_openal_resources
+end

data/lib/gosu/preview.rb

@@ -1,10 +1,10 @@
-warn "gosu/preview.rb has been removed in Gosu 0.9.0, and Gosu itself \n" +
-  "provides a similar interface to what preview.rb used to offer.\n" +
-  "Notable differences:\n" +
-  "• no global $window variable\n" +
-  "• no global Gosu.mouse_x and Gosu.mouse_y functions\n" +
-  "• Image#initialize et.al. use an options hash now\n" +
-  "If you cannot update your code base right now, you should require \n" +
-  "Gosu 0.8.x in your Gemfile: gem 'gosu', '~> 0.8.0'";
-
-require 'gosu'
+warn "gosu/preview.rb has been removed in Gosu 0.9.0, and Gosu itself \n" +
+  "provides a similar interface to what preview.rb used to offer.\n" +
+  "Notable differences:\n" +
+  "• no global $window variable\n" +
+  "• no global Gosu.mouse_x and Gosu.mouse_y functions\n" +
+  "• Image#initialize et.al. use an options hash now\n" +
+  "If you cannot update your code base right now, you should require \n" +
+  "Gosu 0.8.x in your Gemfile: gem 'gosu', '~> 0.8.0'";
+
+require 'gosu'

data/lib/gosu/run.rb

@@ -1,11 +1,11 @@
-# Replace the load path
-$LOAD_PATH.clear
-$LOAD_PATH << File.dirname(__FILE__)[0..-6]
-$LOAD_PATH << $LOAD_PATH[0] + '/lib'
-# Ruby portions of Gosu
-require 'gosu/patches'
-require 'gosu/swig_patches'
-# Let the application know it is being run from the Mac app wrapper.
-OSX_EXECUTABLE = true
-# Main application
-require 'Main'
+# Replace the load path
+$LOAD_PATH.clear
+$LOAD_PATH << File.dirname(__FILE__)[0..-6]
+$LOAD_PATH << $LOAD_PATH[0] + '/lib'
+# Ruby portions of Gosu
+require 'gosu/patches'
+require 'gosu/swig_patches'
+# Let the application know it is being run from the Mac app wrapper.
+OSX_EXECUTABLE = true
+# Main application
+require 'Main'

data/lib/gosu/swig_patches.rb

@@ -1,70 +1,70 @@
-# SWIG workarounds
-# These are offloaded into a separate file because rb_eval_string() is weird on Ruby 1.8.
-
-# 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 protected_update etc. in the Ruby wrapper so I can add this
-# custom debugging help:
-class Gosu::Window
-  alias initialize_without_hash initialize
-  
-  def initialize width, height, *args
-    if args.empty? or args.first.is_a? Hash then
-      options = args.first || {}
-      fullscreen = options[:fullscreen]
-      update_interval = options[:update_interval]
-    else
-      fullscreen, update_interval = *args
-    end
-    initialize_without_hash width, height, !!fullscreen, update_interval || 16.666666
-  end
-  
-  %w(update draw needs_redraw? needs_cursor?
-     lose_focus button_down button_up).each do |callback|
-    define_method "protected_#{callback}" do |*args|
-      begin
-        # If there has been an exception, don't do anything as to not make matters worse.
-        # Conveniently turn the return value into a boolean result (for needs_cursor? etc).
-        defined?(@_exception) ? false : !!send(callback, *args)
-      rescue Exception => e
-        # Exit the message loop naturally, then re-throw
-        @_exception = e
-        close
-      end
-    end
-  end
-  
-  def protected_draw_2
-    protected_draw
-    $gosu_gl_blocks_2 = $gosu_gl_blocks
-    $gosu_gl_blocks = nil
-  end
-  
-  alias show_internal show
-  def show
-    show_internal
-    # Try to format the message nicely, without any useless patching that we are
-    # doing here.
-    if defined? @_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
-
-module Gosu
-  # Keep a reference to these blocks that is only cleared after Window#draw.
-  # Otherwise, the GC might free these blocks while Gosu is still rendering.
-  def self.gl(*args, &block)
-    $gosu_gl_blocks ||= []
-    $gosu_gl_blocks << block
-    unsafe_gl(*args, &block)
-  end
-end
-
-# SWIG won't let me rename my method to '[]='.
-class Gosu::Font
-  alias []= set_image
-end
+# SWIG workarounds
+# These are offloaded into a separate file because rb_eval_string() is weird on Ruby 1.8.
+
+# 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 protected_update etc. in the Ruby wrapper so I can add this
+# custom debugging help:
+class Gosu::Window
+  alias initialize_without_hash initialize
+  
+  def initialize width, height, *args
+    if args.empty? or args.first.is_a? Hash then
+      options = args.first || {}
+      fullscreen = options[:fullscreen]
+      update_interval = options[:update_interval]
+    else
+      fullscreen, update_interval = *args
+    end
+    initialize_without_hash width, height, !!fullscreen, update_interval || 16.666666
+  end
+  
+  %w(update draw needs_redraw? needs_cursor?
+     lose_focus button_down button_up).each do |callback|
+    define_method "protected_#{callback}" do |*args|
+      begin
+        # If there has been an exception, don't do anything as to not make matters worse.
+        # Conveniently turn the return value into a boolean result (for needs_cursor? etc).
+        defined?(@_exception) ? false : !!send(callback, *args)
+      rescue Exception => e
+        # Exit the message loop naturally, then re-throw
+        @_exception = e
+        close
+      end
+    end
+  end
+  
+  def protected_draw_2
+    protected_draw
+    $gosu_gl_blocks_2 = $gosu_gl_blocks
+    $gosu_gl_blocks = nil
+  end
+  
+  alias show_internal show
+  def show
+    show_internal
+    # Try to format the message nicely, without any useless patching that we are
+    # doing here.
+    if defined? @_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
+
+module Gosu
+  # Keep a reference to these blocks that is only cleared after Window#draw.
+  # Otherwise, the GC might free these blocks while Gosu is still rendering.
+  def self.gl(*args, &block)
+    $gosu_gl_blocks ||= []
+    $gosu_gl_blocks << block
+    unsafe_gl(*args, &block)
+  end
+end
+
+# SWIG won't let me rename my method to '[]='.
+class Gosu::Font
+  alias []= set_image
+end

data/lib/gosu/zen.rb

@@ -1,89 +1,89 @@
-require 'gosu/preview'
-
-module Gosu
-  module Zen
-    
-    @@window_args = [800, 600, {}]
-    @@options = {}
-    
-    def window width, height, options = nil
-      if $window.nil?
-        @@window_args[0] = width
-        @@window_args[1] = height
-        @@window_args[2].merge! options if options
-      else
-        raise "window size can only be set before the window is created"
-      end
-    end
-    
-    def set what, value
-      if $window.nil?
-        @@options[what.to_sym] = value
-      else
-        $window.send "#{what}=", value
-      end
-    end
-    
-    def init &body
-      ZenWindow.send :define_method, :init, &body
-    end
-    
-    def button_down id = nil, &body
-      m = id ? "button_down_#{id}" : :button_down_other
-      ZenWindow.send :define_method, m, &body
-    end
-    
-    def button_up id = nil, &body
-      m = id ? "button_up_#{id}" : :button_up_other
-      ZenWindow.send :define_method, m, &body
-    end
-    
-    def update &body
-      ZenWindow.send :define_method, :update, &body
-    end
-    
-    def draw &body
-      ZenWindow.send :define_method, :draw, &body
-    end
-    
-    def run!
-      window = ZenWindow.new *@@window_args
-      @@options.each do |opt, value|
-        window.send "#{opt}=", value
-      end
-      window.show
-    end
-    
-    def Zen.included mod
-      at_exit { run! unless $! }
-    end
-    
-  end
-  
-  class ZenWindow < Window
-    def initialize *args
-      super
-      init
-    end
-    
-    def init
-    end
-    
-    def button_down id
-      m = :"button_down_#{id}"
-      respond_to?(m) ? send(m) : button_down_other(id)
-    end
-    
-    def button_up id
-      m = :"button_up_#{id}"
-      respond_to?(m) ? send(m) : button_up_other(id)
-    end
-    
-    def button_down_other id
-    end
-    
-    def button_up_other id
-    end
-    
-  end
-end
+require 'gosu/preview'
+
+module Gosu
+  module Zen
+    
+    @@window_args = [800, 600, {}]
+    @@options = {}
+    
+    def window width, height, options = nil
+      if $window.nil?
+        @@window_args[0] = width
+        @@window_args[1] = height
+        @@window_args[2].merge! options if options
+      else
+        raise "window size can only be set before the window is created"
+      end
+    end
+    
+    def set what, value
+      if $window.nil?
+        @@options[what.to_sym] = value
+      else
+        $window.send "#{what}=", value
+      end
+    end
+    
+    def init &body
+      ZenWindow.send :define_method, :init, &body
+    end
+    
+    def button_down id = nil, &body
+      m = id ? "button_down_#{id}" : :button_down_other
+      ZenWindow.send :define_method, m, &body
+    end
+    
+    def button_up id = nil, &body
+      m = id ? "button_up_#{id}" : :button_up_other
+      ZenWindow.send :define_method, m, &body
+    end
+    
+    def update &body
+      ZenWindow.send :define_method, :update, &body
+    end
+    
+    def draw &body
+      ZenWindow.send :define_method, :draw, &body
+    end
+    
+    def run!
+      window = ZenWindow.new *@@window_args
+      @@options.each do |opt, value|
+        window.send "#{opt}=", value
+      end
+      window.show
+    end
+    
+    def Zen.included mod
+      at_exit { run! unless $! }
+    end
+    
+  end
+  
+  class ZenWindow < Window
+    def initialize *args
+      super
+      init
+    end
+    
+    def init
+    end
+    
+    def button_down id
+      m = :"button_down_#{id}"
+      respond_to?(m) ? send(m) : button_down_other(id)
+    end
+    
+    def button_up id
+      m = :"button_up_#{id}"
+      respond_to?(m) ? send(m) : button_up_other(id)
+    end
+    
+    def button_down_other id
+    end
+    
+    def button_up_other id
+    end
+    
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gosu
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.1
 platform: ruby
 authors:
 - Julian Raschke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-20 00:00:00.000000000 Z
+date: 2015-08-21 00:00:00.000000000 Z
 dependencies: []
 description: |2
       2D game development library.