gosu 0.7.47.1 → 0.7.48

data/GosuImpl/RubyGosu_wrap.h

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 2.0.10
  * 
  * This file is not intended to be easily readable and contains a number of 
  * coding conventions designed to improve portability and efficiency. Do not make

data/GosuImpl/Sockets/CommSocket.cpp

@@ -1,6 +1,6 @@
 #include <Gosu/Sockets.hpp>
 #include <Gosu/TR1.hpp>
-#include <GosuImpl/Sockets/Sockets.hpp>
+#include "Socket.hpp"
 #include <cassert>
 #include <cstring>
 #include <stdexcept>

data/GosuImpl/Sockets/ListenerSocket.cpp

@@ -1,5 +1,5 @@
 #include <Gosu/Sockets.hpp>
-#include <GosuImpl/Sockets/Sockets.hpp>
+#include "Socket.hpp"
 #include <cassert>
 #include <cstring>
 

data/GosuImpl/Sockets/MessageSocket.cpp

@@ -1,5 +1,5 @@
 #include <Gosu/Sockets.hpp>
-#include <GosuImpl/Sockets/Sockets.hpp>
+#include "Socket.hpp"
 #include <cassert>
 #include <cstring>
 #include <vector>

data/GosuImpl/Sockets/Socket.cpp

@@ -1,5 +1,5 @@
 #include <Gosu/Sockets.hpp>
-#include <GosuImpl/Sockets/Sockets.hpp>
+#include "Socket.hpp"
 #ifdef GOSU_IS_WIN
 #include <Gosu/WinUtility.hpp>
 #endif

data/GosuImpl/TextInputMac.mm

@@ -1,6 +1,6 @@
 #include <Gosu/TextInput.hpp>
 #include <Gosu/Buttons.hpp>
-#include <GosuImpl/MacUtility.hpp>
+#include "MacUtility.hpp"
 #include <algorithm>
 #include <vector>
 #include <wctype.h>

data/GosuImpl/Utility.cpp

@@ -11,7 +11,7 @@
 #ifndef GOSU_IS_IPHONE
 
 #ifndef GOSU_IS_WIN
-#include <GosuImpl/Iconv.hpp>
+#include "Iconv.hpp"
 #endif
 using namespace std;
 

data/GosuImpl/UtilityApple.mm

@@ -1,6 +1,6 @@
 #include <Gosu/Utility.hpp>
 #include <Gosu/Platform.hpp>
-#include <GosuImpl/MacUtility.hpp>
+#include "MacUtility.hpp"
 #import <Foundation/Foundation.h>
 #include <stdexcept>
 #include <vector>

data/GosuImpl/WindowMac.mm

@@ -2,7 +2,7 @@
 #include <Gosu/Audio.hpp>
 #include <Gosu/Graphics.hpp>
 #include <Gosu/Input.hpp>
-#include <GosuImpl/MacUtility.hpp>
+#include "MacUtility.hpp"
 #include <Gosu/Timing.hpp>
 #include <Gosu/TR1.hpp>
 #include <Gosu/Utility.hpp>
@@ -201,6 +201,12 @@ OVERRIDE_METHOD(scrollWheel);
 
 #undef OVERRIDE_METHOD
 
+#if __MAC_OS_X_VERSION_MAX_ALLOWED < 1070
+@interface NSView (GosuProvideMissingMethodDeclaration)
+- (NSRect)convertRectToBacking:(NSRect)aRect;
+@end
+#endif
+
 struct Gosu::Window::Impl
 {
     ObjRef<NSAutoreleasePool> pool;
@@ -219,7 +225,7 @@ struct Gosu::Window::Impl
     double interval;
     bool mouseViz;
     
-    void createWindow(unsigned width, unsigned height)
+    void createWindowAndAdjustWidthHeight(unsigned& width, unsigned& height)
     {
         NSRect rect = NSMakeRect(0, 0, width, height);
         window.reset([[GosuWindow alloc] initWithContentRect:rect styleMask:windowStyleMask 
@@ -227,14 +233,22 @@ struct Gosu::Window::Impl
         [window.obj() retain]; // TODO: Why?
         
         [window.obj() setContentView:[[GosuView alloc] init]];
+        if ([[window.obj() contentView] respondsToSelector:@selector(wantsBestResolutionOpenGLSurface)])
+        {
+            [[window.obj() contentView] setValue:[NSNumber numberWithBool:YES] forKey:@"wantsBestResolutionOpenGLSurface"];
+            NSRect pointRect = NSMakeRect(0, 0, width, height);
+            NSRect backingRect = [(id)[window.obj() contentView] convertRectToBacking:pointRect];
+            width = backingRect.size.width;
+            height = backingRect.size.height;
+        }
         [window.obj() center];
     }
     
     static void doTick(Window& window);
 };
 
-// Without this variable, the context seems to get eaten by the GC. Oh
-// wow, this sounds hacky and fragile. I am scared :(
+// An addition for MacRuby support:
+// Without this variable, the context seems to get eaten by the GC. (?)
 
 static NSOpenGLContext* context;
 
@@ -287,6 +301,7 @@ Gosu::Window::Window(unsigned width, unsigned height, bool fullscreen,
         throw std::runtime_error("Unable to create an OpenGL context with the supplied pixel format");
     
     unsigned realWidth = width, realHeight = height;
+    unsigned pixelWidth = width, pixelHeight = height;
     
     if (fullscreen) {
         // Fullscreen: Create no window, instead change resolution.
@@ -309,7 +324,9 @@ Gosu::Window::Window(unsigned width, unsigned height, bool fullscreen,
     else
     {
         scaleDownWindowIfNecessary(realWidth, realHeight);
-        pimpl->createWindow(realWidth, realHeight);
+        pixelWidth = realWidth;
+        pixelHeight = realHeight;
+        pimpl->createWindowAndAdjustWidthHeight(pixelWidth, pixelHeight);
         // Tell context to draw on this window.
         [pimpl->context.obj() setView:[pimpl->window.obj() contentView]];
     }
@@ -318,7 +335,7 @@ Gosu::Window::Window(unsigned width, unsigned height, bool fullscreen,
     
     [pimpl->context.obj() makeCurrentContext];
     
-    pimpl->graphics.reset(new Gosu::Graphics(realWidth, realHeight, fullscreen));
+    pimpl->graphics.reset(new Gosu::Graphics(pixelWidth, pixelHeight, fullscreen));
     pimpl->graphics->setResolution(width, height);
     
     pimpl->input.reset(new Input(pimpl->window.get()));
@@ -360,22 +377,16 @@ Gosu::Window::~Window()
 
 std::wstring Gosu::Window::caption() const
 {
-    if (! pimpl->window.get())
-        return L"";
-    
     ObjRef<NSAutoreleasePool> pool([[NSAutoreleasePool alloc] init]);
-    const char* utf8 = [[pimpl->window.obj() title] UTF8String];
+    const char* utf8 = [[pimpl->window.get() title] UTF8String];
     return utf8 ? Gosu::utf8ToWstring(utf8) : std::wstring();
 }
 
 void Gosu::Window::setCaption(const std::wstring& caption)
 {
-    if (! pimpl->window.get())
-        return;
-    
     std::string utf8 = wstringToUTF8(caption);
     ObjRef<NSString> title([[NSString alloc] initWithUTF8String:utf8.c_str()]);
-    [pimpl->window.obj() setTitle: title.obj()];
+    [pimpl->window.get() setTitle:title.obj()];
 }
 
 double Gosu::Window::updateInterval() const

data/GosuImpl/WindowTouch.mm

@@ -2,8 +2,8 @@
 #include <Gosu/Graphics.hpp>
 #include <Gosu/Audio.hpp>
 #include <Gosu/Input.hpp>
-#include <GosuImpl/MacUtility.hpp>   
-#include <GosuImpl/Graphics/GosuView.hpp>
+#include "MacUtility.hpp"
+#include "Graphics/GosuView.hpp"
 
 #import <CoreGraphics/CoreGraphics.h>
 #import <UIKit/UIKit.h>

data/linux/extconf.rb

@@ -93,36 +93,48 @@ if `uname`.chomp == 'Darwin' then
   %w(AudioToolbox IOKit OpenAL OpenGL AppKit ApplicationServices Foundation Carbon).each do |f|
     $LDFLAGS << " -framework #{f}"
   end
-  
-  # Symlink our pretty gosu.so into ../lib
-  # FIXME gosu.rb should just look in the right place.
-  FileUtils.ln_s("../linux/gosu.bundle", "../lib/gosu.bundle")
 else
   SOURCE_FILES = BASE_FILES + LINUX_FILES
 
-  # Symlink our pretty gosu.so into ../lib
-  # FIXME gosu.rb should just look in the right place.
-  FileUtils.ln_s("../linux/gosu.so", "../lib/gosu.so")
-
-  pkg_config("sdl")
-  pkg_config("pangoft2")
-  pkg_config("x11")
-  pkg_config("xinerama")
+  pkg_config 'sdl'
+  pkg_config 'pangoft2'
+  pkg_config 'x11'
+  pkg_config 'xinerama'
   
-  pkg_config("gl")
-  pkg_config("vorbisfile")
-  pkg_config("openal")
-  pkg_config("sndfile")
+  pkg_config 'gl'
+  pkg_config 'vorbisfile'
+  pkg_config 'openal'
+  pkg_config 'sndfile'
   
-  have_header('SDL_ttf.h')   if have_library('SDL_ttf', 'TTF_RenderUTF8_Blended')
-  have_header('FreeImage.h') if have_library('freeimage', 'FreeImage_ConvertFromRawBits')
-  have_header('AL/al.h')     if have_library('openal')
+  have_header 'SDL_ttf.h'   if have_library('SDL_ttf', 'TTF_RenderUTF8_Blended')
+  have_header 'FreeImage.h' if have_library('freeimage', 'FreeImage_ConvertFromRawBits')
+  have_header 'AL/al.h'     if have_library('openal')
+end
+
+# Symlink our pretty gosu.so into ../lib
+# TODO gosu.rb should just look in the right place.
+unless File.exist? "../lib/gosu.#{RbConfig::CONFIG['DLEXT']}"
+  FileUtils.ln_s "../linux/gosu.#{RbConfig::CONFIG['DLEXT']}",
+                 "../lib/gosu.#{RbConfig::CONFIG['DLEXT']}"
 end
 
-# Copy all relevant C++ files into the current directory
-# FIXME Could be done by gem task instead.
+# And now it gets ridiculous (or I am overcomplicating things...):
+# mkmf will compile all .c/.cpp files in this directory, but if they are nested
+# inside folders, it will not find the resulting .o files during linking.
+# So we create a shim .c/.cpp file for each file that we want to compile, ensuring
+# that all .o files are built into the current directory, without any nesting.
+# TODO - would be nicer if the Rakefile would just create these shim files and
+# ship them along with the gem
 SOURCE_FILES.each do |file|
-  FileUtils.cp("../GosuImpl/#{file}", File.basename(file).sub(/\.mm$/, '.cpp'))
+  shim_name = File.basename(file).sub(/\.mm$/, '.cpp')
+  File.open(shim_name, "w") do |shim|
+    shim.puts "#include \"../GosuImpl/#{file}\""
+  end
+end
+
+if RUBY_VERSION >= '2.0.0' then
+  # See http://bugs.ruby-lang.org/issues/8315
+  CONFIG['CXXFLAGS'] = "#$CFLAGS #{CONFIG['CXXFLAGS']}"
 end
 
-create_makefile("gosu")
+create_makefile 'gosu'

data/reference/gosu.rb

@@ -96,11 +96,32 @@ module Gosu
   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 = :implementation_defined
+  MsOther1 = :implementation_defined
+  MsOther2 = :implementation_defined
+  MsOther3 = :implementation_defined
+  MsOther4 = :implementation_defined
+  MsOther5 = :implementation_defined
+  MsOther6 = :implementation_defined
+  MsOther7 = :implementation_defined
+  
   GpButton0 = :implementation_defined
   GpButton1 = :implementation_defined
   GpButton10 = :implementation_defined
@@ -121,6 +142,86 @@ module Gosu
   GpLeft = :implementation_defined
   GpRight = :implementation_defined
   GpUp = :implementation_defined
+  Gp0Button0 = :implementation_defined
+  Gp0Button1 = :implementation_defined
+  Gp0Button10 = :implementation_defined
+  Gp0Button11 = :implementation_defined
+  Gp0Button12 = :implementation_defined
+  Gp0Button13 = :implementation_defined
+  Gp0Button14 = :implementation_defined
+  Gp0Button15 = :implementation_defined
+  Gp0Button2 = :implementation_defined
+  Gp0Button3 = :implementation_defined
+  Gp0Button4 = :implementation_defined
+  Gp0Button5 = :implementation_defined
+  Gp0Button6 = :implementation_defined
+  Gp0Button7 = :implementation_defined
+  Gp0Button8 = :implementation_defined
+  Gp0Button9 = :implementation_defined
+  Gp0Down = :implementation_defined
+  Gp0Left = :implementation_defined
+  Gp0Right = :implementation_defined
+  Gp0Up = :implementation_defined
+  Gp1Button0 = :implementation_defined
+  Gp1Button1 = :implementation_defined
+  Gp1Button10 = :implementation_defined
+  Gp1Button11 = :implementation_defined
+  Gp1Button12 = :implementation_defined
+  Gp1Button13 = :implementation_defined
+  Gp1Button14 = :implementation_defined
+  Gp1Button15 = :implementation_defined
+  Gp1Button2 = :implementation_defined
+  Gp1Button3 = :implementation_defined
+  Gp1Button4 = :implementation_defined
+  Gp1Button5 = :implementation_defined
+  Gp1Button6 = :implementation_defined
+  Gp1Button7 = :implementation_defined
+  Gp1Button8 = :implementation_defined
+  Gp1Button9 = :implementation_defined
+  Gp1Down = :implementation_defined
+  Gp1Left = :implementation_defined
+  Gp1Right = :implementation_defined
+  Gp1Up = :implementation_defined
+  Gp2Button0 = :implementation_defined
+  Gp2Button1 = :implementation_defined
+  Gp2Button10 = :implementation_defined
+  Gp2Button11 = :implementation_defined
+  Gp2Button12 = :implementation_defined
+  Gp2Button13 = :implementation_defined
+  Gp2Button14 = :implementation_defined
+  Gp2Button15 = :implementation_defined
+  Gp2Button2 = :implementation_defined
+  Gp2Button3 = :implementation_defined
+  Gp2Button4 = :implementation_defined
+  Gp2Button5 = :implementation_defined
+  Gp2Button6 = :implementation_defined
+  Gp2Button7 = :implementation_defined
+  Gp2Button8 = :implementation_defined
+  Gp2Button9 = :implementation_defined
+  Gp2Down = :implementation_defined
+  Gp2Left = :implementation_defined
+  Gp2Right = :implementation_defined
+  Gp2Up = :implementation_defined
+  Gp3Button0 = :implementation_defined
+  Gp3Button1 = :implementation_defined
+  Gp3Button10 = :implementation_defined
+  Gp3Button11 = :implementation_defined
+  Gp3Button12 = :implementation_defined
+  Gp3Button13 = :implementation_defined
+  Gp3Button14 = :implementation_defined
+  Gp3Button15 = :implementation_defined
+  Gp3Button2 = :implementation_defined
+  Gp3Button3 = :implementation_defined
+  Gp3Button4 = :implementation_defined
+  Gp3Button5 = :implementation_defined
+  Gp3Button6 = :implementation_defined
+  Gp3Button7 = :implementation_defined
+  Gp3Button8 = :implementation_defined
+  Gp3Button9 = :implementation_defined
+  Gp3Down = :implementation_defined
+  Gp3Left = :implementation_defined
+  Gp3Right = :implementation_defined
+  Gp3Up = :implementation_defined
 
   # Represents an ARGB color value with 8 bits for each channel. Can be
   # replaced by literals of the form 0xaarrggbb in all of Gosu.
@@ -537,42 +638,47 @@ module Gosu
   class GLTexInfo
     attr_reader :tex_name, :left, :right, :top, :bottom
   end
-  
-  # Returns a random double between min (inclusive) and max (exclusive).
-  def random(min, max); end
-  
-  # Returns the horizontal distance between the origin and the point to which you would get if you moved radius pixels in the direction specified by angle.
-  def offset_x(angle, dist); end 
-  
-  # Returns the vertical distance between the origin and the point to which you would get if you moved radius pixels in the direction specified by angle.
-  def offset_y(angle, dist); end
-  
-  # Returns the angle from point 1 to point 2 in degrees, where 0.0 means upwards. Returns 0 if both points are equal.
-  def angle(x1, y1, x2, y2); end
-  
-  # Returns the smallest angle that can be added to angle1 to get to angle2 (can be negative if counter-clockwise movement is shorter).
-  def angle_diff(angle1, angle2); end
-  
-  # Returns the distance between two points.
-  def distance(x1, y1, x2, y2); end
-  
-  # Incrementing, possibly wrapping millisecond timer.
-  def milliseconds(); end
-  
-  # Returns the name of a neutral font that is available on the current
-  # platform.
-  def default_font_name(); end
-  
-  # Returns the width, in pixels, of the user's primary screen.
-  def screen_width(); end
-  
-  # Returns the height, in pixels, of the user's primary screen.
-  def screen_height(); end
-  
-  # 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'. You can rely only on the first two letters
-  # being a common language abbreviation.
-  def language(); end
+
+  class << self
+    # Returns a random double between min (inclusive) and max (exclusive).
+    def random(min, max); end
+
+    # Returns the horizontal distance between the origin and the point to which you would get if you moved radius pixels in the direction specified by angle.
+    def offset_x(angle, dist); end
+
+    # Returns the vertical distance between the origin and the point to which you would get if you moved radius pixels in the direction specified by angle.
+    def offset_y(angle, dist); end
+
+    # Returns the angle from point 1 to point 2 in degrees, where 0.0 means upwards. Returns 0 if both points are equal.
+    def angle(x1, y1, x2, y2); end
+
+    # Returns the smallest angle that can be added to angle1 to get to angle2 (can be negative if counter-clockwise movement is shorter).
+    def angle_diff(angle1, angle2); end
+
+    # Returns the distance between two points.
+    def distance(x1, y1, x2, y2); end
+
+    # Incrementing, possibly wrapping millisecond timer.
+    def milliseconds(); end
+
+    # Return current framerate (frames per second.)
+    def fps(); end
+
+    # Returns the name of a neutral font that is available on the current
+    # platform.
+    def default_font_name(); end
+
+    # Returns the width, in pixels, of the user's primary screen.
+    def screen_width(); end
+
+    # Returns the height, in pixels, of the user's primary screen.
+    def screen_height(); end
+
+    # 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'. You can rely only on the first two letters
+    # being a common language abbreviation.
+    def language(); end
+  end
 end
 
 # Small additions to Numeric to make it easier to integrate Gosu with