gosu 0.11.1.pre1 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 559346f86540c571e858ae520b871e1a35537e84
-  data.tar.gz: 5114eebd3a3aa212b330978a3006bc4d9f5d321e
+  metadata.gz: 69a831194f9c3424b3866b28db95100d56da1621
+  data.tar.gz: e98300b664a62ff75bfe6de59542c779d939241e
 SHA512:
-  metadata.gz: 65e2e163b6e679c44375e3505c0ffe68d767ca9d4333ab0e6c4634ee3c327aa791e03f2b249b3708e1f8d76d9fd3c64a96549988a1074622a41883c949159c63
-  data.tar.gz: 232c94a88002c95910261c074293df22a2c6d6106d27503ba456466d5759d6d7022ed77e43b3cee46d5563973c77335a02b88b3c3b511bbc3be3cd762f08a043
+  metadata.gz: 66d9c21c663b3bba6bbb48f6c2860c3075a75ebc0f77216a42251c851380dedcbb5a10da7479196b652d52ab138996bafaaaa3ff7e5ed4ec7c1b75f77190c347
+  data.tar.gz: ebd17c6adcfbc3b6bbfe7f63b18085273c430b18806148e77468ba5cca41ef290d49e35820681c919276351a6fda29e5ccea3dc67b89c9de9bb6acbc527401f7

data/Gosu/Math.hpp

@@ -6,7 +6,7 @@
 #include <cmath>
 
 // Portability: Define M_PI, which MSVC's <cmath> does not do by default.
-#ifndef M_PI
+#if !defined(M_PI) && !defined(SWIG)
 #define M_PI 3.14159265358979323846264338327950288
 #endif
 

data/Gosu/Window.hpp

@@ -97,17 +97,21 @@ namespace Gosu
         virtual bool needs_cursor() const { return false; }
         
         //! This function is called when the window loses focus on some platforms.
-        //! Most importantly, it is called on the i_phone or i_pad when the user locks the screen.
+        //! 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() {}
 
-        //! Called before update when the user pressed a button while the window had the focus.
-        virtual void button_down(Gosu::Button) {}
+        //! 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,
+        //! 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 released a button.
+        //! Same as button_down. Called then the user releases a button.
         virtual void button_up(Gosu::Button) {}
         
         // Ignore when SWIG is wrapping this class for Ruby/Gosu.

data/lib/gosu/patches.rb

@@ -159,6 +159,9 @@ Gosu::GOSU_COPYRIGHT_NOTICE = Gosu::LICENSES
 
 # Release OpenAL resources during Ruby's shutdown, not Gosu's.
 at_exit do
-  Gosu::Song.current_song.stop if Gosu::Song.current_song
-  Gosu::_release_all_openal_resources
+  begin
+    Gosu::Song.current_song.stop if Gosu::Song.current_song
+    Gosu._release_all_openal_resources
+  rescue
+  end
 end

data/rdoc/gosu.rb

@@ -1,15 +1,17 @@
+# Encoding: UTF-8
+
 module Gosu
   ##
   # The first component of the version.
-  MAJOR_VERSION = :a_fixnum
+  MAJOR_VERSION = :an_integer
 
   ##
   # The second component of the version.
-  MINOR_VERSION = :a_fixnum
+  MINOR_VERSION = :an_integer
 
   ##
   # The third component of the version.
-  POINT_VERSION = :a_fixnum
+  POINT_VERSION = :an_integer
 
   ##
   # A version string of the form "0.1.2", "0.1.2.3" or "0.1.2pre4".
@@ -23,114 +25,99 @@ module Gosu
   # A block of legal copy that your game is obliged to display somewhere.
   LICENSES = :a_string
 
-  Kb0 Kb1 Kb2 Kb3 Kb4 Kb5 Kb6 Kb7 Kb8 Kb9 = :implementation_defined
-  KbA KbB KbC KbD KbE KbF KbG KbH KbI KbJ KbK KbL KbM KbN KbO KbP KbQ KbR KbS KbT KbU KbV KbW KbX KbY KbZ = :implementation_defined
-  KbBackspace = :implementation_defined
-  KbDelete = :implementation_defined
-  KbDown = :implementation_defined
-  KbEnd = :implementation_defined
+  KB_0…KB_9 = :an_integer
+  KB_A…KB_Z = :an_integer
+  KB_APOSTROPHE = :an_integer
+  KB_BACKSLASH = :an_integer
+  KB_BACKSPACE = :an_integer
+  KB_BACKTICK = :an_integer
+  KB_COMMA = :an_integer
+  KB_DELETE = :an_integer
+  KB_DOWN = :an_integer
+  KB_END = :an_integer
 
   ##
   # This is the key on the numpad.
-  KbEnter = :implementation_defined
-
-  KbEscape = :implementation_defined
-  KbF1 KbF2 KbF3 KbF4 KbF5 KbF6 KbF7 KbF8 KbF9 KbF10 KbF11 KbF12 = :implementation_defined
-  KbHome = :implementation_defined
-  KbInsert = :implementation_defined
-  KbLeft = :implementation_defined
-  KbLeftAlt = :implementation_defined
-  KbLeftControl = :implementation_defined
-  KbLeftShift = :implementation_defined
-  KbNumpad0 KbNumpad1 KbNumpad2 KbNumpad3 KbNumpad4 KbNumpad5 KbNumpad6 KbNumpad7 KbNumpad8 KbNumpad9 = :implementation_defined
-  KbNumpadAdd = :implementation_defined
-  KbNumpadDivide = :implementation_defined
-  KbNumpadMultiply = :implementation_defined
-  KbNumpadSubtract = :implementation_defined
-  KbPageDown = :implementation_defined
-  KbPageUp = :implementation_defined
+  KB_ENTER = :an_integer
+
+  KB_EQUALS = :an_integer
+  KB_ESCAPE = :an_integer
+  KB_F1…KB_F12 = :an_integer
+  KB_HOME = :an_integer
+  KB_INSERT = :an_integer
+  KB_ISO = :an_integer
+  KB_LEFT = :an_integer
+  KB_LEFT_ALT = :an_integer
+  KB_LEFT_BRACKET = :an_integer
+  KB_LEFT_CONTROL = :an_integer
+  KB_LEFT_META = :an_integer
+  KB_LEFT_SHIFT = :an_integer
+  KB_MINUS = :an_integer
+  KB_NUMPAD_0…KB_NUMPAD_9 = :an_integer
+  KB_NUMPAD_DIVIDE = :an_integer
+  KB_NUMPAD_MINUS = :an_integer
+  KB_NUMPAD_MULTIPLY = :an_integer
+  KB_NUMPAD_PLUS = :an_integer
+  KB_PAGE_DOWN = :an_integer
+  KB_PAGE_UP = :an_integer
+  KB_PERIOD = :an_integer
 
   ##
   # This is the key above the right shift key.
-  KbReturn = :implementation_defined
-
-  KbRight = :implementation_defined
-  KbRightAlt = :implementation_defined
-  KbRightControl = :implementation_defined
-  KbRightShift = :implementation_defined
-  KbSpace = :implementation_defined
-  KbTab = :implementation_defined
-  KbUp = :implementation_defined
-  KbBacktick = :implementation_defined
-  KbMinus = :implementation_defined
-  KbEqual = :implementation_defined
-  KbBracketLeft = :implementation_defined
-  KbBracketRight = :implementation_defined
-  KbBackslash = :implementation_defined
-  KbSemicolon = :implementation_defined
-  KbApostrophe = :implementation_defined
-  KbComma = :implementation_defined
-  KbPeriod = :implementation_defined
-  KbSlash = :implementation_defined
-
-  MsLeft = :implementation_defined
-  MsMiddle = :implementation_defined
-  MsRight = :implementation_defined
-  MsWheelDown = :implementation_defined
-  MsWheelUp = :implementation_defined
-  MsOther0 MsOther1 MsOther2 MsOther3 MsOther4 MsOther5 MsOther6 MsOther7 = :implementation_defined
-
-  GpButton0 GpButton1 GpButton2 GpButton3 GpButton4 GpButton5 GpButton6 GpButton7 GpButton8 GpButton9 GpButton10 GpButton11 GpButton12 GpButton13 GpButton14 GpButton15 = :implementation_defined
-  GpDown = :implementation_defined
-  GpLeft = :implementation_defined
-  GpRight = :implementation_defined
-  GpUp = :implementation_defined
-
-  Gp0Button0 Gp0Button1 Gp0Button2 Gp0Button3 Gp0Button4 Gp0Button5 Gp0Button6 Gp0Button7 Gp0Button8 Gp0Button9 Gp0Button10 Gp0Button11 Gp0Button12 Gp0Button13 Gp0Button14 Gp0Button15 = :implementation_defined
-  Gp0Down = :implementation_defined
-  Gp0Left = :implementation_defined
-  Gp0Right = :implementation_defined
-  Gp0Up = :implementation_defined
-
-  Gp1Button0 Gp1Button1 Gp1Button2 Gp1Button3 Gp1Button4 Gp1Button5 Gp1Button6 Gp1Button7 Gp1Button8 Gp1Button9 Gp1Button10 Gp1Button11 Gp1Button12 Gp1Button13 Gp1Button14 Gp1Button15 = :implementation_defined
-  Gp1Down = :implementation_defined
-  Gp1Left = :implementation_defined
-  Gp1Right = :implementation_defined
-  Gp1Up = :implementation_defined
-
-  Gp2Button0 Gp2Button1 Gp2Button2 Gp2Button3 Gp2Button4 Gp2Button5 Gp2Button6 Gp2Button7 Gp2Button8 Gp2Button9 Gp2Button10 Gp2Button11 Gp2Button12 Gp2Button13 Gp2Button14 Gp2Button15 = :implementation_defined
-  Gp2Down = :implementation_defined
-  Gp2Left = :implementation_defined
-  Gp2Right = :implementation_defined
-  Gp2Up = :implementation_defined
-
-  Gp3Button0 Gp3Button1 Gp3Button2 Gp3Button3 Gp3Button4 Gp3Button5 Gp3Button6 Gp3Button7 Gp3Button8 Gp3Button9 Gp3Button10 Gp3Button11 Gp3Button12 Gp3Button13 Gp3Button14 Gp3Button15 = :implementation_defined
-  Gp3Down = :implementation_defined
-  Gp3Left = :implementation_defined
-  Gp3Right = :implementation_defined
-  Gp3Up = :implementation_defined
+  KB_RETURN = :an_integer
+
+  KB_RIGHT = :an_integer
+  KB_RIGHT_ALT = :an_integer
+  KB_RIGHT_BRACKET = :an_integer
+  KB_RIGHT_CONTROL = :an_integer
+  KB_RIGHT_META = :an_integer
+  KB_RIGHT_SHIFT = :an_integer
+  KB_SEMICOLON = :an_integer
+  KB_SLASH = :an_integer
+  KB_SPACE = :an_integer
+  KB_TAB = :an_integer
+  KB_UP = :an_integer
+
+  MS_LEFT = :an_integer
+  MS_MIDDLE = :an_integer
+  MS_RIGHT = :an_integer
+  MS_WHEEL_DOWN = :an_integer
+  MS_WHEEL_UP = :an_integer
+  MS_OTHER_0…MS_OTHER_7 = :an_integer
+
+  GP_BUTTON_0…GP_BUTTON_15 = :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_DOWN…GP_3_DOWN = :an_integer
+  GP_0_LEFT…GP_3_LEFT = :an_integer
+  GP_0_RIGHT…GP_3_RIGHT = :an_integer
+  GP_0_UP…GP_3_UP = :an_integer
 
   ##
   # Represents an ARGB color value with 8 bits for each channel. Colors can be used interchangeably with integer literals of the form 0xAARRGGBB in all Gosu APIs.
   class Color
     ##
-    # @return [Fixnum] the color's alpha channel.
+    # @return [Integer] the color's alpha channel.
     attr_accessor :alpha
 
     ##
-    # @return [Fixnum] the color's red channel.
+    # @return [Integer] the color's red channel.
     attr_accessor :red
 
     ##
-    # @return [Fixnum] the color's green channel.
+    # @return [Integer] the color's green channel.
     attr_accessor :green
 
     ##
-    # @return [Fixnum] the color's blue channel.
+    # @return [Integer] the color's blue channel.
     attr_accessor :blue
 
     ##
-    # @return [Fixnum] the color's hue in the range (0...360).
+    # @return [Integer] the color's hue in the range (0...360).
     attr_accessor :hue
 
     ##
@@ -145,13 +132,13 @@ module Gosu
 
     ##
     # @overload initialize(argb)
-    #   @param argb [Fixnum] an integer of the form 0xAARRGGBB.
+    #   @param argb [Integer] an integer of the form 0xAARRGGBB.
     #
     # @overload initialize(a, r, g, b)
-    #   @param a [Fixnum] the color's alpha channel in the range (0..255).
-    #   @param r [Fixnum] the color's red channel in the range (0..255).
-    #   @param g [Fixnum] the color's green channel in the range (0..255).
-    #   @param b [Fixnum] 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
@@ -163,13 +150,13 @@ module Gosu
     # @return (see #initialize)
     #
     # @overload rgba(rgba)
-    #   @param argb [Fixnum] an integer of the form 0xRRGGBBAA.
+    #   @param argb [Integer] an integer of the form 0xRRGGBBAA.
     #
     # @overload rgba(r, g, b, a)
-    #   @param r [Fixnum] the color's red channel in the range (0..255).
-    #   @param g [Fixnum] the color's green channel in the range (0..255).
-    #   @param b [Fixnum] the color's blue channel in the range (0..255).
-    #   @param a [Fixnum] 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).
     #
     # @see #initialize
     # @see argb
@@ -188,7 +175,7 @@ module Gosu
     # Converts an HSV triplet to an opaque color.
     #
     # @return [Color] a color corresponding to the HSV triplet.
-    # @param h [Fixnum] the color's hue in the range (0..360).
+    # @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).
     #
@@ -198,7 +185,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 [Fixnum] 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
@@ -208,7 +195,7 @@ module Gosu
 
     # Returns a 32-bit representation of the color suitable for use with OpenGL calls. This color is stored in a fixed order in memory and its integer value may vary depending on your system's byte order.
     #
-    # @return [Fixnum] a 32-bit OpenGL color.
+    # @return [Integer] a 32-bit OpenGL color.
     def gl; end
 
     ##
@@ -240,7 +227,7 @@ module Gosu
     attr_reader :name
 
     ##
-    # @return [Fixnum] the font's height in pixels.
+    # @return [Integer] the font's height in pixels.
     attr_reader :height
 
     ##
@@ -248,7 +235,7 @@ module Gosu
     #
     # (Passing a Window reference is not necessary anymore, please use the first overload from now on.)
     #
-    # @param height [Fixnum] the height of the font, in pixels.
+    # @param height [Integer] the height of the font, in pixels.
     # @param [Hash] options
     # @option options [String] :name the name of a system font, or a path to a TrueType Font (TTF) file. A path must contain at least one '/' character to distinguish it from a system font.
     #
@@ -278,7 +265,7 @@ module Gosu
     # @param z [Number] the Z-order.
     # @param scale_x [Float] the horizontal scaling factor.
     # @param scale_y [Float] the vertical scaling factor.
-    # @param color [Color, Fixnum]
+    # @param color [Color, Integer]
     # @param mode [:default, :additive] the blending mode to use.
     #
     # @see #draw_rel
@@ -316,7 +303,7 @@ module Gosu
     ##
     # Returns the width of a single line of text, in pixels, if it were drawn.
     #
-    # @return [Fixnum] the width of the text, in pixels.
+    # @return [Integer] the width of the text, in pixels.
     # @param text [String]
     def text_width(text, scale_x=1); end
   end
@@ -325,11 +312,11 @@ module Gosu
   # Provides functionality for drawing rectangular images.
   class Image
     ##
-    # @return [Fixnum] the image's width, in pixels.
+    # @return [Integer] the image's width, in pixels.
     attr_reader :width
 
     ##
-    # @return [Fixnum] the image's height, in pixels.
+    # @return [Integer] the image's height, in pixels.
     attr_reader :height
 
     # @!group Creating and loading images
@@ -369,11 +356,11 @@ module Gosu
     #
     # @return [Gosu::Image]
     # @param [String] text
-    # @param [Fixnum] line_height the line height, in pixels.
+    # @param [Integer] line_height the line height, in pixels.
     # @param [Hash] options
     # @option options [String] :font (Gosu::default_font_name) the name of a system font, or a path to a TrueType Font (TTF) file. A path must contain at least one '/' character to distinguish it from a system font.
-    # @option options [Fixnum] :width the width of the image, in pixels. Long lines will be automatically wrapped around to avoid overflow, but overlong words will be truncated. If this option is omitted, lines will not be wrapped, and :align and :spacing will be ignored as well.
-    # @option options [Fixnum] :spacing (0) the spacing between lines, in pixels.
+    # @option options [Integer] :width the width of the image, in pixels. Long lines will be automatically wrapped around to avoid overflow, but overlong words will be truncated. If this option is omitted, lines will not be wrapped, and :align and :spacing will be ignored as well.
+    # @option options [Integer] :spacing (0) the spacing between lines, in pixels.
     # @option options [:left, :right, :center, :justify] :align (:left) the text alignment.
     # @option options [true, false] :retro (false) if true, the image will not be interpolated when it is scaled up or down.
     #
@@ -388,8 +375,8 @@ module Gosu
     #
     # @return [Array<Gosu::Image>]
     # @param source [String, Magick::Image]
-    # @param tile_width [Fixnum] If positive, this is the width of the individual tiles; if negative, the image is divided into -tile_width columns.
-    # @param tile_height [Fixnum] If positive, this is the height of the individual tiles; if negative, the image is divided into -tile_height rows.
+    # @param tile_width [Integer] If positive, this is the width of the individual tiles; if negative, the image is divided into -tile_width columns.
+    # @param tile_height [Integer] If positive, this is the height of the individual tiles; if negative, the image is divided into -tile_height rows.
     # @param [Hash] options
     # @option options [true, false] :tileable (false) if true, the Image will not have soft edges when scaled
     # @option options [true, false] :retro (false) if true, the image will not be interpolated when it is scaled up or down. When :retro it set, :tileable has no effect.
@@ -507,8 +494,8 @@ module Gosu
     #
     # @return [void]
     # @param source [String, Magick::Image] the filename or RMagick image to load from.
-    # @param x [Fixnum] the X coordinate of the top left corner.
-    # @param y [Fixnum] the Y coordinate of the top left corner.
+    # @param x [Integer] the X coordinate of the top left corner.
+    # @param y [Integer] the Y coordinate of the top left corner.
     def insert(source, x, y); end
 
     ##
@@ -681,11 +668,11 @@ module Gosu
     attr_accessor :text
 
     ##
-    # @return [Fixnum] the position of the editing caret.
+    # @return [Integer] the position of the editing caret.
     attr_accessor :caret_pos
 
     ##
-    # @return [Fixnum] the starting position of the currently selected text.
+    # @return [Integer] the starting position of the currently selected text.
     attr_accessor :selection_start
 
     ##
@@ -739,18 +726,22 @@ module Gosu
     ##
     # The window's width, in pixels. This only counts the drawable area and does not include any borders or decorations added by the window manager.
     #
-    # @return [Fixnum] the window's width, in pixels.
+    # @return [Integer] the window's width, in pixels.
     attr_accessor :width
 
     ##
     # The window's height, in pixels. This only counts the drawable area and does not include any borders or decorations added by the window manager.
     #
-    # @return [Fixnum] the window's height, in pixels.
+    # @return [Integer] the window's height, in pixels.
     attr_accessor :height
 
     ##
-    # @return [true, false] whether this is a full-screen window.
-    attr_accessor :fullscreen?
+    # @return [true, false] whether this is a fullscreen window.
+    def fullscreen?; end
+
+    ##
+    # Toggles between windowed mode and fullscreen.
+    attr_writer :fullscreen
 
     ##
     # @return [Float] the interval between calls to {#update}, in milliseconds.
@@ -764,8 +755,8 @@ module Gosu
     # @overload initialize(width, height, options = {})
     # @overload initialize(width, height, fullscreen, update_interval = 16.666666)
     #
-    # @param width [Fixnum] the desired window width.
-    # @param height [Fixnum] the desired window height.
+    # @param width [Integer] the desired window width.
+    # @param height [Integer] the desired window height.
     # @param [Hash] options
     # @option options [true, false] :fullscreen (false) whether to present the window in fullscreen mode.
     # @option options [Float] :update_interval (16.666666) the interval between frames, in milliseconds.
@@ -828,17 +819,22 @@ module Gosu
     def needs_cursor?; end
 
     ##
-    # This method is called before {#update} if a button was pressed while the window had focus.
+    # 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,
+    # Linux) or cmd+F (macOS).
+    # To support these shortcuts in your application, make sure to call super in your
+    # implementation.
     #
     # @return [void]
-    # @param id [Fixnum] the button's platform-defined id.
+    # @param id [Integer] the button's platform-defined id.
     #
     # @see #button_up
     # @see Gosu.button_down?
     def button_down(id); end
 
     ##
-    # This method is called before {#update} if a button was released while the window had focus.
+    # This method is called before {#update} if a button is released while the window has focus.
     #
     # @return [void]
     # @param (see #button_down)
@@ -863,7 +859,7 @@ module Gosu
   # @see file:examples/OpenGLIntegration.rb
   class GLTexInfo
     ##
-    # @return [Fixnum] OpenGL texture id
+    # @return [Integer] OpenGL texture id
     attr_reader :tex_name
 
     ##
@@ -1127,7 +1123,7 @@ module Gosu
     # @note For real text input, look at {TextInput} instead.
     #
     # @return [String?] the character the button usually produces.
-    # @param id [Fixnum] the button's platform-defined id.
+    # @param id [Integer] the button's platform-defined id.
     #
     # @see char_to_button_id
     # @see Window#text_input
@@ -1137,7 +1133,7 @@ module Gosu
     ##
     # Returns the button that usually produces a character, if any.
     #
-    # @return [Fixnum?] the button that usually produces the character.
+    # @return [Integer?] the button that usually produces the character.
     # @param char [String] the character to query.
     #
     # @see button_id_to_char
@@ -1188,11 +1184,11 @@ module Gosu
     ##
     # @note For long-running games, this counter will eventually wrap around to 0 again.
     #
-    # @return [Fixnum] the number of milliseconds elapsed.
+    # @return [Integer] the number of milliseconds elapsed.
     def milliseconds(); end
 
     ##
-    # @return [Fixnum] the current framerate, in frames per second.
+    # @return [Integer] the current framerate, in frames per second.
     def fps(); end
 
     # @return [String] the name of a neutral font that is available on the current platform.
@@ -1202,18 +1198,18 @@ module Gosu
     def default_font_name(); end
 
     ##
-    # @return [Fixnum] the width (in pixels) of the user's primary screen.
+    # @return [Integer] the width (in pixels) of the user's primary screen.
     def screen_width(); end
 
-    # @return [Fixnum] the height (in pixels) of the user's primary screen.
+    # @return [Integer] the height (in pixels) of the user's primary screen.
     def screen_height(); end
 
     ##
-    # @return [Fixnum] the maximum width (in 'points') that is available for a non-fullscreen Window.
+    # @return [Integer] 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.
     def available_width(); end
 
-    # @return [Fixnum] the maximum height (in 'points') that is available for a non-fullscreen Window.
+    # @return [Integer] 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.
     def available_height(); end