Updated copyright notice. Added event handler code.

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

diff --git a/src/ecore_evas/rb_gl_x11.c b/src/ecore_evas/rb_gl_x11.c
index 061517afb8df7e704dfbc84753f27d0f1e780299..e3ceb30fb238198d59033c13588e37405b91bd0d 100644 (file)
--- a/src/ecore_evas/rb_gl_x11.c
+++ b/src/ecore_evas/rb_gl_x11.c
@@ -1,7 +1,7 @@
 /*
- * $Id: rb_gl_x11.c 25 2004-06-26 23:07:01Z tilman $
+ * $Id: rb_gl_x11.c 77 2004-08-19 17:39:29Z 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
@@ -20,19 +20,32 @@
 
 #include <ruby.h>
 
+#include <Ecore.h>
 #include <Ecore_Evas.h>
 
 #include "rb_ecore_evas_main.h"
 #include "rb_ecore_evas.h"
 
-static VALUE c_init (int argc, VALUE *argv, VALUE self)
+static void c_free (RbEcoreEvas *ee)
 {
-       VALUE disp, parent, geom[4];
-       Ecore_Evas **ee = NULL;
+       c_ecore_evas_free (ee, true);
+}
+
+/*
+ * call-seq:
+ *  Ecore::Evas::GlX11.new([display, parent, x, y, w, h]) => glx11
+ *
+ * Creates an Ecore::Evas::GlX11 object.
+ */
+static VALUE c_new (int argc, VALUE *argv, VALUE klass)
+{
+       VALUE self, disp, parent, geom[4];
+       RbEcoreEvas *ee = NULL;
        char *cdisp = NULL;
        int i, igeom[4] = {0, 0, 0, 0};
 
-       Data_Get_Struct (self, Ecore_Evas *, ee);
+       self = Data_Make_Struct (klass, RbEcoreEvas,
+                                c_ecore_evas_mark, c_free, ee);
 
        rb_scan_args (argc, argv, "06", &disp, &parent,
                      &geom[0], &geom[1], &geom[2], &geom[3]);
@@ -45,34 +58,24 @@ 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 ();
 
-       return self;
-}
+       ee->real = ecore_evas_gl_x11_new (cdisp, 0,
+                                         igeom[0], igeom[1],
+                                         igeom[2], igeom[3]);
 
-static VALUE c_new (int argc, VALUE *argv, VALUE klass)
-{
-       VALUE self;
-       Ecore_Evas **ee;
-
-       self = Data_Make_Struct (klass, Ecore_Evas *,
-                                NULL, c_ecore_evas_free, ee);
-
-       rb_obj_call_init (self, argc, argv);
+       rb_obj_call_init (self, 0, NULL);
 
        return self;
 }
 
 void Init_GlX11 (void)
 {
-       VALUE cGlX11 = rb_define_class_under (mEvas, "GlX11", cEcoreEvas);
+       VALUE c = rb_define_class_under (mEvas, "GlX11", cEcoreEvas);
 
-       rb_define_singleton_method (cGlX11, "new", c_new, -1);
-       rb_define_method (cGlX11, "initialize", c_init, -1);
+       rb_define_singleton_method (c, "new", c_new, -1);
 }
-