X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Frb_evas_object.c;h=22b03153f88988d5006940df84fd99239b16f914;hb=ab841e74c1011d7fdc2e793aae70578957a5bcc6;hp=6a4c5748588d8b6d62f5ced33c3b6f7236c69d2b;hpb=f372062dbc05ab13546a64d0d77026851388bc10;p=ruby-evas.git

diff --git a/src/rb_evas_object.c b/src/rb_evas_object.c
index 6a4c574..22b0315 100644
--- 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 350 2006-02-08 21:13:34Z 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;
 }
@@ -78,6 +85,17 @@ static VALUE c_inspect (VALUE self)
 	INSPECT (self, RbEvasObject);
 }
 
+static VALUE c_type_get (VALUE self)
+{
+	const char *s;
+
+	GET_OBJ (self, RbEvasObject, e);
+
+	s = evas_object_type_get (e->real);
+
+	return s ? rb_str_new2 (s) : Qnil;
+}
+
 /*
  * call-seq:
  *  e.delete => nil
@@ -204,6 +222,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
@@ -327,6 +375,23 @@ static VALUE c_set_color (VALUE self, VALUE r, VALUE g, VALUE b,
 	return Qnil;
 }
 
+static VALUE c_get_clip (VALUE self)
+{
+	GET_OBJ (self, RbEvasObject, e);
+
+	return TO_EVAS_OBJECT (evas_object_clip_get (e->real));
+}
+
+static VALUE c_set_clip (VALUE self, VALUE clip)
+{
+	GET_OBJ (self, RbEvasObject, e);
+	GET_OBJ (clip, RbEvasObject, e2);
+
+	evas_object_clip_set (e->real, e2->real);
+
+	return Qnil;
+}
+
 /*
  * call-seq:
  *  e.pass_events? => true or false
@@ -466,8 +531,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 +545,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",
@@ -498,6 +569,7 @@ void Init_EvasObject (void)
 	                          "new", NULL, 0);
 	rb_define_method (cEvasObject, "initialize", c_init, 1);
 	rb_define_method (cEvasObject, "inspect", c_inspect, 0);
+	rb_define_method (cEvasObject, "type", c_type_get, 0);
 	rb_define_method (cEvasObject, "delete", c_delete, 0);
 	rb_define_method (cEvasObject, "resize", c_resize, 2);
 	rb_define_method (cEvasObject, "move", c_move, 2);
@@ -505,6 +577,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);
@@ -512,6 +586,8 @@ 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, "clip", c_get_clip, 0);
+	rb_define_method (cEvasObject, "clip=", c_set_clip, 1);
 	rb_define_method (cEvasObject, "pass_events?",
 	                  c_pass_events_get, 0);
 	rb_define_method (cEvasObject, "pass_events=",
@@ -526,4 +602,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);
 }