X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Frb_evas_object.c;h=63e3cc4eb2e65f1fcd4f0e65ed844955b2f5a590;hb=50d46594990dc1d3e518a2c808b7f51de32d6dda;hp=6c0a90f99498f4d6ea7f68c908765de73bd7b3bc;hpb=31278d5bfe44418ddc64610ff049a46990b7a5f8;p=ruby-evas.git

diff --git a/src/rb_evas_object.c b/src/rb_evas_object.c
index 6c0a90f..63e3cc4 100644
--- 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 314 2005-04-07 18:23:42Z 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;
 }
@@ -189,6 +211,36 @@ static VALUE c_visible_get (VALUE self)
 	return evas_object_visible_get (e->real) ? Qtrue : Qfalse;
 }
 
+/*
+ * call-seq:
+ *  e.focused? => true or false
+ *
+ * Returns true if <i>e</i> is focused, else returns false.
+ */
+static VALUE c_focused_get (VALUE self)
+{
+	GET_OBJ (self, RbEvasObject, e);
+
+	return evas_object_focus_get (e->real) ? Qtrue : Qfalse;
+}
+
+/*
+ * call-seq:
+ *  e.focused(true or false)
+ *
+ * (Un)focuses <i>e</i>.
+ */
+static VALUE c_focused_set (VALUE self, VALUE val)
+{
+	GET_OBJ (self, RbEvasObject, e);
+
+	CHECK_BOOL (val);
+
+	evas_object_focus_set (e->real, val == Qtrue);
+
+	return Qnil;
+}
+
 /*
  * call-seq:
  *  e.evas => evas
@@ -344,6 +396,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 +503,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 +517,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)
@@ -476,6 +548,8 @@ void Init_EvasObject (void)
 	rb_define_method (cEvasObject, "show", c_show, 0);
 	rb_define_method (cEvasObject, "hide", c_hide, 0);
 	rb_define_method (cEvasObject, "visible?", c_visible_get, 0);
+	rb_define_method (cEvasObject, "focused?", c_focused_get, 0);
+	rb_define_method (cEvasObject, "focused=", c_focused_set, 1);
 	rb_define_method (cEvasObject, "evas", c_evas_get, 0);
 	rb_define_method (cEvasObject, "name", c_name_get, 0);
 	rb_define_method (cEvasObject, "name=", c_name_set, 1);
@@ -483,12 +557,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);
 }