/*
- * $Id$
+ * $Id: rb_gl_x11.c 60 2004-08-10 14:12:36Z tilman $
*
* Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
*
#include <ruby.h>
+#include <Ecore.h>
#include <Ecore_Evas.h>
#include "rb_ecore_evas_main.h"
#include "rb_ecore_evas.h"
-VALUE cSoftwareX11;
+static void c_free (RbEcoreEvas *ee)
+{
+ c_ecore_evas_free (ee, true);
+}
-static VALUE c_init (int argc, VALUE *argv, VALUE self)
+/*
+ * 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 disp, parent, geom[4];
- Ecore_Evas **ee = NULL;
+ VALUE self, disp, parent, geom[4];
+ RbEcoreEvas *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, RbEcoreEvas,
+ c_ecore_evas_mark, c_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++)
if (!NIL_P (geom[i])) {
Check_Type (geom[i], T_FIXNUM);
- igeom[i] = NUM2INT (geom[i]);
+ igeom[i] = FIX2INT (geom[i]);
}
- *ee = ecore_evas_software_x11_new (cdisp, 0,
- igeom[0], igeom[1],
- igeom[2], igeom[3]);
+ ecore_init ();
+ ecore_evas_init ();
- return self;
-}
-
-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);
+ ee->real = ecore_evas_gl_x11_new (cdisp, 0,
+ igeom[0], igeom[1],
+ igeom[2], igeom[3]);
- rb_obj_call_init (self, argc, argv);
+ rb_obj_call_init (self, 0, NULL);
return self;
}
-void Init_SoftwareX11 (void)
+void Init_GlX11 (void)
{
- cSoftwareX11 = rb_define_class_under (mEvas,
- "SoftwareX11",
- cEcoreEvas);
+ VALUE c = rb_define_class_under (mEvas, "GlX11", cEcoreEvas);
- rb_define_singleton_method (cSoftwareX11, "new", c_new, -1);
- rb_define_method (cSoftwareX11, "initialize", c_init, -1);
+ rb_define_singleton_method (c, "new", c_new, -1);
}
-