projects
/
ruby-ecore.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removed RCS-style IDs.
[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 cbaa9f498a42581fc893f40a64d4b5d1f9d3a463..fe27329babcd177cfefc410f754e099b32dab608 100644
(file)
--- a/
src/ecore_evas/rb_software_x11.c
+++ b/
src/ecore_evas/rb_software_x11.c
@@
-1,6
+1,4
@@
/*
/*
- * $Id: rb_software_x11.c 77 2004-08-19 17:39:29Z tilman $
- *
* Copyright (C) 2004 ruby-ecore team (see AUTHORS)
*
* This library is free software; you can redistribute it and/or
* Copyright (C) 2004 ruby-ecore team (see AUTHORS)
*
* This library is free software; you can redistribute it and/or
@@
-19,7
+17,6
@@
*/
#include <ruby.h>
*/
#include <ruby.h>
-#include <stdbool.h>
#include <Ecore.h>
#include <Ecore_Evas.h>
#include <Ecore.h>
#include <Ecore_Evas.h>
@@
-31,6
+28,7
@@
typedef struct {
RbEcoreEvas ee;
typedef struct {
RbEcoreEvas ee;
+ VALUE parent_window;
VALUE window;
} RbEcoreEvasSoftwareX11;
VALUE window;
} RbEcoreEvasSoftwareX11;
@@
-38,6
+36,9
@@
static void c_mark (RbEcoreEvasSoftwareX11 *ee)
{
c_ecore_evas_mark (&ee->ee);
{
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);
}
if (!NIL_P (ee->window))
rb_gc_mark (ee->window);
}
@@
-49,21
+50,31
@@
static void c_free (RbEcoreEvasSoftwareX11 *ee)
free (ee);
}
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.
*/
/*
* call-seq:
* Ecore::Evas::SoftwareX11.new([display, parent, x, y, w, h]) => swx11
*
* Creates an Ecore::Evas::SoftwareX11 object.
*/
-static VALUE c_
new (int argc, VALUE *argv, VALUE klass
)
+static VALUE c_
init (int argc, VALUE *argv, VALUE self
)
{
{
- VALUE
self,
disp, parent, geom[4];
- Rb
EcoreEvasSoftwareX11 *ee
= NULL;
+ VALUE disp, parent, geom[4];
+ Rb
Window *win
= NULL;
char *cdisp = NULL;
int i, igeom[4] = {0, 0, 0, 0};
char *cdisp = NULL;
int i, igeom[4] = {0, 0, 0, 0};
- self = Data_Make_Struct (klass, RbEcoreEvasSoftwareX11,
- c_mark, c_free, ee);
+ GET_OBJ (self, RbEcoreEvasSoftwareX11, 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]);
@@
-73,21
+84,25
@@
static VALUE c_new (int argc, VALUE *argv, VALUE klass)
cdisp = StringValuePtr (disp);
}
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] = FIX2INT (geom[i]);
}
for (i = 0; i < 4; i++)
if (!NIL_P (geom[i])) {
Check_Type (geom[i], T_FIXNUM);
igeom[i] = FIX2INT (geom[i]);
}
- ecore_init ();
- ecore_evas_init ();
-
- ee->ee.real = ecore_evas_software_x11_new (cdisp, 0,
+ ee->ee.real = ecore_evas_software_x11_new (cdisp,
+ win ? win->real : 0,
igeom[0], igeom[1],
igeom[2], igeom[3]);
igeom[0], igeom[1],
igeom[2], igeom[3]);
+ ee->parent_window = parent;
ee->window = Qnil;
ee->window = Qnil;
- rb_
obj_call_init (self, 0, NULL
);
+ rb_
call_super (argc, argv
);
return self;
}
return self;
}
@@
-116,10
+131,9
@@
void Init_SoftwareX11 (void)
{
VALUE c;
{
VALUE c;
- rb_require ("ecore_x");
-
c = rb_define_class_under (mEvas, "SoftwareX11", cEcoreEvas);
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);
}
rb_define_method (c, "window", c_window_get, 0);
}