/*
- * $Id: rb_ecore_evas.c 45 2004-07-26 11:00:14Z tilman $
+ * $Id: rb_ecore_evas.c 50 2004-08-01 10:18:39Z tilman $
*
* Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
*
*/
#include <ruby.h>
+#include <stdbool.h>
#include <Ecore.h>
#include <Ecore_Evas.h>
-#include <rb_evas.h>
+#include <evas/rb_evas.h>
#define __RB_ECORE_EVAS_C
#include "../ecore/rb_ecore.h"
#include "rb_ecore_evas.h"
#define CALLBACK_ADD_HANDLER(name) \
- static void on_##name (Ecore_Evas *ee) \
+ static void on_##name (Ecore_Evas *real) \
{ \
- VALUE self = rb_hash_aref (objects, INT2NUM ((long) ee)); \
- VALUE hash = rb_hash_aref (callbacks, self); \
+ VALUE self = rb_hash_aref (objects, INT2NUM ((long) real)); \
+ VALUE cb; \
\
- rb_funcall (rb_hash_aref (hash, rb_str_new2 (#name)), \
- rb_intern ("call"), 0); \
+ GET_OBJ (self, RbEcoreEvas, ee); \
+\
+ cb = rb_hash_aref (ee->callbacks, rb_str_new2 (#name)); \
+ rb_funcall (cb, rb_intern ("call"), 0); \
} \
\
static VALUE c_on_##name (VALUE self) \
{ \
- VALUE hash; \
-\
- GET_OBJ (self, Ecore_Evas *, ee); \
+ GET_OBJ (self, RbEcoreEvas, ee); \
\
if (!rb_block_given_p ()) \
return Qnil; \
\
- if (NIL_P ((hash = rb_hash_aref (callbacks, self)))) { \
- hash = rb_hash_new (); \
-\
- rb_global_variable (&hash); \
- rb_hash_aset (callbacks, self, hash); \
- } \
+ rb_hash_aset (ee->callbacks, rb_str_new2 (#name), \
+ rb_block_proc ()); \
\
- rb_hash_aset (hash, rb_str_new2 (#name), rb_block_proc ()); \
-\
- ecore_evas_callback_##name##_set (*ee, on_##name); \
+ ecore_evas_callback_##name##_set (ee->real, on_##name); \
\
return Qnil; \
}
rb_define_method ((mod), "on_"#name, c_on_##name, 0);
VALUE cEcoreEvas;
-static VALUE evases, callbacks, objects;
+static VALUE objects;
/* called by the child classes */
-void c_ecore_evas_free (Ecore_Evas **ee)
+void c_ecore_evas_mark (RbEcoreEvas *ee)
{
- if (*ee) {
- rb_hash_aset (objects, INT2NUM ((long) *ee), Qnil);
- ecore_evas_free (*ee);
- }
+ if (!NIL_P (ee->evas))
+ rb_gc_mark (ee->evas);
+
+ rb_gc_mark (ee->callbacks);
+}
- rb_hash_aset (evases, INT2NUM ((long) ee), Qnil);
+void c_ecore_evas_free (RbEcoreEvas *ee, bool free_mem)
+{
+ if (ee->real)
+ ecore_evas_free (ee->real);
ecore_evas_shutdown ();
ecore_shutdown ();
- free (ee);
+ if (free_mem)
+ free (ee);
}
-static VALUE c_initialize (int argc, VALUE *argv, VALUE self)
+static VALUE c_init (int argc, VALUE *argv, VALUE self)
{
- Ecore_Evas **ee = NULL;
+ GET_OBJ (self, RbEcoreEvas, ee);
- Data_Get_Struct (self, Ecore_Evas *, ee);
+ ee->evas = Qnil;
+ ee->callbacks = rb_hash_new ();
- rb_hash_aset (objects, INT2NUM ((long) *ee), self);
+ rb_hash_aset (objects, INT2NUM ((long) ee->real), self);
return Qnil;
}
static VALUE c_inspect (VALUE self)
{
- INSPECT (self, Ecore_Evas *);
+ INSPECT (self, RbEcoreEvas);
}
static VALUE c_show (VALUE self)
{
- GET_OBJ (self, Ecore_Evas *, ee);
+ GET_OBJ (self, RbEcoreEvas, ee);
- ecore_evas_show (*ee);
+ ecore_evas_show (ee->real);
return Qnil;
}
static VALUE c_hide (VALUE self)
{
- GET_OBJ (self, Ecore_Evas *, ee);
+ GET_OBJ (self, RbEcoreEvas, ee);
- ecore_evas_hide (*ee);
+ ecore_evas_hide (ee->real);
return Qnil;
}
static VALUE c_visible_get (VALUE self)
{
- GET_OBJ (self, Ecore_Evas *, ee);
+ GET_OBJ (self, RbEcoreEvas, ee);
- return ecore_evas_visibility_get (*ee) ? Qtrue : Qfalse;
+ return ecore_evas_visibility_get (ee->real) ? Qtrue : Qfalse;
}
static VALUE c_raise (VALUE self)
{
- GET_OBJ (self, Ecore_Evas *, ee);
+ GET_OBJ (self, RbEcoreEvas, ee);
- ecore_evas_raise (*ee);
+ ecore_evas_raise (ee->real);
return Qnil;
}
static VALUE c_lower (VALUE self)
{
- GET_OBJ (self, Ecore_Evas *, ee);
+ GET_OBJ (self, RbEcoreEvas, ee);
- ecore_evas_lower (*ee);
+ ecore_evas_lower (ee->real);
return Qnil;
}
static VALUE c_layer_get (VALUE self)
{
- GET_OBJ (self, Ecore_Evas *, ee);
+ GET_OBJ (self, RbEcoreEvas, ee);
- return INT2FIX (ecore_evas_layer_get (*ee));
+ return INT2FIX (ecore_evas_layer_get (ee->real));
}
static VALUE c_layer_set (VALUE self, VALUE val)
{
- GET_OBJ (self, Ecore_Evas *, ee);
+ GET_OBJ (self, RbEcoreEvas, ee);
Check_Type (val, T_FIXNUM);
- ecore_evas_layer_set (*ee, FIX2INT (val));
+ ecore_evas_layer_set (ee->real, FIX2INT (val));
return Qnil;
}
static VALUE c_evas_get (VALUE self)
{
- VALUE evas;
-
- GET_OBJ (self, Ecore_Evas *, ee);
+ GET_OBJ (self, RbEcoreEvas, ee);
- if (NIL_P (evas = rb_hash_aref (evases, INT2NUM ((long) (ee))))) {
- evas = TO_EVAS (self, ecore_evas_get (*ee));
- rb_hash_aset (evases, INT2NUM ((long) ee), evas);
- }
+ if (NIL_P (ee->evas))
+ ee->evas = TO_EVAS (self, ecore_evas_get (ee->real));
- return evas;
+ return ee->evas;
}
static VALUE c_geometry_get (VALUE self)
{
int x = 0, y = 0, w = 0, h = 0;
- GET_OBJ (self, Ecore_Evas *, ee);
+ GET_OBJ (self, RbEcoreEvas, ee);
- ecore_evas_geometry_get (*ee, &x, &y, &w, &h);
+ ecore_evas_geometry_get (ee->real, &x, &y, &w, &h);
return rb_ary_new3 (4, INT2FIX (x), INT2FIX (y),
INT2FIX (w), INT2FIX (h));
{
int w = 0, h = 0;
- GET_OBJ (self, Ecore_Evas *, ee);
+ GET_OBJ (self, RbEcoreEvas, ee);
- ecore_evas_size_min_get (*ee, &w, &h);
+ ecore_evas_size_min_get (ee->real, &w, &h);
return rb_ary_new3 (2, INT2FIX (w), INT2FIX (h));
}
static VALUE c_set_size_min (VALUE self, VALUE w, VALUE h)
{
- GET_OBJ (self, Ecore_Evas *, ee);
+ GET_OBJ (self, RbEcoreEvas, ee);
Check_Type (w, T_FIXNUM);
Check_Type (h, T_FIXNUM);
- ecore_evas_size_min_set (*ee, FIX2INT (w), FIX2INT (h));
+ ecore_evas_size_min_set (ee->real, FIX2INT (w), FIX2INT (h));
return Qnil;
}
{
int w = 0, h = 0;
- GET_OBJ (self, Ecore_Evas *, ee);
+ GET_OBJ (self, RbEcoreEvas, ee);
- ecore_evas_size_max_get (*ee, &w, &h);
+ ecore_evas_size_max_get (ee->real, &w, &h);
return rb_ary_new3 (2, INT2FIX (w), INT2FIX (h));
}
static VALUE c_set_size_max (VALUE self, VALUE w, VALUE h)
{
- GET_OBJ (self, Ecore_Evas *, ee);
+ GET_OBJ (self, RbEcoreEvas, ee);
Check_Type (w, T_FIXNUM);
Check_Type (h, T_FIXNUM);
- ecore_evas_size_max_set (*ee, FIX2INT (w), FIX2INT (h));
+ ecore_evas_size_max_set (ee->real, FIX2INT (w), FIX2INT (h));
return Qnil;
}
static VALUE c_move (VALUE self, VALUE x, VALUE y)
{
- GET_OBJ (self, Ecore_Evas *, ee);
+ GET_OBJ (self, RbEcoreEvas, ee);
Check_Type (x, T_FIXNUM);
Check_Type (y, T_FIXNUM);
- ecore_evas_move (*ee, FIX2INT (x), FIX2INT (y));
+ ecore_evas_move (ee->real, FIX2INT (x), FIX2INT (y));
return Qnil;
}
static VALUE c_resize (VALUE self, VALUE w, VALUE h)
{
- GET_OBJ (self, Ecore_Evas *, ee);
+ GET_OBJ (self, RbEcoreEvas, ee);
Check_Type (w, T_FIXNUM);
Check_Type (h, T_FIXNUM);
- ecore_evas_resize (*ee, FIX2INT (w), FIX2INT (h));
+ ecore_evas_resize (ee->real, FIX2INT (w), FIX2INT (h));
return Qnil;
}
{
const char *tmp;
- GET_OBJ (self, Ecore_Evas *, ee);
+ GET_OBJ (self, RbEcoreEvas, ee);
- if (!(tmp = ecore_evas_title_get (*ee)))
+ if (!(tmp = ecore_evas_title_get (ee->real)))
return Qnil;
else
return rb_str_new2 (tmp);
static VALUE c_title_set (VALUE self, VALUE val)
{
- GET_OBJ (self, Ecore_Evas *, ee);
+ GET_OBJ (self, RbEcoreEvas, ee);
Check_Type (val, T_STRING);
- ecore_evas_title_set (*ee, StringValuePtr (val));
+ ecore_evas_title_set (ee->real, StringValuePtr (val));
return Qnil;
}
static VALUE c_borderless_get (VALUE self)
{
- GET_OBJ (self, Ecore_Evas *, ee);
+ GET_OBJ (self, RbEcoreEvas, ee);
- return ecore_evas_borderless_get (*ee) ? Qtrue : Qfalse;
+ return ecore_evas_borderless_get (ee->real) ? Qtrue : Qfalse;
}
static VALUE c_borderless_set (VALUE self, VALUE val)
{
- GET_OBJ (self, Ecore_Evas *, ee);
+ GET_OBJ (self, RbEcoreEvas, ee);
CHECK_BOOL (val);
- ecore_evas_borderless_set (*ee, val == Qtrue ? 1 : 0);
+ ecore_evas_borderless_set (ee->real, val == Qtrue);
return Qnil;
}
static VALUE c_shaped_get (VALUE self)
{
- GET_OBJ (self, Ecore_Evas *, ee);
+ GET_OBJ (self, RbEcoreEvas, ee);
- return ecore_evas_shaped_get (*ee) ? Qtrue : Qfalse;
+ return ecore_evas_shaped_get (ee->real) ? Qtrue : Qfalse;
}
static VALUE c_shaped_set (VALUE self, VALUE val)
{
- GET_OBJ (self, Ecore_Evas *, ee);
+ GET_OBJ (self, RbEcoreEvas, ee);
CHECK_BOOL (val);
- ecore_evas_shaped_set (*ee, val == Qtrue ? 1 : 0);
+ ecore_evas_shaped_set (ee->real, val == Qtrue);
return Qnil;
}
static VALUE c_sticky_get (VALUE self)
{
- GET_OBJ (self, Ecore_Evas *, ee);
+ GET_OBJ (self, RbEcoreEvas, ee);
- return ecore_evas_sticky_get (*ee) ? Qtrue : Qfalse;
+ return ecore_evas_sticky_get (ee->real) ? Qtrue : Qfalse;
}
static VALUE c_sticky_set (VALUE self, VALUE val)
{
- GET_OBJ (self, Ecore_Evas *, ee);
+ GET_OBJ (self, RbEcoreEvas, ee);
CHECK_BOOL (val);
- ecore_evas_sticky_set (*ee, val == Qtrue ? 1 : 0);
+ ecore_evas_sticky_set (ee->real, val == Qtrue);
return Qnil;
}
static VALUE c_rotation_get (VALUE self)
{
- GET_OBJ (self, Ecore_Evas *, ee);
+ GET_OBJ (self, RbEcoreEvas, ee);
- return INT2FIX (ecore_evas_rotation_get (*ee));
+ return INT2FIX (ecore_evas_rotation_get (ee->real));
}
static VALUE c_rotation_set (VALUE self, VALUE val)
{
- GET_OBJ (self, Ecore_Evas *, ee);
+ GET_OBJ (self, RbEcoreEvas, ee);
Check_Type (val, T_FIXNUM);
- ecore_evas_rotation_set (*ee, FIX2INT (val));
+ ecore_evas_rotation_set (ee->real, FIX2INT (val));
return Qnil;
}
/* FIXME: this is unsafe! */
static VALUE c_delete (VALUE self)
{
- GET_OBJ (self, Ecore_Evas *, ee);
+ GET_OBJ (self, RbEcoreEvas, ee);
/* reap our children */
rb_gc_start ();
- ecore_evas_free (*ee);
- rb_hash_aset (objects, INT2NUM ((long) *ee), Qnil);
- *ee = NULL;
+ ecore_evas_free (ee->real);
+ rb_hash_aset (objects, INT2NUM ((long) ee->real), Qnil);
+ ee->real = NULL;
return Qnil;
}
rb_define_private_method (rb_singleton_class (cEcoreEvas),
"new", NULL, 0);
- rb_define_method (cEcoreEvas, "initialize", c_initialize, -1);
+ rb_define_method (cEcoreEvas, "initialize", c_init, -1);
rb_define_method (cEcoreEvas, "inspect", c_inspect, 0);
rb_define_method (cEcoreEvas, "delete", c_delete, 0);
rb_define_method (cEcoreEvas, "show", c_show, 0);
CALLBACK_ADD (cEcoreEvas, pre_render);
CALLBACK_ADD (cEcoreEvas, post_render);
- evases = rb_hash_new ();
- rb_global_variable (&evases);
-
objects = rb_hash_new ();
rb_global_variable (&objects);
-
- callbacks = rb_hash_new ();
- rb_global_variable (&callbacks);
}
projects / ruby-ecore.git / blobdiff