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 6c0a90f99498f4d6ea7f68c908765de73bd7b3bc..6e93a8fe3bec6fc5eaae14243988e7d918171d40 100644 (file)
--- a/src/rb_evas_object.c
+++ b/src/rb_evas_object.c
@@ -1,5 +1,5 @@
 /*
- * $Id: rb_evas_object.c 64 2004-08-12 19:37:04Z tilman $
+ * $Id: rb_evas_object.c 304 2005-03-22 17:51:51Z tilman $
  *
  * Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
  *
@@ -30,10 +30,31 @@
 
 VALUE cEvasObject;
 
+VALUE TO_EVAS_OBJECT (Evas_Object *o)
+{
+       void *obj;
+
+       if (!o)
+               return Qnil;
+
+       if (!(obj = evas_object_data_get (o, RUBY_EVAS_OBJECT_KEY))) {
+               rb_raise (rb_eException, "EvasObject Ruby object key missing");
+               return Qnil;
+       }
+
+       return (VALUE) obj;
+}
+
 /* called by the child classes */
 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)
@@ -53,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;
 }
@@ -344,6 +366,38 @@ static VALUE c_pass_events_set (VALUE self, VALUE val)
        return Qnil;
 }
 
+/*
+ * call-seq:
+ *  e.repeat_events? => true or false
+ *
+ * Returns true if <i>e</i> repeats events to EvasObjects that are
+ * below itself, else returns false.
+ */
+static VALUE c_repeat_events_get (VALUE self)
+{
+       GET_OBJ (self, RbEvasObject, e);
+
+       return evas_object_repeat_events_get (e->real) ? Qtrue : Qfalse;
+}
+
+/*
+ * call-seq:
+ *  e.repeat_events(true or false)
+ *
+ * Sets whether <i>e</i> repeats events to EvasObjects that are
+ * below itself.
+ */
+static VALUE c_repeat_events_set (VALUE self, VALUE val)
+{
+       GET_OBJ (self, RbEvasObject, e);
+
+       CHECK_BOOL (val);
+
+       evas_object_repeat_events_set (e->real, val == Qtrue);
+
+       return Qnil;
+}
+
 /*
  * call-seq:
  *   e.raise => nil
@@ -419,20 +473,9 @@ static VALUE c_stack_below (VALUE self, VALUE target)
  */
 static VALUE c_above_get (VALUE self)
 {
-       Evas_Object *o;
-       void *obj;
-
        GET_OBJ (self, RbEvasObject, e);
 
-       if (!(o = evas_object_above_get (e->real)))
-               return Qnil;
-
-       if (!(obj = evas_object_data_get (o, RUBY_EVAS_OBJECT_KEY))) {
-               rb_raise (rb_eException, "EvasObject Ruby object key missing");
-               return Qnil;
-       }
-
-       return (VALUE) obj;
+       return TO_EVAS_OBJECT (evas_object_above_get (e->real));
 }
 
 /*
@@ -444,20 +487,19 @@ static VALUE c_above_get (VALUE self)
  */
 static VALUE c_below_get (VALUE self)
 {
-       Evas_Object *o;
-       void *obj;
-
        GET_OBJ (self, RbEvasObject, e);
 
-       if (!(o = evas_object_below_get (e->real)))
-               return Qnil;
+       return TO_EVAS_OBJECT (evas_object_below_get (e->real));
+}
 
-       if (!(obj = evas_object_data_get (o, RUBY_EVAS_OBJECT_KEY))) {
-               rb_raise (rb_eException, "EvasObject Ruby object key missing");
-               return Qnil;
-       }
+static VALUE c_userdata_get (VALUE self)
+{
+       GET_OBJ (self, RbEvasObject, e);
 
-       return (VALUE) obj;
+       if (NIL_P (e->userdata))
+               e->userdata = rb_hash_new ();
+
+       return e->userdata;
 }
 
 void Init_EvasObject (void)
@@ -483,12 +525,19 @@ void Init_EvasObject (void)
        rb_define_method (cEvasObject, "layer=", c_layer_set, 1);
        rb_define_method (cEvasObject, "get_color", c_get_color, 0);
        rb_define_method (cEvasObject, "set_color", c_set_color, 4);
-       rb_define_method (cEvasObject, "pass_events?", c_pass_events_get, 0);
-       rb_define_method (cEvasObject, "pass_events=", c_pass_events_set, 1);
+       rb_define_method (cEvasObject, "pass_events?",
+                         c_pass_events_get, 0);
+       rb_define_method (cEvasObject, "pass_events=",
+                         c_pass_events_set, 1);
+       rb_define_method (cEvasObject, "repeat_events?",
+                         c_repeat_events_get, 0);
+       rb_define_method (cEvasObject, "repeat_events=",
+                         c_repeat_events_set, 1);
        rb_define_method (cEvasObject, "raise", c_raise, 0);
        rb_define_method (cEvasObject, "lower", c_lower, 0);
        rb_define_method (cEvasObject, "stack_above", c_stack_above, 1);
        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);
 }