X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Frb_evas_object.c;h=63cf9ba9cc3ff82af58d2648df7651cf2a4d3e90;hb=b8652316f7e476cc54a9091b81066a8393f0baa1;hp=c2d39af4f9c7661dd90e69a6638e98f80620cdf6;hpb=500e6a3cfce4f63197eed8805f206d0fb825daaa;p=ruby-evas.git

diff --git a/src/rb_evas_object.c b/src/rb_evas_object.c
index c2d39af..63cf9ba 100644
--- a/src/rb_evas_object.c
+++ b/src/rb_evas_object.c
@@ -1,5 +1,5 @@
 /*
- * $Id: rb_evas_object.c 302 2005-03-22 17:41:35Z tilman $
+ * $Id: rb_evas_object.c 344 2005-05-08 14:37:30Z tilman $
  *
  * Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
  *
@@ -52,6 +52,9 @@ void c_evas_object_mark (RbEvasObject *e)
 
 	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)
@@ -82,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
@@ -208,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
@@ -489,6 +533,16 @@ static VALUE c_below_get (VALUE self)
 	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 +552,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 +560,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);
@@ -526,4 +583,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);
 }