gosu 1.1.0.pre2 → 1.3.0

data/src/RubyGosu.h

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 4.1.0
+ * Version 4.0.2
  *
  * 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
@@ -28,7 +28,7 @@ public:
 class SwigDirector_Window : public Gosu::Window, public Swig::Director {
 
 public:
-    SwigDirector_Window(VALUE self,int width,int height,unsigned int window_flags=Gosu::WF_WINDOWED,double update_interval=16.666666);
+    SwigDirector_Window(VALUE self, int width, int height, unsigned int window_flags = Gosu::WF_WINDOWED, double update_interval = 16.666666);
     virtual ~SwigDirector_Window();
     virtual void show();
     virtual bool tick();
@@ -37,6 +37,7 @@ public:
     virtual void draw();
     virtual bool needs_redraw() const;
     virtual bool needs_cursor() const;
+    virtual void gain_focus();
     virtual void lose_focus();
     virtual void release_memory();
     virtual void button_down(Gosu::Button arg0);

data/src/TexChunk.cpp

@@ -44,7 +44,7 @@ Gosu::TexChunk::~TexChunk()
 }
 
 void Gosu::TexChunk::draw(double x1, double y1, Color c1, double x2, double y2, Color c2,
-    double x3, double y3, Color c3, double x4, double y4, Color c4, ZPos z, AlphaMode mode) const
+    double x3, double y3, Color c3, double x4, double y4, Color c4, ZPos z, BlendMode mode) const
 {
     DrawOp op;
     op.render_state.texture = texture;

data/src/TexChunk.hpp

@@ -29,7 +29,7 @@ public:
         double x2, double y2, Color c2,
         double x3, double y3, Color c3,
         double x4, double y4, Color c4,
-        ZPos z, AlphaMode mode) const override;
+        ZPos z, BlendMode mode) const override;
 
     const GLTexInfo* gl_tex_info() const override { return &info; }
     

data/src/Text.cpp

@@ -1,36 +1,34 @@
+#include "GraphicsImpl.hpp"
 #include "MarkupParser.hpp"
 #include "TextBuilder.hpp"
-#include "GraphicsImpl.hpp"
 #include "TrueTypeFont.hpp"
 #include <Gosu/Text.hpp>
-#include <cassert>
-#include <cmath>
 #include <algorithm>
-#include <vector>
+#include <cmath>
 #include <stdexcept>
-using namespace std;
+#include <vector>
 
-double Gosu::text_width(const u32string& text,
-                        const string& font_name, double font_height, unsigned font_flags)
+double Gosu::text_width(const std::u32string& text,
+                        const std::string& font_name, double font_height, unsigned font_flags)
 {
-    if (font_height <= 0)              throw invalid_argument("font_height must be > 0");
-    if (font_flags >= FF_COMBINATIONS) throw invalid_argument("Invalid font_flags");
-    
-    auto& font = font_by_name(font_name, font_flags);
+    if (font_height <= 0)              throw std::invalid_argument{"font_height must be > 0"};
+    if (font_flags >= FF_COMBINATIONS) throw std::invalid_argument{"Invalid font_flags"};
+
+    TrueTypeFont& font = font_by_name(font_name, font_flags);
     return font.draw_text(text, font_height, nullptr, 0, 0, Gosu::Color::NONE);
 }
 
-double Gosu::draw_text(Bitmap& bitmap, double x, double y, Color c, const u32string& text,
-                       const string& font_name, double font_height, unsigned font_flags)
+double Gosu::draw_text(Bitmap& bitmap, double x, double y, Color c, const std::u32string& text,
+                       const std::string& font_name, double font_height, unsigned font_flags)
 {
-    if (font_height <= 0)              throw invalid_argument("font_height must be > 0");
-    if (font_flags >= FF_COMBINATIONS) throw invalid_argument("Invalid font_flags");
+    if (font_height <= 0)              throw std::invalid_argument("font_height must be > 0");
+    if (font_flags >= FF_COMBINATIONS) throw std::invalid_argument("Invalid font_flags");
 
-    auto& font = font_by_name(font_name, font_flags);
+    TrueTypeFont& font = font_by_name(font_name, font_flags);
     return font.draw_text(text, font_height, &bitmap, x, y, c);
 }
 
-Gosu::Bitmap Gosu::layout_text(const string& text, const string& font_name,
+Gosu::Bitmap Gosu::layout_text(const std::string& text, const std::string& font_name,
                                double font_height, double line_spacing,
                                int width, Alignment align, unsigned font_flags)
 {
@@ -40,55 +38,56 @@ Gosu::Bitmap Gosu::layout_text(const string& text, const string& font_name,
                          width, align, font_flags);
 }
 
-Gosu::Bitmap Gosu::layout_markup(const string& markup, const string& font_name,
+Gosu::Bitmap Gosu::layout_markup(const std::string& markup, const std::string& font_name,
                                  double font_height, double line_spacing,
                                  int width, Alignment align, unsigned font_flags)
 {
-    if (font_height <= 0)              throw invalid_argument("font_height must be > 0");
-    if (line_spacing < -font_height)   throw invalid_argument("line_spacing must be ≥ -font_height");
-    if (font_flags >= FF_COMBINATIONS) throw invalid_argument("Invalid font_flags");
+    if (font_height <= 0)              throw std::invalid_argument{"font_height must be > 0"};
+    if (line_spacing < -font_height)   throw std::invalid_argument{"line_spacing must be ≥ -font_height"};
+    if (font_flags >= FF_COMBINATIONS) throw std::invalid_argument{"Invalid font_flags"};
     
     if (width >= 0) {
-        TextBuilder text_builder(font_name, font_height, line_spacing, width, align);
+        TextBuilder text_builder{font_name, static_cast<int>(font_height),
+                                 static_cast<int>(line_spacing), width, align};
         
         // Feed all formatted substrings to the TextBuilder, which will construct the result.
         // Split the input string into words, because this method implements word-wrapping.
-        MarkupParser parser(font_flags, true, [&text_builder](vector<FormattedString> word) {
+        MarkupParser parser{font_flags, true, [&text_builder](std::vector<FormattedString> word) {
             text_builder.feed_word(move(word));
-        });
+        }};
         parser.parse(markup);
         
         return text_builder.move_into_bitmap();
     }
     else {
-        vector<vector<FormattedString>> lines;
+        std::vector<std::vector<FormattedString>> lines;
         
         // Split the text into lines (split_words = false) since this method does not wrap lines.
-        MarkupParser parser(font_flags, false, [&lines](vector<FormattedString>&& line) {
+        MarkupParser parser{font_flags, false, [&lines](std::vector<FormattedString>&& line) {
             // Remove trailing \n characters from each line to avoid errors from Gosu::text_width().
-            if (line.back().text.back() == '\n') {
+            if (!line.back().text.empty() && line.back().text.back() == '\n') {
                 line.back().text.pop_back();
             }
             
             lines.emplace_back(line);
-        });
+        }};
         parser.parse(markup);
         
         if (lines.empty()) return Bitmap();
         
         // Measure every part of every line.
-        vector<double> line_widths;
+        std::vector<double> line_widths;
         double max_width = 0;
         for (auto& line : lines) {
             line_widths.push_back(0);
             for (auto& part : line) {
                 line_widths.back() += text_width(part.text, font_name, font_height, part.flags);
             }
-            max_width = max(max_width, line_widths.back());
+            max_width = std::max(max_width, line_widths.back());
         }
         
-        double height = lines.size() * font_height + (lines.size() - 1) * line_spacing;
-        Bitmap result(ceil(max_width), ceil(height));
+        double height = lines.size() * font_height + (lines.size() - 1.0) * line_spacing;
+        Bitmap result{static_cast<int>(std::ceil(max_width)), static_cast<int>(std::ceil(height))};
         
         // Render every part of every line.
         double y = 0;

data/src/TrueTypeFont.cpp

@@ -182,7 +182,7 @@ struct Gosu::TrueTypeFont::Impl
         for (int rel_y = 0; rel_y < h; ++rel_y) {
             for (int rel_x = 0; rel_x < w; ++rel_x) {
                 int pixel = pixels[(src_y + rel_y) * stride + src_x + rel_x];
-                Color c_with_alpha(pixel * c.alpha() / 255, c.red(), c.green(), c.blue());
+                Color c_with_alpha = c.with_alpha(pixel * c.alpha / 255);
                 bitmap.blend_pixel(x + rel_x, y + rel_y, c_with_alpha);
             }
         }

data/src/TrueTypeFontApple.cpp

@@ -4,7 +4,6 @@
 #include "TrueTypeFont.hpp"
 #include "Log.hpp"
 
-#include <Gosu/IO.hpp>
 #include <Gosu/Text.hpp>
 
 #import <CoreText/CoreText.h>
@@ -24,8 +23,8 @@ const unsigned char* Gosu::ttf_data_by_name(const string& font_name, unsigned fo
     log("Trying to find a font named '%s', flags=%x", font_name.c_str(), font_flags);
 
     unsigned symbolic_traits = 0;
-    if (font_flags & Gosu::FF_BOLD)   symbolic_traits |= kCTFontBoldTrait;
-    if (font_flags & Gosu::FF_ITALIC) symbolic_traits |= kCTFontItalicTrait;
+    if (font_flags & Gosu::FF_BOLD)   symbolic_traits |= kCTFontTraitBold;
+    if (font_flags & Gosu::FF_ITALIC) symbolic_traits |= kCTFontTraitItalic;
 
     NSDictionary *attributes = @{
         ((__bridge id) kCTFontNameAttribute): [NSString stringWithUTF8String:font_name.c_str()],
@@ -39,6 +38,14 @@ const unsigned char* Gosu::ttf_data_by_name(const string& font_name, unsigned fo
     if (descriptor) {
         CTFontRef font = CTFontCreateWithFontDescriptorAndOptions(descriptor, 20, nullptr, 0);
         if (font) {
+            if ((CTFontGetSymbolicTraits(font) & symbolic_traits) != symbolic_traits) {
+                // For some reason the initial call to CTFontCreateWithFontDescriptorAndOptions does
+                // not respect the requested font traits. Explicitly requesting the traits again
+                // seems to help. Tested on macOS 11.2.2.
+                CTFontRef correct_font = CTFontCreateCopyWithSymbolicTraits(font, 0.0, nullptr, symbolic_traits, symbolic_traits);
+                CFRelease(font);
+                font = correct_font;
+            }
             NSURL *url = CFBridgingRelease(CTFontCopyAttribute(font, kCTFontURLAttribute));
             if (url && url.fileSystemRepresentation) {
                 log("Loading file '%s'", url.fileSystemRepresentation);

data/src/Utility.cpp

@@ -1,20 +1,20 @@
-#include <Gosu/Utility.hpp>
 #include <Gosu/Platform.hpp>
+#include <Gosu/Utility.hpp>
 
 #include <utf8proc.h>
 
 #include <cstring>
+#include <memory>
 #include <stdexcept>
-using namespace std;
 
-u32string Gosu::utf8_to_composed_utc4(const string& utf8)
+std::u32string Gosu::utf8_to_composed_utc4(const std::string& utf8)
 {
-    u32string utc4;
+    std::u32string utc4;
     utc4.reserve(utf8.size());
-    
-    auto* current_byte = reinterpret_cast<const utf8proc_uint8_t*>(utf8.data());
+
+    const auto* current_byte = reinterpret_cast<const utf8proc_uint8_t*>(utf8.data());
     auto remaining_length = utf8.length();
-    
+
     // First convert from UTF-8 to UTC-4.
     utf8proc_int32_t codepoint;
     while (remaining_length) {
@@ -30,35 +30,35 @@ u32string Gosu::utf8_to_composed_utc4(const string& utf8)
             remaining_length -= bytes_read;
         }
     }
-    
+
     // Now compose characters in-place.
-    auto utc4_data = reinterpret_cast<const utf8proc_int32_t*>(utc4.data());
-    // Note that this const_cast will not be necessary anymore in C++17.
-    auto writable_utc4_data = const_cast<utf8proc_int32_t*>(utc4_data);
+    auto* utc4_data = reinterpret_cast<utf8proc_int32_t*>(utc4.data());
     auto options = static_cast<utf8proc_option_t>(UTF8PROC_NLF2LF | UTF8PROC_COMPOSE);
-    auto new_length = utf8proc_normalize_utf32(writable_utc4_data, utc4.length(), options);
+    auto new_length = utf8proc_normalize_utf32(utc4_data, utc4.length(), options);
     if (new_length < 0) {
-        throw runtime_error("Could not normalize '" + utf8 + "': " + utf8proc_errmsg(new_length));
+        throw std::runtime_error{"Could not normalize '" + utf8 +
+                                 "': " + utf8proc_errmsg(new_length)};
     }
     utc4.resize(new_length);
-    
+
     return utc4;
 }
 
-bool Gosu::has_extension(string_view filename, string_view extension)
+bool Gosu::has_extension(std::string_view filename, std::string_view extension)
 {
-    size_t ext_len = extension.length();
+    std::size_t ext_len = extension.length();
     if (ext_len > filename.length()) {
         return false;
     }
 
-    string_view::iterator filename_iter = filename.end();
-    string_view::iterator ext_iter = extension.end();
+    std::string_view::iterator filename_iter = filename.end();
+    std::string_view::iterator ext_iter = extension.end();
     while (ext_len--) {
         --filename_iter;
         --ext_iter;
 
-        if (tolower((int) *filename_iter) != tolower((int) *ext_iter)) {
+        if (std::tolower(static_cast<int>(*filename_iter)) !=
+            std::tolower(static_cast<int>(*ext_iter))) {
             return false;
         }
     }
@@ -66,10 +66,69 @@ bool Gosu::has_extension(string_view filename, string_view extension)
     return true;
 }
 
-#if defined(GOSU_IS_UNIX) && !defined(GOSU_IS_MAC)
-string Gosu::language()
+#ifdef GOSU_IS_IPHONE
+#import <Foundation/Foundation.h>
+#include <regex>
+
+std::vector<std::string> Gosu::user_languages()
 {
-    const char* env = getenv("LANG");
-    return env ? env : "en_US";
+    static const std::regex language_regex{"([a-z]{2})-([A-Z]{2})([^A-Z].*)?"};
+
+    std::vector<std::string> user_languages;
+
+    @autoreleasepool {
+        for (NSString* language in [NSLocale preferredLanguages]) {
+            std::string language_str = language.UTF8String;
+            std::smatch match;
+            if (std::regex_match(language_str, match, language_regex)) {
+                user_languages.push_back(match.str(1) + "_" + match.str(2));
+            }
+        }
+    }
+
+    return user_languages;
 }
+
+#else
+#include <SDL.h>
+#if SDL_VERSION_ATLEAST(2, 0, 14)
+
+std::vector<std::string> Gosu::user_languages()
+{
+    std::vector<std::string> user_languages;
+
+    std::unique_ptr<SDL_Locale, decltype(SDL_free)*> locales{SDL_GetPreferredLocales(), SDL_free};
+    if (!locales) return user_languages;
+
+    for (const SDL_Locale* locale = locales.get(); locale->language != nullptr; ++locale) {
+        std::string language = locale->language;
+        if (locale->country) {
+            language += "_";
+            language += locale->country;
+        }
+        user_languages.emplace_back(std::move(language));
+    }
+
+    return user_languages;
+}
+
+#else
+#include <cstdlib>
+#include <regex>
+
+std::vector<std::string> Gosu::user_languages()
+{
+    static const std::regex language_regex{"[a-z]{2}_[A-Z]{2}([^A-Z].*)?"};
+
+    const char* locale = std::getenv("LANG");
+
+    if (locale && std::regex_match(locale, language_regex)) {
+        // Trim off anything after the language code.
+        return {std::string{locale, locale + 5}};
+    }
+
+    return {};
+}
+
+#endif
 #endif

data/src/WinUtility.hpp

@@ -12,7 +12,8 @@ namespace Gosu
 
     //! 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 = "");
+    [[noreturn]]
+    void throw_last_winapi_error(const std::string& action = "");
 
     //! Small helper function that throws the last Windows error when val_to_check is false.
     template<typename T>

data/src/Window.cpp

@@ -34,11 +34,7 @@ namespace Gosu
                 throw_sdl_error("Could not initialize SDL Video");
             }
 
-            Uint32 flags = SDL_WINDOW_OPENGL | SDL_WINDOW_HIDDEN;
-
-        #if SDL_VERSION_ATLEAST(2, 0, 1)
-            flags |= SDL_WINDOW_ALLOW_HIGHDPI;
-        #endif
+            Uint32 flags = SDL_WINDOW_OPENGL | SDL_WINDOW_HIDDEN | SDL_WINDOW_ALLOW_HIGHDPI;
 
             window =
                 SDL_CreateWindow("", SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, 64, 64, flags);
@@ -192,9 +188,7 @@ void Gosu::Window::resize(int width, int height, bool fullscreen)
         SDL_SetWindowSize(shared_window(), actual_width, actual_height);
     }
 
-#if SDL_VERSION_ATLEAST(2, 0, 1)
     SDL_GL_GetDrawableSize(shared_window(), &actual_width, &actual_height);
-#endif
 
     ensure_current_context();
 
@@ -221,9 +215,7 @@ bool Gosu::Window::resizable() const
 void Gosu::Window::set_resizable(bool resizable)
 {
     pimpl->resizable = resizable;
-#if SDL_VERSION_ATLEAST(2, 0, 5)
     SDL_SetWindowResizable(shared_window(), resizable ? SDL_TRUE : SDL_FALSE);
-#endif
 }
 
 bool Gosu::Window::borderless() const
@@ -325,6 +317,14 @@ bool Gosu::Window::tick()
                         }
                         break;
                     }
+                    case SDL_WINDOWEVENT_FOCUS_GAINED: {
+                        gain_focus();
+                        break;
+                    }
+                    case SDL_WINDOWEVENT_FOCUS_LOST: {
+                        lose_focus();
+                        break;
+                    }
                     default: {
                         break;
                     }

data/src/WindowUIKit.cpp

@@ -25,8 +25,8 @@ Gosu::Window::Window(int width, int height, unsigned window_flags, double update
     pimpl->controller.gosuWindow = this;
     pimpl->window.rootViewController = pimpl->controller;
     
-    // It is important to load the view before creating the Graphics instance.
-    [pimpl->controller loadView];
+    // It is important to (implicitly) load the view before creating the Graphics instance.
+    [pimpl->controller view];
     
     pimpl->graphics.reset(new Graphics(screen_width(), screen_height()));
     pimpl->graphics->set_resolution(width, height);

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gosu
 version: !ruby/object:Gem::Version
-  version: 1.1.0.pre2
+  version: 1.3.0
 platform: ruby
 authors:
 - Julian Raschke
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-17 00:00:00.000000000 Z
+date: 2022-01-02 00:00:00.000000000 Z
 dependencies: []
 description: |2
       2D game development library.
@@ -286,8 +286,6 @@ files:
 - src/TrueTypeFontUnix.cpp
 - src/TrueTypeFontWin.cpp
 - src/Utility.cpp
-- src/UtilityApple.cpp
-- src/UtilityWin.cpp
 - src/Version.cpp
 - src/WinUtility.cpp
 - src/WinUtility.hpp
@@ -312,11 +310,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: 2D game development library.

data/src/UtilityApple.cpp

@@ -1,16 +0,0 @@
-#include <Gosu/Platform.hpp>
-#if defined(GOSU_IS_MAC)
-
-#import <Gosu/Utility.hpp>
-#import <Foundation/Foundation.h>
-using namespace std;
-
-string Gosu::language()
-{
-    @autoreleasepool {
-        NSString* language = [NSLocale preferredLanguages][0];
-        return language.UTF8String ?: "en";
-    }
-}
-
-#endif

data/src/UtilityWin.cpp

@@ -1,17 +0,0 @@
-#include <Gosu/Platform.hpp>
-#if defined(GOSU_IS_WIN)
-
-#include <Gosu/Utility.hpp>
-#include "WinUtility.hpp"
-#include <windows.h>
-using namespace std;
-
-string Gosu::language()
-{
-    LCID lcid = GetUserDefaultLCID();
-    char buffer[9];
-    winapi_check(GetLocaleInfoA(lcid, LOCALE_SISO639LANGNAME, buffer, sizeof buffer));
-    return buffer;
-}
-
-#endif