From 85ffbde47626b42d8259b40907c3673d141ccb57 Mon Sep 17 00:00:00 2001
From: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Fri, 27 Aug 2004 09:31:26 +0000
Subject: [PATCH] Implemented GlX11#window.

---
 src/ecore_evas/rb_gl_x11.c       | 75 +++++++++++++++++++++++++++-----
 src/ecore_evas/rb_software_x11.c |  3 +-
 2 files changed, 66 insertions(+), 12 deletions(-)

diff --git a/src/ecore_evas/rb_gl_x11.c b/src/ecore_evas/rb_gl_x11.c
index e3ceb30..6e9263c 100644
--- a/src/ecore_evas/rb_gl_x11.c
+++ b/src/ecore_evas/rb_gl_x11.c
@@ -1,5 +1,5 @@
 /*
- * $Id: rb_gl_x11.c 77 2004-08-19 17:39:29Z tilman $
+ * $Id: rb_gl_x11.c 100 2004-08-27 09:31:26Z tilman $
  *
  * Copyright (C) 2004 ruby-ecore team (see AUTHORS)
  *
@@ -23,12 +23,33 @@
 #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"
 
-static void c_free (RbEcoreEvas *ee)
+typedef struct {
+	RbEcoreEvas ee;
+	VALUE parent_window;
+	VALUE window;
+} RbEcoreEvasGlX11;
+
+static void c_mark (RbEcoreEvasGlX11 *ee)
 {
-	c_ecore_evas_free (ee, true);
+	c_ecore_evas_mark (&ee->ee);
+
+	if (!NIL_P (ee->parent_window))
+		rb_gc_mark (ee->parent_window);
+
+	if (!NIL_P (ee->window))
+		rb_gc_mark (ee->window);
+}
+
+static void c_free (RbEcoreEvasGlX11 *ee)
+{
+	c_ecore_evas_free (&ee->ee, false);
+
+	free (ee);
 }
 
 /*
@@ -40,12 +61,13 @@ static void c_free (RbEcoreEvas *ee)
 static VALUE c_new (int argc, VALUE *argv, VALUE klass)
 {
 	VALUE self, disp, parent, geom[4];
-	RbEcoreEvas *ee = NULL;
+	RbEcoreEvasGlX11 *ee = NULL;
+	RbWindow *win = NULL;
 	char *cdisp = NULL;
 	int i, igeom[4] = {0, 0, 0, 0};
 
-	self = Data_Make_Struct (klass, RbEcoreEvas,
-	                         c_ecore_evas_mark, c_free, ee);
+	self = Data_Make_Struct (klass, RbEcoreEvasGlX11,
+	                         c_mark, c_free, ee);
 
 	rb_scan_args (argc, argv, "06", &disp, &parent,
 	              &geom[0], &geom[1], &geom[2], &geom[3]);
@@ -55,6 +77,11 @@ static VALUE c_new (int argc, VALUE *argv, VALUE klass)
 		cdisp = StringValuePtr (disp);
 	}
 
+	if (!NIL_P (parent)) {
+		CHECK_CLASS (parent, cWindow);
+		Data_Get_Struct (parent, RbWindow, win);
+	}
+
 	for (i = 0; i < 4; i++)
 		if (!NIL_P (geom[i])) {
 			Check_Type (geom[i], T_FIXNUM);
@@ -64,18 +91,46 @@ static VALUE c_new (int argc, VALUE *argv, VALUE klass)
 	ecore_init ();
 	ecore_evas_init ();
 
-	ee->real = ecore_evas_gl_x11_new (cdisp, 0,
-	                                  igeom[0], igeom[1],
-	                                  igeom[2], igeom[3]);
+	ee->ee.real = ecore_evas_gl_x11_new (cdisp,
+	                                     win ? win->real : 0,
+	                                     igeom[0], igeom[1],
+	                                     igeom[2], igeom[3]);
+	ee->parent_window = parent;
+	ee->window = Qnil;
 
 	rb_obj_call_init (self, 0, NULL);
 
 	return self;
 }
 
+/*
+ * call-seq:
+ *  glx11.window => window
+ *
+ * Returns the <code>Ecore::X::Window</code> object for <i>glx11</i>.
+ */
+static VALUE c_window_get (VALUE self)
+{
+	Ecore_X_Window w;
+
+	GET_OBJ (self, RbEcoreEvasGlX11, ee);
+
+	if (NIL_P (ee->window)) {
+		w = ecore_evas_gl_x11_window_get (ee->ee.real);
+		ee->window = TO_ECORE_X_WINDOW (self, w);
+	}
+
+	return ee->window;
+}
+
 void Init_GlX11 (void)
 {
-	VALUE c = rb_define_class_under (mEvas, "GlX11", cEcoreEvas);
+	VALUE c;
+
+	rb_require ("ecore_x");
+
+	c = rb_define_class_under (mEvas, "GlX11", cEcoreEvas);
 
 	rb_define_singleton_method (c, "new", c_new, -1);
+	rb_define_method (c, "window", c_window_get, 0);
 }
diff --git a/src/ecore_evas/rb_software_x11.c b/src/ecore_evas/rb_software_x11.c
index 83504dd..9aafa26 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 82 2004-08-21 09:45:08Z tilman $
+ * $Id: rb_software_x11.c 100 2004-08-27 09:31:26Z tilman $
  *
  * Copyright (C) 2004 ruby-ecore team (see AUTHORS)
  *
@@ -19,7 +19,6 @@
  */
 
 #include <ruby.h>
-#include <stdbool.h>
 
 #include <Ecore.h>
 #include <Ecore_Evas.h>
-- 
2.30.2