gosu 0.11.3.pre1 → 0.11.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 360466fc7c2bfb5e35f8b08e0b3e74a0a3e023e5
-  data.tar.gz: 0573753156f925308b0e33901fc429103570f905
+  metadata.gz: c8b68fbdbd0189edbb8b7cbb01493859fa122a0e
+  data.tar.gz: 382fb6970aaa117293d78a1276bcb1c95dfeb6af
 SHA512:
-  metadata.gz: e98bb797d0e04dd4cbd5a0e16c618528e7f07d1a0338dd7f8046e27e01ef64e9f1065d23d42f4b24af6236d6c402ebcc16f274409dceded78e996f5298e35b80
-  data.tar.gz: fde462f9acf20b4bf2648c566d33dbe59797c6e3b7e5bdf1a470cee6dc8856d9c4453790894333887f59cfe6b66d9a1a6c9f149575faed6b5dfa403db4f5aa80
+  metadata.gz: 064b805c31aa7ada4b62afd6f6ad7f15c25fc4e6ccccb0f7aed8b298befe04470b3ce142fb5eefb95c3dd35a2483346fd3f075e050696ebbcc053d26fd8b23a4
+  data.tar.gz: 328be94282b2f6193f64d7957c020b74de6aeada8a82440889ad2d3743debf94ea0a73e4e95c707ae629385d1e21d42028573b50d984e7c4e40de50148f3f219

data/Gosu/Version.hpp

@@ -4,7 +4,7 @@
 
 #define GOSU_MAJOR_VERSION 0
 #define GOSU_MINOR_VERSION 11
-#define GOSU_POINT_VERSION 2
+#define GOSU_POINT_VERSION 3
 
 namespace Gosu
 {

data/Gosu/Window.hpp

@@ -77,7 +77,9 @@ namespace Gosu
         virtual bool tick();
         
         //! Closes the window if it is currently shown.
-        void close();
+        //! If you do not want the window to close immediately, you should override this method and
+        //! only call the base implementation (Window::close) when needed.
+        virtual void close();
 
         //! Called every update_interval milliseconds while the window is being shown.
         //! Your application's main game logic goes here.

data/lib/gosu/compat.rb

@@ -0,0 +1,183 @@
+# This whole file is about backward compatibility.
+
+# Define some helpers to deprecate code.
+module Gosu
+  DEPRECATION_STACKTRACE_LINES = 1
+
+  # Adapted from RubyGems, but without the date part.
+  def self.deprecate(klass, name, repl)
+    klass.class_eval {
+      old = "_deprecated_#{name}"
+      alias_method old, name
+      define_method name do |*args, &block|
+        Gosu.deprecation_message(self, name, repl)
+        send old, *args, &block
+      end
+    }
+  end
+
+  def self.deprecate_const(name, repl)
+    send(:remove_const, name) if const_defined?(name)
+
+    @@_deprecated_constants ||= {}
+    @@_deprecated_constants[name] = repl
+  end
+
+  # Constant deprecation works by undefining the original constant and then re-adding it in
+  # const_missing, so that each deprecation warning is only printed once.
+  def self.const_missing(const_name)
+    if @@_deprecated_constants && repl = @@_deprecated_constants[const_name]
+      Gosu.deprecation_message(self, const_name, repl)
+      const_get(repl)
+    else
+      super
+    end
+  end
+
+  def self.deprecation_message(klass_or_full_message, name=nil, repl=nil)
+    @@_deprecations_shown ||= {}
+
+    msg = if klass_or_full_message.is_a?(String) and name.nil? and repl.nil?
+      [ "DEPRECATION WARNING: #{klass_or_full_message},
+        \n#Called from #{caller[1, DEPRECATION_STACKTRACE_LINES]}"
+      ]
+    else
+      # Class method deprecation warnings result in something like this:
+      # #<Class:Gosu::Window>::button_id_to_char is deprecated
+      # Remove the instance-inspect stuff to make it look a bit better:
+      if klass_or_full_message.kind_of?(Module)
+        target = "#{klass_or_full_message.to_s.gsub(/#<Class:(.*)>/, '\1')}::"
+      else
+        "#{klass_or_full_message.class}#"
+      end
+      [ "DEPRECATION WARNING: #{target}#{name} is deprecated",
+        repl == :none ? " with no replacement." : "; use #{repl} instead.",
+        "\n#{target}#{name} called from #{Gosu.deprecation_caller.join("\n")}",
+      ]
+    end
+    return if @@_deprecations_shown.has_key?(msg[0])
+    @@_deprecations_shown[msg[0]] = true
+
+    warn "#{msg.join}."
+  end
+
+  # This method removes the deprecation methods themselves from the stacktrace.
+  def self.deprecation_caller
+    caller.delete_if { |trace_line| trace_line =~ /(deprecat|const_missing)/ }
+      .first(DEPRECATION_STACKTRACE_LINES)
+  end
+end
+
+# No need to pass a Window to Image.
+class Gosu::Image
+  alias initialize_without_window initialize
+
+  def initialize(*args)
+    if args[0].is_a? Gosu::Window
+      Gosu.deprecation_message("Passing a Window to Image#initialize has been deprecated in Gosu 0.9 and this method now uses an options hash, see https://www.libgosu.org/rdoc/Gosu/Image.html.")
+      if args.size == 7
+        initialize_without_window args[1], :tileable => args[2], :rect => args[3..-1]
+      else
+        initialize_without_window args[1], :tileable => args[2]
+      end
+    else
+      initialize_without_window(*args)
+    end
+  end
+
+  class << self
+    alias from_text_without_window from_text
+  end
+
+  def self.from_text(*args)
+    if args.size == 4
+      Gosu.deprecation_message("Passing a Window to Image.from_text has been deprecated in Gosu 0.9 and this method now uses an options hash, see https://www.libgosu.org/rdoc/Gosu/Image.html.")
+      from_text_without_window(args[1], args[3], :font => args[2])
+    elsif args.size == 7
+      Gosu.deprecation_message("Passing a Window to Image.from_text has been deprecated in Gosu 0.9 and this method now uses an options hash, see https://www.libgosu.org/rdoc/Gosu/Image.html.")
+      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
+
+# No need to pass a Window to Sample.
+class Gosu::Sample
+  alias initialize_without_window initialize
+
+  def initialize(*args)
+    if args.first.is_a? Gosu::Window
+      args.shift
+      Gosu.deprecation_message("Passing a Window to Sample#initialize has been deprecated in Gosu 0.7.17.")
+    end
+    initialize_without_window(*args)
+  end
+end
+
+# No need to pass a Window to Song.
+class Gosu::Song
+  alias initialize_without_window initialize
+
+  def initialize(*args)
+    if args.first.is_a? Gosu::Window
+      args.shift
+      Gosu.deprecation_message("Passing a Window to Song#initialize has been deprecated in Gosu 0.7.17.")
+    end
+    initialize_without_window(*args)
+  end
+end
+
+# Moved some Window-methods to the Gosu::Module
+class Gosu::Window
+  # Class methods that have been turned into module methods.
+  class << self
+    def button_id_to_char(id)
+      Gosu.button_id_to_char(id)
+    end
+
+    def char_to_button_id(ch)
+      Gosu.char_to_button_id(ch)
+    end
+  end
+
+  # Instance methods that 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
+
+# Constants
+module Gosu
+  Gosu.deprecate Window, :set_mouse_position, "Window#mouse_x= and Window#mouse_y="
+  Gosu.deprecate Font, :draw_rot, "Font#draw with Gosu.rotate"
+  
+  # This was renamed because it's not actually a "copyright notice".
+  # (https://en.wikipedia.org/wiki/Copyright_notice)
+  deprecate_const :GOSU_COPYRIGHT_NOTICE, :LICENSES
+  
+  module Button; end
+
+  # Support for KbLeft instead of KB_LEFT and Gp3Button2 instead of GP_3_BUTTON_2.
+  Gosu.constants.grep(/^KB_|MS_|GP_/).each do |new_name|
+    old_name = case new_name
+    when :KB_ISO then "KbISO"
+    when :KB_NUMPAD_PLUS then "KbNumpadAdd"
+    when :KB_NUMPAD_MINUS then "KbNumpadSubtract"
+    when :KB_EQUALS then "KbEqual"
+    when :KB_LEFT_BRACKET then "KbBracketLeft"
+    when :KB_RIGHT_BRACKET then "KbBracketRight"
+    else new_name.to_s.capitalize.gsub(/_(.)/) { $1.upcase }
+    end
+    Gosu.const_set old_name, new_name
+
+    # Also import old-style constants into Gosu::Button.
+    Gosu::Button.const_set old_name, Gosu.const_get(new_name)
+  end
+end

data/lib/gosu/patches.rb

@@ -18,79 +18,6 @@ class ::Numeric
   end
 end
 
-# Backwards compatibility:
-# Support for KbLeft instead of KB_LEFT and Gp3Button2 instead of GP_3_BUTTON_2.
-# Also import old-style constants into Gosu::Button.
-module Gosu::Button; end
-Gosu.constants.grep(/^KB_|MS_|GP_/).each do |c|
-  old_name = case c
-  when :KB_ISO then "KbISO"
-  when :KB_NUMPAD_PLUS then "KbNumpadAdd"
-  when :KB_NUMPAD_MINUS then "KbNumpadSubtract"
-  when :KB_EQUALS then "KbEqual"
-  when :KB_LEFT_BRACKET then "KbBracketLeft"
-  when :KB_RIGHT_BRACKET then "KbBracketRight"
-  else c.to_s.capitalize.gsub(/_(.)/) { $1.upcase }
-  end
-  Gosu.const_set old_name, Gosu.const_get(c)
-  Gosu::Button.const_set old_name, Gosu.const_get(c)
-end
-
-# Backwards compatibility:
-# Passing a Window to initialize and from_text has been deprecated in Gosu 0.9.
-class Gosu::Image
-  alias initialize_without_window initialize
-
-  def initialize(*args)
-    if args[0].is_a? Gosu::Window
-      if args.size == 7
-        initialize_without_window args[1], :tileable => args[2], :rect => args[3..-1]
-      else
-        initialize_without_window args[1], :tileable => args[2]
-      end
-    else
-      initialize_without_window(*args)
-    end
-  end
-
-  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 to 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
@@ -119,29 +46,6 @@ module Gosu
 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 that 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
-
   # Call Thread.pass every tick, which may or may not be necessary for friendly co-existence with
   # Ruby's Thread class.
 
@@ -153,10 +57,6 @@ class Gosu::Window
   end
 end
 
-# Backwards compatibility:
-# This was renamed, because it's not actually a "copyright notice" (Wikipedia: https://en.wikipedia.org/wiki/Copyright_notice).
-Gosu::GOSU_COPYRIGHT_NOTICE = Gosu::LICENSES
-
 # Release OpenAL resources during Ruby's shutdown, not Gosu's.
 at_exit do
   begin

data/lib/gosu/swig_patches.rb

@@ -28,7 +28,7 @@ class Gosu::Window
         # 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
+        # Exit the message loop naturally, then re-throw during the next tick.
         @_exception = e
         close
         false

data/lib/gosu.rb

@@ -1,19 +1,21 @@
-require 'rbconfig'
+require "rbconfig"
 
 if RUBY_PLATFORM =~ /mswin$|mingw32|mingw64|win32\-|\-win32/
   binary_path = File.dirname(__FILE__)
   # 64-bit builds of Windows use "x64-mingw32" as RUBY_PLATFORM
-  binary_path += '64' if RUBY_PLATFORM =~ /^x64-/
+  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']}"
+  # When running through Ocra on Windows, we need to be careful to preserve the ENV["PATH"]
+  # encoding (see #385).
+  ENV["PATH"] = "#{binary_path.encode ENV["PATH"].encoding};#{ENV["PATH"]}"
   
-  # Add the correct directory 
-  RUBY_VERSION =~ /(\d+.\d+)/
-  $LOAD_PATH.unshift "#{binary_path}/#{$1}"
+  # Add the correct lib directory for the current version of Ruby (major.minor).
+  $LOAD_PATH.unshift File.join(binary_path, RUBY_VERSION[/^\d+.\d+/])
 end
 
-require "gosu.#{RbConfig::CONFIG['DLEXT']}"
+require "gosu.#{RbConfig::CONFIG["DLEXT"]}"
 
 require "gosu/swig_patches"
 require "gosu/patches"
+require "gosu/compat"

data/rdoc/gosu.rb

@@ -17,10 +17,6 @@ module Gosu
   # A version string of the form "0.1.2", "0.1.2.3" or "0.1.2pre4".
   VERSION = :a_string
 
-  ##
-  # @deprecated Use LICENSES instead as it's a more appropriate name
-  GOSU_COPYRIGHT_NOTICE = :a_string
-
   ##
   # A block of legal copy that your game is obliged to display somewhere.
   LICENSES = :a_string
@@ -291,13 +287,6 @@ module Gosu
     # @see https://github.com/gosu/gosu/wiki/Basic-Concepts#z-ordering Z-ordering explained in the Gosu Wiki
     def draw_rel(text, x, y, z, rel_x, rel_y, scale_x=1, scale_y=1, color=0xff_ffffff, mode=:default); end
 
-    ##
-    # @deprecated Use {#draw} in conjunction with {Gosu.rotate} instead.
-    #
-    # @see #draw
-    # @see Gosu::Window#rotate
-    def draw_rot(text, x, y, z, angle, scale_x=1, scale_y=1, color=0xff_ffffff, mode=:default); end
-
     # @!endgroup
 
     ##
@@ -778,10 +767,10 @@ module Gosu
     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.
+    # Tells the window to end the current run loop as soon as possible.
     #
     # @return [void]
-    def close; end
+    def close!; end
 
     # @!group Callbacks
 
@@ -813,6 +802,15 @@ module Gosu
     # @return [true, false] whether the system cursor should be shown.
     def needs_cursor?; end
 
+    ##
+    # This method is called whenever the user tries to close the window, e.g. by clicking the [x]
+    # button in the window's title bar.
+    # If you do not want the window to close immediately, you should override this method and
+    # call the {#close!} when needed.
+    #
+    # @return [bool]
+    def close; end
+    
     ##
     # This method is called before {#update} if a button is pressed while the window has focus.
     #
@@ -839,10 +837,6 @@ module Gosu
     def button_up(id); end
 
     # @!endgroup
-
-    ##
-    # @deprecated Use {#mouse_x=} and {#mouse_y=} instead.
-    def set_mouse_position(x, y); end
   end
 
   ##

data/src/RubyGosu.cxx

@@ -3172,6 +3172,9 @@ SWIGINTERN void Gosu_Window_set_mouse_x(Gosu::Window *self,double x){
 SWIGINTERN void Gosu_Window_set_mouse_y(Gosu::Window *self,double y){
         self->input().set_mouse_position(self->input().mouse_x(), y);
     }
+SWIGINTERN void Gosu_Window_force_close(Gosu::Window *self){
+        self->Gosu::Window::close();
+    }
 
     // Also mark the TextInput instance alive when the window is being marked.
     static void mark_window(void* window)
@@ -3252,6 +3255,13 @@ bool SwigDirector_Window::tick() {
 }
 
 
+void SwigDirector_Window::close() {
+  VALUE SWIGUNUSED result;
+  
+  result = rb_funcall(swig_get_self(), rb_intern("close"), 0, NULL);
+}
+
+
 void SwigDirector_Window::update() {
   VALUE SWIGUNUSED result;
   
@@ -9183,6 +9193,8 @@ _wrap_Window_close(int argc, VALUE *argv, VALUE self) {
   Gosu::Window *arg1 = (Gosu::Window *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  Swig::Director *director = 0;
+  bool upcall = false;
   
   if ((argc < 0) || (argc > 0)) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
@@ -9192,13 +9204,24 @@ _wrap_Window_close(int argc, VALUE *argv, VALUE self) {
     SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "Gosu::Window *","close", 1, self )); 
   }
   arg1 = reinterpret_cast< Gosu::Window * >(argp1);
-  {
-    try {
-      (arg1)->close();
-    }
-    catch (const std::exception& e) {
-      SWIG_exception(SWIG_RuntimeError, e.what());
+  director = dynamic_cast<Swig::Director *>(arg1);
+  upcall = (director && (director->swig_get_self() == self));
+  try {
+    {
+      try {
+        if (upcall) {
+          (arg1)->Gosu::Window::close();
+        } else {
+          (arg1)->close();
+        }
+      }
+      catch (const std::exception& e) {
+        SWIG_exception(SWIG_RuntimeError, e.what());
+      }
     }
+  } catch (Swig::DirectorException& e) {
+    rb_exc_raise(e.getError());
+    SWIG_fail;
   }
   return Qnil;
 fail:
@@ -9907,6 +9930,34 @@ fail:
 }
 
 
+SWIGINTERN VALUE
+_wrap_Window_closeN___(int argc, VALUE *argv, VALUE self) {
+  Gosu::Window *arg1 = (Gosu::Window *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  
+  if ((argc < 0) || (argc > 0)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_Gosu__Window, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "Gosu::Window *","force_close", 1, self )); 
+  }
+  arg1 = reinterpret_cast< Gosu::Window * >(argp1);
+  {
+    try {
+      Gosu_Window_force_close(arg1);
+    }
+    catch (const std::exception& e) {
+      SWIG_exception(SWIG_RuntimeError, e.what());
+    }
+  }
+  return Qnil;
+fail:
+  return Qnil;
+}
+
+
 SWIGINTERN VALUE
 _wrap_disown_Window(int argc, VALUE *argv, VALUE self) {
   Gosu::Window *arg1 = (Gosu::Window *) 0 ;
@@ -11523,7 +11574,7 @@ SWIGEXPORT void Init_gosu(void) {
   rb_define_const(mGosu, "LICENSES", SWIG_From_std_string(static_cast< std::string >(Gosu::LICENSES)));
   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 >(11)));
-  rb_define_const(mGosu, "POINT_VERSION", SWIG_From_int(static_cast< int >(2)));
+  rb_define_const(mGosu, "POINT_VERSION", SWIG_From_int(static_cast< int >(3)));
   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);
@@ -11944,6 +11995,7 @@ SWIGEXPORT void Init_gosu(void) {
   rb_define_method(SwigClassWindow.klass, "set_mouse_position", VALUEFUNC(_wrap_Window_set_mouse_position), -1);
   rb_define_method(SwigClassWindow.klass, "mouse_x=", VALUEFUNC(_wrap_Window_mouse_xe___), -1);
   rb_define_method(SwigClassWindow.klass, "mouse_y=", VALUEFUNC(_wrap_Window_mouse_ye___), -1);
+  rb_define_method(SwigClassWindow.klass, "close!", VALUEFUNC(_wrap_Window_closeN___), -1);
   SwigClassWindow.mark = (void (*)(void *)) mark_window;
   SwigClassWindow.destroy = (void (*)(void *)) free_Gosu_Window;
   SwigClassWindow.trackObjects = 1;

data/src/RubyGosu.h

@@ -32,6 +32,7 @@ public:
     virtual ~SwigDirector_Window();
     virtual void show();
     virtual bool tick();
+    virtual void close();
     virtual void update();
     virtual void draw();
     virtual bool needs_redraw() const;

data/src/TextTTFWin.cpp

@@ -1,6 +1,7 @@
 #include <Gosu/Platform.hpp>
 #if defined(GOSU_IS_WIN)
 
+#include <Gosu/IO.hpp>
 #include <Gosu/Utility.hpp>
 #include <cassert>
 #include <cstdio>
@@ -56,69 +57,18 @@ struct TT_NAME_RECORD
 
 namespace Gosu
 {
-std::string get_name_from_ttf_file(const std::wstring& filename)
+std::string get_name_from_ttf_file(const std::string& filename)
 {
     FONT_PROPERTIES_ANSI fp;
     FONT_PROPERTIES_ANSI * lpFontProps = &fp;
     memset(lpFontProps, 0, sizeof(FONT_PROPERTIES_ANSI));
 
-    HANDLE hFile = INVALID_HANDLE_VALUE;
-    hFile = ::CreateFile(filename.c_str(),
-                         GENERIC_READ,// | GENERIC_WRITE,
-                         FILE_SHARE_READ,
-                         NULL,
-                         OPEN_EXISTING,
-                         FILE_ATTRIBUTE_NORMAL | FILE_FLAG_SEQUENTIAL_SCAN,
-                         NULL);
-
-    if (hFile == INVALID_HANDLE_VALUE)
-    {
-        TRACE(_T("ERROR:  failed to open '%s'\n"), wstring_to_utf8(filename).c_str());
-        TRACE(_T("ERROR: %s failed, GetLastError() = 0x%x\n"), _T("CreateFile"), (int)GetLastError());
-        return wstring_to_utf8(filename);
-    }
+    Buffer buffer;
+    load_file(buffer, filename);
 
     // get the file size
-    DWORD dwFileSize = ::GetFileSize(hFile, NULL);
-
-    if (dwFileSize == INVALID_FILE_SIZE)
-    {
-        TRACE(_T("ERROR: %s failed\n"), _T("GetFileSize"));
-        ::CloseHandle(hFile);
-        return wstring_to_utf8(filename);
-    }
-
-    //TRACE(_T("dwFileSize = %d\n"), dwFileSize);
-
-    // Create a file mapping object that is the current size of the file
-    HANDLE hMappedFile = NULL;
-    hMappedFile = ::CreateFileMapping(hFile,
-                                      NULL,
-                                      PAGE_READONLY, //PAGE_READWRITE,
-                                      0,
-                                      dwFileSize,
-                                      NULL);
-
-    if (hMappedFile == NULL)
-    {
-        TRACE(_T("ERROR: %s failed\n"), _T("CreateFileMapping"));
-        ::CloseHandle(hFile);
-        return wstring_to_utf8(filename);
-    }
-
-    LPBYTE lpMapAddress = (LPBYTE) ::MapViewOfFile(hMappedFile,        // handle to file-mapping object
-                                            FILE_MAP_READ,//FILE_MAP_WRITE,            // access mode
-                                            0,                        // high-order DWORD of offset
-                                            0,                        // low-order DWORD of offset
-                                            0);                        // number of bytes to map
-
-    if (lpMapAddress == NULL)
-    {
-        TRACE(_T("ERROR: %s failed\n"), _T("MapViewOfFile"));
-        ::CloseHandle(hMappedFile);
-        ::CloseHandle(hFile);
-        return wstring_to_utf8(filename);
-    }
+    DWORD dwFileSize = buffer.size();
+    LPBYTE lpMapAddress = (LPBYTE) buffer.data();
 
     BOOL bRetVal = FALSE;
     int index = 0;
@@ -132,8 +82,9 @@ std::string get_name_from_ttf_file(const std::wstring& filename)
     ttOffsetTable.uMinorVersion = SWAPWORD(ttOffsetTable.uMinorVersion);
 
     //check is this is a true type font and the version is 1.0
-    if (ttOffsetTable.uMajorVersion != 1 || ttOffsetTable.uMinorVersion != 0)
-        return wstring_to_utf8(filename);
+    if (ttOffsetTable.uMajorVersion != 1 || ttOffsetTable.uMinorVersion != 0) {
+        throw std::runtime_error("Only version 1.0 of the TTF file format is supported");
+    }
 
     TT_TABLE_DIRECTORY tblDir;
     memset(&tblDir, 0, sizeof(TT_TABLE_DIRECTORY));
@@ -143,7 +94,6 @@ std::string get_name_from_ttf_file(const std::wstring& filename)
 
     for (int i = 0; i< ttOffsetTable.uNumOfTables; i++)
     {
-        //f.Read(&tblDir, sizeof(TT_TABLE_DIRECTORY));
         memcpy(&tblDir, &lpMapAddress[index], sizeof(TT_TABLE_DIRECTORY));
         index += sizeof(TT_TABLE_DIRECTORY);
 
@@ -191,7 +141,7 @@ std::string get_name_from_ttf_file(const std::wstring& filename)
 
             if (ttRecord.uNameID == 1 || ttRecord.uNameID == 0 || ttRecord.uNameID == 7)
             {
-                int nPos = index; //f.GetPosition();
+                int nPos = index;
 
                 index = tblDir.uOffset + ttRecord.uStringOffset + ttNTHeader.uStorageOffset;
 
@@ -240,10 +190,6 @@ std::string get_name_from_ttf_file(const std::wstring& filename)
         }
     }
 
-    ::UnmapViewOfFile(lpMapAddress);
-    ::CloseHandle(hMappedFile);
-    ::CloseHandle(hFile);
-
     return lpFontProps->csName[0] ? lpFontProps->csName : lpFontProps->csFamily;
 }
 }

data/src/TextWin.cpp

@@ -22,7 +22,7 @@ std::string Gosu::default_font_name()
 
 namespace Gosu
 {
-    std::string get_name_from_ttf_file(const std::wstring& filename);
+    std::string get_name_from_ttf_file(const std::string& filename);
 
     namespace
     {
@@ -93,9 +93,8 @@ namespace Gosu
                 
                 if (font_name.find("/") != font_name.npos) {
                     if (custom_fonts.count(font_name) == 0) {
-                        std::wstring wfont_name = utf8_to_wstring(font_name);
-                        AddFontResourceExW(wfont_name.c_str(), FR_PRIVATE, 0);
-                        font_name = custom_fonts[font_name] = get_name_from_ttf_file(wfont_name);
+                        AddFontResourceExW(utf8_to_wstring(font_name).c_str(), FR_PRIVATE, 0);
+                        font_name = custom_fonts[font_name] = get_name_from_ttf_file(font_name);
                     }
                     else {
                         font_name = custom_fonts[font_name];

data/src/Window.cpp

@@ -83,6 +83,12 @@ struct Gosu::Window::Impl
     bool fullscreen;
     double update_interval;
     
+    // A single `bool open` is not good enough to support the tick() method: When close() is called
+    // from outside the window's call graph, the next call to tick() must return false (transition
+    // from CLOSING to CLOSED), but the call after that must return show the window again
+    // (transition from CLOSED to OPEN).
+    enum { CLOSED, OPEN, CLOSING } state = CLOSED;
+    
     std::unique_ptr<Graphics> graphics;
     std::unique_ptr<Input> input;
 };
@@ -93,10 +99,11 @@ Gosu::Window::Window(unsigned width, unsigned height, bool fullscreen, double up
     // Even in fullscreen mode, temporarily show the window in windowed mode to centre it.
     // This ensures that the window will be centred correctly when exiting fullscreen mode.
     // Fixes https://github.com/gosu/gosu/issues/369
+    // (This will implicitly create graphics() and input(), and make the OpenGL context current.)
     resize(width, height, false);
     SDL_SetWindowPosition(shared_window(), SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED);
 
-    // This will implicitly create graphics() and input(), and make the OpenGL context current.
+    // Really enable fullscreen if desired.
     resize(width, height, fullscreen);
     
     SDL_GL_SetSwapInterval(1);
@@ -104,7 +111,7 @@ Gosu::Window::Window(unsigned width, unsigned height, bool fullscreen, double up
     pimpl->update_interval = update_interval;
     
     input().on_button_down = [this](Button button) { button_down(button); };
-    input().on_button_up = [this](Button button) { button_up(button); };
+    input().on_button_up   = [this](Button button) { button_up(button); };
 }
 
 Gosu::Window::~Window()
@@ -221,12 +228,20 @@ void Gosu::Window::show()
         
         time_before_tick = milliseconds();
     }
+    
+    pimpl->state = Impl::CLOSED;
 }
 
 bool Gosu::Window::tick()
 {
-    if (SDL_GetWindowFlags(shared_window()) & SDL_WINDOW_HIDDEN) {
+    if (pimpl->state == Impl::CLOSING) {
+        pimpl->state = Impl::CLOSED;
+        return false;
+    }
+    
+    if (pimpl->state == Impl::CLOSED) {
         SDL_ShowWindow(shared_window());
+        pimpl->state = Impl::OPEN;
 
         // SDL_GL_GetDrawableSize returns different values before and after showing the window.
         // -> When first showing the window, update the physical size of Graphics (=glViewport).
@@ -239,8 +254,7 @@ bool Gosu::Window::tick()
     SDL_Event e;
     while (SDL_PollEvent(&e)) {
         if (e.type == SDL_QUIT) {
-            SDL_HideWindow(shared_window());
-            return false;
+            close();
         }
         else {
             input().feed_sdl_event(&e);
@@ -266,14 +280,17 @@ bool Gosu::Window::tick()
         SDL_GL_SwapWindow(shared_window());
     }
     
-    return true;
+    if (pimpl->state == Impl::CLOSING) {
+        pimpl->state = Impl::CLOSED;
+    }
+    
+    return pimpl->state == Impl::OPEN;
 }
 
 void Gosu::Window::close()
 {
-    SDL_Event e;
-    e.type = SDL_QUIT;
-    SDL_PushEvent(&e);
+    pimpl->state = Impl::CLOSING;
+    SDL_HideWindow(shared_window());
 }
 
 void Gosu::Window::button_down(Button button)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gosu
 version: !ruby/object:Gem::Version
-  version: 0.11.3.pre1
+  version: 0.11.3
 platform: ruby
 authors:
 - Julian Raschke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-23 00:00:00.000000000 Z
+date: 2017-03-26 00:00:00.000000000 Z
 dependencies: []
 description: |2
       2D game development library.
@@ -53,6 +53,7 @@ files:
 - README.md
 - ext/gosu/extconf.rb
 - lib/gosu.rb
+- lib/gosu/compat.rb
 - lib/gosu/patches.rb
 - lib/gosu/preview.rb
 - lib/gosu/run.rb
@@ -150,9 +151,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.6.8