X-Git-Url: http://git.code-monkey.de/?p=ruby-evas.git;a=blobdiff_plain;f=src%2Frb_evas.c;h=fb02482920b5b937204ac25f0d771795336f4812;hp=1f72188acc7dbfa7672034e03e7cd4b36741f8eb;hb=8efd0235a6bb26710fd89dd07a5fdb55cafde247;hpb=6875d95e45841dbac62479cc583d13a7d1fd3803

diff --git a/src/rb_evas.c b/src/rb_evas.c
index 1f72188..fb02482 100644
--- a/src/rb_evas.c
+++ b/src/rb_evas.c
@@ -1,5 +1,5 @@
 /*
- * $Id: rb_evas.c 43 2004-07-26 10:49:51Z tilman $
+ * $Id: rb_evas.c 49 2004-08-01 10:17:39Z tilman $
  *
  * Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
  *
@@ -28,40 +28,24 @@
 #include "rb_evas_object.h"
 
 VALUE cEvas;
-static VALUE parents;
 
-static void c_mark (Evas **e)
+static void c_mark (RbEvas *e)
 {
-	VALUE parent;
-
-	parent = rb_hash_aref (parents, INT2NUM ((long) (e)));
-	if (parent != Qnil)
-		rb_gc_mark (parent);
-}
-
-static void c_free (Evas **e)
-{
-	/* do NOT call evas_free() here, since the Evas is freed
-	 * by ecore_evas_free() eventually
-	 */
-	rb_hash_aset (parents, INT2NUM ((long) e), Qnil);
-
-	free (e);
+	rb_gc_mark (e->parent);
 }
 
 VALUE TO_EVAS (VALUE parent, Evas *e)
 {
 	VALUE self;
-	Evas **my_e = NULL;
+	RbEvas *evas = NULL;
 
 	if (NIL_P (parent) || !e)
 		return Qnil;
 
-	self = Data_Make_Struct (cEvas, Evas *,
-	                         c_mark, c_free, my_e);
-	*my_e = e;
-
-	rb_hash_aset (parents, INT2NUM ((long) my_e), parent);
+	self = Data_Make_Struct (cEvas, RbEvas,
+	                         c_mark, free, evas);
+	evas->real = e;
+	evas->parent = parent;
 
 	rb_obj_call_init (self, 0, NULL);
 
@@ -70,45 +54,45 @@ VALUE TO_EVAS (VALUE parent, Evas *e)
 
 static VALUE c_inspect (VALUE self)
 {
-	INSPECT (self, Evas *);
+	INSPECT (self, RbEvas);
 }
 
 static VALUE c_render (VALUE self)
 {
-	GET_OBJ (self, Evas *, e);
+	GET_OBJ (self, RbEvas, e);
 
-	evas_render (*e);
+	evas_render (e->real);
 
 	return Qnil;
 }
 
 static VALUE c_font_path_clear (VALUE self)
 {
-	GET_OBJ (self, Evas *, e);
+	GET_OBJ (self, RbEvas, e);
 
-	evas_font_path_clear (*e);
+	evas_font_path_clear (e->real);
 
 	return Qnil;
 }
 
 static VALUE c_font_path_append (VALUE self, VALUE path)
 {
-	GET_OBJ (self, Evas *, e);
+	GET_OBJ (self, RbEvas, e);
 
 	Check_Type (path, T_STRING);
 
-	evas_font_path_append (*e, StringValuePtr (path));
+	evas_font_path_append (e->real, StringValuePtr (path));
 
 	return Qnil;
 }
 
 static VALUE c_font_path_prepend (VALUE self, VALUE path)
 {
-	GET_OBJ (self, Evas *, e);
+	GET_OBJ (self, RbEvas, e);
 
 	Check_Type (path, T_STRING);
 
-	evas_font_path_append (*e, StringValuePtr (path));
+	evas_font_path_append (e->real, StringValuePtr (path));
 
 	return Qnil;
 }
@@ -118,9 +102,9 @@ static VALUE c_font_path_get (VALUE self)
 	VALUE ary;
 	const Evas_List *list, *l;
 
-	GET_OBJ (self, Evas *, e);
+	GET_OBJ (self, RbEvas, e);
 
-	if (!(list = evas_font_path_list (*e)))
+	if (!(list = evas_font_path_list (e->real)))
 		return rb_ary_new ();
 
 	ary = rb_ary_new2 (evas_list_count ((Evas_List *) list));
@@ -133,63 +117,63 @@ static VALUE c_font_path_get (VALUE self)
 
 static VALUE c_font_cache_get (VALUE self)
  {
-	GET_OBJ (self, Evas *, e);
+	GET_OBJ (self, RbEvas, e);
 
-	return INT2FIX (evas_font_cache_get (*e));
+	return INT2FIX (evas_font_cache_get (e->real));
 }
 
 static VALUE c_font_cache_set (VALUE self, VALUE val)
 {
-	GET_OBJ (self, Evas *, e);
+	GET_OBJ (self, RbEvas, e);
 
 	Check_Type (val, T_FIXNUM);
 
-	evas_font_cache_set (*e, FIX2INT (val));
+	evas_font_cache_set (e->real, FIX2INT (val));
 
 	return Qnil;
 }
 
 static VALUE c_font_cache_flush (VALUE self)
 {
-	GET_OBJ (self, Evas *, e);
+	GET_OBJ (self, RbEvas, e);
 
-	evas_font_cache_flush (*e);
+	evas_font_cache_flush (e->real);
 
 	return Qnil;
 }
 
 static VALUE c_image_cache_get (VALUE self)
 {
-	GET_OBJ (self, Evas *, e);
+	GET_OBJ (self, RbEvas, e);
 
-	return INT2FIX (evas_image_cache_get (*e));
+	return INT2FIX (evas_image_cache_get (e->real));
 }
 
 static VALUE c_image_cache_set (VALUE self, VALUE val)
 {
-	GET_OBJ (self, Evas *, e);
+	GET_OBJ (self, RbEvas, e);
 
 	Check_Type (val, T_FIXNUM);
 
-	evas_image_cache_set (*e, FIX2INT (val));
+	evas_image_cache_set (e->real, FIX2INT (val));
 
 	return Qnil;
 }
 
 static VALUE c_image_cache_reload (VALUE self)
 {
-	GET_OBJ (self, Evas *, e);
+	GET_OBJ (self, RbEvas, e);
 
-	evas_image_cache_reload (*e);
+	evas_image_cache_reload (e->real);
 
 	return Qnil;
 }
 
 static VALUE c_image_cache_flush (VALUE self)
 {
-	GET_OBJ (self, Evas *, e);
+	GET_OBJ (self, RbEvas, e);
 
-	evas_image_cache_flush (*e);
+	evas_image_cache_flush (e->real);
 
 	return Qnil;
 }
@@ -199,9 +183,9 @@ static VALUE c_top_get (VALUE self)
 	Evas_Object *o;
 	void *obj;
 
-	GET_OBJ (self, Evas *, e);
+	GET_OBJ (self, RbEvas, e);
 
-	if (!(o = evas_object_top_get (*e)))
+	if (!(o = evas_object_top_get (e->real)))
 		return Qnil;
 
 	if (!(obj = evas_object_data_get (o, RUBY_EVAS_OBJECT_KEY))) {
@@ -217,9 +201,9 @@ static VALUE c_bottom_get (VALUE self)
 	Evas_Object *o;
 	void *obj;
 
-	GET_OBJ (self, Evas *, e);
+	GET_OBJ (self, RbEvas, e);
 
-	if (!(o = evas_object_bottom_get (*e)))
+	if (!(o = evas_object_bottom_get (e->real)))
 		return Qnil;
 
 	if (!(obj = evas_object_data_get (o, RUBY_EVAS_OBJECT_KEY))) {
@@ -235,11 +219,11 @@ static VALUE c_find_object (VALUE self, VALUE name)
 	Evas_Object *o;
 	void *obj;
 
-	GET_OBJ (self, Evas *, e);
+	GET_OBJ (self, RbEvas, e);
 
 	Check_Type (name, T_STRING);
 
-	if (!(o = evas_object_name_find (*e, StringValuePtr (name))))
+	if (!(o = evas_object_name_find (e->real, StringValuePtr (name))))
 		return Qnil;
 
 	if (!(obj = evas_object_data_get (o, RUBY_EVAS_OBJECT_KEY))) {
@@ -276,7 +260,4 @@ void Init_Evas (void)
 	rb_define_method (cEvas, "top", c_top_get, 0);
 	rb_define_method (cEvas, "bottom", c_bottom_get, 0);
 	rb_define_method (cEvas, "find_object", c_find_object, 1);
-
-	parents = rb_hash_new ();
-	rb_global_variable (&parents);
 }