X-Git-Url: http://git.code-monkey.de/?p=ruby-ecore.git;a=blobdiff_plain;f=src%2Fecore_evas%2Frb_software_x11.c;h=f694e3e68e7eda916b7fe93620f0d7a5f7ae210c;hp=055c17e1a357a6c55f0c95de89784e33675a7295;hb=f805cf241a9d1fb9765892f0af48ede8359e9b65;hpb=4f5c88b4cfae4d5fb177710b09624f2e229d6a1b

diff --git a/src/ecore_evas/rb_software_x11.c b/src/ecore_evas/rb_software_x11.c
index 055c17e..f694e3e 100644
--- a/src/ecore_evas/rb_software_x11.c
+++ b/src/ecore_evas/rb_software_x11.c
@@ -1,5 +1,5 @@
 /*
- * $Id: rb_software_x11.c 40 2004-07-25 13:14:34Z tilman $
+ * $Id: rb_software_x11.c 50 2004-08-01 10:18:39Z tilman $
  *
  * Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
  *
@@ -19,6 +19,7 @@
  */
 
 #include <ruby.h>
+#include <stdbool.h>
 
 #include <Ecore.h>
 #include <Ecore_Evas.h>
@@ -28,17 +29,35 @@
 #include "rb_ecore_evas_main.h"
 #include "rb_ecore_evas.h"
 
-static VALUE windows;
+typedef struct {
+	RbEcoreEvas ee;
+	VALUE window;
+} RbEcoreEvasSoftwareX11;
+
+static void c_mark (RbEcoreEvasSoftwareX11 *ee)
+{
+	c_ecore_evas_mark (&ee->ee);
+
+	if (!NIL_P (ee->window))
+		rb_gc_mark (ee->window);
+}
+
+static void c_free (RbEcoreEvasSoftwareX11 *ee)
+{
+	c_ecore_evas_free (&ee->ee, false);
+
+	free (ee);
+}
 
 static VALUE c_new (int argc, VALUE *argv, VALUE klass)
 {
 	VALUE self, disp, parent, geom[4];
-	Ecore_Evas **ee = NULL;
+	RbEcoreEvasSoftwareX11 *ee = NULL;
 	char *cdisp = NULL;
 	int i, igeom[4] = {0, 0, 0, 0};
 
-	self = Data_Make_Struct (klass, Ecore_Evas *,
-	                         NULL, c_ecore_evas_free, ee);
+	self = Data_Make_Struct (klass, RbEcoreEvasSoftwareX11,
+	                         c_mark, c_free, ee);
 
 	rb_scan_args (argc, argv, "06", &disp, &parent,
 	              &geom[0], &geom[1], &geom[2], &geom[3]);
@@ -51,15 +70,16 @@ static VALUE c_new (int argc, VALUE *argv, VALUE klass)
 	for (i = 0; i < 4; i++)
 		if (!NIL_P (geom[i])) {
 			Check_Type (geom[i], T_FIXNUM);
-			igeom[i] = NUM2INT (geom[i]);
+			igeom[i] = FIX2INT (geom[i]);
 		}
 
 	ecore_init ();
 	ecore_evas_init ();
 
-	*ee = ecore_evas_software_x11_new (cdisp, 0,
-	                                   igeom[0], igeom[1],
-	                                   igeom[2], igeom[3]);
+	ee->ee.real = ecore_evas_software_x11_new (cdisp, 0,
+	                                           igeom[0], igeom[1],
+	                                           igeom[2], igeom[3]);
+	ee->window = Qnil;
 
 	rb_obj_call_init (self, 0, NULL);
 
@@ -68,18 +88,16 @@ static VALUE c_new (int argc, VALUE *argv, VALUE klass)
 
 static VALUE c_window_get (VALUE self)
 {
-	VALUE o;
 	Ecore_X_Window w;
 
-	GET_OBJ (self, Ecore_Evas *, ee);
+	GET_OBJ (self, RbEcoreEvasSoftwareX11, ee);
 
-	if (NIL_P (o = rb_hash_aref (windows, INT2NUM ((long) (ee))))) {
-		w = ecore_evas_software_x11_window_get (*ee);
-		o = TO_ECORE_X_WINDOW (self, w);
-		rb_hash_aset (windows, INT2NUM ((long) ee), o);
+	if (NIL_P (ee->window)) {
+		w = ecore_evas_software_x11_window_get (ee->ee.real);
+		ee->window = TO_ECORE_X_WINDOW (self, w);
 	}
 
-	return o;
+	return ee->window;
 }
 
 void Init_SoftwareX11 (void)
@@ -92,7 +110,4 @@ void Init_SoftwareX11 (void)
 
 	rb_define_singleton_method (c, "new", c_new, -1);
 	rb_define_method (c, "window", c_window_get, 0);
-
-	windows = rb_hash_new ();
-	rb_global_variable (&windows);
 }