gosu 0.14.6.pre1 → 1.0.0.pre2

data/include/Gosu/Sample.h

@@ -0,0 +1,19 @@
+#pragma once
+
+#include <Gosu/Channel.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct Gosu_Sample Gosu_Sample;
+
+Gosu_Sample* Gosu_Sample_create(const char* filename);
+void Gosu_Sample_destroy(Gosu_Sample* sample);
+
+Gosu_Channel* Gosu_Sample_play(Gosu_Sample *sample, double volume, double speed, bool looping);
+Gosu_Channel* Gosu_Sample_play_pan(Gosu_Sample *sample, double pan, double volume, double speed, bool looping);
+
+#ifdef __cplusplus
+}
+#endif

data/include/Gosu/Song.h

@@ -0,0 +1,24 @@
+#pragma once
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct Gosu_Song Gosu_Song;
+
+Gosu_Song* Gosu_Song_create(const char* filename);
+void Gosu_Song_destroy(Gosu_Song* song);
+
+void Gosu_Song_pause(Gosu_Song* song);
+bool Gosu_Song_paused(Gosu_Song* song);
+void Gosu_Song_play(Gosu_Song* song, bool looping);
+bool Gosu_Song_playing(Gosu_Song* song);
+void Gosu_Song_stop(Gosu_Song* song);
+double Gosu_Song_volume(Gosu_Song* song);
+void Gosu_Song_set_volume(Gosu_Song* song, double volume);
+
+Gosu_Song* Gosu_Song_current_song();
+
+#ifdef __cplusplus
+}
+#endif

data/include/Gosu/TextInput.h

@@ -0,0 +1,30 @@
+#pragma once
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct Gosu_TextInput Gosu_TextInput;
+
+Gosu_TextInput* Gosu_TextInput_create();
+
+const char* Gosu_TextInput_text(Gosu_TextInput* text_input);
+void Gosu_TextInput_set_text(Gosu_TextInput* text_input, const char* text);
+
+unsigned Gosu_TextInput_caret_pos(Gosu_TextInput* text_input);
+void Gosu_TextInput_set_caret_pos(Gosu_TextInput* text_input, unsigned pos);
+
+unsigned Gosu_TextInput_selection_start(Gosu_TextInput* text_input);
+void Gosu_TextInput_set_selection_start(Gosu_TextInput* text_input, unsigned pos);
+
+void Gosu_TextInput_set_filter(Gosu_TextInput *text_input, void function(void* data, const char* text), void* data);
+void Gosu_TextInput_set_filter_result(Gosu_TextInput *text_input, const char* result);
+void Gosu_TextInput_insert_text(Gosu_TextInput *text_input, const char* text);
+void Gosu_TextInput_delete_backward(Gosu_TextInput *text_input);
+void Gosu_TextInput_delete_forward(Gosu_TextInput *text_input);
+
+void Gosu_TextInput_destroy(Gosu_TextInput* text_input);
+
+#ifdef __cplusplus
+}
+#endif

data/{Gosu → include/Gosu}/Utility.hpp

@@ -1,6 +1,3 @@
-//! \file Utility.hpp
-//! General purpose utility functions.
-
 #pragma once
 
 #include <string>
@@ -11,10 +8,24 @@ namespace Gosu
     
     //! Returns true if the filename has the given extension.
     //! The comparison is case-insensitive, but you must pass the extension in lower case.
-    bool has_extension(const std::string& filename, const char* extension);
+    bool has_extension(std::string_view filename, std::string_view extension);
     
     //! Returns the user's preferred language, at the moment of calling the function. Expect return
     //! 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/{Gosu → include/Gosu}/Version.hpp

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

data/include/Gosu/Window.h

@@ -0,0 +1,63 @@
+#pragma once
+#include <stdbool.h>
+#include "TextInput.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct Gosu_Window Gosu_Window;
+
+// Constructor
+Gosu_Window* Gosu_Window_create(int width, int height, bool fullscreen, double update_interval, bool resizable);
+
+// callbacks
+void Gosu_Window_set_update(Gosu_Window *window, void function(void *data), void* data);
+void Gosu_Window_set_draw(Gosu_Window *window, void function(void *data), void* data);
+void Gosu_Window_set_button_down(Gosu_Window *window, void function(void *data, unsigned btn), void* data);
+void Gosu_Window_set_button_up(Gosu_Window *window, void function(void *data, unsigned btn), void* data);
+void Gosu_Window_set_gamepad_connected(Gosu_Window *window, void function(void *data, int id), void* data);
+void Gosu_Window_set_gamepad_disconnected(Gosu_Window *window, void function(void *data, int id), void* data);
+void Gosu_Window_set_drop(Gosu_Window *window, void function(void *data, const char *filename), void* data);
+void Gosu_Window_set_needs_redraw(Gosu_Window *window, bool function(void *data), void* data);
+void Gosu_Window_set_needs_cursor(Gosu_Window *window, bool function(void *data), void* data);
+void Gosu_Window_set_close(Gosu_Window *window, void function(void *data), void* data);
+
+void Gosu_Window_default_button_down(Gosu_Window* window, unsigned btn);
+
+// Properties
+int Gosu_Window_width(Gosu_Window* window);
+int Gosu_Window_height(Gosu_Window* window);
+bool Gosu_Window_is_fullscreen(Gosu_Window* window);
+bool Gosu_Window_is_resizable(Gosu_Window* window);
+double Gosu_Window_update_interval(Gosu_Window* window);
+const char* Gosu_Window_caption(Gosu_Window* window);
+
+Gosu_TextInput* Gosu_Window_text_input(Gosu_Window *window);
+double Gosu_Window_mouse_x(Gosu_Window* window);
+double Gosu_Window_mouse_y(Gosu_Window* window);
+int Gosu_Window_is_button_down(Gosu_Window* window, unsigned btn);
+
+// Setters
+void Gosu_Window_set_text_input(Gosu_Window *window, Gosu_TextInput *text_input);
+void Gosu_Window_set_caption(Gosu_Window* window, const char* caption);
+void Gosu_Window_set_update_interval(Gosu_Window* window, double update_interval);
+void Gosu_Window_set_mouse_x(Gosu_Window* window, double width);
+void Gosu_Window_set_mouse_y(Gosu_Window* window, double height);
+void Gosu_Window_set_width(Gosu_Window* window, int width);
+void Gosu_Window_set_height(Gosu_Window* window, int height);
+
+void Gosu_Window_resize(Gosu_Window* window, int width, int height, bool fullscreen);
+
+// Main Loop
+void Gosu_Window_show(Gosu_Window* window);
+void Gosu_Window_close_immediately(Gosu_Window* window);
+bool Gosu_Window_tick(Gosu_Window* window);
+
+// Destructor
+void Gosu_Window_destroy(Gosu_Window* window);
+
+
+#ifdef __cplusplus
+}
+#endif

data/{Gosu → include/Gosu}/Window.hpp

@@ -1,6 +1,3 @@
-//! \file Window.hpp
-//! Interface of the Window class.
-
 #pragma once
 
 #include <Gosu/Fwd.hpp>
@@ -9,13 +6,6 @@
 #include <memory>
 #include <string>
 
-#ifdef GOSU_IS_WIN
-#ifndef NOMINMAX
-#define NOMINMAX
-#endif
-#include <windows.h>
-#endif
-
 namespace Gosu
 {
     //! Convenient all-in-one class that serves as the foundation of a standard Gosu application.
@@ -52,7 +42,7 @@ namespace Gosu
         //! Enters a modal loop where the Window is visible on screen and
         //! receives calls to draw, update etc.
         virtual void show();
-        
+
         //! EXPERIMENTAL - MAY DISAPPEAR WITHOUT WARNING.
         //! Performs a single main loop step.
         //! This method is only useful if you want to integrate Gosu with another library that has
@@ -62,7 +52,7 @@ namespace Gosu
         //! If you discard the return value and keep calling tick(), the window will be shown again,
         //! or keep being shown.
         virtual bool tick();
-        
+
         //! Closes the window if it is currently shown.
         //! 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.
@@ -71,24 +61,24 @@ namespace Gosu
         //! Called every update_interval milliseconds while the window is being shown.
         //! Your application's main game logic goes here.
         virtual void update() {}
-        
+
         //! Called after every update and when the OS wants the window to repaint itself.
         //! Your application's rendering code goes here.
         virtual void draw() {}
-        
+
         //! Gives the game a chance to say no to being redrawn.
         //! This is not a definitive answer. The operating system can still force the window to
         //! redraw itself.
         //! 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.
         virtual void lose_focus() {}
-        
+
         //! This function is called when the operating system's memory is low.
         //! So far, it is only called in iOS applications.
         virtual void release_memory() {}
@@ -99,10 +89,18 @@ namespace Gosu
         //! 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 when the user releases a button.
         virtual void button_up(Gosu::Button) {}
 
+        //! Called when a gamepad is connected.
+        //! \param index the index of the gamepad slot that the gamepad is in.
+        virtual void gamepad_connected(int index) {}
+
+        //! Called when a gamepad is disconnected.
+        //! \param index the index of the gamepad slot that the gamepad is in. The slot will be freed immediately after this callback.
+        virtual void gamepad_disconnected(int index) {}
+
         //! Called when a file is dropped onto the window.
         //! \param filename The filename of the dropped file. When multiple files are dropped, this
         //! method will be called several times.
@@ -115,14 +113,14 @@ namespace Gosu
         virtual void touch_moved(Touch touch) {}
         virtual void touch_ended(Touch touch) {}
         virtual void touch_cancelled(Touch touch) {}
-        
+
         const Graphics& graphics() const;
         Graphics& graphics();
-        
+
         const Input& input() const;
         Input& input();
         #endif
-        
+
         #ifdef GOSU_IS_IPHONE
         void* uikit_window() const;
         #endif
@@ -132,18 +130,18 @@ namespace Gosu
     //! \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);
-    
+
     //! 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);
-    
+
     //! 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);
-    
+
     //! 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

data/lib/gosu.rb

@@ -17,9 +17,6 @@ if RUBY_PLATFORM =~ /mswin$|mingw32|mingw64|win32\-|\-win32/
     path_encoding = ENV["PATH"].encoding
     ENV["PATH"] = "#{binary_path.encode(path_encoding)};#{ENV["PATH"]}"
   end
-  
-  # 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"]}"

data/lib/gosu/compat.rb

@@ -68,9 +68,14 @@ module Gosu
   end
 end
 
+# These were useful for working with Direct3D and the Win32 API a long time ago,
+# there was never a real reason to have them available in Ruby.
+Gosu.deprecate Gosu::Color, :bgr, :none
+Gosu.deprecate Gosu::Color, :abgr, :none
+
 # No need to pass a Window to Image.
 class Gosu::Image
-  alias initialize_without_window initialize
+  alias_method :initialize_without_window, :initialize
 
   def initialize(*args)
     if args[0].is_a? Gosu::Window
@@ -86,7 +91,7 @@ class Gosu::Image
   end
 
   class << self
-    alias from_text_without_window from_text
+    alias_method :from_text_without_window, :from_text
   end
 
   def self.from_text(*args)
@@ -105,7 +110,7 @@ end
 
 # No need to pass a Window to Sample.
 class Gosu::Sample
-  alias initialize_without_window initialize
+  alias_method :initialize_without_window, :initialize
 
   def initialize(*args)
     if args.first.is_a? Gosu::Window
@@ -118,7 +123,7 @@ end
 
 # No need to pass a Window to Song.
 class Gosu::Song
-  alias initialize_without_window initialize
+  alias_method :initialize_without_window, :initialize
 
   def initialize(*args)
     if args.first.is_a? Gosu::Window

data/lib/gosu/patches.rb

@@ -28,6 +28,12 @@ class Gosu::Font
 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)
@@ -54,7 +60,7 @@ module Gosu
     FUCHSIA = Gosu::ImmutableColor.new(0xff_ff00ff)
     CYAN    = Gosu::ImmutableColor.new(0xff_00ffff)
 
-    alias hash gl
+    alias_method :hash, :gl
     def eql?(other)
       gl == other.gl
     end
@@ -65,19 +71,10 @@ class Gosu::Window
   # Call Thread.pass every tick, which may or may not be necessary for friendly co-existence with
   # Ruby's Thread class.
 
-  alias _tick tick
+  alias_method :_tick, :tick
 
   def tick
     Thread.pass
     _tick
   end
 end
-
-# Release OpenAL resources during Ruby's shutdown, not Gosu's.
-at_exit do
-  begin
-    Gosu::Song.current_song.stop if Gosu::Song.current_song
-    Gosu._release_all_openal_resources
-  rescue
-  end
-end

data/lib/gosu/swig_patches.rb

@@ -3,7 +3,7 @@
 # compatible, but I just call protected_update etc. in the Ruby wrapper so I can add this
 # custom debugging help:
 class Gosu::Window
-  alias initialize_without_hash initialize
+  alias_method :initialize_without_hash, :initialize
 
   def initialize width, height, *args
     if args.empty? or args.first.is_a? Hash
@@ -19,7 +19,8 @@ class Gosu::Window
   end
 
   %w(update draw needs_redraw? needs_cursor?
-     lose_focus button_down button_up).each do |callback|
+     lose_focus button_down button_up
+     gamepad_connected gamepad_disconnected drop).each do |callback|
     define_method "protected_#{callback}" do |*args|
       begin
         # If there has been an exception, don't do anything as to not make matters worse.
@@ -40,14 +41,14 @@ class Gosu::Window
     $gosu_gl_blocks = nil
   end
   
-  alias show_internal show
+  alias_method :show_internal, :show
   def show
     show_internal
     # Try to format the message nicely, without any useless patching that we are
     # doing here.
     if defined? @_exception
       if @_exception.backtrace.is_a? Array and not @_exception.backtrace.frozen?
-        @_exception.backtrace.reject! { |line| line.include? 'lib/gosu/swig_patches.rb' }
+        @_exception.backtrace.reject! { |line| line.include? "lib/gosu/swig_patches.rb" }
       end
       raise @_exception
     end
@@ -68,7 +69,13 @@ module Gosu
   end
 end
 
-# SWIG will not let me rename my method to '[]=', so use alias here.
+# SWIG somehow maps the instance method "argb" as an overload of the class
+# method of the same name.
+class Gosu::Color
+  alias_method :argb, :to_i
+end
+
+# SWIG will not let me rename my method to '[]=', so use alias_method here.
 class Gosu::Font
-  alias []= set_image
+  alias_method :[]=, :set_image
 end