gosu 0.11.3.1 → 0.11.4.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b7d373f3c18bf8290ded150c92e00fe8aefe4622
-  data.tar.gz: 32e974e19a7b7c3b29dba6e72eb0f85ec768ab8b
+  metadata.gz: 71567bcb35b320a552723bfa654ee71669158f00
+  data.tar.gz: ad465f70e02208f4077acd1487121b65190430bc
 SHA512:
-  metadata.gz: a374719a095b3778956583007aed12214f58dc097348681e1627904a83713ff1335137d1c9c580d685b4aa88c69704e17a8cc7cd7686ac84393a4ccf1627249d
-  data.tar.gz: 3ba325813d86c06d32db804df36fc6deea9d3e2ab158a2ad6335007e99cd26949bf5023eb818a813523de287613c2f0e07709979fb6469710fef3b0ebc60a85d
+  metadata.gz: 3e5b404362d89c536ec9df111bbb0cd705813f9b4bfd8b1940bb1fa39cea94656b9dfba02c2be3f9682f5eff8e718183ec7a9063d8705fbfe45f863ae9d5c987
+  data.tar.gz: 8782527c80c0cb9b300587ec8aaa69bc4c08fa3aabf337ed706f37867590c7e564dd1033c308b017565de0ced432f38096843285672b7c300eef48d6960b05bc

data/Gosu/Version.hpp

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

data/Gosu/Window.hpp

@@ -67,6 +67,7 @@ namespace Gosu
         //! receives calls to draw, update etc.
         virtual void show();
         
+        //! EXPERIMENTAL - MAY DISAPPEAR WITHOUT WARNING.
         //! Performs a single mainloop step.
         //! This method is only useful if you want to integrate Gosu with another library that has
         //! its own main loop.
@@ -107,14 +108,19 @@ namespace Gosu
         virtual void release_memory() {}
 
         //! Called before update when the user presses a button while the window has the focus.
-        //! By default, this will toggle fullscreen mode if the user presses alt+enter (Windows,
+        //! By default, this will toggle fullscreen mode if the user presses Alt+Enter (Windows,
         //! Linux) or cmd+F (macOS).
         //! To support these shortcuts in your application, make sure to call Window::button_down
         //! in your implementation.
         virtual void button_down(Gosu::Button);
         
-        //! Same as button_down. Called then the user releases a button.
+        //! Same as button_down. Called when the user releases a button.
         virtual void button_up(Gosu::Button) {}
+
+        //! Called when a file is dropped onto the window.
+        //! \param path The filename of the dropped file. When multiple files are dropped, this
+        //! method will be called several times.
+        virtual void drop(const std::string& filename) {}
         
         // Ignore when SWIG is wrapping this class for Ruby/Gosu.
         #ifndef SWIG

data/rdoc/gosu.rb

@@ -113,15 +113,15 @@ module Gosu
     attr_accessor :blue
 
     ##
-    # @return [Integer] the color's hue in the range (0...360).
+    # @return [Float] the color's hue in the range [0.0; 360.0).
     attr_accessor :hue
 
     ##
-    # @return [Float] the color's saturation in the range (0..1).
+    # @return [Float] the color's saturation in the range [0.0; 1.0].
     attr_accessor :saturation
 
     ##
-    # @return [Float] the color's value in the range (0..1).
+    # @return [Float] the color's value in the range [0.0; 1.0].
     attr_accessor :value
 
     # @!group Creating colors.
@@ -131,10 +131,10 @@ module Gosu
     #   @param argb [Integer] an integer of the form 0xAARRGGBB.
     #
     # @overload initialize(a, r, g, b)
-    #   @param a [Integer] the color's alpha channel in the range (0..255).
-    #   @param r [Integer] the color's red channel in the range (0..255).
-    #   @param g [Integer] the color's green channel in the range (0..255).
-    #   @param b [Integer] the color's blue channel in the range (0..255).
+    #   @param a [Integer] the color's alpha channel in the range [0; 255].
+    #   @param r [Integer] the color's red channel in the range [0; 255].
+    #   @param g [Integer] the color's green channel in the range [0; 255].
+    #   @param b [Integer] the color's blue channel in the range [0; 255].
     #
     # @see from_hsv
     # @see from_ahsv
@@ -149,10 +149,10 @@ module Gosu
     #   @param argb [Integer] an integer of the form 0xRRGGBBAA.
     #
     # @overload rgba(r, g, b, a)
-    #   @param r [Integer] the color's red channel in the range (0..255).
-    #   @param g [Integer] the color's green channel in the range (0..255).
-    #   @param b [Integer] the color's blue channel in the range (0..255).
-    #   @param a [Integer] the color's alpha channel in the range (0..255).
+    #   @param a [Integer] the color's alpha channel in the range [0; 255].
+    #   @param r [Integer] the color's red channel in the range [0; 255].
+    #   @param g [Integer] the color's green channel in the range [0; 255].
+    #   @param b [Integer] the color's blue channel in the range [0; 255].
     #
     # @see #initialize
     # @see argb
@@ -171,9 +171,9 @@ module Gosu
     # Converts an HSV triplet to an opaque color.
     #
     # @return [Color] a color corresponding to the HSV triplet.
-    # @param h [Integer] the color's hue in the range (0..360).
-    # @param s [Float] the color's saturation in the range (0..1).
-    # @param v [Float] the color's value in the range (0..1).
+    # @param h [Float] the color's hue in the range [0.0; 360.0).
+    # @param s [Float] the color's saturation in the range [0.0; 1.0].
+    # @param v [Float] the color's value in the range [0.0; 1.0].
     #
     # @see from_ahsv
     def self.from_hsv(h, s, v); end
@@ -181,7 +181,7 @@ module Gosu
     # Converts an HSV triplet to a color with the alpha channel set to a given value.
     #
     # @return (see from_hsv)
-    # @param a [Integer] the color's opacity in the range (0..255).
+    # @param a [Integer] the color's opacity in the range [0; 255].
     # @param (see from_hsv)
     #
     # @see from_hsv
@@ -516,7 +516,7 @@ module Gosu
     # Playback speed is limited only by the underlying audio library, and both very large and very small values should work just fine.
     #
     # @return [SampleInstance]
-    # @param volume [Float] the playback volume, in the range (0..1), where 0 is completely silent and 1 is full volume.
+    # @param volume [Float] the playback volume, in the range [0.0; 1.0], where 0 is completely silent and 1 is full volume.
     # @param speed [Float] the playback speed.
     # @param looping [true, false] whether the sample should play in a loop.
     #
@@ -529,7 +529,7 @@ module Gosu
     # @note Samples played with this method will not be as loud as those played with {#play}, even if `pan` is 0. This is due to a limitation in the way panning works.
     #
     # @return [SampleInstance]
-    # @param pan [Float] the amount of panning. 0 is centered.
+    # @param pan [Float] the amount of panning. 0.0 is centered.
     # @param (see #play)
     #
     # @see #play
@@ -814,7 +814,7 @@ module Gosu
     ##
     # This method is called before {#update} if a button is pressed while the window has focus.
     #
-    # By default, this method  will toggle fullscreen mode if the user presses alt+enter (Windows,
+    # By default, this method  will toggle fullscreen mode if the user presses Alt+Enter (Windows,
     # Linux) or cmd+F (macOS).
     # To support these shortcuts in your application, make sure to call super in your
     # implementation.
@@ -836,6 +836,12 @@ module Gosu
     # @see Gosu.button_down?
     def button_up(id); end
 
+    ##
+    # Called when a file is dropped onto the window.
+    #
+    # @param filename [String] the filename of the dropped file. When multiple files are dropped, this method will be called several times.
+    def drop(filename); end
+
     # @!endgroup
   end
 
@@ -1131,7 +1137,7 @@ module Gosu
     def self.char_to_button_id(char); end
 
     ##
-    # @return [Float] a random number in the range (min...max).
+    # @return [Float] a random number in the range [min; max).
     # @param min [Float] the minimum value, inclusive.
     # @param max [Float] the maximum value, exclusive.
     def random(min, max); end

data/src/Audio.cpp

@@ -21,6 +21,7 @@
 #else
 #include <AL/al.h>
 #include <AL/alc.h>
+#include "MPEGFile.hpp"
 #include "SndFile.hpp"
 #define WAVE_FILE SndFile
 #endif
@@ -175,9 +176,8 @@ Gosu::Sample::Sample(const std::string& filename)
     CONSTRUCTOR_BEGIN;
 
     if (is_ogg_file(filename)) {
-        Gosu::Buffer buffer;
-        Gosu::load_file(buffer, filename);
-        OggFile ogg_file(buffer.front_reader());
+        Gosu::File file(filename);
+        OggFile ogg_file(file.front_reader());
         data.reset(new SampleData(ogg_file));
     }
     else {
@@ -197,8 +197,19 @@ Gosu::Sample::Sample(Reader reader)
         data.reset(new SampleData(ogg_file));
     }
     else {
-        WAVE_FILE audio_file(reader);
-        data.reset(new SampleData(audio_file));
+        try {
+            WAVE_FILE audio_file(reader);
+            data.reset(new SampleData(audio_file));
+        }
+        catch (const std::runtime_error& ex) {
+            if (std::string(ex.what()).find("unknown format") != std::string::npos) {
+                MPEGFile mpeg_file(reader);
+                data.reset(new SampleData(mpeg_file));
+            }
+            else {
+                throw ex;
+            }
+        }
     }
     
     CONSTRUCTOR_END;
@@ -221,7 +232,6 @@ Gosu::SampleInstance Gosu::Sample::play_pan(double pan, double volume, double sp
                                                                    channel_and_token.second);
     assert (source != ALChannelManagement::NO_SOURCE);
     alSourcei(source, AL_BUFFER, data->buffer);
-    // TODO: This is not the old panning behavior!
     alSource3f(source, AL_POSITION, pan * 10, 0, 0);
     alSourcef(source, AL_GAIN, volume);
     alSourcef(source, AL_PITCH, speed);
@@ -281,7 +291,7 @@ public:
         player = [[AVAudioPlayer alloc] initWithContentsOfURL:URL error:nil];
     }
     
-    void play(bool looping)
+    void play(bool looping) override
     {
         if (paused()) {
             stop();
@@ -290,28 +300,28 @@ public:
         [player play];
     }
     
-    void pause()
+    void pause() override
     {
         [player pause];
     }
     
-    void resume()
+    void resume() override
     {
         [player play];
     }
     
-    bool paused() const
+    bool paused() const override
     {
         return !player.playing;
     };
     
-    void stop()
+    void stop() override
     {
         [player stop];
         player.currentTime = 0;
     }
     
-    void update()
+    void update() override
     {
     }
 };
@@ -323,7 +333,7 @@ class Gosu::Song::StreamData : public BaseData
     std::unique_ptr<AudioFile> file;
     ALuint buffers[2];
     
-    void apply_volume()
+    void apply_volume() override
     {
         int source = lookup_source();
         if (source != ALChannelManagement::NO_SOURCE) {
@@ -360,7 +370,15 @@ public:
             file.reset(new OggFile(source_file.front_reader()));
         }
         else {
-            file.reset(new WAVE_FILE(filename));
+            try {
+                file.reset(new WAVE_FILE(filename));
+            }
+            catch (const std::runtime_error& ex) {
+                if (std::string(ex.what()).find("unknown format") != std::string::npos) {
+                    Gosu::File source_file(filename);
+                    file.reset(new MPEGFile(source_file.front_reader()));
+                }
+            }
         }
         alGenBuffers(2, buffers);
     }
@@ -371,7 +389,14 @@ public:
             file.reset(new OggFile(reader));
         }
         else {
-            file.reset(new WAVE_FILE(reader));
+            try {
+                file.reset(new WAVE_FILE(reader));
+            }
+            catch (const std::runtime_error& ex) {
+                if (std::string(ex.what()).find("unknown format") != std::string::npos) {
+                    file.reset(new MPEGFile(reader));
+                }
+            }
         }
         alGenBuffers(2, buffers);
     }
@@ -383,7 +408,7 @@ public:
         }
     }
     
-    void play(bool looping)
+    void play(bool looping) override
     {
         int source = lookup_source();
         if (source != ALChannelManagement::NO_SOURCE) {
@@ -402,7 +427,7 @@ public:
         }
     }
 
-    void stop()
+    void stop() override
     {
         int source = lookup_source();
         if (source != ALChannelManagement::NO_SOURCE) {
@@ -422,7 +447,7 @@ public:
         file->rewind();
     }
     
-    void pause()
+    void pause() override
     {
         int source = lookup_source();
         if (source != ALChannelManagement::NO_SOURCE) {
@@ -430,7 +455,7 @@ public:
         }
     }
     
-    void resume()
+    void resume() override
     {
         int source = lookup_source();
         if (source != ALChannelManagement::NO_SOURCE) {
@@ -438,7 +463,7 @@ public:
         }
     }
     
-    bool paused() const
+    bool paused() const override
     {
         int source = lookup_source();
         if (source == ALChannelManagement::NO_SOURCE) {
@@ -449,7 +474,7 @@ public:
         return state == AL_PAUSED;
     }
     
-    void update()
+    void update() override
     {
         int source = lookup_source();
 

data/src/AudioToolboxFile.hpp

@@ -175,7 +175,7 @@ namespace Gosu
             init();
         }
         
-        ~AudioToolboxFile()
+        ~AudioToolboxFile() override
         {
             ExtAudioFileDispose(file_);
 
@@ -184,22 +184,22 @@ namespace Gosu
             }
         }
         
-        ALenum format() const
+        ALenum format() const override
         {
             return format_;
         }
         
-        ALuint sample_rate() const
+        ALuint sample_rate() const override
         {
             return sample_rate_;
         }
         
-        void rewind()
+        void rewind() override
         {
             CHECK_OS(ExtAudioFileSeek(file_, 0 + seek_offset_));
         }
         
-        std::size_t read_data(void* dest, size_t length)
+        std::size_t read_data(void* dest, size_t length) override
         {
             AudioBufferList abl;
             abl.mNumberBuffers = 1;

data/src/Color.cpp

@@ -14,21 +14,25 @@ namespace
         
         double min = std::min(std::min(r, g), b);
         double max = std::max(std::max(r, g), b);
+        double delta = max - min;
 
         if (max == 0) {
             HSV hsv = { 0, 0, 0 };
             return hsv;
         }
         
+        HSV hsv;
+
         // Value.
-        HSV hsv = { -1, -1, max };
+        hsv.v = max;
         
         // Saturation.
-        double delta = max - min;
         hsv.s = delta / max;
         
         // Hue.
-        if (r == max) {
+        if (delta == 0) {
+            hsv.h = 0;
+        } else if (r == max) {
             hsv.h = (g - b) / delta + (g < b ? 6 : 0);
         }
         else if (g == max) {
@@ -55,8 +59,11 @@ Gosu::Color Gosu::Color::from_ahsv(Channel alpha, double h, double s, double v)
         return Color(alpha, v * 255, v * 255, v * 255);
     }
     
-    // Normalize hue
+    // Normalize hue so that is always in the [0, 360) range and wraps around.
     h = normalize_angle(h);
+    // Clamp s and v for consistency with the Ruby/Gosu ARGB getters/setters.
+    s = clamp(s, 0.0, 1.0);
+    v = clamp(v, 0.0, 1.0);
     
     int sector       = h / 60;
     double factorial = h / 60 - sector;

data/src/Input.cpp

@@ -10,42 +10,62 @@
 #include <algorithm>
 #include <array>
 
-namespace
+static void require_sdl_video()
 {
-    void cleanup();
-
-    void require_sdl_video()
-    {
-        static bool initialized = false;
-        if (!initialized) {
-            SDL_InitSubSystem(SDL_INIT_VIDEO);
-            initialized = true;
-            std::atexit(cleanup);
-        }
-    }
-    
-    void cleanup()
-    {
-        SDL_QuitSubSystem(SDL_INIT_VIDEO);
+    static bool initialized = false;
+    if (!initialized) {
+        SDL_InitSubSystem(SDL_INIT_VIDEO);
+        initialized = true;
+        std::atexit([] { SDL_QuitSubSystem(SDL_INIT_VIDEO); });
     }
-
-    std::array<bool, Gosu::NUM_BUTTONS> button_states = { { false } };
 }
+    
+static std::array<bool, Gosu::NUM_BUTTONS> button_states = { { false } };
 
 struct Gosu::Input::Impl
 {
     Input& input;
     SDL_Window* window;
-    TextInput* text_input;
+    
+    TextInput* text_input = nullptr;
     double mouse_x, mouse_y;
-    double mouse_scale_x, mouse_scale_y;
-    double mouse_offset_x, mouse_offset_y;
+    double mouse_scale_x = 1;
+    double mouse_scale_y = 1;
+    double mouse_offset_x = 0;
+    double mouse_offset_y = 0;
     
     Impl(Input& input, SDL_Window* window)
-    : input(input), window(window), text_input(nullptr)
+    : input(input), window(window)
+    {
+        require_sdl_video();
+        
+        SDL_InitSubSystem(SDL_INIT_GAMECONTROLLER);
+        
+        int num_gamepads = std::min<int>(Gosu::NUM_GAMEPADS, SDL_NumJoysticks());
+        
+        for (int i = 0; i < num_gamepads; ++i) {
+            // Prefer the SDL_GameController API...
+            if (SDL_IsGameController(i)) {
+                if (SDL_GameController* game_controller = SDL_GameControllerOpen(i)) {
+                    game_controllers.push_back(game_controller);
+                    continue;
+                }
+            }
+            // ...but fall back on the good, old SDL_Joystick API.
+            if (SDL_Joystick* joystick = SDL_JoystickOpen(i)) {
+                joysticks.push_back(joystick);
+            }
+        }
+    }
+    
+    ~Impl()
     {
-        mouse_scale_x = mouse_scale_y = 1;
-        mouse_offset_x = mouse_offset_y = 0;
+        std::for_each(joysticks.begin(), joysticks.end(), &SDL_JoystickClose);
+        joysticks.clear();
+        std::for_each(game_controllers.begin(), game_controllers.end(), &SDL_GameControllerClose);
+        game_controllers.clear();
+        
+        SDL_QuitSubSystem(SDL_INIT_GAMECONTROLLER);
     }
     
     void update_mouse_position()
@@ -83,59 +103,40 @@ struct Gosu::Input::Impl
     #endif
     }
     
-    void enqueue_event(int id, bool down)
-    {
-        event_queue.push_back(down ? id : ~id);
-    }
-    
-    void dispatch_enqueued_events()
+    bool feed_sdl_event(const SDL_Event* e)
     {
-        for (int event : event_queue) {
-            bool down = (event >= 0);
-            Button button(down ? event : ~event);
-            
-            button_states[button.id()] = down;
-            if (down && input.on_button_down) {
-                input.on_button_down(button);
-            }
-            else if (!down && input.on_button_up) {
-                input.on_button_up(button);
+        switch (e->type) {
+            case SDL_KEYDOWN:
+            case SDL_KEYUP: {
+                if (e->key.repeat == 0 && e->key.keysym.scancode <= KB_RANGE_END) {
+                    enqueue_event(e->key.keysym.scancode, e->type == SDL_KEYDOWN);
+                    return true;
+                }
+                break;
             }
-        }
-        event_queue.clear();
-    }
-    
-    void initialize_gamepads()
-    {
-        SDL_InitSubSystem(SDL_INIT_GAMECONTROLLER);
-
-        int num_gamepads = std::min<int>(Gosu::NUM_GAMEPADS, SDL_NumJoysticks());
-        
-        for (int i = 0; i < num_gamepads; ++i) {
-            // Prefer the SDL_GameController API...
-            if (SDL_IsGameController(i)) {
-                SDL_GameController* game_controller = SDL_GameControllerOpen(i);
-                if (game_controller) {
-                    game_controllers.push_back(game_controller);
-                    continue;
+            case SDL_MOUSEBUTTONDOWN:
+            case SDL_MOUSEBUTTONUP: {
+                if (e->button.button >= 1 && e->button.button <= 3) {
+                    enqueue_event(MS_LEFT + e->button.button - 1, e->type == SDL_MOUSEBUTTONDOWN);
+                    return true;
                 }
+                break;
             }
-            // ...but fall back on the good, old SDL_Joystick API :)
-            SDL_Joystick* joystick = SDL_JoystickOpen(i);
-            if (joystick) {
-                joysticks.push_back(joystick);
+            case SDL_MOUSEWHEEL: {
+                if (e->wheel.y > 0) {
+                    enqueue_event(MS_WHEEL_UP, true);
+                    enqueue_event(MS_WHEEL_UP, false);
+                    return true;
+                }
+                else if (e->wheel.y < 0) {
+                    enqueue_event(MS_WHEEL_DOWN, true);
+                    enqueue_event(MS_WHEEL_DOWN, false);
+                    return true;
+                }
+                break;
             }
         }
-    }
-    
-    void release_gamepads()
-    {
-        std::for_each(joysticks.begin(), joysticks.end(), &SDL_JoystickClose);
-        joysticks.clear();
-        std::for_each(game_controllers.begin(), game_controllers.end(), &SDL_GameControllerClose);
-        game_controllers.clear();
-        
-        SDL_QuitSubSystem(SDL_INIT_GAMECONTROLLER);
+        return false;
     }
     
     typedef std::array<bool, GP_NUM_PER_GAMEPAD> GamepadBuffer;
@@ -192,17 +193,38 @@ struct Gosu::Input::Impl
         }
     }
     
+    void dispatch_enqueued_events()
+    {
+        for (int event : event_queue) {
+            bool down = (event >= 0);
+            Button button(down ? event : ~event);
+            
+            button_states[button.id()] = down;
+            if (down && input.on_button_down) {
+                input.on_button_down(button);
+            }
+            else if (!down && input.on_button_up) {
+                input.on_button_up(button);
+            }
+        }
+        event_queue.clear();
+    }
+    
 private:
     // For button down event: Button name value (>= 0)
     // For button up event: ~Button name value (< 0)
     std::vector<int> event_queue;
+
+    void enqueue_event(int id, bool down)
+    {
+        event_queue.push_back(down ? id : ~id);
+    }
     
     std::vector<SDL_Joystick*> joysticks;
     std::vector<SDL_GameController*> game_controllers;
     
-    // SDL returns axis values in the range -2^15 through 2^15-1, so we consider
-    // -2^14 through 2^14 the dead zone.
-    
+    // SDL returns axis values in the range -2^15 through 2^15-1, so we consider -2^14 through
+    // 2^14 (half of that range) the dead zone.
     enum { DEAD_ZONE = (1 << 14) };
     
     void poll_game_controller(SDL_GameController* controller, GamepadBuffer& gamepad)
@@ -228,7 +250,7 @@ private:
             SDL_GameControllerGetAxis(controller, SDL_CONTROLLER_AXIS_RIGHTY) > +DEAD_ZONE;
         
         int button = 0;
-        for (button; button < SDL_CONTROLLER_BUTTON_DPAD_UP; ++button) {
+        for (; button < SDL_CONTROLLER_BUTTON_DPAD_UP; ++button) {
             gamepad[GP_BUTTON_0 + button - GP_RANGE_BEGIN] =
                 SDL_GameControllerGetButton(controller, (SDL_GameControllerButton) button);
         }
@@ -241,47 +263,27 @@ private:
     void poll_joystick(SDL_Joystick* joystick, GamepadBuffer& gamepad)
     {
         int axes = SDL_JoystickNumAxes(joystick);
-        int hats = SDL_JoystickNumHats(joystick);
-        int buttons = std::min<int>(GP_NUM_PER_GAMEPAD - 4, SDL_JoystickNumButtons(joystick));
-        
         for (int axis = 0; axis < axes; ++axis) {
             Sint16 value = SDL_JoystickGetAxis(joystick, axis);
             
             if (value < -DEAD_ZONE) {
-                if (axis % 2 == 0) {
-                    gamepad[GP_LEFT - GP_RANGE_BEGIN] = true;
-                }
-                else {
-                    gamepad[GP_UP - GP_RANGE_BEGIN] = true;
-                }
+                gamepad[(axis % 2 ? GP_UP   : GP_LEFT)  - GP_RANGE_BEGIN] = true;
             }
             else if (value > +DEAD_ZONE) {
-                if (axis % 2 == 0) {
-                    gamepad[GP_RIGHT - GP_RANGE_BEGIN] = true;
-                }
-                else {
-                    gamepad[GP_DOWN - GP_RANGE_BEGIN] = true;
-                }
+                gamepad[(axis % 2 ? GP_DOWN : GP_RIGHT) - GP_RANGE_BEGIN] = true;
             }
         }
         
+        int hats = SDL_JoystickNumHats(joystick);
         for (int hat = 0; hat < hats; ++hat) {
             Uint8 value = SDL_JoystickGetHat(joystick, hat);
-            
-            if (value & SDL_HAT_LEFT) {
-                gamepad[GP_LEFT - GP_RANGE_BEGIN] = true;
-            }
-            if (value & SDL_HAT_RIGHT) {
-                gamepad[GP_RIGHT - GP_RANGE_BEGIN] = true;
-            }
-            if (value & SDL_HAT_UP) {
-                gamepad[GP_UP - GP_RANGE_BEGIN] = true;
-            }
-            if (value & SDL_HAT_DOWN) {
-                gamepad[GP_DOWN - GP_RANGE_BEGIN] = true;
-            }
+            if (value & SDL_HAT_LEFT)  gamepad[GP_LEFT  - GP_RANGE_BEGIN] = true;
+            if (value & SDL_HAT_RIGHT) gamepad[GP_RIGHT - GP_RANGE_BEGIN] = true;
+            if (value & SDL_HAT_UP)    gamepad[GP_UP    - GP_RANGE_BEGIN] = true;
+            if (value & SDL_HAT_DOWN)  gamepad[GP_DOWN  - GP_RANGE_BEGIN] = true;
         }
         
+        int buttons = std::min<int>(GP_NUM_PER_GAMEPAD - 4, SDL_JoystickNumButtons(joystick));
         for (int button = 0; button < buttons; ++button) {
             if (SDL_JoystickGetButton(joystick, button)) {
                 gamepad[GP_BUTTON_0 + button - GP_RANGE_BEGIN] = true;
@@ -293,56 +295,16 @@ private:
 Gosu::Input::Input(void* window)
 : pimpl(new Impl(*this, (SDL_Window*)window))
 {
-    require_sdl_video();
-    
-    pimpl->initialize_gamepads();
 }
 
 Gosu::Input::~Input()
 {
-    pimpl->release_gamepads();
 }
 
 bool Gosu::Input::feed_sdl_event(void* event)
 {
-    const SDL_Event* e = static_cast<SDL_Event*>(event);
-    
-    if (pimpl->text_input && pimpl->text_input->feed_sdl_event(event)) {
-        return true;
-    }
-    
-    switch (e->type) {
-    case SDL_KEYDOWN:
-    case SDL_KEYUP: {
-        if (e->key.repeat == 0 && e->key.keysym.scancode <= KB_RANGE_END) {
-            pimpl->enqueue_event(e->key.keysym.scancode, e->type == SDL_KEYDOWN);
-            return true;
-        }
-        break;
-    }
-    case SDL_MOUSEBUTTONDOWN:
-    case SDL_MOUSEBUTTONUP: {
-        if (e->button.button >= 1 && e->button.button <= 3) {
-            pimpl->enqueue_event(MS_LEFT + e->button.button - 1, e->type == SDL_MOUSEBUTTONDOWN);
-            return true;
-        }
-        break;
-    }
-    case SDL_MOUSEWHEEL: {
-        if (e->wheel.y > 0) {
-            pimpl->enqueue_event(MS_WHEEL_UP, true);
-            pimpl->enqueue_event(MS_WHEEL_UP, false);
-            return true;
-        }
-        else if (e->wheel.y < 0) {
-            pimpl->enqueue_event(MS_WHEEL_DOWN, true);
-            pimpl->enqueue_event(MS_WHEEL_DOWN, false);
-            return true;
-        }
-        break;
-    }
-    }
-    return false;
+    return (pimpl->text_input && pimpl->text_input->feed_sdl_event(event)) ||
+        pimpl->feed_sdl_event(static_cast<SDL_Event*>(event));
 }
 
 std::string Gosu::Input::id_to_char(Button btn)
@@ -366,7 +328,7 @@ std::string Gosu::Input::id_to_char(Button btn)
     // Convert to lower case to be consistent with previous versions of Gosu.
     // German umlauts are already reported in lower-case by SDL, anyway.
     // (This should handle Turkish i/I just fine because it uses the current locale.)
-    wname[0] = (wchar_t)std::towlower((int)wname[0]);
+    wname[0] = (wchar_t) std::towlower((int) wname[0]);
     return wstring_to_utf8(wname);
 }
 
@@ -411,7 +373,7 @@ void Gosu::Input::set_mouse_factors(double scale_x, double scale_y,
 
 const Gosu::Touches& Gosu::Input::current_touches() const
 {
-    // Note: We can actually use the SDL's touch API to implement this, even on macOS! Neat.
+    // We could use the SDL 2 touch API to implement this.
     
     static Gosu::Touches none;
     return none;
@@ -435,8 +397,8 @@ double Gosu::Input::accelerometer_z() const
 void Gosu::Input::update()
 {
     pimpl->update_mouse_position();
-    pimpl->dispatch_enqueued_events();
     pimpl->poll_gamepads();
+    pimpl->dispatch_enqueued_events();
 }
 
 Gosu::TextInput* Gosu::Input::text_input() const

data/src/MPEGFile.hpp

@@ -0,0 +1,90 @@
+#pragma once
+
+#include "AudioFile.hpp"
+#include <Gosu/IO.hpp>
+#include <algorithm>
+#include <stdexcept>
+#include <string>
+
+#include <mpg123.h>
+
+namespace Gosu
+{
+    class MPEGFile : public AudioFile
+    {
+        Gosu::Buffer contents_;
+        off_t position_ = 0;
+        mpg123_handle* handle_;
+        
+        enum {
+            SAMPLE_RATE = 44100,
+            INPUT_SIZE = 16384
+        };
+        
+    public:
+        MPEGFile(Gosu::Reader reader)
+        {
+            contents_.resize(reader.resource().size() - reader.position());
+            reader.read(contents_.data(), contents_.size());
+
+            static int init_error = mpg123_init();
+            if (init_error != MPG123_OK) {
+                throw std::runtime_error("Cannot initialize mpg123: " +
+                                         std::string(mpg123_plain_strerror(init_error)));
+            }
+
+            int new_error;
+            handle_ = mpg123_new(nullptr, &new_error);
+            if (handle_ == nullptr) {
+                throw std::runtime_error("Cannot initialize mpg123 decoder: " +
+                                         std::string(mpg123_plain_strerror(new_error)));
+            }
+            
+            mpg123_param(handle_, MPG123_FORCE_RATE, SAMPLE_RATE, 0);
+            mpg123_param(handle_, MPG123_FLAGS, MPG123_FORCE_STEREO, 0);
+            
+            mpg123_open_feed(handle_);
+        }
+        
+        ~MPEGFile() override
+        {
+            mpg123_delete(handle_);
+        }
+        
+        ALenum format() const override
+        {
+            return AL_FORMAT_STEREO16;
+        }
+        
+        ALuint sample_rate() const override
+        {
+            return SAMPLE_RATE;
+        }
+        
+        std::size_t read_data(void* dest, std::size_t length) override
+        {
+            std::size_t written = 0;
+            int error = 0;
+            
+            error = mpg123_read(handle_, static_cast<unsigned char*>(dest), length, &written);
+            while (written == 0
+                   && (error == MPG123_NEED_MORE || error == MPG123_NEW_FORMAT)
+                   && position_ != contents_.size()) {
+                auto bytes = std::min<std::size_t>(contents_.size() - position_, INPUT_SIZE);
+                // (Not sure what to do about the return value of mpg123_feed here.)
+                mpg123_feed(handle_, static_cast<unsigned char*>(contents_.data()) + position_,
+                            bytes);
+                position_ += bytes;
+                error = mpg123_read(handle_, static_cast<unsigned char*>(dest), length, &written);
+            }
+            
+            return written;
+        }
+        
+        void rewind() override
+        {
+            mpg123_feedseek(handle_, 0, SEEK_SET, &position_);
+            assert (position_ >= 0 && position_ <= contents_.size());
+        }
+    };
+}

data/src/Macro.hpp

@@ -18,7 +18,7 @@ public:
     
     void draw(double x1, double y1, Color c1, double x2, double y2, Color c2,
         double x3, double y3, Color c3, double x4, double y4, Color c4, ZPos z,
-        AlphaMode mode) const;
+        AlphaMode mode) const override;
     
     const Gosu::GLTexInfo* gl_tex_info() const override;
     

data/src/OggFile.hpp

@@ -2,33 +2,34 @@
 
 #include "AudioFile.hpp"
 #include <Gosu/IO.hpp>
-#include <algorithm>
 #include <stdexcept>
 #include <string>
 
 #define STB_VORBIS_HEADER_ONLY
 #include "stb_vorbis.c"
 
-// Based on the Drama Sound Engine for D
-
 namespace Gosu
 {
     class OggFile : public AudioFile
     {
         Gosu::Buffer contents_;
-        Gosu::Buffer buffer_;
         int channels_;
         ALenum sample_rate_;
         stb_vorbis* stream_;
 
-        void open()
+    public:
+        OggFile(Gosu::Reader reader)
         {
+            contents_.resize(reader.resource().size() - reader.position());
+            reader.read(contents_.data(), contents_.size());
+            
             int error = 0;
             
-            const unsigned char* mem = static_cast<const unsigned char*>(contents_.data());
-            stream_ = stb_vorbis_open_memory(mem, contents_.size(), &error, 0);
+            auto data = static_cast<const unsigned char*>(contents_.data());
+            auto size = static_cast<int>(contents_.size());
+            stream_ = stb_vorbis_open_memory(data, size, &error, 0);
             
-            if (stream_ == 0) {
+            if (stream_ == nullptr) {
                 throw std::runtime_error("Cannot open Ogg Vorbis file, error code: " +
                                          std::to_string(error));
             }
@@ -36,43 +37,28 @@ namespace Gosu
             stb_vorbis_info info = stb_vorbis_get_info(stream_);
             channels_ = info.channels;
             sample_rate_ = info.sample_rate;
-            buffer_.resize(info.temp_memory_required);
         }
         
-        void close()
+        ~OggFile() override
         {
             stb_vorbis_close(stream_);
-            stream_ = 0;
-        }
-        
-    public:
-        OggFile(Gosu::Reader reader)
-        {
-            contents_.resize(reader.resource().size() - reader.position());
-            reader.read(contents_.data(), contents_.size());
-            
-            open();
-        }
-        
-        ~OggFile()
-        {
-            close();
+            stream_ = nullptr;
         }
         
-        ALenum format() const
+        ALenum format() const override
         {
             return (channels_ == 1 ? AL_FORMAT_MONO16 : AL_FORMAT_STEREO16);
         }
         
-        ALuint sample_rate() const
+        ALuint sample_rate() const override
         {
             return sample_rate_;
         }
         
-        std::size_t read_data(void* dest, std::size_t length)
+        std::size_t read_data(void* dest, std::size_t length) override
         {
             int samples = 0;
-            int max_samples = length / sizeof(short);
+            int max_samples = static_cast<int>(length / sizeof(short));
             
             while (samples < max_samples) {
                 int samples_per_channel =
@@ -88,7 +74,7 @@ namespace Gosu
             return samples * sizeof(short);
         }
         
-        void rewind()
+        void rewind() override
         {
             stb_vorbis_seek_start(stream_);
         }

data/src/RubyGosu.cxx

@@ -3342,6 +3342,15 @@ void SwigDirector_Window::button_up(Gosu::Button arg0) {
 }
 
 
+void SwigDirector_Window::drop(std::string const &filename) {
+  VALUE obj0 = Qnil ;
+  VALUE SWIGUNUSED result;
+  
+  obj0 = SWIG_From_std_string(static_cast< std::string >(filename));
+  result = rb_funcall(swig_get_self(), rb_intern("drop"), 1,obj0);
+}
+
+
 SWIGINTERN VALUE
 _wrap_milliseconds(int argc, VALUE *argv, VALUE self) {
   unsigned long result;
@@ -9571,6 +9580,62 @@ fail:
 }
 
 
+SWIGINTERN VALUE
+_wrap_Window_drop(int argc, VALUE *argv, VALUE self) {
+  Gosu::Window *arg1 = (Gosu::Window *) 0 ;
+  std::string *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int res2 = SWIG_OLDOBJ ;
+  Swig::Director *director = 0;
+  bool upcall = false;
+  
+  if ((argc < 1) || (argc > 1)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",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 *","drop", 1, self )); 
+  }
+  arg1 = reinterpret_cast< Gosu::Window * >(argp1);
+  {
+    std::string *ptr = (std::string *)0;
+    res2 = SWIG_AsPtr_std_string(argv[0], &ptr);
+    if (!SWIG_IsOK(res2)) {
+      SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "std::string const &","drop", 2, argv[0] )); 
+    }
+    if (!ptr) {
+      SWIG_exception_fail(SWIG_ValueError, Ruby_Format_TypeError("invalid null reference ", "std::string const &","drop", 2, argv[0])); 
+    }
+    arg2 = ptr;
+  }
+  director = dynamic_cast<Swig::Director *>(arg1);
+  upcall = (director && (director->swig_get_self() == self));
+  try {
+    {
+      try {
+        if (upcall) {
+          (arg1)->Gosu::Window::drop((std::string const &)*arg2);
+        } else {
+          (arg1)->drop((std::string const &)*arg2);
+        }
+      }
+      catch (const std::exception& e) {
+        SWIG_exception(SWIG_RuntimeError, e.what());
+      }
+    }
+  } catch (Swig::DirectorException& e) {
+    rb_exc_raise(e.getError());
+    SWIG_fail;
+  }
+  if (SWIG_IsNewObj(res2)) delete arg2;
+  return Qnil;
+fail:
+  if (SWIG_IsNewObj(res2)) delete arg2;
+  return Qnil;
+}
+
+
 SWIGINTERN VALUE
 _wrap_Window_widthe___(int argc, VALUE *argv, VALUE self) {
   Gosu::Window *arg1 = (Gosu::Window *) 0 ;
@@ -11574,7 +11639,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 >(3)));
+  rb_define_const(mGosu, "POINT_VERSION", SWIG_From_int(static_cast< int >(4)));
   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);
@@ -11985,6 +12050,7 @@ SWIGEXPORT void Init_gosu(void) {
   rb_define_method(SwigClassWindow.klass, "release_memory", VALUEFUNC(_wrap_Window_release_memory), -1);
   rb_define_method(SwigClassWindow.klass, "button_down", VALUEFUNC(_wrap_Window_button_down), -1);
   rb_define_method(SwigClassWindow.klass, "button_up", VALUEFUNC(_wrap_Window_button_up), -1);
+  rb_define_method(SwigClassWindow.klass, "drop", VALUEFUNC(_wrap_Window_drop), -1);
   rb_define_method(SwigClassWindow.klass, "width=", VALUEFUNC(_wrap_Window_widthe___), -1);
   rb_define_method(SwigClassWindow.klass, "height=", VALUEFUNC(_wrap_Window_heighte___), -1);
   rb_define_method(SwigClassWindow.klass, "fullscreen=", VALUEFUNC(_wrap_Window_fullscreene___), -1);

data/src/RubyGosu.h

@@ -41,6 +41,7 @@ public:
     virtual void release_memory();
     virtual void button_down(Gosu::Button arg0);
     virtual void button_up(Gosu::Button arg0);
+    virtual void drop(std::string const &filename);
 };
 
 

data/src/SndFile.hpp

@@ -137,14 +137,14 @@ namespace Gosu
             }
         }
         
-        ~SndFile()
+        ~SndFile() override
         {
             if (file) {
                 sf_close(file);
             }
         }
         
-        ALenum format() const
+        ALenum format() const override
         {
             switch (info.channels) {
             case 1:
@@ -156,18 +156,18 @@ namespace Gosu
             };
         }
         
-        ALuint sample_rate() const
+        ALuint sample_rate() const override
         {
             return info.samplerate;
         }
         
-        std::size_t read_data(void* dest, std::size_t length)
+        std::size_t read_data(void* dest, std::size_t length) override
         {
             int frame_size = sizeof(short) * info.channels;
             return sf_readf_short(file, (short*)dest, length / frame_size) * frame_size;
         }
         
-        void rewind()
+        void rewind() override
         {
             sf_seek(file, 0, SEEK_SET);
         }

data/src/Window.cpp

@@ -43,6 +43,7 @@ namespace Gosu
             if (window == nullptr) {
                 throw_sdl_error("Could not create window");
             }
+            SDL_EventState(SDL_DROPFILE, SDL_ENABLE);
         }
         return window;
     }
@@ -253,11 +254,22 @@ bool Gosu::Window::tick()
     
     SDL_Event e;
     while (SDL_PollEvent(&e)) {
-        if (e.type == SDL_QUIT) {
-            close();
-        }
-        else {
-            input().feed_sdl_event(&e);
+        switch (e.type) {
+            case (SDL_QUIT): {
+                close();
+                break;
+            }
+            case (SDL_DROPFILE): {
+                char* dropped_filedir = e.drop.file;      
+                if (dropped_filedir == nullptr) break;
+                drop(std::string(dropped_filedir));
+                SDL_free(dropped_filedir);
+                break;
+            }
+            default: {
+                input().feed_sdl_event(&e);
+                break;
+            }
         }
     }
     
@@ -306,7 +318,7 @@ void Gosu::Window::button_down(Button button)
         !Input::down(KB_LEFT_SHIFT) && !Input::down(KB_RIGHT_SHIFT) &&
         !Input::down(KB_LEFT_ALT) && !Input::down(KB_RIGHT_ALT);
 #else
-    // alt+enter and alt+return toggle fullscreen mode on all other platforms.
+    // Alt+Enter and Alt+Return toggle fullscreen mode on all other platforms.
     toggle_fullscreen = (button == KB_RETURN || button == KB_ENTER) &&
         (Input::down(KB_LEFT_ALT) || Input::down(KB_RIGHT_ALT)) &&
         !Input::down(KB_LEFT_CONTROL) && !Input::down(KB_RIGHT_CONTROL) &&

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gosu
 version: !ruby/object:Gem::Version
-  version: 0.11.3.1
+  version: 0.11.4.pre1
 platform: ruby
 authors:
 - Julian Raschke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-26 00:00:00.000000000 Z
+date: 2017-04-04 00:00:00.000000000 Z
 dependencies: []
 description: |2
       2D game development library.
@@ -95,6 +95,7 @@ files:
 - src/Inspection.cpp
 - src/LargeImageData.cpp
 - src/LargeImageData.hpp
+- src/MPEGFile.hpp
 - src/Macro.cpp
 - src/Macro.hpp
 - src/Math.cpp
@@ -151,9 +152,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: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.8