/*
- * $Id: rb_edje.c 96 2004-08-23 15:21:41Z tilman $
+ * $Id: rb_edje.c 328 2005-04-28 07:44:46Z tilman $
*
* Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
*
#include "rb_edje.h"
#include "rb_edje_main.h"
#include "rb_part.h"
+#include "rb_messages.h"
VALUE cEdje;
{
c_evas_object_mark (&e->real);
- rb_gc_mark (e->parts);
- rb_gc_mark (e->callbacks);
+ if (!NIL_P (e->parts))
+ rb_gc_mark (e->parts);
+
+ if (!NIL_P (e->callbacks))
+ 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, false);
+ free (e);
edje_shutdown ();
}
self = Data_Make_Struct (klass, RbEdje, c_mark, c_free, edje);
edje->real.real = edje_object_add (e->real);
- edje->parts = rb_hash_new ();
- edje->callbacks = rb_ary_new ();
+ edje->parts = Qnil;
+ edje->callbacks = Qnil;
edje->on_text_changed_cb = Qnil;
argv[0] = evas;
static VALUE c_part_get (VALUE self, VALUE name)
{
VALUE part;
+ const char *cname = StringValuePtr (name);
GET_OBJ (self, RbEdje, e);
- Check_Type (name, T_STRING);
- if (!edje_object_part_exists (e->real.real, StringValuePtr (name))) {
- rb_raise (rb_eException, "Unknown part name");
+ if (!edje_object_part_exists (e->real.real, cname)) {
+ rb_raise (rb_eException, "Unknown part name - %s", cname);
return Qnil;
}
+ if (NIL_P (e->parts))
+ e->parts = rb_hash_new ();
+
if (NIL_P (part = rb_hash_aref (e->parts, name))) {
part = TO_PART (self, name);
rb_hash_aset (e->parts, name, part);
name = rb_str_new2 (part_name);
+ if (NIL_P (e->parts))
+ e->parts = rb_hash_new ();
+
if (NIL_P (part = rb_hash_aref (e->parts, name))) {
part = TO_PART (self, name);
rb_hash_aset (e->parts, name, part);
return Qnil;
cb = rb_block_proc ();
+
+ if (NIL_P (e->callbacks))
+ e->callbacks = rb_ary_new ();
+
rb_ary_push (e->callbacks, cb);
edje_object_signal_callback_add (e->real.real,
return Qnil;
}
+static VALUE c_data_get (VALUE self, VALUE key)
+{
+ const char *s;
+
+ GET_OBJ (self, RbEdje, e);
+
+ Check_Type (key, T_STRING);
+
+ s = edje_object_data_get (e->real.real, StringValuePtr (key));
+
+ return s ? rb_str_new2 (s) : Qnil;
+}
+
+static VALUE c_send_message (VALUE self, VALUE msg)
+{
+ VALUE m;
+ Edje_Message_Type type;
+ int id;
+
+ GET_OBJ (self, RbEdje, e);
+
+ CHECK_CLASS (msg, cMsg);
+
+ type = NUM2INT (rb_iv_get (msg, "@type"));
+ id = NUM2INT (rb_iv_get (msg, "@id"));
+ m = rb_funcall (msg, rb_intern ("serialize"), 0, NULL);
+
+ edje_object_message_send (e->real.real, type, id, (void *) m);
+
+ return Qnil;
+}
+
void Init_Edje (void)
{
cEdje = rb_define_class_under (mEdje, "Edje", cEvasObject);
rb_define_method (cEdje, "play=", c_play_set, 1);
rb_define_method (cEdje, "animation?", c_animation_get, 0);
rb_define_method (cEdje, "animation=", c_animation_set, 1);
+ rb_define_method (cEdje, "data", c_data_get, 1);
+ rb_define_method (cEdje, "send_message", c_send_message, 1);
}