X-Git-Url: http://git.code-monkey.de/?p=ruby-edje.git;a=blobdiff_plain;f=src%2Frb_edje.c;h=57509cfc37044e2e0bff0b69e831017bd64556f3;hp=c85e594bed7d4e3fe3375023a99dbb66c63fb237;hb=3a9c35673bdd0dc885f7474865be23d6d0061789;hpb=fc473416558a8d1cbccdabfe9ab5fae2a1e987fa diff --git a/src/rb_edje.c b/src/rb_edje.c index c85e594..57509cf 100644 --- a/src/rb_edje.c +++ b/src/rb_edje.c @@ -1,5 +1,5 @@ /* - * $Id: rb_edje.c 48 2004-07-31 13:46:07Z tilman $ + * $Id: rb_edje.c 51 2004-08-01 10:19:02Z tilman $ * * Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de) * @@ -21,19 +21,14 @@ #include #include -#include -#include +#include +#include #define __RB_EDJE_C +#include "rb_edje.h" #include "rb_edje_main.h" #include "rb_part.h" -typedef struct { - Evas_Object *real; - VALUE parts; - VALUE callbacks; -} RbEdje; - VALUE cEdje; static void c_mark (RbEdje *e) @@ -42,11 +37,14 @@ static void c_mark (RbEdje *e) rb_gc_mark (e->parts); rb_gc_mark (e->callbacks); + + if (!NIL_P (e->on_text_changed_cb)) + rb_gc_mark (e->on_text_changed_cb); } static void c_free (RbEdje *e) { - c_evas_object_free (&e->real); + c_evas_object_free (&e->real, false); edje_shutdown (); } @@ -54,18 +52,19 @@ static void c_free (RbEdje *e) static VALUE c_new (VALUE klass, VALUE evas) { VALUE self, argv[1]; - RbEdje *edje; + RbEdje *edje = NULL; CHECK_CLASS (evas, cEvas); - GET_OBJ (evas, Evas *, e); + GET_OBJ (evas, RbEvas, e); edje_init (); self = Data_Make_Struct (klass, RbEdje, c_mark, c_free, edje); - edje->real = edje_object_add (*e); + edje->real.real = edje_object_add (e->real); edje->parts = rb_hash_new (); edje->callbacks = rb_ary_new (); + edje->on_text_changed_cb = Qnil; argv[0] = evas; rb_obj_call_init (self, 1, argv); @@ -77,7 +76,7 @@ static VALUE c_freeze (VALUE self) { GET_OBJ (self, RbEdje, e); - edje_object_freeze (e->real); + edje_object_freeze (e->real.real); return Qnil; } @@ -86,7 +85,7 @@ static VALUE c_thaw (VALUE self) { GET_OBJ (self, RbEdje, e); - edje_object_thaw (e->real); + edje_object_thaw (e->real.real); return Qnil; } @@ -98,7 +97,7 @@ static VALUE c_load (VALUE self, VALUE eet, VALUE group) Check_Type (eet, T_STRING); Check_Type (group, T_STRING); - if (!edje_object_file_set (e->real, StringValuePtr (eet), + if (!edje_object_file_set (e->real.real, StringValuePtr (eet), StringValuePtr (group))) rb_raise (rb_eException, "Cannot load eet"); @@ -111,7 +110,7 @@ static VALUE c_get_size_min (VALUE self) GET_OBJ (self, RbEdje, e); - edje_object_size_min_get (e->real, &w, &h); + edje_object_size_min_get (e->real.real, &w, &h); return rb_ary_new3 (2, INT2FIX (w), INT2FIX (h)); } @@ -122,7 +121,7 @@ static VALUE c_get_size_max (VALUE self) GET_OBJ (self, RbEdje, e); - edje_object_size_max_get (e->real, &w, &h); + edje_object_size_max_get (e->real.real, &w, &h); return rb_ary_new3 (2, INT2FIX (w), INT2FIX (h)); } @@ -135,7 +134,7 @@ static VALUE c_part_exists_get (VALUE self, VALUE name) Check_Type (name, T_STRING); - r = edje_object_part_exists (e->real, StringValuePtr (name)); + r = edje_object_part_exists (e->real.real, StringValuePtr (name)); return r ? Qtrue : Qfalse; } @@ -145,10 +144,9 @@ static VALUE c_part_get (VALUE self, VALUE name) VALUE part; GET_OBJ (self, RbEdje, e); - Check_Type (name, T_STRING); - if (!edje_object_part_exists (e->real, StringValuePtr (name))) + if (!edje_object_part_exists (e->real.real, StringValuePtr (name))) return Qnil; if (NIL_P (part = rb_hash_aref (e->parts, name))) { @@ -159,11 +157,22 @@ static VALUE c_part_get (VALUE self, VALUE name) return part; } -static void on_text_changed (void *data, Evas_Object *e, - const char *part) +static void on_text_changed (void *data, Evas_Object *eo, + const char *part_name) { - rb_funcall ((VALUE) data, rb_intern ("call"), 1, - rb_str_new2 (part)); + VALUE self = (VALUE) data, part, name; + + GET_OBJ (self, RbEdje, e); + + name = rb_str_new2 (part_name); + + if (NIL_P (part = rb_hash_aref (e->parts, name))) { + part = TO_PART (self, name); + rb_hash_aset (e->parts, name, part); + } + + rb_funcall (e->on_text_changed_cb, + rb_intern ("call"), 1, part); } static VALUE c_on_text_changed (VALUE self) @@ -173,8 +182,10 @@ static VALUE c_on_text_changed (VALUE self) if (!rb_block_given_p ()) return Qnil; - edje_object_text_change_cb_set (e->real, on_text_changed, - (void *) rb_block_proc ()); + e->on_text_changed_cb = rb_block_proc (); + + edje_object_text_change_cb_set (e->real.real, on_text_changed, + (void *) self); return Qnil; } @@ -186,7 +197,7 @@ static VALUE c_emit_signal (VALUE self, VALUE emission, VALUE source) Check_Type (emission, T_STRING); Check_Type (source, T_STRING); - edje_object_signal_emit (e->real, StringValuePtr (emission), + edje_object_signal_emit (e->real.real, StringValuePtr (emission), StringValuePtr (source)); return Qnil; @@ -214,7 +225,8 @@ static VALUE c_on_signal (VALUE self, VALUE signal, VALUE src) cb = rb_block_proc (); rb_ary_push (e->callbacks, cb); - edje_object_signal_callback_add (e->real, StringValuePtr (signal), + edje_object_signal_callback_add (e->real.real, + StringValuePtr (signal), StringValuePtr (src), on_signal, (void *) cb); @@ -225,7 +237,7 @@ static VALUE c_play_get (VALUE self) { GET_OBJ (self, RbEdje, e); - return edje_object_play_get (e->real) ? Qtrue : Qfalse; + return edje_object_play_get (e->real.real) ? Qtrue : Qfalse; } static VALUE c_play_set (VALUE self, VALUE val) @@ -234,7 +246,7 @@ static VALUE c_play_set (VALUE self, VALUE val) CHECK_BOOL(val); - edje_object_play_set (e->real, val == Qtrue); + edje_object_play_set (e->real.real, val == Qtrue); return Qnil; } @@ -243,7 +255,7 @@ static VALUE c_animation_get (VALUE self) { GET_OBJ (self, RbEdje, e); - return edje_object_animation_get (e->real) ? Qtrue : Qfalse; + return edje_object_animation_get (e->real.real) ? Qtrue : Qfalse; } static VALUE c_animation_set (VALUE self, VALUE val) @@ -252,7 +264,7 @@ static VALUE c_animation_set (VALUE self, VALUE val) CHECK_BOOL(val); - edje_object_animation_set (e->real, val == Qtrue); + edje_object_animation_set (e->real.real, val == Qtrue); return Qnil; }