X-Git-Url: http://git.code-monkey.de/?p=ruby-edje.git;a=blobdiff_plain;f=src%2Frb_edje.c;h=1202b795d20bc953232823ef3f4e6bc57b81d2c7;hp=6e32824418a6764ba6bd9d970d692c6f78dd87b3;hb=9df644ecd3547f65ac0685ce46c6f2f6bb50d089;hpb=30fb3b8341f1f9ee89d0fc2a699401c98b4c9201
diff --git a/src/rb_edje.c b/src/rb_edje.c
index 6e32824..1202b79 100644
--- a/src/rb_edje.c
+++ b/src/rb_edje.c
@@ -1,5 +1,5 @@
/*
- * $Id: rb_edje.c 59 2004-08-10 14:10:31Z tilman $
+ * $Id: rb_edje.c 330 2005-04-28 15:38:47Z tilman $
*
* Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
*
@@ -30,13 +30,17 @@
#include "rb_part.h"
VALUE cEdje;
+static VALUE cMsg, eEdjeError;
static void c_mark (RbEdje *e)
{
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);
@@ -45,6 +49,7 @@ static void c_mark (RbEdje *e)
static void c_free (RbEdje *e)
{
c_evas_object_free (&e->real, false);
+ free (e);
edje_shutdown ();
}
@@ -68,8 +73,8 @@ static VALUE c_new (VALUE klass, VALUE evas)
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;
@@ -169,7 +174,8 @@ static VALUE c_get_size_max (VALUE self)
* call-seq:
* edje.part_exists?(part) => true or false
*
- * Returns true if edje has a part called part, else false.
+ * Returns true if edje has a part called part,
+ * else returns false.
*/
static VALUE c_part_exists_get (VALUE self, VALUE name)
{
@@ -195,15 +201,18 @@ static VALUE c_part_exists_get (VALUE self, VALUE name)
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);
@@ -221,6 +230,9 @@ static void on_text_changed (void *data, Evas_Object *eo,
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);
@@ -284,32 +296,43 @@ static void on_signal (void *data, Evas_Object *o,
/*
* call-seq:
- * edje.on_signal(signal, source) { |signal, source| block } => nil
+ * edje.on_signal(signal [, source]) { |signal, source| block } => nil
*
* Registers a callback that will get called when signal
* is emitted by source.
+ * If source is nil, "*" will be used instead.
* The block is passed two strings, signal and source, which identify
* the emission.
*/
-static VALUE c_on_signal (VALUE self, VALUE signal, VALUE src)
+static VALUE c_on_signal (int argc, VALUE *argv, VALUE self)
{
- VALUE cb;
+ VALUE signal, src, cb;
+ char *ssrc = "*";
GET_OBJ (self, RbEdje, e);
+ rb_scan_args (argc, argv, "11", &signal, &src);
+
Check_Type (signal, T_STRING);
- Check_Type (src, T_STRING);
+
+ if (!NIL_P (src)) {
+ Check_Type (src, T_STRING);
+ ssrc = StringValuePtr (src);
+ }
if (!rb_block_given_p ())
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,
StringValuePtr (signal),
- StringValuePtr (src), on_signal,
- (void *) cb);
+ ssrc, on_signal, (void *) cb);
return Qnil;
}
@@ -318,7 +341,7 @@ static VALUE c_on_signal (VALUE self, VALUE signal, VALUE src)
* call-seq:
* edje.play? => true or false
*
- * Returns true if edje is in play mode, else false.
+ * Returns true if edje is in play mode, else returns false.
*/
static VALUE c_play_get (VALUE self)
{
@@ -374,6 +397,74 @@ static VALUE c_animation_set (VALUE self, VALUE val)
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)
+{
+ Edje_Message_String s;
+ Edje_Message_Int i;
+ Edje_Message_Float f;
+ Edje_Message_Type type;
+ void *data;
+ VALUE v, tmp;
+
+ GET_OBJ (self, RbEdje, e);
+
+ CHECK_CLASS (msg, cMsg);
+
+ v = rb_iv_get (msg, "@value");
+
+ if (NIL_P (v)) {
+ rb_raise (eEdjeError, "value must not be nil");
+ return Qnil;
+ }
+
+ if (!NIL_P (tmp = rb_check_string_type (v))) {
+ type = EDJE_MESSAGE_STRING;
+ s.str = StringValuePtr (tmp);
+ data = &s;
+ } else if (rb_obj_is_kind_of (v, rb_cFixnum)) {
+ type = EDJE_MESSAGE_INT;
+ i.val = FIX2INT (v);
+ data = &i;
+ } else if (rb_obj_is_kind_of (v, rb_cFloat)) {
+ type = EDJE_MESSAGE_FLOAT;
+ f.val = NUM2DBL (v);
+ data = &v;
+ /* } else if (!NIL_P (tmp = rb_check_array_type (v))) { */
+ } else {
+ rb_raise (eEdjeError, "unsupported value");
+ }
+
+ edje_object_message_send (e->real.real, type,
+ NUM2INT (rb_iv_get (msg, "@id")), data);
+
+ return Qnil;
+}
+
+static VALUE c_msg_init (int argc, VALUE *argv, VALUE self)
+{
+ VALUE val;
+
+ rb_scan_args (argc, argv, "01", &val);
+
+ rb_iv_set (self, "@id", UINT2NUM (0));
+ rb_iv_set (self, "@value", val);
+
+ return self;
+}
+
void Init_Edje (void)
{
cEdje = rb_define_class_under (mEdje, "Edje", cEvasObject);
@@ -388,9 +479,21 @@ void Init_Edje (void)
rb_define_method (cEdje, "part", c_part_get, 1);
rb_define_method (cEdje, "on_text_changed", c_on_text_changed, 0);
rb_define_method (cEdje, "emit_signal", c_emit_signal, 2);
- rb_define_method (cEdje, "on_signal", c_on_signal, 2);
+ rb_define_method (cEdje, "on_signal", c_on_signal, -1);
rb_define_method (cEdje, "play?", c_play_get, 0);
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);
+
+ cMsg = rb_define_class_under (mEdje, "Message", rb_cObject);
+
+ rb_define_method (cMsg, "initialize", c_msg_init, -1);
+
+ rb_define_attr (cMsg, "id", 1, 1);
+ rb_define_attr (cMsg, "value", 1, 1);
+
+ eEdjeError = rb_define_class_under (mEdje, "EdjeError",
+ rb_eStandardError);
}