X-Git-Url: http://git.code-monkey.de/?p=ruby-edje.git;a=blobdiff_plain;f=src%2Frb_part.c;h=bfc664cd903e4e8e0de0b1f6273a3800a19a1f62;hp=381d04962b2b07d07954c4b85c98295ed071bfe3;hb=a405c57ad4ce8be9ab99b97464cbfe69a00853a3;hpb=fc473416558a8d1cbccdabfe9ab5fae2a1e987fa diff --git a/src/rb_part.c b/src/rb_part.c index 381d049..bfc664c 100644 --- a/src/rb_part.c +++ b/src/rb_part.c @@ -1,5 +1,5 @@ /* - * $Id: rb_part.c 48 2004-07-31 13:46:07Z tilman $ + * $Id: rb_part.c 113 2004-10-10 10:00:07Z tilman $ * * Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de) * @@ -21,8 +21,6 @@ #include #include -#include -#include #include "rb_edje_main.h" #include "rb_edje.h" @@ -52,32 +50,14 @@ static inline VALUE GET_EDJE (VALUE o) return rb_ivar_get (o, id); } -static void c_mark (VALUE *self) -{ - rb_gc_mark (GET_EDJE (*self)); -} - -static void c_free (VALUE *self) -{ - edje_shutdown (); - - free (self); -} - VALUE TO_PART (VALUE edje, VALUE name) { - VALUE self, *self2; + VALUE self; CHECK_CLASS (edje, cEdje); Check_Type (name, T_STRING); - edje_init (); - - /* we only use Data_Make_Struct to be able to specify - * mark and sweep hooks - */ - self = Data_Make_Struct (cPart, VALUE, c_mark, c_free, self2); - self2 = &self; + self = rb_obj_alloc (cPart); rb_iv_set (self, "@edje", edje); rb_iv_set (self, "@name", rb_str_dup (name)); @@ -87,13 +67,19 @@ VALUE TO_PART (VALUE edje, VALUE name) return self; } -static VALUE c_get_geometry (VALUE self) +/* + * call-seq: + * part.geometry => array + * + * Returns an array containing the geometry of part. + */ +static VALUE c_geometry_get (VALUE self) { int x = 0, y = 0, w = 0, h = 0; - GET_OBJ (GET_EDJE (self), Evas_Object *, e); + GET_OBJ (GET_EDJE (self), RbEdje, e); - edje_object_part_geometry_get (*e, GET_NAME (self), + edje_object_part_geometry_get (e->real.real, GET_NAME (self), (Evas_Coord *) &x, (Evas_Coord *) &y, (Evas_Coord *) &w, @@ -103,90 +89,137 @@ static VALUE c_get_geometry (VALUE self) INT2FIX (y), INT2FIX (h)); } +/* + * call-seq: + * part.swallow(evasobject) => nil + * + * Swallows an Evas::EvasObject into part. + */ static VALUE c_swallow (VALUE self, VALUE target) { - GET_OBJ (GET_EDJE (self), Evas_Object *, e); + GET_OBJ (GET_EDJE (self), RbEdje, e); CHECK_CLASS (target, cEvasObject); - GET_OBJ (target, Evas_Object *, target2); + GET_OBJ (target, RbEvasObject, t); - edje_object_part_swallow (*e, GET_NAME (self), *target2); + edje_object_part_swallow (e->real.real, GET_NAME (self), t->real); + rb_iv_set (self, "swallowed_obj", target); return Qnil; } +/* + * call-seq: + * part.unswallow => nil + * + * Unswallows the Evas::EvasObject swallowed by + * part. + */ static VALUE c_unswallow (VALUE self) { Evas_Object *o; - GET_OBJ (GET_EDJE (self), Evas_Object *, e); + GET_OBJ (GET_EDJE (self), RbEdje, e); - if (!(o = edje_object_part_swallow_get (*e, GET_NAME (self)))) { + o = edje_object_part_swallow_get (e->real.real, GET_NAME (self)); + if (!o) { rb_raise (rb_eException, "Part didn't swallow an EvasObject"); return Qnil; } - edje_object_part_unswallow (*e, o); + edje_object_part_unswallow (e->real.real, o); + rb_iv_set (self, "swallowed_obj", Qnil); return Qnil; } +/* + * call-seq: + * part.swallowed_object => evasobject or nil + * + * Returns the Evas::EvasObject swallowed by + * part or nil if part didn't swallow an + * Evas::EvasObject. + */ static VALUE c_swallowed_object_get (VALUE self) { Evas_Object *o; - void *obj; - GET_OBJ (GET_EDJE (self), Evas_Object *, e); + GET_OBJ (GET_EDJE (self), RbEdje, e); - if (!(o = edje_object_part_swallow_get (*e, GET_NAME (self)))) + o = edje_object_part_swallow_get (e->real.real, GET_NAME (self)); + 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; + return TO_EVAS_OBJECT (o); } +/* + * call-seq: + * part.text => string + * + * Returns the text of part. + */ static VALUE c_text_get (VALUE self) { const char *s; - GET_OBJ (GET_EDJE (self), Evas_Object *, e); + GET_OBJ (GET_EDJE (self), RbEdje, e); - if (!(s = edje_object_part_text_get (*e, GET_NAME (self)))) - return Qnil; - else - return rb_str_new2 (s); + s = edje_object_part_text_get (e->real.real, GET_NAME (self)); + + return s ? rb_str_new2 (s) : Qnil; } +/* + * call-seq: + * part.text(string) + * + * Sets the text of part. + */ static VALUE c_text_set (VALUE self, VALUE text) { - GET_OBJ (GET_EDJE (self), Evas_Object *, e); + GET_OBJ (GET_EDJE (self), RbEdje, e); Check_Type (text, T_STRING); - edje_object_part_text_set (*e, GET_NAME (self), + edje_object_part_text_set (e->real.real, GET_NAME (self), StringValuePtr (text)); return Qnil; } +/* + * call-seq: + * part.get_drag_value => array + * + * Returns the drag value of part. + * + * part.set_drag_value(1.5, 2.5) #=> nil + * part.get_drag_value #=> [1.5, 2.5] + */ static VALUE c_get_drag_value (VALUE self) { double dx = 0, dy = 0; - GET_OBJ (GET_EDJE (self), Evas_Object *, e); + GET_OBJ (GET_EDJE (self), RbEdje, e); - edje_object_part_drag_value_get (*e, GET_NAME (self), &dx, &dy); + edje_object_part_drag_value_get (e->real.real, GET_NAME (self), &dx, &dy); return rb_ary_new3 (2, rb_float_new (dx), rb_float_new (dy)); } +/* + * call-seq: + * part.set_drag_value(dx, dy) => nil + * + * Sets the drag value of part. + * + * part.set_drag_value(1.5, 2.5) #=> nil + */ static VALUE c_set_drag_value (VALUE self, VALUE dx, VALUE dy) { - GET_OBJ (GET_EDJE (self), Evas_Object *, e); + GET_OBJ (GET_EDJE (self), RbEdje, e); if (!FIXNUM_P (dx)) Check_Type (dx, T_FLOAT); @@ -194,7 +227,7 @@ static VALUE c_set_drag_value (VALUE self, VALUE dx, VALUE dy) if (!FIXNUM_P (dy)) Check_Type (dy, T_FLOAT); - edje_object_part_drag_value_set (*e, GET_NAME (self), + edje_object_part_drag_value_set (e->real.real, GET_NAME (self), NUM2DBL (dx), NUM2DBL (dy)); return Qnil; @@ -210,13 +243,13 @@ void Init_Part (void) /* not publically instantiable yet */ rb_define_private_method (rb_singleton_class (cPart), "new", NULL, 0); - rb_define_method (cPart, "get_geometry", c_get_geometry, 0); + rb_define_method (cPart, "geometry", c_geometry_get, 0); rb_define_method (cPart, "swallow", c_swallow, 1); rb_define_method (cPart, "unswallow", c_unswallow, 1); rb_define_method (cPart, "swallowed_object", c_swallowed_object_get, 0); rb_define_method (cPart, "text", c_text_get, 0); rb_define_method (cPart, "text=", c_text_set, 1); - rb_define_method (cPart, "get_drag_value", c_get_drag_value, 2); + rb_define_method (cPart, "get_drag_value", c_get_drag_value, 0); rb_define_method (cPart, "set_drag_value", c_set_drag_value, 2); }