gosu 0.14.0.pre2 → 0.14.0

data/src/WinUtility.hpp

@@ -5,6 +5,11 @@
 
 namespace Gosu
 {
+    //! Converts UTF-8 to UTF-16, as it is used in Windows APIs.
+    std::wstring utf8_to_utf16(const std::string& utf8);
+    //! Converts UTF-16 to UTF-8.
+    std::string utf16_to_utf8(const std::wstring& utf16);
+
     //! Throws an exception according to the error returned by  GetLastError(), optionally prefixed
     //! with "While (action), the following error occured: ".
     GOSU_NORETURN void throw_last_winapi_error(const std::string& action = "");

data/src/Window.cpp

@@ -24,7 +24,7 @@ namespace Gosu
 
     static void cleanup();
 
-    static SDL_Window* shared_window()
+    SDL_Window* shared_window()
     {
         static SDL_Window* window = nullptr;
         if (window == nullptr) {
@@ -148,8 +148,8 @@ void Gosu::Window::resize(unsigned width, unsigned height, bool fullscreen)
     double black_bar_height = 0;
     
     if (fullscreen) {
-        actual_width = Gosu::screen_width();
-        actual_height = Gosu::screen_height();
+        actual_width  = Gosu::screen_width(this);
+        actual_height = Gosu::screen_height(this);
 
         double scale_x = 1.0 * actual_width / width;
         double scale_y = 1.0 * actual_height / height;
@@ -163,8 +163,8 @@ void Gosu::Window::resize(unsigned width, unsigned height, bool fullscreen)
         }
     }
     else {
-        double max_width = Gosu::available_width();
-        double max_height = Gosu::available_height();
+        double max_width  = Gosu::available_width(this);
+        double max_height = Gosu::available_height(this);
         
         if (width > max_width || height > max_height) {
             scale_factor = min(max_width / width, max_height / height);
@@ -257,11 +257,23 @@ bool Gosu::Window::tick()
     SDL_Event e;
     while (SDL_PollEvent(&e)) {
         switch (e.type) {
-            case (SDL_QUIT): {
+        #ifdef GOSU_IS_MAC
+            // Workaround for https://github.com/gosu/gosu/issues/458
+            // "Resize" the window to its current dimensions after it is shown.
+            // Otherwise it will be black on macOS 10.14 (Mojave) until the user moves it around.
+            // TODO: Since this affects `brew install supertux` as well, maybe file an SDL bug?
+            case SDL_WINDOWEVENT: {
+                if (e.window.event == SDL_WINDOWEVENT_SHOWN) {
+                    resize(this->width(), this->height(), fullscreen());
+                }
+                break;
+            }
+        #endif
+            case SDL_QUIT: {
                 close();
                 break;
             }
-            case (SDL_DROPFILE): {
+            case SDL_DROPFILE: {
                 char* dropped_filedir = e.drop.file;
                 if (dropped_filedir == nullptr) break;
                 drop(string(dropped_filedir));

data/src/WindowUIKit.cpp

@@ -6,34 +6,6 @@
 
 using namespace std;
 
-
-namespace Gosu
-{
-    unsigned screen_width()
-    {
-        static CGSize screen_size = [UIScreen mainScreen].bounds.size;
-        static CGFloat width = MIN(screen_size.width, screen_size.height);
-        return width;
-    }
-    
-    unsigned screen_height()
-    {
-        static CGSize screen_size = [UIScreen mainScreen].bounds.size;
-        static CGFloat width = MAX(screen_size.width, screen_size.height);
-        return width;
-    }
-    
-    unsigned available_width()
-    {
-        return screen_width();
-    }
-    
-    unsigned available_height()
-    {
-        return screen_height();
-    }
-}
-
 struct Gosu::Window::Impl
 {
     UIWindow* window;
@@ -57,11 +29,11 @@ Gosu::Window::Window(unsigned width, unsigned height, bool fullscreen, double up
     // It is important to load the view before creating the Graphics instance.
     [pimpl->controller loadView];
     
-    pimpl->graphics.reset(new Graphics(screen_height(), screen_width()));
+    pimpl->graphics.reset(new Graphics(screen_width(), screen_height()));
     pimpl->graphics->set_resolution(width, height);
     
     pimpl->input.reset(new Input((__bridge void*) pimpl->controller.view, update_interval));
-    pimpl->input->set_mouse_factors(1.0 * width / screen_height(), 1.0 * height / screen_width());
+    pimpl->input->set_mouse_factors(1.0 * width / available_width(), 1.0 * height / available_height());
     
     pimpl->input->on_touch_began = [this](Gosu::Touch touch) { touch_began(touch); };
     pimpl->input->on_touch_moved = [this](Gosu::Touch touch) { touch_moved(touch); };
@@ -162,4 +134,28 @@ void* Gosu::Window::uikit_window() const
     return (__bridge void*) pimpl->window;
 }
 
+unsigned Gosu::screen_width(Window*)
+{
+    return available_width() * [UIScreen mainScreen].scale;
+}
+
+unsigned Gosu::screen_height(Window*)
+{
+    return available_height() * [UIScreen mainScreen].scale;
+}
+
+unsigned Gosu::available_width(Window*)
+{
+    static CGSize screen_size = [UIScreen mainScreen].bounds.size;
+    static CGFloat width = MAX(screen_size.width, screen_size.height);
+    return width;
+}
+
+unsigned Gosu::available_height(Window*)
+{
+    static CGSize screen_size = [UIScreen mainScreen].bounds.size;
+    static CGFloat height = MIN(screen_size.width, screen_size.height);
+    return height;
+}
+
 #endif

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gosu
 version: !ruby/object:Gem::Version
-  version: 0.14.0.pre2
+  version: 0.14.0
 platform: ruby
 authors:
 - Julian Raschke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-29 00:00:00.000000000 Z
+date: 2018-09-17 00:00:00.000000000 Z
 dependencies: []
 description: |2
       2D game development library.
@@ -106,7 +106,6 @@ files:
 - src/OggFile.hpp
 - src/RenderState.hpp
 - src/Resolution.cpp
-- src/ResolutionApple.cpp
 - src/RubyGosu.cxx
 - src/RubyGosu.h
 - src/SndFile.hpp
@@ -163,9 +162,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.6

data/src/ResolutionApple.cpp

@@ -1,25 +0,0 @@
-#include <Gosu/Platform.hpp>
-#if defined(GOSU_IS_MAC) && !defined(GOSU_IS_IPHONE)
-
-#import <Gosu/Gosu.hpp>
-#import <AppKit/AppKit.h>
-
-static const NSUInteger STYLE_MASK_FROM_SDL2 =
-    NSTitledWindowMask | NSClosableWindowMask | NSMiniaturizableWindowMask;
-
-static const NSRect available_frame = [[NSScreen screens][0] visibleFrame];
-
-static const NSRect available_content_frame =
-    [NSWindow contentRectForFrameRect:available_frame styleMask:STYLE_MASK_FROM_SDL2];
-
-unsigned Gosu::available_width()
-{
-    return available_content_frame.size.width;
-}
-
-unsigned Gosu::available_height()
-{
-    return available_content_frame.size.height;
-}
-
-#endif