From: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Thu, 8 Jul 2004 18:47:44 +0000 (+0000)
Subject: evas_shutdown() isn't exported anymore.
X-Git-Url: http://git.code-monkey.de/?p=ruby-evas.git;a=commitdiff_plain;h=57c054bb97ec81f443c45cae635bb4c7036091c2

evas_shutdown() isn't exported anymore.

Evas is inited and shut down automatically now.
---

diff --git a/src/rb_evas.c b/src/rb_evas.c
index 3da4ccf..b6d9887 100644
--- a/src/rb_evas.c
+++ b/src/rb_evas.c
@@ -1,5 +1,5 @@
 /*
- * $Id: rb_evas.c 23 2004-06-26 22:55:31Z tilman $
+ * $Id: rb_evas.c 29 2004-07-08 18:47:44Z tilman $
  *
  * Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
  *
@@ -37,6 +37,15 @@ 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;
@@ -46,7 +55,7 @@ VALUE TO_EVAS (VALUE parent, Evas *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);
@@ -56,6 +65,18 @@ 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");
@@ -240,6 +261,7 @@ 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);
diff --git a/src/rb_evas_main.c b/src/rb_evas_main.c
index 2fbb484..288408a 100644
--- a/src/rb_evas_main.c
+++ b/src/rb_evas_main.c
@@ -1,5 +1,5 @@
 /*
- * $Id: rb_evas_main.c 23 2004-06-26 22:55:31Z tilman $
+ * $Id: rb_evas_main.c 29 2004-07-08 18:47:44Z tilman $
  *
  * Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
  *
@@ -32,18 +32,26 @@
 #include "rb_image.h"
 #include "rb_text.h"
 
-static VALUE m_shutdown (VALUE self)
+#ifdef DEBUG
+static VALUE m_init (VALUE self)
 {
-	evas_shutdown ();
+	return INT2FIX (evas_init ());
+}
 
-	return Qnil;
+static VALUE m_shutdown (VALUE self)
+{
+	return INT2FIX (evas_shutdown ());
 }
+#endif
 
 void Init_evas (void)
 {
 	mEvas = rb_define_module ("Evas");
 
+#ifdef DEBUG
+	rb_define_module_function (mEvas, "init", m_init, 0);
 	rb_define_module_function (mEvas, "shutdown", m_shutdown, 0);
+#endif
 
 	Init_Evas ();
 	Init_EvasObject ();
diff --git a/src/rb_evas_object.c b/src/rb_evas_object.c
index ee25e1d..79dc66f 100644
--- a/src/rb_evas_object.c
+++ b/src/rb_evas_object.c
@@ -1,5 +1,5 @@
 /*
- * $Id: rb_evas_object.c 23 2004-06-26 22:55:31Z tilman $
+ * $Id: rb_evas_object.c 29 2004-07-08 18:47:44Z tilman $
  *
  * Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
  *
@@ -34,6 +34,8 @@ void c_evas_object_free (Evas_Object **e)
 	if (*e)
 		evas_object_del (*e);
 
+	rb_hash_aset (parents, INT2NUM ((long) e), Qnil);
+
 	free (e);
 }
 
@@ -63,7 +65,7 @@ static VALUE c_inspect (VALUE self)
 
 	GET_OBJ (self, Evas_Object, e, "EvasObject");
 
-	snprintf (buf, sizeof (buf), "#<EvasObject:%p ptr=%p>",
+	snprintf (buf, sizeof (buf), "#<Evas::EvasObject:%p ptr=%p>",
 	          (void *) self, *e);
 
 	return rb_str_new2 (buf);
@@ -73,10 +75,8 @@ static VALUE c_delete (VALUE self)
 {
 	GET_OBJ (self, Evas_Object, e, "EvasObject");
 
-	if (*e) {
-		evas_object_del (*e);
-		*e = NULL;
-	}
+	evas_object_del (*e);
+	*e = NULL;
 
 	return Qnil;
 }