Changeset 205

Timestamp:

09/25/2007 00:57:39 (11 months ago)

Author:

why

Message:

* shoes/ruby.c: ahh, ended up needing App.method_missing for anything that ends up getting added to Canvas or Shoes classes at runtime. perhaps could use method_added in the future. this gave me a chance to wrap up ts_funcall2 which means Shoes actually has a hack by the wonderful Guy Decoux!
* samples/mask.rb: using title now that the above is fixed.

Location:

trunk

Files:

• samples/mask.rb (modified) (1 diff)
• shoes/ruby.c (modified) (4 diffs)

trunk/samples/mask.rb

@@ -7 +7 @@
 
   mask do
-    text "<span font_desc='34px'>Shoes</span>"
+    title "Shoes"
   end
 end

trunk/shoes/ruby.c

@@ -32 +32 @@
 {
   return rb_funcall2(tmp[0], (ID)tmp[1], (int)tmp[2], (VALUE *)tmp[3]);
+}
+
+VALUE
+ts_funcall2(VALUE obj, ID meth, int argc, VALUE *argv)
+{
+  VALUE tmp[4];
+  tmp[0] = obj;
+  tmp[1] = (VALUE)meth; 
+  tmp[2] = (VALUE)argc;
+  tmp[3] = (VALUE)argv;
+  return rb_iterate((VALUE(*)(VALUE))ts_each, (VALUE)tmp, CASTHOOK(rb_yield), 0);
 }
 
@@ -1119 +1130 @@
 
 VALUE
-shoes_method_missing_color(int argc, VALUE *argv, VALUE self)
-{
-  VALUE c, cname, alpha;
-  rb_scan_args(argc, argv, "11", &cname, &alpha);
+shoes_app_method_missing(int argc, VALUE *argv, VALUE self)
+{
+  shoes_app *app;
+  VALUE c, cname, alpha, canvas;
+
+  cname = argv[0];
+  Data_Get_Struct(self, shoes_app, app);
+
+  canvas = rb_ary_entry(app->nesting, RARRAY_LEN(app->nesting) - 1);
+  if (!NIL_P(canvas) && rb_respond_to(canvas, SYM2ID(cname)))
+  {
+    return ts_funcall2(canvas, SYM2ID(cname), argc - 1, argv + 1);
+  }
+
+  //
+  // Create colors by name
+  //
   c = rb_hash_aref(cColors, cname);
   if (NIL_P(c))
@@ -1131 +1155 @@
   }
 
+  rb_scan_args(argc, argv, "11", &cname, &alpha);
   if (!NIL_P(alpha))
   {
@@ -2544 +2569 @@
   rb_define_method(cColor, "to_pattern", CASTHOOK(shoes_color_to_pattern), 0);
 
-  rb_define_method(cApp, "method_missing", CASTHOOK(shoes_method_missing_color), -1);
+  rb_define_method(cApp, "method_missing", CASTHOOK(shoes_app_method_missing), -1);
 
   rb_const_set(cShoes, rb_intern("COLORS"), rb_hash_new());