X-Git-Url: http://git.code-monkey.de/?p=ruby-evas.git;a=blobdiff_plain;f=src%2Frb_evas_object.c;h=98a05fbc839841df7f30d7537bdadcd53b68caf7;hp=7fe3298837ff962c589679dbdf4036ee9ca974ee;hb=8efd0235a6bb26710fd89dd07a5fdb55cafde247;hpb=6875d95e45841dbac62479cc583d13a7d1fd3803

diff --git a/src/rb_evas_object.c b/src/rb_evas_object.c
index 7fe3298..98a05fb 100644
--- a/src/rb_evas_object.c
+++ b/src/rb_evas_object.c
@@ -1,5 +1,5 @@
 /*
- * $Id: rb_evas_object.c 46 2004-07-26 11:14:50Z tilman $
+ * $Id: rb_evas_object.c 49 2004-08-01 10:17:39Z tilman $
  *
  * Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
  *
@@ -19,6 +19,7 @@
  */
 
 #include <ruby.h>
+#include <stdbool.h>
 
 #include <Evas.h>
 
@@ -28,76 +29,70 @@
 #include "rb_evas_object.h"
 
 VALUE cEvasObject;
-static VALUE parents;
 
 /* called by the child classes */
-void c_evas_object_free (Evas_Object **e)
+void c_evas_object_mark (RbEvasObject *e)
 {
-	if (*e)
-		evas_object_del (*e);
-
-	rb_hash_aset (parents, INT2NUM ((long) e), Qnil);
-
-	free (e);
+	rb_gc_mark (e->parent);
 }
 
-void c_evas_object_mark (Evas_Object **e)
+void c_evas_object_free (RbEvasObject *e, bool free_mem)
 {
-	VALUE parent;
+	if (e->real)
+		evas_object_del (e->real);
 
-	parent = rb_hash_aref (parents, INT2NUM ((long) (e)));
-	if (!NIL_P (parent))
-		rb_gc_mark (parent);
+	if (free_mem)
+		free (e);
 }
 
 static VALUE c_init (VALUE self, VALUE parent)
 {
-	GET_OBJ (self, Evas_Object *, e);
+	GET_OBJ (self, RbEvasObject, e);
 
-	evas_object_data_set (*e, RUBY_EVAS_OBJECT_KEY, (void *) self);
+	evas_object_data_set (e->real, RUBY_EVAS_OBJECT_KEY, (void *) self);
 
-	rb_hash_aset (parents, INT2NUM ((long) e), parent);
+	e->parent = parent;
 
 	return self;
 }
 
 static VALUE c_inspect (VALUE self)
 {
-	INSPECT (self, Evas_Object *);
+	INSPECT (self, RbEvasObject);
 }
 
 static VALUE c_delete (VALUE self)
 {
-	GET_OBJ (self, Evas_Object *, e);
+	GET_OBJ (self, RbEvasObject, e);
 
-	evas_object_del (*e);
-	*e = NULL;
+	evas_object_del (e->real);
+	e->real = NULL;
 
 	return Qnil;
 }
 
 static VALUE c_resize (VALUE self, VALUE w, VALUE h)
 {
-	GET_OBJ (self, Evas_Object *, e);
+	GET_OBJ (self, RbEvasObject, e);
 
 	Check_Type (w, T_FIXNUM);
 	Check_Type (h, T_FIXNUM);
 
-	evas_object_resize (*e, (Evas_Coord) FIX2INT (w),
-	                        (Evas_Coord) FIX2INT (h));
+	evas_object_resize (e->real, (Evas_Coord) FIX2INT (w),
+	                    (Evas_Coord) FIX2INT (h));
 
 	return Qnil;
 }
 
 static VALUE c_move (VALUE self, VALUE x, VALUE y)
 {
-	GET_OBJ (self, Evas_Object *, e);
+	GET_OBJ (self, RbEvasObject, e);
 
 	Check_Type (x, T_FIXNUM);
 	Check_Type (y, T_FIXNUM);
 
-	evas_object_move (*e, (Evas_Coord) FIX2INT (x),
-	                      (Evas_Coord) FIX2INT (y));
+	evas_object_move (e->real, (Evas_Coord) FIX2INT (x),
+	                  (Evas_Coord) FIX2INT (y));
 
 	return Qnil;
 }
@@ -106,10 +101,11 @@ static VALUE c_geometry_get (VALUE self)
 {
 	int x = 0, y = 0, w = 0, h = 0;
 
-	GET_OBJ (self, Evas_Object *, e);
+	GET_OBJ (self, RbEvasObject, e);
 
-	evas_object_geometry_get (*e, (Evas_Coord *) &x, (Evas_Coord *) &y,
-	                          (Evas_Coord *) & w, (Evas_Coord *) &h);
+	evas_object_geometry_get (e->real,
+	                          (Evas_Coord *) &x, (Evas_Coord *) &y,
+	                          (Evas_Coord *) &w, (Evas_Coord *) &h);
 
 	return rb_ary_new3 (4, INT2FIX (x), INT2FIX (y), INT2FIX (w),
 	                    INT2FIX (h));
@@ -117,43 +113,43 @@ static VALUE c_geometry_get (VALUE self)
 
 static VALUE c_show (VALUE self)
 {
-	GET_OBJ (self, Evas_Object *, e);
+	GET_OBJ (self, RbEvasObject, e);
 
-	evas_object_show (*e);
+	evas_object_show (e->real);
 
 	return Qnil;
 }
 
 static VALUE c_hide (VALUE self)
 {
-	GET_OBJ (self, Evas_Object *, e);
+	GET_OBJ (self, RbEvasObject, e);
 
-	evas_object_hide (*e);
+	evas_object_hide (e->real);
 
 	return Qnil;
 }
 
 static VALUE c_visible_get (VALUE self)
 {
-	GET_OBJ (self, Evas_Object *, e);
+	GET_OBJ (self, RbEvasObject, e);
 
-	return evas_object_visible_get (*e) ? Qtrue : Qfalse;
+	return evas_object_visible_get (e->real) ? Qtrue : Qfalse;
 }
 
 static VALUE c_evas_get (VALUE self)
 {
-	GET_OBJ (self, Evas_Object *, e);
+	GET_OBJ (self, RbEvasObject, e);
 
-	return rb_hash_aref (parents, INT2NUM ((long) (e)));
+	return e->parent;
 }
 
 static VALUE c_name_get (VALUE self)
 {
 	const char *name;
 
-	GET_OBJ (self, Evas_Object *, e);
+	GET_OBJ (self, RbEvasObject, e);
 
-	if (!(name = evas_object_name_get (*e)))
+	if (!(name = evas_object_name_get (e->real)))
 		return Qnil;
 	else
 		return rb_str_new2 (name);
@@ -161,29 +157,29 @@ static VALUE c_name_get (VALUE self)
 
 static VALUE c_name_set (VALUE self, VALUE val)
 {
-	GET_OBJ (self, Evas_Object *, e);
+	GET_OBJ (self, RbEvasObject, e);
 
 	Check_Type (val, T_STRING);
 
-	evas_object_name_set (*e, StringValuePtr (val));
+	evas_object_name_set (e->real, StringValuePtr (val));
 
 	return Qnil;
 }
 
 static VALUE c_layer_get (VALUE self)
 {
-	GET_OBJ (self, Evas_Object *, e);
+	GET_OBJ (self, RbEvasObject, e);
 
-	return INT2FIX (evas_object_layer_get (*e));
+	return INT2FIX (evas_object_layer_get (e->real));
 }
 
 static VALUE c_layer_set (VALUE self, VALUE val)
 {
-	GET_OBJ (self, Evas_Object *, e);
+	GET_OBJ (self, RbEvasObject, e);
 
 	Check_Type (val, T_FIXNUM);
 
-	evas_object_layer_set (*e, NUM2INT (val));
+	evas_object_layer_set (e->real, NUM2INT (val));
 
 	return Qnil;
 }
@@ -192,9 +188,9 @@ static VALUE c_get_color (VALUE self)
 {
 	int r = 0, g = 0, b = 0, a = 0;
 
-	GET_OBJ (self, Evas_Object *, e);
+	GET_OBJ (self, RbEvasObject, e);
 
-	evas_object_color_get (*e, &r, &g, &b, &a);
+	evas_object_color_get (e->real, &r, &g, &b, &a);
 
 	return rb_ary_new3 (4, INT2FIX (r), INT2FIX (g), INT2FIX (b),
 	                    INT2FIX (a));
@@ -203,58 +199,58 @@ static VALUE c_get_color (VALUE self)
 static VALUE c_set_color (VALUE self, VALUE r, VALUE g, VALUE b,
                           VALUE a)
 {
-	GET_OBJ (self, Evas_Object *, e);
+	GET_OBJ (self, RbEvasObject, e);
 
 	Check_Type (r, T_FIXNUM);
 	Check_Type (g, T_FIXNUM);
 	Check_Type (b, T_FIXNUM);
 	Check_Type (a, T_FIXNUM);
 
-	evas_object_color_set (*e, FIX2INT (r), FIX2INT (g), FIX2INT (b),
-	                       FIX2INT (a));
+	evas_object_color_set (e->real, FIX2INT (r), FIX2INT (g),
+	                       FIX2INT (b), FIX2INT (a));
 
 	return Qnil;
 }
 
 static VALUE c_pass_events_get (VALUE self)
 {
-	GET_OBJ (self, Evas_Object *, e);
+	GET_OBJ (self, RbEvasObject, e);
 
-	return evas_object_pass_events_get (*e) ? Qtrue : Qfalse;
+	return evas_object_pass_events_get (e->real) ? Qtrue : Qfalse;
 }
 
 static VALUE c_pass_events_set (VALUE self, VALUE val)
 {
-	GET_OBJ (self, Evas_Object *, e);
+	GET_OBJ (self, RbEvasObject, e);
 
 	CHECK_BOOL (val);
 
-	evas_object_pass_events_set (*e, val == Qtrue ? 1 : 0);
+	evas_object_pass_events_set (e->real, val == Qtrue);
 
 	return Qnil;
 }
 
 static VALUE c_raise (VALUE self)
 {
-	GET_OBJ (self, Evas_Object *, e);
+	GET_OBJ (self, RbEvasObject, e);
 
-	evas_object_raise (*e);
+	evas_object_raise (e->real);
 
 	return Qnil;
 }
 
 static VALUE c_lower (VALUE self)
 {
-	GET_OBJ (self, Evas_Object *, e);
+	GET_OBJ (self, RbEvasObject, e);
 
-	evas_object_lower (*e);
+	evas_object_lower (e->real);
 
 	return Qnil;
 }
 
 static VALUE c_stack_above (VALUE self, VALUE target)
 {
-	GET_OBJ (self, Evas_Object *, e);
+	GET_OBJ (self, RbEvasObject, e);
 
 	if (!rb_obj_is_kind_of (target, cEvasObject)) {
 		rb_raise (rb_eTypeError,
@@ -263,16 +259,16 @@ static VALUE c_stack_above (VALUE self, VALUE target)
 		return Qnil;
 	}
 
-	GET_OBJ (target, Evas_Object *, target2);
+	GET_OBJ (target, RbEvasObject, t);
 
-	evas_object_stack_above (*e, *target2);
+	evas_object_stack_above (e->real, t->real);
 
 	return Qnil;
 }
 
 static VALUE c_stack_below (VALUE self, VALUE target)
 {
-	GET_OBJ (self, Evas_Object *, e);
+	GET_OBJ (self, RbEvasObject, e);
 
 	if (!rb_obj_is_kind_of (target, cEvasObject)) {
 		rb_raise (rb_eTypeError,
@@ -281,9 +277,9 @@ static VALUE c_stack_below (VALUE self, VALUE target)
 		return Qnil;
 	}
 
-	GET_OBJ (target, Evas_Object *, target2);
+	GET_OBJ (target, RbEvasObject, t);
 
-	evas_object_stack_below (*e, *target2);
+	evas_object_stack_below (e->real, t->real);
 
 	return Qnil;
 }
@@ -293,9 +289,9 @@ static VALUE c_above_get (VALUE self)
 	Evas_Object *o;
 	void *obj;
 
-	GET_OBJ (self, Evas_Object *, e);
+	GET_OBJ (self, RbEvasObject, e);
 
-	if (!(evas_object_above_get (*e)))
+	if (!(o = evas_object_above_get (e->real)))
 		return Qnil;
 
 	if (!(obj = evas_object_data_get (o, RUBY_EVAS_OBJECT_KEY))) {
@@ -311,9 +307,9 @@ static VALUE c_below_get (VALUE self)
 	Evas_Object *o;
 	void *obj;
 
-	GET_OBJ (self, Evas_Object *, e);
+	GET_OBJ (self, RbEvasObject, e);
 
-	if (!(evas_object_below_get (*e)))
+	if (!(o = evas_object_below_get (e->real)))
 		return Qnil;
 
 	if (!(obj = evas_object_data_get (o, RUBY_EVAS_OBJECT_KEY))) {
@@ -355,7 +351,4 @@ void Init_EvasObject (void)
 	rb_define_method (cEvasObject, "stack_below", c_stack_below, 1);
 	rb_define_method (cEvasObject, "above", c_above_get, 0);
 	rb_define_method (cEvasObject, "below", c_below_get, 0);
-
-	parents = rb_hash_new ();
-	rb_global_variable (&parents);
 }