From 854431b47068220339f7d5ca2bffe1935e6fe336 Mon Sep 17 00:00:00 2001 From: Tilman Sauerbeck Date: Sat, 21 Aug 2004 09:45:08 +0000 Subject: [PATCH] Make use of Ecore::X::Window in Ecore::Evas::SoftwareX11. This way, we can improve the parent window handling. --- src/ecore_evas/rb_software_x11.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/src/ecore_evas/rb_software_x11.c b/src/ecore_evas/rb_software_x11.c index cbaa9f4..83504dd 100644 --- 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 77 2004-08-19 17:39:29Z tilman $ + * $Id: rb_software_x11.c 82 2004-08-21 09:45:08Z tilman $ * * Copyright (C) 2004 ruby-ecore team (see AUTHORS) * @@ -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); } @@ -59,6 +63,7 @@ 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}; @@ -73,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); @@ -82,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); -- 2.30.2