gosu 1.0.0.pre1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd0fd86f4301c36a1537d5adaa45e6bc7fd918e47191909bb1bc238624d01f48
-  data.tar.gz: 0d79c98a88fc7c433a8eaf3b5a432da6a9c24c86d6388d6e853c6d6c4a44f4a4
+  metadata.gz: 0c00e9925256d5f0c158716eeb225fd8bc5b9af17335f2a3b67b892a1c7d87d7
+  data.tar.gz: 3e2edbae0cf3ae45cf926ff228fd621c2d092c0e1ccbf425884b0ba01c984199
 SHA512:
-  metadata.gz: d3393dda33deff7db00d4fda1f40faac895243f6dc8c0d6c776eaf905bc44e64235ac0e3e2ff9067bac7a971d6794c02e526755e7602b98f4fc58b2053c1441a
-  data.tar.gz: 1fce5bf10d01a9e2ab6df0d30d62a3105bb98050c8efe94701eb09d8cbc64fa19a9a7fac02bc1d7a2ab62d74bb591b5bce1fdc1ae5a49ccdc57d8d6911ec9757
+  metadata.gz: ab8f4550f297ae89f321e133b3ca9e0b5f77ab64b9c66415e379270eb90ac1c000de685b175e3dbfb5a9de34afa3cfb4eda3d8a5e40ebe9dd18b25ef22964dcf
+  data.tar.gz: 87803f08a8a4a13ec027ee265cc08be511eb95c30bc1494766310485d757799bffc794427f2fe1002142b00b1282b4ade6b90b985f01f00f3b03db041a12299b

data/ext/gosu/extconf.rb

@@ -5,11 +5,9 @@ when /^mingw/
   windows = true
 when /^darwin/
   macos = true
-when /linux/
-  linux = true
 end
 
-if macos or linux
+if not windows
   puts 'The Gosu gem requires some libraries to be installed system-wide.'
   puts 'See the following site for a list:'
   if macos
@@ -54,12 +52,11 @@ if windows
     $LDFLAGS << "  -L../../dependencies/al_soft/x86 -L../../dependencies/SDL/lib/x86"
   end
   $LDFLAGS << " -lgdi32 -lwinmm -lOpenGL32 -lOpenAL32 -lSDL2"
+  # Link libstdc++ statically to avoid having another DLL dependency when using Ocra.
+  $LDFLAGS << " -static-libstdc++"
 elsif macos
   # Compile all C++ files as Objective C++ on macOS since mkmf does not support .mm files.
   $CXXFLAGS << " -x objective-c++ -fobjc-arc -DNDEBUG"
-  # Prevents issues with Apple's pre-installed Ruby 2.3 on macOS 10.13.
-  # https://github.com/gosu/gosu/issues/424
-  $CXXFLAGS << " -Wno-reserved-user-defined-literal"
 
   # Explicitly specify libc++ as the standard library.
   # rvm will sometimes try to override this:
@@ -82,7 +79,7 @@ elsif macos
   $LDFLAGS.gsub! "-arch i386", ""
   $ARCH_FLAG.gsub! "-arch i386", ""
   CONFIG['LDSHARED'].gsub! "-arch i386", ""
-elsif linux
+else
   if /BCM2708/ =~ `cat /proc/cpuinfo`
     $INCFLAGS << " -I/opt/vc/include/GLES"
     $INCFLAGS << " -I/opt/vc/include"
@@ -113,21 +110,4 @@ Dir.glob('../../dependencies/**/*.c').each do |dep|
   end
 end
 
-# Gem::Version#initialize is apparently broken in some versions of Ruby, so use a local helper.
-def ruby_newer_than?(want_version)
-  have_parts = RUBY_VERSION.split('.').map { |part| part.to_i }
-  want_parts = want_version.split('.').map { |part| part.to_i }
-  have_parts << 0 while have_parts.size < want_parts.size
-  want_parts << 0 while want_parts.size < have_parts.size
-  (have_parts <=> want_parts) == 1
-end
-
-# In some versions of Ruby/mkmf, the $CXXFLAGS variable does not work.
-# We can modify CONFIG instead, and our changes will end up in the Makefile.
-# See: http://bugs.ruby-lang.org/issues/8315
-# The lower bound was reduced to 1.9.3 here: https://github.com/gosu/gosu/issues/321
-if ruby_newer_than?("1.9.2") and not ruby_newer_than?("2.2.0")
-  CONFIG['CXXFLAGS'] = "#$CFLAGS #$CXXFLAGS"
-end
-
 create_makefile "gosu", "../../src"

data/include/Gosu/Buttons.hpp

@@ -1,15 +1,12 @@
 #pragma once
 
-#include <Gosu/Platform.hpp>
-
 namespace Gosu
 {
-    //! List of button ids that can be used with Gosu::Input.
-    //! This enumeration contains ids for keyboard keys (KB_*),
-    //! mouse buttons and mouse wheel (MS_*) and gamepad buttons (GP_*).
-    enum ButtonName
+    /// List of button IDs that can be used with Gosu::Input.
+    /// This enumeration contains IDs for keyboard keys (KB_*),
+    /// mouse buttons and mouse wheel (MS_*), as well as gamepad buttons (GP_*).
+    enum Button
     {
-        KB_RANGE_BEGIN,
         KB_ESCAPE          = 41,
         KB_F1              = 58,
         KB_F2              = 59,
@@ -51,8 +48,8 @@ namespace Gosu
         KB_DOWN            = 81,
         KB_HOME            = 74,
         KB_END             = 77,
-        KB_PRINTSCREEN     = 70,
-        KB_SCROLLLOCK      = 71,
+        KB_PRINT_SCREEN    = 70,
+        KB_SCROLL_LOCK     = 71,
         KB_PAUSE           = 72,
         KB_INSERT          = 73,
         KB_DELETE          = 76,
@@ -70,7 +67,7 @@ namespace Gosu
         KB_COMMA           = 54,
         KB_PERIOD          = 55,
         KB_SLASH           = 56,
-        KB_CAPSLOCK        = 57,
+        KB_CAPS_LOCK       = 57,
         KB_A               = 4,
         KB_B               = 5,
         KB_C               = 6,
@@ -97,7 +94,8 @@ namespace Gosu
         KB_X               = 27,
         KB_Y               = 28,
         KB_Z               = 29,
-        KB_ISO             = 100, // ` on US/UK macOS, < on EU macOS, \ on US/UK Windows
+        /// ` on US/UK macOS, < on EU macOS, \ on US/UK Windows
+        KB_ISO             = 100,
         KB_NUMPAD_0        = 98,
         KB_NUMPAD_1        = 89,
         KB_NUMPAD_2        = 90,
@@ -129,7 +127,6 @@ namespace Gosu
         MS_OTHER_5,
         MS_OTHER_6,
         MS_OTHER_7,
-        MS_RANGE_END = 0x110,
 
         GP_RANGE_BEGIN,
         GP_DPAD_LEFT = GP_RANGE_BEGIN,
@@ -263,8 +260,14 @@ namespace Gosu
         GP_3_DOWN,
         GP_RANGE_END = GP_3_DOWN,
 
-        GP_AXES_RANGE_BEGIN,
-        GP_LEFT_STICK_X_AXIS = GP_AXES_RANGE_BEGIN,
+        NUM_GAMEPADS = 4,
+        NO_BUTTON = 0xffffffff,
+    };
+
+    /// List of axis IDs that can be used with Gosu::Input.
+    enum Axis
+    {
+        GP_LEFT_STICK_X_AXIS,
         GP_LEFT_STICK_Y_AXIS,
         GP_RIGHT_STICK_X_AXIS,
         GP_RIGHT_STICK_Y_AXIS,
@@ -298,9 +301,7 @@ namespace Gosu
         GP_3_RIGHT_STICK_Y_AXIS,
         GP_3_LEFT_TRIGGER_AXIS,
         GP_3_RIGHT_TRIGGER_AXIS,
-        GP_AXES_RANGE_END = GP_3_RIGHT_TRIGGER_AXIS,
 
-        NUM_GAMEPADS = 4,
-        NO_BUTTON = 0xffffffff,
+        NUM_AXES
     };
 }

data/include/Gosu/Font.hpp

@@ -40,7 +40,7 @@ namespace Gosu
         
         //! Returns the width, in pixels, the given text would occupy if drawn.
         double text_width(const std::string& text) const;
-        //! Returns the width, in pixels, the given text would occupy if drawn.
+        //! Returns the width, in pixels, the given markup would occupy if drawn.
         double markup_width(const std::string& markup) const;
         
         //! Draws text so the top left corner of the text is at (x; y).

data/include/Gosu/Fwd.hpp

@@ -1,14 +1,9 @@
-//! \file Fwd.hpp
-//! Contains forward declarations of all of Gosu's available classes.
-
 #pragma once
 
-//! The library's main namespace.
 namespace Gosu
 {
     class Bitmap;
     class Buffer;
-    class Button;
     class Channel;
     class Color;
     class File;

data/include/Gosu/Input.hpp

@@ -1,11 +1,9 @@
-//! \file Input.hpp
-//! Interface of the Input class.
-
 #pragma once
 
 #include <Gosu/Fwd.hpp>
 #include <Gosu/Buttons.hpp>
 #include <Gosu/Platform.hpp>
+#include <Gosu/Utility.hpp>
 #include <functional>
 #include <memory>
 #include <string>
@@ -13,56 +11,30 @@
 
 namespace Gosu
 {
-    //! Very lightweight class that identifies a button (keyboard, mouse or other device).
-    class Button
-    {
-        unsigned id_;
-
-    public:
-        //! For internal use.
-        explicit Button(unsigned id) : id_(id) {}
-        //! For internal use.
-        unsigned id() const { return id_; }
-
-        //! Default constructor; == no_button.
-        Button() : id_(NO_BUTTON) {}
-
-        //! Conversion from ButtonName constants.
-        Button(ButtonName name) : id_(name) {}
-    };
-
-    //! Tests whether two Buttons identify the same physical button.
-    inline bool operator==(Button lhs, Button rhs) { return lhs.id() == rhs.id(); }
-    inline bool operator!=(Button lhs, Button rhs) { return !(lhs == rhs); }
-    inline bool operator<(Button lhs, Button rhs) { return lhs.id() < rhs.id(); }
-
-    //! Struct that saves information about a touch on the surface of a multi-
-    //! touch device.
-    //! Available even on non-iPhone platforms to make it easier to compile the
-    //! same source for multiple platforms.
+    /// Struct that saves information about a touch on the surface of a multi-touch device.
+    /// (Right now this is only supported on iOS.)
     struct Touch
     {
-        //! Allows for identification of a touch across calls.
+        /// Allows for identification of a touch across calls.
         void* id;
-        //! Position of a touch on the touch screen.
-        float x, y;
+        /// Position of a touch on the touch screen.
+        double x, y;
     };
     typedef std::vector<Touch> Touches;
 
-    //! Manages initialization and shutdown of the input system. Only one Input
-    //! instance can exist per application.
-    class Input
+    /// Manages initialization and shutdown of the input system.
+    /// Only one Input instance can exist per application.
+    class Input : Noncopyable
     {
         struct Impl;
-        // Non-movable (const) to avoid dangling internal references.
-        const std::unique_ptr<Impl> pimpl;
+        std::unique_ptr<Impl> pimpl;
 
     public:
     #ifdef GOSU_IS_IPHONE
         Input(void* view, float update_interval);
         void feed_touch_event(std::function<void (Touch)>& callback, void* touches);
     #else
-        Input(void* window);
+        explicit Input(void* window);
         bool feed_sdl_event(void* event);
     #endif
 
@@ -87,7 +59,8 @@ namespace Gosu
         //! Updated every tick.
         static bool down(Button btn);
 
-        //! Returns the value of a Gamepad joystick in the range -1.0 thru +1.0 and trigger in the range 0.0 thru +1.0.
+        //! Returns the value of a gamepad stick in the range -1.0 through +1.0, or a trigger in the
+        //! range 0.0 through +1.0.
         //! Updated every tick.
         static double axis(Button btn);
 

data/include/Gosu/Utility.hpp

@@ -1,6 +1,3 @@
-//! \file Utility.hpp
-//! General purpose utility functions.
-
 #pragma once
 
 #include <string>
@@ -17,4 +14,18 @@ namespace Gosu
     //! values such as 'en_US', 'de_DE.UTF-8', 'ja', 'zh-Hans'.
     //! The first two letters will always be a language code.
     std::string language();
+
+    class Noncopyable
+    {
+    protected:
+        Noncopyable() = default;
+        ~Noncopyable() = default;
+
+    public:
+        Noncopyable(const Noncopyable& other) = delete;
+        Noncopyable& operator=(const Noncopyable& other) = delete;
+
+        Noncopyable(Noncopyable&& other) = delete;
+        Noncopyable& operator=(Noncopyable&& other) = delete;
+    };
 }

data/include/Gosu/Version.hpp

@@ -2,9 +2,9 @@
 
 #include <string>
 
-#define GOSU_MAJOR_VERSION 0
-#define GOSU_MINOR_VERSION 15
-#define GOSU_POINT_VERSION 2
+#define GOSU_MAJOR_VERSION 1
+#define GOSU_MINOR_VERSION 1
+#define GOSU_POINT_VERSION 0
 
 namespace Gosu
 {

data/include/Gosu/Window.hpp

@@ -1,6 +1,3 @@
-//! \file Window.hpp
-//! Interface of the Window class.
-
 #pragma once
 
 #include <Gosu/Fwd.hpp>
@@ -9,15 +6,16 @@
 #include <memory>
 #include <string>
 
-#ifdef GOSU_IS_WIN
-#ifndef NOMINMAX
-#define NOMINMAX
-#endif
-#include <windows.h>
-#endif
-
 namespace Gosu
 {
+    enum WindowFlags
+    {
+        WF_WINDOWED,
+        WF_FULLSCREEN = 1,
+        WF_RESIZABLE  = 2,
+        WF_BORDERLESS = 4
+    };
+
     //! Convenient all-in-one class that serves as the foundation of a standard Gosu application.
     //! Manages initialization of all of Gosu's core components and provides timing functionality.
     //! Note that you should really only use one instance of this class at the same time.
@@ -31,17 +29,23 @@ namespace Gosu
         //! \param width Width of the window in points; that is, pixels on a normal display, and
         //! 'points' on a high-resolution display.
         //! \param height See width.
+        //! \param window_flags A bitmask of values from Gosu::WindowFlags.
         //! \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, bool resizable = false);
+        Window(int width, int height, unsigned window_flags = WF_WINDOWED,
+               double update_interval = 16.666666);
         virtual ~Window();
 
-        unsigned width() const;
-        unsigned height() const;
+        int width() const;
+        int height() const;
         bool fullscreen() const;
+        void resize(int width, int height, bool fullscreen);
+
         bool resizable() const;
-        void resize(unsigned width, unsigned height, bool fullscreen);
+        void set_resizable(bool resizable);
+
+        bool borderless() const;
+        void set_borderless(bool borderless);
 
         double update_interval() const;
         void set_update_interval(double update_interval);
@@ -82,8 +86,8 @@ namespace Gosu
         //! By default, the window is redrawn all the time.
         virtual bool needs_redraw() const { return true; }
 
-        //! If this function returns true, the system arrow cursor is drawn while over the window.
-        virtual bool needs_cursor() const { return false; }
+        //! If this function returns true, the system cursor will be visible while over the window.
+        virtual bool needs_cursor() const { return true; }
 
         //! This function is called when the window loses focus on some platforms.
         //! Most importantly, it is called on the iPhone or iPad when the user locks the screen.
@@ -139,22 +143,22 @@ namespace Gosu
     //! Returns the width (in pixels) of a screen.
     //! \param window The result describes the screen on which the window is shown, or the
     //!               primary screen if no window is given.
-    unsigned screen_width(Window* window = nullptr);
+    int screen_width(Window* window = nullptr);
 
     //! Returns the height (in pixels) of the user's primary screen.
     //! \param window The result describes the screen on which the window is shown, or the
     //!               primary screen if no window is given.
-    unsigned screen_height(Window* window = nullptr);
+    int screen_height(Window* window = nullptr);
 
     //! Returns the maximum width (in 'points') that is available for a non-fullscreen Window.
     //! All windows larger than this size will automatically be shrunk to fit.
     //! \param window The result describes the screen on which the window is shown, or the
     //!               primary screen if no window is given.
-    unsigned available_width(Window* window = nullptr);
+    int available_width(Window* window = nullptr);
 
     //! Returns the maximum height (in 'points') that is available for a non-fullscreen Window.
     //! All windows larger than this size will automatically be shrunk to fit.
     //! \param window The result describes the screen on which the window is shown, or the
     //!               primary screen if no window is given.
-    unsigned available_height(Window* window = nullptr);
+    int available_height(Window* window = nullptr);
 }

data/lib/gosu/patches.rb

@@ -18,26 +18,12 @@ class ::Numeric
   end
 end
 
-class Gosu::Font
-  # draw_text will stop parsing markup in Gosu 1.0.
-  alias_method :draw_text, :draw_markup
-  # draw_text_rel will stop parsing markup in Gosu 1.0.
-  alias_method :draw_text_rel, :draw_markup_rel
-  # text_width will stop parsing markup in Gosu 1.0.
-  alias_method :text_width, :markup_width
-end
-
 class Gosu::Image
   BlobHelper = Struct.new(:columns, :rows, :to_blob)
   
   def self.from_blob(width, height, rgba = "\0\0\0\0" * (width * height))
     self.new(BlobHelper.new(width, height, rgba))
   end
-  
-  # from_markup will stop parsing markup in Gosu 1.0.
-  def self.from_markup(*args)
-    self.from_text(*args)
-  end
 end
 
 # Color constants.

data/lib/gosu/preview.rb

@@ -3,8 +3,6 @@ warn "gosu/preview.rb has been removed in Gosu 0.9.0, and Gosu itself \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'";
+  "• Image#initialize et.al. use an options hash now";
 
 require 'gosu'

data/lib/gosu/swig_patches.rb

@@ -3,19 +3,20 @@
 # compatible, but I just call protected_update etc. in the Ruby wrapper so I can add this
 # custom debugging help:
 class Gosu::Window
-  alias_method :initialize_without_hash, :initialize
+  alias_method :initialize_with_bitmask, :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]
+  def initialize(width, height, *args)
+    $gosu_gl_blocks = nil
+
+    if args.first.is_a? Hash
+      flags = 0
+      flags |= 1 if args.first[:fullscreen]
+      flags |= 2 if args.first[:resizable]
+      flags |= 4 if args.first[:borderless]
+      initialize_with_bitmask(width, height, flags, args.first[:update_interval] || 16.666666)
     else
-      fullscreen, update_interval = *args
+      initialize_with_bitmask(width, height, args[0] ? 1 : 0, args[1] || 16.666666)
     end
-    $gosu_gl_blocks = nil
-    initialize_without_hash width, height, !!fullscreen, update_interval || 16.666666, !!resizable
   end
 
   %w(update draw needs_redraw? needs_cursor?