gosu 1.1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 444c045288619f5db21634cb5bbdd24bf16c93799d16dc84147cab982282804b
-  data.tar.gz: cab4e8823a7b19893cfd3f5b280176ed2b99f76c76278859fe5957bec8aa283a
+  metadata.gz: b9f867c68587f182be0ba872daf669724376a55b6f7e0c3853eca5f350dc413f
+  data.tar.gz: f24639563ba937303f9a81dd22a78ad5a22fa9243d980c629d163605656be0b2
 SHA512:
-  metadata.gz: c4c1168ca82b6e0c969ca8943469010d1eeadc32908ac3b78fc4b61567e0905076dedc2e4509bb55abedccf9ba4f3ccf79ae900093f1de996112548bc0fbad31
-  data.tar.gz: 6f7b1cea866fecc2b8bde836790f684fff6990dc89844a66f7a304f7f405625a33200bb6ffe2db987444ecc53e7a8ddee26cb75f7e77f7891393fd564e2ae81b
+  metadata.gz: 6bb10eafcfa8742066e246e607ada383af5d2f3a461910e386064b27788d5620ab289b2081e0e4652240df9faf7cb1bb8d669fb95b7bcfbfb040e767c4354edd
+  data.tar.gz: dc56b6a28a0f8980027c3f3bc5fd110e806617a4b22b3d6e918fa24f99d59cea98cd03d85af875968bcc7b98bc283ac810aca7a37e199ff1f4aaaaea1de7fc80

data/include/Gosu/Font.hpp

@@ -44,11 +44,11 @@ namespace Gosu
         //! Draws text so the top left corner of the text is at (x; y).
         void draw_text(const std::string& text, double x, double y, ZPos z,
                        double scale_x = 1, double scale_y = 1, Color c = Color::WHITE,
-                       AlphaMode mode = AM_DEFAULT) const;
+                       BlendMode mode = BM_DEFAULT) const;
         //! Draws markup so the top left corner of the text is at (x; y).
         void draw_markup(const std::string& markup, double x, double y, ZPos z,
                          double scale_x = 1, double scale_y = 1, Color c = Color::WHITE,
-                         AlphaMode mode = AM_DEFAULT) const;
+                         BlendMode mode = BM_DEFAULT) const;
         
         //! Draws text at a position relative to (x; y).
         //! \param rel_x Determines where the text is drawn horizontally. If
@@ -58,7 +58,7 @@ namespace Gosu
         //! \param rel_y See rel_x.
         void draw_text_rel(const std::string& text, double x, double y, ZPos z,
                            double rel_x, double rel_y, double scale_x = 1, double scale_y = 1,
-                           Color c = Color::WHITE, AlphaMode mode = AM_DEFAULT) const;
+                           Color c = Color::WHITE, BlendMode mode = BM_DEFAULT) const;
         //! Draws text at a position relative to (x; y).
         //! \param rel_x Determines where the text is drawn horizontally. If
         //! rel_x is 0.0, the text will be to the right of x, if it is 1.0,
@@ -67,7 +67,7 @@ namespace Gosu
         //! \param rel_y See rel_x.
         void draw_markup_rel(const std::string& markup, double x, double y, ZPos z,
                              double rel_x, double rel_y, double scale_x = 1, double scale_y = 1,
-                             Color c = Color::WHITE, AlphaMode mode = AM_DEFAULT) const;
+                             Color c = Color::WHITE, BlendMode mode = BM_DEFAULT) const;
         
         //! Maps a letter to a specific image, instead of generating one using
         //! Gosu's built-in text rendering.

data/include/Gosu/Graphics.hpp

@@ -78,21 +78,23 @@ namespace Gosu
         //! image to simulate lines, or contribute a better draw_line to Gosu.
         static void draw_line(double x1, double y1, Color c1,
                               double x2, double y2, Color c2,
-                              ZPos z, AlphaMode mode = AM_DEFAULT);
+                              ZPos z, BlendMode mode = BM_DEFAULT);
 
         static void draw_triangle(double x1, double y1, Color c1,
                                   double x2, double y2, Color c2,
                                   double x3, double y3, Color c3,
-                                  ZPos z, AlphaMode mode = AM_DEFAULT);
+                                  ZPos z,
+                                  BlendMode mode = BM_DEFAULT);
 
         static void draw_quad(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 = AM_DEFAULT);
+                              ZPos z, BlendMode mode = BM_DEFAULT);
         
         static void draw_rect(double x, double y, double width, double height,
-                              Color c, ZPos z, AlphaMode mode = AM_DEFAULT);
+                              Color c, ZPos z,
+                              BlendMode mode = BM_DEFAULT);
 
         //! For internal use only.
         void set_physical_resolution(unsigned physical_width, unsigned physical_height);

data/include/Gosu/GraphicsBase.hpp

@@ -15,18 +15,18 @@ namespace Gosu
     
     //! Determines the way colors are combined when one is drawn onto
     //! another.
-    enum AlphaMode
+    enum BlendMode
     {
-        AM_DEFAULT,
+        BM_DEFAULT,
         //! The color's channels will be interpolated. The alpha channel
         //! specifies the opacity of the new color, 255 is full opacity.
-        AM_INTERPOLATE = AM_DEFAULT,
+        BM_INTERPOLATE = BM_DEFAULT,
         //! The colors' channels will be added. The alpha channel specifies
         //! the percentage of the new color's channels that will be added
         //! to the old color's channels.
-        AM_ADD,
+        BM_ADD,
         //! The color's channels will be multiplied with each other.
-        AM_MULTIPLY
+        BM_MULTIPLY
     };
     
     enum FontFlags
@@ -50,7 +50,7 @@ namespace Gosu
     {
         IF_SMOOTH = 0,
         
-        // Note: No constant for '1', but Gosu treats '1' as if_tileable for
+        // Note: No constant for '1', but Gosu treats '1' as IF_TILEABLE for
         // backward compatibility reasons (this parameter used to be a bool).
         
         IF_TILEABLE_LEFT   = 1 << 1,

data/include/Gosu/Image.hpp

@@ -49,10 +49,10 @@ namespace Gosu
 
         //! Draws the image so its upper left corner is at (x; y).
         void draw(double x, double y, ZPos z = 0, double scale_x = 1, double scale_y = 1,
-            Color c = Color::WHITE, AlphaMode mode = AM_DEFAULT) const;
+            Color c = Color::WHITE, BlendMode mode = BM_DEFAULT) const;
         //! Like draw(), but with modulation colors for all four corners.
         void draw_mod(double x, double y, ZPos z, double scale_x, double scale_y,
-            Color c1, Color c2, Color c3, Color c4, AlphaMode mode = AM_DEFAULT) const;
+            Color c1, Color c2, Color c3, Color c4, BlendMode mode = BM_DEFAULT) const;
 
         //! Draws the image rotated by the given angle so that its rotation
         //! center is at (x; y). Note that this is different from how all the
@@ -65,7 +65,7 @@ namespace Gosu
         //! \param center_y See center_x.
         void draw_rot(double x, double y, ZPos z = 0, double angle = 0,
             double center_x = 0.5, double center_y = 0.5, double scale_x = 1, double scale_y = 1,
-            Color c = Color::WHITE, AlphaMode mode = AM_DEFAULT) const;
+            Color c = Color::WHITE, BlendMode mode = BM_DEFAULT) const;
         
         #ifndef SWIG
         //! Provides access to the underlying image data object.

data/include/Gosu/ImageData.hpp

@@ -44,7 +44,7 @@ namespace Gosu
             double x2, double y2, Color c2,
             double x3, double y3, Color c3,
             double x4, double y4, Color c4,
-            ZPos z, AlphaMode mode) const = 0;
+            ZPos z, BlendMode mode) const = 0;
 
         virtual const GLTexInfo* gl_tex_info() const = 0;
         

data/include/Gosu/Utility.hpp

@@ -1,19 +1,21 @@
 #pragma once
 
 #include <string>
+#include <vector>
 
 namespace Gosu
 {
     std::u32string utf8_to_composed_utc4(const std::string& utf8);
-    
-    //! Returns true if the filename has the given extension.
-    //! The comparison is case-insensitive, but you must pass the extension in lower case.
+
+    /// Returns true if the filename has the given extension.
+    /// The comparison is case-insensitive, but you must pass the extension in lower case.
     bool has_extension(std::string_view filename, std::string_view extension);
-    
-    //! Returns the user's preferred language, at the moment of calling the function. Expect return
-    //! values such as 'en_US', 'de_DE.UTF-8', 'ja', 'zh-Hans'.
-    //! The first two letters will always be a language code.
-    std::string language();
+
+    /// Returns the user's preferred user_languages/locales, e.g. {"en_US", "de_DE", "ja"}.
+    /// The first two letters of each element will always be a language code.
+    /// This value is not cached. Please memorize the specific value that you are interested in,
+    /// typically the first language in the returned array that your game supports.
+    std::vector<std::string> user_languages();
 
     class Noncopyable
     {

data/include/Gosu/Version.hpp

@@ -3,8 +3,8 @@
 #include <string>
 
 #define GOSU_MAJOR_VERSION 1
-#define GOSU_MINOR_VERSION 1
-#define GOSU_POINT_VERSION 1
+#define GOSU_MINOR_VERSION 2
+#define GOSU_POINT_VERSION 0
 
 namespace Gosu
 {

data/lib/gosu/compat.rb

@@ -202,4 +202,8 @@ module Gosu
     # Also import old-style constants into Gosu::Button.
     Gosu::Button.const_set old_name, Gosu.const_get(new_name)
   end
+
+  def self.language
+    @language_cache ||= (user_languages.first || "en_US")
+  end
 end

data/src/EmptyImageData.hpp

@@ -22,7 +22,7 @@ namespace Gosu
                   double, double, Color,
                   double, double, Color,
                   double, double, Color,
-                  ZPos, AlphaMode) const override
+                  ZPos, BlendMode) const override
         {
         }
         

data/src/Font.cpp

@@ -112,13 +112,13 @@ double Gosu::Font::markup_width(const string& markup) const
 }
 
 void Gosu::Font::draw_text(const string& text, double x, double y, ZPos z,
-                           double scale_x, double scale_y, Color c, AlphaMode mode) const
+                           double scale_x, double scale_y, Color c, BlendMode mode) const
 {
     draw_markup(escape_markup(text), x, y, z, scale_x, scale_y, c, mode);
 }
 
 void Gosu::Font::draw_markup(const string& markup, double x, double y, ZPos z,
-                             double scale_x, double scale_y, Color c, AlphaMode mode) const
+                             double scale_x, double scale_y, Color c, BlendMode mode) const
 {
     double current_y = y;
     
@@ -142,7 +142,7 @@ void Gosu::Font::draw_markup(const string& markup, double x, double y, ZPos z,
 
 void Gosu::Font::draw_text_rel(const string& text, double x, double y, ZPos z,
                                double rel_x, double rel_y, double scale_x, double scale_y,
-                               Color c, AlphaMode mode) const
+                               Color c, BlendMode mode) const
 {
     if (rel_x) x -= text_width(text) * scale_x * rel_x;
     if (rel_y) y -= height() * scale_y * rel_y;
@@ -152,7 +152,7 @@ void Gosu::Font::draw_text_rel(const string& text, double x, double y, ZPos z,
 
 void Gosu::Font::draw_markup_rel(const string& markup, double x, double y, ZPos z,
                                  double rel_x, double rel_y, double scale_x, double scale_y,
-                                 Color c, AlphaMode mode) const
+                                 Color c, BlendMode mode) const
 {
     if (rel_x) x -= markup_width(markup) * scale_x * rel_x;
     if (rel_y) y -= height() * scale_y * rel_y;

data/src/Graphics.cpp

@@ -330,7 +330,7 @@ void Gosu::Graphics::transform(const Gosu::Transform& transform, const function<
 }
 
 void Gosu::Graphics::draw_line(double x1, double y1, Color c1,
-    double x2, double y2, Color c2, ZPos z, AlphaMode mode)
+    double x2, double y2, Color c2, ZPos z, BlendMode mode)
 {
     DrawOp op;
     op.render_state.mode = mode;
@@ -343,7 +343,7 @@ void Gosu::Graphics::draw_line(double x1, double y1, Color c1,
 }
 
 void Gosu::Graphics::draw_triangle(double x1, double y1, Color c1, double x2, double y2, Color c2,
-    double x3, double y3, Color c3, ZPos z, AlphaMode mode)
+    double x3, double y3, Color c3, ZPos z, BlendMode mode)
 {
     DrawOp op;
     op.render_state.mode = mode;
@@ -361,7 +361,7 @@ void Gosu::Graphics::draw_triangle(double x1, double y1, Color c1, double x2, do
 }
 
 void Gosu::Graphics::draw_quad(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)
+    double x3, double y3, Color c3, double x4, double y4, Color c4, ZPos z, BlendMode mode)
 {
     normalize_coordinates(x1, y1, x2, y2, x3, y3, c3, x4, y4, c4);
 
@@ -384,7 +384,7 @@ void Gosu::Graphics::draw_quad(double x1, double y1, Color c1, double x2, double
 }
 
 void Gosu::Graphics::draw_rect(double x, double y, double width, double height, Color c,
-                               ZPos z, Gosu::AlphaMode mode)
+                               ZPos z, Gosu::BlendMode mode)
 {
     draw_quad(x, y, c, x + width, y, c, x, y + height, c, x + width, y + height, c, z, mode);
 }

data/src/Image.cpp

@@ -57,7 +57,7 @@ unsigned Gosu::Image::height() const
 }
 
 void Gosu::Image::draw(double x, double y, ZPos z, double scale_x, double scale_y, Color c,
-    AlphaMode mode) const
+    BlendMode mode) const
 {
     double x2 = x + width() * scale_x;
     double y2 = y + height() * scale_y;
@@ -66,7 +66,7 @@ void Gosu::Image::draw(double x, double y, ZPos z, double scale_x, double scale_
 }
 
 void Gosu::Image::draw_mod(double x, double y, ZPos z, double scale_x, double scale_y, Color c1,
-    Color c2, Color c3, Color c4, AlphaMode mode) const
+    Color c2, Color c3, Color c4, BlendMode mode) const
 {
     double x2 = x + width() * scale_x;
     double y2 = y + height() * scale_y;
@@ -75,7 +75,8 @@ void Gosu::Image::draw_mod(double x, double y, ZPos z, double scale_x, double sc
 }
 
 void Gosu::Image::draw_rot(double x, double y, ZPos z, double angle,
-    double center_x, double center_y, double scale_x, double scale_y, Color c, AlphaMode mode) const
+    double center_x, double center_y, double scale_x, double scale_y, Color c,
+                           BlendMode mode) const
 {
     double size_x = width() * scale_x;
     double size_y = height() * scale_y;

data/src/LargeImageData.cpp

@@ -69,7 +69,7 @@ void Gosu::LargeImageData::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
+                                ZPos z, BlendMode mode) const
 {
     normalize_coordinates(x1, y1, x2, y2, x3, y3, c3, x4, y4, c4);
     

data/src/LargeImageData.hpp

@@ -25,7 +25,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 nullptr; }
     

data/src/Macro.cpp

@@ -162,7 +162,7 @@ int Gosu::Macro::height() const
 }
 
 void Gosu::Macro::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
 {
     if (c1 != Color::WHITE || c2 != Color::WHITE || c3 != Color::WHITE || c4 != Color::WHITE) {
         throw invalid_argument("Macros cannot be tinted with colors");
@@ -185,7 +185,7 @@ Gosu::Bitmap Gosu::Macro::to_bitmap() const
              pimpl->width, 0,             Color::WHITE,
              0,            pimpl->height, Color::WHITE,
              pimpl->width, pimpl->height, Color::WHITE,
-             0, AM_DEFAULT);
+             0, BM_DEFAULT);
     }).data().to_bitmap();
 }
 

data/src/Macro.hpp

@@ -18,7 +18,7 @@ public:
     
     void 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 override;
+        BlendMode mode) const override;
     
     const Gosu::GLTexInfo* gl_tex_info() const override;
     

data/src/RenderState.hpp

@@ -10,10 +10,10 @@ struct Gosu::RenderState
     std::shared_ptr<Texture> texture;
     const Transform* transform;
     ClipRect clip_rect;
-    AlphaMode mode;
+    BlendMode mode;
     
     RenderState()
-    : transform(0), mode(AM_DEFAULT)
+    : transform(0), mode(BM_DEFAULT)
     {
         clip_rect.width = NO_CLIPPING;
     }
@@ -39,10 +39,10 @@ struct Gosu::RenderState
     
     void apply_alpha_mode() const
     {
-        if (mode == AM_ADD) {
+        if (mode == BM_ADD) {
             glBlendFunc(GL_SRC_ALPHA, GL_ONE);
         }
-        else if (mode == AM_MULTIPLY) {
+        else if (mode == BM_MULTIPLY) {
             glBlendFunc(GL_DST_COLOR, GL_ZERO);
         }
         else {
@@ -174,7 +174,7 @@ public:
         }
     }
     
-    void set_alpha_mode(AlphaMode new_mode)
+    void set_alpha_mode(BlendMode new_mode)
     {
         if (new_mode == mode) return;
         

data/src/RubyGosu.cxx

@@ -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
@@ -2203,7 +2203,7 @@ static VALUE mGosu;
 #define SWIG_RUBY_THREAD_END_BLOCK
 
 
-#define SWIGVERSION 0x040100 
+#define SWIGVERSION 0x040002 
 #define SWIG_VERSION SWIGVERSION
 
 
@@ -2353,7 +2353,7 @@ namespace Gosu
 {
     void draw_line(double x1, double y1, Gosu::Color c1,
                    double x2, double y2, Gosu::Color c2,
-                   Gosu::ZPos z = 0, Gosu::AlphaMode mode = Gosu::AM_DEFAULT)
+                   Gosu::ZPos z = 0, Gosu::BlendMode mode = Gosu::BM_DEFAULT)
     {
         Gosu::Graphics::draw_line(x1, y1, c1, x2, y2, c2, z, mode);
     }
@@ -2361,7 +2361,7 @@ namespace Gosu
     void draw_triangle(double x1, double y1, Gosu::Color c1,
                        double x2, double y2, Gosu::Color c2,
                        double x3, double y3, Gosu::Color c3,
-                       Gosu::ZPos z = 0, Gosu::AlphaMode mode = Gosu::AM_DEFAULT)
+                       Gosu::ZPos z = 0, Gosu::BlendMode mode = Gosu::BM_DEFAULT)
     {
         Gosu::Graphics::draw_triangle(x1, y1, c1, x2, y2, c2, x3, y3, c3, z, mode);
     }
@@ -2370,13 +2370,13 @@ namespace Gosu
                    double x2, double y2, Gosu::Color c2,
                    double x3, double y3, Gosu::Color c3,
                    double x4, double y4, Gosu::Color c4,
-                   Gosu::ZPos z = 0, Gosu::AlphaMode mode = Gosu::AM_DEFAULT)
+                   Gosu::ZPos z = 0, Gosu::BlendMode mode = Gosu::BM_DEFAULT)
     {
         Gosu::Graphics::draw_quad(x1, y1, c1, x2, y2, c2, x3, y3, c3, x4, y4, c4, z, mode);
     }
     
     void draw_rect(double x, double y, double width, double height, Gosu::Color c,
-                   Gosu::ZPos z = 0, Gosu::AlphaMode mode = Gosu::AM_DEFAULT)
+                   Gosu::ZPos z = 0, Gosu::BlendMode mode = Gosu::BM_DEFAULT)
     {
         Gosu::Graphics::draw_rect(x, y, width, height, c, z, mode);
     }
@@ -2519,7 +2519,7 @@ SWIG_ruby_failed(VALUE SWIGUNUSEDPARM(arg1), VALUE SWIGUNUSEDPARM(arg2))
 } 
 
 
-/*@SWIG:/usr/local/Cellar/swig/HEAD-975f8fc/share/swig/4.1.0/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/opt/homebrew/Cellar/swig/4.0.2/share/swig/4.0.2/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2DBL(VALUE arg)
 {
   VALUE *args = (VALUE *)arg;
@@ -2562,7 +2562,7 @@ SWIG_From_unsigned_SS_int  (unsigned int value)
 #include <string>
 
 
-/*@SWIG:/usr/local/Cellar/swig/HEAD-975f8fc/share/swig/4.1.0/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/opt/homebrew/Cellar/swig/4.0.2/share/swig/4.0.2/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2ULONG(VALUE arg)
 {
   VALUE *args = (VALUE *)arg;
@@ -2768,7 +2768,7 @@ SWIG_AsPtr_std_string (VALUE obj, std::string **val)
 }
 
 
-/*@SWIG:/usr/local/Cellar/swig/HEAD-975f8fc/share/swig/4.1.0/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/opt/homebrew/Cellar/swig/4.0.2/share/swig/4.0.2/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2LONG(VALUE arg)
 {
   VALUE *args = (VALUE *)arg;
@@ -2923,7 +2923,7 @@ SWIGINTERN Gosu::Image *new_Gosu_Image(VALUE source,VALUE options=0){
         
         return new Gosu::Image(bmp, src_x, src_y, src_width, src_height, flags);
     }
-SWIGINTERN void Gosu_Image_draw_as_quad(Gosu::Image *self,double x1,double y1,Gosu::Color c1,double x2,double y2,Gosu::Color c2,double x3,double y3,Gosu::Color c3,double x4,double y4,Gosu::Color c4,Gosu::ZPos z,Gosu::AlphaMode mode=Gosu::AM_DEFAULT){
+SWIGINTERN void Gosu_Image_draw_as_quad(Gosu::Image *self,double x1,double y1,Gosu::Color c1,double x2,double y2,Gosu::Color c2,double x3,double y3,Gosu::Color c3,double x4,double y4,Gosu::Color c4,Gosu::ZPos z,Gosu::BlendMode mode=Gosu::BM_DEFAULT){
         self->data().draw(x1, y1, c1, x2, y2, c2, x3, y3, c3, x4, y4, c4, z, mode);
     }
 SWIGINTERN Gosu::GLTexInfo *Gosu_Image_gl_tex_info(Gosu::Image const *self){
@@ -3300,7 +3300,7 @@ std::string SwigDirector_TextInput::filter(std::string text) const {
 }
 
 
-SwigDirector_Window::SwigDirector_Window(VALUE self,int width,int height,unsigned int window_flags,double update_interval): Gosu::Window(width, height, window_flags, update_interval), Swig::Director(self) {
+SwigDirector_Window::SwigDirector_Window(VALUE self, int width, int height, unsigned int window_flags, double update_interval): Gosu::Window(width, height, window_flags, update_interval), Swig::Director(self) {
   
 }
 
@@ -3864,8 +3864,8 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_language(int argc, VALUE *argv, VALUE self) {
-  std::string result;
+_wrap_user_languages(int argc, VALUE *argv, VALUE self) {
+  SwigValueWrapper< std::vector< std::string > > result;
   VALUE vresult = Qnil;
   
   if ((argc < 0) || (argc > 0)) {
@@ -3873,15 +3873,17 @@ _wrap_language(int argc, VALUE *argv, VALUE self) {
   }
   {
     try {
-      result = Gosu::language();
+      result = Gosu::user_languages();
     }
     catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
   {
-    vresult = rb_str_new2((&result)->c_str());
-    ENFORCE_UTF8(vresult);
+    vresult = rb_ary_new2((&result)->size());
+    for (std::size_t i = 0; i < (&result)->size(); i++) {
+      rb_ary_store(vresult, i, rb_str_new2((*&result)[i].c_str()));
+    }
   }
   return vresult;
 fail:
@@ -5373,7 +5375,7 @@ _wrap_Font_draw_text(int argc, VALUE *argv, VALUE self) {
   double arg6 = (double) 1 ;
   double arg7 = (double) 1 ;
   Gosu::Color arg8 = (Gosu::Color) Gosu::Color::WHITE ;
-  Gosu::AlphaMode arg9 = (Gosu::AlphaMode) Gosu::AM_DEFAULT ;
+  Gosu::BlendMode arg9 = (Gosu::BlendMode) Gosu::BM_DEFAULT ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 = SWIG_OLDOBJ ;
@@ -5461,16 +5463,16 @@ _wrap_Font_draw_text(int argc, VALUE *argv, VALUE self) {
       const char* cstr = Gosu::cstr_from_symbol(argv[7]);
       
       if (!strcmp(cstr, "default")) {
-        arg9 = Gosu::AM_DEFAULT;
+        arg9 = Gosu::BM_DEFAULT;
       }
       else if (!strcmp(cstr, "add") || !strcmp(cstr, "additive")) {
-        arg9 = Gosu::AM_ADD;
+        arg9 = Gosu::BM_ADD;
       }
       else if (!strcmp(cstr, "multiply")) {
-        arg9 = Gosu::AM_MULTIPLY;
+        arg9 = Gosu::BM_MULTIPLY;
       }
       else {
-        SWIG_exception_fail(SWIG_ValueError, "invalid alpha mode (expected one of :default, :add, "
+        SWIG_exception_fail(SWIG_ValueError, "invalid blend mode (expected one of :default, :add, "
           ":multiply)");
       }
     }
@@ -5501,7 +5503,7 @@ _wrap_Font_draw_markup(int argc, VALUE *argv, VALUE self) {
   double arg6 = (double) 1 ;
   double arg7 = (double) 1 ;
   Gosu::Color arg8 = (Gosu::Color) Gosu::Color::WHITE ;
-  Gosu::AlphaMode arg9 = (Gosu::AlphaMode) Gosu::AM_DEFAULT ;
+  Gosu::BlendMode arg9 = (Gosu::BlendMode) Gosu::BM_DEFAULT ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 = SWIG_OLDOBJ ;
@@ -5589,16 +5591,16 @@ _wrap_Font_draw_markup(int argc, VALUE *argv, VALUE self) {
       const char* cstr = Gosu::cstr_from_symbol(argv[7]);
       
       if (!strcmp(cstr, "default")) {
-        arg9 = Gosu::AM_DEFAULT;
+        arg9 = Gosu::BM_DEFAULT;
       }
       else if (!strcmp(cstr, "add") || !strcmp(cstr, "additive")) {
-        arg9 = Gosu::AM_ADD;
+        arg9 = Gosu::BM_ADD;
       }
       else if (!strcmp(cstr, "multiply")) {
-        arg9 = Gosu::AM_MULTIPLY;
+        arg9 = Gosu::BM_MULTIPLY;
       }
       else {
-        SWIG_exception_fail(SWIG_ValueError, "invalid alpha mode (expected one of :default, :add, "
+        SWIG_exception_fail(SWIG_ValueError, "invalid blend mode (expected one of :default, :add, "
           ":multiply)");
       }
     }
@@ -5631,7 +5633,7 @@ _wrap_Font_draw_text_rel(int argc, VALUE *argv, VALUE self) {
   double arg8 = (double) 1 ;
   double arg9 = (double) 1 ;
   Gosu::Color arg10 = (Gosu::Color) Gosu::Color::WHITE ;
-  Gosu::AlphaMode arg11 = (Gosu::AlphaMode) Gosu::AM_DEFAULT ;
+  Gosu::BlendMode arg11 = (Gosu::BlendMode) Gosu::BM_DEFAULT ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 = SWIG_OLDOBJ ;
@@ -5733,16 +5735,16 @@ _wrap_Font_draw_text_rel(int argc, VALUE *argv, VALUE self) {
       const char* cstr = Gosu::cstr_from_symbol(argv[9]);
       
       if (!strcmp(cstr, "default")) {
-        arg11 = Gosu::AM_DEFAULT;
+        arg11 = Gosu::BM_DEFAULT;
       }
       else if (!strcmp(cstr, "add") || !strcmp(cstr, "additive")) {
-        arg11 = Gosu::AM_ADD;
+        arg11 = Gosu::BM_ADD;
       }
       else if (!strcmp(cstr, "multiply")) {
-        arg11 = Gosu::AM_MULTIPLY;
+        arg11 = Gosu::BM_MULTIPLY;
       }
       else {
-        SWIG_exception_fail(SWIG_ValueError, "invalid alpha mode (expected one of :default, :add, "
+        SWIG_exception_fail(SWIG_ValueError, "invalid blend mode (expected one of :default, :add, "
           ":multiply)");
       }
     }
@@ -5775,7 +5777,7 @@ _wrap_Font_draw_markup_rel(int argc, VALUE *argv, VALUE self) {
   double arg8 = (double) 1 ;
   double arg9 = (double) 1 ;
   Gosu::Color arg10 = (Gosu::Color) Gosu::Color::WHITE ;
-  Gosu::AlphaMode arg11 = (Gosu::AlphaMode) Gosu::AM_DEFAULT ;
+  Gosu::BlendMode arg11 = (Gosu::BlendMode) Gosu::BM_DEFAULT ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 = SWIG_OLDOBJ ;
@@ -5877,16 +5879,16 @@ _wrap_Font_draw_markup_rel(int argc, VALUE *argv, VALUE self) {
       const char* cstr = Gosu::cstr_from_symbol(argv[9]);
       
       if (!strcmp(cstr, "default")) {
-        arg11 = Gosu::AM_DEFAULT;
+        arg11 = Gosu::BM_DEFAULT;
       }
       else if (!strcmp(cstr, "add") || !strcmp(cstr, "additive")) {
-        arg11 = Gosu::AM_ADD;
+        arg11 = Gosu::BM_ADD;
       }
       else if (!strcmp(cstr, "multiply")) {
-        arg11 = Gosu::AM_MULTIPLY;
+        arg11 = Gosu::BM_MULTIPLY;
       }
       else {
-        SWIG_exception_fail(SWIG_ValueError, "invalid alpha mode (expected one of :default, :add, "
+        SWIG_exception_fail(SWIG_ValueError, "invalid blend mode (expected one of :default, :add, "
           ":multiply)");
       }
     }
@@ -6625,7 +6627,7 @@ _wrap_Image_draw(int argc, VALUE *argv, VALUE self) {
   double arg5 = (double) 1 ;
   double arg6 = (double) 1 ;
   Gosu::Color arg7 = (Gosu::Color) Gosu::Color::WHITE ;
-  Gosu::AlphaMode arg8 = (Gosu::AlphaMode) Gosu::AM_DEFAULT ;
+  Gosu::BlendMode arg8 = (Gosu::BlendMode) Gosu::BM_DEFAULT ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   double val2 ;
@@ -6703,16 +6705,16 @@ _wrap_Image_draw(int argc, VALUE *argv, VALUE self) {
       const char* cstr = Gosu::cstr_from_symbol(argv[6]);
       
       if (!strcmp(cstr, "default")) {
-        arg8 = Gosu::AM_DEFAULT;
+        arg8 = Gosu::BM_DEFAULT;
       }
       else if (!strcmp(cstr, "add") || !strcmp(cstr, "additive")) {
-        arg8 = Gosu::AM_ADD;
+        arg8 = Gosu::BM_ADD;
       }
       else if (!strcmp(cstr, "multiply")) {
-        arg8 = Gosu::AM_MULTIPLY;
+        arg8 = Gosu::BM_MULTIPLY;
       }
       else {
-        SWIG_exception_fail(SWIG_ValueError, "invalid alpha mode (expected one of :default, :add, "
+        SWIG_exception_fail(SWIG_ValueError, "invalid blend mode (expected one of :default, :add, "
           ":multiply)");
       }
     }
@@ -6743,7 +6745,7 @@ _wrap_Image_draw_mod(int argc, VALUE *argv, VALUE self) {
   Gosu::Color arg8 ;
   Gosu::Color arg9 ;
   Gosu::Color arg10 ;
-  Gosu::AlphaMode arg11 = (Gosu::AlphaMode) Gosu::AM_DEFAULT ;
+  Gosu::BlendMode arg11 = (Gosu::BlendMode) Gosu::BM_DEFAULT ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   double val2 ;
@@ -6867,16 +6869,16 @@ _wrap_Image_draw_mod(int argc, VALUE *argv, VALUE self) {
       const char* cstr = Gosu::cstr_from_symbol(argv[9]);
       
       if (!strcmp(cstr, "default")) {
-        arg11 = Gosu::AM_DEFAULT;
+        arg11 = Gosu::BM_DEFAULT;
       }
       else if (!strcmp(cstr, "add") || !strcmp(cstr, "additive")) {
-        arg11 = Gosu::AM_ADD;
+        arg11 = Gosu::BM_ADD;
       }
       else if (!strcmp(cstr, "multiply")) {
-        arg11 = Gosu::AM_MULTIPLY;
+        arg11 = Gosu::BM_MULTIPLY;
       }
       else {
-        SWIG_exception_fail(SWIG_ValueError, "invalid alpha mode (expected one of :default, :add, "
+        SWIG_exception_fail(SWIG_ValueError, "invalid blend mode (expected one of :default, :add, "
           ":multiply)");
       }
     }
@@ -6907,7 +6909,7 @@ _wrap_Image_draw_rot(int argc, VALUE *argv, VALUE self) {
   double arg8 = (double) 1 ;
   double arg9 = (double) 1 ;
   Gosu::Color arg10 = (Gosu::Color) Gosu::Color::WHITE ;
-  Gosu::AlphaMode arg11 = (Gosu::AlphaMode) Gosu::AM_DEFAULT ;
+  Gosu::BlendMode arg11 = (Gosu::BlendMode) Gosu::BM_DEFAULT ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   double val2 ;
@@ -7012,16 +7014,16 @@ _wrap_Image_draw_rot(int argc, VALUE *argv, VALUE self) {
       const char* cstr = Gosu::cstr_from_symbol(argv[9]);
       
       if (!strcmp(cstr, "default")) {
-        arg11 = Gosu::AM_DEFAULT;
+        arg11 = Gosu::BM_DEFAULT;
       }
       else if (!strcmp(cstr, "add") || !strcmp(cstr, "additive")) {
-        arg11 = Gosu::AM_ADD;
+        arg11 = Gosu::BM_ADD;
       }
       else if (!strcmp(cstr, "multiply")) {
-        arg11 = Gosu::AM_MULTIPLY;
+        arg11 = Gosu::BM_MULTIPLY;
       }
       else {
-        SWIG_exception_fail(SWIG_ValueError, "invalid alpha mode (expected one of :default, :add, "
+        SWIG_exception_fail(SWIG_ValueError, "invalid blend mode (expected one of :default, :add, "
           ":multiply)");
       }
     }
@@ -7101,7 +7103,7 @@ _wrap_Image_draw_as_quad(int argc, VALUE *argv, VALUE self) {
   double arg12 ;
   Gosu::Color arg13 ;
   Gosu::ZPos arg14 ;
-  Gosu::AlphaMode arg15 = (Gosu::AlphaMode) Gosu::AM_DEFAULT ;
+  Gosu::BlendMode arg15 = (Gosu::BlendMode) Gosu::BM_DEFAULT ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   double val2 ;
@@ -7253,16 +7255,16 @@ _wrap_Image_draw_as_quad(int argc, VALUE *argv, VALUE self) {
       const char* cstr = Gosu::cstr_from_symbol(argv[13]);
       
       if (!strcmp(cstr, "default")) {
-        arg15 = Gosu::AM_DEFAULT;
+        arg15 = Gosu::BM_DEFAULT;
       }
       else if (!strcmp(cstr, "add") || !strcmp(cstr, "additive")) {
-        arg15 = Gosu::AM_ADD;
+        arg15 = Gosu::BM_ADD;
       }
       else if (!strcmp(cstr, "multiply")) {
-        arg15 = Gosu::AM_MULTIPLY;
+        arg15 = Gosu::BM_MULTIPLY;
       }
       else {
-        SWIG_exception_fail(SWIG_ValueError, "invalid alpha mode (expected one of :default, :add, "
+        SWIG_exception_fail(SWIG_ValueError, "invalid blend mode (expected one of :default, :add, "
           ":multiply)");
       }
     }
@@ -10987,7 +10989,7 @@ _wrap_draw_line(int argc, VALUE *argv, VALUE self) {
   double arg5 ;
   Gosu::Color arg6 ;
   Gosu::ZPos arg7 = (Gosu::ZPos) 0 ;
-  Gosu::AlphaMode arg8 = (Gosu::AlphaMode) Gosu::AM_DEFAULT ;
+  Gosu::BlendMode arg8 = (Gosu::BlendMode) Gosu::BM_DEFAULT ;
   double val1 ;
   int ecode1 = 0 ;
   double val2 ;
@@ -11070,16 +11072,16 @@ _wrap_draw_line(int argc, VALUE *argv, VALUE self) {
       const char* cstr = Gosu::cstr_from_symbol(argv[7]);
       
       if (!strcmp(cstr, "default")) {
-        arg8 = Gosu::AM_DEFAULT;
+        arg8 = Gosu::BM_DEFAULT;
       }
       else if (!strcmp(cstr, "add") || !strcmp(cstr, "additive")) {
-        arg8 = Gosu::AM_ADD;
+        arg8 = Gosu::BM_ADD;
       }
       else if (!strcmp(cstr, "multiply")) {
-        arg8 = Gosu::AM_MULTIPLY;
+        arg8 = Gosu::BM_MULTIPLY;
       }
       else {
-        SWIG_exception_fail(SWIG_ValueError, "invalid alpha mode (expected one of :default, :add, "
+        SWIG_exception_fail(SWIG_ValueError, "invalid blend mode (expected one of :default, :add, "
           ":multiply)");
       }
     }
@@ -11110,7 +11112,7 @@ _wrap_draw_triangle(int argc, VALUE *argv, VALUE self) {
   double arg8 ;
   Gosu::Color arg9 ;
   Gosu::ZPos arg10 = (Gosu::ZPos) 0 ;
-  Gosu::AlphaMode arg11 = (Gosu::AlphaMode) Gosu::AM_DEFAULT ;
+  Gosu::BlendMode arg11 = (Gosu::BlendMode) Gosu::BM_DEFAULT ;
   double val1 ;
   int ecode1 = 0 ;
   double val2 ;
@@ -11225,16 +11227,16 @@ _wrap_draw_triangle(int argc, VALUE *argv, VALUE self) {
       const char* cstr = Gosu::cstr_from_symbol(argv[10]);
       
       if (!strcmp(cstr, "default")) {
-        arg11 = Gosu::AM_DEFAULT;
+        arg11 = Gosu::BM_DEFAULT;
       }
       else if (!strcmp(cstr, "add") || !strcmp(cstr, "additive")) {
-        arg11 = Gosu::AM_ADD;
+        arg11 = Gosu::BM_ADD;
       }
       else if (!strcmp(cstr, "multiply")) {
-        arg11 = Gosu::AM_MULTIPLY;
+        arg11 = Gosu::BM_MULTIPLY;
       }
       else {
-        SWIG_exception_fail(SWIG_ValueError, "invalid alpha mode (expected one of :default, :add, "
+        SWIG_exception_fail(SWIG_ValueError, "invalid blend mode (expected one of :default, :add, "
           ":multiply)");
       }
     }
@@ -11268,7 +11270,7 @@ _wrap_draw_quad(int argc, VALUE *argv, VALUE self) {
   double arg11 ;
   Gosu::Color arg12 ;
   Gosu::ZPos arg13 = (Gosu::ZPos) 0 ;
-  Gosu::AlphaMode arg14 = (Gosu::AlphaMode) Gosu::AM_DEFAULT ;
+  Gosu::BlendMode arg14 = (Gosu::BlendMode) Gosu::BM_DEFAULT ;
   double val1 ;
   int ecode1 = 0 ;
   double val2 ;
@@ -11415,16 +11417,16 @@ _wrap_draw_quad(int argc, VALUE *argv, VALUE self) {
       const char* cstr = Gosu::cstr_from_symbol(argv[13]);
       
       if (!strcmp(cstr, "default")) {
-        arg14 = Gosu::AM_DEFAULT;
+        arg14 = Gosu::BM_DEFAULT;
       }
       else if (!strcmp(cstr, "add") || !strcmp(cstr, "additive")) {
-        arg14 = Gosu::AM_ADD;
+        arg14 = Gosu::BM_ADD;
       }
       else if (!strcmp(cstr, "multiply")) {
-        arg14 = Gosu::AM_MULTIPLY;
+        arg14 = Gosu::BM_MULTIPLY;
       }
       else {
-        SWIG_exception_fail(SWIG_ValueError, "invalid alpha mode (expected one of :default, :add, "
+        SWIG_exception_fail(SWIG_ValueError, "invalid blend mode (expected one of :default, :add, "
           ":multiply)");
       }
     }
@@ -11451,7 +11453,7 @@ _wrap_draw_rect(int argc, VALUE *argv, VALUE self) {
   double arg4 ;
   Gosu::Color arg5 ;
   Gosu::ZPos arg6 = (Gosu::ZPos) 0 ;
-  Gosu::AlphaMode arg7 = (Gosu::AlphaMode) Gosu::AM_DEFAULT ;
+  Gosu::BlendMode arg7 = (Gosu::BlendMode) Gosu::BM_DEFAULT ;
   double val1 ;
   int ecode1 = 0 ;
   double val2 ;
@@ -11516,16 +11518,16 @@ _wrap_draw_rect(int argc, VALUE *argv, VALUE self) {
       const char* cstr = Gosu::cstr_from_symbol(argv[6]);
       
       if (!strcmp(cstr, "default")) {
-        arg7 = Gosu::AM_DEFAULT;
+        arg7 = Gosu::BM_DEFAULT;
       }
       else if (!strcmp(cstr, "add") || !strcmp(cstr, "additive")) {
-        arg7 = Gosu::AM_ADD;
+        arg7 = Gosu::BM_ADD;
       }
       else if (!strcmp(cstr, "multiply")) {
-        arg7 = Gosu::AM_MULTIPLY;
+        arg7 = Gosu::BM_MULTIPLY;
       }
       else {
-        SWIG_exception_fail(SWIG_ValueError, "invalid alpha mode (expected one of :default, :add, "
+        SWIG_exception_fail(SWIG_ValueError, "invalid blend mode (expected one of :default, :add, "
           ":multiply)");
       }
     }
@@ -12518,7 +12520,7 @@ SWIGEXPORT void Init_gosu(void) {
   rb_define_const(mGosu, "VERSION", SWIG_From_std_string(static_cast< std::string >(Gosu::VERSION)));
   rb_define_const(mGosu, "LICENSES", SWIG_From_std_string(static_cast< std::string >(Gosu::LICENSES)));
   rb_define_const(mGosu, "MAJOR_VERSION", SWIG_From_int(static_cast< int >(1)));
-  rb_define_const(mGosu, "MINOR_VERSION", SWIG_From_int(static_cast< int >(1)));
+  rb_define_const(mGosu, "MINOR_VERSION", SWIG_From_int(static_cast< int >(2)));
   rb_define_const(mGosu, "POINT_VERSION", SWIG_From_int(static_cast< int >(0)));
   rb_define_module_function(mGosu, "milliseconds", VALUEFUNC(_wrap_milliseconds), -1);
   rb_define_module_function(mGosu, "random", VALUEFUNC(_wrap_random), -1);
@@ -12532,7 +12534,7 @@ SWIGEXPORT void Init_gosu(void) {
   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_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, "user_languages", VALUEFUNC(_wrap_user_languages), -1);
   rb_define_module_function(mGosu, "enable_undocumented_retrofication", VALUEFUNC(_wrap_enable_undocumented_retrofication), -1);
   
   SwigClassColor.klass = rb_define_class_under(mGosu, "Color", rb_cObject);

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();

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gosu
 version: !ruby/object:Gem::Version
-  version: 1.1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Julian Raschke
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-13 00:00:00.000000000 Z
+date: 2021-03-18 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

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