Added EvasObject#userdata.

[ruby-evas.git] / src / rb_evas_object.c

diff --git a/src/rb_evas_object.c b/src/rb_evas_object.c
index 6a4c5748588d8b6d62f5ced33c3b6f7236c69d2b..6e93a8fe3bec6fc5eaae14243988e7d918171d40 100644 (file)
--- a/src/rb_evas_object.c
+++ b/src/rb_evas_object.c
@@ -1,5 +1,5 @@
 /*
- * $Id: rb_evas_object.c 105 2004-08-29 15:45:48Z tilman $
+ * $Id: rb_evas_object.c 304 2005-03-22 17:51:51Z tilman $
  *
  * Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
  *
@@ -49,6 +49,12 @@ VALUE TO_EVAS_OBJECT (Evas_Object *o)
 void c_evas_object_mark (RbEvasObject *e)
 {
        rb_gc_mark (e->parent);
+
+       if (!NIL_P (e->callbacks))
+               rb_gc_mark (e->callbacks);
+
+       if (!NIL_P (e->userdata))
+               rb_gc_mark (e->userdata);
 }
 
 void c_evas_object_free (RbEvasObject *e, bool free_mem)
@@ -68,6 +74,7 @@ static VALUE c_init (VALUE self, VALUE parent)
        evas_object_data_set (e->real, RUBY_EVAS_OBJECT_KEY, (void *) self);
 
        e->parent = parent;
+       e->callbacks = Qnil;
 
        return self;
 }
@@ -466,8 +473,6 @@ static VALUE c_stack_below (VALUE self, VALUE target)
  */
 static VALUE c_above_get (VALUE self)
 {
-       Evas_Object *o;
-
        GET_OBJ (self, RbEvasObject, e);
 
        return TO_EVAS_OBJECT (evas_object_above_get (e->real));
@@ -482,13 +487,21 @@ static VALUE c_above_get (VALUE self)
  */
 static VALUE c_below_get (VALUE self)
 {
-       Evas_Object *o;
-
        GET_OBJ (self, RbEvasObject, e);
 
        return TO_EVAS_OBJECT (evas_object_below_get (e->real));
 }
 
+static VALUE c_userdata_get (VALUE self)
+{
+       GET_OBJ (self, RbEvasObject, e);
+
+       if (NIL_P (e->userdata))
+               e->userdata = rb_hash_new ();
+
+       return e->userdata;
+}
+
 void Init_EvasObject (void)
 {
        cEvasObject = rb_define_class_under (mEvas, "EvasObject",
@@ -526,4 +539,5 @@ void Init_EvasObject (void)
        rb_define_method (cEvasObject, "stack_below", c_stack_below, 1);
        rb_define_method (cEvasObject, "above", c_above_get, 0);
        rb_define_method (cEvasObject, "below", c_below_get, 0);
+       rb_define_method (cEvasObject, "userdata", c_userdata_get, 0);
 }