X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Frb_evas_object.c;h=6e93a8fe3bec6fc5eaae14243988e7d918171d40;hb=e012a51b703ddd23c407d308602246d07ff73d2e;hp=e465bfc4dc7520de75937680ad3e8310491ced2f;hpb=1f6059ba8be27832fc4b6f88c99548e39f4264cb;p=ruby-evas.git

diff --git a/src/rb_evas_object.c b/src/rb_evas_object.c
index e465bfc..6e93a8f 100644
--- a/src/rb_evas_object.c
+++ b/src/rb_evas_object.c
@@ -1,5 +1,5 @@
 /*
- * $Id: rb_evas_object.c 58 2004-08-10 14:10:02Z 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;
 }
@@ -180,7 +202,7 @@ static VALUE c_hide (VALUE self)
  * call-seq:
  *  e.visible? => true or false
  *
- * Returns true if <i>e</i> is visible, else false.
+ * Returns true if <i>e</i> is visible, else returns false.
  */
 static VALUE c_visible_get (VALUE self)
 {
@@ -317,7 +339,7 @@ static VALUE c_set_color (VALUE self, VALUE r, VALUE g, VALUE b,
  *  e.pass_events? => true or false
  *
  * Returns true if <i>e</i> passes events on to EvasObjects that are
- * below itself, else false.
+ * below itself, else returns false.
  */
 static VALUE c_pass_events_get (VALUE 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);
 }