X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fecore_evas%2Frb_ecore_evas.c;h=7c78a267426b68de74a7acb0f45120703d923c6a;hb=773ea0f0b86cf8d4c738d3147eebc9b24f68114a;hp=18ac0e02d00992bf0d81d9a89171718f6cb71590;hpb=f3e4005cf0cfdefa25cfd5187a67a4f456fe697f;p=ruby-ecore.git diff --git a/src/ecore_evas/rb_ecore_evas.c b/src/ecore_evas/rb_ecore_evas.c index 18ac0e0..7c78a26 100644 --- a/src/ecore_evas/rb_ecore_evas.c +++ b/src/ecore_evas/rb_ecore_evas.c @@ -1,5 +1,5 @@ /* - * $Id: rb_ecore_evas.c 25 2004-06-26 23:07:01Z tilman $ + * $Id: rb_ecore_evas.c 30 2004-07-10 14:05:30Z tilman $ * * Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de) * @@ -20,19 +20,22 @@ #include +#include #include #include #include "rb_ecore_evas_main.h" #include "rb_ecore_evas.h" -#define GET_OBJ(obj, type, o, desc) \ +#define GET_OBJ(obj, type, o) \ type **(o) = NULL; \ \ Data_Get_Struct ((obj), type *, (o)); \ \ if (!*(o)) { \ - rb_raise (rb_eException, desc " destroyed already"); \ + rb_raise (rb_eException, \ + "%s destroyed already", \ + rb_obj_classname ((obj))); \ return Qnil; \ } @@ -44,30 +47,41 @@ return Qnil; \ } +#define INSPECT(obj, type) \ + char buf[128]; \ +\ + GET_OBJ (obj, type, o); \ +\ + snprintf (buf, sizeof (buf), \ + "#<%s:%p ptr=%p>", rb_obj_classname ((obj)), \ + (void *) obj, *o); \ +\ + return rb_str_new2 (buf); + +static VALUE evases; + /* called by the child classes */ void c_ecore_evas_free (Ecore_Evas **ee) { if (*ee) ecore_evas_free (*ee); + rb_hash_aset (evases, INT2NUM ((long) ee), Qnil); + + ecore_evas_shutdown (); + ecore_shutdown (); + free (ee); } static VALUE c_inspect (VALUE self) { - char buf[128]; - - GET_OBJ (self, Ecore_Evas, ee, "EcoreEvas"); - - snprintf (buf, sizeof (buf), "#", - (void *) self, *ee); - - return rb_str_new2 (buf); + INSPECT (self, Ecore_Evas); } static VALUE c_show (VALUE self) { - GET_OBJ (self, Ecore_Evas, ee, "EcoreEvas"); + GET_OBJ (self, Ecore_Evas, ee); ecore_evas_show (*ee); @@ -76,7 +90,7 @@ static VALUE c_show (VALUE self) static VALUE c_hide (VALUE self) { - GET_OBJ (self, Ecore_Evas, ee, "EcoreEvas"); + GET_OBJ (self, Ecore_Evas, ee); ecore_evas_hide (*ee); @@ -85,14 +99,14 @@ static VALUE c_hide (VALUE self) static VALUE c_visible_get (VALUE self) { - GET_OBJ (self, Ecore_Evas, ee, "EcoreEvas"); + GET_OBJ (self, Ecore_Evas, ee); return ecore_evas_visibility_get (*ee) ? Qtrue : Qfalse; } static VALUE c_raise (VALUE self) { - GET_OBJ (self, Ecore_Evas, ee, "EcoreEvas"); + GET_OBJ (self, Ecore_Evas, ee); ecore_evas_raise (*ee); @@ -101,7 +115,7 @@ static VALUE c_raise (VALUE self) static VALUE c_lower (VALUE self) { - GET_OBJ (self, Ecore_Evas, ee, "EcoreEvas"); + GET_OBJ (self, Ecore_Evas, ee); ecore_evas_lower (*ee); @@ -110,14 +124,14 @@ static VALUE c_lower (VALUE self) static VALUE c_layer_get (VALUE self) { - GET_OBJ (self, Ecore_Evas, ee, "EcoreEvas"); + GET_OBJ (self, Ecore_Evas, ee); return INT2FIX (ecore_evas_layer_get (*ee)); } static VALUE c_layer_set (VALUE self, VALUE val) { - GET_OBJ (self, Ecore_Evas, ee, "EcoreEvas"); + GET_OBJ (self, Ecore_Evas, ee); Check_Type (val, T_FIXNUM); @@ -128,16 +142,23 @@ static VALUE c_layer_set (VALUE self, VALUE val) static VALUE c_evas (VALUE self) { - GET_OBJ (self, Ecore_Evas, ee, "EcoreEvas"); + VALUE evas; - return TO_EVAS (self, ecore_evas_get (*ee)); + GET_OBJ (self, Ecore_Evas, ee); + + if (NIL_P (evas = rb_hash_aref (evases, INT2NUM ((long) (ee))))) { + evas = TO_EVAS (self, ecore_evas_get (*ee)); + rb_hash_aset (evases, INT2NUM ((long) ee), evas); + } + + return evas; } static VALUE c_get_size_min (VALUE self) { int w = 0, h = 0; - GET_OBJ (self, Ecore_Evas, ee, "EcoreEvas"); + GET_OBJ (self, Ecore_Evas, ee); ecore_evas_size_min_get (*ee, &w, &h); @@ -146,7 +167,7 @@ static VALUE c_get_size_min (VALUE self) static VALUE c_set_size_min (VALUE self, VALUE w, VALUE h) { - GET_OBJ (self, Ecore_Evas, ee, "EcoreEvas"); + GET_OBJ (self, Ecore_Evas, ee); Check_Type (w, T_FIXNUM); Check_Type (h, T_FIXNUM); @@ -160,7 +181,7 @@ static VALUE c_get_size_max (VALUE self) { int w = 0, h = 0; - GET_OBJ (self, Ecore_Evas, ee, "EcoreEvas"); + GET_OBJ (self, Ecore_Evas, ee); ecore_evas_size_max_get (*ee, &w, &h); @@ -169,7 +190,7 @@ static VALUE c_get_size_max (VALUE self) static VALUE c_set_size_max (VALUE self, VALUE w, VALUE h) { - GET_OBJ (self, Ecore_Evas, ee, "EcoreEvas"); + GET_OBJ (self, Ecore_Evas, ee); Check_Type (w, T_FIXNUM); Check_Type (h, T_FIXNUM); @@ -181,7 +202,7 @@ static VALUE c_set_size_max (VALUE self, VALUE w, VALUE h) static VALUE c_move (VALUE self, VALUE x, VALUE y) { - GET_OBJ (self, Ecore_Evas, ee, "EcoreEvas"); + GET_OBJ (self, Ecore_Evas, ee); Check_Type (x, T_FIXNUM); Check_Type (y, T_FIXNUM); @@ -193,7 +214,7 @@ static VALUE c_move (VALUE self, VALUE x, VALUE y) static VALUE c_resize (VALUE self, VALUE w, VALUE h) { - GET_OBJ (self, Ecore_Evas, ee, "EcoreEvas"); + GET_OBJ (self, Ecore_Evas, ee); Check_Type (w, T_FIXNUM); Check_Type (h, T_FIXNUM); @@ -207,7 +228,7 @@ static VALUE c_title_get (VALUE self) { const char *tmp; - GET_OBJ (self, Ecore_Evas, ee, "EcoreEvas"); + GET_OBJ (self, Ecore_Evas, ee); if (!(tmp = ecore_evas_title_get (*ee))) return Qnil; @@ -217,7 +238,7 @@ static VALUE c_title_get (VALUE self) static VALUE c_title_set (VALUE self, VALUE val) { - GET_OBJ (self, Ecore_Evas, ee, "EcoreEvas"); + GET_OBJ (self, Ecore_Evas, ee); Check_Type (val, T_STRING); @@ -228,14 +249,14 @@ static VALUE c_title_set (VALUE self, VALUE val) static VALUE c_borderless_get (VALUE self) { - GET_OBJ (self, Ecore_Evas, ee, "EcoreEvas"); + GET_OBJ (self, Ecore_Evas, ee); return ecore_evas_borderless_get (*ee) ? Qtrue : Qfalse; } static VALUE c_borderless_set (VALUE self, VALUE val) { - GET_OBJ (self, Ecore_Evas, ee, "EcoreEvas"); + GET_OBJ (self, Ecore_Evas, ee); CHECK_BOOL (val); @@ -246,14 +267,14 @@ static VALUE c_borderless_set (VALUE self, VALUE val) static VALUE c_shaped_get (VALUE self) { - GET_OBJ (self, Ecore_Evas, ee, "EcoreEvas"); + GET_OBJ (self, Ecore_Evas, ee); return ecore_evas_shaped_get (*ee) ? Qtrue : Qfalse; } static VALUE c_shaped_set (VALUE self, VALUE val) { - GET_OBJ (self, Ecore_Evas, ee, "EcoreEvas"); + GET_OBJ (self, Ecore_Evas, ee); CHECK_BOOL (val); @@ -264,14 +285,14 @@ static VALUE c_shaped_set (VALUE self, VALUE val) static VALUE c_sticky_get (VALUE self) { - GET_OBJ (self, Ecore_Evas, ee, "EcoreEvas"); + GET_OBJ (self, Ecore_Evas, ee); return ecore_evas_sticky_get (*ee) ? Qtrue : Qfalse; } static VALUE c_sticky_set (VALUE self, VALUE val) { - GET_OBJ (self, Ecore_Evas, ee, "EcoreEvas"); + GET_OBJ (self, Ecore_Evas, ee); CHECK_BOOL (val); @@ -282,14 +303,14 @@ static VALUE c_sticky_set (VALUE self, VALUE val) static VALUE c_rotation_get (VALUE self) { - GET_OBJ (self, Ecore_Evas, ee, "EcoreEvas"); + GET_OBJ (self, Ecore_Evas, ee); return INT2FIX (ecore_evas_rotation_get (*ee)); } static VALUE c_rotation_set (VALUE self, VALUE val) { - GET_OBJ (self, Ecore_Evas, ee, "EcoreEvas"); + GET_OBJ (self, Ecore_Evas, ee); Check_Type (val, T_FIXNUM); @@ -300,7 +321,7 @@ static VALUE c_rotation_set (VALUE self, VALUE val) static VALUE c_delete (VALUE self) { - GET_OBJ (self, Ecore_Evas, ee, "EcoreEvas"); + GET_OBJ (self, Ecore_Evas, ee); /* reap our children */ rb_gc_start (); @@ -343,4 +364,7 @@ void Init_EcoreEvas (void) rb_define_method (cEcoreEvas, "sticky=", c_sticky_set, 1); rb_define_method (cEcoreEvas, "rotation", c_rotation_get, 0); rb_define_method (cEcoreEvas, "rotation=", c_rotation_set, 1); + + evases = rb_hash_new (); + rb_global_variable (&evases); }