Changeset 2092 for libcaca/trunk/ruby/caca-display.cTweet

Timestamp:

Nov 28, 2007, 8:29:12 AM (13 years ago)

Author:

Pascal Terjan

Message:

• Allow calling Caca::Display.new without parameter

File:

• libcaca/trunk/ruby/caca-display.c (modified) (2 diffs)

libcaca/trunk/ruby/caca-display.c

@@ -31 +31 @@
 }
 
-static VALUE display_initialize(VALUE self, VALUE cv)
+static VALUE display_initialize(int argc, VALUE* argv, VALUE self)
 {
     caca_display_t *display;
-    
-    if(CLASS_OF(cv) != cCanvas)
-    {
-        rb_raise(rb_eArgError, "Argument is not a Cucul::Canvas");
-    }
-
-    display = caca_create_display(DATA_PTR(cv));
+    VALUE cv;
+
+    rb_scan_args(argc, argv, "01", &cv);
+
+    if(NIL_P(cv))
+    {
+        display = caca_create_display(NULL);
+    }
+    else
+    {
+        if(CLASS_OF(cv) != cCanvas)
+        {
+            rb_raise(rb_eArgError, "Argument is not a Cucul::Canvas");
+        }
+
+        display = caca_create_display(DATA_PTR(cv));
+    }
+
     if(display == NULL)
     {
@@ -188 +199 @@
     rb_define_alloc_func(cDisplay, display_alloc);
 
-    rb_define_method(cDisplay, "initialize", display_initialize, 1);
+    rb_define_method(cDisplay, "initialize", display_initialize, -1);
     rb_define_method(cDisplay, "refresh", display_refresh, 0);
     rb_define_method(cDisplay, "time=", set_time, 1);