From b766027333443e5483024afbbfe40f78ad4168ba Mon Sep 17 00:00:00 2001 From: Tilman Sauerbeck Date: Sat, 24 Dec 2005 17:11:24 +0000 Subject: [PATCH] Added support for the XRender Evas engine. --- src/ecore_evas/rb_ecore_evas_main.c | 4 +- src/ecore_evas/rb_xrender_x11.c | 136 ++++++++++++++++++++++++++++ src/ecore_evas/rb_xrender_x11.h | 26 ++++++ 3 files changed, 165 insertions(+), 1 deletion(-) create mode 100644 src/ecore_evas/rb_xrender_x11.c create mode 100644 src/ecore_evas/rb_xrender_x11.h diff --git a/src/ecore_evas/rb_ecore_evas_main.c b/src/ecore_evas/rb_ecore_evas_main.c index da98b48..b77925f 100644 --- a/src/ecore_evas/rb_ecore_evas_main.c +++ b/src/ecore_evas/rb_ecore_evas_main.c @@ -1,5 +1,5 @@ /* - * $Id: rb_ecore_evas_main.c 174 2005-01-19 21:31:04Z tilman $ + * $Id: rb_ecore_evas_main.c 348 2005-12-24 17:11:24Z tilman $ * * Copyright (C) 2004-2005 ruby-ecore team (see AUTHORS) * @@ -27,6 +27,7 @@ #include "rb_ecore_evas.h" #include "rb_software_x11.h" #include "rb_gl_x11.h" +#include "rb_xrender_x11.h" #include "rb_fb.h" #include "rb_buffer.h" @@ -40,6 +41,7 @@ void Init_ecore_evas (void) Init_EcoreEvas (); Init_SoftwareX11 (); Init_GlX11 (); + Init_XRenderX11 (); Init_Fb (); Init_Buffer (); } diff --git a/src/ecore_evas/rb_xrender_x11.c b/src/ecore_evas/rb_xrender_x11.c new file mode 100644 index 0000000..a403bfa --- /dev/null +++ b/src/ecore_evas/rb_xrender_x11.c @@ -0,0 +1,136 @@ +/* + * $Id: rb_xrender_x11.c 348 2005-12-24 17:11:24Z tilman $ + * + * Copyright (C) 2005 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 + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include + +#include +#include + +#include "../ecore/rb_ecore.h" +#include "../ecore_x/rb_window.h" +#include "rb_ecore_evas_main.h" +#include "rb_ecore_evas.h" + +typedef struct { + RbEcoreEvas ee; + VALUE parent_window; + VALUE window; +} RbEcoreEvasXRenderX11; + +static void c_mark (RbEcoreEvasXRenderX11 *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); +} + +static void c_free (RbEcoreEvasXRenderX11 *ee) +{ + c_ecore_evas_free (&ee->ee, false); + + free (ee); +} + +/* + * call-seq: + * Ecore::Evas::XRenderX11.new([display, parent, x, y, w, h]) => xrx11 + * + * Creates an Ecore::Evas::XRenderX11 object. + */ +static VALUE c_new (int argc, VALUE *argv, VALUE klass) +{ + VALUE self, disp, parent, geom[4]; + RbEcoreEvasXRenderX11 *ee = NULL; + RbWindow *win = NULL; + char *cdisp = NULL; + int i, igeom[4] = {0, 0, 0, 0}; + + self = Data_Make_Struct (klass, RbEcoreEvasXRenderX11, + c_mark, c_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); + 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]); + } + + ecore_init (); + ecore_evas_init (); + + ee->ee.real = ecore_evas_xrender_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); + + return self; +} + +/* + * call-seq: + * xrx11.window => window + * + * Returns the Ecore::X::Window object for xrx11. + */ +static VALUE c_window_get (VALUE self) +{ + Ecore_X_Window w; + + GET_OBJ (self, RbEcoreEvasXRenderX11, ee); + + if (NIL_P (ee->window)) { + w = ecore_evas_xrender_x11_window_get (ee->ee.real); + ee->window = TO_ECORE_X_WINDOW (self, w); + } + + return ee->window; +} + +void Init_XRenderX11 (void) +{ + VALUE c; + + rb_require ("ecore_x"); + + c = rb_define_class_under (mEvas, "XRenderX11", cEcoreEvas); + + rb_define_singleton_method (c, "new", c_new, -1); + rb_define_method (c, "window", c_window_get, 0); +} diff --git a/src/ecore_evas/rb_xrender_x11.h b/src/ecore_evas/rb_xrender_x11.h new file mode 100644 index 0000000..e40a9c4 --- /dev/null +++ b/src/ecore_evas/rb_xrender_x11.h @@ -0,0 +1,26 @@ +/* + * $Id: rb_xrender_x11.h 348 2005-12-24 17:11:24Z tilman $ + * + * Copyright (C) 2005 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 + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef __RB_XRENDER_X11_H +#define __RB_XRENDER_X11_H + +void Init_XRenderX11 (void); + +#endif -- 2.30.2