X-Git-Url: http://git.code-monkey.de/?p=ruby-evas.git;a=blobdiff_plain;f=src%2Frb_evas_object.c;h=3be8bf694eef5ca9a78bb0d023cb042caa4a7b53;hp=6c0a90f99498f4d6ea7f68c908765de73bd7b3bc;hb=c3202d026f3800676461ee407f2a5e46dc20e2f2;hpb=31278d5bfe44418ddc64610ff049a46990b7a5f8
diff --git a/src/rb_evas_object.c b/src/rb_evas_object.c
index 6c0a90f..3be8bf6 100644
--- a/src/rb_evas_object.c
+++ b/src/rb_evas_object.c
@@ -1,6 +1,4 @@
/*
- * $Id: rb_evas_object.c 64 2004-08-12 19:37:04Z tilman $
- *
* Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
*
* This library is free software; you can redistribute it and/or
@@ -30,10 +28,31 @@
VALUE cEvasObject;
+VALUE TO_EVAS_OBJECT (Evas_Object *o)
+{
+ void *obj;
+
+ if (!o)
+ return Qnil;
+
+ if (!(obj = evas_object_data_get (o, RUBY_EVAS_OBJECT_KEY))) {
+ rb_raise (rb_eException, "EvasObject Ruby object key missing");
+ return Qnil;
+ }
+
+ return (VALUE) obj;
+}
+
/* called by the child classes */
void c_evas_object_mark (RbEvasObject *e)
{
rb_gc_mark (e->parent);
+
+ if (!NIL_P (e->callbacks))
+ rb_gc_mark (e->callbacks);
+
+ if (!NIL_P (e->userdata))
+ rb_gc_mark (e->userdata);
}
void c_evas_object_free (RbEvasObject *e, bool free_mem)
@@ -45,6 +64,19 @@ void c_evas_object_free (RbEvasObject *e, bool free_mem)
free (e);
}
+static void c_free (RbEvasObject *e)
+{
+ c_evas_object_free (e, true);
+}
+
+static VALUE c_alloc (VALUE klass)
+{
+ RbEvasObject *e;
+
+ return Data_Make_Struct (klass, RbEvasObject, c_evas_object_mark,
+ c_free, e);
+}
+
/* :nodoc: */
static VALUE c_init (VALUE self, VALUE parent)
{
@@ -53,6 +85,7 @@ static VALUE c_init (VALUE self, VALUE parent)
evas_object_data_set (e->real, RUBY_EVAS_OBJECT_KEY, (void *) self);
e->parent = parent;
+ e->callbacks = Qnil;
return self;
}
@@ -63,6 +96,17 @@ static VALUE c_inspect (VALUE self)
INSPECT (self, RbEvasObject);
}
+static VALUE c_type_get (VALUE self)
+{
+ const char *s;
+
+ GET_OBJ (self, RbEvasObject, e);
+
+ s = evas_object_type_get (e->real);
+
+ return s ? rb_str_new2 (s) : Qnil;
+}
+
/*
* call-seq:
* e.delete => nil
@@ -189,6 +233,36 @@ static VALUE c_visible_get (VALUE self)
return evas_object_visible_get (e->real) ? Qtrue : Qfalse;
}
+/*
+ * call-seq:
+ * e.focused? => true or false
+ *
+ * Returns true if e is focused, else returns false.
+ */
+static VALUE c_focused_get (VALUE self)
+{
+ GET_OBJ (self, RbEvasObject, e);
+
+ return evas_object_focus_get (e->real) ? Qtrue : Qfalse;
+}
+
+/*
+ * call-seq:
+ * e.focused(true or false)
+ *
+ * (Un)focuses e.
+ */
+static VALUE c_focused_set (VALUE self, VALUE val)
+{
+ GET_OBJ (self, RbEvasObject, e);
+
+ CHECK_BOOL (val);
+
+ evas_object_focus_set (e->real, val == Qtrue);
+
+ return Qnil;
+}
+
/*
* call-seq:
* e.evas => evas
@@ -230,8 +304,6 @@ static VALUE c_name_set (VALUE self, VALUE val)
{
GET_OBJ (self, RbEvasObject, e);
- Check_Type (val, T_STRING);
-
evas_object_name_set (e->real, StringValuePtr (val));
return Qnil;
@@ -312,6 +384,23 @@ static VALUE c_set_color (VALUE self, VALUE r, VALUE g, VALUE b,
return Qnil;
}
+static VALUE c_get_clip (VALUE self)
+{
+ GET_OBJ (self, RbEvasObject, e);
+
+ return TO_EVAS_OBJECT (evas_object_clip_get (e->real));
+}
+
+static VALUE c_set_clip (VALUE self, VALUE clip)
+{
+ GET_OBJ (self, RbEvasObject, e);
+ GET_OBJ (clip, RbEvasObject, e2);
+
+ evas_object_clip_set (e->real, e2->real);
+
+ return Qnil;
+}
+
/*
* call-seq:
* e.pass_events? => true or false
@@ -344,6 +433,56 @@ static VALUE c_pass_events_set (VALUE self, VALUE val)
return Qnil;
}
+/*
+ * call-seq:
+ * e.repeat_events? => true or false
+ *
+ * Returns true if e repeats events to EvasObjects that are
+ * below itself, else returns false.
+ */
+static VALUE c_repeat_events_get (VALUE self)
+{
+ GET_OBJ (self, RbEvasObject, e);
+
+ return evas_object_repeat_events_get (e->real) ? Qtrue : Qfalse;
+}
+
+/*
+ * call-seq:
+ * e.repeat_events(true or false)
+ *
+ * Sets whether e repeats events to EvasObjects that are
+ * below itself.
+ */
+static VALUE c_repeat_events_set (VALUE self, VALUE val)
+{
+ GET_OBJ (self, RbEvasObject, e);
+
+ CHECK_BOOL (val);
+
+ evas_object_repeat_events_set (e->real, val == Qtrue);
+
+ return Qnil;
+}
+
+static VALUE c_anti_alias_get (VALUE self)
+{
+ GET_OBJ (self, RbEvasObject, e);
+
+ return evas_object_anti_alias_get (e->real) ? Qtrue : Qfalse;
+}
+
+static VALUE c_anti_alias_set (VALUE self, VALUE val)
+{
+ GET_OBJ (self, RbEvasObject, e);
+
+ CHECK_BOOL (val);
+
+ evas_object_anti_alias_set (e->real, val == Qtrue);
+
+ return Qnil;
+}
+
/*
* call-seq:
* e.raise => nil
@@ -419,20 +558,9 @@ static VALUE c_stack_below (VALUE self, VALUE target)
*/
static VALUE c_above_get (VALUE self)
{
- Evas_Object *o;
- void *obj;
-
GET_OBJ (self, RbEvasObject, e);
- if (!(o = evas_object_above_get (e->real)))
- return Qnil;
-
- if (!(obj = evas_object_data_get (o, RUBY_EVAS_OBJECT_KEY))) {
- rb_raise (rb_eException, "EvasObject Ruby object key missing");
- return Qnil;
- }
-
- return (VALUE) obj;
+ return TO_EVAS_OBJECT (evas_object_above_get (e->real));
}
/*
@@ -444,20 +572,19 @@ static VALUE c_above_get (VALUE self)
*/
static VALUE c_below_get (VALUE self)
{
- Evas_Object *o;
- void *obj;
-
GET_OBJ (self, RbEvasObject, e);
- if (!(o = evas_object_below_get (e->real)))
- return Qnil;
+ return TO_EVAS_OBJECT (evas_object_below_get (e->real));
+}
- if (!(obj = evas_object_data_get (o, RUBY_EVAS_OBJECT_KEY))) {
- rb_raise (rb_eException, "EvasObject Ruby object key missing");
- return Qnil;
- }
+static VALUE c_userdata_get (VALUE self)
+{
+ GET_OBJ (self, RbEvasObject, e);
- return (VALUE) obj;
+ if (NIL_P (e->userdata))
+ e->userdata = rb_hash_new ();
+
+ return e->userdata;
}
void Init_EvasObject (void)
@@ -465,10 +592,10 @@ void Init_EvasObject (void)
cEvasObject = rb_define_class_under (mEvas, "EvasObject",
rb_cObject);
- rb_define_private_method (rb_singleton_class (cEvasObject),
- "new", NULL, 0);
+ rb_define_alloc_func (cEvasObject, c_alloc);
rb_define_method (cEvasObject, "initialize", c_init, 1);
rb_define_method (cEvasObject, "inspect", c_inspect, 0);
+ rb_define_method (cEvasObject, "type", c_type_get, 0);
rb_define_method (cEvasObject, "delete", c_delete, 0);
rb_define_method (cEvasObject, "resize", c_resize, 2);
rb_define_method (cEvasObject, "move", c_move, 2);
@@ -476,6 +603,8 @@ void Init_EvasObject (void)
rb_define_method (cEvasObject, "show", c_show, 0);
rb_define_method (cEvasObject, "hide", c_hide, 0);
rb_define_method (cEvasObject, "visible?", c_visible_get, 0);
+ rb_define_method (cEvasObject, "focused?", c_focused_get, 0);
+ rb_define_method (cEvasObject, "focused=", c_focused_set, 1);
rb_define_method (cEvasObject, "evas", c_evas_get, 0);
rb_define_method (cEvasObject, "name", c_name_get, 0);
rb_define_method (cEvasObject, "name=", c_name_set, 1);
@@ -483,12 +612,23 @@ void Init_EvasObject (void)
rb_define_method (cEvasObject, "layer=", c_layer_set, 1);
rb_define_method (cEvasObject, "get_color", c_get_color, 0);
rb_define_method (cEvasObject, "set_color", c_set_color, 4);
- rb_define_method (cEvasObject, "pass_events?", c_pass_events_get, 0);
- rb_define_method (cEvasObject, "pass_events=", c_pass_events_set, 1);
+ rb_define_method (cEvasObject, "clip", c_get_clip, 0);
+ rb_define_method (cEvasObject, "clip=", c_set_clip, 1);
+ rb_define_method (cEvasObject, "pass_events?",
+ c_pass_events_get, 0);
+ rb_define_method (cEvasObject, "pass_events=",
+ c_pass_events_set, 1);
+ rb_define_method (cEvasObject, "repeat_events?",
+ c_repeat_events_get, 0);
+ rb_define_method (cEvasObject, "repeat_events=",
+ c_repeat_events_set, 1);
+ rb_define_method (cEvasObject, "anti_alias?", c_anti_alias_get, 0);
+ rb_define_method (cEvasObject, "anti_alias=", c_anti_alias_set, 1);
rb_define_method (cEvasObject, "raise", c_raise, 0);
rb_define_method (cEvasObject, "lower", c_lower, 0);
rb_define_method (cEvasObject, "stack_above", c_stack_above, 1);
rb_define_method (cEvasObject, "stack_below", c_stack_below, 1);
rb_define_method (cEvasObject, "above", c_above_get, 0);
rb_define_method (cEvasObject, "below", c_below_get, 0);
+ rb_define_method (cEvasObject, "userdata", c_userdata_get, 0);
}