projects
/
ruby-ecore.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
We now use real structs to wrap objects.
[ruby-ecore.git]
/
src
/
ecore
/
rb_idler.c
diff --git
a/src/ecore/rb_idler.c
b/src/ecore/rb_idler.c
index 414b6fb85395c625f6a0913d833a9cf2997d0259..b890ef59a49b5726523e610a134c68ee03c33524 100644
(file)
--- a/
src/ecore/rb_idler.c
+++ b/
src/ecore/rb_idler.c
@@
-1,5
+1,5
@@
/*
/*
- * $Id: rb_idler.c
27 2004-07-08 18:25:05
Z tilman $
+ * $Id: rb_idler.c
50 2004-08-01 10:18:39
Z tilman $
*
* Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
*
*
* Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
*
@@
-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_Idler *
idler
;
-
void *cb
;
+ Ecore_Idler *
real
;
+
VALUE callback
;
bool deleted;
bool deleted;
-} RbEcoreIdler;
-
-static VALUE cIdler;
+} RbIdler;
static int on_idler (void *data)
{
VALUE r;
static int on_idler (void *data)
{
VALUE r;
- Rb
Ecore
Idler *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
/* if the callback returns false, we return 0 and Ecore
* will remove the idler
@@
-49,10
+47,15
@@
static int on_idler (void *data)
return (r != Qfalse);
}
return (r != Qfalse);
}
-static void c_free (RbEcoreIdler *idler)
+static void c_mark (RbIdler *idler)
+{
+ rb_gc_mark (idler->callback);
+}
+
+static void c_free (RbIdler *idler)
{
{
- if (idler->
idler
&& !idler->deleted)
- ecore_idler_del (idler->
idler
);
+ if (idler->
real
&& !idler->deleted)
+ ecore_idler_del (idler->
real
);
ecore_shutdown ();
ecore_shutdown ();
@@
-62,17
+65,17
@@
static void c_free (RbEcoreIdler *idler)
static VALUE c_new (VALUE klass)
{
VALUE self;
static VALUE c_new (VALUE klass)
{
VALUE self;
- Rb
Ecore
Idler *idler;
+ RbIdler *idler;
if (!rb_block_given_p ())
return Qnil;
if (!rb_block_given_p ())
return Qnil;
- self = Data_Make_Struct (klass, Rb
EcoreIdler, NULL
, c_free, idler);
+ self = Data_Make_Struct (klass, Rb
Idler, c_mark
, c_free, idler);
ecore_init ();
ecore_init ();
- idler->c
b = (void *)
rb_block_proc ();
- idler->
idler
= ecore_idler_add (on_idler, idler);
+ idler->c
allback =
rb_block_proc ();
+ idler->
real
= ecore_idler_add (on_idler, idler);
rb_obj_call_init (self, 0, NULL);
rb_obj_call_init (self, 0, NULL);
@@
-81,13
+84,11
@@
static VALUE c_new (VALUE klass)
static VALUE c_delete (VALUE self)
{
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!");
idler->deleted = true;
} else
rb_raise (rb_eException, "Idler already deleted!");
@@
-97,9
+98,8
@@
static VALUE c_delete (VALUE self)
void Init_Idler (void)
{
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 (c
Idler
, "new", c_new, 1);
- rb_define_method (c
Idler
, "delete", c_delete, 0);
+ rb_define_singleton_method (c, "new", c_new, 1);
+ rb_define_method (c, "delete", c_delete, 0);
}
}
-