projects
/
ruby-ecore.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Macro updates.
[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 89c996e54579d5a2c9ccc69f859b84787941b92b..d61c66fd95f5b916d160cc48e592a7a30f3745ce 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
9 2004-06-19 19:53:47
Z tilman $
+ * $Id: rb_software_x11.c
27 2004-07-08 18:25:05
Z tilman $
*
* Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
*
*
* Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
*
@@
-20,28
+20,28
@@
#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 cGlX11;
-
-static VALUE c_init (int argc, VALUE *argv, VALUE self)
+static VALUE c_new (int argc, VALUE *argv, VALUE klass)
{
{
- VALUE disp, parent, geom[4];
+ VALUE
self,
disp, parent, geom[4];
Ecore_Evas **ee = NULL;
char *cdisp = NULL;
Ecore_Evas **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, Ecore_Evas *,
+ NULL, c_ecore_evas_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);
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 = S
TR2CSTR
(disp);
+ cdisp = S
tringValuePtr
(disp);
}
for (i = 0; i < 4; i++)
}
for (i = 0; i < 4; i++)
@@
-50,31
+50,23
@@
static VALUE c_init (int argc, VALUE *argv, VALUE self)
igeom[i] = NUM2INT (geom[i]);
}
igeom[i] = NUM2INT (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 = ecore_evas_software_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;
}
return self;
}
-void Init_
Gl
X11 (void)
+void Init_
Software
X11 (void)
{
{
- cGlX11 = rb_define_class_under (mEvas, "GlX11", cEcoreEvas);
+ VALUE cSoftwareX11 = rb_define_class_under (mEvas,
+ "SoftwareX11",
+ cEcoreEvas);
- rb_define_singleton_method (cGlX11, "new", c_new, -1);
- rb_define_method (cGlX11, "initialize", c_init, -1);
+ rb_define_singleton_method (cSoftwareX11, "new", c_new, -1);
}
}
-