cairo 1.4.1 → 1.5.0

data/src/rb_cairo_context.c

@@ -3,7 +3,7 @@
  * Ruby Cairo Binding
  *
  * $Author: kou $
- * $Date: 2007/03/06 12:35:40 $
+ * $Date: 2007/05/20 08:46:07 $
  *
  * Copyright 2005 Øyvind Kolås <pippin@freedesktop.org>
  * Copyright 2004-2005 MenTaLguY <mental@rydia.com>
@@ -17,7 +17,8 @@
 
 VALUE rb_cCairo_Context;
 
-static ID cr_id_surface, cr_id_source, cr_id_source_class;
+static ID cr_id_surface, cr_id_source;
+static ID cr_id_plus, cr_id_minus, cr_id_multi, cr_id_div;
 
 #define _SELF  (RVAL2CRCONTEXT(self))
 
@@ -25,6 +26,8 @@ static ID cr_id_surface, cr_id_source, cr_id_source_class;
 static VALUE rb_cCairo_Rectangle;
 static ID at_x, at_y, at_width, at_height;
 
+static VALUE cr_get_current_point (VALUE self);
+
 static VALUE
 cr_rectangle_initialize (VALUE self, VALUE x, VALUE y,
                          VALUE width, VALUE height)
@@ -49,7 +52,7 @@ cairo_t *
 rb_cairo_context_from_ruby_object (VALUE obj)
 {
   cairo_t *context;
-  if (!RTEST (rb_obj_is_kind_of (obj, rb_cCairo_Context)))
+  if (!rb_cairo__is_kind_of (obj, rb_cCairo_Context))
     {
       rb_raise (rb_eTypeError, "not a cairo graphics context");
     }
@@ -122,9 +125,11 @@ cr_save (VALUE self)
 static VALUE
 cr_pop_group (VALUE self)
 {
-  cairo_pop_group (_SELF);
+  cairo_pattern_t *pattern;
+
+  pattern = cairo_pop_group (_SELF);
   cr_check_status (_SELF);
-  return Qnil;
+  return CRPATTERN2RVAL (pattern);
 }
 
 static VALUE
@@ -140,7 +145,7 @@ cr_pop_group_generic (int argc, VALUE *argv, VALUE self)
 {
   VALUE to_source;
   rb_scan_args (argc, argv, "01", &to_source);
-  if (RTEST(to_source))
+  if (RVAL2CBOOL (to_source))
     return cr_pop_group_to_source (self);
   else
     return cr_pop_group (self);
@@ -161,13 +166,22 @@ cr_push_group (int argc, VALUE *argv, VALUE self)
 
   if (rb_block_given_p ())
     {
+      int state = 0;
+
       if (NIL_P (pop_to_source))
         pop_to_source = Qtrue;
 
-      if (RTEST (pop_to_source))
-        result = rb_ensure (rb_yield, self, cr_pop_group_to_source, self);
-      else
-        result = rb_ensure (rb_yield, self, cr_pop_group, self);
+      result = rb_protect (rb_yield, self, &state);
+      if (cairo_status(_SELF) == CAIRO_STATUS_SUCCESS)
+        {
+          if (RVAL2CBOOL (pop_to_source))
+            cr_pop_group_to_source (self);
+          else
+            result = cr_pop_group (self);
+        }
+
+      if (state)
+        rb_jump_tag (state);
     }
 
   return result;
@@ -191,7 +205,7 @@ cr_set_source_rgb (int argc, VALUE *argv, VALUE self)
 
   n = rb_scan_args (argc, argv, "12", &red, &green, &blue);
 
-  if (n == 1 && RTEST (rb_obj_is_kind_of (red, rb_cArray)))
+  if (n == 1 && rb_cairo__is_kind_of (red, rb_cArray))
     {
       VALUE ary = red;
       n = RARRAY (ary)->len;
@@ -217,7 +231,6 @@ cr_set_source_rgb (int argc, VALUE *argv, VALUE self)
     }
   cr_check_status (_SELF);
   rb_ivar_set (self, cr_id_source, Qnil);
-  rb_ivar_set (self, cr_id_source_class, rb_cCairo_SolidPattern);
   return self;
 }
 
@@ -229,7 +242,7 @@ cr_set_source_rgba (int argc, VALUE *argv, VALUE self)
 
   n = rb_scan_args (argc, argv, "13", &red, &green, &blue, &alpha);
 
-  if (n == 1 && RTEST (rb_obj_is_kind_of (red, rb_cArray)))
+  if (n == 1 && rb_cairo__is_kind_of (red, rb_cArray))
     {
       VALUE ary = red;
       n = RARRAY (ary)->len;
@@ -266,7 +279,6 @@ cr_set_source_rgba (int argc, VALUE *argv, VALUE self)
     }
   cr_check_status (_SELF);
   rb_ivar_set (self, cr_id_source, Qnil);
-  rb_ivar_set (self, cr_id_source_class, rb_cCairo_SolidPattern);
   return self;
 }
 
@@ -279,7 +291,6 @@ cr_set_source_surface (VALUE self, VALUE surface, VALUE width, VALUE height)
                             NUM2INT (height));
   cr_check_status (_SELF);
   rb_ivar_set (self, cr_id_source, Qnil);
-  rb_ivar_set (self, cr_id_source_class, rb_cCairo_SurfacePattern);
   return self;
 }
 
@@ -289,7 +300,6 @@ cr_set_source (VALUE self, VALUE pattern)
   cairo_set_source (_SELF, RVAL2CRPATTERN (pattern));
   cr_check_status (_SELF);
   rb_ivar_set (self, cr_id_source, pattern);
-  rb_ivar_set (self, cr_id_source_class, rb_obj_class (pattern));
   return self;
 }
 
@@ -301,7 +311,7 @@ cr_set_source_generic (int argc, VALUE *argv, VALUE self)
 
   n = rb_scan_args (argc, argv, "13", &arg1, &arg2, &arg3, &arg4);
 
-  if (n == 1 && RTEST (rb_obj_is_kind_of (arg1, rb_cArray)))
+  if (n == 1 && rb_cairo__is_kind_of (arg1, rb_cArray))
     {
       return cr_set_source_rgba (argc, argv, self);
     }
@@ -309,7 +319,7 @@ cr_set_source_generic (int argc, VALUE *argv, VALUE self)
     {
       return cr_set_source (self, arg1);
     }
-  else if (n == 3 && rb_obj_is_kind_of (arg1, rb_cCairo_Surface))
+  else if (n == 3 && rb_cairo__is_kind_of (arg1, rb_cCairo_Surface))
     {
       return cr_set_source_surface (self, arg1, arg2, arg3);
     }
@@ -375,16 +385,34 @@ cr_set_line_join (VALUE self, VALUE join)
 }
 
 static VALUE
-cr_set_dash (VALUE self, VALUE dash_array, VALUE offset)
+cr_set_dash (int argc, VALUE *argv, VALUE self)
 {
-  if (!NIL_P (dash_array))
+  VALUE dash_array, rb_offset;
+  double offset;
+  cairo_bool_t is_num;
+
+  rb_scan_args(argc, argv, "11", &dash_array, &rb_offset);
+
+  is_num = rb_cairo__is_kind_of (dash_array, rb_cNumeric);
+  if (!(NIL_P (dash_array) || is_num))
     {
       Check_Type (dash_array, T_ARRAY);
     }
 
-  if (NIL_P (dash_array) || RARRAY (dash_array)->len == 0)
+  if (NIL_P (rb_offset))
+    offset = 0.0;
+  else
+    offset = NUM2DBL (rb_offset);
+
+  if (is_num)
     {
-      cairo_set_dash (_SELF, NULL, 0, NUM2DBL (offset));
+      double values[1];
+      values[0] = NUM2DBL (dash_array);
+      cairo_set_dash (_SELF, values, 1, offset);
+    }
+  else if (NIL_P (dash_array) || RARRAY (dash_array)->len == 0)
+    {
+      cairo_set_dash (_SELF, NULL, 0, offset);
     }
   else
     {
@@ -400,9 +428,9 @@ cr_set_dash (VALUE self, VALUE dash_array, VALUE offset)
         {
           values[i] = NUM2DBL (RARRAY (dash_array)->ptr[i]);
         }
-      cairo_set_dash (_SELF, values, length, NUM2DBL (offset));
+      cairo_set_dash (_SELF, values, length, offset);
     }
-  
+
   cr_check_status (_SELF);
   return self;
 }
@@ -551,6 +579,59 @@ cr_curve_to (VALUE self, VALUE x1, VALUE y1,
   return self;
 }
 
+static VALUE
+cr_quadratic_curve_to (VALUE self, VALUE x1, VALUE y1, VALUE x2, VALUE y2)
+{
+  VALUE current_point, x0, y0, cx1, cy1, cx2, cy2;
+
+  current_point = cr_get_current_point (self);
+  x0 = RARRAY (current_point)->ptr[0];
+  y0 = RARRAY (current_point)->ptr[1];
+
+  /* cx1 = x0 + 2 * ((x1 - x0) / 3.0) */
+  cx1 = rb_funcall (x0, cr_id_plus, 1,
+                    rb_funcall (INT2NUM(2), cr_id_multi, 1,
+                                rb_funcall (rb_funcall (x1, cr_id_minus, 1, x0),
+                                            cr_id_div, 1, rb_float_new (3.0))));
+  /* cy1 = y0 + 2 * ((y1 - y0) / 3.0) */
+  cy1 = rb_funcall (y0, cr_id_plus, 1,
+                    rb_funcall (INT2NUM(2), cr_id_multi, 1,
+                                rb_funcall (rb_funcall (y1, cr_id_minus, 1, y0),
+                                            cr_id_div, 1, rb_float_new (3.0))));
+  /* cx2 = cx1 + (x2 - x0) / 3.0 */
+  cx2 = rb_funcall (cx1, cr_id_plus, 1,
+                    rb_funcall (rb_funcall (x2, cr_id_minus, 1, x0),
+                                cr_id_div, 1, rb_float_new (3.0)));
+  /* cy2 = cy1 + (y2 - y0) / 3.0 */
+  cy2 = rb_funcall (cy1, cr_id_plus, 1,
+                    rb_funcall (rb_funcall (y2, cr_id_minus, 1, y0),
+                                cr_id_div, 1, rb_float_new (3.0)));
+  return cr_curve_to (self, cx1, cy1, cx2, cy2, x2, y2);
+}
+
+static VALUE
+cr_curve_to_generic (int argc, VALUE *argv, VALUE self)
+{
+  VALUE x1, y1, x2, y2, x3, y3;
+
+  rb_scan_args (argc, argv, "42", &x1, &y1, &x2, &y2, &x3, &y3);
+
+  if (!(argc == 4 || argc == 6))
+    {
+      VALUE inspected_arg = rb_inspect (rb_ary_new4 (argc, argv));
+      rb_raise (rb_eArgError,
+                "invalid argument: %s (expect "
+                "(x1, y1, x2, y2) (quadratic) or "
+                "(x1, y1, x2, y2, x3, y3) (cubic))",
+                StringValuePtr (inspected_arg));
+    }
+
+  if (argc == 4)
+    return cr_quadratic_curve_to (self, x1, y1, x2, y2);
+  else
+    return cr_curve_to (self, x1, y1, x2, y2, x3, y3);
+}
+
 static VALUE
 cr_arc (VALUE self, VALUE xc, VALUE yc, VALUE radius,
         VALUE angle1, VALUE angle2)
@@ -588,15 +669,55 @@ cr_rel_line_to (VALUE self, VALUE x, VALUE y)
 }
 
 static VALUE
-cr_rel_curve_to (VALUE self, VALUE x1, VALUE y1,
-                 VALUE x2, VALUE y2, VALUE x3, VALUE y3)
+cr_rel_curve_to (VALUE self, VALUE dx1, VALUE dy1,
+                 VALUE dx2, VALUE dy2, VALUE dx3, VALUE dy3)
 {
-  cairo_rel_curve_to (_SELF, NUM2DBL (x1), NUM2DBL (y1),
-                      NUM2DBL (x2), NUM2DBL (y2), NUM2DBL (x3), NUM2DBL (y3));
+  cairo_rel_curve_to (_SELF, NUM2DBL (dx1), NUM2DBL (dy1),
+                      NUM2DBL (dx2), NUM2DBL (dy2),
+                      NUM2DBL (dx3), NUM2DBL (dy3));
   cr_check_status (_SELF);
   return self;
 }
 
+static VALUE
+cr_rel_quadratic_curve_to (VALUE self, VALUE dx1, VALUE dy1,
+                           VALUE dx2, VALUE dy2)
+{
+  VALUE current_point, x0, y0;
+
+  current_point = cr_get_current_point (self);
+  x0 = RARRAY (current_point)->ptr[0];
+  y0 = RARRAY (current_point)->ptr[1];
+  return cr_quadratic_curve_to (self,
+                                rb_funcall (dx1, cr_id_plus, 1, x0),
+                                rb_funcall (dy1, cr_id_plus, 1, y0),
+                                rb_funcall (dx2, cr_id_plus, 1, x0),
+                                rb_funcall (dy2, cr_id_plus, 1, y0));
+}
+
+static VALUE
+cr_rel_curve_to_generic (int argc, VALUE *argv, VALUE self)
+{
+  VALUE dx1, dy1, dx2, dy2, dx3, dy3;
+
+  rb_scan_args (argc, argv, "42", &dx1, &dy1, &dx2, &dy2, &dx3, &dy3);
+
+  if (!(argc == 4 || argc == 6))
+    {
+      VALUE inspected_arg = rb_inspect (rb_ary_new4 (argc, argv));
+      rb_raise (rb_eArgError,
+                "invalid argument: %s (expect "
+                "(dx1, dy1, dx2, dy2) (quadratic) or "
+                "(dx1, dy1, dx2, dy2, dx3, dy3) (cubic))",
+                StringValuePtr (inspected_arg));
+    }
+
+  if (argc == 4)
+    return cr_rel_quadratic_curve_to (self, dx1, dy1, dx2, dy2);
+  else
+    return cr_rel_curve_to (self, dx1, dy1, dx2, dy2, dx3, dy3);
+}
+
 static VALUE
 cr_rectangle (VALUE self, VALUE x, VALUE y, VALUE width, VALUE height)
 {
@@ -639,7 +760,7 @@ cr_paint_generic(int argc, VALUE *argv, VALUE self)
 
   n = rb_scan_args (argc, argv, "01", &alpha);
 
-  if (n == 0 || (n == 1 && NIL_P(alpha)))
+  if (n == 0 || (n == 1 && NIL_P (alpha)))
     {
       return cr_paint (self);
     }
@@ -695,58 +816,50 @@ cr_mask_generic (int argc, VALUE *argv, VALUE self)
 }
 
 static VALUE
-cr_stroke (VALUE self)
+cr_stroke (int argc, VALUE *argv, VALUE self)
 {
-  if (rb_block_given_p ())
-    {
-      cr_new_path (self);
-      rb_yield (self);
-    }
-  cairo_stroke (_SELF);
-  cr_check_status (_SELF);
-  return self;
-}
+  VALUE preserve;
+
+  rb_scan_args (argc, argv, "01", &preserve);
 
-static VALUE
-cr_stroke_preserve (VALUE self)
-{
   if (rb_block_given_p ())
     {
       cr_new_path (self);
       rb_yield (self);
     }
-  cairo_stroke_preserve (_SELF);
+
+  if (RVAL2CBOOL (preserve))
+    cairo_stroke_preserve (_SELF);
+  else
+    cairo_stroke (_SELF);
+
   cr_check_status (_SELF);
   return self;
 }
 
 static VALUE
-cr_fill (VALUE self)
+cr_fill (int argc, VALUE *argv, VALUE self)
 {
-  if (rb_block_given_p ())
-    {
-      cr_new_path (self);
-      rb_yield (self);
-    }
-  cairo_fill (_SELF);
-  cr_check_status (_SELF);
-  return self;
-}
+  VALUE preserve;
 
+  rb_scan_args (argc, argv, "01", &preserve);
 
-static VALUE
-cr_fill_preserve (VALUE self)
-{
   if (rb_block_given_p ())
     {
       cr_new_path (self);
       rb_yield (self);
     }
-  cairo_fill_preserve (_SELF);
+
+  if (RVAL2CBOOL (preserve))
+    cairo_fill_preserve (_SELF);
+  else
+    cairo_fill (_SELF);
+
   cr_check_status (_SELF);
   return self;
 }
 
+
 static VALUE
 cr_copy_page (VALUE self)
 {
@@ -772,7 +885,7 @@ cr_in_stroke (VALUE self, VALUE x, VALUE y)
       cr_new_path (self);
       rb_yield (self);
     }
-  return cairo_in_stroke (_SELF, NUM2DBL (x), NUM2DBL (y)) ? Qtrue : Qfalse;
+  return CBOOL2RVAL (cairo_in_stroke (_SELF, NUM2DBL (x), NUM2DBL (y)));
 }
 
 static VALUE
@@ -783,7 +896,7 @@ cr_in_fill (VALUE self, VALUE x, VALUE y)
       cr_new_path (self);
       rb_yield (self);
     }
-  return cairo_in_fill (_SELF, NUM2DBL (x), NUM2DBL (y)) ? Qtrue : Qfalse;
+  return CBOOL2RVAL (cairo_in_fill (_SELF, NUM2DBL (x), NUM2DBL (y)));
 }
 
 /* Rectangular extents */
@@ -823,27 +936,23 @@ cr_reset_clip (VALUE self)
 }
 
 static VALUE
-cr_clip (VALUE self)
+cr_clip (int argc, VALUE *argv, VALUE self)
 {
-  if (rb_block_given_p ())
-    {
-      cr_new_path (self);
-      rb_yield (self);
-    }
-  cairo_clip (_SELF);
-  cr_check_status (_SELF);
-  return self;
-}
+  VALUE preserve;
+
+  rb_scan_args(argc, argv, "01", &preserve);
 
-static VALUE
-cr_clip_preserve (VALUE self)
-{
   if (rb_block_given_p ())
     {
       cr_new_path (self);
       rb_yield (self);
     }
-  cairo_clip_preserve (_SELF);
+
+  if (RVAL2CBOOL (preserve))
+    cairo_clip_preserve(_SELF);
+  else
+    cairo_clip (_SELF);
+
   cr_check_status (_SELF);
   return self;
 }
@@ -908,12 +1017,12 @@ cr_select_font_face (int argc, VALUE *argv, VALUE self)
   else
     weight = RVAL2CRFONTWEIGHT (rb_weight);
 
-  cairo_select_font_face (_SELF, StringValueCStr (family), slant, weight);
+  cairo_select_font_face (_SELF, RVAL2CSTR (family), slant, weight);
   cr_check_status (_SELF);
   return self;
 }
 
-static   VALUE
+static VALUE
 cr_set_font_size (VALUE self, VALUE scale)
 {
   cairo_set_font_size (_SELF, NUM2DBL (scale));
@@ -952,7 +1061,7 @@ cr_get_font_options (VALUE self)
   cairo_font_options_t *options = cairo_font_options_create ();
   rb_cairo_check_status (cairo_font_options_status (options));
   cairo_get_font_options (_SELF, options);
-  cr_check_status (_SELF);
+  rb_cairo_check_status (cairo_font_options_status (options));
   return CRFONTOPTIONS2RVAL (options);
 }
 
@@ -975,7 +1084,7 @@ cr_get_scaled_font (VALUE self)
 static VALUE
 cr_show_text (VALUE self, VALUE utf8)
 {
-  cairo_show_text (_SELF, StringValuePtr (utf8));
+  cairo_show_text (_SELF, RVAL2CSTR (utf8));
   cr_check_status (_SELF);
   return self;
 }
@@ -986,10 +1095,7 @@ cr_show_glyphs (VALUE self, VALUE rb_glyphs)
   int count;
   cairo_glyph_t *glyphs;
 
-  if (!rb_obj_is_kind_of (rb_glyphs, rb_cArray))
-     rb_raise (rb_eTypeError, "expected array");
-    
-  rb_cairo__glyphs_to_array (rb_glyphs, &glyphs, &count);
+  RB_CAIRO__GLYPHS_TO_ARRAY (rb_glyphs, glyphs, count);
   cairo_show_glyphs (_SELF, glyphs, count);
   cr_check_status (_SELF);
   return self;
@@ -999,9 +1105,9 @@ static VALUE
 cr_get_font_face (VALUE self)
 {
   cairo_font_face_t *face;
-  
+
   face = cairo_get_font_face (_SELF);
-  cr_check_status (_SELF);
+  rb_cairo_check_status (cairo_font_face_status (face));
   return CRFONTFACE2RVAL (face);
 }
 
@@ -1017,7 +1123,7 @@ cr_font_extents (VALUE self)
 static VALUE
 cr_set_font_face (VALUE self, VALUE face)
 {
-  cairo_set_font_face (_SELF, RVAL2CRFONTFACE (face));
+  cairo_set_font_face (_SELF, NIL_P (face) ? NULL : RVAL2CRFONTFACE (face));
   cr_check_status (_SELF);
   return self;
 }
@@ -1038,7 +1144,7 @@ cr_glyph_extents (VALUE self, VALUE rb_glyphs)
   cairo_glyph_t *glyphs;
   int length;
 
-  rb_cairo__glyphs_to_array (rb_glyphs, &glyphs, &length);
+  RB_CAIRO__GLYPHS_TO_ARRAY (rb_glyphs, glyphs, length);
   cairo_glyph_extents (_SELF, glyphs, length, &extents);
   cr_check_status (_SELF);
   return CRTEXTEXTENTS2RVAL (&extents);
@@ -1058,10 +1164,10 @@ cr_glyph_path (VALUE self, VALUE rb_glyphs)
   int count;
   cairo_glyph_t *glyphs;
 
-  rb_cairo__glyphs_to_array (rb_glyphs, &glyphs, &count);
+  RB_CAIRO__GLYPHS_TO_ARRAY (rb_glyphs, glyphs, count);
   cairo_glyph_path (_SELF, glyphs, count);
   cr_check_status (_SELF);
-  
+
   return self;
 }
 
@@ -1079,14 +1185,13 @@ cr_get_source (VALUE self)
   cairo_pattern_t *source;
   source = cairo_get_source (_SELF);
 
-  rb_source = rb_ivar_get (self, cr_id_source);
   if (source)
     {
       rb_cairo_check_status (cairo_pattern_status (source));
+      rb_source = rb_ivar_get (self, cr_id_source);
       if (NIL_P (rb_source) || RVAL2CRPATTERN (rb_source) != source)
         {
-          rb_source =
-            CRPATTERN2RVAL (source, rb_ivar_get (self, cr_id_source_class));
+          rb_source = CRPATTERN2RVAL (source);
           rb_ivar_set (self, cr_id_source, rb_source);
         }
     }
@@ -1206,6 +1311,8 @@ cr_get_group_target (VALUE self)
   cairo_surface_t *surface;
 
   surface = cairo_get_group_target (_SELF);
+  if (!surface)
+    return Qnil;
   rb_cairo_check_status (cairo_surface_status (surface));
   return CRSURFACE2RVAL (surface);
 }
@@ -1214,17 +1321,21 @@ cr_get_group_target (VALUE self)
 static VALUE
 cr_copy_path (VALUE self)
 {
-  VALUE path = CRPATH2RVAL (cairo_copy_path (_SELF));
-  cr_check_status (_SELF);
-  return path;
+  cairo_path_t *path;
+
+  path = cairo_copy_path (_SELF);
+  rb_cairo_check_status (path->status);
+  return CRPATH2RVAL (path);
 }
 
 static VALUE
 cr_copy_path_flat (VALUE self)
 {
-  VALUE path = CRPATH2RVAL (cairo_copy_path_flat (_SELF));
-  cr_check_status (_SELF);
-  return path;
+  cairo_path_t *path;
+
+  path =  cairo_copy_path_flat (_SELF);
+  rb_cairo_check_status (path->status);
+  return CRPATH2RVAL (path);
 }
 
 static VALUE
@@ -1240,7 +1351,11 @@ Init_cairo_context (void)
 {
   cr_id_surface = rb_intern ("surface");
   cr_id_source = rb_intern ("source");
-  cr_id_source_class = rb_intern ("source_class");
+
+  cr_id_plus = rb_intern ("+");
+  cr_id_minus = rb_intern ("-");
+  cr_id_multi = rb_intern ("*");
+  cr_id_div = rb_intern ("/");
 
 #if CAIRO_CHECK_VERSION(1, 3, 0)
   rb_cCairo_Rectangle =
@@ -1263,7 +1378,7 @@ Init_cairo_context (void)
     rb_define_class_under (rb_mCairo, "Context", rb_cObject);
 
   rb_define_alloc_func (rb_cCairo_Context, cr_allocate);
-  
+
   /* Functions for manipulating state objects */
   rb_define_method (rb_cCairo_Context, "initialize", cr_initialize, 1);
 
@@ -1287,15 +1402,15 @@ Init_cairo_context (void)
   rb_define_method (rb_cCairo_Context, "set_line_width", cr_set_line_width, 1);
   rb_define_method (rb_cCairo_Context, "set_line_cap", cr_set_line_cap, 1);
   rb_define_method (rb_cCairo_Context, "set_line_join", cr_set_line_join, 1);
-  rb_define_method (rb_cCairo_Context, "set_dash", cr_set_dash, 2);
+  rb_define_method (rb_cCairo_Context, "set_dash", cr_set_dash, -1);
   rb_define_method (rb_cCairo_Context, "set_miter_limit",
                     cr_set_miter_limit, 1);
-  
+
   rb_define_method (rb_cCairo_Context, "translate", cr_translate, 2);
   rb_define_method (rb_cCairo_Context, "scale", cr_scale, 2);
   rb_define_method (rb_cCairo_Context, "rotate", cr_rotate, 1);
   rb_define_method (rb_cCairo_Context, "transform", cr_transform, 1);
-  
+
   rb_define_method (rb_cCairo_Context, "set_matrix", cr_set_matrix, 1);
   rb_define_method (rb_cCairo_Context, "identity_matrix",
                     cr_identity_matrix, 0);
@@ -1311,38 +1426,35 @@ Init_cairo_context (void)
   rb_define_method (rb_cCairo_Context, "move_to", cr_move_to, 2);
   rb_define_method (rb_cCairo_Context, "new_sub_path", cr_new_sub_path, 0);
   rb_define_method (rb_cCairo_Context, "line_to", cr_line_to, 2);
-  rb_define_method (rb_cCairo_Context, "curve_to", cr_curve_to, 6);
+  rb_define_method (rb_cCairo_Context, "curve_to", cr_curve_to_generic, -1);
   rb_define_method (rb_cCairo_Context, "arc", cr_arc, 5);
   rb_define_method (rb_cCairo_Context, "arc_negative", cr_arc_negative, 5);
   rb_define_method (rb_cCairo_Context, "rel_move_to", cr_rel_move_to, 2);
   rb_define_method (rb_cCairo_Context, "rel_line_to", cr_rel_line_to, 2);
-  rb_define_method (rb_cCairo_Context, "rel_curve_to", cr_rel_curve_to, 6);
+  rb_define_method (rb_cCairo_Context, "rel_curve_to",
+                    cr_rel_curve_to_generic, -1);
   rb_define_method (rb_cCairo_Context, "rectangle", cr_rectangle, 4);
   rb_define_method (rb_cCairo_Context, "close_path", cr_close_path, 0);
 
   /* Painting functions */
   rb_define_method (rb_cCairo_Context, "paint", cr_paint_generic, -1);
   rb_define_method (rb_cCairo_Context, "mask", cr_mask_generic, -1);
-  rb_define_method (rb_cCairo_Context, "stroke", cr_stroke, 0);
-  rb_define_method (rb_cCairo_Context, "stroke_preserve",
-                    cr_stroke_preserve, 0);
-  rb_define_method (rb_cCairo_Context, "fill", cr_fill, 0);
-  rb_define_method (rb_cCairo_Context, "fill_preserve", cr_fill_preserve, 0);
+  rb_define_method (rb_cCairo_Context, "stroke", cr_stroke, -1);
+  rb_define_method (rb_cCairo_Context, "fill", cr_fill, -1);
   rb_define_method (rb_cCairo_Context, "copy_page", cr_copy_page, 0);
   rb_define_method (rb_cCairo_Context, "show_page", cr_show_page, 0);
 
   /* Insideness testing */
   rb_define_method (rb_cCairo_Context, "in_stroke?", cr_in_stroke, 2);
   rb_define_method (rb_cCairo_Context, "in_fill?", cr_in_fill, 2);
-  
+
   /* Rectangular extents */
   rb_define_method (rb_cCairo_Context, "stroke_extents", cr_stroke_extents, 0);
   rb_define_method (rb_cCairo_Context, "fill_extents", cr_fill_extents, 0);
-  
+
   /* Clipping */
   rb_define_method (rb_cCairo_Context, "reset_clip", cr_reset_clip, 0);
-  rb_define_method (rb_cCairo_Context, "clip", cr_clip, 0);
-  rb_define_method (rb_cCairo_Context, "clip_preserve", cr_clip_preserve, 0);
+  rb_define_method (rb_cCairo_Context, "clip", cr_clip, -1);
 #if CAIRO_CHECK_VERSION(1, 3, 0)
   rb_define_method (rb_cCairo_Context, "clip_extents", cr_clip_extents, 0);
   rb_define_method (rb_cCairo_Context, "clip_rectangle_list",