X-Git-Url: http://git.code-monkey.de/?p=ruby-ecore.git;a=blobdiff_plain;f=src%2Fecore%2Frb_idler.c;h=41f1cb30711f46892a2fb70a054f0bbd3cd57e70;hp=77c35a30c235f95768af0c73de8a9389c6002f82;hb=0f8d24c745efc1057f8d25ada1375c88a1ab2ed7;hpb=f3e4005cf0cfdefa25cfd5187a67a4f456fe697f

diff --git a/src/ecore/rb_idler.c b/src/ecore/rb_idler.c
index 77c35a3..41f1cb3 100644
--- a/src/ecore/rb_idler.c
+++ b/src/ecore/rb_idler.c
@@ -1,7 +1,5 @@
 /*
- * $Id: rb_idler.c 25 2004-06-26 23:07:01Z 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,26 +17,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;
-
-static VALUE cIdler;
+} 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
@@ -49,47 +45,65 @@ static int on_idler (void *data)
 	return (r != Qfalse);
 }
 
-static VALUE c_init (VALUE self)
+static void c_mark (RbIdler *idler)
 {
-	RbEcoreIdler *idler = NULL;
+	rb_gc_mark (idler->callback);
+}
 
-	Data_Get_Struct (self, RbEcoreIdler, idler);
+static void c_free (RbIdler *idler)
+{
+	if (idler->real && !idler->deleted)
+		ecore_idler_del (idler->real);
 
-	idler->cb = (void *) rb_block_proc ();
-	idler->idler = ecore_idler_add (on_idler, idler);
+	ecore_shutdown ();
 
-	return self;
+	free (idler);
 }
 
-static void c_free (RbEcoreIdler *idler)
+static VALUE c_alloc (VALUE klass)
 {
-	if (idler->idler && !idler->deleted)
-		ecore_idler_del (idler->idler);
+	RbIdler *idler;
 
-	free (idler);
+	ecore_init ();
+
+	return Data_Make_Struct (klass, RbIdler, c_mark, c_free, idler);
 }
 
-static VALUE c_new (VALUE klass)
+/*
+ * 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)
 {
-	VALUE self;
-	RbEcoreIdler *idler;
+	GET_OBJ (self, RbIdler, idler);
 
-	self = Data_Make_Struct (klass, RbEcoreIdler, NULL, c_free, 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;
+	GET_OBJ (self, RbIdler, idler);
 
-	Data_Get_Struct (self, RbEcoreIdler, 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!");
@@ -99,10 +113,9 @@ static VALUE c_delete (VALUE self)
 
 void Init_Idler (void)
 {
-	cIdler = rb_define_class_under (mEcore, "Idler", rb_cObject);
+	VALUE c = rb_define_class_under (mEcore, "Idler", rb_cObject);
 
-	rb_define_singleton_method (cIdler, "new", c_new, 1);
-	rb_define_method (cIdler, "initialize", c_init, 1);
-	rb_define_method (cIdler, "delete", c_delete, 0);
+	rb_define_alloc_func (c, c_alloc);
+	rb_define_method (c, "initialize", c_init, 0);
+	rb_define_method (c, "delete", c_delete, 0);
 }
-