gosu 1.1.0.pre2 → 1.3.0

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,14 @@ 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@*/
+SWIGINTERNINLINE VALUE
+SWIG_From_unsigned_SS_char  (unsigned char value)
+{    
+  return SWIG_From_unsigned_SS_long  (value);
+}
+
+
+/*@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;
@@ -2591,44 +2598,24 @@ SWIG_AsVal_unsigned_SS_long (VALUE obj, unsigned long *val)
   return SWIG_TypeError;
 }
 
-
-SWIGINTERN int
-SWIG_AsVal_unsigned_SS_int (VALUE obj, unsigned int *val)
-{
-  unsigned long v;
-  int res = SWIG_AsVal_unsigned_SS_long (obj, &v);
-  if (SWIG_IsOK(res)) {
-    if ((v > UINT_MAX)) {
-      return SWIG_OverflowError;
-    } else {
-      if (val) *val = static_cast< unsigned int >(v);
-    }
-  }  
-  return res;
-}
-
-
-SWIGINTERNINLINE VALUE
-SWIG_From_unsigned_SS_char  (unsigned char value)
-{    
-  return SWIG_From_unsigned_SS_long  (value);
-}
-
 SWIGINTERN Gosu::Color Gosu_Color_rgb(Gosu::Color::Channel r,Gosu::Color::Channel g,Gosu::Color::Channel b){
-        return Gosu::Color(r, g, b);
+        return Gosu::Color{r, g, b};
     }
 SWIGINTERN Gosu::Color Gosu_Color_rgba__SWIG_0(Gosu::Color::Channel r,Gosu::Color::Channel g,Gosu::Color::Channel b,Gosu::Color::Channel a){
-        return Gosu::Color(a, r, g, b);
+        return Gosu::Color{r, g, b}.with_alpha(a);
     }
 SWIGINTERN Gosu::Color Gosu_Color_rgba__SWIG_1(std::uint32_t rgba){
-        return Gosu::Color((rgba >>  0) & 0xff, (rgba >> 24) & 0xff,
-                           (rgba >> 16) & 0xff, (rgba >>  8) & 0xff);
+        const std::uint32_t argb = (rgba >> 8) & 0xffffff | ((rgba & 0xff) << 24);
+        return Gosu::Color{argb};
     }
 SWIGINTERN Gosu::Color Gosu_Color_argb__SWIG_1(Gosu::Color::Channel a,Gosu::Color::Channel r,Gosu::Color::Channel g,Gosu::Color::Channel b){
-        return Gosu::Color(a, r, g, b);
+        return Gosu::Color{r, g, b}.with_alpha(a);
     }
 SWIGINTERN Gosu::Color Gosu_Color_argb__SWIG_2(std::uint32_t argb){
-        return Gosu::Color(argb);
+        return Gosu::Color{argb};
+    }
+SWIGINTERN Gosu::Color Gosu_Color_from_ahsv(Gosu::Color::Channel alpha,double h,double s,double v){
+        return Gosu::Color::from_hsv(h, s, v).with_alpha(alpha);
     }
 SWIGINTERN std::uint32_t Gosu_Color_to_i(Gosu::Color const *self){
       return self->argb();
@@ -2638,10 +2625,10 @@ SWIGINTERN Gosu::Color Gosu_Color_dup(Gosu::Color const *self){
     }
 SWIGINTERN std::string Gosu_Color_inspect(Gosu::Color const *self){
         char buffer[32];
-        // snprintf is either member of std:: or a #define for ruby_snprintf.
+        // snprintf is either a member of std:: or a #define for ruby_snprintf.
         using namespace std;
-        snprintf(buffer, sizeof buffer, "#<Gosu::Color:ARGB=0x%02x_%06x>",
-            self->alpha(), self->argb() & 0xffffff);
+        snprintf(buffer, sizeof buffer, "#<Gosu::Color:ARGB=0x%02x_%02x%02x%02x>",
+            self->alpha, self->red, self->green, self->blue);
         return buffer;
     }
 
@@ -2768,7 +2755,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 +2910,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){
@@ -3167,7 +3154,7 @@ SWIGINTERN std::string Gosu_Image_inspect(Gosu::Image const *self,int max_width=
             Gosu::Bitmap bmp = self->data().to_bitmap();
             // This is the scaled image width inside the ASCII art border, so make sure
             // there will be room for a leading and trailing '#' character.
-            int w = Gosu::clamp<int>(max_width - 2, 0, bmp.width());
+            int w = std::clamp<int>(max_width - 2, 0, bmp.width());
             // For images with width == 0, the output will have one line per pixel.
             // Otherwise, scale proportionally.
             int h = (w ? bmp.height() * w / bmp.width() : bmp.height());
@@ -3183,7 +3170,7 @@ SWIGINTERN std::string Gosu_Image_inspect(Gosu::Image const *self,int max_width=
                 for (int x = 0; x < w; ++x) {
                     int scaled_x = x * bmp.width()  / w;
                     int scaled_y = y * bmp.height() / h;
-                    int alpha3bit = bmp.get_pixel(scaled_x, scaled_y).alpha() / 32;
+                    int alpha3bit = bmp.get_pixel(scaled_x, scaled_y).alpha / 32;
                     str[(y + 1) * stride + (x + 1)] = " .:ioVM@"[alpha3bit];
                 }
                 str[(y + 1) * stride + (w + 2)] = '\n'; // newline after row of pixels
@@ -3218,6 +3205,22 @@ SWIGINTERN void Gosu_TextInput_set_selection_start(Gosu::TextInput *self,VALUE s
         std::string prefix = StringValueCStr(rb_prefix);
         self->set_selection_start(std::min(prefix.length(), self->text().length()));
     }
+
+SWIGINTERN int
+SWIG_AsVal_unsigned_SS_int (VALUE obj, unsigned int *val)
+{
+  unsigned long v;
+  int res = SWIG_AsVal_unsigned_SS_long (obj, &v);
+  if (SWIG_IsOK(res)) {
+    if ((v > UINT_MAX)) {
+      return SWIG_OverflowError;
+    } else {
+      if (val) *val = static_cast< unsigned int >(v);
+    }
+  }  
+  return res;
+}
+
 SWIGINTERN void Gosu_Window_set_width(Gosu::Window *self,unsigned int width){
         self->resize(width, self->height(), self->fullscreen());
     }
@@ -3300,7 +3303,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) {
   
 }
 
@@ -3382,6 +3385,13 @@ bool SwigDirector_Window::needs_cursor() const {
 }
 
 
+void SwigDirector_Window::gain_focus() {
+  VALUE SWIGUNUSED result;
+  
+  result = rb_funcall(swig_get_self(), rb_intern("protected_gain_focus"), 0, Qnil);
+}
+
+
 void SwigDirector_Window::lose_focus() {
   VALUE SWIGUNUSED result;
   
@@ -3864,8 +3874,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 +3883,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:
@@ -3911,271 +3923,97 @@ fail:
 static swig_class SwigClassColor;
 
 SWIGINTERN VALUE
-_wrap_new_Color__SWIG_0(int argc, VALUE *argv, VALUE self) {
-  const char *classname SWIGUNUSED = "Gosu::Color";
-  Gosu::Color *result = 0 ;
-  
-  if ((argc < 0) || (argc > 0)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
-  }
-  {
-    try {
-      result = (Gosu::Color *)new Gosu::Color();
-      DATA_PTR(self) = result;
-      SWIG_RubyAddTracking(result, self);
-    }
-    catch (const std::exception& e) {
-      SWIG_exception(SWIG_RuntimeError, e.what());
-    }
-  }
-  return self;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_new_Color__SWIG_1(int argc, VALUE *argv, VALUE self) {
-  unsigned int arg1 ;
-  unsigned int val1 ;
-  int ecode1 = 0 ;
-  const char *classname SWIGUNUSED = "Gosu::Color";
-  Gosu::Color *result = 0 ;
+_wrap_Color_red_set(int argc, VALUE *argv, VALUE self) {
+  Gosu::Color *arg1 = (Gosu::Color *) 0 ;
+  Gosu::Color::Channel arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
   
   if ((argc < 1) || (argc > 1)) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
   }
-  ecode1 = SWIG_AsVal_unsigned_SS_int(argv[0], &val1);
-  if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), Ruby_Format_TypeError( "", "unsigned int","Color", 1, argv[0] ));
-  } 
-  arg1 = static_cast< unsigned int >(val1);
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_Gosu__Color, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "Gosu::Color *","red", 1, self )); 
+  }
+  arg1 = reinterpret_cast< Gosu::Color * >(argp1);
   {
-    try {
-      result = (Gosu::Color *)new Gosu::Color(arg1);
-      DATA_PTR(self) = result;
-      SWIG_RubyAddTracking(result, self);
-    }
-    catch (const std::exception& e) {
-      SWIG_exception(SWIG_RuntimeError, e.what());
-    }
+    arg2 = std::clamp<int>(NUM2ULONG(argv[0]), 0, 255);
   }
-  return self;
+  if (arg1) (arg1)->red = arg2;
+  return Qnil;
 fail:
   return Qnil;
 }
 
 
 SWIGINTERN VALUE
-_wrap_new_Color__SWIG_2(int argc, VALUE *argv, VALUE self) {
-  Gosu::Color::Channel arg1 ;
-  Gosu::Color::Channel arg2 ;
-  Gosu::Color::Channel arg3 ;
-  const char *classname SWIGUNUSED = "Gosu::Color";
-  Gosu::Color *result = 0 ;
+_wrap_Color_red_get(int argc, VALUE *argv, VALUE self) {
+  Gosu::Color *arg1 = (Gosu::Color *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  Gosu::Color::Channel result;
+  VALUE vresult = Qnil;
   
-  if ((argc < 3) || (argc > 3)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc); SWIG_fail;
-  }
-  {
-    arg1 = Gosu::clamp<int>(NUM2ULONG(argv[0]), 0, 255);
-  }
-  {
-    arg2 = Gosu::clamp<int>(NUM2ULONG(argv[1]), 0, 255);
-  }
-  {
-    arg3 = Gosu::clamp<int>(NUM2ULONG(argv[2]), 0, 255);
+  if ((argc < 0) || (argc > 0)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
   }
-  {
-    try {
-      result = (Gosu::Color *)new Gosu::Color(arg1,arg2,arg3);
-      DATA_PTR(self) = result;
-      SWIG_RubyAddTracking(result, self);
-    }
-    catch (const std::exception& e) {
-      SWIG_exception(SWIG_RuntimeError, e.what());
-    }
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_Gosu__Color, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "Gosu::Color *","red", 1, self )); 
   }
-  return self;
+  arg1 = reinterpret_cast< Gosu::Color * >(argp1);
+  result =  ((arg1)->red);
+  vresult = SWIG_From_unsigned_SS_char(static_cast< unsigned char >(result));
+  return vresult;
 fail:
   return Qnil;
 }
 
 
 SWIGINTERN VALUE
-#ifdef HAVE_RB_DEFINE_ALLOC_FUNC
-_wrap_Color_allocate(VALUE self)
-#else
-_wrap_Color_allocate(int argc, VALUE *argv, VALUE self)
-#endif
-{
-  VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_Gosu__Color);
-#ifndef HAVE_RB_DEFINE_ALLOC_FUNC
-  rb_obj_call_init(vresult, argc, argv);
-#endif
-  return vresult;
-}
-
-
-SWIGINTERN VALUE
-_wrap_new_Color__SWIG_3(int argc, VALUE *argv, VALUE self) {
-  Gosu::Color::Channel arg1 ;
+_wrap_Color_green_set(int argc, VALUE *argv, VALUE self) {
+  Gosu::Color *arg1 = (Gosu::Color *) 0 ;
   Gosu::Color::Channel arg2 ;
-  Gosu::Color::Channel arg3 ;
-  Gosu::Color::Channel arg4 ;
-  const char *classname SWIGUNUSED = "Gosu::Color";
-  Gosu::Color *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
   
-  if ((argc < 4) || (argc > 4)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 4)",argc); SWIG_fail;
-  }
-  {
-    arg1 = Gosu::clamp<int>(NUM2ULONG(argv[0]), 0, 255);
-  }
-  {
-    arg2 = Gosu::clamp<int>(NUM2ULONG(argv[1]), 0, 255);
-  }
-  {
-    arg3 = Gosu::clamp<int>(NUM2ULONG(argv[2]), 0, 255);
+  if ((argc < 1) || (argc > 1)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
   }
-  {
-    arg4 = Gosu::clamp<int>(NUM2ULONG(argv[3]), 0, 255);
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_Gosu__Color, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "Gosu::Color *","green", 1, self )); 
   }
+  arg1 = reinterpret_cast< Gosu::Color * >(argp1);
   {
-    try {
-      result = (Gosu::Color *)new Gosu::Color(arg1,arg2,arg3,arg4);
-      DATA_PTR(self) = result;
-      SWIG_RubyAddTracking(result, self);
-    }
-    catch (const std::exception& e) {
-      SWIG_exception(SWIG_RuntimeError, e.what());
-    }
+    arg2 = std::clamp<int>(NUM2ULONG(argv[0]), 0, 255);
   }
-  return self;
-fail:
+  if (arg1) (arg1)->green = arg2;
   return Qnil;
-}
-
-
-SWIGINTERN VALUE _wrap_new_Color(int nargs, VALUE *args, VALUE self) {
-  int argc;
-  VALUE argv[4];
-  int ii;
-  
-  argc = nargs;
-  if (argc > 4) SWIG_fail;
-  for (ii = 0; (ii < argc); ++ii) {
-    argv[ii] = args[ii];
-  }
-  if (argc == 0) {
-    return _wrap_new_Color__SWIG_0(nargs, args, self);
-  }
-  if (argc == 1) {
-    int _v;
-    {
-      int res = SWIG_AsVal_unsigned_SS_int(argv[0], NULL);
-      _v = SWIG_CheckState(res);
-    }
-    if (_v) {
-      return _wrap_new_Color__SWIG_1(nargs, args, self);
-    }
-  }
-  if (argc == 3) {
-    int _v;
-    {
-      _v = !!rb_respond_to(argv[0], rb_intern("to_i"));
-    }
-    if (_v) {
-      {
-        _v = !!rb_respond_to(argv[1], rb_intern("to_i"));
-      }
-      if (_v) {
-        {
-          _v = !!rb_respond_to(argv[2], rb_intern("to_i"));
-        }
-        if (_v) {
-          return _wrap_new_Color__SWIG_2(nargs, args, self);
-        }
-      }
-    }
-  }
-  if (argc == 4) {
-    int _v;
-    {
-      _v = !!rb_respond_to(argv[0], rb_intern("to_i"));
-    }
-    if (_v) {
-      {
-        _v = !!rb_respond_to(argv[1], rb_intern("to_i"));
-      }
-      if (_v) {
-        {
-          _v = !!rb_respond_to(argv[2], rb_intern("to_i"));
-        }
-        if (_v) {
-          {
-            _v = !!rb_respond_to(argv[3], rb_intern("to_i"));
-          }
-          if (_v) {
-            return _wrap_new_Color__SWIG_3(nargs, args, self);
-          }
-        }
-      }
-    }
-  }
-  
 fail:
-  Ruby_Format_OverloadedError( argc, 4, "Color.new", 
-    "    Color.new()\n"
-    "    Color.new(unsigned int argb)\n"
-    "    Color.new(Gosu::Color::Channel red, Gosu::Color::Channel green, Gosu::Color::Channel blue)\n"
-    "    Color.new(Gosu::Color::Channel alpha, Gosu::Color::Channel red, Gosu::Color::Channel green, Gosu::Color::Channel blue)\n");
-  
   return Qnil;
 }
 
 
 SWIGINTERN VALUE
-_wrap_Color_from_hsv(int argc, VALUE *argv, VALUE self) {
-  double arg1 ;
-  double arg2 ;
-  double arg3 ;
-  double val1 ;
-  int ecode1 = 0 ;
-  double val2 ;
-  int ecode2 = 0 ;
-  double val3 ;
-  int ecode3 = 0 ;
-  Gosu::Color result;
+_wrap_Color_green_get(int argc, VALUE *argv, VALUE self) {
+  Gosu::Color *arg1 = (Gosu::Color *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  Gosu::Color::Channel result;
   VALUE vresult = Qnil;
   
-  if ((argc < 3) || (argc > 3)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc); SWIG_fail;
+  if ((argc < 0) || (argc > 0)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
   }
-  ecode1 = SWIG_AsVal_double(argv[0], &val1);
-  if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), Ruby_Format_TypeError( "", "double","Gosu::Color::from_hsv", 1, argv[0] ));
-  } 
-  arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(argv[1], &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "double","Gosu::Color::from_hsv", 2, argv[1] ));
-  } 
-  arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(argv[2], &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), Ruby_Format_TypeError( "", "double","Gosu::Color::from_hsv", 3, argv[2] ));
-  } 
-  arg3 = static_cast< double >(val3);
-  {
-    try {
-      result = Gosu::Color::from_hsv(arg1,arg2,arg3);
-    }
-    catch (const std::exception& e) {
-      SWIG_exception(SWIG_RuntimeError, e.what());
-    }
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_Gosu__Color, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "Gosu::Color *","green", 1, self )); 
   }
-  vresult = SWIG_NewPointerObj((new Gosu::Color(static_cast< const Gosu::Color& >(result))), SWIGTYPE_p_Gosu__Color, SWIG_POINTER_OWN |  0 );
+  arg1 = reinterpret_cast< Gosu::Color * >(argp1);
+  result =  ((arg1)->green);
+  vresult = SWIG_From_unsigned_SS_char(static_cast< unsigned char >(result));
   return vresult;
 fail:
   return Qnil;
@@ -4183,58 +4021,32 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_Color_from_ahsv(int argc, VALUE *argv, VALUE self) {
-  Gosu::Color::Channel arg1 ;
-  double arg2 ;
-  double arg3 ;
-  double arg4 ;
-  double val2 ;
-  int ecode2 = 0 ;
-  double val3 ;
-  int ecode3 = 0 ;
-  double val4 ;
-  int ecode4 = 0 ;
-  Gosu::Color result;
-  VALUE vresult = Qnil;
+_wrap_Color_blue_set(int argc, VALUE *argv, VALUE self) {
+  Gosu::Color *arg1 = (Gosu::Color *) 0 ;
+  Gosu::Color::Channel arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
   
-  if ((argc < 4) || (argc > 4)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 4)",argc); SWIG_fail;
+  if ((argc < 1) || (argc > 1)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
   }
-  {
-    arg1 = Gosu::clamp<int>(NUM2ULONG(argv[0]), 0, 255);
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_Gosu__Color, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "Gosu::Color *","blue", 1, self )); 
   }
-  ecode2 = SWIG_AsVal_double(argv[1], &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "double","Gosu::Color::from_ahsv", 2, argv[1] ));
-  } 
-  arg2 = static_cast< double >(val2);
-  ecode3 = SWIG_AsVal_double(argv[2], &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), Ruby_Format_TypeError( "", "double","Gosu::Color::from_ahsv", 3, argv[2] ));
-  } 
-  arg3 = static_cast< double >(val3);
-  ecode4 = SWIG_AsVal_double(argv[3], &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), Ruby_Format_TypeError( "", "double","Gosu::Color::from_ahsv", 4, argv[3] ));
-  } 
-  arg4 = static_cast< double >(val4);
+  arg1 = reinterpret_cast< Gosu::Color * >(argp1);
   {
-    try {
-      result = Gosu::Color::from_ahsv(arg1,arg2,arg3,arg4);
-    }
-    catch (const std::exception& e) {
-      SWIG_exception(SWIG_RuntimeError, e.what());
-    }
+    arg2 = std::clamp<int>(NUM2ULONG(argv[0]), 0, 255);
   }
-  vresult = SWIG_NewPointerObj((new Gosu::Color(static_cast< const Gosu::Color& >(result))), SWIGTYPE_p_Gosu__Color, SWIG_POINTER_OWN |  0 );
-  return vresult;
+  if (arg1) (arg1)->blue = arg2;
+  return Qnil;
 fail:
   return Qnil;
 }
 
 
 SWIGINTERN VALUE
-_wrap_Color_red(int argc, VALUE *argv, VALUE self) {
+_wrap_Color_blue_get(int argc, VALUE *argv, VALUE self) {
   Gosu::Color *arg1 = (Gosu::Color *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -4246,17 +4058,10 @@ _wrap_Color_red(int argc, VALUE *argv, VALUE self) {
   }
   res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_Gosu__Color, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "Gosu::Color const *","red", 1, self )); 
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "Gosu::Color *","blue", 1, self )); 
   }
   arg1 = reinterpret_cast< Gosu::Color * >(argp1);
-  {
-    try {
-      result = ((Gosu::Color const *)arg1)->red();
-    }
-    catch (const std::exception& e) {
-      SWIG_exception(SWIG_RuntimeError, e.what());
-    }
-  }
+  result =  ((arg1)->blue);
   vresult = SWIG_From_unsigned_SS_char(static_cast< unsigned char >(result));
   return vresult;
 fail:
@@ -4265,38 +4070,32 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_Color_green(int argc, VALUE *argv, VALUE self) {
+_wrap_Color_alpha_set(int argc, VALUE *argv, VALUE self) {
   Gosu::Color *arg1 = (Gosu::Color *) 0 ;
+  Gosu::Color::Channel arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  Gosu::Color::Channel result;
-  VALUE vresult = Qnil;
   
-  if ((argc < 0) || (argc > 0)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
+  if ((argc < 1) || (argc > 1)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_Gosu__Color, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "Gosu::Color const *","green", 1, self )); 
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "Gosu::Color *","alpha", 1, self )); 
   }
   arg1 = reinterpret_cast< Gosu::Color * >(argp1);
   {
-    try {
-      result = ((Gosu::Color const *)arg1)->green();
-    }
-    catch (const std::exception& e) {
-      SWIG_exception(SWIG_RuntimeError, e.what());
-    }
+    arg2 = std::clamp<int>(NUM2ULONG(argv[0]), 0, 255);
   }
-  vresult = SWIG_From_unsigned_SS_char(static_cast< unsigned char >(result));
-  return vresult;
+  if (arg1) (arg1)->alpha = arg2;
+  return Qnil;
 fail:
   return Qnil;
 }
 
 
 SWIGINTERN VALUE
-_wrap_Color_blue(int argc, VALUE *argv, VALUE self) {
+_wrap_Color_alpha_get(int argc, VALUE *argv, VALUE self) {
   Gosu::Color *arg1 = (Gosu::Color *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -4308,17 +4107,10 @@ _wrap_Color_blue(int argc, VALUE *argv, VALUE self) {
   }
   res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_Gosu__Color, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "Gosu::Color const *","blue", 1, self )); 
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "Gosu::Color *","alpha", 1, self )); 
   }
   arg1 = reinterpret_cast< Gosu::Color * >(argp1);
-  {
-    try {
-      result = ((Gosu::Color const *)arg1)->blue();
-    }
-    catch (const std::exception& e) {
-      SWIG_exception(SWIG_RuntimeError, e.what());
-    }
-  }
+  result =  ((arg1)->alpha);
   vresult = SWIG_From_unsigned_SS_char(static_cast< unsigned char >(result));
   return vresult;
 fail:
@@ -4327,159 +4119,242 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_Color_alpha(int argc, VALUE *argv, VALUE self) {
-  Gosu::Color *arg1 = (Gosu::Color *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  Gosu::Color::Channel result;
-  VALUE vresult = Qnil;
+_wrap_new_Color__SWIG_0(int argc, VALUE *argv, VALUE self) {
+  const char *classname SWIGUNUSED = "Gosu::Color";
+  Gosu::Color *result = 0 ;
   
   if ((argc < 0) || (argc > 0)) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_Gosu__Color, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "Gosu::Color const *","alpha", 1, self )); 
-  }
-  arg1 = reinterpret_cast< Gosu::Color * >(argp1);
   {
     try {
-      result = ((Gosu::Color const *)arg1)->alpha();
+      result = (Gosu::Color *)new Gosu::Color();
+      DATA_PTR(self) = result;
+      SWIG_RubyAddTracking(result, self);
     }
     catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
-  vresult = SWIG_From_unsigned_SS_char(static_cast< unsigned char >(result));
-  return vresult;
+  return self;
 fail:
   return Qnil;
 }
 
 
 SWIGINTERN VALUE
-_wrap_Color_rede___(int argc, VALUE *argv, VALUE self) {
-  Gosu::Color *arg1 = (Gosu::Color *) 0 ;
-  Gosu::Color::Channel arg2 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
+_wrap_new_Color__SWIG_1(int argc, VALUE *argv, VALUE self) {
+  std::uint32_t arg1 ;
+  unsigned long val1 ;
+  int ecode1 = 0 ;
+  const char *classname SWIGUNUSED = "Gosu::Color";
+  Gosu::Color *result = 0 ;
   
   if ((argc < 1) || (argc > 1)) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_Gosu__Color, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "Gosu::Color *","set_red", 1, self )); 
-  }
-  arg1 = reinterpret_cast< Gosu::Color * >(argp1);
-  {
-    arg2 = Gosu::clamp<int>(NUM2ULONG(argv[0]), 0, 255);
-  }
+  ecode1 = SWIG_AsVal_unsigned_SS_long(argv[0], &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), Ruby_Format_TypeError( "", "std::uint32_t","Color", 1, argv[0] ));
+  } 
+  arg1 = static_cast< std::uint32_t >(val1);
   {
     try {
-      (arg1)->set_red(arg2);
+      result = (Gosu::Color *)new Gosu::Color(arg1);
+      DATA_PTR(self) = result;
+      SWIG_RubyAddTracking(result, self);
     }
     catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
-  return Qnil;
+  return self;
 fail:
   return Qnil;
 }
 
 
 SWIGINTERN VALUE
-_wrap_Color_greene___(int argc, VALUE *argv, VALUE self) {
-  Gosu::Color *arg1 = (Gosu::Color *) 0 ;
+#ifdef HAVE_RB_DEFINE_ALLOC_FUNC
+_wrap_Color_allocate(VALUE self)
+#else
+_wrap_Color_allocate(int argc, VALUE *argv, VALUE self)
+#endif
+{
+  VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_Gosu__Color);
+#ifndef HAVE_RB_DEFINE_ALLOC_FUNC
+  rb_obj_call_init(vresult, argc, argv);
+#endif
+  return vresult;
+}
+
+
+SWIGINTERN VALUE
+_wrap_new_Color__SWIG_2(int argc, VALUE *argv, VALUE self) {
+  Gosu::Color::Channel arg1 ;
   Gosu::Color::Channel arg2 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
+  Gosu::Color::Channel arg3 ;
+  const char *classname SWIGUNUSED = "Gosu::Color";
+  Gosu::Color *result = 0 ;
   
-  if ((argc < 1) || (argc > 1)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
+  if ((argc < 3) || (argc > 3)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc); SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_Gosu__Color, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "Gosu::Color *","set_green", 1, self )); 
+  {
+    arg1 = std::clamp<int>(NUM2ULONG(argv[0]), 0, 255);
+  }
+  {
+    arg2 = std::clamp<int>(NUM2ULONG(argv[1]), 0, 255);
   }
-  arg1 = reinterpret_cast< Gosu::Color * >(argp1);
   {
-    arg2 = Gosu::clamp<int>(NUM2ULONG(argv[0]), 0, 255);
+    arg3 = std::clamp<int>(NUM2ULONG(argv[2]), 0, 255);
   }
   {
     try {
-      (arg1)->set_green(arg2);
+      result = (Gosu::Color *)new Gosu::Color(arg1,arg2,arg3);
+      DATA_PTR(self) = result;
+      SWIG_RubyAddTracking(result, self);
     }
     catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
+  return self;
+fail:
   return Qnil;
+}
+
+
+SWIGINTERN VALUE _wrap_new_Color(int nargs, VALUE *args, VALUE self) {
+  int argc;
+  VALUE argv[3];
+  int ii;
+  
+  argc = nargs;
+  if (argc > 3) SWIG_fail;
+  for (ii = 0; (ii < argc); ++ii) {
+    argv[ii] = args[ii];
+  }
+  if (argc == 0) {
+    return _wrap_new_Color__SWIG_0(nargs, args, self);
+  }
+  if (argc == 1) {
+    int _v;
+    {
+      int res = SWIG_AsVal_unsigned_SS_long(argv[0], NULL);
+      _v = SWIG_CheckState(res);
+    }
+    if (_v) {
+      return _wrap_new_Color__SWIG_1(nargs, args, self);
+    }
+  }
+  if (argc == 3) {
+    int _v;
+    {
+      _v = !!rb_respond_to(argv[0], rb_intern("to_i"));
+    }
+    if (_v) {
+      {
+        _v = !!rb_respond_to(argv[1], rb_intern("to_i"));
+      }
+      if (_v) {
+        {
+          _v = !!rb_respond_to(argv[2], rb_intern("to_i"));
+        }
+        if (_v) {
+          return _wrap_new_Color__SWIG_2(nargs, args, self);
+        }
+      }
+    }
+  }
+  
 fail:
+  Ruby_Format_OverloadedError( argc, 3, "Color.new", 
+    "    Color.new()\n"
+    "    Color.new(std::uint32_t argb)\n"
+    "    Color.new(Gosu::Color::Channel red, Gosu::Color::Channel green, Gosu::Color::Channel blue)\n");
+  
   return Qnil;
 }
 
 
 SWIGINTERN VALUE
-_wrap_Color_bluee___(int argc, VALUE *argv, VALUE self) {
+_wrap_Color_with_alpha(int argc, VALUE *argv, VALUE self) {
   Gosu::Color *arg1 = (Gosu::Color *) 0 ;
   Gosu::Color::Channel arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  Gosu::Color result;
+  VALUE vresult = Qnil;
   
   if ((argc < 1) || (argc > 1)) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_Gosu__Color, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "Gosu::Color *","set_blue", 1, self )); 
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "Gosu::Color *","with_alpha", 1, self )); 
   }
   arg1 = reinterpret_cast< Gosu::Color * >(argp1);
   {
-    arg2 = Gosu::clamp<int>(NUM2ULONG(argv[0]), 0, 255);
+    arg2 = std::clamp<int>(NUM2ULONG(argv[0]), 0, 255);
   }
   {
     try {
-      (arg1)->set_blue(arg2);
+      result = (arg1)->with_alpha(arg2);
     }
     catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
-  return Qnil;
+  vresult = SWIG_NewPointerObj((new Gosu::Color(static_cast< const Gosu::Color& >(result))), SWIGTYPE_p_Gosu__Color, SWIG_POINTER_OWN |  0 );
+  return vresult;
 fail:
   return Qnil;
 }
 
 
 SWIGINTERN VALUE
-_wrap_Color_alphae___(int argc, VALUE *argv, VALUE self) {
-  Gosu::Color *arg1 = (Gosu::Color *) 0 ;
-  Gosu::Color::Channel arg2 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
+_wrap_Color_from_hsv(int argc, VALUE *argv, VALUE self) {
+  double arg1 ;
+  double arg2 ;
+  double arg3 ;
+  double val1 ;
+  int ecode1 = 0 ;
+  double val2 ;
+  int ecode2 = 0 ;
+  double val3 ;
+  int ecode3 = 0 ;
+  Gosu::Color result;
+  VALUE vresult = Qnil;
   
-  if ((argc < 1) || (argc > 1)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_Gosu__Color, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "Gosu::Color *","set_alpha", 1, self )); 
-  }
-  arg1 = reinterpret_cast< Gosu::Color * >(argp1);
-  {
-    arg2 = Gosu::clamp<int>(NUM2ULONG(argv[0]), 0, 255);
+  if ((argc < 3) || (argc > 3)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc); SWIG_fail;
   }
+  ecode1 = SWIG_AsVal_double(argv[0], &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), Ruby_Format_TypeError( "", "double","Gosu::Color::from_hsv", 1, argv[0] ));
+  } 
+  arg1 = static_cast< double >(val1);
+  ecode2 = SWIG_AsVal_double(argv[1], &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "double","Gosu::Color::from_hsv", 2, argv[1] ));
+  } 
+  arg2 = static_cast< double >(val2);
+  ecode3 = SWIG_AsVal_double(argv[2], &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), Ruby_Format_TypeError( "", "double","Gosu::Color::from_hsv", 3, argv[2] ));
+  } 
+  arg3 = static_cast< double >(val3);
   {
     try {
-      (arg1)->set_alpha(arg2);
+      result = Gosu::Color::from_hsv(arg1,arg2,arg3);
     }
     catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
-  return Qnil;
+  vresult = SWIG_NewPointerObj((new Gosu::Color(static_cast< const Gosu::Color& >(result))), SWIGTYPE_p_Gosu__Color, SWIG_POINTER_OWN |  0 );
+  return vresult;
 fail:
   return Qnil;
 }
@@ -4822,13 +4697,13 @@ _wrap_Color_rgb(int argc, VALUE *argv, VALUE self) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc); SWIG_fail;
   }
   {
-    arg1 = Gosu::clamp<int>(NUM2ULONG(argv[0]), 0, 255);
+    arg1 = std::clamp<int>(NUM2ULONG(argv[0]), 0, 255);
   }
   {
-    arg2 = Gosu::clamp<int>(NUM2ULONG(argv[1]), 0, 255);
+    arg2 = std::clamp<int>(NUM2ULONG(argv[1]), 0, 255);
   }
   {
-    arg3 = Gosu::clamp<int>(NUM2ULONG(argv[2]), 0, 255);
+    arg3 = std::clamp<int>(NUM2ULONG(argv[2]), 0, 255);
   }
   {
     try {
@@ -4858,16 +4733,16 @@ _wrap_Color_rgba__SWIG_0(int argc, VALUE *argv, VALUE self) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 4)",argc); SWIG_fail;
   }
   {
-    arg1 = Gosu::clamp<int>(NUM2ULONG(argv[0]), 0, 255);
+    arg1 = std::clamp<int>(NUM2ULONG(argv[0]), 0, 255);
   }
   {
-    arg2 = Gosu::clamp<int>(NUM2ULONG(argv[1]), 0, 255);
+    arg2 = std::clamp<int>(NUM2ULONG(argv[1]), 0, 255);
   }
   {
-    arg3 = Gosu::clamp<int>(NUM2ULONG(argv[2]), 0, 255);
+    arg3 = std::clamp<int>(NUM2ULONG(argv[2]), 0, 255);
   }
   {
-    arg4 = Gosu::clamp<int>(NUM2ULONG(argv[3]), 0, 255);
+    arg4 = std::clamp<int>(NUM2ULONG(argv[3]), 0, 255);
   }
   {
     try {
@@ -4982,16 +4857,16 @@ _wrap_Color_argb__SWIG_1(int argc, VALUE *argv, VALUE self) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 4)",argc); SWIG_fail;
   }
   {
-    arg1 = Gosu::clamp<int>(NUM2ULONG(argv[0]), 0, 255);
+    arg1 = std::clamp<int>(NUM2ULONG(argv[0]), 0, 255);
   }
   {
-    arg2 = Gosu::clamp<int>(NUM2ULONG(argv[1]), 0, 255);
+    arg2 = std::clamp<int>(NUM2ULONG(argv[1]), 0, 255);
   }
   {
-    arg3 = Gosu::clamp<int>(NUM2ULONG(argv[2]), 0, 255);
+    arg3 = std::clamp<int>(NUM2ULONG(argv[2]), 0, 255);
   }
   {
-    arg4 = Gosu::clamp<int>(NUM2ULONG(argv[3]), 0, 255);
+    arg4 = std::clamp<int>(NUM2ULONG(argv[3]), 0, 255);
   }
   {
     try {
@@ -5103,6 +4978,57 @@ fail:
 }
 
 
+SWIGINTERN VALUE
+_wrap_Color_from_ahsv(int argc, VALUE *argv, VALUE self) {
+  Gosu::Color::Channel arg1 ;
+  double arg2 ;
+  double arg3 ;
+  double arg4 ;
+  double val2 ;
+  int ecode2 = 0 ;
+  double val3 ;
+  int ecode3 = 0 ;
+  double val4 ;
+  int ecode4 = 0 ;
+  Gosu::Color result;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 4) || (argc > 4)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 4)",argc); SWIG_fail;
+  }
+  {
+    arg1 = std::clamp<int>(NUM2ULONG(argv[0]), 0, 255);
+  }
+  ecode2 = SWIG_AsVal_double(argv[1], &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "double","Gosu_Color_from_ahsv", 2, argv[1] ));
+  } 
+  arg2 = static_cast< double >(val2);
+  ecode3 = SWIG_AsVal_double(argv[2], &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), Ruby_Format_TypeError( "", "double","Gosu_Color_from_ahsv", 3, argv[2] ));
+  } 
+  arg3 = static_cast< double >(val3);
+  ecode4 = SWIG_AsVal_double(argv[3], &val4);
+  if (!SWIG_IsOK(ecode4)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode4), Ruby_Format_TypeError( "", "double","Gosu_Color_from_ahsv", 4, argv[3] ));
+  } 
+  arg4 = static_cast< double >(val4);
+  {
+    try {
+      result = Gosu_Color_from_ahsv(arg1,arg2,arg3,arg4);
+    }
+    catch (const std::exception& e) {
+      SWIG_exception(SWIG_RuntimeError, e.what());
+    }
+  }
+  vresult = SWIG_NewPointerObj((new Gosu::Color(static_cast< const Gosu::Color& >(result))), SWIGTYPE_p_Gosu__Color, SWIG_POINTER_OWN |  0 );
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
 /*
   Document-method: Gosu::Color.to_i
 
@@ -5373,7 +5299,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 +5387,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 +5427,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 +5515,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 +5557,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 +5659,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 +5701,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 +5803,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 +6551,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 +6629,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 +6669,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 +6793,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 +6833,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 +6938,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 +7027,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 +7179,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)");
       }
     }
@@ -9934,6 +9860,47 @@ fail:
 }
 
 
+SWIGINTERN VALUE
+_wrap_Window_gain_focus(int argc, VALUE *argv, VALUE self) {
+  Gosu::Window *arg1 = (Gosu::Window *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  Swig::Director *director = 0;
+  bool upcall = false;
+  
+  if ((argc < 0) || (argc > 0)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_Gosu__Window, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "Gosu::Window *","gain_focus", 1, self )); 
+  }
+  arg1 = reinterpret_cast< Gosu::Window * >(argp1);
+  director = dynamic_cast<Swig::Director *>(arg1);
+  upcall = (director && (director->swig_get_self() == self));
+  try {
+    {
+      try {
+        if (upcall) {
+          (arg1)->Gosu::Window::gain_focus();
+        } else {
+          (arg1)->gain_focus();
+        }
+      }
+      catch (const std::exception& e) {
+        SWIG_exception(SWIG_RuntimeError, e.what());
+      }
+    }
+  } catch (Swig::DirectorException& e) {
+    rb_exc_raise(e.getError());
+    SWIG_fail;
+  }
+  return Qnil;
+fail:
+  return Qnil;
+}
+
+
 SWIGINTERN VALUE
 _wrap_Window_lose_focus(int argc, VALUE *argv, VALUE self) {
   Gosu::Window *arg1 = (Gosu::Window *) 0 ;
@@ -10987,7 +10954,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 +11037,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 +11077,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 +11192,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 +11235,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 +11382,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 +11418,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 +11483,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 +12485,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 >(3)));
   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 +12499,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);
@@ -12540,16 +12507,16 @@ SWIGEXPORT void Init_gosu(void) {
   rb_define_alloc_func(SwigClassColor.klass, _wrap_Color_allocate);
   rb_define_method(SwigClassColor.klass, "initialize", VALUEFUNC(_wrap_new_Color), -1);
   rb_define_const(SwigClassColor.klass, "GL_FORMAT", SWIG_From_unsigned_SS_int(static_cast< unsigned int >(Gosu::Color::GL_FORMAT)));
+  rb_define_method(SwigClassColor.klass, "red=", VALUEFUNC(_wrap_Color_red_set), -1);
+  rb_define_method(SwigClassColor.klass, "red", VALUEFUNC(_wrap_Color_red_get), -1);
+  rb_define_method(SwigClassColor.klass, "green=", VALUEFUNC(_wrap_Color_green_set), -1);
+  rb_define_method(SwigClassColor.klass, "green", VALUEFUNC(_wrap_Color_green_get), -1);
+  rb_define_method(SwigClassColor.klass, "blue=", VALUEFUNC(_wrap_Color_blue_set), -1);
+  rb_define_method(SwigClassColor.klass, "blue", VALUEFUNC(_wrap_Color_blue_get), -1);
+  rb_define_method(SwigClassColor.klass, "alpha=", VALUEFUNC(_wrap_Color_alpha_set), -1);
+  rb_define_method(SwigClassColor.klass, "alpha", VALUEFUNC(_wrap_Color_alpha_get), -1);
+  rb_define_method(SwigClassColor.klass, "with_alpha", VALUEFUNC(_wrap_Color_with_alpha), -1);
   rb_define_singleton_method(SwigClassColor.klass, "from_hsv", VALUEFUNC(_wrap_Color_from_hsv), -1);
-  rb_define_singleton_method(SwigClassColor.klass, "from_ahsv", VALUEFUNC(_wrap_Color_from_ahsv), -1);
-  rb_define_method(SwigClassColor.klass, "red", VALUEFUNC(_wrap_Color_red), -1);
-  rb_define_method(SwigClassColor.klass, "green", VALUEFUNC(_wrap_Color_green), -1);
-  rb_define_method(SwigClassColor.klass, "blue", VALUEFUNC(_wrap_Color_blue), -1);
-  rb_define_method(SwigClassColor.klass, "alpha", VALUEFUNC(_wrap_Color_alpha), -1);
-  rb_define_method(SwigClassColor.klass, "red=", VALUEFUNC(_wrap_Color_rede___), -1);
-  rb_define_method(SwigClassColor.klass, "green=", VALUEFUNC(_wrap_Color_greene___), -1);
-  rb_define_method(SwigClassColor.klass, "blue=", VALUEFUNC(_wrap_Color_bluee___), -1);
-  rb_define_method(SwigClassColor.klass, "alpha=", VALUEFUNC(_wrap_Color_alphae___), -1);
   rb_define_method(SwigClassColor.klass, "hue", VALUEFUNC(_wrap_Color_hue), -1);
   rb_define_method(SwigClassColor.klass, "hue=", VALUEFUNC(_wrap_Color_huee___), -1);
   rb_define_method(SwigClassColor.klass, "saturation", VALUEFUNC(_wrap_Color_saturation), -1);
@@ -12562,6 +12529,7 @@ SWIGEXPORT void Init_gosu(void) {
   rb_define_singleton_method(SwigClassColor.klass, "rgb", VALUEFUNC(_wrap_Color_rgb), -1);
   rb_define_singleton_method(SwigClassColor.klass, "rgba", VALUEFUNC(_wrap_Color_rgba), -1);
   rb_define_singleton_method(SwigClassColor.klass, "argb", VALUEFUNC(_wrap_Color_argb), -1);
+  rb_define_singleton_method(SwigClassColor.klass, "from_ahsv", VALUEFUNC(_wrap_Color_from_ahsv), -1);
   rb_define_method(SwigClassColor.klass, "to_i", VALUEFUNC(_wrap_Color_to_i), -1);
   rb_define_method(SwigClassColor.klass, "dup", VALUEFUNC(_wrap_Color_dup), -1);
   rb_define_method(SwigClassColor.klass, "inspect", VALUEFUNC(_wrap_Color_inspect), -1);
@@ -12988,6 +12956,7 @@ SWIGEXPORT void Init_gosu(void) {
   rb_define_method(SwigClassWindow.klass, "draw", VALUEFUNC(_wrap_Window_draw), -1);
   rb_define_method(SwigClassWindow.klass, "needs_redraw?", VALUEFUNC(_wrap_Window_needs_redrawq___), -1);
   rb_define_method(SwigClassWindow.klass, "needs_cursor?", VALUEFUNC(_wrap_Window_needs_cursorq___), -1);
+  rb_define_method(SwigClassWindow.klass, "gain_focus", VALUEFUNC(_wrap_Window_gain_focus), -1);
   rb_define_method(SwigClassWindow.klass, "lose_focus", VALUEFUNC(_wrap_Window_lose_focus), -1);
   rb_define_method(SwigClassWindow.klass, "release_memory", VALUEFUNC(_wrap_Window_release_memory), -1);
   rb_define_method(SwigClassWindow.klass, "button_down", VALUEFUNC(_wrap_Window_button_down), -1);