X-Git-Url: http://git.code-monkey.de/?p=ruby-edje.git;a=blobdiff_plain;f=src%2Frb_edje.c;h=a899ea466d7379086fe6e8d161bea437a12db4e2;hp=25be7482d724d756ebbf58dc1341c14b0edd8308;hb=fae1e0d0b39467848a15f5cf94dbf3aa8c25bc22;hpb=887790d08e623c56ce01230fb2889b2555f21ed2 diff --git a/src/rb_edje.c b/src/rb_edje.c index 25be748..a899ea4 100644 --- a/src/rb_edje.c +++ b/src/rb_edje.c @@ -1,6 +1,4 @@ /* - * $Id: rb_edje.c 139 2004-10-30 09:41:17Z tilman $ - * * Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de) * * This library is free software; you can redistribute it and/or @@ -19,6 +17,7 @@ */ #include +#include #include #include @@ -28,16 +27,19 @@ #include "rb_edje.h" #include "rb_edje_main.h" #include "rb_part.h" -#include "rb_messages.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); @@ -46,35 +48,54 @@ static void c_mark (RbEdje *e) static void c_free (RbEdje *e) { c_evas_object_free (&e->real, false); + free (e); edje_shutdown (); } +static VALUE c_alloc (VALUE klass) +{ + RbEdje *e = NULL; + + edje_init (); + + return Data_Make_Struct (klass, RbEdje, c_mark, c_free, e); +} + /* * call-seq: * Edje::Edje.new(evas) => edje * * Creates an Edje::Edje object. */ -static VALUE c_new (VALUE klass, VALUE evas) +static VALUE c_init (VALUE self, VALUE evas) { - VALUE self, argv[1]; - RbEdje *edje = NULL; - CHECK_CLASS (evas, cEvas); GET_OBJ (evas, RbEvas, e); + GET_OBJ (self, RbEdje, edje); - edje_init (); - - self = Data_Make_Struct (klass, RbEdje, c_mark, c_free, edje); + /* c_new_from_pointer() might already have initialized the pointer */ + if (!edje->real.real) + edje->real.real = edje_object_add (e->real); - 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; - rb_obj_call_init (self, 1, argv); + rb_call_super (1, &evas); + + return self; +} + +static VALUE c_new_from_pointer (VALUE klass, VALUE evas, VALUE ptr) +{ + VALUE self = rb_obj_alloc (klass); + + GET_OBJ (self, RbEdje, edje); + + edje->real.real = (Evas_Object *) ptr; + + rb_obj_call_init (self, 1, &evas); return self; } @@ -197,15 +218,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); @@ -223,6 +247,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); @@ -297,7 +324,7 @@ static void on_signal (void *data, Evas_Object *o, static VALUE c_on_signal (int argc, VALUE *argv, VALUE self) { VALUE signal, src, cb; - char *ssrc = "*"; + const char *ssrc = "*"; GET_OBJ (self, RbEdje, e); @@ -314,6 +341,10 @@ static VALUE c_on_signal (int argc, VALUE *argv, VALUE self) 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, @@ -396,30 +427,259 @@ static VALUE c_data_get (VALUE self, VALUE key) return s ? rb_str_new2 (s) : Qnil; } +static Edje_Message_Type get_msg_type (VALUE val) +{ + VALUE ary, entry; + Edje_Message_Type type; + int i, len; + + if (NIL_P (val)) + return EDJE_MESSAGE_NONE; + + if (!NIL_P (rb_check_string_type (val))) { + return EDJE_MESSAGE_STRING; + } else if (rb_obj_is_kind_of (val, rb_cFixnum)) { + return EDJE_MESSAGE_INT; + } else if (rb_obj_is_kind_of (val, rb_cFloat)) { + return EDJE_MESSAGE_FLOAT; + } else if (NIL_P (ary = rb_check_array_type (val))) + return EDJE_MESSAGE_NONE; + + len = RARRAY (ary)->len; + if (len <= 0) + return EDJE_MESSAGE_NONE; + + entry = rb_ary_entry (ary, 0); + + if (rb_obj_is_kind_of (entry, rb_cFixnum)) + return EDJE_MESSAGE_INT_SET; + else if (rb_obj_is_kind_of (entry, rb_cFloat)) + return EDJE_MESSAGE_FLOAT_SET; + else if (NIL_P (rb_check_string_type (entry))) + return EDJE_MESSAGE_NONE; + + /* first entry is a string. + * so if we only have one entry, it's a string set + */ + if (len == 1) + return EDJE_MESSAGE_STRING_SET; + + entry = rb_ary_entry (ary, 1); + + if (!NIL_P (rb_check_string_type (entry))) + type = EDJE_MESSAGE_STRING_SET; + else if (rb_obj_is_kind_of (entry, rb_cFixnum)) + type = len == 2 ? EDJE_MESSAGE_STRING_INT : EDJE_MESSAGE_STRING_INT_SET; + else if (rb_obj_is_kind_of (entry, rb_cFloat)) + type = len == 2 ? EDJE_MESSAGE_STRING_FLOAT :EDJE_MESSAGE_STRING_FLOAT_SET; + else + return EDJE_MESSAGE_NONE; + + switch (type) { + case EDJE_MESSAGE_STRING_SET: + for (i = 2; i < len; i++) { + entry = rb_ary_entry (ary, i); + if (NIL_P(rb_check_string_type (entry))) + return EDJE_MESSAGE_NONE; + } + + break; + case EDJE_MESSAGE_INT_SET: + case EDJE_MESSAGE_STRING_INT_SET: + for (i = 2; i < len; i++) { + entry = rb_ary_entry (ary, i); + if (!rb_obj_is_kind_of (entry, rb_cFixnum)) + return EDJE_MESSAGE_NONE; + } + + break; + case EDJE_MESSAGE_FLOAT_SET: + case EDJE_MESSAGE_STRING_FLOAT_SET: + for (i = 2; i < len; i++) { + entry = rb_ary_entry (ary, 2); + if (!rb_obj_is_kind_of (entry, rb_cFloat)) + return EDJE_MESSAGE_NONE; + } + + break; + default: + break; + } + + return type; +} + static VALUE c_send_message (VALUE self, VALUE msg) { - VALUE m; + Edje_Message_String msg_s; + Edje_Message_Int msg_i; + Edje_Message_Float msg_f; + Edje_Message_String_Set *s_set = NULL; + Edje_Message_Int_Set *i_set = NULL; + Edje_Message_Float_Set *f_set = NULL; + Edje_Message_String_Int si; + Edje_Message_String_Float sf; + Edje_Message_String_Int_Set *si_set = NULL; + Edje_Message_String_Float_Set *sf_set = NULL; Edje_Message_Type type; - int id; + void *data = NULL; + int id, i, len = 0; + bool free_data = false; + VALUE v, ary, entry; 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); + id = FIX2INT (rb_iv_get (msg, "@id")); + v = rb_iv_get (msg, "@value"); + + type = get_msg_type (v); + if (!NIL_P (ary = rb_check_array_type (v))) + len = RARRAY (ary)->len; + + switch (type) { + case EDJE_MESSAGE_NONE: + rb_raise (eEdjeError, "unsupported value"); + return Qnil; + case EDJE_MESSAGE_SIGNAL: + return Qnil; /* cannot happen */ + case EDJE_MESSAGE_STRING: + msg_s.str = StringValuePtr (v); + data = &msg_s; + break; + case EDJE_MESSAGE_INT: + msg_i.val = FIX2INT (v); + data = &msg_i; + break; + case EDJE_MESSAGE_FLOAT: + msg_f.val = NUM2DBL (v); + data = &msg_f; + break; + case EDJE_MESSAGE_STRING_SET: + s_set = malloc (sizeof (Edje_Message_String_Set) + ((len - 1) * sizeof (char *))); + s_set->count = len; + free_data = true; + + for (i = 0; i < len; i++) { + entry = rb_ary_entry (ary, i); + s_set->str[i] = StringValuePtr (entry); + } + + data = s_set; + + break; + case EDJE_MESSAGE_INT_SET: + i_set = malloc (sizeof (Edje_Message_Int_Set) + ((len - 1) * sizeof (int))); + i_set->count = len; + free_data = true; + + for (i = 0; i < len; i++) { + entry = rb_ary_entry (ary, i); + i_set->val[i] = FIX2INT (entry); + } + + data = i_set; + + break; + case EDJE_MESSAGE_FLOAT_SET: + f_set = malloc (sizeof (Edje_Message_Float_Set) + ((len - 1) * sizeof (double))); + f_set->count = len; + free_data = true; + + for (i = 0; i < len; i++) { + entry = rb_ary_entry (ary, i); + f_set->val[i] = NUM2DBL (entry); + } + + data = f_set; + + break; + case EDJE_MESSAGE_STRING_INT: + entry = rb_ary_entry (ary, 0); + si.str = StringValuePtr (entry); + entry = rb_ary_entry (ary, 1); + si.val = FIX2INT (entry); + + data = &si; + + break; + case EDJE_MESSAGE_STRING_FLOAT: + entry = rb_ary_entry (ary, 0); + sf.str = StringValuePtr (entry); + entry = rb_ary_entry (ary, 1); + sf.val = NUM2DBL (entry); + + data = &sf; + + break; + case EDJE_MESSAGE_STRING_INT_SET: + si_set = malloc (sizeof (Edje_Message_String_Int_Set) + ((len - 1) * sizeof (int))); + si_set->count = len - 1; + free_data = true; + + entry = rb_ary_entry (ary, 0); + si_set->str = StringValuePtr (entry); + + for (i = 1; i < len; i++) { + entry = rb_ary_entry (ary, i); + si_set->val[i - 1] = FIX2INT (entry); + } + + data = &si_set; + + break; + case EDJE_MESSAGE_STRING_FLOAT_SET: + sf_set = malloc (sizeof (Edje_Message_String_Float_Set) + ((len - 1) * sizeof (double))); + sf_set->count = len - 1; + free_data = true; + + entry = rb_ary_entry (ary, 0); + sf_set->str = StringValuePtr (entry); + + for (i = 1; i < len; i++) { + entry = rb_ary_entry (ary, i); + sf_set->val[i - 1] = NUM2DBL (entry); + } + + data = &sf_set; + + break; + } - edje_object_message_send (e->real.real, type, id, (void *) m); + edje_object_message_send (e->real.real, type, id, data); + + if (free_data) + free (data); return Qnil; } +static VALUE c_msg_init (int argc, VALUE *argv, VALUE self) +{ + VALUE id, val; + + if (argc == 2) + rb_scan_args (argc, argv, "11", &id, &val); + else + rb_scan_args (argc, argv, "1*", &id, &val); + + Check_Type (id, T_FIXNUM); + + rb_iv_set (self, "@id", id); + rb_iv_set (self, "@value", val); + + return self; +} + void Init_Edje (void) { cEdje = rb_define_class_under (mEdje, "Edje", cEvasObject); - rb_define_singleton_method (cEdje, "new", c_new, 1); + rb_define_alloc_func (cEdje, c_alloc); + rb_define_singleton_method (cEdje, "new_from_pointer", + c_new_from_pointer, 2); + rb_define_method (cEdje, "initialize", c_init, 1); rb_define_method (cEdje, "freeze", c_freeze, 0); rb_define_method (cEdje, "thaw", c_thaw, 0); rb_define_method (cEdje, "load", c_load, 2); @@ -436,4 +696,14 @@ void Init_Edje (void) 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); }