gosu 0.7.35 → 0.7.36.2

data/Gosu/Image.hpp

@@ -19,16 +19,16 @@ namespace Gosu
     public:
         //! Loads an image from a given filename that can be drawn onto
         //! graphics.
-		//! This constructor can handle PNG and BMP images. A color key of #ff00ff is
-		//! automatically applied to BMP type images. For more flexibility, use the
-		//! corresponding constructor that uses a Bitmap object.
+        //! This constructor can handle PNG and BMP images. A color key of #ff00ff is
+        //! automatically applied to BMP type images. For more flexibility, use the
+        //! corresponding constructor that uses a Bitmap object.
         Image(Graphics& graphics, const std::wstring& filename,
               bool tileable = false);
         //! Loads a portion of the the image at the given filename that can be
         //! drawn onto graphics.
-		//! This constructor can handle PNG and BMP images. A color key of #ff00ff is
-		//! automatically applied to BMP type images. For more flexibility, use the
-		//! corresponding constructor that uses a Bitmap object.
+        //! This constructor can handle PNG and BMP images. A color key of #ff00ff is
+        //! automatically applied to BMP type images. For more flexibility, use the
+        //! corresponding constructor that uses a Bitmap object.
         Image(Graphics& graphics, const std::wstring& filename, unsigned srcX,
               unsigned srcY, unsigned srcWidth, unsigned srcHeight,
               bool tileable = false);
@@ -80,8 +80,8 @@ namespace Gosu
         ImageData& getData() const;
     };
 
-	//! Convenience function that splits a BMP or PNG file into an array
-	//! of small rectangles and creates images from them.
+    //! Convenience function that splits a BMP or PNG file into an array
+    //! of small rectangles and creates images from them.
     //! \param tileWidth If positive, specifies the width of one tile in
     //! pixels. If negative, the bitmap is divided into -tileWidth rows.
     //! \param tileHeight See tileWidth.

data/Gosu/Input.hpp

@@ -33,42 +33,42 @@
 
 namespace Gosu
 {
-	//! Very lightweight class that identifies a button (keyboard, mouse or other device).
-	class Button
-	{
-		unsigned id_;
-		
-	public:
-		//! For internal use.
-		explicit Button(unsigned id) : id_(id) {}
-		//! For internal use.
-		unsigned id() const { return id_; }
+    //! Very lightweight class that identifies a button (keyboard, mouse or other device).
+    class Button
+    {
+        unsigned id_;
+        
+    public:
+        //! For internal use.
+        explicit Button(unsigned id) : id_(id) {}
+        //! For internal use.
+        unsigned id() const { return id_; }
 
-		//! Default constructor; == noButton.
-		Button() : id_(noButton) {}
+        //! Default constructor; == noButton.
+        Button() : id_(noButton) {}
 
-		//! Conversion from ButtonName constants.
-		Button(ButtonName name) : id_(name) {}
-	};
+        //! Conversion from ButtonName constants.
+        Button(ButtonName name) : id_(name) {}
+    };
     
-	//! Tests whether two Buttons identify the same physical button.
-	inline bool operator==(Button lhs, Button rhs)
-	{
-		return lhs.id() == rhs.id();
-	}
-	inline bool operator!=(Button lhs, Button rhs)
-	{
-		return !(lhs == rhs);
-	}
+    //! Tests whether two Buttons identify the same physical button.
+    inline bool operator==(Button lhs, Button rhs)
+    {
+        return lhs.id() == rhs.id();
+    }
+    inline bool operator!=(Button lhs, Button rhs)
+    {
+        return !(lhs == rhs);
+    }
     inline bool operator<(Button lhs, Button rhs)
     {
         return lhs.id() < rhs.id();
     }
-	
+    
     //! Struct that saves information about a touch on the surface of a multi-
     //! touch device.
-	//! Available even on non-iPhone platforms to make it easier to compile the
-	//! same source for multiple platforms.
+    //! Available even on non-iPhone platforms to make it easier to compile the
+    //! same source for multiple platforms.
     struct Touch
     {
         //! Allows for identification of a touch across calls.
@@ -79,13 +79,13 @@ namespace Gosu
     typedef std::vector<Touch> Touches;
     
     //! Manages initialization and shutdown of the input system. Only one Input
-	//! instance can exist per application.
+    //! instance can exist per application.
     class Input
     {
         struct Impl;
         const std::auto_ptr<Impl> pimpl;
 
-	public:
+    public:
         #ifdef GOSU_IS_WIN
         Input(HWND window);
         #endif
@@ -113,9 +113,9 @@ namespace Gosu
         //! given character, or noButton.
         static Button charToId(wchar_t ch);
         
-		//! Returns true if a button is currently pressed.
+        //! Returns true if a button is currently pressed.
         //! Updated every tick.
-		bool down(Button btn) const;
+        bool down(Button btn) const;
         
         //! Returns the horizontal position of the mouse relative to the top
         //! left corner of the window given to Input's constructor.
@@ -143,12 +143,12 @@ namespace Gosu
         //! mouse is and calls onButtonUp/onButtonDown, if assigned.
         void update();
         
-		//! Assignable events that are called by update. You can bind these to your own functions.
-		//! If you use the Window class, it will assign forward these to its own methods.
+        //! Assignable events that are called by update. You can bind these to your own functions.
+        //! If you use the Window class, it will assign forward these to its own methods.
         std::tr1::function<void (Button)> onButtonDown, onButtonUp;
         
-		//! Assignable events that are called by update. You can bind these to your own functions.
-		//! If you use the Window class, it will assign forward these to its own methods.
+        //! Assignable events that are called by update. You can bind these to your own functions.
+        //! If you use the Window class, it will assign forward these to its own methods.
         std::tr1::function<void (Touch)> onTouchBegan, onTouchMoved, onTouchEnded;
         
         //! Returns the currently active TextInput instance, or 0.

data/Gosu/Version.hpp

@@ -3,8 +3,8 @@
 
 #define GOSU_MAJOR_VERSION 0
 #define GOSU_MINOR_VERSION 7
-#define GOSU_POINT_VERSION 35
-#define GOSU_VERSION "0.7.35"
+#define GOSU_POINT_VERSION 36
+#define GOSU_VERSION "0.7.36.2"
 
 #define GOSU_COPYRIGHT_NOTICE \
   "May contain `ogg', `vorbis' libraries (c) 2002-2008 Xiph.org Foundation" \

data/Gosu/Window.hpp

@@ -21,7 +21,7 @@
 namespace Gosu
 {
     //! Convenient all-in-one class that serves as the foundation of a standard
-	//! Gosu application. Manages initialization of all of Gosu's core components
+    //! Gosu application. Manages initialization of all of Gosu's core components
     //! and provides timing functionality.
     //! Note that you should really only use one instance of this class at the same time.
     //! This may or may not change later.
@@ -43,7 +43,8 @@ namespace Gosu
         
         double updateInterval() const;
 
-        //! Enters a modal loop where the Window is visible on screen and receives calls to draw, update etc.
+        //! Enters a modal loop where the Window is visible on screen and
+        //! receives calls to draw, update etc.
         void show();
         //! Closes the window if it is currently shown.
         void close();
@@ -61,9 +62,9 @@ namespace Gosu
         //! By default, the window is redrawn all the time.
         virtual bool needsRedraw() const { return true; }
 
-		//! If this function returns true, the system arrow cursor is drawn while
-		//! over the window.
-		virtual bool needsCursor() const { return false; }
+        //! If this function returns true, the system arrow cursor is drawn while
+        //! over the window.
+        virtual bool needsCursor() const { return false; }
         
         //! 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

data/GosuImpl/Graphics/BitmapFreeImage.cpp

@@ -3,6 +3,7 @@
 #include <Gosu/Platform.hpp>
 #include <Gosu/TR1.hpp>
 #include <Gosu/Utility.hpp>
+#include <stdexcept>
 #include <vector>
 #include <FreeImage.h>
 
@@ -75,10 +76,33 @@ namespace
     {
         return ((Gosu::Writer*)handle)->position();
     }
+    
+    // TODO: This is not thread safe!
+    
+    std::string lastFreeImageError;
+    
+    void DLL_CALLCONV FreeImageErrorHandler(FREE_IMAGE_FORMAT fif, const char *message)
+    {
+        lastFreeImageError = (message && message[0]) ? message : "Unknown error";
+        if (fif != FIF_UNKNOWN)
+            if (const char* format = FreeImage_GetFormatFromFIF(fif))
+                lastFreeImageError += std::string(" (in ") + format + " parser)";
+    }
+    
+    void checkForFreeImageErrors(bool value = true)
+    {
+        if (!value || !lastFreeImageError.empty())
+        {
+            std::string message = lastFreeImageError;
+            if (message.empty())
+                message = "Unknown error";
+            else
+                lastFreeImageError.clear();
+            throw std::runtime_error(message);
+        }
+    }
 }
 
-// TODO: error checking w/ FreeImage_SetOutputMessage?
-
 namespace Gosu
 {
     void FI(loadImageFile)(Bitmap& bitmap, const std::wstring& filename)
@@ -91,7 +115,7 @@ namespace Gosu
         FREE_IMAGE_FORMAT fif = FreeImage_GetFileType(utf8Filename.c_str());
         FIBITMAP* fib = FreeImage_Load(fif, utf8Filename.c_str(), GOSU_FIFLAGS);
         #endif
-
+        checkForFreeImageErrors(fib);
         fibToBitmap(bitmap, fib, fif);
     }
 
@@ -103,7 +127,7 @@ namespace Gosu
         FIMEMORY* fim = FreeImage_OpenMemory(&data[0], data.size());
         FREE_IMAGE_FORMAT fif = FreeImage_GetFileTypeFromMemory(fim);
         FIBITMAP* fib = FreeImage_LoadFromMemory(fif, fim, GOSU_FIFLAGS);
-
+        checkForFreeImageErrors(fib);
         fibToBitmap(bitmap, fib, fif);
     }
 
@@ -119,6 +143,7 @@ namespace Gosu
         FreeImage_Save(fif, fib, utf8Filename.c_str());
         #endif
         FreeImage_Unload(fib);
+        checkForFreeImageErrors();
     }
 
     void FI(saveImageFile)(const Bitmap& bitmap, Gosu::Writer writer,
@@ -131,5 +156,6 @@ namespace Gosu
         FreeImageIO fio = { NULL, WriteProc, SeekProc, TellProc };
         FreeImage_SaveToHandle(fif, fib, &fio, &writer);
         FreeImage_Unload(fib);
+        checkForFreeImageErrors();
     }
 }

data/GosuImpl/RubyGosu.swg

@@ -26,7 +26,7 @@
 %typemap(in) wchar_t {
     VALUE localTemporary = rb_obj_as_string($input);
     std::wstring localTemporary2 = Gosu::utf8ToWstring(StringValueCStr(localTemporary));
-	$1 = localTemporary2.empty() ? 0 : localTemporary2.at(0);
+    $1 = localTemporary2.empty() ? 0 : localTemporary2.at(0);
 }
 %typemap(out) wchar_t {
     if ($1 == 0)
@@ -203,7 +203,7 @@ namespace GosusDarkSide
     
     void yieldToOtherRubyThreads()
     {
-		rb_thread_schedule();
+        rb_thread_schedule();
     }
 }
 
@@ -216,8 +216,8 @@ namespace
 
 namespace Gosu
 {
-	#ifdef GOSU_IS_WIN
-    void ping_FreeImage()
+    #ifdef GOSU_IS_WIN
+    void requireFreeImageFor(const char* filename)
     {
         // Copied and pasted from MSDN.
         // TODO: Remove duplication, this is also in AudioAudiere.cpp
@@ -231,7 +231,9 @@ namespace Gosu
         }
         __except ((GetExceptionCode() == BAD_MOD) ? EXCEPTION_EXECUTE_HANDLER : EXCEPTION_CONTINUE_SEARCH)
         {
-            rb_raise(rb_eRuntimeError, "unable to locate FreeImage.dll");
+            rb_raise(rb_eRuntimeError,
+                "Could neither load image %s nor locate FreeImage.dll to retry with it",
+                filename);
         }
         #undef BAD_MOD
         #undef VcppException
@@ -250,15 +252,22 @@ namespace Gosu
             try {
                 loadImageFile(bitmap, filename);
                 return;
-	        } catch (const std::exception&) {
+            } catch (const std::exception&) {
             #ifdef GOSU_IS_WIN
-                ping_FreeImage();
-                loadImageFile_FreeImage(bitmap, filename);
+                requireFreeImageFor(filenameUTF8);
+                try {
+                    loadImageFile_FreeImage(bitmap, filename);
+                }
+                catch (const std::runtime_error& error) {
+                    rb_raise(rb_eRuntimeError,
+                        "Could not load image %s using either GDI+ or FreeImage: %s",
+                        filenameUTF8, error.what());
+                }
                 return;
-	        #else
-				throw;
-			#endif
-	        }  
+            #else
+                throw;
+            #endif
+            }  
         }
 
         // Otherwise, try to call .to_blob on it (works with RMagick, TexPlay etc).
@@ -590,8 +599,8 @@ namespace Gosu {
 %include "../Gosu/ButtonsMac.hpp"
 %init %{
     GosusDarkSide::oncePerTick = GosusDarkSide::yieldToOtherRubyThreads;
-	// While we are at it, to some healthy srand() - otherwise unavailable to Ruby people
-	std::srand(static_cast<unsigned int>(std::time(0)));
+    // While we are at it, to some healthy srand() - otherwise unavailable to Ruby people
+    std::srand(static_cast<unsigned int>(std::time(0)));
     std::rand(); // and flush the first value
 %}
 
@@ -685,12 +694,12 @@ namespace Gosu {
         $self->input().setTextInput(ti);
     }
     
-	double mouseX() const {
-		return $self->input().mouseX();
-	}
-	double mouseY() const {
-		return $self->input().mouseY();
-	}
+    double mouseX() const {
+        return $self->input().mouseX();
+    }
+    double mouseY() const {
+        return $self->input().mouseY();
+    }
     void setMousePosition(double x, double y) {
         $self->input().setMousePosition(x, y);
     }
@@ -701,12 +710,12 @@ namespace Gosu {
         $self->input().setMousePosition($self->input().mouseX(), y);
     }
     
-	int width() const {
-		return $self->graphics().width();
-	}
-	int height() const {
-		return $self->graphics().height();
-	}
+    int width() const {
+        return $self->graphics().width();
+    }
+    int height() const {
+        return $self->graphics().height();
+    }
     bool fullscreen() const {
         return $self->graphics().fullscreen();
     }

data/GosuImpl/RubyGosu_wrap.cxx

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.3
+ * Version 2.0.4
  * 
  * 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
@@ -2191,7 +2191,7 @@ static VALUE mGosu;
 #define SWIG_RUBY_THREAD_END_BLOCK
 
 
-#define SWIGVERSION 0x020003 
+#define SWIGVERSION 0x020004 
 #define SWIG_VERSION SWIGVERSION
 
 
@@ -2274,7 +2274,7 @@ namespace GosusDarkSide
     
     void yieldToOtherRubyThreads()
     {
-		rb_thread_schedule();
+        rb_thread_schedule();
     }
 }
 
@@ -2287,8 +2287,8 @@ namespace
 
 namespace Gosu
 {
-	#ifdef GOSU_IS_WIN
-    void ping_FreeImage()
+    #ifdef GOSU_IS_WIN
+    void requireFreeImageFor(const char* filename)
     {
         // Copied and pasted from MSDN.
         // TODO: Remove duplication, this is also in AudioAudiere.cpp
@@ -2302,7 +2302,9 @@ namespace Gosu
         }
         __except ((GetExceptionCode() == BAD_MOD) ? EXCEPTION_EXECUTE_HANDLER : EXCEPTION_CONTINUE_SEARCH)
         {
-            rb_raise(rb_eRuntimeError, "unable to locate FreeImage.dll");
+            rb_raise(rb_eRuntimeError,
+                "Could neither load image %s nor locate FreeImage.dll to retry with it",
+                filename);
         }
         #undef BAD_MOD
         #undef VcppException
@@ -2321,15 +2323,22 @@ namespace Gosu
             try {
                 loadImageFile(bitmap, filename);
                 return;
-	        } catch (const std::exception&) {
+            } catch (const std::exception&) {
             #ifdef GOSU_IS_WIN
-                ping_FreeImage();
-                loadImageFile_FreeImage(bitmap, filename);
+                requireFreeImageFor(filenameUTF8);
+                try {
+                    loadImageFile_FreeImage(bitmap, filename);
+                }
+                catch (const std::runtime_error& error) {
+                    rb_raise(rb_eRuntimeError,
+                        "Could not load image %s using either GDI+ or FreeImage: %s",
+                        filenameUTF8, error.what());
+                }
                 return;
-	        #else
-				throw;
-			#endif
-	        }  
+            #else
+                throw;
+            #endif
+            }  
         }
 
         // Otherwise, try to call .to_blob on it (works with RMagick, TexPlay etc).
@@ -2437,7 +2446,7 @@ SWIG_ruby_failed(void)
 } 
 
 
-/*@SWIG:/usr/local/Cellar/swig/2.0.3/share/swig/2.0.3/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/usr/local/Cellar/swig/2.0.4/share/swig/2.0.4/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2DBL(VALUE *args)
 {
   VALUE obj = args[0];
@@ -2479,7 +2488,7 @@ SWIG_From_unsigned_SS_int  (unsigned int value)
 #include <string>
 
 
-/*@SWIG:/usr/local/Cellar/swig/2.0.3/share/swig/2.0.3/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/usr/local/Cellar/swig/2.0.4/share/swig/2.0.4/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2ULONG(VALUE *args)
 {
   VALUE obj = args[0];
@@ -2595,7 +2604,7 @@ SWIG_From_bool  (bool value)
 }
 
 
-/*@SWIG:/usr/local/Cellar/swig/2.0.3/share/swig/2.0.3/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/usr/local/Cellar/swig/2.0.4/share/swig/2.0.4/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2LONG(VALUE *args)
 {
   VALUE obj = args[0];
@@ -2786,11 +2795,11 @@ SWIGINTERN void Gosu_Window_setTextInput(Gosu::Window *self,Gosu::TextInput *ti)
         self->input().setTextInput(ti);
     }
 SWIGINTERN double Gosu_Window_mouseX(Gosu::Window const *self){
-		return self->input().mouseX();
-	}
+        return self->input().mouseX();
+    }
 SWIGINTERN double Gosu_Window_mouseY(Gosu::Window const *self){
-		return self->input().mouseY();
-	}
+        return self->input().mouseY();
+    }
 SWIGINTERN void Gosu_Window_setMousePosition(Gosu::Window *self,double x,double y){
         self->input().setMousePosition(x, y);
     }
@@ -2801,11 +2810,11 @@ SWIGINTERN void Gosu_Window_setMouseY(Gosu::Window *self,double y){
         self->input().setMousePosition(self->input().mouseX(), y);
     }
 SWIGINTERN int Gosu_Window_width(Gosu::Window const *self){
-		return self->graphics().width();
-	}
+        return self->graphics().width();
+    }
 SWIGINTERN int Gosu_Window_height(Gosu::Window const *self){
-		return self->graphics().height();
-	}
+        return self->graphics().height();
+    }
 SWIGINTERN bool Gosu_Window_fullscreen(Gosu::Window const *self){
         return self->graphics().fullscreen();
     }
@@ -11241,8 +11250,8 @@ SWIGEXPORT void Init_gosu(void) {
   SWIG_RubyInitializeTrackings();
   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 >(7)));
-  rb_define_const(mGosu, "POINT_VERSION", SWIG_From_int(static_cast< int >(35)));
-  rb_define_const(mGosu, "VERSION", SWIG_FromCharPtr("0.7.35"));
+  rb_define_const(mGosu, "POINT_VERSION", SWIG_From_int(static_cast< int >(36)));
+  rb_define_const(mGosu, "VERSION", SWIG_FromCharPtr("0.7.36.2"));
   rb_define_const(mGosu, "GOSU_COPYRIGHT_NOTICE", SWIG_FromCharPtr("May contain `ogg\', `vorbis\' libraries (c) 2002-2008 Xiph.org Foundation\n\nRedistribution and use in source and binary forms, with or withoutmodification, are permitted provided that the following conditionsare met:\n\n- Redistributions of source code must retain the above copyrightnotice, this list of conditions and the following disclaimer.\n\n- Redistributions in binary form must reproduce the above copyrightnotice, this list of conditions and the following disclaimer in thedocumentation and/or other materials provided with the distribution.\n\n- Neither the name of the Xiph.org Foundation nor the names of itscontributors may be used to endorse or promote products derived fromthis software without specific prior written permission.\n\nTHIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS``AS IS\'\' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOTLIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FORA PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATIONOR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOTLIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANYTHEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USEOF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."));
   rb_define_module_function(mGosu, "milliseconds", VALUEFUNC(_wrap_milliseconds), -1);
   rb_define_module_function(mGosu, "random", VALUEFUNC(_wrap_random), -1);

data/GosuImpl/RubyGosu_wrap.h

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.3
+ * Version 2.0.4
  * 
  * 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/TimingUnix.cpp

@@ -9,10 +9,10 @@ void Gosu::sleep(unsigned milliseconds)
 
 unsigned long Gosu::milliseconds()
 {
-	timeval tp;
-	gettimeofday(&tp, NULL);
+    timeval tp;
+    gettimeofday(&tp, NULL);
     // Truncate to 2^30, C++ users shouldn't mind and Ruby users will
     // have a happy GC on 32-bit systems.
     // No, don't ask why this is an unsigned long then :)
-	return (tp.tv_usec / 1000UL + tp.tv_sec * 1000UL) & 0x1fffffff;
+    return (tp.tv_usec / 1000UL + tp.tv_sec * 1000UL) & 0x1fffffff;
 }

data/lib/gosu/preview.rb

@@ -0,0 +1,116 @@
+require 'gosu'
+
+# Wrapper around Gosu 0.7 that provides the work-in-progress 0.8 interface
+
+module Gosu
+  class Font
+    alias :initialize07 :initialize
+    
+    def initialize *args
+      if args.first.is_a? Gosu::Window then
+        initialize07 *args
+      else
+        height  = args[0]
+        options = args[1] || {}
+        name = options[:name] || Gosu::default_font_name
+        initialize07 $window, name, height
+      end
+    end
+  end
+  
+  class Window
+    alias :initialize07 :initialize
+    
+    def initialize width, height, *args
+      if args.empty? or args.first.is_a? Hash then
+       options = args.first || {}
+       fullscreen = !!options[:fullscreen]
+       update_interval = options[:update_interval] || 16.66
+      else
+       fullscreen, update_interval = *args
+      end
+      $window = initialize07 width, height, fullscreen, update_interval
+    end
+  end
+  
+  class Image
+    alias :initialize07 :initialize
+    
+    def initialize *args
+      if args.first.is_a? Gosu::Window then
+        initialize07 *args
+      else
+        source = args[0]
+        tileable = !args[1] || args[1][:tileable]
+        initialize07 $window, source, !!tileable
+      end
+    end
+    
+    class <<self
+      alias load_tiles07 load_tiles
+    end
+    
+    def self.load_tiles *args
+      if args.first.is_a? Gosu::Window then
+        load_tiles07 *args
+      else
+        source = args[0]
+        x, y = args[1..2]
+        tileable = !args[3] || args[3][:tileable]
+        load_tiles07 $window, source, x, y, !!tileable
+      end
+    end
+    
+    def self.from_text *args
+      if args.first.is_a? Gosu::Window then
+        args.size == 4 ? from_text4(*args) : from_text7(*args)
+      else
+        text      = args[0]
+        height    = args[1]
+        options   = args[2] || {}
+        font      = options[:font]    || Gosu::default_font_name
+        if width  = options[:width] then
+          spacing = options[:spacing] || 0
+          align   = options[:align]   || :left
+          Gosu::Image.from_text7 $window, text, font, height, spacing, width, align
+        else
+          Gosu::Image.from_text4 $window, text, font, height
+        end
+      end
+    end
+  end
+  
+  def self.draw_quad *args
+    $window.draw_quad *args
+  end
+  
+  def self.clip_to *args
+    $window.clip_to *args do
+      yield
+    end
+  end
+  
+  def self.translate *args
+    $window.translate *args do
+      yield
+    end
+  end
+  
+  def self.scale *args
+    $window.scale *args do
+      yield
+    end
+  end
+  
+  def self.rotate *args
+    $window.rotate *args do
+      yield
+    end
+  end
+  
+  def self.transform *args
+    $window.transform *args do
+      yield
+    end
+  end
+end

data/lib/gosu/run.rb

@@ -0,0 +1,11 @@
+# Replace the load path
+$LOAD_PATH.clear
+$LOAD_PATH << File.dirname(__FILE__)[0..-6]
+$LOAD_PATH << $LOAD_PATH[0] + '/lib'
+# Ruby portions of Gosu
+require 'gosu/patches'
+require 'gosu/swig_patches'
+# Let the application know it is being run from the Mac app wrapper.
+OSX_EXECUTABLE = true
+# Main application
+require 'Main'

data/lib/gosu/zen.rb

@@ -0,0 +1,28 @@
+require 'gosu'
+require 'singleton'
+
+module Gosu
+  class ZenWindow < Window
+    include Singleton
+    
+    def initialize
+      super 800, 600, false
+    end
+  end
+end
+
+def set what, value
+  Gosu::ZenWindow.instance.send "#{what}=", value
+end
+
+def update(&proc)
+  Gosu::ZenWindow.send :define_method, :update, proc
+end
+
+# WIP - needs all other callbacks, even with arguments
+
+# WIP - needs to be compatible with gosu/preview.rb later
+
+at_exit do
+  Gosu::ZenWindow.instance.show
+end

data/linux/extconf.rb

@@ -48,7 +48,7 @@ MAC_FILES = %w(
 )
 
 LINUX_FILES = %w(
-  Audio/AudioSDL.cpp
+  Audio/AudioOpenAL.cpp
   Graphics/BitmapFreeImage.cpp
   Graphics/TextUnix.cpp
   InputX.cpp
@@ -88,8 +88,7 @@ else
   pango_config = "pkg-config pangoft2"
 
   $INCFLAGS << " `#{sdl_config} --cflags` `#{pango_config} --cflags`"
-  $LDFLAGS  << " `#{sdl_config} --libs`   `#{pango_config} --libs` -lX11"
-  have_header('SDL_mixer.h') if have_library('SDL_mixer', 'Mix_OpenAudio')
+  $LDFLAGS  << " `#{sdl_config} --libs`   `#{pango_config} --libs` -lXdamage -lX11"
   have_header('SDL_ttf.h') if have_library('SDL_ttf', 'TTF_RenderUTF8_Blended')
   have_header('gl.h') if have_library('GL', 'glMatrixMode')
   have_header('FreeImage.h') if have_library('freeimage', 'FreeImage_ConvertFromRawBits')

metadata

@@ -1,25 +1,25 @@
 --- !ruby/object:Gem::Specification 
 name: gosu
 version: !ruby/object:Gem::Version 
-  hash: 69
+  hash: 227
   prerelease: 
   segments: 
   - 0
   - 7
-  - 35
-  version: 0.7.35
+  - 36
+  - 2
+  version: 0.7.36.2
 platform: ruby
 authors: 
 - Julian Raschke
-- Jan Luecker
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-08-12 00:00:00 Z
+date: 2011-08-25 00:00:00 Z
 dependencies: []
 
-description: "  2D game development library.\n\n  Gosu features easy to use and game-friendly interfaces to 2D graphics\n  and text (accelerated by 3D hardware), sound samples and music as well as\n  keyboard, mouse and gamepad/joystick input.\n\n  Also includes demos for integration with RMagick, Chipmunk and Ruby-OpenGL.\n"
+description: "  2D game development library.\n\n  Gosu features easy to use and game-friendly interfaces to 2D graphics\n  and text (accelerated by 3D hardware), sound samples and music as well as\n  keyboard, mouse and gamepad/joystick input.\n\n  Also includes demos for integration with RMagick, Chipmunk and OpenGL.\n"
 email: julian@raschke.de
 executables: []
 
@@ -60,9 +60,12 @@ files:
 - Gosu/Version.hpp
 - Gosu/Window.hpp
 - Gosu/WinUtility.hpp
-- lib/gosu.rb
 - lib/gosu/patches.rb
+- lib/gosu/preview.rb
+- lib/gosu/run.rb
 - lib/gosu/swig_patches.rb
+- lib/gosu/zen.rb
+- lib/gosu.rb
 - examples/ChipmunkIntegration.rb
 - examples/CptnRuby.rb
 - examples/MoreChipmunkAndRMagick.rb
@@ -206,7 +209,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: 
 - See https://github.com/jlnr/gosu/wiki/Getting-Started-on-Linux
 rubyforge_project: 
-rubygems_version: 1.8.7
+rubygems_version: 1.8.9
 signing_key: 
 specification_version: 3
 summary: 2D game development library.