X-Git-Url: http://git.code-monkey.de/?p=ruby-evas.git;a=blobdiff_plain;f=src%2Frb_evas.c;h=1f72188acc7dbfa7672034e03e7cd4b36741f8eb;hp=dfb949aec2c2e0ec12417fd7c02a93daa3abac50;hb=1b56a6791ef0e24b38fb32678115fb83b174ef30;hpb=2118372cfbb06b10e6254539b30887e0342650fd

diff --git a/src/rb_evas.c b/src/rb_evas.c
index dfb949a..1f72188 100644
--- a/src/rb_evas.c
+++ b/src/rb_evas.c
@@ -1,5 +1,5 @@
 /*
- * $Id: rb_evas.c 20 2004-06-22 20:46:56Z tilman $
+ * $Id: rb_evas.c 43 2004-07-26 10:49:51Z tilman $
  *
  * Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
  *
@@ -22,20 +22,12 @@
 
 #include <Evas.h>
 
+#define __RB_EVAS_C
 #include "rb_evas_main.h"
 #include "rb_evas.h"
 #include "rb_evas_object.h"
 
-#define GET_OBJ(obj, type, o, desc) \
-	type **(o) = NULL; \
-\
-	Data_Get_Struct ((obj), type *, (o)); \
-\
-	if (!*(o)) { \
-		rb_raise (rb_eException, desc " destroyed already"); \
-		return Qnil; \
-	}
-
+VALUE cEvas;
 static VALUE parents;
 
 static void c_mark (Evas **e)
@@ -47,16 +39,26 @@ static void c_mark (Evas **e)
 		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);
+}
+
 VALUE TO_EVAS (VALUE parent, Evas *e)
 {
 	VALUE self;
 	Evas **my_e = NULL;
 
-	if (parent == Qnil || !e)
+	if (NIL_P (parent) || !e)
 		return Qnil;
 
 	self = Data_Make_Struct (cEvas, Evas *,
-	                         c_mark, free, my_e);
+	                         c_mark, c_free, my_e);
 	*my_e = e;
 
 	rb_hash_aset (parents, INT2NUM ((long) my_e), parent);
@@ -66,9 +68,23 @@ VALUE TO_EVAS (VALUE parent, Evas *e)
 	return self;
 }
 
+static VALUE c_inspect (VALUE self)
+{
+	INSPECT (self, Evas *);
+}
+
+static VALUE c_render (VALUE self)
+{
+	GET_OBJ (self, Evas *, e);
+
+	evas_render (*e);
+
+	return Qnil;
+}
+
 static VALUE c_font_path_clear (VALUE self)
 {
-	GET_OBJ (self, Evas, e, "Evas");
+	GET_OBJ (self, Evas *, e);
 
 	evas_font_path_clear (*e);
 
@@ -77,7 +93,7 @@ static VALUE c_font_path_clear (VALUE self)
 
 static VALUE c_font_path_append (VALUE self, VALUE path)
 {
-	GET_OBJ (self, Evas, e, "Evas");
+	GET_OBJ (self, Evas *, e);
 
 	Check_Type (path, T_STRING);
 
@@ -88,7 +104,7 @@ static VALUE c_font_path_append (VALUE self, VALUE path)
 
 static VALUE c_font_path_prepend (VALUE self, VALUE path)
 {
-	GET_OBJ (self, Evas, e, "Evas");
+	GET_OBJ (self, Evas *, e);
 
 	Check_Type (path, T_STRING);
 
@@ -102,7 +118,7 @@ static VALUE c_font_path_get (VALUE self)
 	VALUE ary;
 	const Evas_List *list, *l;
 
-	GET_OBJ (self, Evas, e, "Evas");
+	GET_OBJ (self, Evas *, e);
 
 	if (!(list = evas_font_path_list (*e)))
 		return rb_ary_new ();
@@ -117,14 +133,14 @@ static VALUE c_font_path_get (VALUE self)
 
 static VALUE c_font_cache_get (VALUE self)
  {
-	GET_OBJ (self, Evas, e, "Evas");
+	GET_OBJ (self, Evas *, e);
 
 	return INT2FIX (evas_font_cache_get (*e));
 }
 
 static VALUE c_font_cache_set (VALUE self, VALUE val)
 {
-	GET_OBJ (self, Evas, e, "Evas");
+	GET_OBJ (self, Evas *, e);
 
 	Check_Type (val, T_FIXNUM);
 
@@ -135,7 +151,7 @@ static VALUE c_font_cache_set (VALUE self, VALUE val)
 
 static VALUE c_font_cache_flush (VALUE self)
 {
-	GET_OBJ (self, Evas, e, "Evas");
+	GET_OBJ (self, Evas *, e);
 
 	evas_font_cache_flush (*e);
 
@@ -144,14 +160,14 @@ static VALUE c_font_cache_flush (VALUE self)
 
 static VALUE c_image_cache_get (VALUE self)
 {
-	GET_OBJ (self, Evas, e, "Evas");
+	GET_OBJ (self, Evas *, e);
 
 	return INT2FIX (evas_image_cache_get (*e));
 }
 
 static VALUE c_image_cache_set (VALUE self, VALUE val)
 {
-	GET_OBJ (self, Evas, e, "Evas");
+	GET_OBJ (self, Evas *, e);
 
 	Check_Type (val, T_FIXNUM);
 
@@ -162,7 +178,7 @@ static VALUE c_image_cache_set (VALUE self, VALUE val)
 
 static VALUE c_image_cache_reload (VALUE self)
 {
-	GET_OBJ (self, Evas, e, "Evas");
+	GET_OBJ (self, Evas *, e);
 
 	evas_image_cache_reload (*e);
 
@@ -171,7 +187,7 @@ static VALUE c_image_cache_reload (VALUE self)
 
 static VALUE c_image_cache_flush (VALUE self)
 {
-	GET_OBJ (self, Evas, e, "Evas");
+	GET_OBJ (self, Evas *, e);
 
 	evas_image_cache_flush (*e);
 
@@ -183,7 +199,7 @@ static VALUE c_top_get (VALUE self)
 	Evas_Object *o;
 	void *obj;
 
-	GET_OBJ (self, Evas, e, "Evas");
+	GET_OBJ (self, Evas *, e);
 
 	if (!(o = evas_object_top_get (*e)))
 		return Qnil;
@@ -201,7 +217,7 @@ static VALUE c_bottom_get (VALUE self)
 	Evas_Object *o;
 	void *obj;
 
-	GET_OBJ (self, Evas, e, "Evas");
+	GET_OBJ (self, Evas *, e);
 
 	if (!(o = evas_object_bottom_get (*e)))
 		return Qnil;
@@ -219,7 +235,7 @@ static VALUE c_find_object (VALUE self, VALUE name)
 	Evas_Object *o;
 	void *obj;
 
-	GET_OBJ (self, Evas, e, "Evas");
+	GET_OBJ (self, Evas *, e);
 
 	Check_Type (name, T_STRING);
 
@@ -241,6 +257,8 @@ void Init_Evas (void)
 	/* not publically instantiable yet */
 	rb_define_private_method (rb_singleton_class (cEvas),
 	                          "new", NULL, 0);
+	rb_define_method (cEvas, "inspect", c_inspect, 0);
+	rb_define_method (cEvas, "render", c_render, 0);
 	rb_define_method (cEvas, "font_path_clear", c_font_path_clear, 0);
 	rb_define_method (cEvas, "font_path_append", c_font_path_append, 1);
 	rb_define_method (cEvas, "font_path_prepend", c_font_path_prepend, 1);