cairo 1.4.1 → 1.5.0

data/src/rb_cairo_scaled_font.c

@@ -3,7 +3,7 @@
  * Ruby Cairo Binding
  *
  * $Author: kou $
- * $Date: 2007/03/06 12:17:34 $
+ * $Date: 2007/05/20 09:18:49 $
  *
  * Copyright 2005 Kouhei Sutou <kou@cozmixng.org>
  *
@@ -29,7 +29,7 @@ cairo_scaled_font_t *
 rb_cairo_scaled_font_from_ruby_object (VALUE obj)
 {
   cairo_scaled_font_t *font;
-  if (!RTEST (rb_obj_is_kind_of (obj, rb_cCairo_ScaledFont)))
+  if (!rb_cairo__is_kind_of (obj, rb_cCairo_ScaledFont))
     {
       rb_raise (rb_eTypeError, "not a cairo scaled font");
     }
@@ -82,12 +82,6 @@ cr_scaled_font_initialize (VALUE self, VALUE face, VALUE matrix,
   return Qnil;
 }
 
-static VALUE
-cr_scaled_font_get_type (VALUE self)
-{
-  return INT2NUM (cairo_scaled_font_get_type ( _SELF (self)));
-}
-
 static VALUE
 cr_scaled_font_extents (VALUE self)
 {
@@ -114,7 +108,7 @@ cr_scaled_font_glyph_extents (VALUE self, VALUE rb_glyphs)
   cairo_glyph_t *glyphs;
   int count;
 
-  rb_cairo__glyphs_to_array (rb_glyphs, &glyphs, &count);
+  RB_CAIRO__GLYPHS_TO_ARRAY (rb_glyphs, glyphs, count);
   cairo_scaled_font_glyph_extents (_SELF (self), glyphs, count, &extents);
   cr_scaled_font_check_status (_SELF (self));
   return CRTEXTEXTENTS2RVAL (&extents);
@@ -168,7 +162,6 @@ Init_cairo_scaled_font (void)
   rb_define_method (rb_cCairo_ScaledFont, "initialize",
                     cr_scaled_font_initialize, 4);
 
-  rb_define_method (rb_cCairo_ScaledFont, "type", cr_scaled_font_get_type, 0);
   rb_define_method (rb_cCairo_ScaledFont, "extents", cr_scaled_font_extents, 0);
   rb_define_method (rb_cCairo_ScaledFont, "text_extents",
                     cr_scaled_font_text_extents, 1);

data/src/rb_cairo_surface.c

@@ -3,7 +3,7 @@
  * Ruby Cairo Binding
  *
  * $Author: kou $
- * $Date: 2007/03/06 12:17:34 $
+ * $Date: 2007/05/20 23:31:57 $
  *
  * Copyright 2005 Øyvind Kolås <pippin@freedesktop.org>
  * Copyright 2004-2005 MenTaLguY <mental@rydia.com>
@@ -29,11 +29,11 @@ VALUE rb_cCairo_ImageSurface;
 VALUE rb_cCairo_PDFSurface;
 VALUE rb_cCairo_PSSurface;
 VALUE rb_cCairo_SVGSurface;
+VALUE rb_cCairo_WIN32Surface;
 
 static ID cr_id_target;
 static ID cr_id_read;
 static ID cr_id_write;
-static cairo_user_data_key_t cr_klass_key;
 static cairo_user_data_key_t cr_closure_key;
 
 #define _SELF  (RVAL2CRSURFACE(self))
@@ -44,43 +44,33 @@ cr_surface_check_status (cairo_surface_t *surface)
   rb_cairo_check_status (cairo_surface_status (surface));
 }
 
-static void
-cr_surface_set_klass (cairo_surface_t *surface, VALUE klass)
-{
-  cairo_status_t status;
-  status = cairo_surface_set_user_data (surface, &cr_klass_key,
-                                        (void *)klass, NULL);
-  rb_cairo_check_status (status);
-}
-
 static VALUE
 cr_surface_get_klass (cairo_surface_t *surface)
 {
   VALUE klass;
-  void *data = cairo_surface_get_user_data (surface, &cr_klass_key);
+  cairo_surface_type_t type;
 
-  if (data)
-    klass = (VALUE) data;
-  else
+  type = cairo_surface_get_type (surface);
+  switch (type)
     {
-      switch (cairo_surface_get_type (surface))
-        {
-        case CAIRO_SURFACE_TYPE_IMAGE:
-          klass = rb_cCairo_ImageSurface;
-          break;
-        case CAIRO_SURFACE_TYPE_PDF:
-          klass = rb_cCairo_PDFSurface;
-          break;
-        case CAIRO_SURFACE_TYPE_PS:
-          klass = rb_cCairo_PSSurface;
-          break;
-        case CAIRO_SURFACE_TYPE_SVG:
-          klass = rb_cCairo_SVGSurface;
-          break;
-        default:
-          klass = rb_cCairo_Surface;
-          break;
-        }
+    case CAIRO_SURFACE_TYPE_IMAGE:
+      klass = rb_cCairo_ImageSurface;
+      break;
+    case CAIRO_SURFACE_TYPE_PDF:
+      klass = rb_cCairo_PDFSurface;
+      break;
+    case CAIRO_SURFACE_TYPE_PS:
+      klass = rb_cCairo_PSSurface;
+      break;
+    case CAIRO_SURFACE_TYPE_SVG:
+      klass = rb_cCairo_SVGSurface;
+      break;
+    case CAIRO_SURFACE_TYPE_WIN32:
+      klass = rb_cCairo_WIN32Surface;
+      break;
+    default:
+      rb_raise (rb_eArgError, "unknown source type: %d", type);
+      break;
     }
 
   return klass;
@@ -224,12 +214,11 @@ cairo_surface_t *
 rb_cairo_surface_from_ruby_object (VALUE obj)
 {
   cairo_surface_t *surface;
-  if (!RTEST (rb_obj_is_kind_of (obj, rb_cCairo_Surface)))
+  if (!rb_cairo__is_kind_of (obj, rb_cCairo_Surface))
     {
       rb_raise (rb_eTypeError, "not a cairo surface");
     }
   Data_Get_Struct (obj, cairo_surface_t, surface);
-  cr_surface_set_klass (surface, rb_obj_class (obj));
   return surface;
 }
 
@@ -247,7 +236,8 @@ rb_cairo_surface_to_ruby_object (cairo_surface_t *surface)
 {
   if (surface)
     {
-      VALUE klass = cr_surface_get_klass (surface);
+      VALUE klass;
+      klass = cr_surface_get_klass (surface);
       cairo_surface_reference (surface);
       return Data_Wrap_Struct (klass, NULL, cr_surface_free, surface);
     }
@@ -264,6 +254,25 @@ cr_surface_allocate (VALUE klass)
 }
 
 /* Surface manipulation */
+static void
+yield_and_finish (VALUE self)
+{
+  cairo_surface_t *surface;
+  cairo_status_t status;
+
+  rb_yield (self);
+
+  surface = _SELF;
+  if (cairo_surface_status (surface))
+    return;
+  cairo_surface_finish (surface);
+  status = cairo_surface_status (surface);
+  if (status == CAIRO_STATUS_SUCCESS || status == CAIRO_STATUS_SURFACE_FINISHED)
+    return;
+
+  cr_surface_check_status (surface);
+}
+
 static VALUE
 cr_surface_create_similar (VALUE self, VALUE content,
                            VALUE width, VALUE height)
@@ -274,7 +283,6 @@ cr_surface_create_similar (VALUE self, VALUE content,
                                           RVAL2CRCONTENT (content),
                                           NUM2INT (width), NUM2INT (height));
   cr_surface_check_status (surface);
-  cr_surface_set_klass (surface, rb_obj_class (self));
   return CRSURFACE2RVAL (surface);
 }
 
@@ -293,12 +301,6 @@ cr_surface_finish (VALUE self)
   return self;
 }
 
-static VALUE
-cr_surface_get_type (VALUE self)
-{
-  return INT2NUM (cairo_surface_get_type (_SELF));
-}
-
 static VALUE
 cr_surface_get_content (VALUE self)
 {
@@ -460,7 +462,6 @@ cr_image_surface_create_from_png_generic (VALUE klass, VALUE target)
     surface = cr_image_surface_create_from_png (target);
 
   cr_surface_check_status (surface);
-  cr_surface_set_klass (surface, klass);
   rb_surface = cr_surface_allocate (klass);
   DATA_PTR (rb_surface) = surface;
   return rb_surface;
@@ -518,6 +519,8 @@ cr_image_surface_initialize (int argc, VALUE *argv, VALUE self)
 
   cr_surface_check_status (surface);
   DATA_PTR (self) = surface;
+  if (rb_block_given_p ())
+    yield_and_finish (self);
   return Qnil;
 }
 
@@ -609,6 +612,8 @@ cr_ ## type ## _surface_initialize (VALUE self, VALUE target,           \
                                                                         \
   cr_surface_check_status (surface);                                    \
   DATA_PTR (self) = surface;                                            \
+  if (rb_block_given_p ())                                              \
+    yield_and_finish (self);                                            \
   return Qnil;                                                          \
 }
 
@@ -717,6 +722,114 @@ cr_svg_version_to_string (VALUE self, VALUE version)
 }
 #endif
 
+#if CAIRO_HAS_WIN32_SURFACE
+/* WIN32-surface functions */
+
+/* from dl/dl.h (ruby 1.9) */
+#if SIZEOF_LONG == SIZEOF_VOIDP
+#  define PTR2NUM(x)   (ULONG2NUM((unsigned long)(x)))
+#  define NUM2PTR(x)   ((void *)(NUM2ULONG(x)))
+#else
+#  define PTR2NUM(x)   (ULL2NUM((unsigned long long)(x)))
+#  define NUM2PTR(x)   ((void *)(NUM2ULL(x)))
+#endif
+
+static VALUE
+cr_win32_surface_initialize (int argc, VALUE *argv, VALUE self)
+{
+  cairo_surface_t *surface = NULL;
+  VALUE arg1, arg2, arg3, arg4;
+  VALUE hdc, format, width, height;
+
+  rb_scan_args (argc, argv, "13", &arg1, &arg2, &arg3, &arg4);
+
+  switch (argc)
+    {
+    case 1:
+      hdc = arg1;
+      surface = cairo_win32_surface_create (NUM2PTR (hdc));
+      break;
+    case 2:
+      width = arg1;
+      height = arg2;
+      surface = cairo_win32_surface_create_with_dib (CAIRO_FORMAT_ARGB32,
+                                                     NUM2INT (width),
+                                                     NUM2INT (height));
+      break;
+    case 3:
+      if (NIL_P (arg1) ||
+          (rb_cairo__is_kind_of (arg1, rb_cNumeric) &&
+           NUM2INT (arg1) != CAIRO_FORMAT_RGB24))
+        {
+          hdc = arg1;
+          width = arg2;
+          height = arg3;
+          HDC win32_hdc = NIL_P (hdc) ? NULL : NUM2PTR (hdc);
+          surface = cairo_win32_surface_create_with_ddb (win32_hdc,
+                                                         CAIRO_FORMAT_RGB24,
+                                                         NUM2INT (width),
+                                                         NUM2INT (height));
+        }
+      else
+        {
+          format = arg1;
+          width = arg2;
+          height = arg3;
+          surface = cairo_win32_surface_create_with_dib (RVAL2CRFORMAT (format),
+                                                         NUM2INT (width),
+                                                         NUM2INT (height));
+        }
+      break;
+    case 4:
+      {
+        HDC win32_hdc;
+        hdc = arg1;
+        format = arg2;
+        width = arg3;
+        height = arg4;
+        win32_hdc = NIL_P (hdc) ? NULL : (HDC) NUM2UINT (hdc);
+        surface = cairo_win32_surface_create_with_ddb (win32_hdc,
+                                                       RVAL2CRFORMAT (format),
+                                                       NUM2INT (width),
+                                                       NUM2INT (height));
+      }
+      break;
+    }
+
+  if (!surface)
+    rb_cairo_check_status (CAIRO_STATUS_INVALID_FORMAT);
+  cr_surface_check_status (surface);
+  DATA_PTR (self) = surface;
+  if (rb_block_given_p ())
+    yield_and_finish (self);
+  return Qnil;
+}
+
+static VALUE
+cr_win32_surface_get_hdc (VALUE self)
+{
+  HDC hdc;
+
+  hdc = cairo_win32_surface_get_dc (_SELF);
+  if (!hdc)
+    return Qnil;
+  else
+    return PTR2NUM (hdc);
+}
+
+static VALUE
+cr_win32_surface_get_image (VALUE self)
+{
+  cairo_surface_t *surface;
+
+  surface = cairo_win32_surface_get_image (_SELF);
+  if (!surface)
+    return Qnil;
+  rb_cairo_check_status (cairo_surface_status (surface));
+  return CRSURFACE2RVAL (surface);
+}
+#endif
+
 
 void
 Init_cairo_surface (void)
@@ -732,7 +845,6 @@ Init_cairo_surface (void)
   rb_define_method (rb_cCairo_Surface, "create_similar",
                     cr_surface_create_similar, 3);
   rb_define_method (rb_cCairo_Surface, "finish", cr_surface_finish, 0);
-  rb_define_method (rb_cCairo_Surface, "type", cr_surface_get_type, 0);
   rb_define_method (rb_cCairo_Surface, "content", cr_surface_get_content, 0);
 
   rb_define_method (rb_cCairo_Surface, "font_options",
@@ -817,11 +929,6 @@ Init_cairo_surface (void)
   /* SVG-surface */
   INIT_SURFACE(svg, SVG)
 
-  rb_define_const (rb_cCairo_SVGSurface, "VERSION_1_1",
-                   rb_const_get (rb_mCairo, rb_intern ("SVG_VERSION_1_1")));
-  rb_define_const (rb_cCairo_SVGSurface, "VERSION_1_2",
-                   rb_const_get (rb_mCairo, rb_intern ("SVG_VERSION_1_2")));
-
   rb_define_singleton_method (rb_cCairo_SVGSurface, "versions",
                               cr_svg_get_versions, 0);
   rb_define_singleton_method (rb_cCairo_SVGSurface, "version_to_string",
@@ -834,4 +941,19 @@ Init_cairo_surface (void)
 #else
   rb_cCairo_SVGSurface = Qnil;
 #endif
+
+#if CAIRO_HAS_WIN32_SURFACE
+  /* WIN32-surface */
+  rb_cCairo_WIN32Surface =
+    rb_define_class_under (rb_mCairo, "WIN32Surface", rb_cCairo_Surface);
+
+  rb_define_method (rb_cCairo_WIN32Surface, "initialize",
+                    cr_win32_surface_initialize, -1);
+  rb_define_method (rb_cCairo_WIN32Surface, "hdc",
+                    cr_win32_surface_get_hdc, 0);
+  rb_define_method (rb_cCairo_WIN32Surface, "image",
+                    cr_win32_surface_get_image, 0);
+#else
+  rb_cCairo_WIN32Surface = Qnil;
+#endif
 }

data/src/rb_cairo_text_extents.c

@@ -3,7 +3,7 @@
  * Ruby Cairo Binding
  *
  * $Author: kou $
- * $Date: 2007/03/06 12:17:34 $
+ * $Date: 2007/05/03 02:47:39 $
  *
  * Copyright 2005 Øyvind Kolås <pippin@freedesktop.org>
  * Copyright 2004-2005 MenTaLguY <mental@rydia.com>
@@ -13,6 +13,7 @@
  */
 
 #include "rb_cairo.h"
+#include "rb_cairo_private.h"
 
 VALUE rb_cCairo_TextExtents;
 
@@ -22,7 +23,7 @@ cairo_text_extents_t *
 rb_cairo_text_extents_from_ruby_object (VALUE obj)
 {
   cairo_text_extents_t *extents;
-  if (!RTEST (rb_obj_is_kind_of (obj, rb_cCairo_TextExtents)))
+  if (!rb_cairo__is_kind_of (obj, rb_cCairo_TextExtents))
     {
       rb_raise (rb_eTypeError, "not a cairo text_extents");
     }

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: cairo
 version: !ruby/object:Gem::Version 
-  version: 1.4.1
-date: 2007-04-13 00:00:00 +09:00
+  version: 1.5.0
+date: 2007-05-27 00:00:00 +09:00
 summary: Ruby bindings for cairo
 require_paths: 
 - src/lib
@@ -42,7 +42,10 @@ files:
 - README
 - Rakefile
 - extconf.rb
+- misc/update-colors.rb
 - pkg-config.rb
+- samples/.#blur.rb.1.1
+- samples/blur.rb
 - samples/pac.rb
 - samples/pac2.rb
 - samples/png.rb
@@ -51,11 +54,17 @@ files:
 - samples/text2.rb
 - src/cairo.def
 - src/lib/cairo.rb
+- src/lib/cairo/color.rb
+- src/lib/cairo/colors.rb
+- src/lib/cairo/constants.rb
 - src/lib/cairo/context.rb
+- src/lib/cairo/context/blur.rb
 - src/lib/cairo/context/circle.rb
+- src/lib/cairo/context/color.rb
 - src/lib/cairo/context/path.rb
-- src/lib/cairo/context/quad.rb
 - src/lib/cairo/context/rectangle.rb
+- src/lib/cairo/path.rb
+- src/lib/cairo/point.rb
 - src/rb_cairo.c
 - src/rb_cairo.h
 - src/rb_cairo_constants.c
@@ -75,8 +84,9 @@ files:
 - src/rb_cairo_text_extents.c
 test_files: []
 
-rdoc_options: []
-
+rdoc_options: 
+- --main
+- README.txt
 extra_rdoc_files: []
 
 executables: []