gosu 0.14.5 → 0.14.6.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 61b26106f2220170e6e8aaeeff303363a1ba74e7380902fdb994ca7cb5380e10
-  data.tar.gz: 2c4c31879e62f94a6717b08e0b964294a3d969752867aa10e69b348ed1aa6b28
+  metadata.gz: aa8da5cf8c3c455ebaa47ee8e9dc31091fcc2ecc10afce1acac4fb4802cd0b9a
+  data.tar.gz: 12c781dbcbda39f7417b8afcbb4fc72e7998fb5574fa0dfed15d4e4b2c0e97fb
 SHA512:
-  metadata.gz: c2a5661e5da0003d5225299f386fb05cecc22ee66ee2b7e9bf7a91e8f81e41f2845807d1816a80e814fa128088154bad53f5887eed851d09cae0c1457e084c6e
-  data.tar.gz: f68170c042c37db4f15a35c37f6f347076b26ed3c4582b45a7c9be896588479db07582fe3439206fdaf803142ff22709acd1c0e250fd2dae0a9abf2d5ff4f39c
+  metadata.gz: a84524ee920802fa45abf1bcf980c6bd0ec0456a3b47c42ee3bc139e4c364261f6fb1369e2456dd886a5bc0eae8f8903b21a9a80c930abc14fad665f13253d8a
+  data.tar.gz: 43cc93051d22b7ddbf49987dd50efd70b001752acab675e29235f351e7a30d318acb11ed9853937ead8024185d494fc6d872307a961cef3a37ddca4f09e84442

data/COPYING

@@ -1,4 +1,4 @@
-Copyright (C) 2001-2018 Julian Raschke, Jan Lücker and all contributors.
+Copyright (C) 2001-2019 Julian Raschke, Jan Lücker and all contributors.
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"),

data/Gosu/Version.hpp

@@ -4,7 +4,7 @@
 
 #define GOSU_MAJOR_VERSION 0
 #define GOSU_MINOR_VERSION 14
-#define GOSU_POINT_VERSION 5
+#define GOSU_POINT_VERSION 6
 
 namespace Gosu
 {

data/Gosu/Window.hpp

@@ -34,14 +34,15 @@ namespace Gosu
         //! \param update_interval Interval in milliseconds between two calls to the update member
         //! function.
         Window(unsigned width, unsigned height, bool fullscreen = false,
-            double update_interval = 16.666666);
+            double update_interval = 16.666666, bool resizable = false);
         virtual ~Window();
 
         unsigned width() const;
         unsigned height() const;
         bool fullscreen() const;
+        bool resizable() const;
         void resize(unsigned width, unsigned height, bool fullscreen);
-        
+
         double update_interval() const;
         void set_update_interval(double update_interval);
 

data/README.md

@@ -18,7 +18,7 @@ or look at existing projects in the [Gosu Showcase](https://www.libgosu.org/cgi-
 Community
 ---------
 
-- There is a lively [Discord community](https://discord.gg/SZ4nbEd).
+- There is a lively [Discord community](https://discord.gg/5nEBXDc).
 - If you want to discuss or announce something in a more permanent place than a chat room, we also have a [message board](https://www.libgosu.org/cgi-bin/mwf/forum.pl).
 - Please file bugs and feature requests [on GitHub](https://github.com/gosu/gosu/issues).
 

data/ext/gosu/extconf.rb

@@ -46,6 +46,9 @@ if `uname`.chomp == 'Darwin'
   $CXXFLAGS << " #{`sdl2-config --cflags`.chomp}"
   # Prefer statically linking SDL 2.
   $LDFLAGS  << " #{`sdl2-config --static-libs`.chomp} -framework OpenGL -framework Metal -framework OpenAL"
+  # And yet another hack: `sdl2-config --static-libs` uses `-lSDL2` instead of linking to the static library,
+  # even if it exists. -> Manually replace it. (Ugh!)
+  $LDFLAGS.sub! " -lSDL2 ", " /usr/local/lib/libSDL2.a " if File.exist? "/usr/local/lib/libSDL2.a"
   
   # Disable building of 32-bit slices in Apple's Ruby.
   # (RbConfig::CONFIG['CXXFLAGS'] on 10.11: -arch x86_64 -arch i386 -g -Os -pipe)

data/lib/gosu/compat.rb

@@ -74,7 +74,7 @@ class Gosu::Image
 
   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.")
+      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
@@ -91,10 +91,10 @@ class Gosu::Image
 
   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.")
+      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.")
+      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

data/lib/gosu/swig_patches.rb

@@ -4,19 +4,20 @@
 # 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
       options = args.first || {}
       fullscreen = options[:fullscreen]
       update_interval = options[:update_interval]
+      resizable = options[:resizable]
     else
       fullscreen, update_interval = *args
     end
     $gosu_gl_blocks = nil
-    initialize_without_hash width, height, !!fullscreen, update_interval || 16.666666
+    initialize_without_hash width, height, !!fullscreen, update_interval || 16.666666, !!resizable
   end
-  
+
   %w(update draw needs_redraw? needs_cursor?
      lose_focus button_down button_up).each do |callback|
     define_method "protected_#{callback}" do |*args|
@@ -56,10 +57,14 @@ 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)
+  def self.gl(z = nil, &block)
     $gosu_gl_blocks ||= []
     $gosu_gl_blocks << block
-    unsafe_gl(*args, &block)
+    if z.nil?
+      unsafe_gl(&block)
+    else
+      unsafe_gl(z, &block)
+    end
   end
 end
 

data/rdoc/gosu.rb

@@ -1,4 +1,4 @@
-# Encoding: UTF-8
+## Encoding: UTF-8
 
 module Gosu
   ##
@@ -50,6 +50,7 @@ module Gosu
   KB_LEFT_SHIFT = :an_integer
   KB_MINUS = :an_integer
   KB_NUMPAD_0…KB_NUMPAD_9 = :an_integer
+  KB_NUMPAD_DELETE = :an_integer
   KB_NUMPAD_DIVIDE = :an_integer
   KB_NUMPAD_MINUS = :an_integer
   KB_NUMPAD_MULTIPLY = :an_integer
@@ -471,7 +472,6 @@ module Gosu
     # @return [Gosu::GLTexInfo?] information about the underlying OpenGL texture.
     #
     # @see Gosu::GLTexInfo
-    # @see file:examples/OpenGLIntegration.rb
     def gl_tex_info; end
 
     ##
@@ -764,6 +764,10 @@ module Gosu
     ##
     # Toggles between windowed mode and fullscreen.
     attr_writer :fullscreen
+    
+    ##
+    # @return [true, false] whether this window is resizable.
+    def resizable?; end
 
     ##
     # @return [Float] the interval between calls to {#update}, in milliseconds.
@@ -772,8 +776,9 @@ module Gosu
     ##
     # Creates a new window with the requested size.
     #
-    # @note The actual window may be smaller if the requested size is too large for the current display resolution; in that case, Gosu will automatically scale all coordinates to transparently emulate a larger window. No need to thank us.
-    #
+    # Resizable fullscreen windows always use the full desktop resolution.
+    # Windows that are larger than the desktop resolution will be shrunk.
+    # 
     # @overload initialize(width, height, options = {})
     # @overload initialize(width, height, fullscreen, update_interval = 16.666666)
     #
@@ -781,6 +786,7 @@ module Gosu
     # @param height [Integer] the desired window height.
     # @param [Hash] options
     # @option options [true, false] :fullscreen (false) whether to present the window in fullscreen mode.
+    # @option options [true, false] :resizable (false) whether the window can be resized by the user.
     # @option options [Float] :update_interval (16.666666) the interval between frames, in milliseconds.
     def initialize(width, height, options); end
 
@@ -889,7 +895,6 @@ module Gosu
   # Can be retrieved from some images to use them in OpenGL operations.
   #
   # @see Gosu::Image#gl_tex_info
-  # @see file:examples/OpenGLIntegration.rb
   class GLTexInfo
     ##
     # @return [Integer] OpenGL texture id
@@ -1040,7 +1045,6 @@ module Gosu
     #
     # @see Window#draw
     # @see file:reference/Z-Ordering
-    # @see file:examples/OpenGLIntegration.rb
     def gl(z=nil); end
 
     ##

data/src/RubyGosu.cxx

@@ -3212,7 +3212,7 @@ std::string SwigDirector_TextInput::filter(std::string text) const {
 }
 
 
-SwigDirector_Window::SwigDirector_Window(VALUE self, unsigned int width, unsigned int height, bool fullscreen, double update_interval): Gosu::Window(width, height, fullscreen, update_interval), Swig::Director(self) {
+SwigDirector_Window::SwigDirector_Window(VALUE self, unsigned int width, unsigned int height, bool fullscreen, double update_interval, bool resizable): Gosu::Window(width, height, fullscreen, update_interval, resizable), Swig::Director(self) {
   
 }
 
@@ -8697,6 +8697,7 @@ _wrap_new_Window(int argc, VALUE *argv, VALUE self) {
   unsigned int arg3 ;
   bool arg4 = (bool) false ;
   double arg5 = (double) 16.666666 ;
+  bool arg6 = (bool) false ;
   unsigned int val2 ;
   int ecode2 = 0 ;
   unsigned int val3 ;
@@ -8705,10 +8706,12 @@ _wrap_new_Window(int argc, VALUE *argv, VALUE self) {
   int ecode4 = 0 ;
   double val5 ;
   int ecode5 = 0 ;
+  bool val6 ;
+  int ecode6 = 0 ;
   const char *classname SWIGUNUSED = "Gosu::Window";
   Gosu::Window *result = 0 ;
   
-  if ((argc < 2) || (argc > 4)) {
+  if ((argc < 2) || (argc > 5)) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
   }
   arg1 = self;
@@ -8736,13 +8739,20 @@ _wrap_new_Window(int argc, VALUE *argv, VALUE self) {
     } 
     arg5 = static_cast< double >(val5);
   }
+  if (argc > 4) {
+    ecode6 = SWIG_AsVal_bool(argv[4], &val6);
+    if (!SWIG_IsOK(ecode6)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode6), Ruby_Format_TypeError( "", "bool","Window", 6, argv[4] ));
+    } 
+    arg6 = static_cast< bool >(val6);
+  }
   {
     try {
       if ( strcmp(rb_obj_classname(self), classname) != 0 ) {
         /* subclassed */
-        result = (Gosu::Window *)new SwigDirector_Window(arg1,arg2,arg3,arg4,arg5); 
+        result = (Gosu::Window *)new SwigDirector_Window(arg1,arg2,arg3,arg4,arg5,arg6); 
       } else {
-        result = (Gosu::Window *)new Gosu::Window(arg2,arg3,arg4,arg5); 
+        result = (Gosu::Window *)new Gosu::Window(arg2,arg3,arg4,arg5,arg6); 
       }
       
       DATA_PTR(self) = result;
@@ -8858,6 +8868,37 @@ fail:
 }
 
 
+SWIGINTERN VALUE
+_wrap_Window_resizableq___(int argc, VALUE *argv, VALUE self) {
+  Gosu::Window *arg1 = (Gosu::Window *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  bool result;
+  VALUE vresult = Qnil;
+  
+  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 const *","resizable", 1, self )); 
+  }
+  arg1 = reinterpret_cast< Gosu::Window * >(argp1);
+  {
+    try {
+      result = (bool)((Gosu::Window const *)arg1)->resizable();
+    }
+    catch (const std::exception& e) {
+      SWIG_exception(SWIG_RuntimeError, e.what());
+    }
+  }
+  vresult = SWIG_From_bool(static_cast< bool >(result));
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
 SWIGINTERN VALUE
 _wrap_Window_update_interval(int argc, VALUE *argv, VALUE self) {
   Gosu::Window *arg1 = (Gosu::Window *) 0 ;
@@ -12097,6 +12138,7 @@ SWIGEXPORT void Init_gosu(void) {
   rb_define_method(SwigClassWindow.klass, "width", VALUEFUNC(_wrap_Window_width), -1);
   rb_define_method(SwigClassWindow.klass, "height", VALUEFUNC(_wrap_Window_height), -1);
   rb_define_method(SwigClassWindow.klass, "fullscreen?", VALUEFUNC(_wrap_Window_fullscreenq___), -1);
+  rb_define_method(SwigClassWindow.klass, "resizable?", VALUEFUNC(_wrap_Window_resizableq___), -1);
   rb_define_method(SwigClassWindow.klass, "update_interval", VALUEFUNC(_wrap_Window_update_interval), -1);
   rb_define_method(SwigClassWindow.klass, "update_interval=", VALUEFUNC(_wrap_Window_update_intervale___), -1);
   rb_define_method(SwigClassWindow.klass, "caption", VALUEFUNC(_wrap_Window_caption), -1);

data/src/RubyGosu.h

@@ -28,7 +28,7 @@ public:
 class SwigDirector_Window : public Gosu::Window, public Swig::Director {
 
 public:
-    SwigDirector_Window(VALUE self, unsigned int width, unsigned int height, bool fullscreen = false, double update_interval = 16.666666);
+    SwigDirector_Window(VALUE self, unsigned int width, unsigned int height, bool fullscreen = false, double update_interval = 16.666666, bool resizable = false);
     virtual ~SwigDirector_Window();
     virtual void show();
     virtual bool tick();

data/src/Window.cpp

@@ -85,22 +85,29 @@ struct Gosu::Window::Impl
 {
     bool fullscreen;
     double update_interval;
-    
+    bool resizable;
+    bool resizing = false;
+
     // 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;
-    
+
     unique_ptr<Graphics> graphics;
     unique_ptr<Input> input;
 };
 
-Gosu::Window::Window(unsigned width, unsigned height, bool fullscreen, double update_interval)
+Gosu::Window::Window(unsigned width, unsigned height, bool fullscreen, double update_interval,
+                     bool resizable)
 : pimpl(new Impl)
 {
+#if SDL_VERSION_ATLEAST(2, 0, 5)
+    SDL_SetWindowResizable(shared_window(), (SDL_bool)resizable);
+#endif
+
     // 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.
+    // This ensures that the window will be centered 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);
@@ -108,11 +115,12 @@ Gosu::Window::Window(unsigned width, unsigned height, bool fullscreen, double up
 
     // Really enable fullscreen if desired.
     resize(width, height, fullscreen);
-    
+
     SDL_GL_SetSwapInterval(1);
 
     pimpl->update_interval = update_interval;
-    
+    pimpl->resizable = resizable;
+
     input().on_button_down = [this](Button button) { button_down(button); };
     input().on_button_up   = [this](Button button) { button_up(button); };
 }
@@ -137,6 +145,11 @@ bool Gosu::Window::fullscreen() const
     return pimpl->fullscreen;
 }
 
+bool Gosu::Window::resizable() const
+{
+    return pimpl->resizable;
+}
+
 void Gosu::Window::resize(unsigned width, unsigned height, bool fullscreen)
 {
     pimpl->fullscreen = fullscreen;
@@ -150,31 +163,47 @@ void Gosu::Window::resize(unsigned width, unsigned height, bool fullscreen)
     if (fullscreen) {
         actual_width  = Gosu::screen_width(this);
         actual_height = Gosu::screen_height(this);
-
-        double scale_x = 1.0 * actual_width / width;
-        double scale_y = 1.0 * actual_height / height;
-        scale_factor = min(scale_x, scale_y);
-
-        if (scale_x < scale_y) {
-            black_bar_height = (actual_height / scale_x - height) / 2;
+        
+        if (resizable()) {
+            // Resizable fullscreen windows stubbornly follow the desktop resolution.
+            width  = actual_width;
+            height = actual_height;
         }
-        else if (scale_y < scale_x) {
-            black_bar_width = (actual_width / scale_y - width) / 2;
+        else {
+            // Scale the window to fill the desktop resolution.
+            double scale_x = 1.0 * actual_width / width;
+            double scale_y = 1.0 * actual_height / height;
+            scale_factor = min(scale_x, scale_y);
+            // Add black bars to preserve the aspect ratio, if necessary.
+            if (scale_x < scale_y) {
+                black_bar_height = (actual_height / scale_x - height) / 2;
+            }
+            else if (scale_y < scale_x) {
+                black_bar_width = (actual_width / scale_y - width) / 2;
+            }
         }
     }
     else {
-        double max_width  = Gosu::available_width(this);
-        double max_height = Gosu::available_height(this);
+        unsigned max_width  = Gosu::available_width(this);
+        unsigned max_height = Gosu::available_height(this);
         
-        if (width > max_width || height > max_height) {
-            scale_factor = min(max_width / width, max_height / height);
+        if (resizable()) {
+            // If the window is resizable, limit its size, without preserving the aspect ratio.
+            width  = actual_width  = min(width,  max_width);
+            height = actual_height = min(height, max_height);
+        }
+        else if (width > max_width || height > max_height) {
+            // If the window cannot fit on the screen, shrink its contents.
+            scale_factor = min(1.0 * max_width / width, 1.0 * max_height / height);
             actual_width  = width  * scale_factor;
             actual_height = height * scale_factor;
         }
     }
     
     SDL_SetWindowFullscreen(shared_window(), fullscreen ? SDL_WINDOW_FULLSCREEN_DESKTOP : 0);
-    SDL_SetWindowSize(shared_window(), actual_width, actual_height);
+    if (!pimpl->resizing) {
+        SDL_SetWindowSize(shared_window(), actual_width, actual_height);
+    }
     
 #if SDL_VERSION_ATLEAST(2, 0, 1)
     SDL_GL_GetDrawableSize(shared_window(), &actual_width, &actual_height);
@@ -256,19 +285,24 @@ bool Gosu::Window::tick()
     
     SDL_Event e;
     while (SDL_PollEvent(&e)) {
+
         switch (e.type) {
-        #ifdef GOSU_IS_MAC
-            // Workaround for https://github.com/gosu/gosu/issues/458
-            // "Resize" the window to its current dimensions after it is shown.
-            // Otherwise it will be black on macOS 10.14 (Mojave) until the user moves it around.
-            // TODO: Since this affects `brew install supertux` as well, maybe file an SDL bug?
             case SDL_WINDOWEVENT: {
-                if (e.window.event == SDL_WINDOWEVENT_SHOWN) {
-                    resize(this->width(), this->height(), fullscreen());
+                switch (e.window.event) {
+                    case SDL_WINDOWEVENT_SIZE_CHANGED: {
+                        if (pimpl->resizable && (width() != e.window.data1 || height() != e.window.data2)) {
+                            pimpl->resizing = true;
+                            resize(e.window.data1, e.window.data2, fullscreen());
+                            pimpl->resizing = false;
+                        }
+                        break;
+                    }
+                    default: {
+                        break;
+                    }
                 }
                 break;
             }
-        #endif
             case SDL_QUIT: {
                 close();
                 break;

data/src/WindowUIKit.cpp

@@ -13,12 +13,12 @@ struct Gosu::Window::Impl
     unique_ptr<Graphics> graphics;
     unique_ptr<Input> input;
     
-    bool fullscreen;
     double update_interval;
     string caption;
 };
 
-Gosu::Window::Window(unsigned width, unsigned height, bool fullscreen, double update_interval)
+Gosu::Window::Window(unsigned width, unsigned height, bool fullscreen, double update_interval,
+                     bool resizable)
 : pimpl(new Impl)
 {
     pimpl->window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
@@ -43,7 +43,6 @@ Gosu::Window::Window(unsigned width, unsigned height, bool fullscreen, double up
     // Now let the controller know about our Input instance.
     [pimpl->controller trackTextInput:*pimpl->input];
     
-    pimpl->fullscreen = fullscreen;
     pimpl->update_interval = update_interval;
 }
 
@@ -63,7 +62,12 @@ unsigned Gosu::Window::height() const
 
 bool Gosu::Window::fullscreen() const
 {
-    return pimpl->fullscreen;
+    return true;
+}
+
+bool Gosu::Window::resizable() const
+{
+    return false;
 }
 
 void Gosu::Window::resize(unsigned width, unsigned height, bool fullscreen)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gosu
 version: !ruby/object:Gem::Version
-  version: 0.14.5
+  version: 0.14.6.pre1
 platform: ruby
 authors:
 - Julian Raschke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-09 00:00:00.000000000 Z
+date: 2019-10-18 00:00:00.000000000 Z
 dependencies: []
 description: |2
       2D game development library.
@@ -163,12 +163,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: 2D game development library.