X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fecore_evas%2Frb_software_x11.c;h=83504dd94dab27e3ea75f1024bb68bba86841a03;hb=ddaa53d3761be0e96352e75e2002072d92389d10;hp=f694e3e68e7eda916b7fe93620f0d7a5f7ae210c;hpb=f805cf241a9d1fb9765892f0af48ede8359e9b65;p=ruby-ecore.git
diff --git a/src/ecore_evas/rb_software_x11.c b/src/ecore_evas/rb_software_x11.c
index f694e3e..83504dd 100644
--- a/src/ecore_evas/rb_software_x11.c
+++ b/src/ecore_evas/rb_software_x11.c
@@ -1,7 +1,7 @@
/*
- * $Id: rb_software_x11.c 50 2004-08-01 10:18:39Z tilman $
+ * $Id: rb_software_x11.c 82 2004-08-21 09:45:08Z 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
@@ -31,6 +31,7 @@
typedef struct {
RbEcoreEvas ee;
+ VALUE parent_window;
VALUE window;
} RbEcoreEvasSoftwareX11;
@@ -38,6 +39,9 @@ static void c_mark (RbEcoreEvasSoftwareX11 *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);
}
@@ -49,10 +53,17 @@ static void c_free (RbEcoreEvasSoftwareX11 *ee)
free (ee);
}
+/*
+ * 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)
{
VALUE self, disp, parent, geom[4];
RbEcoreEvasSoftwareX11 *ee = NULL;
+ RbWindow *win = NULL;
char *cdisp = NULL;
int i, igeom[4] = {0, 0, 0, 0};
@@ -67,6 +78,11 @@ static VALUE c_new (int argc, VALUE *argv, VALUE klass)
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);
@@ -76,9 +92,11 @@ static VALUE c_new (int argc, VALUE *argv, VALUE klass)
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]);
+ ee->parent_window = parent;
ee->window = Qnil;
rb_obj_call_init (self, 0, NULL);
@@ -86,6 +104,12 @@ static VALUE c_new (int argc, VALUE *argv, VALUE klass)
return self;
}
+/*
+ * call-seq:
+ * swx11.window => window
+ *
+ * Returns the Ecore::X::Window
object for swx11.
+ */
static VALUE c_window_get (VALUE self)
{
Ecore_X_Window w;