gosu 1.0.0 → 1.2.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,unsigned int width,unsigned int height,bool fullscreen=false,double update_interval=16.666666,bool resizable=false);
+    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();

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/TrueTypeFontApple.cpp

@@ -24,8 +24,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 +39,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/TrueTypeFontWin.cpp

@@ -32,9 +32,9 @@ const unsigned char* Gosu::ttf_data_by_name(const string& font_name, unsigned fo
     LOGFONT logfont = {
         0, 0, 0, 0,
         (font_flags & Gosu::FF_BOLD) ? FW_BOLD : FW_NORMAL,
-        (font_flags & Gosu::FF_ITALIC) ? TRUE : FALSE,
-        (font_flags & Gosu::FF_UNDERLINE) ? TRUE : FALSE,
-        FALSE /* no strikethrough */,
+        static_cast<BYTE>((font_flags & Gosu::FF_ITALIC) ? TRUE : FALSE),
+        static_cast<BYTE>((font_flags & Gosu::FF_UNDERLINE) ? TRUE : FALSE),
+        0 /* no strikethrough */,
         ANSI_CHARSET, OUT_OUTLINE_PRECIS, CLIP_DEFAULT_PRECIS, ANTIALIASED_QUALITY,
         DEFAULT_PITCH
     };

data/src/Utility.cpp

@@ -1,20 +1,20 @@
 #include <Gosu/Utility.hpp>
-#include <Gosu/Platform.hpp>
 
+#include <SDL.h>
 #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,39 @@ bool Gosu::has_extension(string_view filename, string_view extension)
     return true;
 }
 
-#if defined(GOSU_IS_UNIX) && !defined(GOSU_IS_MAC)
-string Gosu::language()
+#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()
 {
-    const char* env = getenv("LANG");
-    return env ? env : "en_US";
+    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)) {
+        return {std::string{locale, locale + 5}};
+    }
+
+    return {};
 }
 #endif

data/src/Window.cpp

@@ -1,6 +1,10 @@
 #include <Gosu/Platform.hpp>
 #if !defined(GOSU_IS_IPHONE)
 
+#if defined(GOSU_IS_WIN)
+#include <windows.h>
+#endif
+
 #include <Gosu/Gosu.hpp>
 #include "GraphicsImpl.hpp"
 #include <SDL.h>
@@ -30,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);
@@ -87,13 +87,11 @@ struct Gosu::Window::Impl
     unique_ptr<Input> input;
 };
 
-Gosu::Window::Window(unsigned width, unsigned height, bool fullscreen, double update_interval,
-                     bool resizable)
+Gosu::Window::Window(int width, int height, unsigned window_flags, double update_interval)
 : pimpl(new Impl)
 {
-#if SDL_VERSION_ATLEAST(2, 0, 5)
-    SDL_SetWindowResizable(shared_window(), (SDL_bool)resizable);
-#endif
+    set_borderless(window_flags & WF_BORDERLESS);
+    set_resizable(window_flags & WF_RESIZABLE);
 
     // Even in fullscreen mode, temporarily show the window in windowed mode to centre it.
     // This ensures that the window will be centered correctly when exiting fullscreen mode.
@@ -103,12 +101,11 @@ Gosu::Window::Window(unsigned width, unsigned height, bool fullscreen, double up
     SDL_SetWindowPosition(shared_window(), SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED);
 
     // Really enable fullscreen if desired.
-    resize(width, height, fullscreen);
+    resize(width, height, (window_flags & WF_FULLSCREEN));
 
     SDL_GL_SetSwapInterval(1);
 
     pimpl->update_interval = update_interval;
-    pimpl->resizable = resizable;
 
     input().on_button_down = [this](Button button) { button_down(button); };
     input().on_button_up   = [this](Button button) { button_up(button); };
@@ -121,12 +118,12 @@ Gosu::Window::~Window()
     SDL_HideWindow(shared_window());
 }
 
-unsigned Gosu::Window::width() const
+int Gosu::Window::width() const
 {
     return graphics().width();
 }
 
-unsigned Gosu::Window::height() const
+int Gosu::Window::height() const
 {
     return graphics().height();
 }
@@ -136,12 +133,7 @@ bool Gosu::Window::fullscreen() const
     return pimpl->fullscreen;
 }
 
-bool Gosu::Window::resizable() const
-{
-    return pimpl->resizable;
-}
-
-void Gosu::Window::resize(unsigned width, unsigned height, bool fullscreen)
+void Gosu::Window::resize(int width, int height, bool fullscreen)
 {
     pimpl->fullscreen = fullscreen;
 
@@ -175,8 +167,8 @@ void Gosu::Window::resize(unsigned width, unsigned height, bool fullscreen)
         }
     }
     else {
-        unsigned max_width  = Gosu::available_width(this);
-        unsigned max_height = Gosu::available_height(this);
+        int max_width  = Gosu::available_width(this);
+        int max_height = Gosu::available_height(this);
 
         if (resizable()) {
             // If the window is resizable, limit its size, without preserving the aspect ratio.
@@ -196,9 +188,7 @@ void Gosu::Window::resize(unsigned width, unsigned 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();
 
@@ -217,6 +207,27 @@ void Gosu::Window::resize(unsigned width, unsigned height, bool fullscreen)
                                     black_bar_width, black_bar_height);
 }
 
+bool Gosu::Window::resizable() const
+{
+    return pimpl->resizable;
+}
+
+void Gosu::Window::set_resizable(bool resizable)
+{
+    pimpl->resizable = resizable;
+    SDL_SetWindowResizable(shared_window(), resizable ? SDL_TRUE : SDL_FALSE);
+}
+
+bool Gosu::Window::borderless() const
+{
+    return SDL_GetWindowFlags(shared_window()) & SDL_WINDOW_BORDERLESS;
+}
+
+void Gosu::Window::set_borderless(bool borderless)
+{
+    SDL_SetWindowBordered(shared_window(), borderless ? SDL_FALSE : SDL_TRUE);
+}
+
 double Gosu::Window::update_interval() const
 {
     return pimpl->update_interval;
@@ -242,16 +253,34 @@ void Gosu::Window::show()
 {
     unsigned long time_before_tick = milliseconds();
 
-    while (tick()) {
-        // Sleep to keep this loop from eating 100% CPU.
-        unsigned long tick_time = milliseconds() - time_before_tick;
-        if (tick_time < update_interval()) {
-            sleep(update_interval() - tick_time);
-        }
+#ifdef GOSU_IS_WIN
+    // Try to convince Windows to only run this thread on the first core, to avoid timing glitches.
+    // (If we ever run into a situation where the first core is not available, we should start to
+    // use GetProcessAffinityMask to retrieve the allowed cores as a bitmask.)
+    DWORD_PTR previous_affinity = SetThreadAffinityMask(GetCurrentThread(), 1);
+#endif
+
+    try {
+        while (tick()) {
+            // Sleep to keep this loop from eating 100% CPU.
+            unsigned long tick_time = milliseconds() - time_before_tick;
+            if (tick_time < update_interval()) {
+                sleep(update_interval() - tick_time);
+            }
 
-        time_before_tick = milliseconds();
+            time_before_tick = milliseconds();
+        }
+    } catch (...) {
+    #ifdef GOSU_IS_WIN
+        if (previous_affinity) SetThreadAffinityMask(GetCurrentThread(), previous_affinity);
+    #endif
+        throw;
     }
 
+#ifdef GOSU_IS_WIN
+    if (previous_affinity) SetThreadAffinityMask(GetCurrentThread(), previous_affinity);
+#endif
+
     pimpl->state = Impl::CLOSED;
 }
 

data/src/WindowUIKit.cpp

@@ -17,8 +17,7 @@ struct Gosu::Window::Impl
     string caption;
 };
 
-Gosu::Window::Window(unsigned width, unsigned height, bool fullscreen, double update_interval,
-                     bool resizable)
+Gosu::Window::Window(int width, int height, unsigned window_flags, double update_interval)
 : pimpl(new Impl)
 {
     pimpl->window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
@@ -50,12 +49,12 @@ Gosu::Window::~Window()
 {
 }
 
-unsigned Gosu::Window::width() const
+int Gosu::Window::width() const
 {
     return graphics().width();
 }
 
-unsigned Gosu::Window::height() const
+int Gosu::Window::height() const
 {
     return graphics().height();
 }
@@ -70,7 +69,20 @@ bool Gosu::Window::resizable() const
     return false;
 }
 
-void Gosu::Window::resize(unsigned width, unsigned height, bool fullscreen)
+void Gosu::Window::set_resizable(bool resizable)
+{
+}
+
+bool Gosu::Window::borderless() const
+{
+    return true;
+}
+
+void Gosu::Window::set_borderless(bool borderless)
+{
+}
+
+void Gosu::Window::resize(int width, int height, bool fullscreen)
 {
     throw logic_error("Cannot resize windows on iOS");
 }
@@ -138,24 +150,24 @@ void* Gosu::Window::uikit_window() const
     return (__bridge void*) pimpl->window;
 }
 
-unsigned Gosu::screen_width(Window*)
+int Gosu::screen_width(Window*)
 {
     return available_width() * [UIScreen mainScreen].scale;
 }
 
-unsigned Gosu::screen_height(Window*)
+int Gosu::screen_height(Window*)
 {
     return available_height() * [UIScreen mainScreen].scale;
 }
 
-unsigned Gosu::available_width(Window*)
+int 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*)
+int Gosu::available_height(Window*)
 {
     static CGSize screen_size = [UIScreen mainScreen].bounds.size;
     static CGFloat height = MIN(screen_size.width, screen_size.height);

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gosu
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Julian Raschke
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-29 00:00:00.000000000 Z
+date: 2021-03-18 00:00:00.000000000 Z
 dependencies: []
 description: |2
       2D game development library.
@@ -188,34 +188,25 @@ files:
 - include/Gosu/Audio.hpp
 - include/Gosu/Bitmap.hpp
 - include/Gosu/Buttons.hpp
-- include/Gosu/Channel.h
-- include/Gosu/Color.h
 - include/Gosu/Color.hpp
 - include/Gosu/Directories.hpp
-- include/Gosu/Font.h
 - include/Gosu/Font.hpp
 - include/Gosu/Fwd.hpp
-- include/Gosu/Gosu.h
 - include/Gosu/Gosu.hpp
 - include/Gosu/Graphics.hpp
 - include/Gosu/GraphicsBase.hpp
 - include/Gosu/IO.hpp
-- include/Gosu/Image.h
 - include/Gosu/Image.hpp
 - include/Gosu/ImageData.hpp
 - include/Gosu/Input.hpp
 - include/Gosu/Inspection.hpp
 - include/Gosu/Math.hpp
 - include/Gosu/Platform.hpp
-- include/Gosu/Sample.h
-- include/Gosu/Song.h
 - include/Gosu/Text.hpp
-- include/Gosu/TextInput.h
 - include/Gosu/TextInput.hpp
 - include/Gosu/Timing.hpp
 - include/Gosu/Utility.hpp
 - include/Gosu/Version.hpp
-- include/Gosu/Window.h
 - include/Gosu/Window.hpp
 - lib/OpenAL32.dll
 - lib/SDL2.dll
@@ -239,11 +230,8 @@ files:
 - src/BlockAllocator.cpp
 - src/BlockAllocator.hpp
 - src/Channel.cpp
-- src/ChannelWrapper.cpp
 - src/ClipRectStack.hpp
 - src/Color.cpp
-- src/ColorWrapper.cpp
-- src/Constants.cpp
 - src/DirectoriesApple.cpp
 - src/DirectoriesUnix.cpp
 - src/DirectoriesWin.cpp
@@ -253,25 +241,21 @@ files:
 - src/FileUnix.cpp
 - src/FileWin.cpp
 - src/Font.cpp
-- src/FontWrapper.cpp
 - src/GosuGLView.cpp
 - src/GosuGLView.hpp
 - src/GosuViewController.cpp
 - src/GosuViewController.hpp
-- src/GosuWrapper.cpp
 - src/Graphics.cpp
 - src/GraphicsImpl.hpp
 - src/IO.cpp
 - src/Iconv.hpp
 - src/Image.cpp
-- src/ImageWrapper.cpp
 - src/Input.cpp
 - src/InputUIKit.cpp
 - src/Inspection.cpp
 - src/LargeImageData.cpp
 - src/LargeImageData.hpp
 - src/Log.hpp
-- src/MPEGFile.hpp
 - src/Macro.cpp
 - src/Macro.hpp
 - src/MarkupParser.cpp
@@ -283,15 +267,12 @@ files:
 - src/Resolution.cpp
 - src/RubyGosu.cxx
 - src/RubyGosu.h
-- src/SampleWrapper.cpp
-- src/SongWrapper.cpp
 - src/TexChunk.cpp
 - src/TexChunk.hpp
 - src/Text.cpp
 - src/TextBuilder.cpp
 - src/TextBuilder.hpp
 - src/TextInput.cpp
-- src/TextInputWrapper.cpp
 - src/Texture.cpp
 - src/Texture.hpp
 - src/TimingApple.cpp
@@ -305,14 +286,11 @@ 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
 - src/Window.cpp
 - src/WindowUIKit.cpp
-- src/WindowWrapper.cpp
 homepage: https://www.libgosu.org/
 licenses:
 - MIT
@@ -336,7 +314,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: 2D game development library.