Added Ecore::Evas::EcoreEvas#has_alpha? and #has_alpha=.

[ruby-ecore.git] / src / ecore / rb_idler.c

diff --git a/src/ecore/rb_idler.c b/src/ecore/rb_idler.c
index ce6bc03817828da9f55585eb9517ad22adfa1b72..746229050c055168531666b11b332d76a42507a0 100644 (file)
--- a/src/ecore/rb_idler.c
+++ b/src/ecore/rb_idler.c
@@ -1,7 +1,7 @@
 /*
- * $Id: rb_idler.c 40 2004-07-25 13:14:34Z tilman $
+ * $Id: rb_idler.c 351 2006-02-10 15:25:40Z 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
@@ -19,24 +19,24 @@
  */
 
 #include <ruby.h>
+#include <stdbool.h>
 
 #include <Ecore.h>
-#include <stdbool.h>
 
 #include "rb_ecore.h"
 
 typedef struct {
-       Ecore_Idler *idler;
-       void *cb;
+       Ecore_Idler *real;
+       VALUE callback;
        bool deleted;
-} RbEcoreIdler;
+} RbIdler;
 
 static int on_idler (void *data)
 {
        VALUE r;
-       RbEcoreIdler *idler = data;
+       RbIdler *idler = data;
 
-       r = rb_funcall ((VALUE) idler->cb, rb_intern ("call"), 0);
+       r = rb_funcall (idler->callback, rb_intern ("call"), 0);
 
        /* if the callback returns false, we return 0 and Ecore
         * will remove the idler
@@ -47,45 +47,65 @@ static int on_idler (void *data)
        return (r != Qfalse);
 }
 
-static void c_free (RbEcoreIdler *idler)
+static void c_mark (RbIdler *idler)
+{
+       rb_gc_mark (idler->callback);
+}
+
+static void c_free (RbIdler *idler)
 {
-       if (idler->idler && !idler->deleted)
-               ecore_idler_del (idler->idler);
+       if (idler->real && !idler->deleted)
+               ecore_idler_del (idler->real);
 
        ecore_shutdown ();
 
        free (idler);
 }
 
-static VALUE c_new (VALUE klass)
+static VALUE c_alloc (VALUE klass)
 {
-       VALUE self;
-       RbEcoreIdler *idler;
+       RbIdler *idler;
 
-       if (!rb_block_given_p ())
-               return Qnil;
+       ecore_init ();
 
-       self = Data_Make_Struct (klass, RbEcoreIdler, NULL, c_free, idler);
+       return Data_Make_Struct (klass, RbIdler, c_mark, c_free, idler);
+}
 
-       ecore_init ();
+/*
+ * call-seq:
+ *  Ecore::Idler.new { block } => idler
+ *
+ * Creates an Ecore::Idler object.
+ * When Ecore is idle, the specified block will be called.
+ * If the block returns false, the idler is deleted.
+ */
+static VALUE c_init (VALUE self)
+{
+       GET_OBJ (self, RbIdler, idler);
 
-       idler->cb = (void *) rb_block_proc ();
-       idler->idler = ecore_idler_add (on_idler, idler);
+       if (!rb_block_given_p ())
+               rb_raise (rb_eStandardError, "block missing");
 
-       rb_obj_call_init (self, 0, NULL);
+       idler->callback = rb_block_proc ();
+       idler->deleted = false;
+       idler->real = ecore_idler_add (on_idler, idler);
 
        return self;
 }
 
+/*
+ * call-seq:
+ *  idler.delete => nil
+ *
+ * Deletes <i>idler</i>.
+ */
 static VALUE c_delete (VALUE self)
 {
-       RbEcoreIdler *idler = NULL;
-
-       Data_Get_Struct (self, RbEcoreIdler, idler);
+       GET_OBJ (self, RbIdler, idler);
 
-       if (idler->idler && !idler->deleted) {
-               ecore_idler_del (idler->idler);
-               idler->idler = NULL;
+       if (idler->real && !idler->deleted) {
+               ecore_idler_del (idler->real);
+               idler->real = NULL;
                idler->deleted = true;
        } else
                rb_raise (rb_eException, "Idler already deleted!");
@@ -97,6 +117,7 @@ void Init_Idler (void)
 {
        VALUE c = rb_define_class_under (mEcore, "Idler", rb_cObject);
 
-       rb_define_singleton_method (c, "new", c_new, 1);
+       rb_define_alloc_func (c, c_alloc);
+       rb_define_method (c, "initialize", c_init, 0);
        rb_define_method (c, "delete", c_delete, 0);
 }