projects
/
ruby-ecore.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Implemented the following events: MOUSE_MOVE, MOUSE_IN, MOUSE_OUT.
[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 d8e7a386ee1b5939125edb629468bcb0ff9f6446..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
14 2004-06-20 10:33:13
Z tilman $
+ * $Id: rb_gl_x11.c
77 2004-08-19 17:39:29
Z 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
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@
-20,21
+20,32
@@
#include <ruby.h>
#include <ruby.h>
+#include <Ecore.h>
#include <Ecore_Evas.h>
#include "rb_ecore_evas_main.h"
#include "rb_ecore_evas.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;
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]);
rb_scan_args (argc, argv, "06", &disp, &parent,
&geom[0], &geom[1], &geom[2], &geom[3]);
@@
-47,36
+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);
for (i = 0; i < 4; i++)
if (!NIL_P (geom[i])) {
Check_Type (geom[i], T_FIXNUM);
- igeom[i] =
NUM
2INT (geom[i]);
+ igeom[i] =
FIX
2INT (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;
}
return self;
}
-void Init_
Software
X11 (void)
+void Init_
Gl
X11 (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);
}
}
-