X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fecore_evas%2Frb_software_x11.c;h=055c17e1a357a6c55f0c95de89784e33675a7295;hb=094fc971409b22abd413ed08935786dba73a9062;hp=89c996e54579d5a2c9ccc69f859b84787941b92b;hpb=f007c429dfb7b76be36317212a0585401e13984a;p=ruby-ecore.git

diff --git a/src/ecore_evas/rb_software_x11.c b/src/ecore_evas/rb_software_x11.c
index 89c996e..055c17e 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 9 2004-06-19 19:53:47Z tilman $
+ * $Id: rb_software_x11.c 40 2004-07-25 13:14:34Z tilman $
  *
  * Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
  *
@@ -20,28 +20,32 @@
 
 #include <ruby.h>
 
+#include <Ecore.h>
 #include <Ecore_Evas.h>
 
+#include "../ecore/rb_ecore.h"
+#include "../ecore_x/rb_window.h"
 #include "rb_ecore_evas_main.h"
 #include "rb_ecore_evas.h"
 
-VALUE cGlX11;
+static VALUE windows;
 
-static VALUE c_init (int argc, VALUE *argv, VALUE self)
+static VALUE c_new (int argc, VALUE *argv, VALUE klass)
 {
-	VALUE disp, parent, geom[4];
+	VALUE self, disp, parent, geom[4];
 	Ecore_Evas **ee = NULL;
 	char *cdisp = NULL;
-	int i, igeom[4] = {0};
+	int i, igeom[4] = {0, 0, 0, 0};
 
-	Data_Get_Struct (self, Ecore_Evas *, ee);
+	self = Data_Make_Struct (klass, Ecore_Evas *,
+	                         NULL, c_ecore_evas_free, ee);
 
 	rb_scan_args (argc, argv, "06", &disp, &parent,
 	              &geom[0], &geom[1], &geom[2], &geom[3]);
 
 	if (!NIL_P (disp)) {
 		Check_Type (disp, T_STRING);
-		cdisp = STR2CSTR (disp);
+		cdisp = StringValuePtr (disp);
 	}
 
 	for (i = 0; i < 4; i++)
@@ -50,31 +54,45 @@ static VALUE c_init (int argc, VALUE *argv, VALUE self)
 			igeom[i] = NUM2INT (geom[i]);
 		}
 
-	*ee = ecore_evas_gl_x11_new (cdisp, 0,
-	                             igeom[0], igeom[1],
-	                             igeom[2], igeom[3]);
+	ecore_init ();
+	ecore_evas_init ();
+
+	*ee = ecore_evas_software_x11_new (cdisp, 0,
+	                                   igeom[0], igeom[1],
+	                                   igeom[2], igeom[3]);
+
+	rb_obj_call_init (self, 0, NULL);
 
 	return self;
 }
 
-static VALUE c_new (int argc, VALUE *argv, VALUE klass)
+static VALUE c_window_get (VALUE self)
 {
-	VALUE self;
-	Ecore_Evas **ee;
+	VALUE o;
+	Ecore_X_Window w;
 
-	self = Data_Make_Struct (klass, Ecore_Evas *,
-	                         NULL, c_ecore_evas_free, ee);
+	GET_OBJ (self, Ecore_Evas *, ee);
 
-	rb_obj_call_init (self, argc, argv);
+	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);
+	}
 
-	return self;
+	return o;
 }
 
-void Init_GlX11 (void)
+void Init_SoftwareX11 (void)
 {
-	cGlX11 = rb_define_class_under (mEvas, "GlX11", cEcoreEvas);
+	VALUE c;
 
-	rb_define_singleton_method (cGlX11, "new", c_new, -1);
-	rb_define_method (cGlX11, "initialize", c_init, -1);
-}
+	rb_require ("ecore_x");
 
+	c = rb_define_class_under (mEvas, "SoftwareX11", cEcoreEvas);
+
+	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);
+}