Removed RCS-style IDs.

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

diff --git a/src/ecore/rb_timer.c b/src/ecore/rb_timer.c
index 28bb4057b611b2d20b064be53e9733ac7cbb3309..4d05d48d66a4284a91d73a3e2c1e81307285eea5 100644 (file)
--- a/src/ecore/rb_timer.c
+++ b/src/ecore/rb_timer.c
@@ -1,7 +1,5 @@
 /*
- * $Id$
- *
- * 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_Timer *timer;
-       void *cb;
+       Ecore_Timer *real;
+       VALUE callback;
        bool deleted;
-} RbEcoreTimer;
-
-VALUE cTimer;
+} RbTimer;
 
 static int on_timer (void *data)
 {
        VALUE r;
-       RbEcoreTimer *timer = data;
+       RbTimer *timer = data;
 
-       r = rb_funcall ((VALUE) timer->cb, rb_intern ("call"), 0);
+       r = rb_funcall (timer->callback, rb_intern ("call"), 0);
 
        /* if the callback returns false, we return 0 and Ecore
         * will remove the timer
@@ -49,49 +45,66 @@ static int on_timer (void *data)
        return (r != Qfalse);
 }
 
-static VALUE c_init (VALUE self, VALUE interval)
+static void c_mark (RbTimer *timer)
 {
-       RbEcoreTimer *timer = NULL;
+       rb_gc_mark (timer->callback);
+}
 
-       Data_Get_Struct (self, RbEcoreTimer, timer);
+static void c_free (RbTimer *timer)
+{
+       if (timer->real && !timer->deleted)
+               ecore_timer_del (timer->real);
 
-       timer->cb = (void *) rb_block_proc ();
-       timer->timer = ecore_timer_add (NUM2DBL (interval),
-                                       on_timer, timer);
+       ecore_shutdown ();
 
-       return self;
+       free (timer);
 }
 
-static void c_free (RbEcoreTimer *timer)
+static VALUE c_alloc (VALUE klass)
 {
-       if (timer->timer && !timer->deleted)
-               ecore_timer_del (timer->timer);
+       RbTimer *timer = NULL;
 
-       free (timer);
+       ecore_init ();
+
+       return Data_Make_Struct (klass, RbTimer, c_mark, c_free, timer);
 }
 
-static VALUE c_new (VALUE klass, VALUE interval)
+/*
+ * call-seq:
+ *  Ecore::Timer.new(interval) { block } => timer
+ *
+ * Creates an Ecore::Timer object with the specified interval.
+ * When the timeout is hit, the block is called.
+ * If the block returns false, the timer is deleted.
+ */
+static VALUE c_init (VALUE self, VALUE interval)
 {
-       VALUE self, argv[1];
-       RbEcoreTimer *timer;
+       GET_OBJ (self, RbTimer, timer);
 
-       self = Data_Make_Struct (klass, RbEcoreTimer, NULL, c_free, timer);
+       if (!rb_block_given_p ())
+               rb_raise (rb_eStandardError, "block missing");
 
-       argv[0] = interval;
-       rb_obj_call_init (self, 1, argv);
+       timer->callback = rb_block_proc ();
+       timer->deleted = false;
+       timer->real = ecore_timer_add (NUM2DBL (interval),
+                                      on_timer, timer);
 
        return self;
 }
 
+/*
+ * call-seq:
+ *  timer.delete => nil
+ *
+ * Deletes <i>timer</i>.
+ */
 static VALUE c_delete (VALUE self)
 {
-       RbEcoreTimer *timer = NULL;
-
-       Data_Get_Struct (self, RbEcoreTimer, timer);
+       GET_OBJ (self, RbTimer, timer);
 
-       if (timer->timer && !timer->deleted) {
-               ecore_timer_del (timer->timer);
-               timer->timer = NULL;
+       if (timer->real && !timer->deleted) {
+               ecore_timer_del (timer->real);
+               timer->real = NULL;
                timer->deleted = true;
        } else
                rb_raise (rb_eException, "Timer already deleted!");
@@ -99,12 +112,29 @@ static VALUE c_delete (VALUE self)
        return Qnil;
 }
 
-void Init_Timer (void)
+static VALUE c_deleted_get (VALUE self)
 {
-       cTimer = rb_define_class_under (mEcore, "Timer", rb_cObject);
+       GET_OBJ (self, RbTimer, timer);
 
-       rb_define_singleton_method (cTimer, "new", c_new, 1);
-       rb_define_method (cTimer, "initialize", c_init, 1);
-       rb_define_method (cTimer, "delete", c_delete, 0);
+       return timer->deleted ? Qtrue : Qfalse;
 }
 
+static VALUE c_interval_set (VALUE self, VALUE interval)
+{
+       GET_OBJ (self, RbTimer, timer);
+
+       ecore_timer_interval_set (timer->real, NUM2DBL (interval));
+
+       return Qnil;
+}
+
+void Init_Timer (void)
+{
+       VALUE c = rb_define_class_under (mEcore, "Timer", rb_cObject);
+
+       rb_define_alloc_func (c, c_alloc);
+       rb_define_method (c, "initialize", c_init, 1);
+       rb_define_method (c, "delete", c_delete, 0);
+       rb_define_method (c, "deleted?", c_deleted_get, 0);
+       rb_define_method (c, "interval=", c_interval_set, 1);
+}