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

diff --git a/src/rb_evas.c b/src/rb_evas.c
index dfb949a..b6d9887 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 29 2004-07-08 18:47:44Z tilman $
  *
  * Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
  *
@@ -26,16 +26,6 @@
 #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; \
-	}
-
 static VALUE parents;
 
 static void c_mark (Evas **e)
@@ -47,16 +37,25 @@ 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,6 +65,27 @@ VALUE TO_EVAS (VALUE parent, Evas *e)
 	return self;
 }
 
+static VALUE c_inspect (VALUE self)
+{
+	char buf[128];
+
+	GET_OBJ (self, Evas, e, "Evas");
+
+	snprintf (buf, sizeof (buf), "#<Evas::Evas:%p ptr=%p>",
+	          (void *) self, *e);
+
+	return rb_str_new2 (buf);
+}
+
+static VALUE c_render (VALUE self)
+{
+	GET_OBJ (self, Evas, e, "Evas");
+
+	evas_render (*e);
+
+	return Qnil;
+}
+
 static VALUE c_font_path_clear (VALUE self)
 {
 	GET_OBJ (self, Evas, e, "Evas");
@@ -241,6 +261,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);