X-Git-Url: http://git.code-monkey.de/?p=ruby-edje.git;a=blobdiff_plain;f=src%2Frb_edje.c;h=1605ceb4a210837debf895f23feb4016b0636614;hp=50ba39b4369a613393ada20ff00e67098f65019e;hb=bdefff1f62f93747a4ea21a81f46507965852299;hpb=251fa1fd3a3b4949b4919bf377a9b73e23f0cf0e

diff --git a/src/rb_edje.c b/src/rb_edje.c
index 50ba39b..1605ceb 100644
--- a/src/rb_edje.c
+++ b/src/rb_edje.c
@@ -1,5 +1,5 @@
 /*
- * $Id: rb_edje.c 66 2004-08-12 19:37:52Z tilman $
+ * $Id: rb_edje.c 307 2005-03-23 17:30:30Z tilman $
  *
  * Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
  *
@@ -28,6 +28,7 @@
 #include "rb_edje.h"
 #include "rb_edje_main.h"
 #include "rb_part.h"
+#include "rb_messages.h"
 
 VALUE cEdje;
 
@@ -35,8 +36,11 @@ 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;
@@ -205,6 +210,9 @@ static VALUE c_part_get (VALUE self, VALUE name)
 		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);
@@ -222,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);
@@ -285,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 <i>signal</i>
  * is emitted by <i>source</i>.
+ * 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;
 }
@@ -375,6 +397,38 @@ 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)
+{
+	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);
@@ -389,9 +443,11 @@ 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);
 }