/*
- * $Id: rb_timer.c 25 2004-06-26 23:07:01Z tilman $
+ * $Id: rb_timer.c 279 2005-03-13 14:32:25Z 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
*/
#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;
-
-static 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
return (r != Qfalse);
}
-static VALUE c_init (VALUE self, VALUE interval)
+static void c_mark (RbTimer *timer)
{
- RbEcoreTimer *timer = NULL;
-
- Data_Get_Struct (self, RbEcoreTimer, timer);
-
- timer->cb = (void *) rb_block_proc ();
- timer->timer = ecore_timer_add (NUM2DBL (interval),
- on_timer, timer);
-
- return self;
+ rb_gc_mark (timer->callback);
}
-static void c_free (RbEcoreTimer *timer)
+static void c_free (RbTimer *timer)
{
- if (timer->timer && !timer->deleted)
- ecore_timer_del (timer->timer);
+ if (timer->real && !timer->deleted)
+ ecore_timer_del (timer->real);
+
+ ecore_shutdown ();
free (timer);
}
+/*
+ * 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_new (VALUE klass, VALUE interval)
{
- VALUE self, argv[1];
- RbEcoreTimer *timer;
+ VALUE self;
+ RbTimer *timer = NULL;
+
+ if (!rb_block_given_p ())
+ return Qnil;
- self = Data_Make_Struct (klass, RbEcoreTimer, NULL, c_free, timer);
+ self = Data_Make_Struct (klass, RbTimer, c_mark, c_free, timer);
- argv[0] = interval;
- rb_obj_call_init (self, 1, argv);
+ ecore_init ();
+
+ timer->callback = rb_block_proc ();
+ timer->deleted = false;
+ timer->real = ecore_timer_add (NUM2DBL (interval),
+ on_timer, timer);
+
+ rb_obj_call_init (self, 0, NULL);
return self;
}
+/*
+ * call-seq:
+ * timer.delete => nil
+ *
+ * Deletes <i>timer</i>.
+ */
static VALUE c_delete (VALUE self)
{
- RbEcoreTimer *timer = NULL;
+ GET_OBJ (self, RbTimer, timer);
- Data_Get_Struct (self, RbEcoreTimer, 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!");
return Qnil;
}
-void Init_Timer (void)
+static VALUE c_deleted_get (VALUE self)
+{
+ GET_OBJ (self, RbTimer, timer);
+
+ return timer->deleted ? Qtrue : Qfalse;
+}
+
+static VALUE c_interval_set (VALUE self, VALUE interval)
{
- cTimer = rb_define_class_under (mEcore, "Timer", rb_cObject);
+ GET_OBJ (self, RbTimer, timer);
+
+ ecore_timer_interval_set (timer->real, NUM2DBL (interval));
- 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 Qnil;
}
+void Init_Timer (void)
+{
+ VALUE c = rb_define_class_under (mEcore, "Timer", rb_cObject);
+
+ rb_define_singleton_method (c, "new", c_new, 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);
+}