gosu 1.2.0 → 1.3.0

data/src/RubyGosu.h

@@ -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/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>

data/src/Utility.cpp

@@ -1,6 +1,6 @@
+#include <Gosu/Platform.hpp>
 #include <Gosu/Utility.hpp>
 
-#include <SDL.h>
 #include <utf8proc.h>
 
 #include <cstring>
@@ -66,7 +66,33 @@ bool Gosu::has_extension(std::string_view filename, std::string_view extension)
     return true;
 }
 
+#ifdef GOSU_IS_IPHONE
+#import <Foundation/Foundation.h>
+#include <regex>
+
+std::vector<std::string> Gosu::user_languages()
+{
+    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;
@@ -85,6 +111,7 @@ std::vector<std::string> Gosu::user_languages()
 
     return user_languages;
 }
+
 #else
 #include <cstdlib>
 #include <regex>
@@ -96,9 +123,12 @@ std::vector<std::string> Gosu::user_languages()
     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

@@ -317,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.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Julian Raschke
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-18 00:00:00.000000000 Z
+date: 2022-01-02 00:00:00.000000000 Z
 dependencies: []
 description: |2
       2D game development library.
@@ -314,7 +314,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: 2D game development library.