projects
/
ruby-ecore.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added Ecore::Timer#deleted?.
[ruby-ecore.git]
/
src
/
ecore
/
rb_timer.c
diff --git
a/src/ecore/rb_timer.c
b/src/ecore/rb_timer.c
index 28bb4057b611b2d20b064be53e9733ac7cbb3309..bc7003567f7639d12d5a749db4b8167fcd5ceda7 100644
(file)
--- a/
src/ecore/rb_timer.c
+++ b/
src/ecore/rb_timer.c
@@
-1,7
+1,7
@@
/*
/*
- * $Id$
+ * $Id
: rb_timer.c 267 2005-02-28 21:20:03Z 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
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@
-19,26
+19,24
@@
*/
#include <ruby.h>
*/
#include <ruby.h>
+#include <stdbool.h>
#include <Ecore.h>
#include <Ecore.h>
-#include <stdbool.h>
#include "rb_ecore.h"
typedef struct {
#include "rb_ecore.h"
typedef struct {
- Ecore_Timer *
timer
;
-
void *cb
;
+ Ecore_Timer *
real
;
+
VALUE callback
;
bool deleted;
bool deleted;
-} RbEcoreTimer;
-
-VALUE cTimer;
+} RbTimer;
static int on_timer (void *data)
{
VALUE r;
static int on_timer (void *data)
{
VALUE r;
- Rb
Ecore
Timer *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
/* if the callback returns false, we return 0 and Ecore
* will remove the timer
@@
-49,49
+47,64
@@
static int on_timer (void *data)
return (r != Qfalse);
}
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 (Rb
Ecore
Timer *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);
}
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)
{
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, Rb
EcoreTimer, NULL
, c_free, timer);
+ self = Data_Make_Struct (klass, Rb
Timer, 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;
}
return self;
}
+/*
+ * call-seq:
+ * timer.delete => nil
+ *
+ * Deletes <i>timer</i>.
+ */
static VALUE c_delete (VALUE self)
{
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!");
timer->deleted = true;
} else
rb_raise (rb_eException, "Timer already deleted!");
@@
-99,12
+112,18
@@
static VALUE c_delete (VALUE self)
return Qnil;
}
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;
}
}
+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);
+}