edje_init() and edje_shutdown() aren't exported anymore.

[ruby-edje.git] / src / rb_edje.c

diff --git a/src/rb_edje.c b/src/rb_edje.c
index d6f60f29e5fa73198f50eed7eca88ceb7e47e5f9..34b6dc534ac7daf44b3a5eba48f0e28a2e3d6327 100644 (file)
--- a/src/rb_edje.c
+++ b/src/rb_edje.c
@@ -1,5 +1,5 @@
 /*
- * $Id: rb_edje.c 19 2004-06-22 20:40:05Z tilman $
+ * $Id: rb_edje.c 28 2004-07-08 18:35:51Z tilman $
  *
  * Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
  *
@@ -44,17 +44,31 @@
                return Qnil; \
        }
 
-VALUE cEdje;
+static void c_free (Evas_Object **e)
+{
+       c_evas_object_free (e);
+
+       edje_shutdown ();
+}
 
 static VALUE c_new (VALUE klass, VALUE evas)
 {
        VALUE self, argv[1];
        Evas_Object **edje;
 
+       if (!rb_obj_is_kind_of (evas, cEvas)) {
+               rb_raise (rb_eTypeError,
+                         "wrong argument type %s (expected Evas)",
+                         rb_obj_classname (evas));
+               return Qnil;
+       }
+
        GET_OBJ (evas, Evas, e, "Evas");
 
+       edje_init ();
+
        self = Data_Make_Struct (klass, Evas_Object *, c_evas_object_mark,
-                                c_evas_object_free, edje);
+                                c_free, edje);
        *edje = edje_object_add (*e);
 
        argv[0] = evas;
@@ -230,6 +244,29 @@ static VALUE c_signal_emit (VALUE self, VALUE emission, VALUE source)
        return Qnil;
 }
 
+static void on_signal (void *data, Evas_Object *o,
+                       const char *emission, const char *src) {
+       rb_funcall ((VALUE) data, rb_intern ("call"), 1,
+                   rb_str_new2 (emission), rb_str_new2 (src));
+}
+
+static VALUE c_on_signal (VALUE self, VALUE signal, VALUE src)
+{
+       GET_OBJ (self, Evas_Object, e, "Edje");
+
+       Check_Type (signal, T_STRING);
+       Check_Type (src, T_STRING);
+
+       if (!rb_block_given_p ())
+               return Qnil;
+
+       edje_object_signal_callback_add (*e, StringValuePtr (signal),
+                                        StringValuePtr (src), on_signal,
+                                        (void *) rb_block_proc ());
+
+       return Qnil;
+}
+
 static VALUE c_play_get (VALUE self)
 {
        GET_OBJ (self, Evas_Object, e, "Edje");
@@ -268,7 +305,7 @@ static VALUE c_animation_set (VALUE self, VALUE val)
 
 void Init_Edje (void)
 {
-       cEdje = rb_define_class_under (mEdje, "Edje", cEvasObject);
+       VALUE cEdje = rb_define_class_under (mEdje, "Edje", cEvasObject);
 
        rb_define_singleton_method (cEdje, "new", c_new, 1);
        rb_define_method (cEdje, "load", c_load, 2);
@@ -282,9 +319,9 @@ void Init_Edje (void)
        rb_define_method (cEdje, "set_part_text", c_set_part_text, 2);
        rb_define_method (cEdje, "on_text_changed", c_on_text_changed, 0);
        rb_define_method (cEdje, "signal_emit", c_signal_emit, 1);
+       rb_define_method (cEdje, "on_signal", c_on_signal, 2);
        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);
 }
-