We now use real structs to wrap objects.

[ruby-ecore.git] / src / ecore_evas / rb_software_x11.c

diff --git a/src/ecore_evas/rb_software_x11.c b/src/ecore_evas/rb_software_x11.c
index b077335b3bc684e252e85991c4c70693f95fc8f5..f694e3e68e7eda916b7fe93620f0d7a5f7ae210c 100644 (file)
--- 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 14 2004-06-20 10:33:13Z 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,22 +19,45 @@
  */
 
 #include <ruby.h>
+#include <stdbool.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;
+typedef struct {
+       RbEcoreEvas ee;
+       VALUE window;
+} RbEcoreEvasSoftwareX11;
 
-static VALUE c_init (int argc, VALUE *argv, VALUE self)
+static void c_mark (RbEcoreEvasSoftwareX11 *ee)
 {
-       VALUE disp, parent, geom[4];
-       Ecore_Evas **ee = NULL;
+       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];
+       RbEcoreEvasSoftwareX11 *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, RbEcoreEvasSoftwareX11,
+                                c_mark, c_free, ee);
 
        rb_scan_args (argc, argv, "06", &disp, &parent,
                      &geom[0], &geom[1], &geom[2], &geom[3]);
@@ -47,34 +70,44 @@ static VALUE c_init (int argc, VALUE *argv, VALUE self)
        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]);
                }
 
-       *ee = ecore_evas_gl_x11_new (cdisp, 0,
-                                    igeom[0], igeom[1],
-                                    igeom[2], igeom[3]);
+       ecore_init ();
+       ecore_evas_init ();
+
+       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);
 
        return self;
 }
 
-static VALUE c_new (int argc, VALUE *argv, VALUE klass)
+static VALUE c_window_get (VALUE self)
 {
-       VALUE self;
-       Ecore_Evas **ee;
+       Ecore_X_Window w;
 
-       self = Data_Make_Struct (klass, Ecore_Evas *,
-                                NULL, c_ecore_evas_free, ee);
+       GET_OBJ (self, RbEcoreEvasSoftwareX11, ee);
 
-       rb_obj_call_init (self, argc, argv);
+       if (NIL_P (ee->window)) {
+               w = ecore_evas_software_x11_window_get (ee->ee.real);
+               ee->window = TO_ECORE_X_WINDOW (self, w);
+       }
 
-       return self;
+       return ee->window;
 }
 
-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);
+}