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::FdHandler. Moved DEF_CONST.
[ruby-ecore.git]
/
src
/
ecore
/
rb_timer.c
diff --git
a/src/ecore/rb_timer.c
b/src/ecore/rb_timer.c
index 315a65a56e4e0a3d9d38a6ec6d039f30ad049dd8..28ef41c6c1010d9e7056e6db00a69d7edebba993 100644
(file)
--- a/
src/ecore/rb_timer.c
+++ b/
src/ecore/rb_timer.c
@@
-1,7
+1,7
@@
/*
/*
- * $Id: rb_timer.c
27 2004-07-08 18:25:05
Z tilman $
+ * $Id: rb_timer.c
77 2004-08-19 17:39:29
Z 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;
-
-static 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,46
+47,64
@@
static int on_timer (void *data)
return (r != Qfalse);
}
return (r != Qfalse);
}
-static void c_
free (RbEcore
Timer *timer)
+static void c_
mark (Rb
Timer *timer)
{
{
- if (timer->timer && !timer->deleted)
- ecore_timer_del (timer->timer);
+ rb_gc_mark (timer->callback);
+}
+
+static void c_free (RbTimer *timer)
+{
+ if (timer->real && !timer->deleted)
+ ecore_timer_del (timer->real);
ecore_shutdown ();
free (timer);
}
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;
static VALUE c_new (VALUE klass, VALUE interval)
{
VALUE self;
- Rb
EcoreTimer *timer
;
+ Rb
Timer *timer = NULL
;
if (!rb_block_given_p ())
return Qnil;
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);
ecore_init ();
ecore_init ();
- timer->cb = (void *) rb_block_proc ();
- timer->timer = ecore_timer_add (NUM2DBL (interval),
- on_timer, timer);
+ 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;
}
rb_obj_call_init (self, 0, NULL);
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!");
@@
-98,9
+114,8
@@
static VALUE c_delete (VALUE self)
void Init_Timer (void)
{
void Init_Timer (void)
{
-
cTimer
= rb_define_class_under (mEcore, "Timer", rb_cObject);
+
VALUE c
= rb_define_class_under (mEcore, "Timer", rb_cObject);
- rb_define_singleton_method (c
Timer
, "new", c_new, 1);
- rb_define_method (c
Timer
, "delete", c_delete, 0);
+ rb_define_singleton_method (c, "new", c_new, 1);
+ rb_define_method (c, "delete", c_delete, 0);
}
}
-