Resolve the cWindow reference using Ruby.

[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 055c17e1a357a6c55f0c95de89784e33675a7295..e8c38338ffac1ac44dbdbd3356df523b74d0847d 100644 (file)
--- a/src/ecore_evas/rb_software_x11.c
+++ b/src/ecore_evas/rb_software_x11.c
@@ -1,7 +1,7 @@
 /*
- * $Id: rb_software_x11.c 40 2004-07-25 13:14:34Z tilman $
+ * $Id: rb_software_x11.c 389 2006-11-11 11:40:24Z tilman $
  *
- * Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
+ * Copyright (C) 2004 ruby-ecore team (see AUTHORS)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -28,17 +28,55 @@
 #include "rb_ecore_evas_main.h"
 #include "rb_ecore_evas.h"
 
-static VALUE windows;
+typedef struct {
+       RbEcoreEvas ee;
+       VALUE parent_window;
+       VALUE window;
+} RbEcoreEvasSoftwareX11;
 
-static VALUE c_new (int argc, VALUE *argv, VALUE klass)
+static void c_mark (RbEcoreEvasSoftwareX11 *ee)
 {
-       VALUE self, disp, parent, geom[4];
-       Ecore_Evas **ee = NULL;
+       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 (RbEcoreEvasSoftwareX11 *ee)
+{
+       c_ecore_evas_free (&ee->ee, false);
+
+       free (ee);
+}
+
+static VALUE c_alloc (VALUE klass)
+{
+       RbEcoreEvasSoftwareX11 *ee = NULL;
+
+       ecore_init ();
+       ecore_evas_init ();
+
+       return Data_Make_Struct (klass, RbEcoreEvasSoftwareX11,
+                                c_mark, c_free, ee);
+}
+
+/*
+ * call-seq:
+ *  Ecore::Evas::SoftwareX11.new([display, parent, x, y, w, h]) => swx11
+ *
+ * Creates an Ecore::Evas::SoftwareX11 object.
+ */
+static VALUE c_init (int argc, VALUE *argv, VALUE self)
+{
+       VALUE disp, parent, geom[4];
+       RbWindow *win = 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);
+       GET_OBJ (self, RbEcoreEvasSoftwareX11, ee);
 
        rb_scan_args (argc, argv, "06", &disp, &parent,
                      &geom[0], &geom[1], &geom[2], &geom[3]);
@@ -48,51 +86,56 @@ 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);
-                       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,
+                                                  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);
+       rb_call_super (argc, argv);
 
        return self;
 }
 
+/*
+ * call-seq:
+ *  swx11.window => window
+ *
+ * Returns the <code>Ecore::X::Window</code> object for <i>swx11</i>.
+ */
 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)
 {
        VALUE c;
 
-       rb_require ("ecore_x");
-
        c = rb_define_class_under (mEvas, "SoftwareX11", cEcoreEvas);
 
-       rb_define_singleton_method (c, "new", c_new, -1);
+       rb_define_alloc_func (c, c_alloc);
+       rb_define_method (c, "initialize", c_init, -1);
        rb_define_method (c, "window", c_window_get, 0);
-
-       windows = rb_hash_new ();
-       rb_global_variable (&windows);
 }