gosu 0.8.3 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c784033452e0c201c224b718caa97cc809751dc
-  data.tar.gz: cd1442a5124881f9ac41527e9f10f730a309df0f
+  metadata.gz: a2094143800954943e5e1d0caa49cb31ade07524
+  data.tar.gz: db763a9ef9839cdbae87f22b429f11b33a5fa045
 SHA512:
-  metadata.gz: 90d46482cec5683d8a938d9be06fc69a7b1d8dec11299cca49351b23c86c2e377cdb38595ccdf93b0afd1f85b92246a75718cd6b96007e357b62cf9db7379d8b
-  data.tar.gz: b09fd1d374921955fd6da5ce9caac843948e6ee0f33fc5ff758dbc940cc48f30ee4c2fb43b08a7bb6c19b0d5c3a78841d7db99cdd49b4d6b7a34196ad25bf2f8
+  metadata.gz: 4d402e2be429707bc108ce0a0f409156c03f2f5f582f15ad624b1d8527bbd9709deecf457184aee0e4e24c664fac13b91c02adb182519a7931f07b506f03dccd
+  data.tar.gz: 94a2b28e2490fd40c5b3a2e61f6c9b10d6d1b4fe07534076e7c688b5501506e800dc4f1bf47b8c5fb82bbcb4c607fb56c94fc5d3c05208a57eedd4a98cdb2b0d

data/Gosu/Graphics.hpp

@@ -12,12 +12,6 @@
 
 namespace Gosu
 {
-    //! Returns the width, in pixels, of the user's primary screen.
-    unsigned screenWidth();
-    
-    //! Returns the height, in pixels, of the user's primary screen.
-    unsigned screenHeight();
-    
     //! Returns the maximum size of an texture that will be allocated
     //! internally by Gosu.
     //! Useful when extending Gosu using OpenGL.

data/Gosu/Version.hpp

@@ -3,8 +3,8 @@
 
 #define GOSU_MAJOR_VERSION 0
 #define GOSU_MINOR_VERSION 8
-#define GOSU_POINT_VERSION 3
-#define GOSU_VERSION "0.8.3"
+#define GOSU_POINT_VERSION 4
+#define GOSU_VERSION "0.8.4"
 
 #define GOSU_COPYRIGHT_NOTICE \
     "This software uses the following third-party libraries:\n" \

data/Gosu/Window.hpp

@@ -20,6 +20,20 @@
 
 namespace Gosu
 {
+    //! Returns the width (in pixels) of the user's primary screen.
+    unsigned screenWidth();
+    
+    //! Returns the height (in pixels) of the user's primary screen.
+    unsigned screenHeight();
+    
+    //! 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.
+    unsigned availableWidth();
+    
+    //! 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.
+    unsigned availableHeight();
+    
     //! Convenient all-in-one class that serves as the foundation of a standard
     //! Gosu application. Manages initialization of all of Gosu's core components
     //! and provides timing functionality.
@@ -38,6 +52,9 @@ namespace Gosu
 	
     public:
         //! Constructs a Window.
+        //! \param width Width of the window in points; that is, pixels on a normal display, and 'virtual pixels' on a
+        //! high-resolution display.
+        //! \param height See width.
         //! \param updateInterval Interval in milliseconds between two calls
         //! to the update member function.
         Window(unsigned width, unsigned height, bool fullscreen,
@@ -63,8 +80,8 @@ namespace Gosu
         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 cause
-        //! redraws for one reason or another.
+        //! 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 needsRedraw() const { return true; }
 

data/ext/gosu/extconf.rb

@@ -28,6 +28,7 @@ BASE_FILES = %w(
   Graphics/Graphics.cpp
   Graphics/Image.cpp
   Graphics/LargeImageData.cpp
+  Graphics/Resolution.cpp
   Graphics/TexChunk.cpp
   Graphics/Texture.cpp
   Graphics/Transform.cpp
@@ -45,6 +46,7 @@ BASE_FILES = %w(
 MAC_FILES = %w(
   Audio/AudioOpenAL.mm
   Bitmap/BitmapApple.mm
+  Graphics/ResolutionApple.mm
   Text/TextApple.mm
   Text/TextMac.cpp
   TimingApple.cpp

data/ext/gosu/gosu_wrap.cxx

@@ -3379,50 +3379,6 @@ fail:
 }
 
 
-SWIGINTERN VALUE
-_wrap_screen_width(int argc, VALUE *argv, VALUE self) {
-  unsigned int result;
-  VALUE vresult = Qnil;
-  
-  if ((argc < 0) || (argc > 0)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
-  }
-  {
-    try {
-      result = (unsigned int)Gosu::screenWidth();
-    } catch (const std::exception& e) {
-      SWIG_exception(SWIG_RuntimeError, e.what());
-    }
-  }
-  vresult = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(result));
-  return vresult;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_screen_height(int argc, VALUE *argv, VALUE self) {
-  unsigned int result;
-  VALUE vresult = Qnil;
-  
-  if ((argc < 0) || (argc > 0)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
-  }
-  {
-    try {
-      result = (unsigned int)Gosu::screenHeight();
-    } catch (const std::exception& e) {
-      SWIG_exception(SWIG_RuntimeError, e.what());
-    }
-  }
-  vresult = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(result));
-  return vresult;
-fail:
-  return Qnil;
-}
-
-
 SWIGINTERN VALUE
 _wrap_language(int argc, VALUE *argv, VALUE self) {
   std::string result;
@@ -8270,6 +8226,94 @@ fail:
 }
 
 
+SWIGINTERN VALUE
+_wrap_screen_width(int argc, VALUE *argv, VALUE self) {
+  unsigned int result;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 0) || (argc > 0)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
+  }
+  {
+    try {
+      result = (unsigned int)Gosu::screenWidth();
+    } catch (const std::exception& e) {
+      SWIG_exception(SWIG_RuntimeError, e.what());
+    }
+  }
+  vresult = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(result));
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_screen_height(int argc, VALUE *argv, VALUE self) {
+  unsigned int result;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 0) || (argc > 0)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
+  }
+  {
+    try {
+      result = (unsigned int)Gosu::screenHeight();
+    } catch (const std::exception& e) {
+      SWIG_exception(SWIG_RuntimeError, e.what());
+    }
+  }
+  vresult = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(result));
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_available_width(int argc, VALUE *argv, VALUE self) {
+  unsigned int result;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 0) || (argc > 0)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
+  }
+  {
+    try {
+      result = (unsigned int)Gosu::availableWidth();
+    } catch (const std::exception& e) {
+      SWIG_exception(SWIG_RuntimeError, e.what());
+    }
+  }
+  vresult = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(result));
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_available_height(int argc, VALUE *argv, VALUE self) {
+  unsigned int result;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 0) || (argc > 0)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
+  }
+  {
+    try {
+      result = (unsigned int)Gosu::availableHeight();
+    } catch (const std::exception& e) {
+      SWIG_exception(SWIG_RuntimeError, e.what());
+    }
+  }
+  vresult = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(result));
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
 static swig_class SwigClassWindow;
 
 #ifdef HAVE_RB_DEFINE_ALLOC_FUNC
@@ -10832,8 +10876,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 >(8)));
-  rb_define_const(mGosu, "POINT_VERSION", SWIG_From_int(static_cast< int >(3)));
-  rb_define_const(mGosu, "VERSION", SWIG_FromCharPtr("0.8.3"));
+  rb_define_const(mGosu, "POINT_VERSION", SWIG_From_int(static_cast< int >(4)));
+  rb_define_const(mGosu, "VERSION", SWIG_FromCharPtr("0.8.4"));
   rb_define_const(mGosu, "GOSU_COPYRIGHT_NOTICE", SWIG_FromCharPtr("This software uses the following third-party libraries:\n\nGosu, http://www.libgosu.org, MIT License, http://opensource.org/licenses/MIT\nSDL 2, http://www.libsdl.org, MIT License, http://opensource.org/licenses/MIT\nFreeImage, http://freeimage.sourceforge.net, FreeImage Public License\nlibogg & libvorbis, http://www.xiph.org, BSD License, 3-Clause Version, http://www.xiph.org/licenses/bsd\nlibsndfile, http://www.mega-nerd.com/libsndfile, GNU LGPL 3, http://www.gnu.org/copyleft/lesser.html\nOpenAL Soft, http://kcat.strangesoft.net/openal.html, GNU LGPL 2, http://www.gnu.org/licenses/old-licenses/lgpl-2.0.html\n"));
   rb_define_module_function(mGosu, "milliseconds", VALUEFUNC(_wrap_milliseconds), -1);
   rb_define_module_function(mGosu, "random", VALUEFUNC(_wrap_random), -1);
@@ -10846,8 +10890,6 @@ SWIGEXPORT void Init_gosu(void) {
   rb_define_module_function(mGosu, "normalize_angle", VALUEFUNC(_wrap_normalize_angle), -1);
   rb_define_module_function(mGosu, "distance", VALUEFUNC(_wrap_distance), -1);
   rb_define_module_function(mGosu, "default_font_name", VALUEFUNC(_wrap_default_font_name), -1);
-  rb_define_module_function(mGosu, "screen_width", VALUEFUNC(_wrap_screen_width), -1);
-  rb_define_module_function(mGosu, "screen_height", VALUEFUNC(_wrap_screen_height), -1);
   rb_define_const(mGosu, "MAX_TEXTURE_SIZE", SWIG_From_unsigned_SS_int(static_cast< unsigned int >(Gosu::MAX_TEXTURE_SIZE)));
   rb_define_module_function(mGosu, "language", VALUEFUNC(_wrap_language), -1);
   rb_define_module_function(mGosu, "enable_undocumented_retrofication", VALUEFUNC(_wrap_enable_undocumented_retrofication), -1);
@@ -11223,6 +11265,10 @@ SWIGEXPORT void Init_gosu(void) {
   SwigClassTextInput.mark = 0;
   SwigClassTextInput.destroy = (void (*)(void *)) free_Gosu_TextInput;
   SwigClassTextInput.trackObjects = 1;
+  rb_define_module_function(mGosu, "screen_width", VALUEFUNC(_wrap_screen_width), -1);
+  rb_define_module_function(mGosu, "screen_height", VALUEFUNC(_wrap_screen_height), -1);
+  rb_define_module_function(mGosu, "available_width", VALUEFUNC(_wrap_available_width), -1);
+  rb_define_module_function(mGosu, "available_height", VALUEFUNC(_wrap_available_height), -1);
   rb_define_module_function(mGosu, "disown_Window", VALUEFUNC(_wrap_disown_Window), -1);
   
   SwigClassWindow.klass = rb_define_class_under(mGosu, "Window", rb_cObject);

data/src/Audio/AudioOpenAL.cpp

@@ -155,7 +155,7 @@ struct Gosu::Sample::SampleData
         alBufferData(buffer,
                      audioFile.format(),
                      &audioFile.decodedData().front(),
-                     audioFile.decodedData().size(),
+                     (ALsizei)audioFile.decodedData().size(),
                      audioFile.sampleRate());
     }
     
@@ -352,7 +352,7 @@ class Gosu::Song::StreamData : public BaseData
         char audioData[BUFFER_SIZE];
         std::size_t readBytes = file->readData(audioData, BUFFER_SIZE);
         if (readBytes > 0)
-            alBufferData(buffer, file->format(), audioData, readBytes, file->sampleRate());
+            alBufferData(buffer, file->format(), audioData, (ALsizei)readBytes, file->sampleRate());
         return readBytes > 0;
     }
     

data/src/Graphics/ClipRectStack.hpp

@@ -21,7 +21,7 @@ class Gosu::ClipRectStack
         }
         
         ClipRect result = { 0.0, 0.0, 1e10, 1e10 };
-        for (int i = 0, end = stack.size(); i < end; ++i)
+        for (std::size_t i = 0, end = stack.size(); i < end; ++i)
         {
             const ClipRect& rect = stack[i];
             int resultRight = std::min(result.x + result.width, rect.x + rect.width);

data/src/Graphics/Color.cpp

@@ -111,10 +111,10 @@ void Gosu::Color::setValue(double v)
 
 Gosu::Color Gosu::interpolate(Color a, Color b, double weight)
 {
-    return Color(clamp<int>(round(Gosu::interpolate(a.alpha(), b.alpha(), weight)), 0, 255),
-                 clamp<int>(round(Gosu::interpolate(a.red(),   b.red(),   weight)), 0, 255),
-                 clamp<int>(round(Gosu::interpolate(a.green(), b.green(), weight)), 0, 255),
-                 clamp<int>(round(Gosu::interpolate(a.blue(),  b.blue(),  weight)), 0, 255));
+    return Color(clamp<long>(round(Gosu::interpolate(a.alpha(), b.alpha(), weight)), 0, 255),
+                 clamp<long>(round(Gosu::interpolate(a.red(),   b.red(),   weight)), 0, 255),
+                 clamp<long>(round(Gosu::interpolate(a.green(), b.green(), weight)), 0, 255),
+                 clamp<long>(round(Gosu::interpolate(a.blue(),  b.blue(),  weight)), 0, 255));
 }
 
 Gosu::Color Gosu::multiply(Color a, Color b)

data/src/Graphics/LargeImageData.cpp

@@ -12,8 +12,8 @@ Gosu::LargeImageData::LargeImageData(Graphics& graphics,
 {
     fullWidth = source.width();
     fullHeight = source.height();
-    partsX = trunc(ceil(1.0 * source.width() / partWidth));
-    partsY = trunc(ceil(1.0 * source.height() / partHeight));
+    partsX = static_cast<unsigned>(trunc(ceil(1.0 * source.width() / partWidth)));
+    partsY = static_cast<unsigned>(trunc(ceil(1.0 * source.height() / partHeight)));
     this->partWidth = partWidth;
     this->partHeight = partHeight;
 

data/src/Graphics/Macro.hpp

@@ -183,7 +183,7 @@ class Gosu::Macro : public Gosu::ImageData
             it->renderState.apply();
             glMultMatrixd(&transform[0]);
             glInterleavedArrays(GL_T2F_C4UB_V3F, 0, &it->vertices[0]);
-            glDrawArrays(GL_QUADS, 0, it->vertices.size());
+            glDrawArrays(GL_QUADS, 0, (GLsizei)it->vertices.size());
             glPopMatrix();
         }
         #endif

data/src/Graphics/RenderState.hpp

@@ -33,7 +33,9 @@ struct Gosu::RenderState
             glBindTexture(GL_TEXTURE_2D, texture->texName());
         }
         else
+        {
             glDisable(GL_TEXTURE_2D);
+        }
     }
     
     void applyAlphaMode() const
@@ -49,7 +51,9 @@ struct Gosu::RenderState
     void applyClipRect() const
     {
         if (clipRect.width == NO_CLIPPING)
+        {
             glDisable(GL_SCISSOR_TEST);
+        }
         else
         {
             glEnable(GL_SCISSOR_TEST);
@@ -187,9 +191,6 @@ public:
     // The cached values may have been messed with. Reset them again.
     void enforceAfterUntrustedGL() const
     {
-        // TODO: Actually, we don't have to worry about anything pushed
-        // using glPushAttribs because beginGL/endGL will take care of that.
-        
         applyTexture();
         applyTransform();
         applyClipRect();

data/src/Graphics/Resolution.cpp

@@ -0,0 +1,92 @@
+#include <Gosu/Gosu.hpp>
+
+#ifdef GOSU_IS_WIN
+#include <windows.h>
+// Note: This does not use the SDL2 variant below, which reports 2560x1920 in my Windows VM, which is running at 2560x1080. Last checked with SDL 2.0.3.
+// TODO: Try this on a real Windows machine.
+
+unsigned Gosu::screenWidth()
+{
+    return GetSystemMetrics(SM_CXSCREEN);
+}
+    
+unsigned Gosu::screenHeight()
+{
+    return GetSystemMetrics(SM_CYSCREEN);
+}
+
+// Note: It is okay for this couple of functions to be OS-specific.
+namespace
+{
+    SIZE calculateAvailableSize()
+    {
+        RECT workArea;
+        SystemParametersInfo(SPI_GETWORKAREA, 0, &workArea, 0);
+
+        RECT windowSize = workArea;
+        // Note: This should be kept in sync with STYLE_NORMAL in SDL_windowswindow.c.
+        DWORD style = WS_OVERLAPPED | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX;
+        AdjustWindowRectEx(&windowSize, style, FALSE, 0);
+
+        SIZE availableSize;
+        availableSize.cx = 2 * (workArea.right - workArea.left) - (windowSize.right - windowSize.left);
+        availableSize.cy = 2 * (workArea.bottom - workArea.top) - (windowSize.bottom - windowSize.top);
+        return availableSize;
+    }
+
+    SIZE availableSize = calculateAvailableSize();
+}
+
+unsigned Gosu::availableWidth()
+{
+    return availableSize.cx;
+}
+
+unsigned Gosu::availableHeight()
+{
+    return availableSize.cy;
+}
+#else
+#include <SDL2/SDL.h>
+
+namespace
+{
+    SDL_DisplayMode currentDisplayMode = { 0, 0 };
+}
+
+unsigned Gosu::screenWidth()
+{
+    // TODO - not thread-safe
+    if (currentDisplayMode.w == 0) {
+        SDL_Init(SDL_INIT_VIDEO);
+        SDL_GetDisplayMode(0, 0, &currentDisplayMode);
+        SDL_QuitSubSystem(SDL_INIT_VIDEO);
+    }
+    return currentDisplayMode.w;
+}
+
+unsigned Gosu::screenHeight()
+{
+    // TODO - not thread-safe
+    if (currentDisplayMode.h == 0) {
+        SDL_Init(SDL_INIT_VIDEO);
+        SDL_GetDisplayMode(0, 0, &currentDisplayMode);
+        SDL_QuitSubSystem(SDL_INIT_VIDEO);
+    }
+    return currentDisplayMode.h;
+}
+
+// Pessimistic fallback implementation for availableWidth / availableHeight.
+
+#if !defined(GOSU_IS_MAC)
+unsigned Gosu::availableWidth()
+{
+    return Gosu::screenWidth() * 0.9;
+}
+
+unsigned Gosu::availableHeight()
+{
+    return Gosu::screenHeight() * 0.8;
+}
+#endif
+#endif

data/src/Graphics/ResolutionApple.mm

@@ -0,0 +1,19 @@
+#include <Gosu/Gosu.hpp>
+#import <AppKit/AppKit.h>
+
+namespace Gosu
+{
+    NSUInteger styleMaskFromSDL2 = NSTitledWindowMask | NSClosableWindowMask | NSMiniaturizableWindowMask;
+    NSRect availableFrame = [[[NSScreen screens] objectAtIndex:0] visibleFrame];
+    NSRect availableContentFrame = [NSWindow contentRectForFrameRect:availableFrame styleMask:styleMaskFromSDL2];
+}
+
+unsigned Gosu::availableWidth()
+{
+    return availableContentFrame.size.width;
+}
+
+unsigned Gosu::availableHeight()
+{
+    return availableContentFrame.size.height;
+}

data/src/Inspection.cpp

@@ -5,12 +5,13 @@ namespace Gosu
 {
     namespace FPS
     {
-        int fps, accum, sec;
+        int fps, accum;
+        unsigned long sec;
 
         void registerFrame()
         {
             ++accum;
-            int newSec = Gosu::milliseconds() / 1000;
+            unsigned long newSec = Gosu::milliseconds() / 1000;
             if (sec != newSec)
             {
                 sec = newSec;

data/src/Text/FormattedString.hpp

@@ -123,7 +123,7 @@ namespace Gosu
                     len >= pos + 10 && html[pos + 9] == L'>')
                 {
                     using namespace std;
-                    unsigned rgb = wcstoul(html + pos + 3, 0, 16);
+                    unsigned rgb = static_cast<std::tr1::uint32_t>(wcstoul(html + pos + 3, 0, 16));
                     c.push_back(0xff000000 | rgb);
                     pos += 10;
                     continue;
@@ -132,7 +132,7 @@ namespace Gosu
                     len >= pos + 12 && html[pos + 11] == L'>')
                 {
                     using namespace std;
-                    unsigned argb = wcstoul(html + pos + 3, 0, 16);
+                    unsigned argb = static_cast<std::tr1::uint32_t>(wcstoul(html + pos + 3, 0, 16));
                     c.push_back(argb);
                     pos += 12;
                     continue;
@@ -241,15 +241,15 @@ namespace Gosu
                 return characters[index].color;
         }
         
-        unsigned length() const
+        std::size_t length() const
         {
-            if (unsigned len = characters.size())
+            if (std::size_t len = characters.size())
                 return len;
             else
                 return simpleString.length();
         }
         
-        FormattedString range(unsigned begin, unsigned end) const
+        FormattedString range(std::size_t begin, std::size_t end) const
         {
             FormattedString result;
             if (characters.empty())

data/src/Text/TextApple.mm

@@ -168,7 +168,7 @@ void Gosu::drawText(Bitmap& bitmap, const wstring& text, int x, int y,
     CGSize size = [string.obj() sizeWithFont: font];
     #endif
     
-    unsigned width = round(size.width / size.height * fontHeight);
+    unsigned width = static_cast<unsigned>(round(size.width / size.height * fontHeight));
 
     // Get the width and height of the image
     Bitmap bmp(width, fontHeight);

data/src/Window.cpp

@@ -12,30 +12,6 @@ namespace Gosu
     {
         void registerFrame();
     }
-    
-    SDL_DisplayMode currentDisplayMode = { 0, 0 };
-}
-
-unsigned Gosu::screenWidth()
-{
-    // TODO - not thread-safe
-    if (currentDisplayMode.w == 0) {
-        SDL_Init(SDL_INIT_VIDEO);
-        SDL_GetDisplayMode(0, 0, &currentDisplayMode);
-        SDL_QuitSubSystem(SDL_INIT_VIDEO);
-    }
-    return currentDisplayMode.w;
-}
-
-unsigned Gosu::screenHeight()
-{
-    // TODO - not thread-safe
-    if (currentDisplayMode.h == 0) {
-        SDL_Init(SDL_INIT_VIDEO);
-        SDL_GetDisplayMode(0, 0, &currentDisplayMode);
-        SDL_QuitSubSystem(SDL_INIT_VIDEO);
-    }
-    return currentDisplayMode.h;
 }
 
 struct Gosu::Window::Impl
@@ -78,8 +54,8 @@ Gosu::Window::Window(unsigned width, unsigned height, bool fullscreen, double up
     else {
         // TODO - get platform-specific best width/height we could get
         
-        double maxWidth = Gosu::screenWidth() * 0.9;
-        double maxHeight = Gosu::screenHeight() * 0.8;
+        double maxWidth = Gosu::availableWidth();
+        double maxHeight = Gosu::availableHeight();
         
         if (width > maxWidth || height > maxHeight) {
             scaleFactor = std::min(maxWidth / width, maxHeight / height);
@@ -88,15 +64,17 @@ Gosu::Window::Window(unsigned width, unsigned height, bool fullscreen, double up
         }
     }
     
+    Uint32 flags = SDL_WINDOW_OPENGL;
+#if SDL_VERSION_ATLEAST(2, 0, 1)
+    flags |= SDL_WINDOW_ALLOW_HIGHDPI;
+#endif
+    if (fullscreen) {
+        flags |= SDL_WINDOW_FULLSCREEN_DESKTOP;
+    }
+    
     pimpl->window = SDL_CreateWindow("",
         SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED,
-        actualWidth, actualHeight,
-        SDL_WINDOW_OPENGL |
-// Note: This flag is not available in all versions of SDL 2, e.g. SDL 2.0.0 on OpenSuSE 13.1.
-#ifdef SDL_WINDOW_ALLOW_HIGHDPI
-        SDL_WINDOW_ALLOW_HIGHDPI |
-#endif
-        (fullscreen ? SDL_WINDOW_FULLSCREEN_DESKTOP : 0));
+        actualWidth, actualHeight, flags);
 
 #ifdef GOSU_IS_OPENGLES
     SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 1);
@@ -174,19 +152,21 @@ void Gosu::Window::show()
         
         SDL_ShowCursor(needsCursor());
         
-        if (graphics().begin()) {
-            draw();
-            graphics().end();
-            FPS::registerFrame();
+        if (needsRedraw()) {
+            if (graphics().begin()) {
+                draw();
+                graphics().end();
+                FPS::registerFrame();
+            }
+            
+            SDL_GL_SwapWindow(pimpl->window);
+            
+            if (GosusDarkSide::oncePerTick) GosusDarkSide::oncePerTick();
         }
-	    
-        SDL_GL_SwapWindow(pimpl->window);
-        
-        if (GosusDarkSide::oncePerTick) GosusDarkSide::oncePerTick();
         
         // Sleep to keep this loop from eating 100% CPU.
-        unsigned int frameTime = milliseconds() - startTime;
-        if (frameTime > 0 && frameTime < pimpl->updateInterval) {
+        unsigned long frameTime = milliseconds() - startTime;
+        if (frameTime < pimpl->updateInterval) {
             sleep(pimpl->updateInterval - frameTime);
         }
     }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gosu
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.8.4
 platform: ruby
 authors:
 - Julian Raschke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-29 00:00:00.000000000 Z
+date: 2014-09-03 00:00:00.000000000 Z
 dependencies: []
 description: |2
       2D game development library.
@@ -118,6 +118,8 @@ files:
 - src/Graphics/LargeImageData.hpp
 - src/Graphics/Macro.hpp
 - src/Graphics/RenderState.hpp
+- src/Graphics/Resolution.cpp
+- src/Graphics/ResolutionApple.mm
 - src/Graphics/TexChunk.cpp
 - src/Graphics/TexChunk.hpp
 - src/Graphics/Texture.cpp