gosu 0.15.0 → 1.0.0

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,8 +2,8 @@
 
 #include <string>
 
-#define GOSU_MAJOR_VERSION 0
-#define GOSU_MINOR_VERSION 15
+#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/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.
@@ -78,12 +64,3 @@ class Gosu::Window
     _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/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

@@ -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.
@@ -47,7 +48,7 @@ class Gosu::Window
     # 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

data/rdoc/gosu.rb

@@ -32,6 +32,10 @@ module Gosu
   KB_DOWN = :an_integer
   KB_END = :an_integer
 
+  KB_PRINT_SCREEN = :an_integer
+  KB_SCROLL_LOCK = :an_integer
+  KB_PAUSE = :an_integer
+
   ##
   # This is the key on the numpad.
   KB_ENTER = :an_integer
@@ -71,6 +75,7 @@ module Gosu
   KB_RIGHT_SHIFT = :an_integer
   KB_SEMICOLON = :an_integer
   KB_SLASH = :an_integer
+  KB_CAPS_LOCK = :an_integer
   KB_SPACE = :an_integer
   KB_TAB = :an_integer
   KB_UP = :an_integer
@@ -83,12 +88,32 @@ module Gosu
   MS_OTHER_0…MS_OTHER_7 = :an_integer
 
   GP_BUTTON_0…GP_BUTTON_15 = :an_integer
+  GP_LEFT_STICK_X_AXIS = :an_integer
+  GP_RIGHT_STICK_X_AXIS = :an_integer
+  GP_LEFT_STICK_Y_AXIS = :an_integer
+  GP_RIGHT_STICK_Y_AXIS = :an_integer
+  GP_LEFT_TRIGGER_AXIS = :an_integer
+  GP_RIGHT_TRIGGER_AXIS = :an_integer
+  GP_DPAD_DOWN = :an_integer
+  GP_DPAD_LEFT = :an_integer
+  GP_DPAD_RIGHT = :an_integer
+  GP_DPAD_UP = :an_integer
   GP_DOWN = :an_integer
   GP_LEFT = :an_integer
   GP_RIGHT = :an_integer
   GP_UP = :an_integer
 
   GP_0_BUTTON_0…GP_3_BUTTON_15 = :an_integer
+  GP_0_LEFT_STICK_X_AXIS…GP_3_LEFT_STICK_X_AXIS = :an_integer
+  GP_0_RIGHT_STICK_X_AXIS…GP_3_RIGHT_STICK_X_AXIS = :an_integer
+  GP_0_LEFT_STICK_Y_AXIS…GP_3_LEFT_STICK_Y_AXIS = :an_integer
+  GP_0_RIGHT_STICK_Y_AXIS…GP_3_RIGHT_STICK_Y_AXIS = :an_integer
+  GP_0_LEFT_TRIGGER_AXIS…GP_3_LEFT_TRIGGER_AXIS = :an_integer
+  GP_0_RIGHT_TRIGGER_AXIS…GP_3_RIGHT_TRIGGER_AXIS = :an_integer
+  GP_0_DPAD_DOWN…GP_3_DPAD_DOWN = :an_integer
+  GP_0_DPAD_LEFT…GP_3_DPAD_LEFT = :an_integer
+  GP_0_DPAD_RIGHT…GP_3_DPAD_RIGHT = :an_integer
+  GP_0_DPAD_UP…GP_3_DPAD_UP = :an_integer
   GP_0_DOWN…GP_3_DOWN = :an_integer
   GP_0_LEFT…GP_3_LEFT = :an_integer
   GP_0_RIGHT…GP_3_RIGHT = :an_integer
@@ -193,14 +218,14 @@ module Gosu
     ##
     # @return [Integer] a 32-bit representation of the color in 0xAARRGGBB format.
     def argb; end
-    
+
     alias_method :to_i, :argb
 
     # Returns a 32-bit representation of the color suitable for use with OpenGL calls. This color is stored in a fixed format in memory and its integer value may vary depending on your system's byte order.
     #
     # @return [Integer] a 32-bit OpenGL color.
     def gl; end
-    
+
     # Returns an OpenGL integer constant that identifies the RGBA color format that Gosu uses.
     GL_FORMAT = :some_integer
 
@@ -316,7 +341,7 @@ module Gosu
     # @return [Integer] the width of the text, in pixels.
     # @param text [String]
     def text_width(text, scale_x=1); end
-    
+
     ##
     # Like {#text_width}, but supports the following markup tags: `<b>bold</b>`, `<i>italic</i>`, `<c=rrggbb>colors</c>`.
     def markup_width(markup, scale_x=1); end
@@ -420,13 +445,13 @@ module Gosu
 
     ##
     # Returns an image that is a smaller, rectangular view of this {Image}.
-    # 
+    #
     # This is a very fast operation, and no new textures will be allocated.
     # If you update this {Image} or the {#subimage} using {#insert}, the other {Image} will be affected as well.
-    # 
+    #
     # Caveats:
     # * If you stretch or rotate a {#subimage}, the pixels adjacent to it might bleed into it, as Gosu does not manage the 'tileability' of subimages.
-    # 
+    #
     # @return [Image?] an image that represents a portion of the containing image
     def subimage(left, top, width, height); end
 
@@ -450,7 +475,7 @@ module Gosu
     # @see #draw_as_quad
     # @see https://github.com/gosu/gosu/wiki/Basic-Concepts#drawing-with-colours Drawing with colors, explained in the Gosu Wiki
     # @see https://github.com/gosu/gosu/wiki/Basic-Concepts#z-ordering Z-ordering explained in the Gosu Wiki
-    def draw(x, y, z, scale_x=1, scale_y=1, color=0xff_ffffff, mode=:default); end
+    def draw(x, y, z=0, scale_x=1, scale_y=1, color=0xff_ffffff, mode=:default); end
 
     ##
     # Draws the image rotated, with its rotational center at (x, y).
@@ -464,7 +489,7 @@ module Gosu
     # @see #draw
     # @see https://github.com/gosu/gosu/wiki/Basic-Concepts#drawing-with-colours Drawing with colors, explained in the Gosu Wiki
     # @see https://github.com/gosu/gosu/wiki/Basic-Concepts#z-ordering Z-ordering explained in the Gosu Wiki
-    def draw_rot(x, y, z, angle, center_x=0.5, center_y=0.5, scale_x=1, scale_y=1, color=0xff_ffffff, mode=:default); end
+    def draw_rot(x, y, z=0, angle=0, center_x=0.5, center_y=0.5, scale_x=1, scale_y=1, color=0xff_ffffff, mode=:default); end
 
     ##
     # Draws the image as an arbitrary quad. This method can be used for advanced non-rectangular drawing techniques, e.g., faking perspective or isometric projection.
@@ -576,16 +601,16 @@ module Gosu
     # @param [Float]
     # @return [Float]
     attr_writer :volume
-    
+
     ##
     # Sets the playback speed. A value of 2.0 will play the sample at 200% speed and one octave higher. A value of 0.5 will play the sample at 50% speed and one octave lower. The valid range of this property depends on the operating system, but values up to 8.0 should work.
-    # @param [Float]    
+    # @param [Float]
     # @return [Float]
     attr_writer :speed
-    
+
     ##
     # Set the amount of panning, i.e. the position of the sound when using stereo speakers. 0.0 is the centre, negative values are to the left, positive values are to the right. If something happens on the edge of the screen, a good value for pan would be ±0.1.
-    # @param [Float] 
+    # @param [Float]
     # @return [Float]
     attr_writer :pan
 
@@ -781,7 +806,7 @@ module Gosu
     ##
     # Toggles between windowed mode and fullscreen.
     attr_writer :fullscreen
-    
+
     ##
     # @return [true, false] whether this window is resizable.
     def resizable?; end
@@ -795,7 +820,7 @@ module Gosu
     #
     # 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)
     #
@@ -812,18 +837,18 @@ module Gosu
     #
     # @return [void]
     def show; end
-    
+
     ##
     # EXPERIMENTAL - MAY DISAPPEAR WITHOUT WARNING.
-    # 
+    #
     # Performs a single step in the main loop.
     # This can be useful for integrating Gosu with other libraries that have their own main loop, e.g. Ruby/Tk.
-    # 
+    #
     # See: https://www.libgosu.org/cgi-bin/mwf/topic_show.pl?tid=1218
-    # 
+    #
     # If you find a good way to use {#tick}, please let us know on the forum and we can make this a part of Gosu's stable interface.
     # Thank you!
-    # 
+    #
     # @return [true, false] whether the {Window} should still be shown after this tick
     def tick; end
 
@@ -850,7 +875,7 @@ module Gosu
     def draw; end
 
     ##
-    # This method can be overriden to give the game a chance to opt out of a call to {#draw}; however, the operating system can still force a redraw for any reason.
+    # This method can be overridden to give the game a chance to opt out of a call to {#draw}; however, the operating system can still force a redraw for any reason.
     #
     # @return [true, false] whether the window needs to be redrawn.
     #
@@ -858,7 +883,8 @@ module Gosu
     def needs_redraw?; end
 
     ##
-    # This method can be overriden to control the visibility of the system cursor over your window, e.g., for level editors or other situations where introducing a custom cursor or hiding the default one is not desired.
+    # This method can be overridden to control the visibility of the system cursor over your window.
+    # The base class implementation returns true.
     #
     # @return [true, false] whether the system cursor should be shown.
     def needs_cursor?; end
@@ -871,7 +897,7 @@ module Gosu
     #
     # @return [bool]
     def close; end
-    
+
     ##
     # This method is called before {#update} if a button is pressed while the window has focus.
     #
@@ -903,6 +929,24 @@ module Gosu
     # @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
 
+    ##
+    # Called when a gamepad is connected.
+    # If a gamepad is momentarily disconnected and then reconnected, before another gamepad, it will have the same index.
+    #
+    # @param index [integer] index for looking up gamepad.
+    #
+    # @see Gosu.gamepad_name
+    def gamepad_connected(index); end
+
+    ##
+    # Called when a gamepad is disconnected.
+    #
+    # @param index [integer] index for looking up gamepad.
+    #
+    # @see #gamepad_connected
+    # @see Gosu.gamepad_name
+    def gamepad_disconnected(index); end
+
     # @!endgroup
   end
 
@@ -945,6 +989,38 @@ module Gosu
     # @see Window#button_up
     def button_down?(id); end
 
+    ##
+    # Returns the name of a Gosu::KB_{*} constant. Returns nil if no name is found.
+    #
+    # @example
+    #   Gosu.button_name(Gosu::KB_SPACE) #=> "Space"
+    #
+    # @return [String, nil]
+    # @param id [Integer]
+    #
+    def button_name(id); end
+
+    ##
+    # Returns the name for gamepad at `index` or nil if there is no connected at the specified index.
+    #
+    # @example
+    #   Gosu.gamepad_name(0) #=> "PS4 Controller"
+    #
+    # @return [String, nil]
+    # @param index [Integer]
+    def gamepad_name(index); end
+
+    ##
+    # Returns the value for the specified gamepad axis in the range -1.0..1.0 for joysticks and 0.0..1.0 for triggers.
+    #
+    # @example
+    #   Gosu.axis(Gosu::GP_0_LEFT_STICK_Y_AXIS) #=> 0.75
+    #
+    # @return [Float]
+    # @param id [Integer]
+    #
+    def axis(id); end
+
     # @!group Drawing primitives
 
     ##